forked from qt-creator/qt-creator
Doc: Replace "Tools > Options" with "Edit > Preferences"
The menu was moved and renamed. The Options dialog was also renamed "Preferences". Change-Id: I05d187915382b3ce49699d91304cd447c87e2bd6 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -51,7 +51,7 @@
|
||||
\li Download \l{http://gnuwin32.sourceforge.net/packages/diffutils.htm}
|
||||
{Diffutils} and extract it to a directory in your PATH.
|
||||
|
||||
\li Select \uicontrol Tools > \uicontrol Options >
|
||||
\li Select \uicontrol Edit > \uicontrol Preferences >
|
||||
\uicontrol {Version Control} > \uicontrol ClearCase.
|
||||
|
||||
\li Select the \uicontrol External radio button. The radio button is
|
||||
@@ -71,12 +71,12 @@
|
||||
\uicontrol ClearCase > \uicontrol {Check Out}. If you check out files in a
|
||||
Unified Change Management (UCM) view, they are added to the change set of
|
||||
a UCM activity. By default, the activities are automatically assigned names.
|
||||
To disable this functionality, select \uicontrol Tools > \uicontrol Options
|
||||
To disable this functionality, select \uicontrol Edit > \uicontrol Preferences
|
||||
> \uicontrol {Version Control} > \uicontrol ClearCase, and then deselect the
|
||||
\uicontrol {Automatically assign activity names} check box.
|
||||
|
||||
To automatically check out files when you edit them, select \uicontrol Tools
|
||||
> \uicontrol Options > \uicontrol {Version Control} > \uicontrol ClearCase,
|
||||
To automatically check out files when you edit them, select \uicontrol Edit
|
||||
> \uicontrol Preferences > \uicontrol {Version Control} > \uicontrol ClearCase,
|
||||
and then select the \uicontrol {Automatically check out files on edit}
|
||||
check box.
|
||||
|
||||
@@ -91,12 +91,12 @@
|
||||
To create a permanent new version of the current file or all files in the
|
||||
versioned object base (VOB), select \uicontrol Tools >
|
||||
\uicontrol {ClearCase} > \uicontrol {Check In}. To be asked to confirm
|
||||
that you want to check in the files, select \uicontrol Tools >
|
||||
\uicontrol Options > \uicontrol {Version Control} > \uicontrol ClearCase,
|
||||
that you want to check in the files, select \uicontrol Edit >
|
||||
\uicontrol Preferences > \uicontrol {Version Control} > \uicontrol ClearCase,
|
||||
and then select the \uicontrol {Prompt on check-in} check box.
|
||||
|
||||
By default, you are asked to enter a comment when checking files out or in.
|
||||
To suppress this prompt, select \uicontrol Tools > \uicontrol Options >
|
||||
To suppress this prompt, select \uicontrol Edit > \uicontrol Preferences >
|
||||
\uicontrol {Version Control} > \uicontrol ClearCase, and then select the
|
||||
\uicontrol {Do not prompt for comment during checkout or check-in} check
|
||||
box.
|
||||
@@ -107,7 +107,7 @@
|
||||
\uicontrol Tools > \uicontrol ClearCase > \uicontrol {Undo Hijack}.
|
||||
|
||||
By default, the files in the VOBs are indexed for quick access to their
|
||||
statuses. To disable indexing, select \uicontrol Tools > \uicontrol Options
|
||||
statuses. To disable indexing, select \uicontrol Edit > \uicontrol Preferences
|
||||
> \uicontrol {Version Control} > \uicontrol ClearCase, and then select the
|
||||
\uicontrol {Disable indexer} check box. To only have some VOBs indexed,
|
||||
specify them in the \uicontrol {Index only VOBs} field.
|
||||
|
||||
@@ -51,8 +51,8 @@
|
||||
To unedit files in the local directory, as well as recursively in all
|
||||
subdirectories, select \uicontrol {Unedit Repository}.
|
||||
|
||||
To specify the CVS root directory, select \uicontrol Tools >
|
||||
\uicontrol Options > \uicontrol {Version Control} > \uicontrol CVS, and then
|
||||
To specify the CVS root directory, select \uicontrol Edit >
|
||||
\uicontrol Preferences > \uicontrol {Version Control} > \uicontrol CVS, and then
|
||||
specify the path to the directory in the \uicontrol {CVS root} field.
|
||||
|
||||
You can specify settings for viewing diff output in the
|
||||
|
||||
@@ -33,8 +33,8 @@
|
||||
repositories. To allow access, make sure that the command line clients can
|
||||
be located using the \c{PATH} environment variable. Alternatively, specify
|
||||
the path to the command line client executable in the \uicontrol Command
|
||||
field in the version control system specific tab in \uicontrol Tools >
|
||||
\uicontrol Options > \uicontrol {Version Control}.
|
||||
field in the version control system specific tab in \uicontrol Edit >
|
||||
\uicontrol Preferences > \uicontrol {Version Control}.
|
||||
|
||||
If authentication is required to access the repository, enter the user
|
||||
credentials in the \uicontrol Username and \uicontrol Password fields.
|
||||
@@ -54,9 +54,8 @@
|
||||
|
||||
\section1 Setting Up General Options
|
||||
|
||||
Select \uicontrol{Tools} > \uicontrol{Options} > \uicontrol{Version Control}
|
||||
> \uicontrol{General}
|
||||
to specify settings for submit messages:
|
||||
Select \uicontrol Edit > \uicontrol Preferences > \uicontrol {Version Control}
|
||||
> \uicontrol General to specify settings for submit messages:
|
||||
|
||||
\list
|
||||
\li \uicontrol{Wrap submit messages at} limits the line length of a
|
||||
|
||||
@@ -60,8 +60,8 @@
|
||||
\l {Using Common Functions}, you can select \uicontrol Tools >
|
||||
\uicontrol Perforce > \uicontrol {Edit File} to open a file for editing
|
||||
within the client workspace. By default, files are automatically opened for
|
||||
editing. To disable this feature, select \uicontrol Tools >
|
||||
\uicontrol Options > \uicontrol {Version Control} > \uicontrol Perforce,
|
||||
editing. To disable this feature, select \uicontrol Edit >
|
||||
\uicontrol Preferences > \uicontrol {Version Control} > \uicontrol Perforce,
|
||||
and then deselect the \uicontrol {Automatically open files when editing}
|
||||
check box.
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
\uicontrol Tools > \uicontrol Perforce > \uicontrol Describe.
|
||||
|
||||
By default, you are prompted to confirm that you want to submit changes.
|
||||
To suppress the prompt, select \uicontrol Tools > \uicontrol Options >
|
||||
To suppress the prompt, select \uicontrol Edit > \uicontrol Preferences >
|
||||
\uicontrol {Version Control} > \uicontrol Perforce, and then deselect the
|
||||
\uicontrol {Prompt on submit} check box.
|
||||
*/
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
for a revision.
|
||||
|
||||
By default, you are prompted to confirm that you want to submit changes.
|
||||
To suppress the prompt, select \uicontrol Tools > \uicontrol Options >
|
||||
To suppress the prompt, select \uicontrol Edit > \uicontrol Preferences >
|
||||
\uicontrol {Version Control} > \uicontrol Subversion, and then deselect the
|
||||
\uicontrol {Prompt on submit} check box.
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
installation directory, and therefore, the authorization fails.
|
||||
|
||||
You can set the \c HOME environment variable from \QC. Select
|
||||
\uicontrol Tools > \uicontrol Options > \uicontrol {Version Control} >
|
||||
\uicontrol Edit > \uicontrol Preferences > \uicontrol {Version Control} >
|
||||
\uicontrol Git, and then select the
|
||||
\uicontrol {Set "HOME" environment variable} check box. \c HOME is
|
||||
set to \c %HOMEDRIVE%%HOMEPATH% when the Git executable is run and
|
||||
@@ -480,7 +480,7 @@
|
||||
|
||||
To pull changes from the remote repository, select \uicontrol Pull. If there
|
||||
are locally modified files, you are prompted to stash the changes. Select
|
||||
\uicontrol Tools > \uicontrol Options > \uicontrol {Version Control} >
|
||||
\uicontrol Edit > \uicontrol Preferences > \uicontrol {Version Control} >
|
||||
\uicontrol Git and then select the \uicontrol {Pull with rebase} check box
|
||||
to perform a rebase operation while pulling.
|
||||
|
||||
@@ -569,7 +569,7 @@
|
||||
To refresh the list of changes, select \uicontrol Refresh.
|
||||
|
||||
The \uicontrol Remote field lists the remotes of the current repository that
|
||||
are detected as Gerrit servers. Select \uicontrol Tools > \uicontrol Options
|
||||
are detected as Gerrit servers. Select \uicontrol Edit > \uicontrol Preferences
|
||||
> \uicontrol {Version Control} > \uicontrol Gerrit to specify a fallback
|
||||
connection to a Gerrit server over SSH. The Gerrit REST interface and the
|
||||
\l{https://curl.haxx.se/}{curl} tool are used for HTTP connections.
|
||||
@@ -594,11 +594,11 @@
|
||||
\uicontrol Git > \uicontrol {Git Tools} > \uicontrol Gitk. You can also
|
||||
start the tool to view commits in the current document or in the folder that
|
||||
contains the current document. To specify arguments for running Gitk, select
|
||||
\uicontrol Tools > \uicontrol Options > \uicontrol {Version Control} >
|
||||
\uicontrol Edit > \uicontrol Preferences > \uicontrol {Version Control} >
|
||||
\uicontrol Git.
|
||||
|
||||
To use some other application for viewing Git history, such as GitX or
|
||||
QGit viewer, select \uicontrol Tools > \uicontrol Options >
|
||||
QGit viewer, select \uicontrol Edit > \uicontrol Preferences >
|
||||
\uicontrol {Version Control} > \uicontrol Git and specify the path to the
|
||||
application executable in the \uicontrol {Command} field. To start the
|
||||
application, select \uicontrol Tools > \uicontrol Git
|
||||
|
||||
Reference in New Issue
Block a user