Changeset 869

Timestamp:

Nov 14, 2014, 4:24:27 PM (11 years ago)

Author:

Herwig Bauernfeind

Message:

GUITools: EVFSGUI (Ticket #230,#233), SMBMon, shared library updates

Location:

trunk/guitools

Files:

• evfsgui/evfsgui.vrp (modified) (1 diff)
• evfsgui/evfsgui.vrx (modified) (7 diffs)
• evfsgui/evfsgui.vry (modified) ( previous)
• smbmon/smbmon.vrp (modified) (1 diff)
• smbmon/smbmon.vrx (modified) (6 diffs)
• smbmon/smbmon.vry (modified) ( previous)

trunk/guitools/evfsgui/evfsgui.vrp

@@ -11 +11 @@
 VRXWindow: __VREFileListWindow,1,2204,7950,2665,3358
 VRXWindow: __VRESectionListWindow,1,1168,12382,12238,6914
-VRXWindow: __VREToolsWindow,1,3084,12479,5477,1667
+VRXWindow: __VREToolsWindow,1,3084,12479,5468,1669
 VRXWindow: __VREWindListWindow,1,952,11611,4963,3150
 UserFile: 1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -3044 +3044 @@
 Menu_Context_Open_Default_Click: 
     if options.!debug == 1 then say time()' '||"Menu_Context_Open_Click started"
+    if \VRIsValidObject(rh) then return
+
     userdata = VRMethod( "CN_CURRENT", 'GetRecordAttr', rh, 'UserData')
     PARSE VAR userdata mountpoint ';' mounts ';' .
@@ -3058 +3060 @@
 Menu_Context_Open_Detail_Click: 
     if options.!debug == 1 then say time()' '||"Menu_Context_Open_Details_Click started"
+    if \VRIsValidObject(rh) then return
+
     userdata = VRMethod( "CN_CURRENT", 'GetRecordAttr', rh, 'UserData')
     PARSE VAR userdata mountpoint ';' mounts ';' .
@@ -3072 +3076 @@
 Menu_Context_Open_Icon_Click: 
     if options.!debug == 1 then say time()' '||"Menu_Context_Open_Icon_Click started"
+    if \VRIsValidObject(rh) then return
+
     userdata = VRMethod( "CN_CURRENT", 'GetRecordAttr', rh, 'UserData')
     PARSE VAR userdata mountpoint ';' mounts ';' .
@@ -3085 +3091 @@
 */
 Menu_Context_Open_Settings_Click: 
-    if options.!debug == 1 then say time()' '||"Menu_Context_Open_DetailsClick started"
+    if options.!debug == 1 then say time()' '||"Menu_Context_Open_Settings_Click started"
     if \VRIsValidObject(rh) then return
 
@@ -3095 +3101 @@
     ID = VRMethod( "Application", "StartThread", "wps_open", mountpoint, "SETTINGS" )
 
-    if options.!debug == 1 then say time()' '||"Menu_Context_Open_Details_Click done"
+    if options.!debug == 1 then say time()' '||"Menu_Context_Open_Settings_Click done"
 return
 
@@ -3102 +3108 @@
 Menu_Context_Open_Splitview_Click: 
     if options.!debug == 1 then say time()' '||"Menu_Context_Open_Splitview_Click started"
+    if \VRIsValidObject(rh) then return
+
     userdata = VRMethod( "CN_CURRENT", 'GetRecordAttr', rh, 'UserData')
     PARSE VAR userdata mountpoint ';' mounts ';' .
@@ -3116 +3124 @@
 Menu_Context_Open_Tree_Click: 
     if options.!debug == 1 then say time()' '||"Menu_Context_Open_Tree_Click started"
+    if \VRIsValidObject(rh) then return
+
     userdata = VRMethod( "CN_CURRENT", 'GetRecordAttr', rh, 'UserData')
     PARSE VAR userdata mountpoint ';' mounts ';' .

trunk/guitools/smbmon/smbmon.vrp

@@ -8 +8 @@
 VRXWindow: __VREMainWindow,1,2180,3614,1024,6769
 VRXWindow: __VRESectionListWindow,1,4083,11226,7372,6589
-VRXWindow: __VREToolsWindow,1,2156,1494,5471,1663
+VRXWindow: __VREToolsWindow,1,2156,1494,5468,1669
 VRXWindow: __VREWindListWindow,1,964,11708,3132,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_DAEMONS,1
-UserWindow: SW_SETTINGS,1

trunk/guitools/smbmon/smbmon.vrx

@@ -751 +751 @@
 say 'Refreshcrash "'max(length(Rest)-25)'"'
 
-        Name = strip(left(Rest,max(length(Rest)-25),1))
+        Name = strip(left(Rest,max(length(Rest)-25,1)))
         I = I + 1
         sharepath = strip(translate(left(sharepath,1))||translate(substr(SharePath,2),'\','/'),'T','\')
@@ -1277 +1277 @@
 */
 CN_Daemons_ContextMenu: 
-    if VRInfo("Top") < 400 & VRGet("CN_Daemons", "View") = "Detail" then call _ColumnsMenu "CN_Daemons"
+    IF options.!debug == 1 THEN SAY time()' CN_Daemons_ContextMenu() started'
+    if VRInfo("Top") < 400 & VRGet("CN_Daemons", "View") = "Detail" then do
+        say "  Going for column modification..."
+        call _ColumnsMenu "CN_Daemons"
+    end
     else do
-        say "  Record = '"VRInfo("Record")"'"
+        say "  Going for context menu, record = '"VRInfo("Record")"'"
 
         call _RefreshDaemonsDelay
@@ -1332 +1336 @@
         end
         say '  Daemon is "'DaemonName'"'
+        say '  DaemonView = "'DaemonView'"'
+        if VRGet("CN_Daemons","View") = "Detail" then do
+            ok = VRSet("ContextMenu_Daemons_Details", "Enabled", 0)
+            ok = VRSet("ContextMenu_Daemons_Tree", "Enabled", 1)
+        end
+        else do
+            ok = VRSet("ContextMenu_Daemons_Details", "Enabled", 1)
+            ok = VRSet("ContextMenu_Daemons_Tree", "Enabled", 0)
+        end
+        DaemonView = VRGet("CN_Daemons","View")
+
         ok = VRMethod( "ContextMenu_Daemons", "Popup", , , "", "" )
     end
+    IF options.!debug == 1 THEN SAY time()' CN_Daemons_ContextMenu() done'
 return
 
@@ -1491 +1507 @@
 */
 ContextMenu_Daemons_Details_Click: 
+    IF options.!debug == 1 THEN SAY time()' ContextMenu_Daemons_Tree_Click() started'
     ok = VRset("CN_Daemons","View","Detail")
     ok = VRset("ContextMenu_Daemons_Tree","Enabled",1)
     ok = VRset("ContextMenu_Daemons_Details","Enabled",0)
     ok = VRSet("TM_refresh","Enabled", 1)
+    IF options.!debug == 1 THEN SAY time()' ContextMenu_Daemons_Tree_Click() done'
 return
 
@@ -1566 +1584 @@
 */
 ContextMenu_Daemons_Tree_Click: 
+    IF options.!debug == 1 THEN SAY time()' ContextMenu_Daemons_Tree_Click() started'
     ok = VRset("CN_Daemons","View","IconTree")
     ok = VRset("ContextMenu_Daemons_Tree","Enabled",0)
     ok = VRset("ContextMenu_Daemons_Details","Enabled",1)
     ok = VRSet("TM_refresh","Enabled", 1)
+    IF options.!debug == 1 THEN SAY time()' ContextMenu_Daemons_Tree_Click() done'
 return
 
@@ -1732 +1752 @@
 */
 Main_Create:
-    options.!debug    = 1
+    options.!debug    = 0
     if options.!debug == 1 then do
         ok = VRRedirectStdIO("ON")