Changeset 320

Timestamp:

Aug 27, 2009, 11:19:24 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: More work on EVFSGUI V.next (several (GUI-related) changes)

Location:

branches/guitools-2.0/evfsgui

Files:

• changes (modified) (2 diffs)
• evfsgui.VRP (modified) (1 diff)
• evfsgui.VRX (modified) (14 diffs)
• evfsgui.VRY (modified) ( previous)
• sambaclient.ico (modified) ( previous)

branches/guitools-2.0/evfsgui/changes

@@ -11 +11 @@
 - Added: Create rudimentary %ETC%\samba\smb.conf
 - Added: Connection details view (preliminary)
-- Added: Double connection detection using hashes
+- Added: Double connection detection using md5 hashes
 - Added: New profile saving code
 - Added: Remove menu option (preliminary for passive connections only)
 - Added: smbtree.vrs: Optionally do not show hidden shares
 - Added: smbtree.vrs: Enhanced guessicon()
+- Added: Preliminary context menus for Browse View and Connection details view
+- Changed: Several changes in GUI style (as suggested by Alex Taylor)
+- Changed: Left align buttons in current connections panel (as suggested by 
+           MrFawlty and Alex Taylor)
+- Changed: Replaced status bar by a text control (as suggested by Alex Taylor)
+           (only used for version display for now)
+- Changed: Main icon is now the one done by Alex Taylor           
+- Changed: Use PM_Default_Colors for title sections (as suggested by Alex Taylor)
 - Fixed: Loading a profile presented the user a half drawn window
 - Fixed: CltInit uses smbclient.exe instead of smbd.exe to find Samba binaries
@@ -22 +30 @@
 ToDo:
 - CltInit requires resync with SambaInit
+- Create Icon. stem in order to ease maintainance of icons
+- Create mechanism to save passive connections across sessions
+- Functionality of context menus for Browse View and Connection details view
 - Debug on/off option is badly implemented (rework required)
+- smbtree.vrs: Sort options
 - Advanced dialog should be split into connection options and global options
 - smbtree error messages are ignored (requires more code from smbmon)
-- Connecting to IPC$ still possible
+- Connecting to IPC$ still possible (if it is visible)
 - printer share detection is flaky
 - error checking

branches/guitools-2.0/evfsgui/evfsgui.VRP

@@ -4 +4 @@
 MacroPath: VRM: U:\Develop\Samba\guitools-2.0\smbclgui
 EXEPath: 
-RunParameters: y:\HB.evp
+RunParameters: 
 RunDirectory: 
 VRXWindow: __VREMainWindow,1,530,2457,879,4071
 VRXWindow: __VRESectionListWindow,1,337,11708,11623,3686
-VRXWindow: __VREToolsWindow,1,518,530,6984,1663
+VRXWindow: __VREToolsWindow,1,518,530,6993,1669
 VRXWindow: __VREWindListWindow,1,482,7661,2650,3150
 UserFile: 1

branches/guitools-2.0/evfsgui/evfsgui.VRX

@@ -157 +157 @@
     FWidth = 32
 
+    ok = VRSet("DT_STATUSBAR", "Caption", VRGet("Main", "HintText"))
     call Main_Resize
 return
@@ -251 +252 @@
 RETURN
 
+/*:VRX         CN_CONDET_ContextMenu
+*/
+CN_CONDET_ContextMenu: 
+    ok = VRMethod( "Menu_Selected", "Popup", , , "", "" )
+return
+
 /*:VRX         CN_CONDET_DragStart
 */
@@ -521 +528 @@
     window = VRLoadSecondary( "SW_LOGIN", "W" )
     call PB_MOUNT_CLICK
+return
+
+/*:VRX         CN_SMBTREE_ContextMenu
+*/
+CN_SMBTREE_ContextMenu: 
+    ok = VRMethod( "Menu_Selected", "Popup", , , "", "" )
 return
 
@@ -778 +791 @@
         settings.!curbcolor = VRGetIni('Settings', 'TitleBarBackground', settings.!ini, 'NoClose')
         settings.!curfcolor = VRGetIni('Settings', 'TitleBarForeground', settings.!ini, 'NoClose')
-        IF settings.!curbcolor = '' THEN settings.!curbcolor = '<default>'
-        IF settings.!curfcolor = '' THEN settings.!curfcolor = '<default>'
+        IF settings.!curbcolor = '' THEN settings.!curbcolor = VRGetIni('PM_Default_Colors', 'ActiveTitleText', 'User', 'NoClose')
+        IF settings.!curfcolor = '' THEN settings.!curfcolor = VRGetIni('PM_Default_Colors', 'ActiveTitleTextBgnd', 'User', 'NoClose')
 
         settings.!buttonson = VRGetIni('Settings', 'ButtonsOn', settings.!ini, 'NoClose')
@@ -983 +996 @@
     ok = VRset("PB_DETACH",  "Top",    VRGet("GB_CURRENT","Height")- 400-FWidth-12)
     ok = VRset("PB_DETACH",  "Width",  min((VRGet("GB_CURRENT","Width")-FWidth*3)%2, 1313))
-    ok = VRset("PB_UNMOUNT", "Left",   VRGet("GB_CURRENT","Width") -VRGet("PB_DETACH","Width")-FWidth)
+    ok = VRset("PB_UNMOUNT", "Left",   FWidth*2 +1313 - 12)
+/*  ok = VRset("PB_UNMOUNT", "Left",   VRGet("GB_CURRENT","Width") -VRGet("PB_DETACH","Width")-FWidth) */
     ok = VRset("PB_UNMOUNT", "Top",    VRGet("GB_CURRENT","Height")- 400-FWidth-12)
     ok = VRset("PB_UNMOUNT", "Width",  min((VRGet("GB_CURRENT","Width")-FWidth*3)%2, 1313))
@@ -991 +1005 @@
     ok = VRSet("GB_SMBTREE", "Left",    VRGet("SPLIT_Main","Left")+60)
     ok = VRset("GB_SMBTREE", "Height",  VRGet("GB_CURRENT","Height"))
-    ok = VRset("GB_SMBTREE", "Width",   VRGet("Main","Width")-VRGet("SPLIT_Main","Left")-60-FWidth*2-32)
+    ok = VRset("GB_SMBTREE", "Width",   VRGet("Main","Width")-VRGet("SPLIT_Main","Left")-60-FWidth*2-24*2)
 
     ok = VRset("GB_SMBTREE3","Top",     FWidth)
@@ -1020 +1034 @@
     ok = VRset("PICT_THROBBER", "Left",  VRGet("CN_SMBTREE","Width")%2-200)
 
-    /* Conection details stuff */
+    /* Connection details stuff */
     ok = VRSet("GB_CONDET", "Top",     FWidth)
     ok = VRSet("GB_CONDET", "Left",    VRGet("SPLIT_Main","Left")+60)
     ok = VRset("GB_CONDET", "Height",  VRGet("GB_CURRENT","Height"))
-    ok = VRset("GB_CONDET", "Width",   VRGet("Main","Width")-VRGet("SPLIT_Main","Left")-60-FWidth*2-32)
+    ok = VRset("GB_CONDET", "Width",   VRGet("Main","Width")-VRGet("SPLIT_Main","Left")-60-FWidth*2-24*2)
 
     ok = VRset("GB_CONDET3","Top",     FWidth)
@@ -1054 +1068 @@
     ok = VRSet("GB_DIALOG", "Left",   VRGet("SPLIT_Main","Left")+60)
     ok = VRset("GB_DIALOG", "Height", VRGet("GB_CURRENT","Height"))
-    ok = VRset("GB_DIALOG", "Width",  VRGet("Main","Width")-VRGet("SPLIT_Main","Left")-60-FWidth*2-32)
+    ok = VRset("GB_DIALOG", "Width",  VRGet("Main","Width")-VRGet("SPLIT_Main","Left")-60-FWidth*2-24*2)
 
     ok = VRset("GB_DIALOG3","Top",     FWidth)
@@ -1085 +1099 @@
     ok = VRset("SPLIT_Main","Top", FWidth)
     ok = VRset("SPLIT_Main","Height", VRGet("GB_CURRENT","Height"))
+
+    ok = VRSet("GB_STATUSBAR","Left", FWidth-24)
+    ok = VRSet("GB_STATUSBAR","Top", VRGet("Main","Height")-VRGet("GB_STATUSBAR","Height")-FWidth-640+24)
+    ok = VRSet("GB_STATUSBAR","Width", VRGet("Main","Width")-2*FWidth-2*32)
+
+    ok = VRset("DT_STATUSBAR","Top",     8)
+    ok = VRset("DT_STATUSBAR","Left",    8)
+    ok = VRset("DT_STATUSBAR","Width",   VRGet("GB_CURRENT","Width")+VRGet("GB_SMBTREE","Width")+60-24*2)
 
     ok = VRset("Main","Painting", 1)
@@ -1195 +1217 @@
 return
 
+/*:VRX         Menu_Selected_Connect_Click
+*/
+Menu_Selected_Connect_Click: 
+    call PB_CONNECT_Click
+return
+
 /*:VRX         Menu_Selected_Remove_Click
 */
@@ -1211 +1239 @@
 return
 
+/*:VRX         Menu_Selected_Retry_Click
+*/
+Menu_Selected_Retry_Click: 
+    ok = VRMethod( "CN_CONDET", "GetRecordList", "SourceOrSelected", "selrec." ) 
+    if selrec.0 = 0 then return
+
+    do I = 1 to selrec.0
+        if VRMethod("CN_CONDET", "GetFieldData", selrec.I, cd.statusfh) = '#68:PMWP.DLL' then do
+           /*  CALL VRMethod 'CN_CONDET', 'RemoveRecord', selrec.I */
+
+        end
+    end
+return
+
 /*:VRX         Menu_View_Buttons_Click
 */
@@ -1246 +1288 @@
 
     ok = VRSet("Menu_Selected_Remove", "Visible",  1)
+    ok = VRSet("Menu_Selected_Retry", "Visible",  1)
     ok = VRMethod( "CN_CONDET", "GetRecordList", "All", "records." ) 
     ok = VRSet("Menu_Selected_Remove", "Enabled",  (records.0 = 0))
+    ok = VRSet("Menu_Selected_Retry", "Enabled",  (records.0 = 0))
+
+    ok = VRSet("Menu_Selected_Connect", "Visible",  0)
 return
 
@@ -1267 +1313 @@
 
     ok = VRSet("Menu_Selected_Remove", "Visible",  0)
+    ok = VRSet("Menu_Selected_Retry", "Visible",  0)
+
+    ok = VRSet("Menu_Selected_Connect", "Visible",  0)
 return
 
@@ -1286 +1335 @@
 
     ok = VRSet("Menu_Selected_Remove", "Visible",  0)
+    ok = VRSet("Menu_Selected_Retry", "Visible",  0)
+
+    ok = VRSet("Menu_Selected_Connect", "Visible",  1)
 return