Changeset 837


Ignore:
Timestamp:
Jan 7, 2014, 4:40:23 PM (12 years ago)
Author:
Herwig Bauernfeind
Message:

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

Location:
trunk/guitools
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/guitools/evfsgui/changes

    r797 r837  
    4646           convert global settings and advanced connection options
    4747           from windows into notebook pages
     48! Fixed: Proper size on 800x600 systems (I hope)
     49! Fixed: Proper message boxes for "Reset LMHosts" and "
     50! Fixed: Do not crash on "Set default workgroup" anymore           
    4851! Fixed: Ticket #185 (create %ETC%/samba/pid and fix the EA of
    4952         %ETC%/samba/lock)
    … …  
    7477! Fixed: Add workaround for % vs. %% issue on smbclient.exe
    7578! Fixed: Populate TabbedDialog pages earlier during startup
     79! Fixed: p_* variables were not initialized (Ticket #231)
    7680- Removed: Bottom button row
    7781- Removed: View Menu

  • trunk/guitools/evfsgui/evfsgui.vrp

    r797 r837  
    1111VRXWindow: __VREFileListWindow,1,2204,7950,2665,3358
    1212VRXWindow: __VRESectionListWindow,1,1168,12382,12238,6914
    13 VRXWindow: __VREToolsWindow,1,3084,12479,5477,1659
     13VRXWindow: __VREToolsWindow,1,3084,12479,5477,1667
    1414VRXWindow: __VREWindListWindow,1,952,11611,4963,3150
    1515UserFile: 1

  • trunk/guitools/evfsgui/evfsgui.vrx

    r786 r837  
    263263    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'   
    264264
     265    /* We have to remove the double % for smbclient.exe - not entirely clear why */
     266    OldUserCred = ""
     267    if pos('%%',UserCred) > 0 & pos("4OS2", value("COMSPEC",,"OS2ENVIRONMENT")) = 0  then do
     268        OldUserCred = UserCred
     269        parse var UserCred '--user='username'%%'password
     270        UserCred = '--user='username'%'password
     271        say "  Strip double %%!!!"
     272    end
     273
    265274    say '  'samba.!smbclientexe' \\'machine'\'sharename' 'UserCred' --command="dir 'browsepath'"'
    266275    address cmd samba.!smbclientexe' \\'machine'\'sharename' 'UserCred' --command="dir 'browsepath'" 'debuglevel' 2>NUL 1>'samba.!msg
    267276
    268277    if UserCred   = '-N' then UserCred = ''   
     278
     279    if OldUserCred <> "" then do
     280        UserCred = OldUserCred
     281        OldUserCred = ""
     282        say "  Restore double %%!!!"
     283    end
    269284
    270285    I = 0
    … …  
    10781093return
    10791094
     1095/*:VRX         _LMHostsReset
     1096*/
     1097_LMHostsReset:
     1098    ok = SysFileDelete(samba.!lmhosts)
     1099   
     1100    Buttons.1 = NLVGetMessage(2)
     1101    Buttons.0 = 1
     1102    if ok = 0 then do
     1103        id = VRMessage( VRWindow(), NLVGetMessage(118,samba.!lmhosts), NLVGetMessage(127), "Information", "Buttons.", 1, 1 )
     1104    end
     1105    else do
     1106        id = VRMessage( VRWindow(), samba.!lmhosts', RC = 'ok, NLVGetMessage(127), "Error", "Buttons.", 1, 1 )
     1107    end
     1108return
     1109
    10801110/*:VRX         _LMHostsUpdate
    10811111*/
    … …  
    15641594    icons.!plaintext        = '#94'
    15651595
     1596    p_workgroup             = "Unknown"
     1597    p_server                = "Unknown"
     1598    p_share                 = "Unknown"
     1599
    15661600    if options.!debug == 1 then say time()' _StemsInit done'
    15671601return
    … …  
    16091643_TimeSync:
    16101644    if options.!debug == 1 then say time()' _TimeSync started, "'options.!timesrv'"'
     1645    TimeMsg.1 = NLVGetMessage(141)' 'time()
    16111646    if options.!timesrv <> '' then do
    16121647        say     '  'samba.!netexe' time set -S 'options.!timesrv
    … …  
    16181653    end
    16191654    options.!timesync = ''
     1655    TimeMsg.2 = NLVGetMessage(142)' 'time()
     1656    TimeMsg.0 = 2
     1657
     1658    Buttons.1 = NLVGetMessage(2)
     1659    Buttons.0 = 1
     1660    id = VRMessageStem( VRWindow(), TimeMsg. , NLVGetMessage(129) , "Information", "Buttons.", 1, 1 )
    16201661    if options.!debug == 1 then say time()' _TimeSync done'
    16211662return
    … …  
    17831824    /* Herwig B. */
    17841825    CALL VRSet "TM_AUTOCLOSE", "ENABLED", 0
     1826    ok = VRSet("Menu_Selected_Default_Workgroup","Visible", 0)
    17851827
    17861828    rh = VRInfo('Record')
    … …  
    27182760    main_iheight = VRGet("Main","InteriorHeight")               /* Height of window client-area */
    27192761
    2720     if main_iheight < 6400 then ok = VRSet("Main","Height",7100)
    2721     if main_iwidth  < 8800 then ok = VRSet("Main","Width", 8900)
     2762    if VRMethod( "Screen", "TwipsToPixels", main_iheight) < 580 then ok = VRSet("Main","Height",VRMethod( "Screen", "PixelsToTwips", 600))
     2763    if VRMethod( "Screen", "TwipsToPixels", main_iwidth)  < 800 then ok = VRSet("Main","Width", VRMethod( "Screen", "PixelsToTwips", 800))
    27222764
    27232765    sbar_height  = VRGet("GB_STATUSBAR","Height")               /* Height of status-bar */
    … …  
    30443086Menu_Context_Open_Settings_Click:
    30453087    if options.!debug == 1 then say time()' '||"Menu_Context_Open_DetailsClick started"
     3088    if \VRIsValidObject(rh) then return
     3089
    30463090    userdata = VRMethod( "CN_CURRENT", 'GetRecordAttr', rh, 'UserData')
    30473091    PARSE VAR userdata mountpoint ';' mounts ';' .
    … …  
    31673211        CALL VRMessage 'Main', Text, Title, 'E'
    31683212    end
     3213return
     3214
     3215/*:VRX         Menu_File_Click
     3216*/
     3217Menu_File_Click:
     3218    ok = VRSet("Menu_File_LMHosts_Reset", "Enabled", VRFileExists( samba.!lmhosts ))
     3219    ok = VRSet("Menu_File_ucCred_Reset",  "Enabled", (VRGet("Pict_PWINMEM","PicturePath") = "#36"))
    31693220return
    31703221
    … …  
    32253276*/
    32263277Menu_File_LMHosts_Reset_Click:
    3227     ok = SysFileDelete(samba.!lmhosts)
    3228     /* FIXME: Add a message box here */
     3278    call _LMHostsReset
    32293279return
    32303280
    … …  
    33253375*/
    33263376Menu_Selected_Default_Workgroup_Click:
    3327     workgroupname = VRMethod("CN_SMBTREE","GetRecordAttr",SMBObj.rh,"Caption")
    3328     /* FIXME: switch over to REXXIni calls */
    3329     ok = TRSetIni("[global]","workgroup", workgroupname, samba.!smbconf)
     3377    if options.!debug == 1 then say time()' '||"Menu_Selected_Default_Workgroup_Click started"
     3378    if options.!debug == 1 then say '  SMBObj.rh        = "'SMBObj.rh'"'
     3379    Success = 0
     3380    if SMBObj.rh <> "" then do
     3381        if options.!debug == 1 then say '  SMBObj.udatatype = "'SMBObj.udatatype'"'
     3382        Success = 1
     3383        select
     3384            when SMBObj.udatatype = "WORKGROUP" then workgroupname = VRMethod("CN_SMBTREE","GetRecordAttr",SMBObj.rh,"Caption")
     3385            when SMBObj.udatatype = "DISK"      then workgroupname = VRMethod("CN_SMBTREE","GetRecordAttr",SMBObj.gparentrh,"Caption")
     3386            when SMBObj.udatatype = "PRINTER"   then workgroupname = VRMethod("CN_SMBTREE","GetRecordAttr",SMBObj.gparentrh,"Caption")
     3387            when SMBObj.udatatype = "SERVER"    then workgroupname = VRMethod("CN_SMBTREE","GetRecordAttr",SMBObj.parentrh,"Caption")
     3388            otherwise Success = 0
     3389        end
     3390       
     3391        /* FIXME: switch over to REXXIni calls */
     3392        if Success = 1 then ok = TRSetIni("[global]","workgroup", workgroupname, samba.!smbconf)
     3393    end
     3394    Buttons.1 = NLVGetMessage(2)
     3395    Buttons.0 = 1
     3396
     3397    if Success = 0 then do
     3398        id = VRMessage( VRWindow(), NLVGetMessage(5), NLVGetMessage(75), "Error", "Buttons.", 1, 1 )
     3399    end
     3400    else do
     3401        id = VRMessage( VRWindow(), NLVGetMessage(117, workgroupname), NLVGetMessage(75), "Information", "Buttons.", 1, 1 )
     3402    end
     3403    if options.!debug == 1 then say time()' '||"Menu_Selected_Default_Workgroup_Click done"
    33303404return
    33313405

  • trunk/guitools/evfsgui/mkmsg.cmd

    r759 r837  
    11@echo off
    22rem edit alle language files
    3 call edit .\rc\lang\evfsi_de.mkm
    4 call edit .\rc\lang\evfsi_en.mkm
    5 call edit .\rc\lang\evfsi_fr.mkm
    6 call edit .\rc\lang\evfsi_it.mkm
     3rem call edit .\rc\lang\evfsi_de.mkm
     4rem call edit .\rc\lang\evfsi_en.mkm
     5rem call edit .\rc\lang\evfsi_fr.mkm
     6rem call edit .\rc\lang\evfsi_it.mkm
     7del mkmsg.log
    78rem Build all language files
    8 mkmsgf .\rc\lang\evfsi_de.mkm evfsi_de.msg
    9 mkmsgf .\rc\lang\evfsi_en.mkm evfsi_en.msg
    10 mkmsgf .\rc\lang\evfsi_fr.mkm evfsi_fr.msg
    11 mkmsgf .\rc\lang\evfsi_it.mkm evfsi_it.msg
     9mkmsgf .\rc\lang\evfsi_de.mkm evfsi_de.msg 2>&1 | tee -a mkmsg.log
     10mkmsgf .\rc\lang\evfsi_en.mkm evfsi_en.msg 2>&1 | tee -a mkmsg.log
     11mkmsgf .\rc\lang\evfsi_fr.mkm evfsi_fr.msg 2>&1 | tee -a mkmsg.log
     12mkmsgf .\rc\lang\evfsi_it.mkm evfsi_it.msg 2>&1 | tee -a mkmsg.log
    1213rem Help files
    13 ipfc .\rc\help\evfsi_de.ipf evfsi_de.hlp
    14 ipfc .\rc\help\evfsi_en.ipf evfsi_en.hlp
    15 ipfc .\rc\help\evfsi_fr.ipf evfsi_fr.hlp
    16 ipfc .\rc\help\evfsi_it.ipf evfsi_it.hlp
    17 
     14ipfc -s -x -D:049 -C:850 .\rc\help\evfsi_de.ipf evfsi_de.hlp  2>&1 | tee -a mkmsg.log
     15ipfc -s -x -D:001 -C:850 .\rc\help\evfsi_en.ipf evfsi_en.hlp  2>&1 | tee -a mkmsg.log
     16ipfc -s -x -D:033 -C:850 -L:FRA .\rc\help\evfsi_fr.ipf evfsi_fr.hlp  2>&1 | tee -a mkmsg.log
     17ipfc -s -x .\rc\help\evfsi_it.ipf evfsi_it.hlp  2>&1 | tee -a mkmsg.log

  • trunk/guitools/evfsgui/rc/lang/evfsi_de.mkm

    r759 r837  
    124124EVG0115?:
    125125EVG0116?:
    126 EVG0117?:
    127 EVG0118?:
     126EVG0117I: %1 gespeichert.
     127EVG0118I: %1 gel”scht.
    128128EVG0119I: Alte Protokolldateien l”schen?
    129129;More menu strings
    … …  
    150150EVG0139I: Version
    151151EVG0140I: Benutzerkontext
     152EVG0141I: Uhrzeit vor der Synchronisation
     153EVG0142I: Uhrzeit nach der Synchronisation

  • trunk/guitools/evfsgui/rc/lang/evfsi_en.mkm

    r759 r837  
    124124EVG0115?:
    125125EVG0116?:
    126 EVG0117?:
    127 EVG0118?:
     126EVG0117I: %1 stored.
     127EVG0118I: %1 erased.
    128128EVG0119I: Erase old logfiles?
    129129;More menu strings
    … …  
    150150EVG0139I: Version
    151151EVG0140I: User context
    152 
     152EVG0141I: Time before sync
     153EVG0142I: Time after sync

  • trunk/guitools/evfsgui/rc/lang/evfsi_fr.mkm

    r759 r837  
    130130EVG0115?:
    131131EVG0116?:
    132 EVG0117?:
    133 EVG0118?:
     132EVG0117I: %1 sauvegarde‚.
     133EVG0118I: %1 effac‚.
    134134EVG0119I: Effacer les anciens fichiers de log?
    135135;More menu strings
    … …  
    156156EVG0139I: Version
    157157EVG0140I: Contexte d'utilisateur
     158EVG0141I: L'heure avant synchroniser
     159EVG0142I: L'heure aprŠs synchroniser

  • trunk/guitools/evfsgui/rc/lang/evfsi_it.mkm

    r759 r837  
    128128EVG0115?:
    129129EVG0116?:
    130 EVG0117?:
    131 EVG0118?:
     130EVG0117I: %1 salvato.
     131EVG0118I: %1 cancellato.
    132132EVG0119I: Cancellare i vecchi file di log?
    133133;More menu strings
    … …  
    155155EVG0139I: Versione
    156156EVG0140I: Contesto di utente
     157EVG0141I: L'ora prima di sincrinozzare
     158EVG0142I: L'ora dopo sincrinozzare

  • trunk/guitools/shared/smbtree.vrs

    r797 r837  
    141141                end
    142142                if ThrowMsg = 1 then do
    143                 call beep 2400, 500
    144143                    ThrowMsg = 0
    145144                    Msg.Type = "W"

  • trunk/guitools/smbmon/smbmon.vrp

    r805 r837  
    88VRXWindow: __VREMainWindow,1,2180,3614,1024,6769
    99VRXWindow: __VRESectionListWindow,1,4083,11226,7372,6589
    10 VRXWindow: __VREToolsWindow,1,2156,1494,5477,1659
     10VRXWindow: __VREToolsWindow,1,2156,1494,5471,1663
    1111VRXWindow: __VREWindListWindow,1,964,11708,3132,3150
    1212UserFile: 1

  • trunk/guitools/smbmon/smbmon.vrx

    r805 r837  
    747747        parse var Zeile FPid Uid DenyMode Access RW Oplock Sharepath Rest
    748748        TimeDate = right(rest,25)
     749
     750say 'Refreshcrash "'Rest'"'
     751say 'Refreshcrash "'max(length(Rest)-25)'"'
     752
    749753        Name = strip(left(Rest,max(length(Rest)-25),1))
    750754        I = I + 1
Note: See TracChangeset for help on using the changeset viewer.