Changeset 1036 for trunk


Ignore:
Timestamp:
Aug 18, 2017, 11:05:26 AM (8 years ago)
Author:
Herwig Bauernfeind
Message:

SMBMon 2.6: More work on ACLS browser, added tooltips, fixed several bugs, changed icons

Location:
trunk/guitools/smbmon
Files:
24 added
12 edited

Legend:

Unmodified
Added
Removed

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

    r990 r1036  
    1313SMM0009I: Keines
    1414; Main window UI
    15 SMM0010I: ~Speichern
     15SMM0010I: ~Sichern
    1616SMM0011I: ~Erneuern
    1717SMM0012I: ~Beenden
    … …  
    2626SMM0021I: Die Leute hinter Samba Server fr OS/2
    2727SMM0022I: TDB Dateien prfen
    28 SMM0023?:
     28SMM0023I: Passwort
    2929SMM0024I: Einstellungen
    3030SMM0025I: Erneuern alle
    … …  
    6767SMM0059I: Die Netzwerkumgebung dieses Servers anzeigen.
    6868SMM0060I: Die Einstellungen fr dieses Programm verwalten.
    69 SMM0061?:
    70 SMM0062?:
    71 SMM0063?:
    72 SMM0064?:
    73 SMM0065?:
    74 SMM0066?:
    75 SMM0067?:
    76 SMM0068?:
    77 SMM0069?:
     69SMM0061I: Den Server starten
     70SMM0062I: Den Server stoppen
     71SMM0063I: Den Server neu starten
     72SMM0064I: Die Konfigurationsdatei smb.conf neu laden
     73SMM0065I: Serverlaufzeit
     74SMM0066I: šbersicht ber laufende Serverprozesse
     75SMM0067I: šbersicht ber angemeldete Benutzer
     76SMM0068I: šbersicht ber ge”ffnete Dateien
     77SMM0069I: šbersicht ber benutzte Freigaben
    7878;Service Context Menu
    7979SMM0070I: Freigabe schlieáen
    … …  
    8484SMM0075I: Freigabe "%1" wirklich schlieáen?
    8585SMM0076I: Freigabe "%1" geschlossen.
    86 SMM0077?:
    87 SMM0078?:
    88 SMM0079?:
     86SMM0077I: Datei- und Drucker-Serverdienst
     87SMM0078I: NETBIOS-Namen-Serverdienst
     88SMM0079I: Name Service Switch Dienst
    8989; Users context menu
    9090SMM0080I: Mitteilung senden
    … …  
    140140SMM0129?:
    141141; User container columns
    142 SMM0130I: PID
     142SMM0130I: Prozess ID
    143143SMM0131I: Benutzer
    144144SMM0132I: Gruppe

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

    r990 r1036  
    2626SMM0021I: Samba Server for OS/2 is brought to you by
    2727SMM0022I: Check TDB files
    28 SMM0023I:
     28SMM0023I: Password
    2929SMM0024I: Settings
    3030SMM0025I: Refresh every
    … …  
    6767SMM0059I: Show LAN ressources (has to be refreshed manually as it takes some time to complete.)
    6868SMM0060I: Configurable settings for this program.
    69 SMM0061?:
    70 SMM0062?:
    71 SMM0063?:
    72 SMM0064?:
    73 SMM0065?:
    74 SMM0066?:
    75 SMM0067?:
    76 SMM0068?:
    77 SMM0069?:
     69SMM0061I: Start the server
     70SMM0062I: Stop the server
     71SMM0063I: Restart the server
     72SMM0064I: Reload the configurations file smb.conf
     73SMM0065I: Server uptime
     74SMM0066I: Overview of running server processes
     75SMM0067I: Overview of connected users
     76SMM0068I: Overview of opened files
     77SMM0069I: Overview of used shares
    7878;Service Context menu
    7979SMM0070I: Close share
    … …  
    8484SMM0075I: Really close share "%1"?
    8585SMM0076I: Closed share "%1".
    86 SMM0077?:
    87 SMM0078?:
    88 SMM0079?:
     86SMM0077I: File and printer server
     87SMM0078I: NETBIOS name sserver
     88SMM0079I: Name Service Switch daemon
    8989; User Context menu
    9090SMM0080I: Send message

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

    r990 r1036  
    2626SMM0021I: Servidor Samba para OS/2 proporcionado por
    2727SMM0022I: Comprobar los archivos TDB
    28 SMM0023I:
     28SMM0023I: Contrase€a
    2929SMM0024I: Preferencias
    3030SMM0025I: Actualizar cada
    … …  
    6767SMM0059I: Mostrar los recursos de la LAN (debe de ser actualizado manualmente y requiere algo de tiempo para completarse.)
    6868SMM0060I: Preferencias configurables en este programa.
    69 SMM0061?:
    70 SMM0062?:
    71 SMM0063?:
    72 SMM0064?:
    73 SMM0065?:
    74 SMM0066?:
    75 SMM0067?:
    76 SMM0068?:
    77 SMM0069?:
     69SMM0061I: Iniciar el servidor
     70SMM0062I: Detener el servidor
     71SMM0063I: Reiniciar el servidor
     72SMM0064I: Cargar smb.conf de nuevo
     73SMM0065I: Tiempo de actividad del servidor
     74SMM0066I: Visi¢n general de los procesos del servidor en ejecuci¢n
     75SMM0067I: Visi¢n general de los usuarios registrados
     76SMM0068I: Descripci¢n general de los archivos abiertos
     77SMM0069I: Visi¢n general de los lanzamientos usados
    7878;Service Context menu
    7979SMM0070I: Cerrar recurso compartido
    … …  
    8484SMM0075I: šCerrar realmente el recurso compartido "%1"?
    8585SMM0076I: Recurso compartido "%1" cerrado.
    86 SMM0077?:
    87 SMM0078?:
    88 SMM0079?:
     86SMM0077I: File and printer server
     87SMM0078I: NETBIOS name sserver
     88SMM0079I: Name Service Switch daemon
    8989; User Context menu
    9090SMM0080I: Enviar mensaje

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

    r990 r1036  
    2828SMM0021I: Serveur Samba pour OS/2 vous est propos‚ par
    2929SMM0022I: V‚rifier fichiers TDB
    30 SMM0023I:
     30SMM0023I: Mot de passe
    3131SMM0024I: ParamŠtres
    3232SMM0025I: Actualiser toutes les
    … …  
    6969SMM0059I: Affichage des ressources LAN (doit ˆtre actualis‚ manuellement ‚tant donn‚ le temps de traitement !)
    7070SMM0060I: ParamŠtres configurables de ce programme.
    71 SMM0061?:
    72 SMM0062?:
    73 SMM0063?:
    74 SMM0064?:
    75 SMM0065?:
    76 SMM0066?:
    77 SMM0067?:
    78 SMM0068?:
    79 SMM0069?:
     71SMM0061I: D‚marrez le serveur
     72SMM0062I: Arrˆtez le serveur
     73SMM0063I: Red‚marrez le serveur
     74SMM0064I: Recharger le fichier de configuration smb.conf
     75SMM0065I: Temps de disponibilit‚ du serveur
     76SMM0066I: Vue d'ensemble des processus du serveur en cours
     77SMM0067I: Vue d'ensemble des utilisateurs connect‚s
     78SMM0068I: Vue d'ensemble des fichiers ouverts
     79SMM0069I: Aper‡u des versions utilis‚es
    8080;Service Context menu
    8181SMM0070I: Fermeture de partage
    … …  
    8686SMM0075I: Voulez-vous r‚ellement fermer le partage "%1" ?
    8787SMM0076I: Partage "%1" ferm‚.
    88 SMM0077?:
    89 SMM0078?:
    90 SMM0079?:
     88SMM0077I: File and printer server
     89SMM0078I: NETBIOS name sserver
     90SMM0079I: Name Service Switch daemon
    9191; User Context menu
    9292SMM0080I: Message envoy‚

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

    r990 r1036  
    2626SMM0021I: Samba Server f”r OS/2 kommer fran
    2727SMM0022I: Kontrollera TDB filer
    28 SMM0023?:
     28SMM0023I: L”senord
    2929SMM0024I: Inst„llningar
    3030SMM0025I: Uppdatera var
    … …  
    6767SMM0059I: Visa n„tverksresurser (uppdatera manuellt, kan ta tid att genomf”ra!).
    6868SMM0060I: Hantera inst„llningar f”r detta program.
    69 SMM0061?:
    70 SMM0062?:
    71 SMM0063?:
    72 SMM0064?:
    73 SMM0065?:
    74 SMM0066?:
    75 SMM0067?:
    76 SMM0068?:
    77 SMM0069?:
     69SMM0061I: Starta servern
     70SMM0062I: Stoppa servern
     71SMM0063I: Starta om servern
     72SMM0064I: Ladda om konfigurationer fil smb.conf
     73SMM0065I: Server upptid
     74SMM0066I: ™versikt ”ver k”ra serverprocesser
     75SMM0067I: ™versikt ”ver inloggade anv„ndare
     76SMM0068I: ™versikt ”ver ”ppna filer
     77SMM0069I: ™versikt ”ver anv„nda utg†vor
    7878;Service Context Menu
    7979SMM0070I: St„ng av utdelning
    … …  
    8484SMM0075I: Vill du verkligen st„nga av utdelningen "%1"?
    8585SMM0076I: Utdelningen "%1" avst„ngd.
    86 SMM0077?:
    87 SMM0078?:
    88 SMM0079?:
     86SMM0077I: File and printer server
     87SMM0078I: NETBIOS name sserver
     88SMM0079I: Name Service Switch daemon
    8989; Users context menu
    9090SMM0080I: Skicka meddelande

  • trunk/guitools/smbmon/smbmon.rc

    r1028 r1036  
    3030icon 93 .\rc\icons\inf.ico
    3131icon 94 .\rc\icons\txt.ico
    32 BITMAP 111 ..\shared\rc\throbber\frame_01.bmp
    33 BITMAP 112 ..\shared\rc\throbber\frame_02.bmp
    34 BITMAP 113 ..\shared\rc\throbber\frame_03.bmp
    35 BITMAP 114 ..\shared\rc\throbber\frame_04.bmp
    36 BITMAP 115 ..\shared\rc\throbber\frame_05.bmp
    37 BITMAP 116 ..\shared\rc\throbber\frame_06.bmp
    38 BITMAP 117 ..\shared\rc\throbber\frame_07.bmp
    39 BITMAP 118 ..\shared\rc\throbber\frame_08.bmp
    40 BITMAP 119 ..\shared\rc\throbber\frame_09.bmp
    41 BITMAP 120 ..\shared\rc\throbber\frame_10.bmp
    42 BITMAP 121 ..\shared\rc\throbber\frame_11.bmp
    43 BITMAP 122 ..\shared\rc\throbber\frame_12.bmp
     32icon 95 .\rc\icons\font.ico
     33icon 96 .\rc\icons\ini.ico
     34BITMAP 111 .\rc\icons\frame_01.bmp
     35BITMAP 112 .\rc\icons\frame_02.bmp
     36BITMAP 113 .\rc\icons\frame_03.bmp
     37BITMAP 114 .\rc\icons\frame_04.bmp
     38BITMAP 115 .\rc\icons\frame_05.bmp
     39BITMAP 116 .\rc\icons\frame_06.bmp
     40BITMAP 117 .\rc\icons\frame_07.bmp
     41BITMAP 118 .\rc\icons\frame_08.bmp
     42BITMAP 119 .\rc\icons\frame_09.bmp
     43BITMAP 120 .\rc\icons\frame_10.bmp
     44BITMAP 121 .\rc\icons\frame_11.bmp
     45BITMAP 122 .\rc\icons\frame_12.bmp
     46bitmap 150 .\rc\icons\exit.bmp
     47bitmap 151 .\rc\icons\refresh.bmp
     48bitmap 152 .\rc\icons\save_all.bmp
     49bitmap 153 .\rc\icons\info.bmp
     50bitmap 154 .\rc\icons\start.bmp
     51bitmap 155 .\rc\icons\stop.bmp
     52bitmap 156 .\rc\icons\restart.bmp
     53bitmap 157 .\rc\icons\reload.bmp
     54bitmap 158 .\rc\icons\button_accept.bmp
     55bitmap 159 .\rc\icons\button_cancel.bmp
     56

  • trunk/guitools/smbmon/smbmon.vrp

    r1028 r1036  
    88VRXWindow: __VREMainWindow,1,2168,3614,1024,6769
    99VRXWindow: __VRESectionListWindow,1,3963,14213,10130,5059
    10 VRXWindow: __VREToolsWindow,1,2879,1975,6989,1659
     10VRXWindow: __VREToolsWindow,1,1747,1108,6483,1663
    1111VRXWindow: __VREWindListWindow,1,952,11708,5372,3150
    1212UserFile: 1
    1313UserWindow: Main,1
    14 UserWindow: SW_SETTINGS,1
     14UserWindow: SW_USERS,1
     15UserWindow: SW_SERVICE,1
    1516UserWindow: SW_LOGIN,1

  • trunk/guitools/smbmon/smbmon.vrx

    r1028 r1036  
    116116*/
    117117return
     118
    118119/*:VRX         _ChkTDB
    119120*/
    … …  
    283284    DPidsFH    = VRMethod( "CN_Daemons", "AddField", "String", NLVGetMessage(130) )
    284285
    285     smbdHandle = VRMethod("CN_Daemons", "Addrecord",, ,"smbd.exe","$41")
    286     nmbdHandle = VRMethod("CN_Daemons", "Addrecord", ,,"nmbd.exe","$41")
    287     winbHandle = VRMethod("CN_Daemons", "Addrecord",, ,"winbindd.exe","$41")
    288 
    289     ok = VRMethod("CN_Daemons", "SetFieldData", smbdHandle, DaemonFH, "smbd.exe")
    290     ok = VRMethod("CN_Daemons", "SetFieldData", nmbdHandle, DaemonFH, "nmbd.exe")
    291     ok = VRMethod("CN_Daemons", "SetFieldData", winbHandle, DaemonFH, "winbindd.exe")
     286    smbdHandle = VRMethod("CN_Daemons", "Addrecord",, ,NLVGetMessage(77),"$41") /* smbd.exe */
     287    nmbdHandle = VRMethod("CN_Daemons", "Addrecord", ,,NLVGetMessage(78),"$41") /* nmbd.exe */
     288    winbHandle = VRMethod("CN_Daemons", "Addrecord",, ,NLVGetMessage(79),"$41") /* winbindd.exe */
     289
     290    ok = VRMethod("CN_Daemons", "SetFieldData", smbdHandle, DaemonFH, NLVGetMessage(77)) /* smbd.exe */
     291    ok = VRMethod("CN_Daemons", "SetFieldData", nmbdHandle, DaemonFH, NLVGetMessage(78)) /* nmbd.exe */
     292    ok = VRMethod("CN_Daemons", "SetFieldData", winbHandle, DaemonFH, NLVGetMessage(79)) /* winbindd.exe */
    292293    ok = (stream(samba.!bin'\winbindd.exe','c','query exists') <> "")
    293294    ok = VRMethod("CN_Daemons", "SetRecordAttr", winbHandle, "Visible", ok)
    … …  
    338339*/
    339340_ContextMenuSelectedSet:
    340     ok = VRSet("ContextMenu_Tree_Tree",        "Visible", 0)
    341     ok = VRSet("ContextMenu_Tree_Details",     "Visible", 0)
    342     ok = VRSet("ContextMenu_Tree_Icons",       "Visible", 0)
    343     ok = VRSet("ContextMenu_Tree_Sort",        "Visible", 0)
    344     ok = VRSet("ContextMenu_Tree_MiniIcons",   "Visible", 0)
    345341    ok = VRSet("ContextMenu_Tree_Login",       "Visible", 0)
    346342    ok = VRSet("ContextMenu_Tree_ACLS",        "Visible", 0)
    347343    ok = VRSet("ContextMenu_Tree_SendMsg",     "Visible", 0)
    348 say SMBObj.udatatype
     344    ok = VRSet("ContextMenu_Tree_Logoff",      "Visible", 0)
     345    ok = VRSet("ContextMenu_Tree_Sep1",        "Visible", 0)
     346    ok = VRSet("ContextMenu_Tree_MiniIcons",   "Visible", 0)
     347    ok = VRSet("ContextMenu_Tree_Tree",        "Visible", 1)
     348    ok = VRSet("ContextMenu_Tree_Details",     "Visible", 1)
     349    ok = VRSet("ContextMenu_Tree_Icons",       "Visible", 1)
     350    ok = VRSet("ContextMenu_Tree_Sort",        "Visible", 0) /* FIXME: Crashes */
     351    say '  SMBObj.udatatype = "'SMBObj.udatatype'"'
    349352    select
    350353        when SMBObj.udatatype = "WORKGROUP" then do
    … …  
    354357            ok = VRSet("ContextMenu_Tree_Login",       "Visible", 1)
    355358            ok = VRSet("ContextMenu_Tree_SendMsg",     "Visible", 1)
     359            ok = VRSet("ContextMenu_Tree_Logoff",      "Visible", 1)
     360            ok = VRSet("ContextMenu_Tree_Sep1",        "Visible", 1)
     361            ok = VRSet("ContextMenu_Tree_MiniIcons",   "Visible", 1)
    356362        end
    357363        when SMBObj.udatatype = "DISK" then do
     364            ok = VRSet("ContextMenu_Tree_ACLS",        "Visible", 1)
     365            ok = VRSet("ContextMenu_Tree_Sep1",        "Visible", 1)
    358366            ok = VRSet("ContextMenu_Tree_MiniIcons",   "Visible", 1)
    359367        end
    … …  
    362370        end
    363371        when SMBObj.udatatype = "DIRECTORY" then do
    364             ok = VRSet("ContextMenu_Tree_ACLS",             "Visible", 1)
     372            ok = VRSet("ContextMenu_Tree_ACLS",        "Visible", 1)
     373            ok = VRSet("ContextMenu_Tree_Sep1",        "Visible", 1)
    365374        end
    366375        when SMBObj.udatatype = "FILE" then do
    367             ok = VRSet("ContextMenu_Tree_ACLS",             "Visible", 1)
     376            ok = VRSet("ContextMenu_Tree_ACLS",        "Visible", 1)
     377            ok = VRSet("ContextMenu_Tree_Sep1",        "Visible", 1)
    368378        end
    369379        otherwise do /* No other value known - default */
    … …  
    517527    ok = VRSet("TM_Refresh","Delay", Intervall * 1000)
    518528   
    519     ok = VRSet("PB_START",  "Enabled", VRFileExists(samba.!smbcmd))
    520     ok = VRSet("PB_Restart","Enabled", VRFileExists(samba.!smbcmd))
    521     ok = VRSet("PB_Reload", "Enabled", VRFileExists(samba.!smbcmd))
     529    ok = VRSet("ICB_START",  "Enabled", VRFileExists(samba.!smbcmd))
     530    ok = VRSet("ICB_REstart","Enabled", VRFileExists(samba.!smbcmd))
     531    ok = VRSet("ICB_REload", "Enabled", VRFileExists(samba.!smbcmd))
    522532
    523533    ok = VRSet("CN_Daemons",      "View", DaemonView)
    … …  
    625635
    626636    DaemonView = VRGetIni( "Settings", "DaemonView", OurINI,'NoClose')
    627     if DaemonView = "" then DaemonView = "Detail"
     637    if DaemonView = "" then DaemonView = "IconTree"
    628638
    629639    TreeView = VRGetIni( "Settings", "TreeView", OurINI,'NoClose')
    … …  
    653663
    654664    advanced.!bigicons = VRGetIni( "Settings", "BigIcons", OurINI)
    655     if advanced.!bigicons = "" then advanced.!bigicons = 0
     665    if advanced.!bigicons = "" then advanced.!bigicons = 1
    656666
    657667    advanced.!smbconfchanged = 0
    … …  
    775785    ok = VRSet("Main","helpFile", settings.!helpfile)
    776786
    777 
    778 
    779     CALL NLVSetText 'PB_Refresh',  'Caption', 11
    780     CALL NLVSetText 'PB_Apply',    'Caption', 10
    781     CALL NLVSetText 'PB_Cancel',   'Caption', 12
    782     CALL NLVSetText 'PB_Help',     'Caption', 13
    783     CALL NLVSetText 'PB_About',    'Caption', 14
    784 
    785     CALL NLVSetText 'PB_Refresh',  'Hinttext', 51
    786     CALL NLVSetText 'PB_Cancel',   'Hinttext', 54
    787     CALL NLVSetText 'PB_Help',     'Hinttext', 52
    788     CALL NLVSetText 'PB_About',    'Hinttext', 53
    789 
    790 /*  CALL NLVSetText 'TAB_1',       'Userdata', 15
    791     CALL NLVSetText 'TAB_2',       'Userdata', 16
    792     CALL NLVSetText 'TAB_3',       'Userdata', 17
    793     CALL NLVSetText 'TAB_4',       'Userdata', 18
    794     CALL NLVSetText 'TAB_5',       'Userdata', 19
    795     CALL NLVSetText 'TAB_6',       'Userdata', 24
    796 
    797     CALL NLVSetText 'TAB_1',       'Hinttext', 55
    798     CALL NLVSetText 'TAB_2',       'Hinttext', 56
    799     CALL NLVSetText 'TAB_3',       'Hinttext', 57
    800     CALL NLVSetText 'TAB_4',       'Hinttext', 58
    801     CALL NLVSetText 'TAB_5',       'Hinttext', 59
    802     CALL NLVSetText 'TAB_6',       'Hinttext', 60 */
    803 
    804 /*  CALL NLVSetText 'Page_1',      'Hinttext', 55
    805     CALL NLVSetText 'Page_2',      'Hinttext', 56
    806     CALL NLVSetText 'Page_3',      'Hinttext', 57
    807     CALL NLVSetText 'Page_4',      'Hinttext', 58
    808     CALL NLVSetText 'Page_5',      'Hinttext', 59
    809     CALL NLVSetText 'Page_6',      'Hinttext', 60  */
    810 
    811 
     787    /* Setup the tabbed dialogue */
     788    w = VRLoad( "TDL_1", VRWindowPath(), "SW_DAEMONS" )
     789    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(18)" ")
     790    w = VRLoad( "TDL_1", VRWindowPath(), "SW_SMBTREE" )
     791    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(19)" ")
     792    w = VRLoad( "TDL_1", VRWindowPath(), "SW_USERS" )
     793    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(15)" ")
     794    w = VRLoad( "TDL_1", VRWindowPath(), "SW_FILES" )
     795    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(16)" ")
     796    w = VRLoad( "TDL_1", VRWindowPath(), "SW_SERVICE" )
     797    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(17)" ")
     798    w = VRLoad( "TDL_1", VRWindowPath(), "SW_CHKTDB" )
     799    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(22)" ")
     800    w = VRLoad( "TDL_1", VRWindowPath(), "SW_SETTINGS" )
     801    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(24)" ")
     802
     803    CALL NLVSetText 'ICB_Refresh',  'Caption', 11
     804    CALL NLVSetText 'ICB_Apply',    'Caption', 10
     805    CALL NLVSetText 'ICB_About',    'Caption', 14
     806    CALL NLVSetText 'ICB_EXIT',     'Caption', 12
     807
     808    CALL NLVSetText 'ICB_Refresh',  'Hinttext', 51
     809/*  CALL NLVSetText 'ICB_APPLY',    'Hinttext', FIXME */
     810    CALL NLVSetText 'ICB_ABOUT',    'Hinttext', 53
     811    CALL NLVSetText 'ICB_EXIT',     'Hinttext', 54
     812
     813    CALL VRMethod 'TT_Main', 'Register', 'ICB_REFRESH', NLVGetMessage(51)
     814    CALL VRMethod 'TT_Main', 'Register', 'ICB_APPLY',   NLVGetMessage(52) /* FIXME */
     815    CALL VRMethod 'TT_Main', 'Register', 'ICB_ABOUT',   NLVGetMessage(53)
     816    CALL VRMethod 'TT_Main', 'Register', 'ICB_EXIT',    NLVGetMessage(54)
    812817return
    813818
    … …  
    10571062                end
    10581063            end
    1059             smbdpidhandle.I = VRMethod( "CN_Daemons", "AddRecord", smbdhandle, , 'PID 'word(smbdpids,I)' ('d2x(word(smbdpids,I))'x)', "$48")
     1064            smbdpidhandle.I = VRMethod( "CN_Daemons", "AddRecord", smbdhandle, , NLVGetMessage(130)' 'word(smbdpids,I)' ('d2x(word(smbdpids,I))'x)', "$48")
    10601065            /* we ping all smbd.exe except the first one */
    10611066            if DetectZombies = 1 & I > 1 then do
    … …  
    10981103        nmbdpidhandle.0 = words(nmbdpids)
    10991104        do I = 1 to words(nmbdpids)
    1100             nmbdpidhandle.I = VRMethod( "CN_Daemons", "AddRecord", nmbdhandle, , 'PID 'word(nmbdpids,I)' ('d2x(word(nmbdpids,I))'x)', "$48")
     1105            nmbdpidhandle.I = VRMethod( "CN_Daemons", "AddRecord", nmbdhandle, , NLVGetMessage(130)' 'word(nmbdpids,I)' ('d2x(word(nmbdpids,I))'x)', "$48")
    11011106        end
    11021107    end
    … …  
    11111116        winbpidhandle.0 = words(winbpids)
    11121117        do I = 1 to words(winbpids)
    1113             winbpidhandle.I = VRMethod( "CN_Daemons", "AddRecord", winbhandle, , 'PID 'word(winbpids,I)' ('d2x(word(winbpids,I))'x)', "$48")
     1118            winbpidhandle.I = VRMethod( "CN_Daemons", "AddRecord", winbhandle, , NLVGetMessage(130)' 'word(winbpids,I)' ('d2x(word(winbpids,I))'x)', "$48")
    11141119        end
    11151120    end
    … …  
    11201125
    11211126    if \(smbdrunning|nmbdrunning|winbrunning) then do
    1122         ok = VRSet("PB_START",  "Enabled", 1)
    1123         ok = VRSet("PB_STOP",   "Enabled", 0)
    1124         ok = VRSet("PB_ReStart","Enabled", 0)
    1125         ok = VRSet("PB_ReLoad", "Enabled", 0)
     1127        ok = VRSet("ICB_START",  "Enabled", 1)
     1128        ok = VRSet("ICB_STOP",   "Enabled", 0)
     1129        ok = VRSet("ICB_REStart","Enabled", 0)
     1130        ok = VRSet("ICB_RELoad", "Enabled", 0)
    11261131    end
    11271132    else do
    1128         ok = VRSet("PB_START",  "Enabled", 0)
    1129         ok = VRSet("PB_STOP",   "Enabled", 1)
    1130         ok = VRSet("PB_ReStart","Enabled", 1)
    1131         ok = VRSet("PB_ReLoad", "Enabled", 1)
     1133        ok = VRSet("ICB_START",  "Enabled", 0)
     1134        ok = VRSet("ICB_STOP",   "Enabled", 1)
     1135        ok = VRSet("ICB_REStart","Enabled", 1)
     1136        ok = VRSet("ICB_RELoad", "Enabled", 1)
    11321137    end
    11331138
    … …  
    13131318    if uS <> 0 | UpTimeStr = ' 'NlvGetMessage(43)':' then UpTimeStr = UpTimeStr' 'uS' 'NlvGetMessage(49)
    13141319
    1315     loggingfreespace = word(sysdriveinfo(left(samba.!log,2)),2)%1024%1024
    1316 
    1317     ok = VRset("CN_Daemons", "Caption", UpTimeStr' 'loggingfreespace' MB')
     1320    loggingfreespace = word(sysdriveinfo(left(samba.!logdir,2)),2)%1024%1024
     1321    ok = VRSet("DT_FREESPACE", "Caption", loggingfreespace' MB')
     1322    ok = VRset("CN_Daemons", "Caption", UpTimeStr)
    13181323
    13191324    select
    1320         when loggingfreespace <  50 then ok = VRDeleteFile(samba.!log'\log.*')
     1325        when loggingfreespace <  50 then ok = VRDeleteFile(samba.!logdir'\log.*')
    13211326        when loggingfreespace < 100 then ok = VRset("CN_Daemons","BackColor","Red")
    13221327        when loggingfreespace < 200 then ok = VRset("CN_Daemons","BackColor","Yellow")
    … …  
    13661371    address cmd samba.!testparmexe' -v -s -d='log_level' 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
    13671372    if options.!debug == 1 then say time()' _SmbConfCreateShadowCopy done'
    1368 return
    1369 
    1370 /*:VRX         _TabbedDialogSetup
    1371 */
    1372 _TabbedDialogSetup:
    1373     IF options.!debug == 1 THEN SAY time()' _TabbedDialogSetup started'
    1374     w = VRLoad( "TDL_1", VRWindowPath(), "SW_DAEMONS" )
    1375     ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(18)" ")
    1376 
    1377     w = VRLoad( "TDL_1", VRWindowPath(), "SW_SMBTREE" )
    1378     ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(19)" ")
    1379 
    1380     w = VRLoad( "TDL_1", VRWindowPath(), "SW_USERS" )
    1381     ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(15)" ")
    1382 
    1383     w = VRLoad( "TDL_1", VRWindowPath(), "SW_FILES" )
    1384     ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(16)" ")
    1385 
    1386     w = VRLoad( "TDL_1", VRWindowPath(), "SW_SERVICE" )
    1387     ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(17)" ")
    1388 
    1389     w = VRLoad( "TDL_1", VRWindowPath(), "SW_CHKTDB" )
    1390     ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(22)" ")
    1391 
    1392     w = VRLoad( "TDL_1", VRWindowPath(), "SW_SETTINGS" )
    1393     ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(24)" ")
    1394 
    1395 
    1396     IF options.!debug == 1 THEN SAY time()' _TabbedDialogSetup done'
    13971373return
    13981374
    … …  
    16421618            call _GetSmbObjectProperties RH
    16431619            call _ContextMenuSelectedSet
    1644 
    1645             BrowsePath = _browsebuildpath(SMBObj.rh)
     1620            if SMBobj.udatatype <> "WORKGROUP" then do
     1621                BrowsePath = _browsebuildpath(SMBObj.rh)
     1622                parse var browsepath '\\'machine'\'sharename '\' browsepath
     1623            end
    16461624
    16471625            /* call _BrowseResetObject(SmbObj.rh) */
    1648 
    1649             parse var browsepath '\\'machine'\'sharename '\' browsepath
    16501626
    16511627            CurMachine = SMBObj.Resname
    … …  
    16531629        end
    16541630        else do
     1631            say "nix '"RH"'"
     1632            drop SMBObj. /* it is invalid */
    16551633            call _ContextMenuSelectedSet
    16561634        end
    … …  
    16951673            say "  Not connected - trying to connect"
    16961674            ok = VRMethod( "CN_SMBTREE", "SetRecordAttr", sharerh, "Selected", 1)
    1697             call PB_SMBTREE_CONNECT_Click
    1698             ok = VRMethod( "CN_SMBTREE", "SetRecordAttr", SMBObj.rh, "Selected", 1)
    1699 
    1700             OpenOk = _browseobjectopen(machine,sharename,browsepath)
    1701 
     1675            OpenOk = 0
     1676            if VRIsValidObject("PB_SMBTREE_CONNECT") then do
     1677                call PB_SMBTREE_CONNECT_Click
     1678                ok = VRMethod( "CN_SMBTREE", "SetRecordAttr", SMBObj.rh, "Selected", 1)
     1679                OpenOk = _browseobjectopen(machine,sharename,browsepath)
     1680            end
    17021681            if \OpenOk then do
    1703                 say "  Not connected - cannot open - aborting!"
     1682                Msg.Text = "Not connected - cannot open - aborting!"
     1683                Msg.Type = "E"
     1684                call _ShowMsg
    17041685            end
    17051686        end
    … …  
    19741955return
    19751956
     1957/*:VRX         ContextMenu_Tree_LOGOFF_Click
     1958*/
     1959ContextMenu_Tree_LOGOFF_Click:
     1960    UserCred = '-N'
     1961return
     1962
    19761963/*:VRX         ContextMenu_Tree_MiniIcons_Click
    19771964*/
    … …  
    20562043return
    20572044
     2045/*:VRX         ICB_ABOUT_Click
     2046*/
     2047ICB_ABOUT_Click:
     2048    window = VRLoadSecondary( "About", "W" )
     2049return
     2050
     2051/*:VRX         ICB_APPLY_Click
     2052*/
     2053ICB_APPLY_Click:
     2054    IF options.!debug == 1 then say time()' PB_Apply_Click() started'
     2055    options.!Debug = VRGet("CB_Debug","set")
     2056    if options.!Debug then ok = VRREdirectStdIO("ON")
     2057                      else ok = VRREdirectStdIO("OFF")
     2058    Intervall = VRGet("SPIN_Intervall","Value")
     2059    ok = VRSet("TM_Refresh","Delay", Intervall * 1000)
     2060    IntervallMin = VRGet("SPIN_IntervallMin","Value")
     2061
     2062    NoMsgBox = VRGet("CB_NoMsgBox","set")
     2063    say 'NoMsgBox = "'NoMsgBox'"'
     2064
     2065    WPSStartStop = VRGet("CB_WPSStartStop","set")
     2066    say 'WPSStartStop = "'WPSStartStop'"'
     2067
     2068    DetectZombies = VRGet("CB_DetectZombies","set")
     2069    say 'DetectZombies = "'DetectZombies'"'
     2070
     2071    options.!storecreds = VRGet("CB_STORECREDS","Set")
     2072    say "options.!storecreds = "options.!storecreds
     2073
     2074    if advanced.!smbconfchanged = 1 then do
     2075        log_level    = VRGet("SPIN_log_level","Value")
     2076        log_file     = VRGet("EF_log_file","Value")
     2077        max_protocol = VRGet("SPIN_max_protocol","Value")
     2078
     2079        handle = IniOpen('global', samba.!smbconf)
     2080
     2081        ok = IniSet('log level',    log_level,    handle)
     2082        ok = IniSet('log file',     log_file,     handle)
     2083        ok = IniSet('max protocol', max_protocol, handle)
     2084
     2085        ok = IniSave(handle)
     2086        ok = IniClose(handle)
     2087        advanced.!smbconfchanged = 0
     2088    end
     2089    IF options.!debug == 1 then say time()' PB_Apply_Click() done'
     2090return
     2091
     2092/*:VRX         ICB_EXIT_Click
     2093*/
     2094ICB_EXIT_Click:
     2095    say 'start ICB_EXIT_Click'
     2096    Call Quit
     2097    say 'done ICB_EXIT_Click'
     2098return
     2099
     2100/*:VRX         ICB_LOGIN_CANCEL_Click
     2101*/
     2102ICB_LOGIN_CANCEL_Click:
     2103/*  ok = VRSet("EF_USER","Value",VRGet("EF_USER1","Value"))
     2104    ok = VRSet("EF_PASSWORD","Value",VRGet("EF_PASSWORD1","Value")) */
     2105    options.!storecreds = VRGet("CB_STORECREDS1","Set")
     2106    credentials.!entered = 1
     2107    p_server = SMBObj.resname
     2108    if p_server <> "" then do
     2109        ok = _rpcqueryuser(p_server, VRGet("EF_USER1","Value"), VRGet("EF_PASSWORD1","Value"), VRGet("EF_USER1","Value"))
     2110
     2111        if word(ok,1) = "1" then do
     2112            call _StatusBarWrapper NLVGetMessage(107, rpc.queryuser.FULL_NAME)
     2113            say 'rpc.queryuser.DIR_DRIVE    = "'rpc.queryuser.DIR_DRIVE'"'
     2114            say 'rpc.queryuser.LOGON_SCRIPT = "'rpc.queryuser.LOGON_SCRIPT'"'
     2115            call _UserCredUpdate
     2116        end
     2117        else do
     2118            call _StatusBarWrapper VRGet("EF_USER1","Value")" \\"p_server": "rpc.queryuser.LOGONSTATUS
     2119        end
     2120    end
     2121
     2122    call SW_LOGIN_Close
     2123return
     2124
     2125/*:VRX         ICB_LOGIN_OK_Click
     2126*/
     2127ICB_LOGIN_OK_Click:
     2128/*  ok = VRSet("EF_USER","Value",VRGet("EF_USER1","Value"))
     2129    ok = VRSet("EF_PASSWORD","Value",VRGet("EF_PASSWORD1","Value")) */
     2130    options.!storecreds = VRGet("CB_STORECREDS1","Set")
     2131    credentials.!entered = 1
     2132    p_server = SMBObj.resname
     2133    if p_server <> "" then do
     2134        ok = _rpcqueryuser(p_server, VRGet("EF_USER1","Value"), VRGet("EF_PASSWORD1","Value"), VRGet("EF_USER1","Value"))
     2135
     2136        if word(ok,1) = "1" then do
     2137            call _StatusBarWrapper NLVGetMessage(107, rpc.queryuser.FULL_NAME)
     2138            say 'rpc.queryuser.DIR_DRIVE    = "'rpc.queryuser.DIR_DRIVE'"'
     2139            say 'rpc.queryuser.LOGON_SCRIPT = "'rpc.queryuser.LOGON_SCRIPT'"'
     2140            call _UserCredUpdate
     2141        end
     2142        else do
     2143            call _StatusBarWrapper VRGet("EF_USER1","Value")" \\"p_server": "rpc.queryuser.LOGONSTATUS
     2144        end
     2145    end
     2146
     2147    call SW_LOGIN_Close
     2148return
     2149
     2150/*:VRX         ICB_REFRESH_Click
     2151*/
     2152ICB_REFRESH_Click:
     2153    IF options.!debug == 1 then say time()' ICB_REFRESH_Click() started'
     2154    ok = SysSleep(0.3)
     2155
     2156    say "  CurrentPageNr = "CurrentPageNr
     2157    select
     2158        when CurrentPageNr = 2 then do
     2159            ok = VRset("Pict_Throbber", "Visible", 1)
     2160            ok = VRset("TM_Throbber", "Enabled", 1)
     2161            call _RefreshTree
     2162        end
     2163        when CurrentPageNr = 6 then do
     2164            call _ChkTDB
     2165        end
     2166        otherwise call _Refresh
     2167    end
     2168    IF options.!debug == 1 then say time()' ICB_REFRESH_Click() done'
     2169return
     2170
     2171/*:VRX         ICB_RELOAD_Click
     2172*/
     2173ICB_RELOAD_Click:
     2174    call VRSet VRWindow(), 'Pointer', 'Wait'
     2175    if WPSStartStop then do
     2176        ok = SysOpenObject('<smb_reload>', 'DEFAULT', 1)
     2177    end
     2178    else do
     2179        call lineout samba.!bin"\smbstart", "reload"
     2180        ok = stream(samba.!bin"\reload","c","close")
     2181    end
     2182    ok = VRSet("TM_Refresh","Delay", 2000)
     2183    call VRSet VRWindow(), 'Pointer', '<default>'
     2184return
     2185
     2186/*:VRX         ICB_RESTART_Click
     2187*/
     2188ICB_RESTART_Click:
     2189    call VRSet VRWindow(), 'Pointer', 'Wait'
     2190    if WPSStartStop then do
     2191        ok = SysOpenObject('<smb_restart>', 'DEFAULT', 1)
     2192    end
     2193    else do
     2194        call lineout samba.!bin"\restart", "restart"
     2195        ok = stream(samba.!bin"\restart","c","close")
     2196    end
     2197    ok = VRSet("TM_Refresh","Delay", 2000)
     2198    call VRSet VRWindow(), 'Pointer', '<default>'
     2199return
     2200
     2201/*:VRX         ICB_START_Click
     2202*/
     2203ICB_START_Click:
     2204    say "IPB_Start_Click started"
     2205    call VRSet VRWindow(), 'Pointer', 'Wait'
     2206    if WPSStartStop then do
     2207        ok = SysOpenObject('<smb_start>', 'DEFAULT', 1)
     2208    end
     2209    else do
     2210        call lineout samba.!bin"\smbstart", "smbstart"
     2211        ok = stream(samba.!bin"\smbstart","c","close")
     2212    end
     2213    ok = VRSet("TM_Refresh","Delay", 2000)
     2214    call VRSet VRWindow(), 'Pointer', '<default>'
     2215    say "IPB_Start_Click done"
     2216return
     2217
     2218/*:VRX         ICB_STOP_Click
     2219*/
     2220ICB_STOP_Click:
     2221    say "IPB_Stop_Click started"
     2222    call VRSet VRWindow(), 'Pointer', 'Wait'
     2223    if WPSStartStop then do
     2224        ok = SysOpenObject('<smb_stop>', 'DEFAULT', 1)
     2225    end
     2226    else do
     2227        call lineout samba.!bin"\smbstop", "smbstop"
     2228        ok = stream(samba.!bin"\smbstop","c","close")
     2229    end
     2230    ok = VRSet("TM_Refresh","Delay", 2000)
     2231    call VRSet VRWindow(), 'Pointer', '<default>'
     2232    say "IPB_Stop_Click done"
     2233return
     2234
    20582235/*:VRX         Init
    20592236*/
    … …  
    21012278    call _NLVSetup
    21022279
    2103     call _TabbeddialogSetup
    2104 
    21052280    call _SambaInit
    21062281    if \WPSStartStop then call _CreateSmbStarter
    … …  
    21092284    call _GUIInit
    21102285   
    2111 /*    str = 'call TAB_'CurrentPageNr'_Click';
    2112 say str
    2113 interpret str
    2114 say 'Done 'str
    2115     if CurrentPageNr <> 5 then do
    2116         ok = VRSet("TM_Throbber", "Enabled", 1)
    2117         call _RefreshTree
    2118     end */
    2119     ok = VRMethod("PB_Refresh","SetFocus")
     2286    ok = VRMethod("ICB_Refresh","SetFocus")
    21202287
    21212288    if options.!debug == 1 then say time()' Main_Create done'
    … …  
    21422309    marginx4     = margin * 4
    21432310
    2144     pbtn_dist    = 980
    2145     pbtn_nr      = 5
     2311    pbtn_width   = 1200
     2312    pbtn_dist    = 80 + pbtn_width
     2313    pbtn_nr      = 4
    21462314    pbtn_pos     = max((main_iwidth - pbtn_Dist * pbtn_Nr)%2, 0)+ margin
    2147     pbtn_height  = 400                                          /* Height of the panels' internal button areas */
    2148     pbtn_width   = 940
     2315    pbtn_height  = 460                                          /* Height of the panels' internal button areas */
     2316
    21492317
    21502318    pane_height  = main_iheight- sbar_height - pbtn_height - margin * 7                   /* Height of notebook  */
    … …  
    21682336    ok = VRSet("DT_STATUSBAR", "Width", pane_width - 24)
    21692337
    2170     ok = VRSet("PB_Refresh","top", pane_height + marginx4 )
    2171     ok = VRSet("PB_Help",   "top", pane_height + marginx4 )
    2172     ok = VRSet("PB_Cancel", "top", pane_height + marginx4 )
    2173     ok = VRSet("PB_Apply",  "top", pane_height + marginx4 )
    2174     ok = VRSet("PB_About",  "top", pane_height + marginx4 )
    2175 
    2176     ok = VRSet("PB_Refresh","left",pbtn_pos + pbtn_dist * (pbtn_nr - 5))
    2177     ok = VRSet("PB_Apply",  "left",pbtn_pos + pbtn_dist * (pbtn_nr - 4))
    2178     ok = VRSet("PB_Help",   "left",pbtn_pos + pbtn_dist * (pbtn_nr - 3))
    2179     ok = VRSet("PB_About",  "left",pbtn_pos + pbtn_dist * (pbtn_nr - 2))
    2180     ok = VRSet("PB_Cancel", "left",pbtn_pos + pbtn_dist * (pbtn_nr - 1))
     2338    ok = VRSet("ICB_REFRESH","top", pane_height + marginx4 )
     2339    ok = VRSet("ICB_EXIT",   "top", pane_height + marginx4 )
     2340    ok = VRSet("ICB_Apply",  "top", pane_height + marginx4 )
     2341    ok = VRSet("ICB_About",  "top", pane_height + marginx4 )
     2342
     2343    ok = VRSet("ICB_REFRESH","Width", pbtn_width )
     2344    ok = VRSet("ICB_EXIT",   "Width", pbtn_width )
     2345    ok = VRSet("ICB_Apply",  "Width", pbtn_width )
     2346    ok = VRSet("ICB_About",  "Width", pbtn_width )
     2347
     2348    ok = VRSet("ICB_REFRESH","Height", pbtn_Height )
     2349    ok = VRSet("ICB_EXIT",   "Height", pbtn_Height )
     2350    ok = VRSet("ICB_Apply",  "Height", pbtn_Height )
     2351    ok = VRSet("ICB_About",  "Height", pbtn_Height )
     2352
     2353
     2354    ok = VRSet("ICB_REFRESH","left",pbtn_pos + pbtn_dist * (pbtn_nr - 4))
     2355    ok = VRSet("ICB_Apply",  "left",pbtn_pos + pbtn_dist * (pbtn_nr - 3))
     2356    ok = VRSet("ICB_About",  "left",pbtn_pos + pbtn_dist * (pbtn_nr - 2))
     2357    ok = VRSet("ICB_EXIT",   "left",pbtn_pos + pbtn_dist * (pbtn_nr - 1))
    21812358
    21822359    ok = VRset("GB_CHKTDB","Top",    margin  )
    … …  
    22252402    ok = VRset("CN_DAEMONS","Height", pane_height- 1020 - marginx2 )
    22262403
    2227     ok = VRSet("PB_START",  "Top",    pbtn_height*2 - marginx2)
    2228     ok = VRSet("PB_STOP",   "Top",    pbtn_height*3 - marginx2)
    2229     ok = VRSet("PB_Restart","Top",    pbtn_height*4 - marginx2)
    2230     ok = VRSet("PB_Reload", "Top",    pbtn_height*5 - marginx2)
    2231     ok = VRSet("PB_DelLogs","Top",    pbtn_height*6 - marginx2)
    2232 
    2233     ok = VRSet("PB_START",  "Left",   pane_width -  760 - marginx2 - pbtn_width)
    2234     ok = VRSet("PB_STOP",   "Left",   pane_width -  760 - marginx2 - pbtn_width)
    2235     ok = VRSet("PB_Restart","Left",   pane_width -  760 - marginx2 - pbtn_width)
    2236     ok = VRSet("PB_Reload", "Left",   pane_width -  760 - marginx2 - pbtn_width)
    2237     ok = VRSet("PB_DelLogs","Left",   pane_width -  760 - marginx2 - pbtn_width)
     2404    ok = VRSet("ICB_START",  "Top",    pbtn_height*2 - marginx2)
     2405    ok = VRSet("ICB_STOP",   "Top",    pbtn_height*3 - marginx2)
     2406    ok = VRSet("ICB_Restart","Top",    pbtn_height*4 - marginx2)
     2407    ok = VRSet("ICB_REload", "Top",    pbtn_height*5 - marginx2)
     2408
     2409    ok = VRSet("ICB_START",  "Left",   pane_width -  760 - marginx2 - pbtn_width)
     2410    ok = VRSet("ICB_STOP",   "Left",   pane_width -  760 - marginx2 - pbtn_width)
     2411    ok = VRSet("ICB_Restart","Left",   pane_width -  760 - marginx2 - pbtn_width)
     2412    ok = VRSet("ICB_REload", "Left",   pane_width -  760 - marginx2 - pbtn_width)
     2413
     2414    ok = VRSet("ICB_START",  "Width",    pbtn_width)
     2415    ok = VRSet("ICB_STOP",   "Width",    pbtn_width)
     2416    ok = VRSet("ICB_Restart","Width",    pbtn_width)
     2417    ok = VRSet("ICB_Reload",  "Width",    pbtn_width)
     2418
     2419    ok = VRSet("ICB_START",  "Height",    pbtn_Height)
     2420    ok = VRSet("ICB_STOP",   "Height",    pbtn_Height)
     2421    ok = VRSet("ICB_Restart","Height",    pbtn_Height)
     2422    ok = VRSet("ICB_Reload", "Height",    pbtn_Height)
     2423
    22382424
    22392425    ok = VRset("GB_SMBTREE","Top",    margin  )
    … …  
    23362522return
    23372523
    2338 /*:VRX         PB_About_Click
    2339 */
    2340 PB_About_Click:
    2341     window = VRLoadSecondary( "About", "W" )
    2342 return
    2343 
    23442524/*:VRX         PB_AboutOK1_Click
    23452525*/
    … …  
    23602540return
    23612541
    2362 /*:VRX         PB_Apply_Click
    2363 */
    2364 PB_Apply_Click:
    2365     IF options.!debug == 1 then say time()' PB_Apply_Click() started'
    2366     options.!Debug = VRGet("CB_Debug","set")
    2367     if options.!Debug then ok = VRREdirectStdIO("ON")
    2368                       else ok = VRREdirectStdIO("OFF")
    2369     Intervall = VRGet("SPIN_Intervall","Value")
    2370     ok = VRSet("TM_Refresh","Delay", Intervall * 1000)
    2371     IntervallMin = VRGet("SPIN_IntervallMin","Value")
    2372 
    2373     NoMsgBox = VRGet("CB_NoMsgBox","set")
    2374     say 'NoMsgBox = "'NoMsgBox'"'
    2375 
    2376     WPSStartStop = VRGet("CB_WPSStartStop","set")
    2377     say 'WPSStartStop = "'WPSStartStop'"'
    2378 
    2379     DetectZombies = VRGet("CB_DetectZombies","set")
    2380     say 'DetectZombies = "'DetectZombies'"'
    2381 
    2382     options.!storecreds = VRGet("CB_STORECREDS","Set")
    2383     say "options.!storecreds = "options.!storecreds
    2384 
    2385     if advanced.!smbconfchanged = 1 then do
    2386         log_level    = VRGet("SPIN_log_level","Value")
    2387         log_file     = VRGet("EF_log_file","Value")
    2388         max_protocol = VRGet("SPIN_max_protocol","Value")
    2389 
    2390         handle = IniOpen('global', samba.!smbconf)
    2391 
    2392         ok = IniSet('log level',    log_level,    handle)
    2393         ok = IniSet('log file',     log_file,     handle)
    2394         ok = IniSet('max protocol', max_protocol, handle)
    2395 
    2396         ok = IniSave(handle)
    2397         ok = IniClose(handle)
    2398         advanced.!smbconfchanged = 0
    2399     end
    2400     IF options.!debug == 1 then say time()' PB_Apply_Click() done'
    2401 return
    2402 
    2403 /*:VRX         PB_Cancel_Click
    2404 */
    2405 PB_Cancel_Click:
    2406     say 'start PB_Cancel_Click'
    2407     Call Quit
    2408     say 'done PB_Cancel_Click'
    2409 return
    2410 
    24112542/*:VRX         PB_DELLOGS_Click
    24122543*/
    24132544PB_DELLOGS_Click:
    24142545    call VRSet VRWindow(), 'Pointer', 'Wait'
    2415 
    2416     /* Fixme - this needs to be read from smb.conf */
    2417     samba.!logdir = ETC'\samba\log'
     2546say VRGet("EF_LOG_FILE","Value")
     2547say translate(VRGet("EF_LOG_FILE","Value"),'\','/')
     2548    samba.!logdir = VRParseFileName(translate(VRGet("EF_LOG_FILE","Value"),'\','/'),"DP")
     2549say samba.!logdir
     2550
     2551    loggingfreespace = word(sysdriveinfo(left(samba.!logdir,2)),2)%1024%1024
     2552    ok = VRSet("DT_FREESPACE", "Caption", loggingfreespace' MB')
     2553
    24182554
    24192555    ok = SysFileTree(samba.!logdir'\log.*', logs.,'FO')
    … …  
    24252561            if pos(CurPID,logs.I) > 0 then KeepLog = 1
    24262562        end
    2427         if KeepLog = 0 then ok = SysFileDelete(logs.I)
    2428     end
     2563        if KeepLog = 0 then do
     2564            say "Delete "logs.I
     2565            ok = SysFileDelete(logs.I)
     2566        end
     2567    end
     2568
     2569    loggingfreespace = word(sysdriveinfo(left(samba.!logdir,2)),2)%1024%1024
     2570    ok = VRSet("DT_FREESPACE", "Caption", loggingfreespace' MB')   
    24292571
    24302572    call VRSet VRWindow(), 'Pointer', '<default>'
    … …  
    24352577PB_Help_Click:
    24362578    ok = VRMethod("Main", "InvokeHelp" )
    2437 return
    2438 
    2439 /*:VRX         PB_LOGIN_CANCEL_Click
    2440 */
    2441 PB_LOGIN_CANCEL_Click:
    2442     credentials.!entered = 0
    2443     call SW_LOGIN_Close
    2444 return
    2445 
    2446 /*:VRX         PB_LOGIN_OK_Click
    2447 */
    2448 PB_LOGIN_OK_Click:
    2449 /*  ok = VRSet("EF_USER","Value",VRGet("EF_USER1","Value"))
    2450     ok = VRSet("EF_PASSWORD","Value",VRGet("EF_PASSWORD1","Value")) */
    2451     options.!storecreds = VRGet("CB_STORECREDS1","Set")
    2452     credentials.!entered = 1
    2453     p_server = SMBObj.resname
    2454     if p_server <> "" then do
    2455         ok = _rpcqueryuser(p_server, VRGet("EF_USER1","Value"), VRGet("EF_PASSWORD1","Value"), VRGet("EF_USER1","Value"))
    2456 
    2457         if word(ok,1) = "1" then do
    2458             call _StatusBarWrapper NLVGetMessage(107, rpc.queryuser.FULL_NAME)
    2459             say 'rpc.queryuser.DIR_DRIVE    = "'rpc.queryuser.DIR_DRIVE'"'
    2460             say 'rpc.queryuser.LOGON_SCRIPT = "'rpc.queryuser.LOGON_SCRIPT'"'
    2461             call _UserCredUpdate
    2462         end
    2463         else do
    2464             call _StatusBarWrapper VRGet("EF_USER1","Value")" \\"p_server": "rpc.queryuser.LOGONSTATUS
    2465         end
    2466     end
    2467 
    2468     call SW_LOGIN_Close
    2469 return
    2470 
    2471 /*:VRX         PB_Refresh_Click
    2472 */
    2473 PB_Refresh_Click:
    2474     IF options.!debug == 1 then say time()' PB_Refresh_Click() started'
    2475     ok = SysSleep(0.3)
    2476 
    2477     say "  CurrentPageNr = "CurrentPageNr
    2478     select
    2479         when CurrentPageNr = 2 then do
    2480             ok = VRset("Pict_Throbber", "Visible", 1)
    2481             ok = VRset("TM_Throbber", "Enabled", 1)
    2482             call _RefreshTree
    2483         end
    2484         when CurrentPageNr = 6 then do
    2485             call _ChkTDB
    2486         end
    2487         otherwise call _Refresh
    2488     end
    2489     IF options.!debug == 1 then say time()' PB_Refresh_Click() done'
    2490 return
    2491 
    2492 /*:VRX         PB_RELOAD_Click
    2493 */
    2494 PB_RELOAD_Click:
    2495     call VRSet VRWindow(), 'Pointer', 'Wait'
    2496     if WPSStartStop then do
    2497         ok = SysOpenObject('<smb_reload>', 'DEFAULT', 1)
    2498     end
    2499     else do
    2500         call lineout samba.!bin"\smbstart", "reload"
    2501         ok = stream(samba.!bin"\reload","c","close")
    2502     end
    2503     ok = VRSet("TM_Refresh","Delay", 2000)
    2504     call VRSet VRWindow(), 'Pointer', '<default>'
    2505 return
    2506 
    2507 /*:VRX         PB_RESTART_Click
    2508 */
    2509 PB_RESTART_Click:
    2510     call VRSet VRWindow(), 'Pointer', 'Wait'
    2511     if WPSStartStop then do
    2512         ok = SysOpenObject('<smb_restart>', 'DEFAULT', 1)
    2513     end
    2514     else do
    2515         call lineout samba.!bin"\restart", "restart"
    2516         ok = stream(samba.!bin"\restart","c","close")
    2517     end
    2518     ok = VRSet("TM_Refresh","Delay", 1000)
    2519     call VRSet VRWindow(), 'Pointer', '<default>'
    25202579return
    25212580
    … …  
    25372596return
    25382597
    2539 /*:VRX         PB_START_Click
    2540 */
    2541 PB_START_Click:
    2542     say "IPB_Start_Click started"
    2543     call VRSet VRWindow(), 'Pointer', 'Wait'
    2544     if WPSStartStop then do
    2545         ok = SysOpenObject('<smb_start>', 'DEFAULT', 1)
    2546     end
    2547     else do
    2548         call lineout samba.!bin"\smbstart", "smbstart"
    2549         ok = stream(samba.!bin"\smbstart","c","close")
    2550     end
    2551     ok = VRSet("TM_Refresh","Delay", 1000)
    2552     call VRSet VRWindow(), 'Pointer', '<default>'
    2553     say "IPB_Start_Click done"
    2554 return
    2555 /*:VRX         PB_STOP_Click
    2556 */
    2557 PB_STOP_Click:
    2558     say "IPB_Stop_Click started"
    2559     call VRSet VRWindow(), 'Pointer', 'Wait'
    2560     if WPSStartStop then do
    2561         ok = SysOpenObject('<smb_stop>', 'DEFAULT', 1)
    2562     end
    2563     else do
    2564         call lineout samba.!bin"\smbstop", "smbstop"
    2565         ok = stream(samba.!bin"\smbstop","c","close")
    2566     end
    2567     ok = VRSet("TM_Refresh","Delay", 1000)
    2568     call VRSet VRWindow(), 'Pointer', '<default>'
    2569     say "IPB_Stop_Click done"
    2570 return
    25712598/*:VRX         PushbackAll
    25722599*/
    … …  
    26272654return
    26282655
     2656/*:VRX         RB_ACLS_NUMERIC_Click
     2657*/
     2658RB_ACLS_NUMERIC_Click:
     2659    aclsnumeric = '--numeric'
     2660    ok = VRSet("DT_REV_CONT","Caption","")
     2661    ok = VRMethod("CN_ACLS","RemoveRecord","ALL")
     2662    ok = VRMethod("CN_ACLS","SetFieldAttr", ACL.userFH, "Visible", 0 )
     2663    call _ACLSBrowse
     2664return
     2665
     2666/*:VRX         RB_ACLS_TEXT_Click
     2667*/
     2668RB_ACLS_TEXT_Click:
     2669    aclsnumeric = ''
     2670    ok = VRSet("DT_REV_CONT","Caption","")
     2671    ok = VRMethod("CN_ACLS","RemoveRecord","ALL")
     2672    ok = VRMethod("CN_ACLS","SetFieldAttr", ACL.userFH, "Visible", 1 )
     2673    call _ACLSBrowse
     2674return
     2675
    26292676/*:VRX         RB_Sort_Ascending_Click
    26302677*/
    … …  
    26802727SW_ACLS_Create:
    26812728    call SW_ACLS_Init
    2682 
    2683     ok = VRSet("SW_ACLS","Caption",'ACLS \\'machine'\'sharename' "'browsepath'"')
    2684 
    2685     ACL.typeFH  = VRMethod( "CN_ACLS", "AddField", "String", "Type" )
    2686     ACL.valueFH = VRMethod( "CN_ACLS", "AddField", "String", "Value" )
    2687 
    2688     /* Make sure credentials are usable */
    2689     if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'
    2690 
    2691     /* We have to remove the double % for smbclient.exe - not entirely clear why */
    2692     OldUserCred = ""
    2693     if pos('%%',UserCred) > 0 & pos("4OS2", value("COMSPEC",,"OS2ENVIRONMENT")) = 0  then do
    2694         OldUserCred = UserCred
    2695         parse var UserCred '--user='username'%%'password
    2696         UserCred = '--user='username'%'password
    2697         say "  Strip double %%!!!"
    2698     end
    2699 
    2700     say '  'samba.!smbcaclsexe' \\'machine'\'sharename' "'browsepath'" 'UserCred
    2701     address cmd samba.!smbcaclsexe' \\'machine'\'sharename' "'browsepath'" 'UserCred' 'debuglevel' 2>'samba.!error' 1>'samba.!msg
    2702 
    2703     ok = file2stem(samba.!error,"aclserror.","DEL")
    2704 
    2705     if aclserror.0 = 0 then do
    2706         call _StatusBarWrapper "NT_STATUS_OK"
    2707 
    2708         ok = file2stem(samba.!msg,"aclsmsg.","DEL")     
    2709         do I = 1 to aclsmsg.0
    2710             parse var aclsmsg.I aclstype':'aclsvalue
    2711             DummyRH = VRMethod('CN_ACLS', 'AddRecord')
    2712             ok = VRMethod("CN_ACLS", "SetFieldData", DummyRH, ACL.typeFH, aclstype, ACL.valueFH, aclsvalue)
    2713         end
    2714     end
    2715     else do
    2716         call _StatusBarWrapper aclserror.1
    2717         call SW_ACLS_close
    2718     end
     2729    ACL.typeFH   = VRMethod( "CN_ACLS", "AddField", "String", "Type" )
     2730    ACL.groupFH  = VRMethod( "CN_ACLS", "AddField", "String", "Group" )
     2731    ACL.userFH   = VRMethod( "CN_ACLS", "AddField", "String", "User" )
     2732    ACL.ADFH     = VRMethod( "CN_ACLS", "AddField", "String", "A/D" )
     2733    ACL.flagsFH  = VRMethod( "CN_ACLS", "AddField", "String", "Flags" )
     2734    ACL.accessFH = VRMethod( "CN_ACLS", "AddField", "String", "Access" )
     2735    ok = VRMethod( "CN_ACLS", "RemoveRecord", "ALL")
     2736    aclsnumeric = ''
     2737    call _ACLSBrowse
    27192738return
    27202739/*:VRX         SW_ACLS_Fini
    … …  
    27782797SW_DAEMONS_Create:
    27792798    call SW_DAEMONS_Init
     2799
     2800    CALL NLVSetText 'CN_DAEMONS',     'Caption', 65
     2801   
     2802    CALL VRMethod 'TT_Main', 'Register', 'ICB_START',   NLVGetMessage(61)
     2803    CALL VRMethod 'TT_Main', 'Register', 'ICB_STOP',    NLVGetMessage(62)
     2804    CALL VRMethod 'TT_Main', 'Register', 'ICB_RESTART', NLVGetMessage(63)
     2805    CALL VRMethod 'TT_Main', 'Register', 'ICB_RELOAD',  NLVGetMessage(64)
     2806    CALL VRMethod 'TT_DAEMONS', 'Register', 'CN_DAEMONS',  NLVGetMessage(66)
    27802807return
    27812808
    … …  
    28092836SW_FILES_Create:
    28102837    call SW_FILES_Init
     2838    CALL VRMethod 'TT_FILES', 'Register', 'CN_FILES',  NLVGetMessage(68)
    28112839return
    28122840
    … …  
    28402868SW_LOGIN_Create:
    28412869    call SW_LOGIN_Init
    2842 /*  ok = VRSet("SW_LOGIN","Caption",NLVGetMessage(136)' 'strip(p_workgroup' \\'p_server'\'p_share,'T','\'))
    2843     CALL NLVSetText 'DT_USER1',       "Caption", 25
    2844     CALL NLVSetText 'DT_PASSWORD1',   "Caption", 26
    2845     CALL NLVSetText 'CB_STORECREDS1', "Caption", 135
    2846     CALL NLVSetText 'PB_LOGIN_OK',    "Caption", 2
    2847     CALL NLVSetText 'PB_LOGIN_CANCEL',"Caption", 3 */
     2870/*  ok = VRSet("SW_LOGIN","Caption",NLVGetMessage(136)' 'strip(p_workgroup' \\'p_server'\'p_share,'T','\')) */
     2871    CALL NLVSetText 'DT_USER1',       "Caption", 131
     2872    CALL NLVSetText 'DT_PASSWORD1',   "Caption", 23
     2873/*  CALL NLVSetText 'CB_STORECREDS1', "Caption", 135 */
     2874    CALL NLVSetText 'ICB_LOGIN_OK',    "Caption", 2
     2875    CALL NLVSetText 'ICB_LOGIN_CANCEL',"Caption", 3
    28482876
    28492877    if VRIsValidObject(SMBObj.rh) then do
    … …  
    28972925SW_SERVICE_Create:
    28982926    call SW_SERVICE_Init
     2927    CALL VRMethod 'TT_SERVICE', 'Register', 'CN_SERVICE',  NLVGetMessage(69)
    28992928return
    29002929
    … …  
    29282957SW_SETTINGS_Create:
    29292958    call SW_SETTINGS_Init
     2959
     2960    call SW_SETTINGS_Init_Content
     2961
     2962say VRGet("EF_LOG_FILE","Value")
     2963say translate(VRGet("EF_LOG_FILE","Value"),'\','/')
     2964    samba.!logdir = VRParseFileName(translate(VRGet("EF_LOG_FILE","Value"),'\','/'),"DP")
     2965say samba.!logdir
     2966    CALL VRMethod 'TT_SETTINGS', 'Register', 'DT_FREESPACE', samba.!logdir' blums'
    29302967return
    29312968
    … …  
    30673104SW_USERS_Create:
    30683105    call SW_USERS_Init
     3106    CALL VRMethod 'TT_USERS', 'Register', 'CN_USERS',  NLVGetMessage(67)
    30693107return
    30703108
    … …  
    30953133    ok = VRSet("TM_RefreshDaemons","Enabled", 0)
    30963134    ok = VRSet("DT_STATUSBAR","Caption", VRGet("Main", "HintText"))
    3097     /* call _TabsStrip */
     3135    ok = VRSet("CN_DAEMONS","Visible", 0)
     3136    ok = VRSet("CN_SMBTREE","Visible", 0)
     3137    ok = VRSet("CN_USERS",  "Visible", 0)
     3138    ok = VRSet("CN_FILES",  "Visible", 0)
     3139    ok = VRSet("CN_SERVICE","Visible", 0)
     3140    ok = VRSet("CN_CHKTDB", "Visible", 0)
     3141    ok = VRSet("GB_SETTINGS","Visible", 0)
     3142
    30983143    select
    30993144        when page = 1 then do /* daemons */
     3145            ok = VRSet("CN_DAEMONS","Visible", 1)
    31003146            ok = VRSet("Main","WindowIcon","$46")
    31013147            ok = VRSet("TM_RefreshDaemons","Enabled", 1)
    … …  
    31033149        end
    31043150        when page = 2 then do /* smbtree */
     3151            ok = VRSet("CN_SMBTREE","Visible", 1)
    31053152            ok = VRSet("Main","WindowIcon","$1")
    31063153            ok = VRMethod( "CN_SMBTREE", "GetRecordList", "All", "handle." )
    31073154            /* if the page is empty, populate it */
    3108             if handle.0 = 0 then call PB_Refresh_Click
     3155            if handle.0 = 0 then call ICB_REFRESH_Click
    31093156        end
    31103157        when page = 3 then do /* Users */
     3158            ok = VRSet("CN_USERS","Visible", 1)
    31113159            ok = VRSet("Main","WindowIcon","$44")
    31123160        end
    31133161        when page = 4 then do /* files */
     3162            ok = VRSet("CN_FILES",  "Visible", 1)
    31143163            ok = VRSet("Main","WindowIcon","$1")
    31153164        end
    31163165        when page = 5 then do /* service */
     3166            ok = VRSet("CN_SERVICE","Visible", 1)
    31173167            ok = VRSet("Main","WindowIcon","$52")
    31183168        end
    31193169        when page = 6 then do /* chkTDB */
     3170            ok = VRSet("CN_CHKTDB", "Visible", 1)
    31203171            ok = VRSet("Main","WindowIcon","$53")
    31213172            say "ChkTDB"
    … …  
    31233174        end
    31243175        when page = 7 then do /* Settings */
     3176            ok = VRSet("GB_SETTINGS","Visible", 1)
    31253177            ok = VRSet("Main","WindowIcon","$53")
    31263178            call SW_SETTINGS_Init_Content
    … …  
    31433195    ok = VRSet("TM_RefreshDaemons","Delay", 3000)
    31443196    call _RefreshDaemons
     3197    call _AddSharesDisplay
    31453198return
    31463199
Note: See TracChangeset for help on using the changeset viewer.