Changeset 332 for branches

Timestamp:

Sep 16, 2009, 8:40:21 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI V.next (Final additions for beta1

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) (2 diffs)
• evfsi_en.mkm (modified) (2 diffs)
• evfsi_fr.mkm (modified) (5 diffs)
• readme.txt (added)

branches/guitools-2.0/evfsgui/changes

@@ -28 +28 @@
 - Added: Login dialog behaviour matches the one from smbusers now
 - Added: Preliminary handling of smbtree error messages
+- Added: Optionally save passive connections across sessions
+- Added: French message file (thanks to Guillaume Gay)
 - Changed: Several changes in GUI style (as suggested by Alex Taylor)
 - Changed: Left align buttons in current connections panel (as suggested by 
@@ -44 +46 @@
 - Changed: Redesigned login dialog
 - Changed: Clarified message about multiple connections
+- Changed: Rebuild required Samba Client utilities 3.0.36 with libc063 
+           (instead of libc064x) (Changeset 331 level)
 - Fixed: Loading a profile presented the user a half drawn window
 - Fixed: Startup code was broken if no evfsgui.ini is present
@@ -59 +63 @@
 - Fixed: Confirmation of removal of a single connection was missing
 - Fixed: Dropdown combobox in mount dialog was readonly
+- Fixed: Autostart mode was broken
 
 ToDo:
 - Major code refactoring (partly done)
+- Debug on/off option is badly implemented (rework required)
 - Create Icon. stem in order to ease maintainance of icons
-- Create mechanism to save passive connections across sessions
-- Debug on/off option is badly implemented (rework required)
-- rebuild required utilities with libc063 (instead of libc064x)
 
 Known problem:

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,1659
+VRXWindow: __VREToolsWindow,1,518,530,6990,1659
 VRXWindow: __VREWindListWindow,1,482,7661,2650,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_MOUNTPOINT,1
+UserWindow: SW_PROGRESS,1

branches/guitools-2.0/evfsgui/evfsgui.VRX

@@ -137 +137 @@
     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.logfilefh ,     "Visible", 0)
     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.loglevelfh ,    "Visible", 0)
-    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.hashfh ,        "Visible", 0)
+    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.hashfh ,        "Visible", 0) 
 
     ok = VRSet("CN_CONDET", "DetailSort", cd.mpointfh )
@@ -181 +181 @@
     ok = VRSet("DT_STATUSBAR", "Caption", VRGet("Main", "HintText"))
     call Main_Resize
+return
+
+/*:VRX         _PassiveLoad
+*/
+_PassiveLoad: 
+Say "_PassiveLoad started"
+    do cnt = 1 to 255
+        resdata = VRGetIni( "PassiveConnections", cnt, settings.!ini )
+        if resdata = "" then leave
+
+        PARSE Var resdata p_mpoint resource rwFlag
+
+say "resdata  ="resdata
+say "p_mpoint ="p_mpoint
+say "resource ="resource
+say "rwFlag   ="rwFlag
+
+
+
+/*      vfs.!drive      = FILESPEC('DRIVE', node )
+        vfs.!mountpoint = STRIP( node, 'T', '\') */
+
+        /* In case we only have a volume we reattach the backslash, otherwise restore will fail */
+        if vfs.!drive = vfs.!mountpoint then vfs.!mountpoint = vfs.!mountpoint||'\'
+
+        p_mpidx = ""
+
+        PARSE VAR resource . 'WORKGROUP=' p_workgroup ';' .
+        PARSE VAR resource . 'SERVER=' p_server ';' .
+        PARSE VAR resource . 'SHARE=' p_share ';' .
+        PARSE VAR resource . 'USER=' p_user ';' .
+        PARSE VAR resource . 'PASSWORD=' p_password ';' .
+        PARSE VAR resource . 'SPASSWORD=' p_spassword ';' .
+        PARSE VAR resource . 'MASTER=' p_master ';' .
+        PARSE VAR resource . 'MASTERTYPE=' p_mtype ';' .
+        PARSE VAR resource . 'MEMLEN=' p_memlen ';' .
+        PARSE VAR resource . 'LOGFILE=' p_logfile ';'.
+        PARSE VAR resource . 'LOGLEVEL=' p_loglevel ';' .
+        PARSE VAR resource . 'EASUPPORT=' p_easupport .
+
+        p_rw = rwFlag
+
+        cd.lastrh = VRMethod("CN_CONDET","AddRecord")
+say "cd.lastrh="cd.lastrh
+
+        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.mpointFH, p_mpoint, cd.mpidxfh, p_mpidx, cd.workgroupfh, p_workgroup, cd.serverfh, p_server, cd.sharefh, p_share, cd.userfh, p_user)
+        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.passwordfh, p_password, cd.spasswordfh, p_spassword, cd.masterfh, p_master, cd.mtypefh, p_mtype)
+        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.memlenfh, p_memlen, cd.easupportfh, p_easupport, cd.logfilefh, p_logfile, cd.loglevelfh, p_loglevel, cd.rwfh, p_rw)
+        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, '#68:PMWP.DLL') /* Passive */
+        ok = VRMethod("CN_CONDET", "SetRecordAttr", cd.lastrh, "Icon", '#68:PMWP.DLL') /* Active */
+
+        hashstr = p_mpoint' 'translate(p_domain)' 'translate(p_server)' 'translate(p_share)' 'p_user' 'p_spassword' 'p_easupport' 'p_rw
+
+        md5 = rexx_md5(hashstr)
+
+        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.hashfh,md5)
+
+    end
+Say "_PassiveLoad done"
+return
+/*:VRX         _PassiveSave
+*/
+_PassiveSave: 
+    ok = VRDelIni( "PassiveConnections", "ALL", settings.!ini )
+
+    ok = SysIni(settings.!ini, 'PassiveConnections', 'DELETE:')
+
+    CALL VRMethod 'CN_CONDET', 'GetRecordList', 'All', 'records.'
+    cnt = 0
+    DO i = 1 TO records.0
+   
+        if VRMethod( 'CN_CONDET', "GetFieldData", records.i, CD.StatusFH) = '#68:PMWP.DLL' then do
+            cnt = cnt + 1
+            resdata = ""
+            resdata = resdata||VRMethod("CN_CONDET","GetFieldData", records.i, cd.mpointfh)||" "
+            resdata = resdata||'\\'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.workgroupfh)
+            resdata = resdata||':'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.serverfh)
+            resdata = resdata||'\'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.sharefh)
+            resdata = resdata||'@'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.userfh)
+            resdata = resdata||';WORKGROUP='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.workgroupfh)
+            resdata = resdata||';SERVER='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.serverfh)
+            resdata = resdata||';SHARE='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.sharefh)
+            resdata = resdata||';USER='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.userfh)
+            resdata = resdata||';PASSWORD='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.passwordfh)
+            resdata = resdata||';SPASSWORD='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.spasswordfh)
+            resdata = resdata||';MASTER='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.masterfh)
+            resdata = resdata||';MASTERTYPE='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.mtypefh)
+            resdata = resdata||';MEMLEN='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.memlenfh)
+            resdata = resdata||';LOGFILE='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.logfilefh)
+            resdata = resdata||';LOGLEVEL='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.loglevelfh)
+            resdata = resdata||';EASUPPORT='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.easupportfh)
+            resdata = resdata||' '||VRMethod("CN_CONDET","GetFieldData", records.i, cd.rwfh)
+            ok = VRSetIni( "PassiveConnections", cnt, resdata, settings.!ini )
+        END
+        else iterate
+    end
 return
 
@@ -904 +1000 @@
         settings.!smbtreeon = 1
         advanced.!browseimme = 1
+        advanced.!savepassive = 0
+        advanced.!bigicons = 1
 
         ShowHidden = 0
@@ -988 +1086 @@
 
         advanced.!bigicons = VRGetIni('Settings', 'BigIcons', settings.!ini)
-        IF advanced.!bigicons == '' THEN advanced.!bigicons = 0 
+        IF advanced.!bigicons == '' THEN advanced.!bigicons = 1 
+
+        advanced.!savepassive = VRGetIni('Settings', 'SavePassive', settings.!ini)
+        IF advanced.!savepassive == '' THEN advanced.!savepassive = 0 
 
         /* Apply the settings
@@ -1005 +1106 @@
         ok = VRset("CN_SMBTREE", "MiniIcons", \advanced.!bigicons)
         ok = VRset("CN_CONDET",  "MiniIcons", \advanced.!bigicons)
+        ok = VRset("Menu_View_MiniIcons",  "Checked", \advanced.!bigicons)
 
 
@@ -1064 +1166 @@
 */
 Main_Create: 
-    ok = VRREdirectStdIO("ON")
-    options.!debug    = 1
+    ok = VRREdirectStdIO("OFF")
+    options.!debug    = 0
 
     IF options.!debug == 1 THEN ok = VRREdirectStdIO("ON")
@@ -1097 +1199 @@
         CALL Refresh
 
+    if advanced.!savepassive == 1 then CALL _PassiveLoad
+
     CALL VRSet "CB_MOUNT",  "Selected", 1 
     CALL VRSet "CB_DRIVES", "Selected", 1 
-    IF options.!autoclose == 1 THEN CALL VRSet "TM_AUTOCLOSE", "ENABLED", 1
+    IF options.!autoclose == 1 THEN CALL TM_AutoClose_Trigger
+    /* For whatever reason the timer is not triggered anymore....
+    CALL VRSet "TM_AUTOCLOSE", "ENABLED", 1 */
     ELSE do
         if advanced.!browseauth == 1 then window = VRLoadSecondary( "SW_LOGIN", "W" )
@@ -1383 +1489 @@
         advanced.!debug     = adv_debug
         advanced.!special   = adv_special 
-        advanced.!bigicons  = adv_bigicons
+        advanced.!savepassive=adv_savepassive
     END
 return
@@ -1542 +1648 @@
 
     ok = VRSet("Menu_Selected_Connect", "Visible",  0)
+return
+
+/*:VRX         Menu_View_MiniIcons_Click
+*/
+Menu_View_MiniIcons_Click: 
+    advanced.!bigicons = \advanced.!bigicons
+    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_MiniIcons",  "Checked", \advanced.!bigicons)
 return
 
@@ -1846 +1962 @@
     CALL NLVSetText 'Menu_View_Buttons',  'Caption', 87
     CALL NLVSetText 'Menu_View_ConDet',   'Caption', 88
+    CALL NLVSetText 'Menu_View_MiniIcons','Caption', 70
 
     CALL NLVSetText 'Menu_File_Autostart','Caption', 35
@@ -2612 +2729 @@
     adv_debug      = VRGet( "CB_DEBUG",      "Set" )
     adv_special    = VRGet( "CB_SPECIAL",    "Set" )
-    adv_bigicons   = VRGet( "CB_BIGICONS",   "Set" )
+    adv_savepassive= VRGet( "CB_SAVEPASSIVE","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_SETTINGS_Close
@@ -2742 +2855 @@
 /*:VRX         SaveSettings
 */
-SaveSettings: PROCEDURE EXPOSE settings. options. fs. advanced.
+SaveSettings: PROCEDURE EXPOSE settings. options. fs. advanced. cd.
     IF options.!debug == 1 THEN SAY time()' '||"SaveSettings started"
+
+    if advanced.!savepassive then call _PassiveSave 
 
 /* This does not make sense anymore 
@@ -2774 +2889 @@
     CALL VRSetIni 'Settings', 'ConDetOn', settings.!condeton, settings.!ini, 'NoClose'
 
-    CALL VRSetIni 'Settings', 'BrowseAuth',    advanced.!browseauth, settings.!ini, 'NoClose'
-    CALL VRSetIni 'Settings', 'BrowseImme',    advanced.!browseimme, settings.!ini, 'NoClose'
-    CALL VRSetIni 'Settings', 'Debug',         advanced.!debug     , settings.!ini, 'NoClose'
-    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'
+    CALL VRSetIni 'Settings', 'BrowseAuth',    advanced.!browseauth , settings.!ini, 'NoClose'
+    CALL VRSetIni 'Settings', 'BrowseImme',    advanced.!browseimme , settings.!ini, 'NoClose'
+    CALL VRSetIni 'Settings', 'Debug',         advanced.!debug      , settings.!ini, 'NoClose'
+    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'
+    CALL VRSetIni 'Settings', 'SavePassive',   advanced.!savepassive, settings.!ini, 'NoClose'
 
     /* Save position and size */
@@ -3064 +3180 @@
     CALL NLVSetText 'SW_SETTINGS',  'Caption', 47
 
-    CALL NLVSetText 'GB_GLOBAL',    'Caption', 47
-    CALL NLVSetText 'CB_DEBUG',     'Caption', 42
-    CALL NLVSetText 'CB_LOGGING',   'Caption', 46
-    CALL NLVSetText 'CB_BROWSEIMME','Caption', 48
-    CALL NLVSetText 'CB_BROWSEAUTH','Caption', 49
-    CALL NLVSetText 'CB_SPECIAL',   'Caption', 66
-    CALL NLVSetText 'CB_BIGICONS',  'Caption', 70
+    CALL NLVSetText 'GB_GLOBAL',     'Caption', 47
+    CALL NLVSetText 'CB_DEBUG',      'Caption', 42
+    CALL NLVSetText 'CB_LOGGING',    'Caption', 46
+    CALL NLVSetText 'CB_BROWSEIMME', 'Caption', 48
+    CALL NLVSetText 'CB_BROWSEAUTH', 'Caption', 49
+    CALL NLVSetText 'CB_SPECIAL',    'Caption', 66
+    CALL NLVSetText 'CB_SAVEPASSIVE','Caption', 73
 
     CALL NLVSetText 'PB_SETTINGS_OK',     'Caption', 2
@@ -3091 +3207 @@
     IF advanced.!special \= '' THEN
         CALL VRSet 'CB_SPECIAL',    'Set', advanced.!special
-    IF advanced.!bigicons \= '' THEN
-        CALL VRSet 'CB_bigicons',   'Set', advanced.!bigicons
-
+    IF advanced.!savepassive \= '' THEN
+        CALL VRSet 'CB_SAVEPASSIVE',    'Set', advanced.!savepassive
 
     window = VRInfo( "Object" )

branches/guitools-2.0/evfsgui/evfsi_de.mkm

@@ -50 +50 @@
 EVG0044I: Erweiterte Attribute untersttzen
 EVG0045I: Nur-Lesen Verbindung
-EVG0046I: Protokollierung
+EVG0046I: Plugin-Protokollierung aktivieren
 EVG0047I: Globale Einstellungen
 EVG0048I: Netzwerkumgebung sofort aktualisieren
@@ -75 +75 @@
 EVG0068I: EA
 EVG0069I: R/W
-EVG0070I: Groáe Symbole
+EVG0070I: Kleine Symbole
 EVG0071I: Mehrfachverbindung, einzeln trennen nicht m”glich!
 EVG0072I: Die Verbindung von %1 zu %2 trennen?
-EVG0073?:
+EVG0073I: Inaktive Verbindungen merken
 EVG0074?:
 EVG0075?:

branches/guitools-2.0/evfsgui/evfsi_en.mkm

@@ -75 +75 @@
 EVG0068I: EA
 EVG0069I: R/W
-EVG0070I: Large icons
+EVG0070I: Mini icons
 EVG0071I: Multiple connections, cannot remove only one!
 EVG0072I: Really unmount %1 connected to %2?
-EVG0073?:
+EVG0073I: Remember inactive connections
 EVG0074?:
 EVG0075?:
@@ -92 +92 @@
 EVG0084I: ~Help
 EVG0085I: ~Dialog
-EVG0086I: ~LAN-Resource browser
+EVG0086I: ~Network neighbourhood
 EVG0087I: ~Buttons
 EVG0088I: ~Connection details

branches/guitools-2.0/evfsgui/evfsi_fr.mkm

@@ -2 +2 @@
 ; French version
 ; Translator : Guillaume Gay <guillaume.gay@bigfoot.com>
-; Translation : 2009-08-11
+; Translation : 2009-09-15 - 2
 EVG
 ; Common strings used throughout program
@@ -43 +43 @@
 EVG0036I: Montage de %1 sur %2
 EVG0037I: D‚tail
-EVG0038?:
-EVG0039?:
+EVG0038I: R‚~g‚n‚rer
+EVG0039I: Voisinage r‚seau
 ; Advanced properties window UI
 EVG0040I: Options de montage avanc‚es
@@ -50 +50 @@
  allouer par connexion
 EVG0042I: Debug
-EVG0043I: Divers
+EVG0043I: ParamŠtres optionnels
 EVG0044I: Support des attributs ‚tendus
 EVG0045I: Montage en lecture seule
 EVG0046I: Rapport
-EVG0047I: Niveau de d‚tail
-EVG0048I: Fichier journal
-EVG0049?:
+EVG0047I: ParamŠtres globaux
+EVG0048I: R‚g‚n‚ration imm‚diate du voisinage r‚seau
+EVG0049I: Authentification pour l'exploration
 ; Prompts and other messages
 EVG0050I: Sauvegarde du fichier de profil
 EVG0051I: Profil sauvegard‚
-EVG0052I: Le profil des (‚ventuelles) connexions actives actuelles a ‚t‚ sauvegard‚ dans %1.
+EVG0052I: Le profil des connexions a ‚t‚ sauvegard‚ dans %1.
 EVG0053I: Fichier existant
 EVG0054I: Le fichier %1 existe d‚j
@@ -71 +71 @@
 EVG0060I: L'objet EVFS a ‚t‚ cr‚‚ dans le dossier de lancement.
 EVG0061I: Erreur - cr‚ation impossible de l'objet dans le dossier de lancement.
-EVG0062?:
-EVG0063?:
-EVG0064?:
-EVG0065?:
-EVG0066?:
-EVG0067?:
-EVG0068?:
-EVG0069?:
-EVG0070?:
-EVG0071?:
-EVG0072?:
-EVG0073?:
+EVG0062I: Les imprimantes ne sont pas prises en charge pour le moment !
+EVG0063I: Informations sur la connexion
+EVG0064I: Cette connexion existe d‚j
+. Voulez-vous quand mˆme continuer ?
+EVG0065I: Cr‚er mˆme en cas d'‚chec de la connexion
+EVG0066I: Afficher tous les partage (sp‚ciaux)
+EVG0067I: tat
+EVG0068I: A
+EVG0069I: R/W
+EVG0070I: Ic“nes ~miniatures
+EVG0071I: Connexions multiples, impossible de n'en retirer qu'une !
+EVG0072I: Voulez-vous vraiment d‚monter %1 connect‚ sur %2 ?
+EVG0073I: Conserver les connexion inactives
 EVG0074?:
 EVG0075?:
@@ -89 +90 @@
 EVG0078?:
 EVG0079?:
-EVG0080?:
-EVG0081?:
-EVG0082?:
-EVG0083?:
-EVG0084?:
-EVG0085?:
-EVG0086?:
-EVG0087?:
-EVG0088?:
-EVG0089?:
-EVG0090?:
-EVG0091?:
+; Menu entries
+EVG0080I: ~Fichier
+EVG0081I: ~dition
+EVG0082I: ~Affichage
+EVG0083I: ~S‚lection
+EVG0084I: A~ide
+EVG0085I: BoŒtes de ~dialogue
+EVG0086I: ~Voisinage r‚seau
+EVG0087I: ~Boutons
+EVG0088I: I~nformations de connexion
+EVG0089I: Retirer
+EVG0090I: R‚essayer
+EVG0091I: · propos de
 EVG0092?:
 EVG0093?: