Changeset 785

Timestamp:

Aug 8, 2013, 10:27:45 AM (12 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: Rearrange SMBMon pages

Location:

trunk/guitools

Files:

• shared/smbtree.vrs (modified) (1 diff)
• smbmon/smbmon.vrp (modified) (1 diff)
• smbmon/smbmon.vrx (modified) (4 diffs)
• smbmon/smbmon.vry (modified) ( previous)

trunk/guitools/shared/smbtree.vrs

@@ -628 +628 @@
     interpret dyn
     ok = stream(msgfile,'c','close')
-    /* if delMsgFile <> "NODEL" then ok = SysFileDelete(msgfile) */
+    if delMsgFile <> "NODEL" then ok = SysFileDelete(msgfile)
     
     drop msgfile msgstem

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,4968,1665
+VRXWindow: __VREToolsWindow,1,2156,1494,5471,1659
 VRXWindow: __VREWindListWindow,1,964,11708,3132,3150
 UserFile: 1

trunk/guitools/smbmon/smbmon.vrx

@@ -1125 +1125 @@
 _TabbedDialogSetup: 
     IF options.!debug == 1 THEN SAY time()' _TabbedDialogSetup started'
+    w = VRLoad( "TDL_1", VRWindowPath(), "SW_DAEMONS" )
+    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(18)" ") 
+
+    w = VRLoad( "TDL_1", VRWindowPath(), "SW_SMBTREE" )
+    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(19)" ") 
+
     w = VRLoad( "TDL_1", VRWindowPath(), "SW_USERS" )
     ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(15)" ") 
@@ -1133 +1139 @@
     w = VRLoad( "TDL_1", VRWindowPath(), "SW_SERVICE" )
     ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(17)" ") 
-
-    w = VRLoad( "TDL_1", VRWindowPath(), "SW_DAEMONS" )
-    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(18)" ") 
-
-    w = VRLoad( "TDL_1", VRWindowPath(), "SW_SMBTREE" )
-    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(19)" ") 
 
     w = VRLoad( "TDL_1", VRWindowPath(), "SW_SETTINGS" )
@@ -1992 +1992 @@
     say "  CurrentPageNr = "CurrentPageNr
 
-    if CurrentPageNr = 5 then do
+    if CurrentPageNr = 2 then do
         ok = VRset("Pict_Throbber", "Visible", 1)
         ok = VRset("TM_Throbber", "Enabled", 1)
@@ -2428 +2428 @@
     ok = VRSet("DT_STATUSBAR","Caption", VRGet("Main", "HintText"))
     /* call _TabsStrip */
-   select 
-        when page = 1 then do /* Users */
-            nop
-        end
-        when page = 2 then do /* files */
-            nop
-        end
-        when page = 3 then do /* service */
-            nop
-        end
-        when page = 4 then do /* daemons */
+    select 
+        when page = 1 then do /* daemons */
             ok = VRSet("TM_RefreshDaemons","Enabled", 1)
             ok = VRSet("TM_RefreshDaemons","Delay",   3000)
         end
-        when page = 5 then do /* smbtree */
+        when page = 2 then do /* smbtree */
             ok = VRMethod( "CN_SMBTree", "GetRecordList", "All", "handle." ) 
             /* if the page is empty, populate it */
             if handle.0 = 0 then call PB_Refresh_Click
+        end
+        when page = 3 then do /* Users */
+            nop
+        end
+        when page = 4 then do /* files */
+            nop
+        end
+        when page = 5 then do /* service */
+            nop
         end
         when page = 6 then do /* Settings */