Changeset 319

Timestamp:

Aug 25, 2009, 9:17:41 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: More work on EVFSGUI V.next (several additions)

Location:

branches/guitools-2.0

Files:

• evfsgui/changes (modified) (1 diff)
• evfsgui/evfsgui.VRP (modified) (1 diff)
• evfsgui/evfsgui.VRX (modified) (13 diffs)
• evfsgui/evfsgui.VRY (modified) ( previous)
• shared/smbtree.vrs (modified) (4 diffs)

branches/guitools-2.0/evfsgui/changes

@@ -13 +13 @@
 - Added: Double connection detection using hashes
 - Added: New profile saving code
+- Added: Remove menu option (preliminary for passive connections only)
+- Added: smbtree.vrs: Optionally do not show hidden shares
+- Added: smbtree.vrs: Enhanced guessicon()
+- Fixed: Loading a profile presented the user a half drawn window
 - 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)

branches/guitools-2.0/evfsgui/evfsgui.VRP

@@ -4 +4 @@
 MacroPath: VRM: U:\Develop\Samba\guitools-2.0\smbclgui
 EXEPath: 
-RunParameters: 
+RunParameters: y:\HB.evp
 RunDirectory: 
 VRXWindow: __VREMainWindow,1,530,2457,879,4071
 VRXWindow: __VRESectionListWindow,1,337,11708,11623,3686
-VRXWindow: __VREToolsWindow,1,518,530,6990,1659
+VRXWindow: __VREToolsWindow,1,518,530,6984,1663
 VRXWindow: __VREWindListWindow,1,482,7661,2650,3150
 UserFile: 1
 UserWindow: Main,1
+UserWindow: SW_ADVANCED,1
 UserWindow: SW_LOGIN,1
 UserWindow: SW_MOUNTPOINT,1

branches/guitools-2.0/evfsgui/evfsgui.VRX

@@ -744 +744 @@
 /*:VRX         LoadSettings
 */
-LoadSettings: PROCEDURE EXPOSE settings. options. fs. advanced. samba.
+LoadSettings: PROCEDURE EXPOSE settings. options. fs. advanced. samba. ShowHidden
     IF options.!debug == 1 THEN SAY time()' '||'LoadSettings started'
 
@@ -798 +798 @@
 say "Loadsettings" samba.!smbconf
         if \VRFileExists( samba.!smbconf ) then call _CreateSmbConf        
+
+        /* Hardcoded for EVFSGUI for now */
+        ShowHidden = 0
 
         /* Load font settings.
@@ -873 +876 @@
 
     if options.!nogui == 1 then CALL VRLoadSecondary "SW_PROGRESS","W"
-    else call VRSet 'Main',    'Visible', 1
+    /* This is too early if a profile was loaded and Main_Resize does it anyway */
+    /* else call VRSet 'Main',    'Visible', 1 */
 
     IF options.!debug == 1 THEN SAY time()' '||'LoadSettings done'
@@ -904 +908 @@
     CALL _ContainersInit
 
+    CALL _GUIInit
+
     CALL ParseCommandLine
 
@@ -910 +916 @@
     CALL _CltInit
 
-    CALL _GUIInit
-
     CALL LoadSettings
-say 'advanced.!alwaysmp='advanced.!alwaysmp
 
     /* Populate the GUI */
@@ -920 +923 @@
     ELSE 
         CALL Refresh
-say 'advanced.!alwaysmp='advanced.!alwaysmp
+
     CALL VRSet "CB_MOUNT",  "Selected", 1 
     CALL VRSet "CB_DRIVES", "Selected", 1 
@@ -928 +931 @@
         if advanced.!browseimme == 1 then call PB_REFRESH_Click
     end
-say 'advanced.!alwaysmp='advanced.!alwaysmp
+
     IF options.!debug == 1 THEN SAY time()' '||"Main_Create done"
 return
@@ -952 +955 @@
 
     /* Current Panel */
+    ok = VRSet("GB_CURRENT","Visible",1)
     ok = VRSet("GB_CURRENT","Top",    FWidth)
     ok = VRSet("GB_CURRENT","Left",   FWidth-24)
@@ -1078 +1082 @@
     ok = VRset("GB_MPOINT","Width",  VRGet("GB_DIALOG","Width")-FWidth*2)
 
+    ok = VRset("SPLIT_Main","Visible", 1)
     ok = VRset("SPLIT_Main","Top", FWidth)
     ok = VRset("SPLIT_Main","Height", VRGet("GB_CURRENT","Height"))
@@ -1190 +1195 @@
 return
 
+/*:VRX         Menu_Selected_Remove_Click
+*/
+Menu_Selected_Remove_Click: 
+    ok = VRMethod( "CN_CONDET", "GetRecordList", "SourceOrSelected", "selrec." ) 
+    if selrec.0 = 0 then return
+
+    do I = 1 to selrec.0
+        if VRMethod("CN_CONDET", "GetFieldData", selrec.I, cd.statusfh) = '#68:PMWP.DLL' then do
+            CALL VRMethod 'CN_CONDET', 'RemoveRecord', selrec.I
+        end
+        else do
+            say "Active record, not yet implemented...."
+        end
+    end
+return
+
 /*:VRX         Menu_View_Buttons_Click
 */
@@ -1223 +1244 @@
     ok = VRSet("Menu_View_Dialog", "Checked",  0)
     ok = VRSet("Menu_View_ConDet", "Checked",  1)
+
+    ok = VRSet("Menu_Selected_Remove", "Visible",  1)
+    ok = VRMethod( "CN_CONDET", "GetRecordList", "All", "records." ) 
+    ok = VRSet("Menu_Selected_Remove", "Enabled",  (records.0 = 0))
 return
 
@@ -1240 +1265 @@
     ok = VRSet("Menu_View_ConDet", "Checked", 0)
     ok = VRSet("Menu_View_Dialog", "Checked", 1)
+
+    ok = VRSet("Menu_Selected_Remove", "Visible",  0)
 return
 
@@ -1257 +1284 @@
     ok = VRSet("Menu_View_ConDet","Checked",  0)
     ok = VRSet("Menu_View_SmbTree","Checked", 1)
+
+    ok = VRSet("Menu_Selected_Remove", "Visible",  0)
 return
 

branches/guitools-2.0/shared/smbtree.vrs

@@ -11 +11 @@
         UserCred = '-N'
     end
+
+    if ShowHidden = 'SHOWHIDDEN' | ShowHidden = '' then ShowHidden = 1
+
     say 'detach 'samba.!smbtreeexe' 'debuglevel' 'UserCred' >'samba.!msg
     address cmd 'detach 'samba.!smbtreeexe' 'debuglevel' 'UserCred' >'samba.!msg
@@ -63 +66 @@
                     parent = smbtree.!machine
                     smbtree.!share = VRMethod( "CN_smbtree", "AddRecord",parent,, share||'0D0A'x||comment, res)
+                    if pos("$", share) > 0 then ok = VRMethod( "CN_smbtree", "SetRecordAttr", smbtree.!share, "Visible", ShowHidden)
                 end
             end
@@ -146 +150 @@
 */
 _GuessIcon: procedure
-    text = arg(1)
+    text = translate(arg(1))
     select /* Printer guessing */
         when pos('LJ',text)      > 0 then res = '#65:PMWP.DLL'
@@ -158 +162 @@
         when pos('LEXMARK',text) > 0 then res = '#65:PMWP.DLL'
         when pos('IPC$',text)    > 0 then res = '#59:PMWP.DLL'
+        when pos('GHOSTPDF',text)> 0 then res = '#65:PMWP.DLL'
+        when pos('PDF',text)     > 0 & ,
+             pos('WRI',text)     > 0 then res = '#65:PMWP.DLL'
         otherwise res = "#34:PMWP.DLL"
     end