Changeset 1122


Ignore:
Timestamp:
Aug 27, 2008, 6:28:12 PM (17 years ago)
Author:
John Small
Message:

Ticket 267 changes: fix typos, standardize on "Toolbar" over "Toolbox"
and improve/correct wording related to toolbars and toolbar files.

Location:
trunk/dll
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/dll/fm3dll.h

    r1117 r1122  
    570570VOID ResizeDrives(HWND hwndT, long xwidth);
    571571BOOL CloseChildren(HWND hwndClient);
    572 VOID BuildTools(HWND hwndT, BOOL resize);
     572// VOID BuildTools(HWND hwndT, BOOL resize);
    573573void BubbleHelp(HWND hwnd, BOOL other, BOOL data, BOOL above, char *help);
    574574VOID MakeBubble(HWND hwnd, BOOL above, CHAR * help);
     
    11791179  lastextractpath[CCHMAXPATH];
    11801180DATADEF CHAR appname[12], realappname[12];
    1181 DATADEF CHAR  lasttoolbox[CCHMAXPATH], HomePath[CCHMAXPATH],
     1181DATADEF CHAR  lasttoolbar[CCHMAXPATH], HomePath[CCHMAXPATH],
    11821182  SwapperDat[CCHMAXPATH], printer[CCHMAXPATH], szDefArc[CCHMAXPATH];
    11831183DATADEF HMODULE FM3DllHandle, FM3ModHandle;
  • trunk/dll/fm3dll.str

    r1121 r1122  
    1313Pick a directory from the list or get a popup menu.
    1414Pick a drive from the list.
    15 Pick a toolbox from the list.
     15Pick a toolbar from the list.
    1616Dropping here will add the directory to the list.
    1717You're dragging %lu object(s) over the toolbar.
    1818<New directory>
    1919Common directories
    20 Toolboxes
     20Toolbars
    2121States
    2222Commands
     
    555555That ID already has a tool.
    556556FM/2: Pick tool to %0.81s
    557 FM/2: Load Toolbox
     557FM/2: Load Toolbar
    558558OS/2 can't find directory "%s"?
    559559There are no more directories under there...
     
    958958; FM/2 command line file, one per line\n
    959959; FM/2 associations file -- 5 lines: mask, cmd line, sig, offset, flags\n;  For OS/2 associations only, uncomment following 5 lines:\n;*\n;<>\n;\n;0\n;0\n
    960 ;\n;This file contains definitions for an FM/2 toolbox.\n;FM/2 saved this file as \"%s\".\n;\n;Each tool button has four lines that describe it.  The first line is\n;the help for the button.  The second line is the text for the button\n;(internally defined tools have icons, and the text is ignored).  The\n;third line is a number indicating flags associated with the button.\n;A flag value of 1 means the button is dropable, 4 means invisible,\n;32 means use user-provided icon only (named <ID>.bmp).\n;The fourth line is the ID of the button (for internal commands only).\n;Note Commands begin at ID 4000, so a button with ID 4000 would cause\n;the first Command to be run and ID 4001 would run the second.\n;4900 marks the first \"quick toolbox change\" item, and you can\n;have up to 50 of them (these buttons load other toolboxes, see\n;online help).;\n
     960; Fixed: Ticket 267\n;\n; This file contains definitions for an FM/2 toolbar.\n;\n; To edit this file manually, see "Manual edit of toolbar files"\n; in the FM/2 help file.\n;\n;\n
    961961 [%c:  \"%s\"  SN: %08lx%s]
    962962; FM/2 seek and scan mask file, one mask set per line\n
  • trunk/dll/fm3res.dlg

    r1098 r1122  
    10801080DLGTEMPLATE SVBTN_FRAME LOADONCALL MOVEABLE DISCARDABLE
    10811081BEGIN
    1082     DIALOG  "FM/2:  Save Toolbox", SVBTN_FRAME, 12, 6, 213, 148, WS_VISIBLE,
     1082    DIALOG  "FM/2:  Save Toolbar", SVBTN_FRAME, 12, 6, 213, 148, WS_VISIBLE,
    10831083            FCF_TITLEBAR
    10841084    BEGIN
  • trunk/dll/fm3res.rc

    r1085 r1122  
    19831983  MENUITEM "Reorder buttons...",      IDM_REORDERTOOLS
    19841984  MENUITEM "",                        -1,           MIS_SEPARATOR
    1985   MENUITEM "Save toolbox...",         IDM_SAVETOOLS
    1986   MENUITEM "Load toolbox...",         IDM_LOADTOOLS
     1985  MENUITEM "Save toolbar...",         IDM_SAVETOOLS
     1986  MENUITEM "Load toolbar...",         IDM_LOADTOOLS
    19871987  MENUITEM "",                        -1,           MIS_SEPARATOR
    19881988  MENUITEM "Help",                    IDM_HELP
  • trunk/dll/fm3str.h

    r1121 r1122  
    5454#define IDS_NEWDIRECTORYTEXT                                  17
    5555#define IDS_COMMONDIRTEXT                                     18
    56 #define IDS_TOOLBOXTEXT                                       19
     56#define IDS_TOOLBARTEXT                                       19
    5757#define IDS_STATETEXT                                         20
    5858#define IDS_COMMANDSTEXT                                      21
     
    582582#define IDS_TOOLIDEXISTS                                      554
    583583#define IDS_PICKTOOLTITLETEXT                                 555
    584 #define IDS_LOADTOOLBOXTITLETEXT                              556
     584#define IDS_LOADTOOLBARTITLETEXT                              556
    585585#define IDS_CANTFINDDIRTEXT                                   557
    586586#define IDS_NODIRSUNDERTEXT                                   558
  • trunk/dll/init.c

    r1120 r1122  
    14031403  size = sizeof(mailrundir);
    14041404  PrfQueryProfileData(fmprof, appname, "MailRunDir", mailrundir, &size);
    1405   size = sizeof(lasttoolbox);
    1406   PrfQueryProfileData(fmprof, FM3Str, "LastToolBox", lasttoolbox,
     1405  size = sizeof(lasttoolbar);
     1406  PrfQueryProfileData(fmprof, FM3Str, "LastToolbar", lasttoolbar,
    14071407                      &size);
    14081408  size = sizeof(BOOL);
  • trunk/dll/ipf/config.ipf

    r994 r1122  
    3434on the toolbar (see :link reftype=hd res=91800.Toolbar:elink. for more information)
    3535You can switch between toolbars using the dialog that appears if you click :color fc=default bc=cyan.B2:color fc=default bc=default. over
    36 an area of "white space" on the toolbar or by selecting load toolbox from the previously
     36an area of "white space" on the toolbar or by selecting load toolbar from the previously
    3737discussed context menu.
    3838:p.
     
    7070:link reftype=hd res=91500.Walk Directories:elink. dialog).
    7171.br
    72 A Toolboxesdropdown listbox also appears if the :hp6.Toolbar:ehp6. is on.
     72A Toolbars dropdown listbox also appears if the :hp6.Toolbar:ehp6. is on.
    7373:p.
    7474The :hp6.Toggle bottom buttons:ehp6. menu item turns off and on a row of
  • trunk/dll/ipf/context.ipf

    r1094 r1122  
    751751:artwork name='..\..\bitmaps\undelete.bmp' align=center.
    752752:p.
    753 If you have res=99950.Delete = move to trashcan:elink. enabled undelete
     753If you have :link reftype=hd res=99950.Delete = move to trashcan:elink. enabled undelete
    754754will open the trahscan to facilitate resoring files. You will need to
    755755rescan the directory containers in order to see the restored files. Otherwise,
  • trunk/dll/ipf/fm3.ipf

    r1044 r1122  
    331331activate commands when clicked.
    332332:p.
    333 The :hp1."Toolboxes" quicklist:ehp1. only appears when the
     333The :hp1."Toolbars" quicklist:ehp1. only appears when the
    334334:link reftype=hd res=91800.Toolbar:elink. is visible (see :link reftype=hd res=99400.Using
    335335quicklists:elink. section).
     
    468468from the mouse pointer to give better target visibility). Target
    469469emphasis is provided in the form of a black outline around the button,
    470 and the arrow pointer turns into a hand when above a toolbox icon.
     470and the arrow pointer turns into a hand when above a toolbar icon.
    471471:p.
    472472This toolbar submenu is a conditional cascade menu, meaning that if you
     
    480480Toolbar buttons are user-configurable. To change the toolbar, click
    481481mouse button two (usually the right button) while the mouse pointer is
    482 over a button to pop up a context menu. You can get the "Load Toolbox"
     482over a button to pop up a context menu. You can get the "Load Toolbar"
    483483dialog by clicking :color fc=default bc=cyan.B2:color fc=default bc=default.
    484484 on a blank area of the toolbar, and the "Add
     
    490490file contains comments that explain its format.
    491491:p.
    492 FM/2 allows you to create customized toolboxes that can be loaded as
    493 required to provide toolboxes for specific activities. Although FM/2
     492FM/2 allows you to create customized toolbars that can be loaded as
     493required to provide toolbars for specific activities. Although FM/2
    494494provides ways to edit the toolbar internally, it's probably easier to
    495495load the definition files into a text editor and make the changes
     
    497497:p.
    498498If you'd like to see a different toolbar layout (and try out the Load
    499 Toolbox command), right-click on the toolbar, pick Load Toolbox from the
    500 resultant menu, and pick a toolbox from the listbox. Then you might try
    501 creating your own and saving it with the Save Toolbox command.
     499Toolbar command), right-click on the toolbar, pick Load Toolbar from the
     500resultant menu, and pick a toolbar from the listbox. Then you might try
     501creating your own and saving it with the Save Toolbar command.
    502502:p.
    503503See also&colon.
     
    512512.br
    513513:link reftype=hd res=94500.Load Tools:elink.
     514.br
     515:link reftype=hd res=94550.Manual edit of Toolbar files:elink.
    514516
    515517:h3 res=96300 name=PANEL_REORDERTOOLS.Reorder Tools
     
    6726744002   Second Command                                       Y
    673675&period...
    674 4900   First Toolbox                                        N
    675 4901   Second Toolbox                                       N
     6764900   First Toolbar                                        N
     6774901   Second Toolbar                                       N
    676678&period...
    677679:exmp.
     
    682684your Commands around, you need to resync the tools to the Commands...
    683685:p.
    684 Note&colon. Toolbox buttons on a toolbar cause the appropriate toolbox
     686Note&colon. Toolbar buttons on a toolbar cause the appropriate toolbar
    685687to be loaded from QUICKTLS.DAT (one filename per line, blank lines and
    686688lines beginning with ";" ignored). The file named on the first line is
    687 the First Toolbox, and so forth. You can have up to 50 toolbox buttons
     689the First Toolbar, and so forth. You can have up to 50 toolbar buttons
    688690defined (total).
    689691:p.
     
    692694if so.
    693695
    694 :h3 res=94000 name=PANEL_SAVETOOLS.Save Toolbox
    695 :i1 id=aboutSaveTools.Save Toolbox
    696 
    697 FM/2 allows you to save toolboxes (groups of tools) for later recall
    698 with the :link reftype=hd res=94500.Load Toolbox:elink. command.
    699 :p.
    700 Type the name of the file to hold the toolbox definitions into the entry
     696:h3 res=94000 name=PANEL_SAVETOOLS.Save Toolbar
     697:i1 id=aboutSaveTools.Save Toolbar
     698
     699FM/2 allows you to save toolbars (groups of tools) for later recall
     700with the :link reftype=hd res=94500.Load Toolbar:elink. command.
     701:p.
     702Type the name of the file to hold the toolbar definitions into the entry
    701703field below the listbox, or select a file displayed in the listbox (it
    702 will be overwritten). FM/2 saves the toolbox definitions into the file.
     704will be overwritten). FM/2 saves the toolbar definitions into the file.
    703705:p.
    704706The files are given an extension of &period.TLS if you don't specify an
     
    707709convention).
    708710
    709 :h3 res=94500 name=PANEL_LOADTOOLS.Load Toolbox
    710 :i1 id=aboutLoadTools.Load Toolbox
    711 
    712 FM/2 allows you to load toolboxes (groups of tools) which were saved
    713 with the :link reftype=hd res=94000.Save Toolbox:elink. command.
    714 :p.
    715 Type the name of the file that holds the toolbox definitions into the
     711:h3 res=94500 name=PANEL_LOADTOOLS.Load Toolbar
     712:i1 id=aboutLoadTools.Load Toolbar
     713
     714FM/2 allows you to load toolbars (groups of tools) which were saved
     715with the :link reftype=hd res=94000.Save Toolbar:elink. command.
     716:p.
     717Type the name of the file that holds the toolbar definitions into the
    716718entry field below the listbox, or select a file displayed in the
    717 listbox. FM/2 loads the toolbox definitions from the file and updates
     719listbox. FM/2 loads the toolbar definitions from the file and updates
    718720the toolbar.
    719721:p.
     
    723725:p.
    724726Clicking :hp1.Okay:ehp1. without typing in or selecting a filename
    725 results in FM/2 reloading the default toolbox from FM3TOOLS.DAT.
     727results in FM/2 reloading the default toolbar from FM3TOOLS.DAT.
    726728:p.
    727729If I may, here's how I'd recommend using this facility&colon.
     
    730732delete any buttons that you don't want in your customized toolbar.
    731733Finally, add any Command buttons that you do want in the customized
    732 toolbar and save the new toolbox (as <something>.TLS). By starting with
     734toolbar and save the new toolbar (as <something>.TLS). By starting with
    733735the full toolbar, you'll spend more of your time deleting buttons you
    734736don't want (a trivial task) and less adding buttons.
     737
     738:h3 res=94550 name=PANEL_MANUALTOOLS.Manual edit of Toolbar files
     739:i1 id=aboutManualTools.Manual edit of Toolbar files
     740
     741FM/2 can guide you through the processes of creating or customizing your toolbars.
     742This is the recommended way to customize your toolbars. See :link reftype=hd res=91800.Toolbars:elink. for more information.
     743:p.
     744However you may choose to create or customize your toolbars manually. Toolbars
     745are defined in files located in the FM/2 installation directory. These files
     746have an extension of TLS. Any plain text editor may be used to create or edit
     747these files.
     748:note.The maximum line length is 80 characters for ANY line in a TLS file!
     749:note.There can be no more than 50 TLS files!
     750:warning.
     751Incorrectly edited toolbar files may break your toolbars and possibly impair FM/2 as a whole.
     752:ewarning.
     753It is therefore recommended that you backup any TLS file before you edit it. Then, if you
     754experience problems after your edits, you can simply restore the saved copy of the TLS file.
     755:p.
     756Another way to recover from corrupted TLS files is to execute the "Back up FM/2 Customizations
     757and reset to defaults" icon in your FM/2 folder. However using "Back up FM/2 Customizations and reset to defaults" will revert :hp2.ALL:ehp2.
     758customizations to FM/2 defaults, not just the toolbars!
     759:p.
     760The TLS files are made of of two kinds of lines: Comment lines and lines
     761which define a button for the toolbar.
     762:p.
     763:hp7.Comment lines:ehp7.
     764:ul compact.
     765:li.Are optional. None are needed by FM/2. They are for user use.
     766:li.Start with a semicolon in the first column, ";".
     767:li.May be used before or after any set of (4) button definition lines.
     768:sl compact.
     769:li.Comment lines must NOT be placed within the four lines which constitute a button definition!
     770:esl.
     771:li.Properly placed comment lines are ignored by FM/2.
     772:li.Uses:
     773:ul compact.
     774:li.To provide visual separation between sets of button definition lines, making the file more readble (to humans).
     775:li.To provide a means of keeping comments/notes about the file and its buttons.
     776:eul.
     777:eul.
     778:p.
     779:hp7.Button definition lines:ehp7.
     780:ul compact.
     781:li.Each button is defined by four CONSECUTIVE lines.
     782:sl compact.
     783:li.If a comment line is placed within the four lines which define a button, FM/2 will ignore the entire button definition.
     784:esl.
     785:li.The first line contains the text for the bubble help. If bubble help is enabled, the text on this line will be displayed when the mouse is positioned over this button.
     786:sl compact.
     787:li.The bubble help text may include "\r" to break the help into multiple lines.
     788:esl.
     789:li.The second line contains the button text. This text is displayed only if either...
     790:ul compact.
     791:li.Tool titles is enabled.
     792:li.There is no icon for the button.
     793:eul.
     794:li.The third line is a number indicating flags associated with the button.
     795:sl compact.
     796:li.0 means the button is non-droppable
     797:li.1 means the button is droppable
     798:li.4 means invisible
     799:li.8 means a spacer follows this button
     800:li.32 means there is a user-defined bitmap for the button.
     801:ul compact.
     802:li.The bitmap must be in a file named <id-number>.bmp where <id-number> is the id number specified by the fourth line of the button definition.
     803:li.The bitmap file must be in the FM/2 directory
     804:li.The bitmap must be 32x32 in size.
     805:eul.
     806:li.Add these numbers together to combine the attributes. For example 9 (i.e. 8 + 1) means droppable with a spacer following.
     807:esl.
     808:li.The fourth line is the ID number of the button. See
     809:link reftype=hd res=96401.
     810Tool ID's
     811:elink. for more information.
     812:eul.
    735813
    736814:h2 res=99400 name=PANEL_USERLISTS.Using quicklists
     
    745823:li.Often used directories you've configured (see :link reftype=hd
    746824res=91500.Walk Directories dialog:elink.).
    747 :li.Toolboxes (if the Toolbar's on).
     825:li.Toolbars (if the Toolbar's on).
    748826:eul.
    749827:artwork name='bitmaps\userlist.bmp' align=center.
     
    838916.br
    839917The last list (only present if the Toolbar is on) is a list of
    840 Toolboxes. You can select one from the list. FM/2 automatically
    841 maintains this list for you. Initially, the saved toolbox names are
     918Toolbars. You can select one from the list. FM/2 automatically
     919maintains this list for you. Initially, the saved toolbar names are
    842920read from disk (the FM/2 directory), and any you subsequently save
    843 are added to it on the fly. The FM/2 archive includes a few Toolboxes
     921are added to it on the fly. The FM/2 archive includes a few Toolbars
    844922for you to look at and customize if you'd like.
    845923:p.
  • trunk/dll/ipf/term.ipf

    r606 r1122  
    6969passes over a toolbar button.
    7070:p.
    71 :hp1.Toolbox:ehp1. = a collection of buttons in a toolbar. FM/2 allows
    72 you to customize and save toolboxes which you can load into the toolbar
     71:hp1.Toolbar:ehp1. = a collection of buttons in a toolbar. FM/2 allows
     72you to customize and save toolbars which you can load into the toolbar
    7373as desired.
    7474:p.
  • trunk/dll/tools.c

    r1121 r1122  
    118118  }
    119119  if (!filename || !*filename)
    120     filename = (*lasttoolbox) ? lasttoolbox : "CMDS.TLS";
     120    filename = (*lasttoolbar) ? lasttoolbar : "CMDS.TLS";
    121121  if (*filename)
    122122    fname = searchpath(filename);
     
    125125  if (fname && *fname) {
    126126    filename = fname;
    127     strcpy(lasttoolbox, filename);
     127    strcpy(lasttoolbar, filename);
    128128    fp = _fsopen(filename, "r", SH_DENYWR);
    129129    if (fp) {
     
    187187
    188188  if (!filename)
    189     filename = lasttoolbox;
     189    filename = lasttoolbar;
    190190  if (*filename)
    191191    fname = searchpath(filename);
     
    193193    filename = fname;
    194194  else {
    195     if (*lasttoolbox)
    196       filename = lasttoolbox;
     195    if (*lasttoolbar)
     196      filename = lasttoolbar;
    197197    else
    198198      filename = "FM3TOOLS.TLS";
     
    205205    filename = "FM3TOOLS.TLS";
    206206  if (toolhead && filename && *filename) {
    207     strcpy(lasttoolbox, filename);
    208     PrfWriteProfileString(fmprof, FM3Str, "LastToolBox", filename);
     207    strcpy(lasttoolbar, filename);
     208    PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", filename);
    209209  }
    210210  if (!toolhead) {
     
    911911    else {
    912912      WinSetWindowULong(hwnd, QWL_USER, FALSE);
    913       WinSetWindowText(hwnd, GetPString(IDS_LOADTOOLBOXTITLETEXT));
     913      WinSetWindowText(hwnd, GetPString(IDS_LOADTOOLBARTITLETEXT));
    914914    }
    915915    WinSendDlgItemMsg(hwnd,
     
    960960    WinSetDlgItemText(hwnd,
    961961                      SVBTN_CURRENT,
    962                       (*lasttoolbox) ? lasttoolbox : "FM3TOOLS.DAT");
     962                      (*lasttoolbar) ? lasttoolbar : "FM3TOOLS.DAT");
    963963    break;
    964964
     
    10181018        CHAR temptools[CCHMAXPATH];
    10191019
    1020         strcpy(temptools, lasttoolbox);
     1020        strcpy(temptools, lasttoolbar);
    10211021        if (fToolsChanged)
    10221022          save_tools(NULL);
    10231023        WinQueryDlgItemText(hwnd,
    1024                             SVBTN_ENTRY, sizeof(lasttoolbox), lasttoolbox);
    1025         if (*lasttoolbox) {
    1026           if (!strchr(lasttoolbox, '.'))
    1027             strcat(lasttoolbox, ".TLS");
    1028         }
    1029         if (saving && *lasttoolbox)
     1024                            SVBTN_ENTRY, sizeof(lasttoolbar), lasttoolbar);
     1025        if (*lasttoolbar) {
     1026          if (!strchr(lasttoolbar, '.'))
     1027            strcat(lasttoolbar, ".TLS");
     1028        }
     1029        if (saving && *lasttoolbar)
    10301030          save_tools(NULL);
    10311031        else {
    10321032          if (!load_tools(NULL)) {
    1033             strcpy(lasttoolbox, temptools);
     1033            strcpy(lasttoolbar, temptools);
    10341034            if (!load_tools(NULL)) {
    1035               *lasttoolbox = 0;
     1035              *lasttoolbar = 0;
    10361036              load_tools(NULL);
    10371037            }
    10381038          }
    10391039        }
    1040         PrfWriteProfileString(fmprof, FM3Str, "LastToolBox", lasttoolbox);
     1040        PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", lasttoolbar);
    10411041      }
    10421042      WinDismissDlg(hwnd, 1);
Note: See TracChangeset for help on using the changeset viewer.