Changeset 909


Ignore:
Timestamp:
May 26, 2016, 12:51:38 PM (9 years ago)
Author:
Herwig Bauernfeind
Message:

GUITools: EVFSGUI bugfixes, license, new throbber, shared library updates

Location:
trunk/guitools
Files:
12 added
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/guitools/evfsgui/changes

    r894 r909  
    1414 
    1515Version 2.5.0 2016-??-??
     16+ Added: [HB] GPL License header
     17! Fixed: [HB] Share DDCB would not be populated
     18! Fixed: [HB] Heading on neighbourhood was broken and not nlv aware
     19* Changed: [HB] Removed references to eComStation
     20* Changed: [HB] Changed throbber to neutral one (removed eBall)
     21
    1622+ Added: [ALT] Now detects whether running under Blue Lion OS
    1723+ Added: [ALT] "Trac wiki markup" setting on About window now saved in INI

  • trunk/guitools/evfsgui/evfsgui.RC

    r703 r909  
    11ICON 1 .\rc\icons\sambaclient.ico
    2 BITMAP 11 .\rc\throbber\eBall_01.bmp
    3 BITMAP 12 .\rc\throbber\eBall_02.bmp
    4 BITMAP 13 .\rc\throbber\eBall_03.bmp
    5 BITMAP 14 .\rc\throbber\eBall_04.bmp
    6 BITMAP 15 .\rc\throbber\eBall_05.bmp
    7 BITMAP 16 .\rc\throbber\eBall_06.bmp
    8 BITMAP 17 .\rc\throbber\eBall_07.bmp
    9 BITMAP 18 .\rc\throbber\eBall_08.bmp
    10 BITMAP 19 .\rc\throbber\eBall_09.bmp
    11 BITMAP 20 .\rc\throbber\eBall_10.bmp
    12 BITMAP 21 .\rc\throbber\eBall_11.bmp
    13 BITMAP 22 .\rc\throbber\eBall_12.bmp
    14 BITMAP 23 .\rc\throbber\eBall_13.bmp
    15 BITMAP 24 .\rc\throbber\eBall_14.bmp
    16 BITMAP 25 .\rc\throbber\eBall_15.bmp
    17 BITMAP 26 .\rc\throbber\eBall_16.bmp
    18 BITMAP 27 .\rc\throbber\eBall_17.bmp
    19 BITMAP 28 .\rc\throbber\eBall_18.bmp
    20 BITMAP 29 .\rc\throbber\eBall_19.bmp
    21 BITMAP 30 .\rc\throbber\eBall_20.bmp
    22 BITMAP 31 .\rc\throbber\eBall_21.bmp
    23 BITMAP 32 .\rc\throbber\eBall_22.bmp
    24 BITMAP 33 .\rc\throbber\eBall_23.bmp
    25 BITMAP 34 .\rc\throbber\eBall_24.bmp
    26 BITMAP 35 .\rc\throbber\eBall_25.bmp
     2BITMAP 11 .\rc\throbber\frame_01.bmp
     3BITMAP 12 .\rc\throbber\frame_02.bmp
     4BITMAP 13 .\rc\throbber\frame_03.bmp
     5BITMAP 14 .\rc\throbber\frame_04.bmp
     6BITMAP 15 .\rc\throbber\frame_05.bmp
     7BITMAP 16 .\rc\throbber\frame_06.bmp
     8BITMAP 17 .\rc\throbber\frame_07.bmp
     9BITMAP 18 .\rc\throbber\frame_08.bmp
     10BITMAP 19 .\rc\throbber\frame_09.bmp
     11BITMAP 20 .\rc\throbber\frame_10.bmp
     12BITMAP 21 .\rc\throbber\frame_11.bmp
     13BITMAP 22 .\rc\throbber\frame_12.bmp
    2714BITMAP 36 .\rc\icons\green-on-16.bmp
    2815BITMAP 37 .\rc\icons\green-off-16.bmp

  • trunk/guitools/evfsgui/evfsgui.vrp

    r894 r909  
    33VRX: wps_open.VRX
    44VXOFile: VROBJEX
    5 VXOFile: VRSPLIT
    65ClassFile: VRSPLITB.DLL
    76MacroPath: VRM:G:\netlabs\svn\samba\trunk\guitools\evfsgui
    … …  
    109RunDirectory: G:\netlabs\svn\samba\trunk\guitools\evfsgui
    1110VRXWindow: __VREMainWindow,1,1831,2457,1012,7841
    12 VRXWindow: __VREFileListWindow,1,2072,7950,2665,3358
    13 VRXWindow: __VRESectionListWindow,1,217,13057,12238,6914
    14 VRXWindow: __VREToolsWindow,1,2951,12479,5468,1669
     11VRXWindow: __VREFileListWindow,1,1469,6215,2665,3358
     12VRXWindow: __VRESectionListWindow,1,3577,12768,12238,6914
     13VRXWindow: __VREToolsWindow,1,2951,12479,5471,1659
    1514VRXWindow: __VREWindListWindow,1,566,10262,4963,3150
    1615UserFile: 1
    1716UserWindow: Main,1
    1817UserWindow: SW_ADVANCED,1
    19 UserWindow: SW_LOGIN,1
    20 UserWindow: SW_MOUNTPOINT,1
    21 UserWindow: SW_SETTINGS,1
    22 UserWindow: SW_ABOUT,1
    23 UserWindow: SW_SMBTREE,1
    24 UserWindow: SW_CONDET,1

  • trunk/guitools/evfsgui/evfsgui.vrx

    r894 r909  
    44*/
    55Main:
     6/*
     7    Samba Connections GUI for OS/2 based systems
     8    Copyright (C) 2007-2016 by Alexander Taylor and Herwig Bauernfeind
     9    Derived works must contain this copyright notice.
     10
     11    This program is free software: you can redistribute it and/or modify
     12    it under the terms of the GNU General Public License as published by
     13    the Free Software Foundation, either version 3 of the License, or
     14    (at your option) any later version.
     15
     16    This program is distributed in the hope that it will be useful,
     17    but WITHOUT ANY WARRANTY; without even the implied warranty of
     18    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     19    GNU General Public License for more details.
     20
     21    You should have received a copy of the GNU General Public License
     22    along with this program.  If not, see <http://www.gnu.org/licenses/>.
     23*/
    624/*  Process the arguments.
    725    Get the parent window.
    … …  
    724742/*:VRX         _GetSMBObjectShares
    725743*/
    726 _GetSMBObjectShares: procedure expose samba. options. SMBObj. rh
     744_GetSMBObjectShares: procedure expose samba. options. SMBObj.
    727745    /* Purpose: Return stem with shares for a given Object (as handle) */
    728746
    … …  
    731749    SmbObj.shares. = ''
    732750    SmbObj.shares.0 = 0
    733 
     751    I = 0
    734752    ok = VRMethod("CN_smbtree", "GetRecordList", "All", rh.)
    735753
    … …  
    742760        ResName = strip(ResName)
    743761        parse var userdata ResType  '|' .
    744         I = 0
     762
    745763        if ParentRH = rh then do /* we found a share belonging to our server */
    746764            if ResType = "DISK" then do
    … …  
    834852    CALL NLVSetText 'PB_SMBTREE_CONNECT',             "Caption", 28
    835853    CALL NLVSetText 'PB_SMBTREE_REFRESH',             "Caption", 38
    836     CALL NLVSetText 'PB_SMBTREE_HELP',                "Caption", 4
    837     CALL NLVSetText 'CN_SMBTREE',                     "Caption", 140
     854    CALL NLVSetText 'PB_SMBTREE_HELP',                "Caption",  4
     855    CALL NLVSetText 'CN_SMBTREE',                     "Caption",140
     856
    838857/** Use AutoSize property instead
    839858    ok = VRSet("Pict_Throbber","Width",  VRMethod( "Screen", "PixelsToTwips", 32 ))
    … …  
    10291048        ok = VRSet("EF_USER",    "Value",Credentials.!username)
    10301049        ok = VRSet("EF_PASSWORD","Value",Credentials.!password)
    1031     end
     1050        ok = VRSet("CN_SMBTREE","Caption",VRGet("CN_SMBTREE","Caption")||": "Credentials.!username)
     1051    end
     1052    else ok = VRSet("CN_SMBTREE","Caption",VRGet("CN_SMBTREE","Caption")||": Guest")
    10321053
    10331054    /* SambaInit.VRS needs these 2 */
    … …  
    24652486
    24662487    machine = VRGet("EF_SERVER","value")
     2488    ok = VRSet("EF_SHARE","Value", "")
     2489    ok = VRMethod("EF_SHARE","Reset")
     2490
    24672491    rh = _GetMachineHandle(machine)
    2468 
    24692492    if rh <> "" then do
    24702493        call _GetSMBObjectProperties rh
    2471 
    24722494        if SMBObj.parentrh = ""
    24732495            then ok = VRSet("EF_NETWORK","Value", "") /* The workgroup might be unknown at this moment */
    24742496            else ok = VRSet("EF_NETWORK","Value", VRMethod("CN_SMBTREE","GetRecordAttr",SMBObj.parentRH,"Caption"))
    24752497
    2476         call _GetSMBObjectShares rh
    2477 
    2478         ok = VRMethod("EF_SHARE",   "Reset")
    2479         if SMBObj.shares.0 > 0 then ok = VRMethod("EF_SHARE",   "AddRecordList", "SMBObj.shares.")
     2498        call _GetSMBObjectShares SMBObj.rh
     2499
     2500        if SMBObj.shares.0 > 0 then do
     2501            ok = VRMethod("EF_SHARE",   "AddStringList", "SMBObj.shares.")
     2502        end
    24802503    end
    24812504    else do
    … …  
    53795402    parse var pIdx '#' pidx
    53805403    pidx = pidx + 1
    5381     if pidx = 36 then pidx = 11
     5404    if pidx = 23 then pidx = 11
    53825405    ok = VRSet("Pict_Throbber","PicturePath","#"pidx)
    53835406return

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

    r837 r909  
    33EVG
    44; Common strings used throughout program
    5 EVG0001I: Samba (SMB/CIFS) Verbindungen fr eComStation (OS/2)
     5EVG0001I: Samba (SMB/CIFS) Verbindungen
    66EVG0002I: ~OK
    77EVG0003I: ~Abbruch

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

    r837 r909  
    33EVG
    44; Common strings used throughout program
    5 EVG0001I: Samba (SMB/CIFS) Connections for eComStation (OS/2)
     5EVG0001I: Samba (SMB/CIFS) Connections
    66EVG0002I: ~OK
    77EVG0003I: ~Cancel

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

    r837 r909  
    55EVG
    66; Common strings used throughout program
    7 EVG0001I: Connexions Samba (SMB/CIFS) pour eComStation (OS/2)
     7EVG0001I: Connexions Samba (SMB/CIFS)
    88EVG0002I: ~OK
    99EVG0003I: ~Annuler

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

    r837 r909  
    33EVG
    44; Common strings used throughout program
    5 EVG0001I: Connessioni Samba (SMB/CIFS) per eComStation (OS/2)
     5EVG0001I: Connessioni Samba (SMB/CIFS)
    66EVG0002I: ~OK
    77EVG0003I: ~Annulla

  • trunk/guitools/shared/smbtree.vrs

    r875 r909  
    2727    /* strip username from caption */
    2828    UserContext = VRGet("CN_SMBTREE","Caption")
    29     UserContext = DelWord(UserContext,words(UserContext))
     29    UserContext = strip(DelWord(UserContext,words(UserContext)))
    3030   
    31     if UserCred = '-N' then ok = VRSet("CN_SMBTREE","Caption",UserContext': Guest')
     31    if UserCred = '-N' then ok = VRSet("CN_SMBTREE","Caption",UserContext" Guest")
    3232    else do
    3333        parse var UserCred '--user='username'%'.
    34         ok = VRSet("CN_SMBTREE","Caption",UserContext": "username)
     34        ok = VRSet("CN_SMBTREE","Caption",UserContext" "username)
    3535    end
    3636
    … …  
    6161    if BroadCast = 1 then BroadCast = '-b'; else BroadCast = ''
    6262
    63     if UserCred = '-N' then ok = VRSet("CN_SMBTREE","Caption","User context: Guest")
     63    if UserCred = '-N' then ok = VRSet("CN_SMBTREE","Caption",Usercontext" Guest")
    6464    else do
    6565        parse var UserCred '--user='username'%'.
    66         ok = VRSet("CN_SMBTREE","Caption","User context: "username)
     66        ok = VRSet("CN_SMBTREE","Caption", Usercontext" "username)
    6767    end
    6868
    … …  
    197197    address cmd 'detach 'samba.!smbclientexe' -L "'machine'" 'UserCred' 'debuglevel' 2>'smbmachine' 1>&2'
    198198
    199     if UserCred = '-N' then ok = VRSet("CN_SMBTREE","Caption","User context: Guest")
     199    if UserCred = '-N' then ok = VRSet("CN_SMBTREE","Caption",Usercontext" Guest")
    200200    else do
    201201        parse var UserCred '--user='username'%'.
    202         ok = VRSet("CN_SMBTREE","Caption","User context: "username)
     202        ok = VRSet("CN_SMBTREE","Caption",Usercontext" "username)
    203203    end
    204204   
Note: See TracChangeset for help on using the changeset viewer.