Changeset 661

Timestamp:

Nov 11, 2011, 9:45:52 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI 2.5.x: Several fixes, smaller additions

Location:

trunk/guitools/evfsgui

Files:

• changes (modified) (3 diffs)
• evfsgui.vrp (modified) (2 diffs)
• evfsgui.vrx (modified) (9 diffs)
• evfsgui.vry (modified) ( previous)
• rc/lang/evfsi_de.mkm (modified) (3 diffs)
• rc/lang/evfsi_en.mkm (modified) (3 diffs)
• rc/lang/evfsi_fr.mkm (modified) (3 diffs)
• rc/lang/evfsi_it.mkm (modified) (3 diffs)

trunk/guitools/evfsgui/changes

@@ -4 +4 @@
 - Support server based logon scripts (requires REXX rpc library,
   partly done) (works in a separate utility right now)
-- eigenes Icon fr ADMIN$
-- _AddSharesDisplay verwendet kein file2stem
-- session user/password
+- provide Icon fr ADMIN$
+- fully implement icons. stem
+- _AddSharesDisplay does not use file2stem
+- "Guess" proper WINS server - is the LMB = WINS server approach good enough?
 
 Known problems:
@@ -13 +14 @@
 - Passive connections/double connection detection does not seem 
   to work properly
-- Refreshing a single machine adds shares 2x for automatically added machines
   
 Version 2.5.x 2011-??-??
++ Added: Icon on login window depends upon connection type
++ Added: Allow removing stored credentials from memory
 + Added: Optionally store credentials in memory until next reboot
 + Added: Properly verify all manually entered IP addresses
@@ -35 +37 @@
            convert global settings and advanced connection options 
            from windows into notebook pages
+! Fixed: Extended Help menu item was broken
+! Fixed: Refreshing a single machine added shares 2x for automatically 
+         added machines
+! Fixed: Loginbox was not NLS aware
 ! Fixed: Numerous small bugs/omissions
-! Fixed: Creating lame upcase tables filtered
+! Fixed: "Creating lame upcase tables" filtered
 ! Fixed: Do not run nmblookup.exe twice in the foreground
 - Removed: Bottom button row

trunk/guitools/evfsgui/evfsgui.vrp

@@ -9 +9 @@
 RunDirectory: U:\Develop\Samba\trunk\guitools\evfsgui
 VRXWindow: __VREMainWindow,1,1951,2361,891,7841
-VRXWindow: __VREFileListWindow,1,2987,5155,2665,3358
+VRXWindow: __VREFileListWindow,1,1144,10744,2665,3358
 VRXWindow: __VRESectionListWindow,1,3903,10744,8082,4505
 VRXWindow: __VREToolsWindow,0,2987,8528,6486,1669
@@ -16 +16 @@
 UserWindow: Main,1
 UserWindow: SW_LOGIN,1
-UserWindow: SW_SETTINGS,1
-UserWindow: SW_SMBTREE,1
-UserWindow: SW_DIALOG,1
+UserWindow: SW_MOUNTPOINT,1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -692 +692 @@
     CALL NLVSetText 'Menu_File_SAVE',                 "Caption", 30
     CALL NLVSetText 'Menu_File_LMHosts_Reset',        "Caption", 127
+    CALL NLVSetText 'Menu_File_ucCred_Reset',         "Caption", 128
     CALL NLVSetText 'Menu_File_Autostart',            "Caption", 35
     CALL NLVSetText 'Menu_File_Autostart_Activate',   "Caption", 76
@@ -1356 +1357 @@
 */
 _SmbConfCreateShadowCopy: 
+    IF options.!debug == 1 THEN SAY time()' _SmbConfCreateShadowCopy started'
     /* we create a complete version of smb.conf in temporary directory for reading purposes */
     /* as we can only determine a default value from this complete version of the file */
     /* however it is not desirable to always have a complete copy normally */
     ok = SysFileDelete(samba.!shadowsmbconf)
-    say         samba.!testparmexe' -v -s 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
+    say     '  'samba.!testparmexe' -v -s 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
     address cmd samba.!testparmexe' -v -s 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
+    IF options.!debug == 1 THEN SAY time()' _SmbConfCreateShadowCopy done'
 return
 
@@ -1448 +1451 @@
     icons.!folder           = '#26:PMWP.DLL'
     icons.!folder_open      = '#34:PMWP.DLL'
+    icons.!machine_awake    = '#35:PMWP.DLL'
     icons.!machine_sleeping = '#61:PMWP.DLL'
+    icons.!workgroup        = '#62:PMWP.DLL'
+    icons.!pdc              = '#63:PMWP.DLL'
     icons.!active           = '#64:PMWP.DLL'
     icons.!passive          = '#68:PMWP.DLL'
@@ -1514 +1520 @@
 */
 _UserCredUpdate:
+    IF options.!debug == 1 THEN SAY time()' _UserCredUpdate started'
     credentials.!username = VRGet("EF_USER","Value")
     credentials.!password = VRGet("EF_PASSWORD","Value")
@@ -1526 +1533 @@
     end
     else call beep 200, 20
+    IF options.!debug == 1 THEN SAY time()' _UserCredUpdate done'
 return
 
@@ -3052 +3060 @@
 Menu_File_LMHosts_Reset_Click: 
     ok = SysFileDelete(samba.!lmhosts)
+    /* FIXME: Add a message box here */
 return
 
@@ -3110 +3119 @@
 Menu_File_Save_Click:
     call PB_CONDET_SAVE_Click
+return
+
+/*:VRX         Menu_File_ucCred_Reset_Click
+*/
+Menu_File_ucCred_Reset_Click: 
+    ok = _ucDelUc()
+    /* FIXME: Add a message box here */
 return
 
@@ -4497 +4513 @@
 SW_LOGIN_Create:
     call SW_LOGIN_Init 
+    ok = VRSet("SW_LOGIN","Caption",NLVGetMessage(136)' 'strip(p_workgroup' \\'p_server'\'p_share,'T','\'))
     CALL NLVSetText 'DT_USER1',       "Caption", 25
     CALL NLVSetText 'DT_PASSWORD1',   "Caption", 26
@@ -4503 +4520 @@
     CALL NLVSetText 'PB_LOGIN_CANCEL',"Caption", 3
 
-    /* ok = VRSet("Pict_Login","PicturePath", SMBObj.icon) */
+    select
+        when pos("PDC",VRMethod("CN_smbtree", "GetFieldData", SMBObj.rh, MBFH)) > 0 then LoginIcon = "#63:PMWP.DLL" /* icons.!pdc */
+        when SMBObj.udatatype = "WORKGROUP" then LoginIcon = SMBObj.Icon
+        when SMBObj.udatatype = "SERVER" then LoginIcon = SMBObj.Icon
+        otherwise LoginIcon = "#35:PMWP.DLL" /* icons.!machine_awake */
+    end
+say loginicon
+    ok = VRSet("Pict_Login","PicturePath", LoginIcon)
     ok = VRSet("EF_USER1","Value",VRGet("EF_USER","Value"))
     ok = VRSet("EF_PASSWORD1","Value",VRGet("EF_PASSWORD","Value"))

trunk/guitools/evfsgui/rc/lang/evfsi_de.mkm

@@ -79 +79 @@
 EVG0072I: Die Verbindung von %1 zu %2 trennen?
 EVG0073I: Inaktive Verbindungen merken
-EVG0074I: Broadcasts statt dem lokalen Master Browser benutzen
+EVG0074I: Broadcasts statt dem lokalen Master Browser (LMB) benutzen
 EVG0075I: Als Standardarbeitsgruppe speichern
 EVG0076I: Aktivieren
@@ -136 +136 @@
 EVG0126I: Steuerprogramm
 EVG0127I: LMHosts zurcksetzen
-EVG0128?:
+EVG0128I: Anmeldeinformationen l”schen
 EVG0129?:
 ;More advanced properties
@@ -145 +145 @@
 EVG0134I: TRAC Wiki Notation anfgen
 EVG0135I: Anmeldeinformationen speichern
+EVG0136I: Anmelden bei

trunk/guitools/evfsgui/rc/lang/evfsi_en.mkm

@@ -79 +79 @@
 EVG0072I: Really unmount %1 connected to %2?
 EVG0073I: Remember inactive connections
-EVG0074I: Use broadcasts instead of local master browser
+EVG0074I: Use broadcasts instead of local master browser (LMB)
 EVG0075I: Save as default workgroup
 EVG0076I: Enable
@@ -135 +135 @@
 EVG0125I: Comment
 EVG0126I: Control daemon
-EVG0127I: Reset LMHosts
-EVG0128?:
+EVG0127I: ~Reset LMHosts
+EVG0128I: Rese~t stored credentials
 EVG0129?:
 ;More advanced properties
@@ -145 +145 @@
 EVG0134I: Add TRAC Wiki markup
 EVG0135I: Store credentials until next reboot
+EVG0136I: Login

trunk/guitools/evfsgui/rc/lang/evfsi_fr.mkm

@@ -84 +84 @@
 EVG0072I: Voulez-vous vraiment d‚monter %1 connect‚ sur %2 ?
 EVG0073I: Conserver les connexions inactives
-EVG0074I: Utilisation des broadcasts plut“t que le maŒtre explorateur local
+EVG0074I: Utilisation des broadcasts plut“t que le maŒtre explorateur local (LMB)
 EVG0075I: Enregistrer groupe de travail par d‚faut
 EVG0076I: Activer
@@ -142 +142 @@
 EVG0126I: Programme de contr“le
 EVG0127I: R‚initialiser LMHosts
-EVG0128?:
+EVG0128I: A~nnuler utilisateur et mot de passe
 EVG0129?:
 ;More advanced properties
@@ -151 +151 @@
 EVG0134I: Ajouter TRAC Wiki balisage
 EVG0135I: R‚f‚rences magasin jusqu'au prochain red‚marrage
+EVG0136I: Connexion

trunk/guitools/evfsgui/rc/lang/evfsi_it.mkm

@@ -83 +83 @@
 EVG0072I: Smonto %1 connesso a %2?
 EVG0073I: Ricorda le connessioni inattive
-EVG0074I: Usa broadcast invece del master browser locale
+EVG0074I: Usa broadcast invece del master browser locale (LMB)
 EVG0075I: Salva come gruppo di lavoro predefinito
 EVG0076I: Abilita
@@ -140 +140 @@
 EVG0126I: Programma di controllo
 EVG0127I: Cancellare LMHosts
-EVG0128?:
+EVG0128I: ~Disfare credenziali di memorizzare
 EVG0129?:
 ;More advanced properties
@@ -149 +149 @@
 EVG0134I: Aggiungi TRAC Wiki markup
 EVG0135I: Credenziali di memorizzare fino al riavvio successivo
+EVG0136I: Accesso