| |
|
Options -> Save Settings will save all your Options choices. Saved Settings are
restored on subsequent Guiffy executions.
|
 |
Ignore |
Enters the Ignore control dialog for choosing to ignore case or
whitespace differences during compares and/or merges.
Also, blank lines (inserted or deleted) can be ignored.
Plus, another Ignore option
specifies to ignore fields (columns A - B and X - Y) during compares.
And, Regular Expression can be used to ignore lines changed, inserted, or deleted matching a
Regular Expression.
See Controlling Compare for additional
information.
|
 |
Show |
Enters the Show control dialog for choosing Tab Size, display of entire
files or only differences or differences within a context (When files are
> specified size),
display InLine differences - highlighting a single string or character-by-character,
and displaying line numbers (default) during compares.
See Controlling Compare and
Folded Compare/Merge Views for additional
information.
|
 |
Folder Ignore |
Enters the Folder Compare Ignore Options dialog for selecting
Ignore these SubFolders, Ignore these files -or- Ignore All files Except these,
Ignore these FileTypes -or- Ignore All FileTypes Except these,
Ignore Symbolic Links, Ignore Modified Date and Time, Ignore File Size,
Verify SubFolders Match and
Verify files Match (Byte-by-Byte or with Text compare) during Folder Compares.
See Controlling Compare for additional
information.
|
 |
Folder Show |
Enters the Folder Compare Show Options dialog for selecting Show SubFolders
(Recursively), Show Archive Filetypes (Recursively), Show Details (Size and Modified Date), Show Matching files,
Show files Added, Show files Deleted, and
Show files changed.
See Controlling Compare for additional
information.
|
 |
Compare/Merges |
Enters the Compare/Merge Bifocal "Shades" dialog for selecting which
type of compare algorithm to apply for file compares and 2-way merges. Plus,
the Attention Focus Expander allows you to expand the attention (conflict) area
for 3-way SureMerges.
See Controlling Compare for additional
information.
|
|
 |
Font |
Enters the Fonts control dialog for selecting fonts. A font can be selected
for All types of text and different fonts can be selected for matching,
deleted, inserted, line numbers or folded marker text. The font, italics, and bold can be
set for each type of text. The font size is applied for all types of text.
See Choosing View Attributes for additional
information.
|
 |
Color |
Enters the Colors control dialog for selecting different colors for matching,
deleted, inserted, line numbers and folded markers text. Background colors are also selectable for changes and each
type of text. Plus, foreground and background colors for selected text can
be defined.
See Choosing View Attributes for additional
information.
|
 |
Styles |
Enters the Style Options dialog for selecting built-in Font and Color options.
See Choosing View Attributes for additional
information.
|
|
|
Syntax Highlighting File Types |
Enters the Syntax Highlighting File Types dialog for defining file types of a syntax. Double-Click on a file type
cell (in the column to the right) for any Syntax --- then, edit the list of file types. Press enter to apply
the edited file types for the Syntax.
OK applies the current file types with any revisions made. Save will store the current file types so they
will be applied for future Guiffy sessions. Defaults resets the current file types to the defaults.
|
|
Syntax Highlighting Styles |
Enters the Syntax Highlighting Styles dialog for defining styles of the syntax highlighting. Select a Syntax
element in the choicelist on the left --- then, edit any of the style properties (Italics, Bold, or Color). Press the
Color button to open a Color Chooser dialog. The Preview field reflects the style properties.
OK applies the current styles any revisions made. To save the current styles so they
will be applied for future Guiffy sessions, see Save Settings. Defaults resets the current styles to the defaults.
|
|
|
Write EOLs |
Enters the Write EOLs Options dialog for selecting End-Of-Line (EOL) format for Saved files.
By default, Guiffy writes EOLs in the format for the platform it's running on. You can
use this option to Save files with EOLs in the format of your server's Operating System.
Guiffy recognizes all
EOL formats while reading files AND ignores EOL format differences during compares.
Auto mode detects the EOL format of the 1st and 2nd files. Then, uses the detected
EOL format when saving 1st or 2nd files. The 1st file's EOL format is used for
all other file saves.
|
|
Encoding |
Enters the Encoding (Charsets) dialog for selecting Encoding of Compare and
Parent files and/or Saved (Dif, RCS, HTML, and MergeResults) files.
A choice list of Encoding charsets is built into the dialog.
Pressing OK verifies the selected Encoding(s) availability on the system.
Auto mode detects the Encoding of the 1st, 2nd, and parent files. Then, uses
the detected Encoding format when saving 1st or 2nd files. The 1st file's
Encoding format is used for all other file saves. The detection is based upon:
Byte Order Marks, XML Declaration "encoding=" attribute, or HTML meta "charset="
attribute. The user selected Encoding formats are used when auto detection
isn't possible.
|
|
|
File Save/Replace/Backup |
Enters the File Save/Replace/Backup dialog for defining File Save behavior when the file will be replaced.
The default behavior choice is Confirm Dialog before replace.
OK applies the current File Save behavior choice. To save the current File Save behavior choice so it
will be applied for future Guiffy sessions, see Save Settings..
|
|
|
Shortcuts |
Enters the Shortcuts dialog for defining keyboard shortcuts. Click on a shortcut
cell (in the column to the right) for any Action --- the Specify Shortcut
editing window will open. In the Specify Shortcut window a new shortcut
can be defined by entering the keystrokes or an existing shortcut can be
removed.
OK applies the current shortcuts with any revisions made. Save will store the current shortcuts so they will be applied for future Guiffy sessions. Defaults resets the current shortcuts to the defaults.
|
|
|
UI Language |
SubMenu for selecting the language for the user interface. Choices are: English,
German, Spanish, French, Italian, and Swedish.
|
|
|
Filter Plugins |
Enters the Filter Plugins dialog for defining filter plugins. A filter plugin provides the capability to
run an external tool on your files and then pass the output from that tool to the compare or merge. Or, a filter plugin provides the capability to run an external compare tool for the specified file type(s). Filters
can be useful for several purposes such as: Extract the text or data from doc, pdf, or spreadsheet files, sort or normalize
a file format such as xml, apply style standards to source files, or convert the text and style attributes of a doc or pdf file to an xml format.
|
|
|
The default Filter Plugins are also used to integrate with additional tools provided with Guiffy.
The Image Compare View Filter Plugin specifies the integration with the Guiffy Image Diff tool.
For image file types the Guiffy Image diff tool, guiffyid, is executed and the compare view appears
in a separate application window.
The Binary Compare View Filter Plugin specifies the integration with the Guiffy Binary Diff tool.
For binary file types the Guiffy Binary diff tool, guiffybd, is executed and the compare view appears
in a separate application window.
The Patch Preview Filter Plugin specifies the integration with the Guiffy Unified Diff Patch tool.
A Patch Preview is performed with the 1st file as the patch Original file and the 2nd file as the Patch
file. The Guiffy Unified Diff Patch tool, upatch, creates the patched output as a temporary file which
is compared with the Original 1st file. If any of the patch changes (chunks) are not applied, a Warning
dialog is displayed which refers the user to the FilterTrace file. The FilterTrace file shows general
information for the patch and also identifies the chunk(s) not applied.
Filter plugins are defined by File Types and can be enabled for file compares and/or merges.
A single File Type specification to be applied for the 1st and 2nd files looks like *.xml.
Multiple File Type specifications are separated by a space like *.c *.cpp.
A File Type to be applied only for the 1st or 2nd file is specified as 1.ext or 2.ext (rather than *.ext or 2.ext).
Select a filter plugin, then edit the Application path or the Arguments. The builtin plugin definitions will
need to be updated after you've installed the tool - to set the Application path. If your Application path has
any spaces enclose the path in double quotes. If the filter plugin tool writes its output
to stdout no ${OUTPUTPATH} is required. The filter plugin output is created in the user's temp folder, the
filename will have a prefix of ~1st, ~2nd, or ~Par whether it's the 1st, 2nd, or Parent file.
The output filename type is
controlled by the Output Type specification.
An Output Type of *.xml sets the output file name type to xml.
An Output Type of *.* sets the output file name type to the type of the input file.
An Output Type of 1.* or 2.* set the output file name type to the type of the 1st or 2nd file.
If the filter plugin tool supports an argument for specifying the
encoding format, place the substitution keyword ${ENCODING} in the arguments as needed.
To specify a filter plugin for running an external compare tool do not specify
any Output Type. See the filter plugin examples for Image and Binary
compare views. Filter plugins for external compare tools need to include ${1stPATH} and ${2ndPATH} in the arguments.
Refer to our Tech Note 5:
Filter Plugins document in the Help
for information regarding downloading and installing any of the default filter plugins. Tech Note 5 also
includes debugging tips.
New adds a new blank plugin definition and Remove deletes the plugin definition selected.
OK applies the current filter plugins with any revisions made. Save will store the current filter plugins so they
will be applied for future Guiffy sessions. Defaults resets the current filter plugins to the defaults.
|
|
File Types |
Enters the File Types dialog for selecting and adding additional File Types.
File Types are the filters which can be selected in File Dialogs to limit
the files displayed.
Pressing Select sets the File Type displayed as the default.
Pressing New creates an additional user defined File Type with a Description
and list of extensions.
|
|
|
Reset Settings |
Resets all settings to defaults, and optionally will redo file
or folder compare or file 2-way or 3-way merge.
|
|
Load Saved Settings |
Loads the current Settings from the file selected, and optionally will redo file
or folder compare or file 2-way or 3-way merge. The specified file will
also be updated on subsequent Save Settings which may be automatic on exits
based upon the Save Settings Controls. These settings will be restored for
subsequent Guiffy sessions.
Settings include: Ignore and Show Options, Folder Compare Options,
Font and Color Options,
View selections, the window dimensions and location, File Type definitions,
Compare/Merge Controls, Encoding selections, Auto Save Settings, and the
File Type selected.
|
|
Save Settings Controls |
Saves the current Settings to be restored for subsequent Guiffy sessions.
Settings may be Saved automatically on exit (with or without a confirmation
dialog) or only saved when the user manually chooses to save them.
Settings saved include: Ignore and Show Options, Folder Compare Options,
Font and Color Options,
View selections, the window dimensions and location, File Type definitions,
Compare/Merge Controls, Encoding selections, Auto Save Settings, and the
File Type selected.
|
|
Save Settings As |
Saves the current Settings to the file selected. The specified file will
also be updated on subsequent Save Settings which may be automatic on exits
based upon the Save Settings Controls. These settings will be restored for
subsequent Guiffy sessions.
Settings saved include: Ignore and Show Options, Folder Compare Options,
Font and Color Options,
View selections, the window dimensions and location, File Type definitions,
Compare/Merge Controls, Encoding selections, Auto Save Settings, and the
File Type selected.
|
See also: