diff --git a/doc/images/qtcreator-texfinder-filter.png b/doc/images/qtcreator-texfinder-filter.png
new file mode 100644
index 0000000000000000000000000000000000000000..b40ea9b37eef82b791eb2f84def8df211cfe8d2c
Binary files /dev/null and b/doc/images/qtcreator-texfinder-filter.png differ
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 41fbc9adeb23d371b15cf3094fe86a0cb0c8268b..7c0c3cf22e758f86ea62131cf2ae1631ec852e62 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -532,6 +532,11 @@
an open output pane, click the \gui {Maximize Output Pane} button
or press \key {Alt+9}.
+ To search within the \gui{Application Output} and \gui{Compile Output}
+ panes, press \key {Ctrl+F} when the pane is active. Enter search
+ criteria in the \gui Find field and click the left and right arrows to
+ search down and up in the pane.
+
To open the \gui{General Messages} and \gui{Version Control}
panes, select \gui {Window > Output Panes}.
@@ -805,20 +810,20 @@
\image qtcreator-editortoolbar-symbols.png
- Use the toolbar to navigate between open files and symbols in use:
- \list
- \o To browse forward or backward through your location history, click
+ Use the toolbar to navigate between open files and symbols in use.
+ To browse forward or backward through your location history, click
\inlineimage qtcreator-back.png
and \inlineimage qtcreator-forward.png
.
- \o To go to any open file, select it from the \gui{Open files}
- drop-down menu.
- \o To jump to any symbol used in the current file, select it from the
- \gui Symbols drop-down menu.
- \endlist
- When you create or edit forms in a \c{.ui} file, the toolbar contains
- Qt Designer specific tools.
+ To go to any open file, select it from the \gui{Open files} drop-down menu.
+ Right-click the menu title and select \gui {Copy Full Path to Clipboard} to
+ copy the path and name of the current file to the clipboard.
+
+ To jump to any symbol used in the current file, select it from the
+ \gui Symbols drop-down menu. By default, the symbols are displayed in the
+ order in which they appear in the file. Right-click the menu title and select
+ \gui {Sort Alphabetically} to arrange the symbols in alphabetic order.
\section1 Splitting the Editor View
@@ -1419,7 +1424,7 @@
\section1 Renaming Symbols
- The functions used to rename symbols depends on whether you are
+ The functions available for renaming symbols depend on whether you are
writing C++ or QML code. For QML, you can only rename IDs.
To rename a specific symbol in a Qt project:
@@ -1583,6 +1588,8 @@
The wizards prompt you to enter the settings needed
for that particular type of project and create the necessary files for you.
+ To display other types of files in the \gui Projects pane, specify them in
+ the project file.
\image qtcreator-new-project.png
@@ -1619,6 +1626,25 @@
\image qtcreator-new-project-summary.png
\endlist
+ \section1 Displaying Additional File Types in Projects Pane
+
+ Qt Creator determines whether to display files from the project folder
+ in the \gui Projects pane depending on the file type (.pro, .pri, .cpp,
+ .h, .ui, .qrc, and so on). To display other types of files, edit the the
+ project file. Add filenames as values of the \c {OTHER_FILES} variable.
+ You can also use wildcards.
+
+ For example, the following code specifies that text files are displayed
+ in the \gui Projects pane:
+
+ \code
+
+ OTHER_FILES += *.txt
+
+ \endcode
+
+ This also makes the files available in the \gui Locator.
+
\section1 Adding New Project Wizards
If you have a team working on a large application or several applications,
@@ -3205,6 +3231,12 @@
\image qtcreator-textfinder-ui-widgets.png "Adding widgets to Text Finder UI"
+ \note To easily locate the widgets, use the search box at the top of the
+ \gui Sidebar. For example, to find the \gui Label widget, start typing
+ the word \bold label.
+
+ \image qtcreator-texfinder-filter.png "Filter field"
+
\o Double-click the \gui{Label} widget and enter the text \bold{Keyword}.
\o Double-click the \gui{Push Button} widget and enter the text \bold{Find}.
@@ -3738,7 +3770,7 @@
\section1 Using the Locator Filters
- The \gui Locator allows you to browse not only files, but any items
+ The locator allows you to browse not only files, but any items
defined by \bold{locator filters}. By default, the locator contains
filters which locate:
\list
@@ -6431,7 +6463,7 @@
\title Tips and Tricks
- \section1 Switching between modes
+ \section1 Switching Between Modes
Qt Creator uses different modes for different purposes. You can quickly
switch between these modes with the following keyboard shortcuts:
@@ -6454,6 +6486,12 @@
To quickly move between currently open files, press
\key Ctrl+Tab.
+ To move forward in the location history, press \key {Alt+Right}
+ (\key {Cmd+Opt+Right} on Mac OS). To move backward, press \key {Alt+Left}
+ (\key {Cmd+Opt+Right} on Mac OS). For example, if you use the \gui Locator
+ to jump to a symbol in the same file, you can jump back to your original
+ location in that file by pressing \key {Alt+Left}.
+
\section1 Moving To the Edit Mode
@@ -6471,10 +6509,34 @@
To find specific settings you require in \gui{Tools} > \gui{Options...}
use the filter located at the top left of the \gui Options dialog box.
+ \section1 Opening Output Panes
+
+ The output panes provide a list of errors and warnings encountered during
+ a build, detailed output from the compiler, status of a program when it is
+ executed and debug output, as well as search results.
+
+ To open output panes, use the following shortcuts:
+
+ \list
+
+ \o \gui{Build Issues} pane Alt+1 (Cmd+1 on Mac OS X)
+
+ \o \gui{Search Results} pane Alt+2 (Cmd+2 on Mac OS X)
+
+ \o \gui{Application Output} pane Alt+3 (Cmd+3 on Mac OS X)
+
+ \o \gui{Compile Output} pane Alt+4 (Cmd+4 on Mac OS X)
+
+ \endlist
+
+ For more information about output panes, see \l{Viewing Output}.
+
\section1 Using Keyboard Shortcuts
Qt Creator provides \l{Keyboard Shortcuts}{many useful keyboard shortcuts}.
+ You can see the keyboard shortcut for a menu command in the menu
+ or the tooltip for a button.
To customize, import or export keyboard shortcuts, select \gui Tools >
\gui Options... > \gui Environment > \gui Keyboard.
@@ -6509,11 +6571,19 @@
\section1 Moving To Symbols
To move straight to a symbol used in a project, select the symbol in the
- \gui Editor toolbar drop-down menu.
-
- For more information on the editor toolbar,
+ \gui Editor toolbar drop-down menu. For more information on the editor toolbar,
see \l {Using the Editor Toolbar}.
+ To jump to a symbol in the current file, press \key {Ctrl+K} to open the
+ \gui Locator, enter a period (.), and start typing the symbol name. Then
+ select the symbol in the list. For more information on using the locator,
+ see \l{Searching With the Locator}.
+
+ Press \key Ctrl (\key Cmd on Mac OS) and click a symbol to move directly to
+ the definition or the declaration of the symbol. You can also move the cursor
+ on the symbol and press \key {F2}. For more information, see
+ \l{Moving to Symbol Definition or Declaration}.
+
\section1 Displaying Signals and Slots
@@ -6527,6 +6597,9 @@
the slot in the \e slots subitem. The objects connected to this slot are
shown as children of the slot. This method works with signals too.
+ For more information about the \gui{Locals and Watchers} view, see
+ \l{Locals and Watchers}.
+
\section1 Displaying Low Level Data
@@ -6541,6 +6614,19 @@
\o Uncheck the \gui{Use Debugging Helper} checkbox.
\endlist
+
+ \section1 Locating Files
+
+ The \gui Locator provides one of the easiest ways in Qt Creator to browse
+ through projects, files, classes, methods, documentation and file systems.
+ To quickly access files not directly mentioned in your project, you can
+ create your own locator filters. That way you can locate files in a
+ directory structure you have defined.
+
+ To create locator filters, select \gui {Tools > Options... > Locator > Add}.
+
+ For more information, see \l{Creating Locator Filters}.
+
*/
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index 2e6fa7f0ae17f84f2ef6c98e4ffd5f795adcf392..9242dc3db1ebef528cb3a3e9cc84bde7da14bf59 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -274,7 +274,7 @@ void EditorToolBar::listContextMenu(QPoint pos)
if (fileName.isEmpty())
return;
QMenu menu;
- menu.addAction(tr("Copy full path to clipboard"));
+ menu.addAction(tr("Copy Full Path to Clipboard"));
if (menu.exec(m_editorList->mapToGlobal(pos))) {
QApplication::clipboard()->setText(QDir::toNativeSeparators(fileName));
}
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 4db9047e77f97c5dc1299802414a4045a31e9c74..6d0a06bf61e8a29a55c5eeb34fa17f2f2a88dd5b 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -673,7 +673,7 @@ void CPPEditor::createToolBar(CPPEditorEditable *editable)
m_methodCombo->setModel(m_proxyModel);
m_methodCombo->setContextMenuPolicy(Qt::ActionsContextMenu);
- m_sortAction = new QAction(tr("Sort alphabetically"), m_methodCombo);
+ m_sortAction = new QAction(tr("Sort Alphabetically"), m_methodCombo);
m_sortAction->setCheckable(true);
m_sortAction->setChecked(sortedMethodOverview());
connect(m_sortAction, SIGNAL(toggled(bool)), CppPlugin::instance(), SLOT(setSortedMethodOverview(bool)));