Changeset 703 for trunk/guitools/smbmon

Timestamp:

Jun 13, 2012, 12:08:42 PM (13 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: Updates in EVFSGUI/SMBMON/Shared code

Location:

trunk/guitools/smbmon

Files:

• changes (modified) (2 diffs)
• rc/lang/smbmon_de.mkm (modified) (1 diff)
• rc/lang/smbmon_en.mkm (modified) (1 diff)
• rc/lang/smbmon_es.mkm (modified) (1 diff)
• rc/lang/smbmon_fr.mkm (modified) (1 diff)
• rc/lang/smbmon_sv.mkm (modified) (1 diff)
• smbmon.vrp (modified) (1 diff)
• smbmon.vrx (modified) (11 diffs)
• smbmon.vry (modified) ( previous)

trunk/guitools/smbmon/changes

@@ -1 @@
-Version 2.5.alpha 10-2011
+Version 2.5.beta 02-2012
                         +Added:   Delete old logs
-                        +Added:   enhanced refresh code
+                        +Added:   Kill single processes
+                        +Added:   (even more) enhanced refresh code
                         *Changed: Use Alex Taylor's Warp4-style notebook
                                   instead of my emulation
@@ -7 +8 @@
                         *Changed: Use latest smbtree.vrs to have all browsing
                                   enhancements added to EVFSGUI
+                        !Fixed:   Columns menu was upside down
+                        !Fixed:   Do not turn off display AFTER starting/stopping etc...
                         Note: This is based upon 1.9 line of code.
 Version 2.1.alpha 07-2011

trunk/guitools/smbmon/rc/lang/smbmon_de.mkm

@@ -37 +37 @@
 SMM0031I: Darstellung
 SMM0032I: Ping
-SMM0033I: "%1"-Prozess stoppen
+SMM0033I: Prozess "%1" stoppen
 SMM0034I: Den "%1"-Prozess wirklich stoppen?
 SMM0035I: Sortieren
-SMM0036I: "%1"-Prozess starten
+SMM0036I: Prozess "%1" starten
 SMM0037I: Den "%1"-Prozess wirklich starten?
-SMM0038?:
-SMM0039?:
+SMM0038I: Prozess "%1" killen               
+SMM0039I: Den "%1"-Prozess wirklich killen? 
 ; Daemon Status
 SMM0040I: gestartet

trunk/guitools/smbmon/rc/lang/smbmon_en.mkm

@@ -42 +42 @@
 SMM0036I: Start "%1"-daemon 
 SMM0037I: Really start "%1"-daemon?
-SMM0038?:
-SMM0039?:
+SMM0038I: Kill "%1"-process        
+SMM0039I: Really kill "%1"-process? 
 ; Daemon Status
 SMM0040I: is running

trunk/guitools/smbmon/rc/lang/smbmon_es.mkm

@@ -42 +42 @@
 SMM0036I: Iniciar "%1"-daemon
 SMM0037I: Realmente iniciar "%1"-daemon?
-SMM0038?:
-SMM0039?:
+SMM0038I: Matar "%1"-daemon            
+SMM0039I: Realmente matar "%1"-daemon? 
 ; Daemon Status
 SMM0040I: en funcionamiento

trunk/guitools/smbmon/rc/lang/smbmon_fr.mkm

@@ -44 +44 @@
 SMM0036I: Lancer le d‚mon-"%1"
 SMM0037I: Voulez-vous r‚ellement lancer le d‚mon-"%1" ?
-SMM0038?:
-SMM0039?:
+SMM0038I: Tuer le d‚mon-"%1"                          
+SMM0039I: Voulez-vous r‚ellement tuer le d‚mon-"%1" ? 
 ; Daemon Status
 SMM0040I: est en cours d'ex‚cution

trunk/guitools/smbmon/rc/lang/smbmon_sv.mkm

@@ -42 +42 @@
 SMM0036I: Start ned "%1"
 SMM0037I: Skall verkligen "%1" startas?
-SMM0038?:
-SMM0039?:
+SMM0038I: D”da ned "%1"                
+SMM0039I: Skall verkligen "%1" d”das? 
 ; Daemon Status
 SMM0040I: startad

trunk/guitools/smbmon/smbmon.vrp

@@ -6 +6 @@
 RunParameters: 
 RunDirectory: U:\Develop\Samba\trunk\guitools\smbmon
-VRXWindow: __VREMainWindow,1,2180,3614,915,4216
-VRXWindow: __VRESectionListWindow,1,3541,11804,7914,3342
-VRXWindow: __VREToolsWindow,1,2156,1494,6483,1663
+VRXWindow: __VREMainWindow,1,2180,3614,1024,6769
+VRXWindow: __VRESectionListWindow,1,3541,11804,7914,6047
+VRXWindow: __VREToolsWindow,1,2156,1494,6480,1669
 VRXWindow: __VREWindListWindow,1,964,11708,2650,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_DAEMONS,1
+UserWindow: SW_FILES,1

trunk/guitools/smbmon/smbmon.vrx

@@ -112 +112 @@
     ok = VRMethod(Container, "GetFieldList", "Fields." )
 
-    do I = 1 to 12
+    do I = 1 to 14
+        R2I = right("0"||I,2)
         if I <= fields.0 then do
-/*          say "Columns_"||right("0"||I,2)' 'VRMethod(Container, "GetFieldAttr", fields.I, "Title" ) */
-            ok = VRset("Columns_"||right("0"||I,2), "Visible", 1)
-            ok = VRset("Columns_"||right("0"||I,2), "Caption", VRMethod(Container, "GetFieldAttr", fields.I, "Title" ))
-            ok = VRset("Columns_"||right("0"||I,2), "Checked", VRMethod(Container, "GetFieldAttr", fields.I, "Visible" ))
-            ok = VRset("Columns_"||right("0"||I,2), "Userdata", Container'|'fields.I'|'VRMethod(Container, "GetFieldAttr", fields.I, "Visible" ))
-        end
-        else ok = VRset("Columns_"||right("0"||I,2), "Visible", 0)
+/*          say "Columns_"||R2I' 'VRMethod(Container, "GetFieldAttr", fields.I, "Title" ) */
+            ok = VRset("Columns_"||R2I, "Visible", 1)
+            ok = VRset("Columns_"||R2I, "Caption", VRMethod(Container, "GetFieldAttr", fields.I, "Title" ))
+            ok = VRset("Columns_"||R2I, "Checked", VRMethod(Container, "GetFieldAttr", fields.I, "Visible" ))
+            ok = VRset("Columns_"||R2I, "Userdata", Container'|'fields.I'|'VRMethod(Container, "GetFieldAttr", fields.I, "Visible" ))
+        end
+        else ok = VRset("Columns_"||R2I, "Visible", 0)
     end
     ok = VRMethod( "Columns", "Popup", , , "", "" )    
@@ -1229 +1230 @@
         if DRH <> "" then DaemonName = VRMethod("CN_Daemons", "GetRecordAttr", DRH, "Caption")
         select
-            when Words(DaemonName) = 3 then do
+            when Words(DaemonName) = 3 then do /* a child process with PID in name */
                 DaemonName = word(DaemonName,2)
                 ok = VRset("ContextMenu_Daemons_Sep1","Visible", 1 )
+                ok = VRSet("ContextMenu_Daemons_KillPID", "Caption", NLVGetMessage( 38, DaemonName))
+                ok = VRset("ContextMenu_Daemons_KillPID",  "Visible", 1 )
+                ok = VRset("ContextMenu_Daemons_Start", "Visible", 0 )
+                ok = VRset("ContextMenu_Daemons_Ping",  "Visible", 1 )
+                ok = VRset("ContextMenu_Daemons_Sep1",  "Visible", 1 )
             end
-            when Words(DaemonName) = 1 then do
+            when Words(DaemonName) = 1 then do /* on smbd.exe or nmbd.exe root processes */
                 parse var DaemonName DaemonName'.exe'
                 if strip(VRMethod("CN_Daemons", "GetFieldData", DRH, DPidsFH)) <> "" then do
@@ -1244 +1250 @@
                     ok = VRSet("ContextMenu_Daemons_Start", "Caption", NLVGetMessage( 36, DaemonName))
                     ok = VRset("ContextMenu_Daemons_Start", "Visible", 1 )
+                    ok = VRset("ContextMenu_Daemons_KillPID","Visible", 0 )
                     ok = VRset("ContextMenu_Daemons_Ping",  "Visible", 0 )
                     ok = VRset("ContextMenu_Daemons_Sep1",  "Visible", 1 )
@@ -1395 +1402 @@
 return
 
+/*:VRX         Columns_13_Click
+*/
+Columns_13_Click: 
+    call _ColumnShow
+return
+
+/*:VRX         Columns_14_Click
+*/
+Columns_14_Click: 
+    call _ColumnShow
+return
+
 /*:VRX         ContextMenu_Daemons_Details_Click
 */
@@ -1402 +1421 @@
     ok = VRset("ContextMenu_Daemons_Details","Enabled",0)
     ok = VRSet("TM_refresh","Enabled", 1)
+return
+
+/*:VRX         ContextMenu_Daemons_KillPID_Click
+*/
+ContextMenu_Daemons_KillPID_Click: 
+    Msg.Text = NLVGetMessage(39, DaemonName)
+    Msg.Type = 'Q'
+    if _MsgYesNo() = 1 then do
+        say 'kill -9 'DaemonName
+        address cmd 'kill -9 'DaemonName
+    end
+    ok = VRSet("TM_refresh","Enabled", 1)
+    call PB_PAUSEDISPLAY_Click
 return
 
@@ -1435 +1467 @@
     end
     ok = VRSet("TM_refresh","Enabled", 1)
+    call PB_PAUSEDISPLAY_Click
 return
 
@@ -1453 +1486 @@
     end
     ok = VRSet("TM_refresh","Enabled", 1)
+    call PB_PAUSEDISPLAY_Click
 return
 
@@ -1943 +1977 @@
     end
     ok = VRSet("TM_Refresh","Delay", 2000)
+    if \VRGet("TM_RefreshDaemons","Enabled") then call PB_PAUSEDISPLAY_Click
     call VRSet VRWindow(), 'Pointer', '<default>' 
 return
@@ -1958 +1993 @@
     end
     ok = VRSet("TM_Refresh","Delay", 1000)
+    if \VRGet("TM_RefreshDaemons","Enabled") then call PB_PAUSEDISPLAY_Click
     call VRSet VRWindow(), 'Pointer', '<default>' 
 return
@@ -1991 +2027 @@
     end
     ok = VRSet("TM_Refresh","Delay", 1000)
+    if \VRGet("TM_RefreshDaemons","Enabled") then call PB_PAUSEDISPLAY_Click
     call VRSet VRWindow(), 'Pointer', '<default>' 
     say "IPB_Start_Click done"
@@ -2007 +2044 @@
     end
     ok = VRSet("TM_Refresh","Delay", 1000)
+    if \VRGet("TM_RefreshDaemons","Enabled") then call PB_PAUSEDISPLAY_Click
     call VRSet VRWindow(), 'Pointer', '<default>' 
     say "IPB_Stop_Click done"