Changeset 326 for branches

Timestamp:

Sep 6, 2009, 5:13:15 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: More work on EVFSGUI V.next (Fixed several bugs, options added)

Location:

branches/guitools-2.0/evfsgui

Files:

• changes (modified) (3 diffs)
• evfsgui.VRP (modified) (1 diff)
• evfsgui.VRX (modified) (15 diffs)
• evfsgui.VRY (modified) ( previous)
• evfsi_de.mkm (modified) (3 diffs)
• evfsi_en.mkm (modified) (1 diff)

branches/guitools-2.0/evfsgui/changes

@@ -24 +24 @@
 - Added: Sort smbtree view ascending
 - Added: Optionally turn on/off special ($) shares
+- Added: Optionally use big icons
 - Changed: Several changes in GUI style (as suggested by Alex Taylor)
 - Changed: Left align buttons in current connections panel (as suggested by 
@@ -31 +32 @@
 - Changed: Main icon is now the one done by Alex Taylor           
 - Changed: Use PM_Default_Colors for title sections (as suggested by Alex Taylor)
+- Changed: German translation of "Retry" 
 - Fixed: Loading a profile presented the user a half drawn window
 - Fixed: CltInit uses smbclient.exe instead of smbd.exe to find Samba binaries
@@ -36 +38 @@
 - Fixed: Missing NLV aware strings
 - Fixed: Don't let user edit network neighbourhood results
+- Fixed: Claiming a passive connection already exists is nonsense
+- Fixed: Disallow connecting to printers via context menu
+- Fixed: Edit and Selected menu easily got out of sync
+- Fixed: Another missing record validation
+
 ToDo:
-- Edit and Selected menu easily got out of sync (partly fixed)
 - Major code refactoring
 - Create Icon. stem in order to ease maintainance of icons

branches/guitools-2.0/evfsgui/evfsgui.VRP

@@ -4 +4 @@
 MacroPath: VRM: U:\Develop\Samba\guitools-2.0\smbclgui
 EXEPath: 
-RunParameters: y:\test.evp
+RunParameters: -ndfs
 RunDirectory: 
 VRXWindow: __VREMainWindow,1,530,2457,879,4071
 VRXWindow: __VRESectionListWindow,1,337,11708,11623,3686
-VRXWindow: __VREToolsWindow,1,518,530,6987,1669
+VRXWindow: __VREToolsWindow,1,518,530,6984,1663
 VRXWindow: __VREWindListWindow,1,482,7661,2650,3150
 UserFile: 1

branches/guitools-2.0/evfsgui/evfsgui.VRX

@@ -279 +279 @@
     rh = VRInfo('Record')
     if VRMethod( 'CN_CONDET', "ValidateRecord", rh) <> 1 then return
+
     if VRMethod( 'CN_CONDET', "GetFieldData", rh, CD.StatusFH) = '#68:PMWP.DLL' then do
         ok = VRSet("Menu_Selected_Retry",  "Enabled",1)
@@ -285 +286 @@
     ok = VRMethod( "Menu_Selected", "Popup", , , "", "" )
 return
-
 /*:VRX         CN_CONDET_DragStart
 */
@@ -588 +588 @@
     window = VRLoadSecondary( "SW_LOGIN", "W" )
     call PB_MOUNT_CLICK
-    if VRGet(srcCtn,'Name') = "CN_CONDET" &,
-       VRMethod("CN_CONDET", "GetRecordAttr", srcRec, "Icon") = '#68:PMWP.DLL' then ok = VRMethod( srcCtn, "RemoveRecord", srcRec)
+
+    if VRGet(srcCtn,'Name') = "CN_CONDET" & VRMethod( 'CN_CONDET', "ValidateRecord", srcRec) = 1 then do
+        if VRMethod("CN_CONDET", "GetRecordAttr", srcRec, "Icon") = '#68:PMWP.DLL' then ok = VRMethod( "CN_CONDET", "RemoveRecord", srcRec)
+    end
 return
 
@@ -595 +597 @@
 */
 CN_SMBTREE_ContextMenu: 
+    rh = VRInfo('Record')
+    if VRMethod( 'CN_SMBTREE', "ValidateRecord", rh) <> 1 then return
+
+    Icon = VRMethod("CN_SMBTREE", "GetRecordAttr", rh, "Icon")
+
+    if Icon = "#65:PMWP.DLL" then do /* Printers not supported at the moment */
+        CALL VRMessage 'Main', NLVGetMessage( 62 ), NLVGetMessage( 5 ), 'E'
+        return
+    end
+
     ok = VRMethod( "Menu_Selected", "Popup", , , "", "" )
 return
@@ -900 +912 @@
         IF advanced.!special == '' THEN advanced.!special = 0 
 
+        advanced.!bigicons = VRGetIni('Settings', 'BigIcons', settings.!ini)
+        IF advanced.!bigicons == '' THEN advanced.!bigicons = 0 
+
         /* Apply the settings
          */
@@ -911 +926 @@
         ok = VRSet("DT_SMBTREE","BACKCOLOR", settings.!curbcolor )
         ok = VRSet("DT_SMBTREE","FORECOLOR", settings.!curfcolor )
+
+        ok = VRset("CN_CURRENT", "MiniIcons", \advanced.!bigicons)
+        ok = VRset("CN_SMBTREE", "MiniIcons", \advanced.!bigicons)
+        ok = VRset("CN_CONDET",  "MiniIcons", \advanced.!bigicons)
+
+
 
         ok = VRSet("Menu_View_Buttons","Checked", settings.!buttonson)
@@ -1499 +1520 @@
     DO i = 1 TO records.0
         hash = VRMethod("CN_CONDET","GetFieldData", records.i, cd.hashfh)
-        if hash = md5 then do
+        if hash = md5 & VRMethod("CN_CONDET","GetFieldData", records.i, cd.statusfh) = '#64:PMWP.DLL' then do /* Same hash, status active */
             buttons.0 = 2
             buttons.1 = NLVGetMessage(9)
@@ -1884 +1905 @@
         advanced.!alwaysmp  = adv_alwaysmp
         advanced.!special   = adv_special 
-    END
-
+        advanced.!bigicons  = adv_bigicons
+    END
+
+say 'advanced.!bigicons  = 'advanced.!bigicons
 RETURN
 
@@ -1917 +1940 @@
     adv_alwaysmp   = VRGet( "CB_ALWAYSMP",   "Set" )
     adv_special    = VRGet( "CB_SPECIAL",    "Set" )
+    adv_bigicons   = VRGet( "CB_BIGICONS",   "Set" )
 
     adv_changed  = 1
     if adv_debug == 1 then ok = VRRedirectStdio("ON")
                       else ok = VRRedirectStdio("OFF")
+
+    ok = VRset("CN_CURRENT", "MiniIcons", \adv_bigicons)
+    ok = VRset("CN_SMBTREE", "MiniIcons", \adv_bigicons)
+    ok = VRset("CN_CONDET",  "MiniIcons", \adv_bigicons)
 
     CALL SW_ADVANCED_Close
@@ -2183 +2211 @@
 */
 PB_LOAD_Click: PROCEDURE EXPOSE settings. options. advanced. vfs. Profile fs. cd.
-say 'PB_load advanced.!browseimme='advanced.!browseimme
-say 'PB_load advanced.!alwaysmp='advanced.!alwaysmp
     IF options.!autoload == 1 then filename = Profile
     else filename = VRFileDialog('Main', NLVGetMessage( 55 ), 'L', '*.'fs.!profileext) 
@@ -2538 +2564 @@
 
 /* call _AddTemplates */
-    CALL VRSet "PB_DETACH", "Enabled", 0 
+    CALL VRSet "PB_DETACH",  "Enabled", 0 
     CALL VRSet "PB_UNMOUNT", "Enabled", 0 
+
+    ok = VRSet("Menu_Context_Detach",  "Visible",  0)
+    ok = VRSet("Menu_Context_Unmount", "Visible",  0)
+    ok = VRSet("Menu_Context_Edit",    "Visible",  0)
 
     ok = VRSet("Menu_Selected_Remove", "Visible",  0)
@@ -2610 +2640 @@
     CALL VRSetIni 'Settings', 'AlwaysMP',      advanced.!alwaysmp  , settings.!ini, 'NoClose'
     CALL VRSetIni 'Settings', 'SpecialShares', advanced.!special   , settings.!ini, 'NoClose'
+    CALL VRSetIni 'Settings', 'BigIcons',      advanced.!bigicons  , settings.!ini, 'NoClose'
 
     /* Save position and size */
@@ -2675 +2706 @@
     advanced.!alwaysmp  = ''
     advanced.!special   = ''
+    advanced.!bigicons  = ''
 
     credentials.!username = ""
@@ -2719 +2751 @@
     CALL NLVSetText 'CB_ALWAYSMP',  'Caption', 65
     CALL NLVSetText 'CB_SPECIAL',   'Caption', 66
+    CALL NLVSetText 'CB_BIGICONS',  'Caption', 70
 
     CALL VRSet "SW_ADVANCED", "HelpTag", NLVGetMessage(40)
@@ -2735 +2768 @@
     CALL VRSet 'CB_LOGGING', 'Set', VRFileExists(SysBootDrive()'\ndpsmb.dbg')
 
+    IF advanced.!browseauth \= '' THEN 
+        CALL VRSet 'CB_BROWSEAUTH', 'Set', advanced.!browseauth
+
+    IF advanced.!browseimme \= '' THEN 
+        CALL VRSet 'CB_BROWSEimme', 'Set', advanced.!browseimme
+
+    IF advanced.!debug \= '' THEN 
+        CALL VRSet 'CB_debug', 'Set', advanced.!debug
+
+    IF advanced.!alwaysmp \= '' THEN 
+        CALL VRSet 'CB_alwaysmp', 'Set', advanced.!alwaysmp
+
     IF advanced.!special \= '' THEN
         CALL VRSet 'CB_SPECIAL', 'Set', advanced.!special
 
-    IF advanced.!browseauth \= '' THEN 
-        CALL VRSet 'CB_BROWSEAUTH', 'Set', advanced.!browseauth
-
-    IF advanced.!browseimme \= '' THEN 
-        CALL VRSet 'CB_BROWSEimme', 'Set', advanced.!browseimme
-
-    IF advanced.!debug \= '' THEN 
-        CALL VRSet 'CB_debug', 'Set', advanced.!debug
-
-    IF advanced.!alwaysmp \= '' THEN 
-        CALL VRSet 'CB_alwaysmp', 'Set', advanced.!alwaysmp
+    IF advanced.!bigicons \= '' THEN
+        CALL VRSet 'CB_bigicons', 'Set', advanced.!bigicons
 
     window = VRInfo( "Object" )

branches/guitools-2.0/evfsgui/evfsi_de.mkm

@@ -69 +69 @@
 EVG0062I: Drucker werden im Moment nicht untersttzt!
 EVG0063I: Verbindungsdetails
-EVG0064I: Diese Verbindung besteht bereits - trotzdem fortfahren?
+EVG0064I: Diese Verbindung existiert bereits - trotzdem fortfahren?
 EVG0065I: Mountpoint auch bei Fehlschlag anlegen
 EVG0066I: Alle (auch spezielle) Freigaben zeigen
@@ -75 +75 @@
 EVG0068I: EA
 EVG0069I: R/W
-EVG0070?:
+EVG0070I: Groáe Symbole
 EVG0071?:
 EVG0072?:
@@ -96 +96 @@
 EVG0088I: ~Verbindungsdetails
 EVG0089I: Entfernen
-EVG0090I: Nochmals versuchen
+EVG0090I: Jetzt verbinden
 EVG0091?:
 EVG0092?:

branches/guitools-2.0/evfsgui/evfsi_en.mkm

@@ -75 +75 @@
 EVG0068I: EA
 EVG0069I: R/W
-EVG0070?:
+EVG0070I: Large icons
 EVG0071?:
 EVG0072?: