forked from qt-creator/qt-creator
Doc: replace \i with \o in \row tags
The \i command has become obsolete. Change-Id: Iee2bc3f4e54be063f805ffe981748e54fafac8fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
This commit is contained in:
@@ -872,16 +872,16 @@
|
|||||||
|
|
||||||
\table
|
\table
|
||||||
\row
|
\row
|
||||||
\i \bold{Note:}
|
\o \bold{Note:}
|
||||||
|
|
||||||
\row
|
\row
|
||||||
\i GDB, and therefore \QC's debugger works for optimized
|
\o GDB, and therefore \QC's debugger works for optimized
|
||||||
builds on Linux and Mac OS X. Optimization can lead to
|
builds on Linux and Mac OS X. Optimization can lead to
|
||||||
re-ordering of instructions or removal of some local variables,
|
re-ordering of instructions or removal of some local variables,
|
||||||
causing the \gui{Locals and Expressions} view to show unexpected
|
causing the \gui{Locals and Expressions} view to show unexpected
|
||||||
data.
|
data.
|
||||||
\row
|
\row
|
||||||
\i The debug information provided by GCC does not include enough
|
\o The debug information provided by GCC does not include enough
|
||||||
information about the time when a variable is initialized.
|
information about the time when a variable is initialized.
|
||||||
Therefore, \QC can not tell whether the contents of a
|
Therefore, \QC can not tell whether the contents of a
|
||||||
local variable contains "real data", or "initial noise". If a
|
local variable contains "real data", or "initial noise". If a
|
||||||
|
|||||||
@@ -590,62 +590,62 @@
|
|||||||
\o Icon
|
\o Icon
|
||||||
\o Description
|
\o Description
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/class.png
|
\o \inlineimage completion/class.png
|
||||||
\i A class
|
\o A class
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/enum.png
|
\o \inlineimage completion/enum.png
|
||||||
\i An enum
|
\o An enum
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/enumerator.png
|
\o \inlineimage completion/enumerator.png
|
||||||
\i An enumerator (value of an enum)
|
\o An enumerator (value of an enum)
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/func.png
|
\o \inlineimage completion/func.png
|
||||||
\i A function
|
\o A function
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/func_priv.png
|
\o \inlineimage completion/func_priv.png
|
||||||
\i A private function
|
\o A private function
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/func_prot.png
|
\o \inlineimage completion/func_prot.png
|
||||||
\i A protected function
|
\o A protected function
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/var.png
|
\o \inlineimage completion/var.png
|
||||||
\i A variable
|
\o A variable
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/var_priv.png
|
\o \inlineimage completion/var_priv.png
|
||||||
\i A private variable
|
\o A private variable
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/var_prot.png
|
\o \inlineimage completion/var_prot.png
|
||||||
\i A protected variable
|
\o A protected variable
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/signal.png
|
\o \inlineimage completion/signal.png
|
||||||
\i A signal
|
\o A signal
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/slot.png
|
\o \inlineimage completion/slot.png
|
||||||
\i A slot
|
\o A slot
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/slot_priv.png
|
\o \inlineimage completion/slot_priv.png
|
||||||
\i A private slot
|
\o A private slot
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/slot_prot.png
|
\o \inlineimage completion/slot_prot.png
|
||||||
\i A protected slot
|
\o A protected slot
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/keyword.png
|
\o \inlineimage completion/keyword.png
|
||||||
\i A C++ keyword
|
\o A C++ keyword
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/snippet.png
|
\o \inlineimage completion/snippet.png
|
||||||
\i A C++ code snippet
|
\o A C++ code snippet
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/element.png
|
\o \inlineimage completion/element.png
|
||||||
\i A QML element
|
\o A QML element
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/qmlsnippet.png
|
\o \inlineimage completion/qmlsnippet.png
|
||||||
\i A QML code snippet
|
\o A QML code snippet
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/macro.png
|
\o \inlineimage completion/macro.png
|
||||||
\i A macro
|
\o A macro
|
||||||
\row
|
\row
|
||||||
\i \inlineimage completion/namespace.png
|
\o \inlineimage completion/namespace.png
|
||||||
\i A namespace
|
\o A namespace
|
||||||
\endtable
|
\endtable
|
||||||
|
|
||||||
\section2 Completing Code Snippets
|
\section2 Completing Code Snippets
|
||||||
@@ -1356,12 +1356,12 @@
|
|||||||
|
|
||||||
\table
|
\table
|
||||||
\header
|
\header
|
||||||
\i Refactoring Action
|
\o Refactoring Action
|
||||||
\i Description
|
\o Description
|
||||||
\i Activation
|
\o Activation
|
||||||
\row
|
\row
|
||||||
\i Add Curly Braces
|
\o Add Curly Braces
|
||||||
\i Adds curly braces to an if statement that does not contain a
|
\o Adds curly braces to an if statement that does not contain a
|
||||||
compound statement. For example, rewrites
|
compound statement. For example, rewrites
|
||||||
|
|
||||||
\code
|
\code
|
||||||
@@ -1376,10 +1376,10 @@
|
|||||||
b;
|
b;
|
||||||
}
|
}
|
||||||
\endcode
|
\endcode
|
||||||
\i if
|
\o if
|
||||||
\row
|
\row
|
||||||
\i Move Declaration out of Condition
|
\o Move Declaration out of Condition
|
||||||
\i Moves a declaration out of an if or while condition to simplify the
|
\o Moves a declaration out of an if or while condition to simplify the
|
||||||
condition. For example, rewrites
|
condition. For example, rewrites
|
||||||
|
|
||||||
\code
|
\code
|
||||||
@@ -1392,10 +1392,10 @@
|
|||||||
Type name = foo;
|
Type name = foo;
|
||||||
if (name) {}
|
if (name) {}
|
||||||
\endcode
|
\endcode
|
||||||
\i Name of the introduced variable
|
\o Name of the introduced variable
|
||||||
\row
|
\row
|
||||||
\i Rewrite Condition Using ||
|
\o Rewrite Condition Using ||
|
||||||
\i Rewrites the expression according to De Morgan's laws. For example,
|
\o Rewrites the expression according to De Morgan's laws. For example,
|
||||||
rewrites:
|
rewrites:
|
||||||
\code
|
\code
|
||||||
!a && !b
|
!a && !b
|
||||||
@@ -1406,10 +1406,10 @@
|
|||||||
\code
|
\code
|
||||||
!(a || b)
|
!(a || b)
|
||||||
\endcode
|
\endcode
|
||||||
\i &&
|
\o &&
|
||||||
\row
|
\row
|
||||||
\i Rewrite Using \e operator
|
\o Rewrite Using \e operator
|
||||||
\i Rewrites an expression negating it and using the inverse operator. For
|
\o Rewrites an expression negating it and using the inverse operator. For
|
||||||
example, rewrites:
|
example, rewrites:
|
||||||
|
|
||||||
\list
|
\list
|
||||||
@@ -1446,10 +1446,10 @@
|
|||||||
|
|
||||||
\endlist
|
\endlist
|
||||||
|
|
||||||
\i <= < > >= == !=
|
\o <= < > >= == !=
|
||||||
\row
|
\row
|
||||||
\i Split Declaration
|
\o Split Declaration
|
||||||
\i Splits a simple declaration into several declarations. For example,
|
\o Splits a simple declaration into several declarations. For example,
|
||||||
rewrites:
|
rewrites:
|
||||||
\code
|
\code
|
||||||
int *a, b;
|
int *a, b;
|
||||||
@@ -1461,10 +1461,10 @@
|
|||||||
int *a;
|
int *a;
|
||||||
int b;
|
int b;
|
||||||
\endcode
|
\endcode
|
||||||
\i Type name or variable name
|
\o Type name or variable name
|
||||||
\row
|
\row
|
||||||
\i Split if Statement
|
\o Split if Statement
|
||||||
\i Splits an if statement into several statements. For example, rewrites:
|
\o Splits an if statement into several statements. For example, rewrites:
|
||||||
\code
|
\code
|
||||||
if (something && something_else) {
|
if (something && something_else) {
|
||||||
}
|
}
|
||||||
@@ -1495,10 +1495,10 @@
|
|||||||
x;
|
x;
|
||||||
\endcode
|
\endcode
|
||||||
|
|
||||||
\i && ||
|
\o && ||
|
||||||
\row
|
\row
|
||||||
\i Swap Operands
|
\o Swap Operands
|
||||||
\i Rewrites an expression in the inverse order using the inverse operator.
|
\o Rewrites an expression in the inverse order using the inverse operator.
|
||||||
For example, rewrites:
|
For example, rewrites:
|
||||||
\code
|
\code
|
||||||
a op b
|
a op b
|
||||||
@@ -1508,22 +1508,22 @@
|
|||||||
\code
|
\code
|
||||||
b flipop a
|
b flipop a
|
||||||
\endcode
|
\endcode
|
||||||
\i <= < > >= == != && ||
|
\o <= < > >= == != && ||
|
||||||
\row
|
\row
|
||||||
\i Convert to Decimal
|
\o Convert to Decimal
|
||||||
\i Converts an integer literal to decimal representation
|
\o Converts an integer literal to decimal representation
|
||||||
\i Numeric literal
|
\o Numeric literal
|
||||||
\row
|
\row
|
||||||
\i Convert to Hexadecimal
|
\o Convert to Hexadecimal
|
||||||
\i Converts an integer literal to hexadecimal representation
|
\o Converts an integer literal to hexadecimal representation
|
||||||
\i Numeric literal
|
\o Numeric literal
|
||||||
\row
|
\row
|
||||||
\i Convert to Octal
|
\o Convert to Octal
|
||||||
\i Converts an integer literal to octal representation
|
\o Converts an integer literal to octal representation
|
||||||
\i Numeric literal
|
\o Numeric literal
|
||||||
\row
|
\row
|
||||||
\i Convert to Objective-C String Literal
|
\o Convert to Objective-C String Literal
|
||||||
\i Converts a string literal to an Objective-C string literal
|
\o Converts a string literal to an Objective-C string literal
|
||||||
if the file type is Objective-C(++). For example, rewrites the following strings
|
if the file type is Objective-C(++). For example, rewrites the following strings
|
||||||
|
|
||||||
\code
|
\code
|
||||||
@@ -1537,10 +1537,10 @@
|
|||||||
\code
|
\code
|
||||||
@"abcd"
|
@"abcd"
|
||||||
\endcode
|
\endcode
|
||||||
\i String literal
|
\o String literal
|
||||||
\row
|
\row
|
||||||
\i Enclose in QLatin1Char()
|
\o Enclose in QLatin1Char()
|
||||||
\i Sets the encoding for a character to Latin-1, unless the character is
|
\o Sets the encoding for a character to Latin-1, unless the character is
|
||||||
already enclosed in QLatin1Char, QT_TRANSLATE_NOOP, tr, trUtf8,
|
already enclosed in QLatin1Char, QT_TRANSLATE_NOOP, tr, trUtf8,
|
||||||
QLatin1Literal, or QLatin1String. For example, rewrites
|
QLatin1Literal, or QLatin1String. For example, rewrites
|
||||||
|
|
||||||
@@ -1553,10 +1553,10 @@
|
|||||||
\code
|
\code
|
||||||
QLatin1Char('a')
|
QLatin1Char('a')
|
||||||
\endcode
|
\endcode
|
||||||
\i String literal
|
\o String literal
|
||||||
\row
|
\row
|
||||||
\i Enclose in QLatin1String()
|
\o Enclose in QLatin1String()
|
||||||
\i Sets the encoding for a string to Latin-1, unless the string is
|
\o Sets the encoding for a string to Latin-1, unless the string is
|
||||||
already enclosed in QLatin1Char, QT_TRANSLATE_NOOP, tr, trUtf8,
|
already enclosed in QLatin1Char, QT_TRANSLATE_NOOP, tr, trUtf8,
|
||||||
QLatin1Literal, or QLatin1String. For example, rewrites
|
QLatin1Literal, or QLatin1String. For example, rewrites
|
||||||
\code
|
\code
|
||||||
@@ -1569,11 +1569,11 @@
|
|||||||
QLatin1String("abcd")
|
QLatin1String("abcd")
|
||||||
\endcode
|
\endcode
|
||||||
|
|
||||||
\i String literal
|
\o String literal
|
||||||
|
|
||||||
\row
|
\row
|
||||||
\i Mark as Translatable
|
\o Mark as Translatable
|
||||||
\i Marks a string translatable. For example, rewrites \c "abcd" with
|
\o Marks a string translatable. For example, rewrites \c "abcd" with
|
||||||
one of the following options, depending on which of them is available:
|
one of the following options, depending on which of them is available:
|
||||||
|
|
||||||
\code
|
\code
|
||||||
@@ -1582,28 +1582,28 @@
|
|||||||
QT_TRANSLATE_NOOP("GLOBAL", "abcd")
|
QT_TRANSLATE_NOOP("GLOBAL", "abcd")
|
||||||
\endcode
|
\endcode
|
||||||
|
|
||||||
\i String literal
|
\o String literal
|
||||||
|
|
||||||
\row
|
\row
|
||||||
\i #include Header File
|
\o #include Header File
|
||||||
\i Adds the matching #include statement for a forward-declared class or struct
|
\o Adds the matching #include statement for a forward-declared class or struct
|
||||||
\i Forward-declared class or struct
|
\o Forward-declared class or struct
|
||||||
\row
|
\row
|
||||||
\i Add Definition in 'filename'
|
\o Add Definition in 'filename'
|
||||||
\i Inserts a definition stub for a member function declaration in the
|
\o Inserts a definition stub for a member function declaration in the
|
||||||
implementation file. The definition is placed after that of the
|
implementation file. The definition is placed after that of the
|
||||||
preceding declaration. Qualified names are minimized when possible,
|
preceding declaration. Qualified names are minimized when possible,
|
||||||
instead of always being fully expanded.
|
instead of always being fully expanded.
|
||||||
|
|
||||||
\i Method name
|
\o Method name
|
||||||
\row
|
\row
|
||||||
\i Add 'Function' Declaration
|
\o Add 'Function' Declaration
|
||||||
\i Inserts the member function declaration that matches the member function
|
\o Inserts the member function declaration that matches the member function
|
||||||
definition into the class declaration. The function can be public,
|
definition into the class declaration. The function can be public,
|
||||||
protected, private, public slot, protected slot, or private slot.
|
protected, private, public slot, protected slot, or private slot.
|
||||||
\i Method name
|
\o Method name
|
||||||
\row
|
\row
|
||||||
\i Add Local Declaration
|
\o Add Local Declaration
|
||||||
\i
|
\i
|
||||||
Adds the type of an assignee, if the type of the right-hand side of the assignment
|
Adds the type of an assignee, if the type of the right-hand side of the assignment
|
||||||
is known. For example, rewrites
|
is known. For example, rewrites
|
||||||
@@ -1620,43 +1620,43 @@
|
|||||||
|
|
||||||
where Type is the return type of \c {foo()}
|
where Type is the return type of \c {foo()}
|
||||||
|
|
||||||
\i Assignee
|
\o Assignee
|
||||||
|
|
||||||
\row
|
\row
|
||||||
\i Convert to Camel Case
|
\o Convert to Camel Case
|
||||||
\i Converts a symbol name to camel case, where elements of the name are joined
|
\o Converts a symbol name to camel case, where elements of the name are joined
|
||||||
without delimiter characters and the initial character of each element is
|
without delimiter characters and the initial character of each element is
|
||||||
capitalized. For example, rewrites \c an_example_symbol
|
capitalized. For example, rewrites \c an_example_symbol
|
||||||
as \c anExampleSymbol and \c AN_EXAMPLE_SYMBOL as \c AnExampleSymbol
|
as \c anExampleSymbol and \c AN_EXAMPLE_SYMBOL as \c AnExampleSymbol
|
||||||
\i Identifier
|
\o Identifier
|
||||||
\row
|
\row
|
||||||
\i Complete Switch Statement
|
\o Complete Switch Statement
|
||||||
\i Adds all possible cases to a switch statement of the type \c enum
|
\o Adds all possible cases to a switch statement of the type \c enum
|
||||||
\i Switch
|
\o Switch
|
||||||
\row
|
\row
|
||||||
\i Generate Missing Q_PROPERTY Members
|
\o Generate Missing Q_PROPERTY Members
|
||||||
\i Adds missing members to a Q_PROPERTY:
|
\o Adds missing members to a Q_PROPERTY:
|
||||||
\list
|
\list
|
||||||
\o \c read method
|
\o \c read method
|
||||||
\o \c write method, if there is a WRITE
|
\o \c write method, if there is a WRITE
|
||||||
\o \c {onChanged} signal, if there is a NOTIFY
|
\o \c {onChanged} signal, if there is a NOTIFY
|
||||||
\o data member with the name \c {m_<propertyName>}
|
\o data member with the name \c {m_<propertyName>}
|
||||||
\endlist
|
\endlist
|
||||||
\i Q_PROPERTY
|
\o Q_PROPERTY
|
||||||
\row
|
\row
|
||||||
\i Apply Changes
|
\o Apply Changes
|
||||||
\i Keeps function declarations and definitions synchronized by
|
\o Keeps function declarations and definitions synchronized by
|
||||||
checking for the matching declaration or definition when you
|
checking for the matching declaration or definition when you
|
||||||
edit a function signature and by applying the changes to the
|
edit a function signature and by applying the changes to the
|
||||||
matching code.
|
matching code.
|
||||||
\i Function signature. When this action is available, a light bulb
|
\o Function signature. When this action is available, a light bulb
|
||||||
icon appears:
|
icon appears:
|
||||||
\inlineimage qml-toolbar-indicator.png
|
\inlineimage qml-toolbar-indicator.png
|
||||||
\row
|
\row
|
||||||
\i Add #include for undeclared identifier
|
\o Add #include for undeclared identifier
|
||||||
\i Adds an #include directive to the current file to make the
|
\o Adds an #include directive to the current file to make the
|
||||||
declaration of a symbol available.
|
declaration of a symbol available.
|
||||||
\i Undeclared identifier
|
\o Undeclared identifier
|
||||||
\endtable
|
\endtable
|
||||||
|
|
||||||
\section2 Refactoring QML Code
|
\section2 Refactoring QML Code
|
||||||
@@ -1680,17 +1680,17 @@
|
|||||||
|
|
||||||
\table
|
\table
|
||||||
\header
|
\header
|
||||||
\i Refactoring Action
|
\o Refactoring Action
|
||||||
\i Description
|
\o Description
|
||||||
\i Activation
|
\o Activation
|
||||||
|
|
||||||
\row
|
\row
|
||||||
\i Move Component into 'filename.qml'
|
\o Move Component into 'filename.qml'
|
||||||
\i Moves a QML element into a separate file
|
\o Moves a QML element into a separate file
|
||||||
\i Element name
|
\o Element name
|
||||||
\row
|
\row
|
||||||
\i Split Initializer
|
\o Split Initializer
|
||||||
\i Reformats a one-line element into a multi-line element. For example,
|
\o Reformats a one-line element into a multi-line element. For example,
|
||||||
rewrites
|
rewrites
|
||||||
\code
|
\code
|
||||||
Item { x: 10; y: 20; width: 10 }
|
Item { x: 10; y: 20; width: 10 }
|
||||||
@@ -1705,17 +1705,17 @@
|
|||||||
width: 10
|
width: 10
|
||||||
}
|
}
|
||||||
\endcode
|
\endcode
|
||||||
\i Element property
|
\o Element property
|
||||||
\row
|
\row
|
||||||
\i Wrap in Loader
|
\o Wrap in Loader
|
||||||
\i Wraps the element in a Component element and loads it dynamically in
|
\o Wraps the element in a Component element and loads it dynamically in
|
||||||
a Loader element. This is usually done to improve startup time.
|
a Loader element. This is usually done to improve startup time.
|
||||||
\i Element name
|
\o Element name
|
||||||
\row
|
\row
|
||||||
\i Add a message suppression comment
|
\o Add a message suppression comment
|
||||||
\i Prepends the line with an annotation comment that stops the message
|
\o Prepends the line with an annotation comment that stops the message
|
||||||
from being generated.
|
from being generated.
|
||||||
\i Error, warning or hint from static analysis
|
\o Error, warning or hint from static analysis
|
||||||
|
|
||||||
\endtable
|
\endtable
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -36,32 +36,32 @@
|
|||||||
Version control systems supported by \QC are:
|
Version control systems supported by \QC are:
|
||||||
\table
|
\table
|
||||||
\header
|
\header
|
||||||
\i Version Control System
|
\o Version Control System
|
||||||
\i Address
|
\o Address
|
||||||
\i Notes
|
\o Notes
|
||||||
\row
|
\row
|
||||||
\i Bazaar
|
\o Bazaar
|
||||||
\i \l{http://bazaar.canonical.com/}
|
\o \l{http://bazaar.canonical.com/}
|
||||||
\i \QC 2.2 and later
|
\o \QC 2.2 and later
|
||||||
\row
|
\row
|
||||||
\i CVS
|
\o CVS
|
||||||
\i \l{http://www.cvshome.org}
|
\o \l{http://www.cvshome.org}
|
||||||
\i
|
\i
|
||||||
\row
|
\row
|
||||||
\i Git
|
\o Git
|
||||||
\i \l{http://git-scm.com/}
|
\o \l{http://git-scm.com/}
|
||||||
\i
|
\i
|
||||||
\row
|
\row
|
||||||
\i Mercurial
|
\o Mercurial
|
||||||
\i \l{http://mercurial.selenic.com/}
|
\o \l{http://mercurial.selenic.com/}
|
||||||
\i \QC 2.0 and later
|
\o \QC 2.0 and later
|
||||||
\row
|
\row
|
||||||
\i Perforce
|
\o Perforce
|
||||||
\i \l{http://www.perforce.com}
|
\o \l{http://www.perforce.com}
|
||||||
\i Server version 2006.1 and later
|
\o Server version 2006.1 and later
|
||||||
\row
|
\row
|
||||||
\i Subversion
|
\o Subversion
|
||||||
\i \l{http://subversion.apache.org/}
|
\o \l{http://subversion.apache.org/}
|
||||||
\i
|
\i
|
||||||
\endtable
|
\endtable
|
||||||
|
|
||||||
@@ -294,11 +294,11 @@
|
|||||||
\o Menu Item
|
\o Menu Item
|
||||||
\o Description
|
\o Description
|
||||||
\row
|
\row
|
||||||
\i \gui{Pull}
|
\o \gui{Pull}
|
||||||
\i Turn the branch into a mirror of another branch.
|
\o Turn the branch into a mirror of another branch.
|
||||||
\row
|
\row
|
||||||
\i \gui{Push}
|
\o \gui{Push}
|
||||||
\i Update a mirror of the branch.
|
\o Update a mirror of the branch.
|
||||||
|
|
||||||
\endtable
|
\endtable
|
||||||
|
|
||||||
@@ -313,14 +313,14 @@
|
|||||||
\o Menu Item
|
\o Menu Item
|
||||||
\o Description
|
\o Description
|
||||||
\row
|
\row
|
||||||
\i \gui{Edit}
|
\o \gui{Edit}
|
||||||
\i Open a file for editing.
|
\o Open a file for editing.
|
||||||
\row
|
\row
|
||||||
\i \gui{Push}
|
\o \gui{Push}
|
||||||
\i Push changes to the remote repository.
|
\o Push changes to the remote repository.
|
||||||
\row
|
\row
|
||||||
\i \gui{Unedit}
|
\o \gui{Unedit}
|
||||||
\i Discard the changes that you made in a file.
|
\o Discard the changes that you made in a file.
|
||||||
|
|
||||||
\endtable
|
\endtable
|
||||||
|
|
||||||
@@ -336,47 +336,47 @@
|
|||||||
\o Menu Item
|
\o Menu Item
|
||||||
\o Description
|
\o Description
|
||||||
\row
|
\row
|
||||||
\i \gui {Patch > Apply from Editor/Apply from File}
|
\o \gui {Patch > Apply from Editor/Apply from File}
|
||||||
\i Patches are rewriting instructions that can be applied to a set
|
\o Patches are rewriting instructions that can be applied to a set
|
||||||
of files. You can either apply a patch file that is open in \QC
|
of files. You can either apply a patch file that is open in \QC
|
||||||
or select the patch file to apply from the file system.
|
or select the patch file to apply from the file system.
|
||||||
\row
|
\row
|
||||||
\i \gui{Pull}
|
\o \gui{Pull}
|
||||||
\i Pull changes from the remote repository. If there are locally
|
\o Pull changes from the remote repository. If there are locally
|
||||||
modified files, you are prompted to stash those changes. Select
|
modified files, you are prompted to stash those changes. Select
|
||||||
\gui{Tools > Options > Version Control > Git} and select the
|
\gui{Tools > Options > Version Control > Git} and select the
|
||||||
\gui {Pull with rebase} check box to perform a rebase operation
|
\gui {Pull with rebase} check box to perform a rebase operation
|
||||||
while pulling.
|
while pulling.
|
||||||
|
|
||||||
\row
|
\row
|
||||||
\i \gui{Clean/Clean Project}
|
\o \gui{Clean/Clean Project}
|
||||||
\i All files that are not under version control (with the exception
|
\o All files that are not under version control (with the exception
|
||||||
of patches and project files) are displayed in the \gui {Clean
|
of patches and project files) are displayed in the \gui {Clean
|
||||||
Repository} dialog. Select the files to delete and click
|
Repository} dialog. Select the files to delete and click
|
||||||
\gui Delete. This allows you to clean a build completely.
|
\gui Delete. This allows you to clean a build completely.
|
||||||
\row
|
\row
|
||||||
\i \gui{Launch gitk}
|
\o \gui{Launch gitk}
|
||||||
\i Start the commit viewer for Git, gitk.
|
\o Start the commit viewer for Git, gitk.
|
||||||
\row
|
\row
|
||||||
\i \gui{Branches}
|
\o \gui{Branches}
|
||||||
\i Manage local and remote branches.
|
\o Manage local and remote branches.
|
||||||
\row
|
\row
|
||||||
\i \gui Remotes
|
\o \gui Remotes
|
||||||
\i Manage remote repositories available in Git.
|
\o Manage remote repositories available in Git.
|
||||||
\row
|
\row
|
||||||
\i \gui {Stage File for Commit}
|
\o \gui {Stage File for Commit}
|
||||||
\i Mark new or modified files for committing to the repository.
|
\o Mark new or modified files for committing to the repository.
|
||||||
To undo this function, select \gui {Unstage File from Commit}.
|
To undo this function, select \gui {Unstage File from Commit}.
|
||||||
\row
|
\row
|
||||||
\i \gui{Show Commit}
|
\o \gui{Show Commit}
|
||||||
\i Select a commit to view. Enter the SHA of the commit
|
\o Select a commit to view. Enter the SHA of the commit
|
||||||
in the \gui Change field.
|
in the \gui Change field.
|
||||||
\row
|
\row
|
||||||
\i \gui Stash
|
\o \gui Stash
|
||||||
\i Store local changes temporarily.
|
\o Store local changes temporarily.
|
||||||
\row
|
\row
|
||||||
\i \gui{Amend Last Commit}
|
\o \gui{Amend Last Commit}
|
||||||
\i Revert the last commit.
|
\o Revert the last commit.
|
||||||
|
|
||||||
\endtable
|
\endtable
|
||||||
|
|
||||||
@@ -395,24 +395,24 @@
|
|||||||
\o Menu Item
|
\o Menu Item
|
||||||
\o Description
|
\o Description
|
||||||
\row
|
\row
|
||||||
\i \gui{Add}
|
\o \gui{Add}
|
||||||
\i Create new tracking and non-tracking branches.
|
\o Create new tracking and non-tracking branches.
|
||||||
\row
|
\row
|
||||||
\i \gui{Checkout}
|
\o \gui{Checkout}
|
||||||
\i Check out the selected branch and make it current.
|
\o Check out the selected branch and make it current.
|
||||||
\row
|
\row
|
||||||
\i \gui{Remove}
|
\o \gui{Remove}
|
||||||
\i Remove a local branch. You cannot delete remote branches.
|
\o Remove a local branch. You cannot delete remote branches.
|
||||||
\row
|
\row
|
||||||
\i \gui{Diff}
|
\o \gui{Diff}
|
||||||
\i Show the differences between the selected and the current
|
\o Show the differences between the selected and the current
|
||||||
branch.
|
branch.
|
||||||
\row
|
\row
|
||||||
\i \gui{Log}
|
\o \gui{Log}
|
||||||
\i Show the changes in a branch.
|
\o Show the changes in a branch.
|
||||||
\row
|
\row
|
||||||
\i \gui{Refresh}
|
\o \gui{Refresh}
|
||||||
\i Refresh the list of branches.
|
\o Refresh the list of branches.
|
||||||
\endtable
|
\endtable
|
||||||
|
|
||||||
\section3 Working with Remote Repositories
|
\section3 Working with Remote Repositories
|
||||||
@@ -427,18 +427,18 @@
|
|||||||
\o Menu Item
|
\o Menu Item
|
||||||
\o Description
|
\o Description
|
||||||
\row
|
\row
|
||||||
\i \gui{Add}
|
\o \gui{Add}
|
||||||
\i Add a new remote repository.
|
\o Add a new remote repository.
|
||||||
\row
|
\row
|
||||||
\i \gui{Fetch}
|
\o \gui{Fetch}
|
||||||
\i Fetch all the branches and change information from a remote
|
\o Fetch all the branches and change information from a remote
|
||||||
repository.
|
repository.
|
||||||
\row
|
\row
|
||||||
\i \gui{Remove}
|
\o \gui{Remove}
|
||||||
\i Remove a remote repository.
|
\o Remove a remote repository.
|
||||||
\row
|
\row
|
||||||
\i \gui{Refresh}
|
\o \gui{Refresh}
|
||||||
\i Refresh the list of remote repositories.
|
\o Refresh the list of remote repositories.
|
||||||
\endtable
|
\endtable
|
||||||
|
|
||||||
|
|
||||||
@@ -456,24 +456,24 @@
|
|||||||
\o Menu Item
|
\o Menu Item
|
||||||
\o Description
|
\o Description
|
||||||
\row
|
\row
|
||||||
\i \gui{Stashes}
|
\o \gui{Stashes}
|
||||||
\i Display a dialog that shows all known stashes with options to
|
\o Display a dialog that shows all known stashes with options to
|
||||||
restore, display or delete them.
|
restore, display or delete them.
|
||||||
\row
|
\row
|
||||||
\i \gui{Stash}
|
\o \gui{Stash}
|
||||||
\i Stash all local changes. The working copy is then reset to
|
\o Stash all local changes. The working copy is then reset to
|
||||||
the state it had right after the last commit.
|
the state it had right after the last commit.
|
||||||
\row
|
\row
|
||||||
\i \gui{Stash Snapshot}
|
\o \gui{Stash Snapshot}
|
||||||
\i Save a snapshot of your current work under a name for later
|
\o Save a snapshot of your current work under a name for later
|
||||||
reference. The working copy is unchanged.
|
reference. The working copy is unchanged.
|
||||||
|
|
||||||
For example, if you want to try something and find out later
|
For example, if you want to try something and find out later
|
||||||
that it does not work, you can discard it and return to the
|
that it does not work, you can discard it and return to the
|
||||||
state of the snapshot.
|
state of the snapshot.
|
||||||
\row
|
\row
|
||||||
\i \gui{Stash Pop}
|
\o \gui{Stash Pop}
|
||||||
\i Remove a single stashed state from the stash list and apply it
|
\o Remove a single stashed state from the stash list and apply it
|
||||||
on top of the current working tree state.
|
on top of the current working tree state.
|
||||||
\endtable
|
\endtable
|
||||||
|
|
||||||
@@ -488,22 +488,22 @@
|
|||||||
\o Menu Item
|
\o Menu Item
|
||||||
\o Description
|
\o Description
|
||||||
\row
|
\row
|
||||||
\i \gui{Import}
|
\o \gui{Import}
|
||||||
\i Apply changes from a patch file.
|
\o Apply changes from a patch file.
|
||||||
\row
|
\row
|
||||||
\i \gui{Incoming}
|
\o \gui{Incoming}
|
||||||
\i Monitor the status of a remote repository by listing
|
\o Monitor the status of a remote repository by listing
|
||||||
the changes that will be pulled.
|
the changes that will be pulled.
|
||||||
\row
|
\row
|
||||||
\i \gui{Outgoing}
|
\o \gui{Outgoing}
|
||||||
\i Monitor the status of a remote repository by listing
|
\o Monitor the status of a remote repository by listing
|
||||||
the changes that will be pushed.
|
the changes that will be pushed.
|
||||||
\row
|
\row
|
||||||
\i \gui{Pull}
|
\o \gui{Pull}
|
||||||
\i Pull changes from the remote repository.
|
\o Pull changes from the remote repository.
|
||||||
\row
|
\row
|
||||||
\i \gui{Push}
|
\o \gui{Push}
|
||||||
\i Push changes to the remote repository.
|
\o Push changes to the remote repository.
|
||||||
\endtable
|
\endtable
|
||||||
|
|
||||||
\section2 Using Additional Perforce Functions
|
\section2 Using Additional Perforce Functions
|
||||||
@@ -532,17 +532,17 @@
|
|||||||
\o Menu Item
|
\o Menu Item
|
||||||
\o Description
|
\o Description
|
||||||
\row
|
\row
|
||||||
\i \gui{Describe}
|
\o \gui{Describe}
|
||||||
\i View information about changelists and the files in them.
|
\o View information about changelists and the files in them.
|
||||||
\row
|
\row
|
||||||
\i \gui{Edit File}
|
\o \gui{Edit File}
|
||||||
\i Open a file for editing.
|
\o Open a file for editing.
|
||||||
\row
|
\row
|
||||||
\i \gui{Opened}
|
\o \gui{Opened}
|
||||||
\i List files that are open for editing.
|
\o List files that are open for editing.
|
||||||
\row
|
\row
|
||||||
\i \gui{Pending Changes}
|
\o \gui{Pending Changes}
|
||||||
\i Group files for commit.
|
\o Group files for commit.
|
||||||
\endtable
|
\endtable
|
||||||
|
|
||||||
\section2 Using Additional Subversion Functions
|
\section2 Using Additional Subversion Functions
|
||||||
@@ -556,8 +556,8 @@
|
|||||||
\o Menu Item
|
\o Menu Item
|
||||||
\o Description
|
\o Description
|
||||||
\row
|
\row
|
||||||
\i \gui{Describe}
|
\o \gui{Describe}
|
||||||
\i Display commit log messages for a revision.
|
\o Display commit log messages for a revision.
|
||||||
\endtable
|
\endtable
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -35,10 +35,10 @@
|
|||||||
|
|
||||||
\table
|
\table
|
||||||
\row
|
\row
|
||||||
\i \inlineimage creator-gs-01.png
|
\o \inlineimage creator-gs-01.png
|
||||||
\i \inlineimage creator-gs-02.png
|
\o \inlineimage creator-gs-02.png
|
||||||
\i \inlineimage creator-gs-03.png
|
\o \inlineimage creator-gs-03.png
|
||||||
\i \inlineimage creator-gs-04.png
|
\o \inlineimage creator-gs-04.png
|
||||||
\row
|
\row
|
||||||
\o \bold {\l{IDE Overview}}
|
\o \bold {\l{IDE Overview}}
|
||||||
|
|
||||||
|
|||||||
@@ -221,23 +221,23 @@
|
|||||||
|
|
||||||
\table
|
\table
|
||||||
\row
|
\row
|
||||||
\i \image qmldesigner-boolean-true.png
|
\o \image qmldesigner-boolean-true.png
|
||||||
\i TRUE
|
\o TRUE
|
||||||
\i The element is visible by default. The visibility might be
|
\o The element is visible by default. The visibility might be
|
||||||
overridden by the visibility set in the base state.
|
overridden by the visibility set in the base state.
|
||||||
\row
|
\row
|
||||||
\i \image qmldesigner-boolean-true-blue.png
|
\o \image qmldesigner-boolean-true-blue.png
|
||||||
\i TRUE (highlighted)
|
\o TRUE (highlighted)
|
||||||
\i The element is explicitly set to visible.
|
\o The element is explicitly set to visible.
|
||||||
\row
|
\row
|
||||||
\i \image qmldesigner-boolean-false.png
|
\o \image qmldesigner-boolean-false.png
|
||||||
\i FALSE
|
\o FALSE
|
||||||
\i The element is hidden by default. The visibility might be
|
\o The element is hidden by default. The visibility might be
|
||||||
overridden by the visibility set in the base state.
|
overridden by the visibility set in the base state.
|
||||||
\row
|
\row
|
||||||
\i \image qmldesigner-boolean-false-blue.png
|
\o \image qmldesigner-boolean-false-blue.png
|
||||||
\i FALSE (hightlighted)
|
\o FALSE (hightlighted)
|
||||||
\i The item is explicitly set to hidden.
|
\o The item is explicitly set to hidden.
|
||||||
\endtable
|
\endtable
|
||||||
|
|
||||||
\section2 Setting Expressions
|
\section2 Setting Expressions
|
||||||
|
|||||||
Reference in New Issue
Block a user