diff --git a/doc/api/qtcreator-api.qdoc b/doc/api/qtcreator-api.qdoc
index 1cf030faaca35a55cafeada781ebb9b792f25fa9..12d4179cb8ae78c0615ed031bc6d12e6ae33077c 100644
--- a/doc/api/qtcreator-api.qdoc
+++ b/doc/api/qtcreator-api.qdoc
@@ -9,6 +9,8 @@
simple means for plugin cooperation that allow plugins to provide
hooks for other plugin's extensions.
+ To get an overview of what parts of QtCreator are extensible, have a look at the \l{Common Extension Tasks} page.
+
\section1 Core Libraries
There are a few core libraries used by many parts of Qt Creator.
@@ -19,12 +21,12 @@
\o Description
\row
- \o \l{Aggregation}{Aggregation}
+ \o \l{Aggregation}
\o Adds functionality for "glueing" QObjects of different
types together, so you can "cast" between them.
\row
- \o \l{ExtensionSystem}{ExtensionSystem}
+ \o \l{ExtensionSystem}
\o Implements the plugin loader framework. Provides a base class for plugins and
basic mechanisms for plugin interaction like an object pool.
@@ -43,10 +45,18 @@
\o Description
\row
- \o \l{Core} {Core}
+ \o \l{Core}
\o The core plugin. Provides the main window and managers for editors,
actions, mode windows and files, just to mention the most important ones.
+ \row
+ \o \l{Find}
+ \o Support for searching text in arbitrary widgets, and arbitrary other things.
+
+ \row
+ \o \l{QuickOpen}
+ \o Hooks for providing content for Locator.
+
\endtable
*/
@@ -79,3 +89,85 @@
\generatelist functionindex
*/
+/*!
+ \page common_extension_tasks.html
+ \title Common Extension Tasks
+
+ \table
+ \header
+ \o Task
+ \o Details
+ \o API
+
+ \row
+ \o Add a menu / menu entry.
+ \o You can extend existing menus or create new ones.
+ \o \l{Core::ActionManager}, \l{Core::Command}, \l{Core::ICore::actionManager()}
+
+ \row
+ \o Add a configurable keyboard shortcut.
+ \o Registerng shortcuts makes it possible for users to configure them in the common shortcut settings dialog.
+ \o \l{Core::ActionManager}, \l{Core::Command}, \l{Core::ICore::actionManager()}
+
+ \row
+ \o Add a mode.
+ \o Modes correspond to complete screens of controls, specialized for a task.
+ \o \l{Core::IMode}, \l{Core::BaseMode}
+
+ \row
+ \o Add a new editor type.
+ \o Like an editor for xml files.
+ \o \l{Core::IEditorFactory}, \l{Core::IEditor}, \l{Core::IFile}
+
+ \row
+ \o Add a "New" wizard.
+ \o That is added to the list when users do File->New..., allows you to basically do whatever you want.
+ \o \l{Core::IWizard}, \l{Core::StandardFileWizard}, \l{Core::BaseFileWizard}, \l{Core::BaseFileWizardParameters}
+
+ \row
+ \o Add support for a new version control system.
+ \o Version control systems provided by QtCreator itself are Perforce, Git and Subversion.
+ \o \l{Core::IVersionControl}
+
+ \row
+ \o Add a view to the navigation sidebar.
+ \o The one which shows the project tree, filesystem, open documents or bookmarks.
+ \o \l{Core::INavigationWidgetFactory}
+
+ \row
+ \o Add a preferences page to the preferences dialog.
+ \o Add a new page to existing or new category in Tools->Options.
+ \o \l{Core::IOptionsPage}
+
+ \row
+ \o Add a find filter for the find dialog.
+ \o Implement any kind of search term based search.
+ \o \l{Find::IFindFilter}, \l{Find::SearchResultWindow}, \l{Find::ResultWindowItem}
+
+ \row
+ \o Add support for the find tool bar to a widget.
+ \o The widget that has focus is asked if it supports text search, you can provide that for widgets under your control.
+ \o \l{Find::IFindSupport}, \l{Find::BaseTextFind}
+
+ \row
+ \o Add a completely new project type.
+ \o
+ \o
+
+ \row
+ \o Add a new type of build step.
+ \o
+ \o
+
+ \row
+ \o Add a new filter to Locator.
+ \o For a text typed in by the user you provide a list of things to show in the popup. When the user selects an entry you are requested to do whatever you want.
+ \o \l{QuickOpen::IQuickOpenFilter}, \l{QuickOpen::FilterEntry}, \l{QuickOpen::BaseFileFilter}
+
+ \row
+ \o
+ \o
+ \o
+
+ \endtable
+*/
diff --git a/doc/api/qtcreator-api.qdocconf b/doc/api/qtcreator-api.qdocconf
index 476c8e6a4df098fec1d48b950815d9b819615621..9396d1262571fd6bcb7f93b661b63f87e2e3a58f 100644
--- a/doc/api/qtcreator-api.qdocconf
+++ b/doc/api/qtcreator-api.qdocconf
@@ -7,13 +7,15 @@ headerdirs = . \
../../src/libs/aggregation \
../../src/libs/extensionsystem \
../../src/plugins/coreplugin \
- ../../src/plugins/coreplugin/actionmanager
+ ../../src/plugins/find \
+ ../../src/plugins/quickopen
sourcedirs = . \
../../src/libs/aggregation \
../../src/libs/extensionsystem \
../../src/plugins/coreplugin \
- ../../src/plugins/coreplugin/actionmanager
+ ../../src/plugins/find \
+ ../../src/plugins/quickopen
headers.fileextesnions = "*.h"
sources.fileextensions = "*.cpp *.qdoc"
diff --git a/doc/doc.pri b/doc/doc.pri
index 1b1918c6d6372663deb29ffa9798c793e9124b7e..67428a0389286b8e537161decd222ce3632df0b2 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -44,3 +44,5 @@ macx {
OTHER_FILES = qtcreator.qdoc \
qtcreator.qdocconf
+OTHER_FILES += api/qtcreator-api.qdoc \
+ api/qtcreator-api.qdocconf
diff --git a/doc/images/completion/class.png b/doc/images/completion/class.png
new file mode 100644
index 0000000000000000000000000000000000000000..88432d2cb10c43de91fdb7ec7989285090747b0a
Binary files /dev/null and b/doc/images/completion/class.png differ
diff --git a/doc/images/completion/enum.png b/doc/images/completion/enum.png
new file mode 100644
index 0000000000000000000000000000000000000000..42a9e83bc7699ec47f244617862b3135b958132b
Binary files /dev/null and b/doc/images/completion/enum.png differ
diff --git a/doc/images/completion/enumerator.png b/doc/images/completion/enumerator.png
new file mode 100644
index 0000000000000000000000000000000000000000..25fc49c6598a8a99c11ec688b4dc1d3153427507
Binary files /dev/null and b/doc/images/completion/enumerator.png differ
diff --git a/doc/images/completion/func.png b/doc/images/completion/func.png
new file mode 100644
index 0000000000000000000000000000000000000000..e515e76e61f64cd285a4c67aaf1feaca38e84f8b
Binary files /dev/null and b/doc/images/completion/func.png differ
diff --git a/doc/images/completion/func_priv.png b/doc/images/completion/func_priv.png
new file mode 100644
index 0000000000000000000000000000000000000000..49dda7dfea0da20fa61bcda8700991c92b670308
Binary files /dev/null and b/doc/images/completion/func_priv.png differ
diff --git a/doc/images/completion/func_prot.png b/doc/images/completion/func_prot.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8add65e07372db105aef8e90afe0448c66ec56a
Binary files /dev/null and b/doc/images/completion/func_prot.png differ
diff --git a/doc/images/completion/keyword.png b/doc/images/completion/keyword.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5a51858d9ed96ab65bf6544891cb48730607fa4
Binary files /dev/null and b/doc/images/completion/keyword.png differ
diff --git a/doc/images/completion/macro.png b/doc/images/completion/macro.png
new file mode 100644
index 0000000000000000000000000000000000000000..53e42af63d23a789d2bf58e25c3a7bb5e91c45d5
Binary files /dev/null and b/doc/images/completion/macro.png differ
diff --git a/doc/images/completion/namespace.png b/doc/images/completion/namespace.png
new file mode 100644
index 0000000000000000000000000000000000000000..18d2941572e8a62e65954c4900aa9b1bdf21766f
Binary files /dev/null and b/doc/images/completion/namespace.png differ
diff --git a/doc/images/completion/signal.png b/doc/images/completion/signal.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4de5dddfe5fe8ceec1f7c21f5da0ec0c5e1cfe8
Binary files /dev/null and b/doc/images/completion/signal.png differ
diff --git a/doc/images/completion/slot.png b/doc/images/completion/slot.png
new file mode 100644
index 0000000000000000000000000000000000000000..5534bbfe0870ae8680bcb7e5cf8e396bf9ff8cd7
Binary files /dev/null and b/doc/images/completion/slot.png differ
diff --git a/doc/images/completion/slot_priv.png b/doc/images/completion/slot_priv.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f585e875d145c29cd71713eec794896122d4019
Binary files /dev/null and b/doc/images/completion/slot_priv.png differ
diff --git a/doc/images/completion/slot_prot.png b/doc/images/completion/slot_prot.png
new file mode 100644
index 0000000000000000000000000000000000000000..469e9c18d06692b9a01a08c89937deee37664f04
Binary files /dev/null and b/doc/images/completion/slot_prot.png differ
diff --git a/doc/images/completion/var.png b/doc/images/completion/var.png
new file mode 100644
index 0000000000000000000000000000000000000000..089cfb45e5fc0f9629c508538ffc5886f79f84c1
Binary files /dev/null and b/doc/images/completion/var.png differ
diff --git a/doc/images/completion/var_priv.png b/doc/images/completion/var_priv.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c6cf64fe7b564e2ac3f43519ab749fb7c6f2e74
Binary files /dev/null and b/doc/images/completion/var_priv.png differ
diff --git a/doc/images/completion/var_prot.png b/doc/images/completion/var_prot.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7496aada00956be7144f7fa6bf2654e3989a691
Binary files /dev/null and b/doc/images/completion/var_prot.png differ
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 89b22fdb1cf3668ba76d133ef401cf42fe12aebc..86067cbbcce5597786f51df118a2816b4fc937fb 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -293,6 +293,63 @@
\gui{Edit -> Advanced} menu.
\endtable
+ \section1 Code Completion
+
+ The completion popup shows possible completions to a certain statement.
+ These completions include classes, namespaces, functions, variables,
+ macros and keywords. Listed below are the icons used in the completion box
+ and their meaning.
+
+ \table
+ \row
+ \i \inlineimage completion/class.png
+ \i A class
+ \row
+ \i \inlineimage completion/enum.png
+ \i An enum
+ \row
+ \i \inlineimage completion/enumerator.png
+ \i An enumerator (value of an enum)
+ \row
+ \i \inlineimage completion/func.png
+ \i A function
+ \row
+ \i \inlineimage completion/func_priv.png
+ \i A private function
+ \row
+ \i \inlineimage completion/func_prot.png
+ \i A protected function
+ \row
+ \i \inlineimage completion/var.png
+ \i A variable
+ \row
+ \i \inlineimage completion/var_priv.png
+ \i A private variable
+ \row
+ \i \inlineimage completion/var_prot.png
+ \i A protected variable
+ \row
+ \i \inlineimage completion/signal.png
+ \i A signal
+ \row
+ \i \inlineimage completion/slot.png
+ \i A slot
+ \row
+ \i \inlineimage completion/slot_priv.png
+ \i A private slot
+ \row
+ \i \inlineimage completion/slot_prot.png
+ \i A protected slot
+ \row
+ \i \inlineimage completion/keyword.png
+ \i A keyword
+ \row
+ \i \inlineimage completion/macro.png
+ \i A macro
+ \row
+ \i \inlineimage completion/namespace.png
+ \i A namespace
+ \endtable
*/
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index 639a0d6500b8cec96f19d025733554659dd9c083..df6004a735e23d0f5f740f5041b6c42067e03a19 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -47,8 +47,11 @@
#include <QtCore/QObject>
#include <QtCore/QPointer>
#include <QtCore/QString>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QSharedDataPointer>
#include <QtCore/QTextCodec>
#include <QtCore/QVector>
+#include <QtCore/QWeakPointer>
int qtGhVersion = QT_VERSION;
@@ -866,10 +869,11 @@ static void qDumpQDateTime(QDumper &d)
BL(d, "isNull", date.isNull());
I(d, "toTime_t", (long)date.toTime_t());
S(d, "toString", date.toString());
+ #if QT_VERSION >= 0x040500
S(d, "toString_(ISO)", date.toString(Qt::ISODate));
S(d, "toString_(SystemLocale)", date.toString(Qt::SystemLocaleDate));
S(d, "toString_(Locale)", date.toString(Qt::LocaleDate));
- S(d, "toString", date.toString());
+ #endif
#if 0
d.beginHash();
@@ -1931,6 +1935,30 @@ static void qDumpQSet(QDumper &d)
d.disarm();
}
+static void qDumpQSharedPointer(QDumper &d)
+{
+ const QSharedPointer<int> &ptr =
+ *reinterpret_cast<const QSharedPointer<int> *>(d.data);
+
+ if (isSimpleType(d.innertype))
+ qDumpInnerValueHelper(d, d.innertype, ptr.data());
+ else
+ P(d, "value", "");
+ P(d, "valuedisabled", "true");
+ P(d, "numchild", 1);
+ if (d.dumpChildren) {
+ d << ",children=[";
+ d.beginHash();
+ P(d, "name", "data");
+ qDumpInnerValue(d, d.innertype, ptr.data());
+ d.endHash();
+ I(d, "strongref", 44);
+ I(d, "weakref", 45);
+ d << "]";
+ }
+ d.disarm();
+}
+
static void qDumpQString(QDumper &d)
{
const QString &str = *reinterpret_cast<const QString *>(d.data);
@@ -2012,11 +2040,13 @@ static void qDumpQVariantHelper(const void *data, QString *value,
*value = QLatin1Char('"') + v.toString() + QLatin1Char('"');
*numchild = 0;
break;
+ #if QT_VERSION >= 0x040500
case QVariant::StringList:
*exp = QString(QLatin1String("(*('"NS"QStringList'*)%1)"))
.arg((quintptr)data);
*numchild = v.toStringList().size();
break;
+ #endif
case QVariant::Int:
*value = QString::number(v.toInt());
*numchild= 0;
@@ -2480,6 +2510,8 @@ static void handleProtocolVersion2and3(QDumper & d)
case 'S':
if (isEqual(type, "QSet"))
qDumpQSet(d);
+ else if (isEqual(type, "QSharedPointer"))
+ qDumpQSharedPointer(d);
else if (isEqual(type, "QString"))
qDumpQString(d);
else if (isEqual(type, "QStringList"))
@@ -2578,6 +2610,7 @@ void *qDumpObjectData440(
#endif // PRIVATE_OBJECT_ALLOWED
// << "\""NS"QRegion\","
"\""NS"QSet\","
+ "\""NS"QSharedPointer\","
"\""NS"QString\","
"\""NS"QStringList\","
"\""NS"QTextCodec\","
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index b3ec85fa3b3aa89be5ad28ebdaf104486ca43cd2..59f68968298abe6f602cc0185e7b650c88c0f26d 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -57,7 +57,7 @@
<message>
<location/>
<source>Clear</source>
- <translation type="unfinished"></translation>
+ <translation>Löschen</translation>
</message>
</context>
<context>
@@ -88,12 +88,12 @@
<message>
<location filename="../../../src/plugins/bineditor/bineditorplugin.cpp" line="+377"/>
<source>&Undo</source>
- <translation type="unfinished">&Rückgangig</translation>
+ <translation>&Rückgangig</translation>
</message>
<message>
<location line="+3"/>
<source>&Redo</source>
- <translation type="unfinished">&Wiederholen</translation>
+ <translation>&Wiederholen</translation>
</message>
</context>
<context>
@@ -101,7 +101,7 @@
<message>
<location filename="../../../src/shared/help/bookmarkdialog.ui"/>
<source>Add Bookmark</source>
- <translation type="unfinished"></translation>
+ <translation>Lesezeichen hinzufügen</translation>
</message>
<message>
<location/>
@@ -130,7 +130,7 @@
<location line="+24"/>
<location line="+32"/>
<source>Bookmarks</source>
- <translation type="unfinished"></translation>
+ <translation>Lesezeichen</translation>
</message>
<message>
<location line="-69"/>
@@ -154,7 +154,7 @@
<message>
<location line="+45"/>
<source>Bookmarks</source>
- <translation type="unfinished"></translation>
+ <translation>Lesezeichen</translation>
</message>
<message>
<location line="+36"/>
@@ -226,7 +226,7 @@
<message>
<location filename="../../../src/plugins/bookmarks/bookmarkmanager.cpp" line="+206"/>
<source>Bookmarks</source>
- <translation type="unfinished"></translation>
+ <translation>Lesezeichen</translation>
</message>
<message>
<location line="+23"/>
@@ -347,8 +347,8 @@
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+613"/>
- <source>Build directory:</source>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+626"/>
+ <source>&Change</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -363,12 +363,12 @@
<context>
<name>CMakeProjectManager::Internal::CMakeRunPage</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+249"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+255"/>
<source>Run CMake</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Arguments</source>
<translation type="unfinished"></translation>
</message>
@@ -378,7 +378,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>The directory %1 contains an outdated .cbp file. Qt Creator needs to update this file by running cmake. If you want to add additional command line arguments, add them in the below. Note, that cmake remembers command line arguments from the former runs.</source>
<translation type="unfinished"></translation>
</message>
@@ -387,11 +387,16 @@
<source>The directory %1 specified in a buildconfiguration, does not contain a cbp file. Qt Creator needs to recreate this file, by running cmake. Some projects require command line arguments to the initial cmake call. Note, that cmake remembers command line arguments from the former runs.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+8"/>
+ <source>Qt Creator needs to run cmake in the new build directory. Some projects require command line arguments to the initial cmake call.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+337"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+338"/>
<location line="+10"/>
<source>CMake</source>
<translation type="unfinished"></translation>
@@ -400,7 +405,7 @@
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="-109"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="-108"/>
<source>Qt Creator has detected an in source build. This prevents shadow builds, Qt Creator won't allow you to change the build directory. If you want a shadow build, clean your source directory and open the project again.</source>
<translation type="unfinished"></translation>
</message>
@@ -408,7 +413,7 @@
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+259"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+258"/>
<source>Additional arguments:</source>
<translation type="unfinished"></translation>
</message>
@@ -421,7 +426,12 @@
<context>
<name>CMakeProjectManager::Internal::ShadowBuildPage</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+27"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+28"/>
+ <source>Please enter the directory in which you want to build your project. </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
<translation type="unfinished"></translation>
</message>
@@ -434,7 +444,7 @@
<context>
<name>CMakeProjectManager::Internal::XmlFileUpToDatePage</name>
<message>
- <location line="-22"/>
+ <location line="-25"/>
<source>Qt Creator has found a recent cbp file, which Qt Creator will parse to gather information about the project. You can change the command line arguments used to create this file in the project mode. Click finish to load the project</source>
<translation type="unfinished"></translation>
</message>
@@ -452,6 +462,48 @@
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>CdbDumperHelper</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/cdb/cdbdumperhelper.cpp" line="+253"/>
+ <source>Loading dumpers...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The debugger does not appear to be Qt application.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>The dumper module appears to be already loaded.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Dumper library '%1' loaded.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The dumper library '%1' could not be loaded:
+%2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source><none></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+1"/>
+ <source>%n known types, Qt version: %1, Qt namespace: %2</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+</context>
<context>
<name>CdbOptionsPageWidget</name>
<message>
@@ -490,7 +542,7 @@
<message>
<location line="+202"/>
<source>Print Document</source>
- <translation type="unfinished"></translation>
+ <translation>Dokument drucken</translation>
</message>
<message>
<location line="+109"/>
@@ -644,7 +696,7 @@
<message>
<location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+62"/>
<source>General</source>
- <translation type="unfinished"></translation>
+ <translation>Allgemein</translation>
</message>
<message>
<location line="+10"/>
@@ -754,12 +806,12 @@
<message>
<location filename="../../../src/shared/help/contentwindow.cpp" line="+133"/>
<source>Open Link</source>
- <translation type="unfinished"></translation>
+ <translation>Adresse öffnen</translation>
</message>
<message>
<location line="+1"/>
<source>Open Link in New Tab</source>
- <translation type="unfinished"></translation>
+ <translation>Adresse in neuem Reiter öffnen</translation>
</message>
</context>
<context>
@@ -781,17 +833,17 @@
<message>
<location line="-438"/>
<source>Unable to create the directory %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Das Verzeichnis %1 kann nicht erstellt werden.</translation>
</message>
<message>
<location line="+7"/>
<source>Unable to open %1 for writing: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei %1 kann nicht zum Schreiben geöffnet werden: %2</translation>
</message>
<message>
<location line="+4"/>
<source>Error while writing to %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler beim Schreiben in %1: %2</translation>
</message>
<message>
<location line="+365"/>
@@ -836,47 +888,47 @@ Sollen sie überschrieben werden?</translation>
<location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="+185"/>
<location line="+1438"/>
<source>Revert to Saved</source>
- <translation type="unfinished"></translation>
+ <translation>Wiederherstellen</translation>
</message>
<message>
<location line="-1435"/>
<source>Close</source>
- <translation type="unfinished"></translation>
+ <translation>Schließen</translation>
</message>
<message>
<location line="+1"/>
<source>Close All</source>
- <translation type="unfinished"></translation>
+ <translation>Alle schließen</translation>
</message>
<message>
<location line="+1"/>
<source>Next Document in History</source>
- <translation type="unfinished"></translation>
+ <translation>Nächstes Dokument im Verlauf</translation>
</message>
<message>
<location line="+1"/>
<source>Previous Document in History</source>
- <translation type="unfinished"></translation>
+ <translation>Vorhergehendes Dokument im Verlauf</translation>
</message>
<message>
<location line="+1"/>
<source>Go back</source>
- <translation type="unfinished"></translation>
+ <translation>Vorheriges</translation>
</message>
<message>
<location line="+1"/>
<source>Go forward</source>
- <translation type="unfinished"></translation>
+ <translation>Nächstes</translation>
</message>
<message>
<location line="+1"/>
<source>Open in External Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Öffne in externem Editor</translation>
</message>
<message>
<location line="+46"/>
<source>Revert File to Saved</source>
- <translation type="unfinished"></translation>
+ <translation>Gespeicherten Stand wiederherstellen</translation>
</message>
<message>
<location line="+43"/>
@@ -951,7 +1003,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+5"/>
<source>Remove Current Split</source>
- <translation type="unfinished"></translation>
+ <translation>Teilung aufheben</translation>
</message>
<message>
<location line="+3"/>
@@ -961,7 +1013,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+5"/>
<source>Remove All Splits</source>
- <translation type="unfinished"></translation>
+ <translation>Alle Teilungen aufheben</translation>
</message>
<message>
<location line="+3"/>
@@ -971,7 +1023,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+5"/>
<source>Goto Other Split</source>
- <translation type="unfinished"></translation>
+ <translation>Gehe zu anderer Teilung</translation>
</message>
<message>
<location line="+3"/>
@@ -981,7 +1033,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+9"/>
<source>&Advanced</source>
- <translation type="unfinished"></translation>
+ <translation>&Weitere</translation>
</message>
<message>
<location line="+15"/>
@@ -991,78 +1043,78 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+662"/>
<source>Opening File</source>
- <translation type="unfinished"></translation>
+ <translation>Datei Öffnen</translation>
</message>
<message>
<location line="+0"/>
<source>Cannot open file %1!</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei '%1' kann nicht geöffnet werden!</translation>
</message>
<message>
<location line="+24"/>
<source>Open File</source>
- <translation type="unfinished"></translation>
+ <translation>Datei öffnen</translation>
</message>
<message>
<location line="+162"/>
<location line="+7"/>
<source>Failed!</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler</translation>
</message>
<message>
<location line="-7"/>
<source>Could not open the file for edit with SCC.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei konnte nicht mit Hilfe der Versionsverwaltung schreibbar gemacht werden.</translation>
</message>
<message>
<location line="+7"/>
<source>Could not set permissions to writable.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei konnte schreibbar gemacht werden.</translation>
</message>
<message>
<location line="+88"/>
<source><b>Warning:</b> You are changing a read-only file.</source>
- <translation type="unfinished"></translation>
+ <translation><b>Hinweis:</b> Sie sind im Begriff, eine schreibgeschützte Datei zu ändern.</translation>
</message>
<message>
<location line="+1"/>
<source>Make writable</source>
- <translation type="unfinished"></translation>
+ <translation>Schreibbar machen</translation>
</message>
<message>
<location line="+14"/>
<source>Save %1 As...</source>
- <translation type="unfinished"></translation>
+ <translation>Speicher '%1' unter...</translation>
</message>
<message>
<location line="+1"/>
<source>&Save %1</source>
- <translation type="unfinished"></translation>
+ <translation>&Speichere %1</translation>
</message>
<message>
<location line="+1"/>
<source>Revert %1 to Saved</source>
- <translation type="unfinished"></translation>
+ <translation>Stelle %1 wieder her</translation>
</message>
<message>
<location line="+4"/>
<source>Close %1</source>
- <translation type="unfinished"></translation>
+ <translation>Schließe %1</translation>
</message>
<message>
<location line="+266"/>
<source>You will lose your current changes if you proceed reverting %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Bei der Wiederherstellung von %1 gehen Ihre derzeitigen Änderungen verloren.</translation>
</message>
<message>
<location line="+2"/>
<source>Proceed</source>
- <translation type="unfinished"></translation>
+ <translation>Weiter</translation>
</message>
<message>
<location line="+1"/>
<source>Cancel</source>
- <translation type="unfinished"></translation>
+ <translation>Abbrechen</translation>
</message>
<message>
<location line="+52"/>
@@ -1075,27 +1127,27 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/filemanager.cpp" line="+304"/>
<source>Can't save file</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei kann nicht gespeichert werden</translation>
</message>
<message>
<location line="+1"/>
<source>Can't save changes to '%1'. Do you want to continue and loose your changes?</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei '%1' kann nicht gespeichert werden. Wollen Sie trotzdem fortsetzen und Ihre Änderungen aufgeben?</translation>
</message>
<message>
<location line="+102"/>
<source>Overwrite?</source>
- <translation type="unfinished"></translation>
+ <translation>Ãœberschreiben?</translation>
</message>
<message>
<location line="+1"/>
<source>An item named '%1' already exists at this location. Do you want to overwrite it?</source>
- <translation type="unfinished"></translation>
+ <translation>Es existiert bereits eine Datei des Namens '%1' an dieser Stelle. Wollen Sie sie überschreiben?</translation>
</message>
<message>
<location line="+35"/>
<source>Save File As</source>
- <translation type="unfinished"></translation>
+ <translation>Datei speichern</translation>
</message>
</context>
<context>
@@ -1103,7 +1155,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/sidebar.cpp" line="+362"/>
<source>Activate %1</source>
- <translation type="unfinished"></translation>
+ <translation>Aktiviere %1</translation>
</message>
</context>
<context>
@@ -1114,6 +1166,14 @@ Sollen sie überschrieben werden?</translation>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>Core::Internal::EditMode</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/editmode.cpp" line="+94"/>
+ <source>Edit</source>
+ <translation>Editieren</translation>
+ </message>
+</context>
<context>
<name>Core::Internal::EditorSplitter</name>
<message>
@@ -1198,17 +1258,17 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="-29"/>
<source>Close</source>
- <translation type="unfinished"></translation>
+ <translation>Schließen</translation>
</message>
<message>
<location line="+193"/>
<source>Make writable</source>
- <translation type="unfinished"></translation>
+ <translation>Schreibbar machen</translation>
</message>
<message>
<location line="+4"/>
<source>File is writable</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei ist schreibbar</translation>
</message>
</context>
<context>
@@ -1216,7 +1276,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/generalsettings.cpp" line="+56"/>
<source>General</source>
- <translation type="unfinished"></translation>
+ <translation>Allgemein</translation>
</message>
<message>
<location line="+10"/>
@@ -1239,64 +1299,64 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+144"/>
<source>Output</source>
- <translation type="unfinished">Ausgaben</translation>
+ <translation>Ausgaben</translation>
</message>
<message>
<location line="+161"/>
<source>&File</source>
- <translation type="unfinished">&Datei</translation>
+ <translation>&Datei</translation>
</message>
<message>
<location line="+14"/>
<source>&Edit</source>
- <translation type="unfinished">&Bearbeiten</translation>
+ <translation>&Bearbeiten</translation>
</message>
<message>
<location line="+11"/>
<source>&Tools</source>
- <translation type="unfinished">&Werkzeuge</translation>
+ <translation>&Werkzeuge</translation>
</message>
<message>
<location line="+5"/>
<source>&Window</source>
- <translation type="unfinished">&Fenster</translation>
+ <translation>&Fenster</translation>
</message>
<message>
<location line="+13"/>
<source>&Help</source>
- <translation type="unfinished">&Hilfe</translation>
+ <translation>&Hilfe</translation>
</message>
<message>
<location line="+62"/>
<source>&New...</source>
- <translation type="unfinished">&Neu</translation>
+ <translation>&Neu...</translation>
</message>
<message>
<location line="+7"/>
<source>&Open...</source>
- <translation type="unfinished">&Öffnen</translation>
+ <translation>&Öffnen...</translation>
</message>
<message>
<location line="+7"/>
<source>&Open With...</source>
- <translation type="unfinished">Öffnen &mit...</translation>
+ <translation>Öffnen &mit...</translation>
</message>
<message>
<location line="+8"/>
<source>Recent Files</source>
- <translation type="unfinished">Zuletzt bearbeitet</translation>
+ <translation>Zuletzt bearbeitet</translation>
</message>
<message>
<location line="+3"/>
<location line="+4"/>
<source>&Save</source>
- <translation type="unfinished">&Speichern</translation>
+ <translation>&Speichern</translation>
</message>
<message>
<location line="+4"/>
<location line="+6"/>
<source>Save &As...</source>
- <translation type="unfinished">Speichern &unter...</translation>
+ <translation>Speichern &unter...</translation>
</message>
<message>
<location line="-3"/>
@@ -1307,17 +1367,17 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="-3"/>
<source>Save A&ll</source>
- <translation type="unfinished">&Alles speichern</translation>
+ <translation>&Alles speichern</translation>
</message>
<message>
<location line="+9"/>
<source>&Print...</source>
- <translation type="unfinished">&Drucken...</translation>
+ <translation>&Drucken...</translation>
</message>
<message>
<location line="+5"/>
<source>E&xit</source>
- <translation type="unfinished">B&eenden</translation>
+ <translation>B&eenden</translation>
</message>
<message>
<location line="+2"/>
@@ -1328,38 +1388,38 @@ Sollen sie überschrieben werden?</translation>
<location line="+5"/>
<location line="+4"/>
<source>&Undo</source>
- <translation type="unfinished">&Rückgangig</translation>
+ <translation>&Rückgangig</translation>
</message>
<message>
<location line="+5"/>
<location line="+4"/>
<source>&Redo</source>
- <translation type="unfinished">&Wiederholen</translation>
+ <translation>&Wiederholen</translation>
</message>
<message>
<location line="+5"/>
<source>Cu&t</source>
- <translation type="unfinished">&Ausschneiden</translation>
+ <translation>&Ausschneiden</translation>
</message>
<message>
<location line="+7"/>
<source>&Copy</source>
- <translation type="unfinished">&Kopieren</translation>
+ <translation>&Kopieren</translation>
</message>
<message>
<location line="+7"/>
<source>&Paste</source>
- <translation type="unfinished">&Einfügen</translation>
+ <translation>&Einfügen</translation>
</message>
<message>
<location line="+7"/>
<source>&Select All</source>
- <translation type="unfinished">Alles Aus&wählen</translation>
+ <translation>Alles Aus&wählen</translation>
</message>
<message>
<location line="+7"/>
<source>&Go To Line...</source>
- <translation type="unfinished">&Gehe zu Zeile...</translation>
+ <translation>&Gehe zu Zeile...</translation>
</message>
<message>
<location line="+2"/>
@@ -1369,48 +1429,48 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+5"/>
<source>&Options...</source>
- <translation type="unfinished">&Einstellungen</translation>
+ <translation>&Einstellungen</translation>
</message>
<message>
<location line="+10"/>
<source>Minimize</source>
- <translation type="unfinished">Minimieren</translation>
+ <translation>Minimieren</translation>
</message>
<message>
<location line="+7"/>
<source>Zoom</source>
- <translation type="unfinished">Vergrößern</translation>
+ <translation>Vergrößern</translation>
</message>
<message>
<location line="+12"/>
<source>Show Sidebar</source>
- <translation type="unfinished">Seitenleiste anzeigen</translation>
+ <translation>Seitenleiste anzeigen</translation>
</message>
<message>
<location line="+15"/>
<source>Full Screen</source>
- <translation type="unfinished">Vollbild</translation>
+ <translation>Vollbild</translation>
</message>
<message>
<location line="+10"/>
<source>About &Qt Creator</source>
- <translation type="unfinished">Ãœber &Qt Creator</translation>
+ <translation>Ãœber &Qt Creator</translation>
</message>
<message>
<location line="+2"/>
<source>About &Qt Creator...</source>
- <translation type="unfinished">Ãœber &Qt Creator...</translation>
+ <translation>Ãœber &Qt Creator...</translation>
</message>
<message>
<location line="+7"/>
<source>About &Plugins...</source>
- <translation type="unfinished">Plugins...</translation>
+ <translation>Plugins...</translation>
</message>
<message>
<location line="+23"/>
<source>New</source>
<comment>Title of dialog</comment>
- <translation type="unfinished">Neu</translation>
+ <translation>Neu</translation>
</message>
</context>
<context>
@@ -1418,7 +1478,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/messageoutputwindow.cpp" line="+76"/>
<source>General</source>
- <translation type="unfinished"></translation>
+ <translation>Allgemein</translation>
</message>
</context>
<context>
@@ -1426,7 +1486,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/navigationwidget.cpp" line="+524"/>
<source>Activate %1</source>
- <translation type="unfinished"></translation>
+ <translation>Aktiviere %1</translation>
</message>
</context>
<context>
@@ -1439,7 +1499,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+1"/>
<source>Close</source>
- <translation type="unfinished"></translation>
+ <translation>Schließen</translation>
</message>
</context>
<context>
@@ -1447,7 +1507,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="-35"/>
<source>Activate %1 Pane</source>
- <translation type="unfinished"></translation>
+ <translation>Aktiviere Panel '%1'</translation>
</message>
</context>
<context>
@@ -1473,7 +1533,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/editormanager/openeditorsview.cpp" line="+94"/>
<source>Open Documents</source>
- <translation type="unfinished"></translation>
+ <translation>Offene Dokumente</translation>
</message>
</context>
<context>
@@ -1489,7 +1549,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/dialogs/openwithdialog.cpp" line="+43"/>
<source>Open file '%1' with:</source>
- <translation type="unfinished"></translation>
+ <translation>Öffne '%1; mit:</translation>
</message>
</context>
<context>
@@ -1497,17 +1557,17 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/outputpane.cpp" line="+167"/>
<source>Output</source>
- <translation type="unfinished">Ausgaben</translation>
+ <translation>Ausgaben</translation>
</message>
<message>
<location line="+4"/>
<source>Clear</source>
- <translation type="unfinished"></translation>
+ <translation>Löschen</translation>
</message>
<message>
<location line="+52"/>
<source>Output &Panes</source>
- <translation type="unfinished"></translation>
+ <translation>Ausgabe&panels</translation>
</message>
</context>
<context>
@@ -1515,32 +1575,33 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/plugindialog.cpp" line="+54"/>
<source>Details</source>
- <translation type="unfinished"></translation>
+ <translation>Beschreibung</translation>
</message>
<message>
<location line="+1"/>
<source>Error Details</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Fehlermeldungen zu %1</translatorcomment>
+ <translation>Fehlermeldungen</translation>
</message>
<message>
<location line="+1"/>
<source>Close</source>
- <translation type="unfinished"></translation>
+ <translation>Schließen</translation>
</message>
<message>
<location line="+15"/>
<source>Installed Plugins</source>
- <translation type="unfinished"></translation>
+ <translation>Installierte Plugins</translation>
</message>
<message>
<location line="+35"/>
<source>Plugin Details of %1</source>
- <translation type="unfinished"></translation>
+ <translation>Pluginbeschreibung zu %1</translation>
</message>
<message>
<location line="+20"/>
<source>Plugin Errors of %1</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
</context>
<context>
@@ -1548,7 +1609,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/progressmanager/progressview.cpp" line="+47"/>
<source>Processes</source>
- <translation type="unfinished"></translation>
+ <translation>Prozesse</translation>
</message>
</context>
<context>
@@ -1556,22 +1617,22 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/dialogs/saveitemsdialog.cpp" line="+53"/>
<source>Don't Save</source>
- <translation type="unfinished"></translation>
+ <translation>Nicht speichern</translation>
</message>
<message>
<location line="+42"/>
<source>Save All</source>
- <translation type="unfinished"></translation>
+ <translation>Alle speichern</translation>
</message>
<message>
<location line="+3"/>
<source>Save</source>
- <translation type="unfinished"></translation>
+ <translation>Speichern</translation>
</message>
<message>
<location line="+3"/>
<source>Save Selected</source>
- <translation type="unfinished"></translation>
+ <translation>Auswahl speichern</translation>
</message>
</context>
<context>
@@ -1613,7 +1674,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+6"/>
<source>Close</source>
- <translation type="unfinished"></translation>
+ <translation>Schließen</translation>
</message>
</context>
<context>
@@ -1621,7 +1682,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/versiondialog.cpp" line="+57"/>
<source>About Qt Creator</source>
- <translation type="unfinished"></translation>
+ <translation>Ãœber Qt Creator</translation>
</message>
<message>
<location line="+8"/>
@@ -1632,9 +1693,119 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::WelcomeMode</name>
<message>
- <location filename="../../../src/plugins/coreplugin/welcomemode.cpp" line="+227"/>
<source> (last session)</source>
- <translation> (letzte Sitzung)</translation>
+ <translation type="obsolete"> (letzte Sitzung)</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/welcomemode.cpp" line="+169"/>
+ <source>%1 (last session)</source>
+ <translation>%1 (zuletzt benutzt)</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::WelcomePage</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/welcomemode.ui"/>
+ <source><style>
+h1 {
+ font-size: 24px;
+ font-weight: normal;
+ color: #4d4d4d;
+ margin-top: 0px;
+ margin-bottom: 20px;
+}
+
+p {
+ margin-top: 0px;
+ margin-bottom: 7px;
+}
+</style>
+
+<p>&nbsp;</p>
+<h1>Welcome</h1>
+<!-- QTextDocument does not support line-height, so wrap the lines manually ... -->
+<p>Qt Creator is an intuitive, modern cross platform IDE that</p> <p>enables developers to create graphically appealing applications</p>
+<p>for desktop, embedded, and mobile devices. Click on <strong>Getting</strong></p>
+<p><strong>Started</strong> to begin developing with Qt Creator.</p>
+<hr style="margin-top:15px"/>
+</source>
+ <translation><style>
+h1 {
+ font-size: 24px;
+ font-weight: normal;
+ color: #4d4d4d;
+ margin-top: 0px;
+ margin-bottom: 20px;
+}
+
+p {
+ margin-top: 0px;
+ margin-bottom: 7px;
+}
+</style>
+
+<p>&nbsp;</p>
+<h1>Welcome</h1>
+<!-- QTextDocument does not support line-height, so wrap the lines manually ... -->
+<p>Qt Creator ist eine intuitive, moderne cross-platform IDE, die</p>
+<p>es Entwicklern ermöglicht, graphisch ansprechende</p>
+<p>Anwendungen für die Bereiche Desktop und Embedded sowie</p>
+<p>mobile Geräte zu erstellen. Klicken Sie auf <strong>Start</strong>,</p>
+<p> um die Entwicklung mit Qt Creator zu beginnen.</p>
+<hr style="margin-top:15px"/></translation>
+ </message>
+ <message>
+ <location/>
+ <source>* {
+ background-image: url(":/core/images/welcomemode/btn_getting_started.png");
+}
+
+*:hover {
+ background-image: url(:/core/images/welcomemode/btn_getting_started_hover.png)
+}
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>#recentSessionsFrame {
+border-image: url(:/core/images/welcomemode/rc_combined.png) 8 8 8 8 stretch stretch;
+border-width: 8 8 8 8;
+}
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>* {
+ background-image: url(":/core/images/welcomemode/btn_restore_session.png");
+}
+
+*:hover {
+ background-image: url(:/core/images/welcomemode/btn_restore_session_hover.png)
+}
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>#bottomWidget {
+background-image: url(:/core/images/welcomemode/feedback-bar-background.png);
+}
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>* {
+ background-image: url(":/core/images/welcomemode/btn_feedback.png");
+}
+
+*:hover {
+ background-image: url(:/core/images/welcomemode/btn_feedback_hover.png)
+}
+</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1642,7 +1813,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/modemanager.cpp" line="+144"/>
<source>Switch to %1 mode</source>
- <translation type="unfinished"></translation>
+ <translation>Gehe zu Mode '%1'</translation>
</message>
</context>
<context>
@@ -1673,7 +1844,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/libs/utils/classnamevalidatinglineedit.cpp" line="+85"/>
<source>The class name must not contain namespace delimiters.</source>
- <translation type="unfinished">Der Klassenname darf keine Namensraum-Trenner enthalten.</translation>
+ <translation>Der Klassenname darf keine Namensraum-Trenner enthalten.</translation>
</message>
<message>
<location line="+4"/>
@@ -1793,17 +1964,17 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+7"/>
<source>Invalid header file name: '%1'</source>
- <translation type="unfinished">Ungültiger Header-Dateiname: '%1'</translation>
+ <translation>Ungültiger Header-Dateiname: '%1'</translation>
</message>
<message>
<location line="+6"/>
<source>Invalid source file name: '%1'</source>
- <translation type="unfinished">Ungültiger Quelldateiname: '%1'</translation>
+ <translation>Ungültiger Quelldateiname: '%1'</translation>
</message>
<message>
<location line="+7"/>
<source>Invalid form file name: '%1'</source>
- <translation type="unfinished">Ungültiger Form-Dateiname: '%1'</translation>
+ <translation>Ungültiger Form-Dateiname: '%1'</translation>
</message>
<message>
<location filename="../../../src/libs/utils/newclasswidget.ui"/>
@@ -1813,37 +1984,37 @@ Sollen sie überschrieben werden?</translation>
<message>
<location/>
<source>Class name:</source>
- <translation type="unfinished">Klassenname:</translation>
+ <translation>Klassenname:</translation>
</message>
<message>
<location/>
<source>Base class:</source>
- <translation type="unfinished">Basisklasse:</translation>
+ <translation>Basisklasse:</translation>
</message>
<message>
<location/>
<source>Header file:</source>
- <translation type="unfinished">Header-Datei:</translation>
+ <translation>Header-Datei:</translation>
</message>
<message>
<location/>
<source>Source file:</source>
- <translation type="unfinished">Quelldatei:</translation>
+ <translation>Quelldatei:</translation>
</message>
<message>
<location/>
<source>Generate form:</source>
- <translation type="unfinished">Form-Datei generieren:</translation>
+ <translation>Form-Datei generieren:</translation>
</message>
<message>
<location/>
<source>Form file:</source>
- <translation type="unfinished">Form-Datei:</translation>
+ <translation>Form-Datei:</translation>
</message>
<message>
<location/>
<source>Path:</source>
- <translation type="unfinished">Pfad:</translation>
+ <translation>Pfad:</translation>
</message>
</context>
<context>
@@ -1861,37 +2032,37 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+117"/>
<source>Choose a directory</source>
- <translation type="unfinished">Wählen Sie ein Verzeichnis</translation>
+ <translation>Wählen Sie ein Verzeichnis</translation>
</message>
<message>
<location line="+6"/>
<source>Choose a file</source>
- <translation type="unfinished">Wählen Sie eine Datei</translation>
+ <translation>Wählen Sie eine Datei</translation>
</message>
<message>
<location line="+32"/>
<source>The path must not be empty.</source>
- <translation type="unfinished">Der Pfad darf nicht leer sein.</translation>
+ <translation>Der Pfad darf nicht leer sein.</translation>
</message>
<message>
<location line="+13"/>
<source>The path '%1' does not exist.</source>
- <translation type="unfinished">Der Pfad '%1' existiert nicht.</translation>
+ <translation>Der Pfad '%1' existiert nicht.</translation>
</message>
<message>
<location line="+15"/>
<source>The path '%1' is not a directory.</source>
- <translation type="unfinished">Der Pfad '%1' zeigt nicht zu einem Verzeichnis.</translation>
+ <translation>Der Pfad '%1' zeigt nicht zu einem Verzeichnis.</translation>
</message>
<message>
<location line="+8"/>
<source>The path '%1' is not a file.</source>
- <translation type="unfinished">Der Pfad '%1' zeigt nicht zu einer Datei.</translation>
+ <translation>Der Pfad '%1' zeigt nicht zu einer Datei.</translation>
</message>
<message>
<location line="+19"/>
<source>Path:</source>
- <translation type="unfinished">Pfad:</translation>
+ <translation>Pfad:</translation>
</message>
</context>
<context>
@@ -1899,17 +2070,17 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/libs/utils/projectintropage.cpp" line="+66"/>
<source><Enter_Name></source>
- <translation type="unfinished"><Name></translation>
+ <translation><Name></translation>
</message>
<message>
<location line="+97"/>
<source>The project already exists.</source>
- <translation type="unfinished">Das Projekt existiert bereits.</translation>
+ <translation>Das Projekt existiert bereits.</translation>
</message>
<message>
<location line="+4"/>
<source>A file with that name already exists.</source>
- <translation type="unfinished">Eine Datei dieses Namens existiert bereits.</translation>
+ <translation>Eine Datei dieses Namens existiert bereits.</translation>
</message>
<message>
<location filename="../../../src/libs/utils/projectintropage.ui"/>
@@ -1919,7 +2090,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location/>
<source>Introduction and project location</source>
- <translation type="unfinished">Einführung und Projektverzeichnis</translation>
+ <translation>Einführung und Projektverzeichnis</translation>
</message>
<message>
<location/>
@@ -1929,12 +2100,12 @@ Sollen sie überschrieben werden?</translation>
<message>
<location/>
<source>Name:</source>
- <translation type="unfinished">Name:</translation>
+ <translation>Name:</translation>
</message>
<message>
<location/>
<source>Create in:</source>
- <translation type="unfinished">Erzeugen in:</translation>
+ <translation>Erzeugen in:</translation>
</message>
</context>
<context>
@@ -1942,7 +2113,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/libs/utils/projectnamevalidatinglineedit.cpp" line="+51"/>
<source>The name must not contain the '.'-character.</source>
- <translation type="unfinished">Der Name darf das Zeichen '.' nicht enthalten.</translation>
+ <translation>Der Name darf das Zeichen '.' nicht enthalten.</translation>
</message>
</context>
<context>
@@ -1950,17 +2121,17 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/libs/utils/submiteditorwidget.ui"/>
<source>Subversion Submit</source>
- <translation type="unfinished">Subversion Submit</translation>
+ <translation>Subversion Submit</translation>
</message>
<message>
<location/>
<source>Des&cription</source>
- <translation type="unfinished">&Beschreibung</translation>
+ <translation>&Beschreibung</translation>
</message>
<message>
<location/>
<source>F&iles</source>
- <translation type="unfinished">&Dateien</translation>
+ <translation>&Dateien</translation>
</message>
</context>
<context>
@@ -1973,17 +2144,25 @@ Sollen sie überschrieben werden?</translation>
<message>
<location/>
<source>Choose the location</source>
- <translation type="unfinished">Verzeichnis auswählen</translation>
+ <translation>Verzeichnis auswählen</translation>
</message>
<message>
<location/>
<source>Name:</source>
- <translation type="unfinished">Name:</translation>
+ <translation>Name:</translation>
</message>
<message>
<location/>
<source>Path:</source>
- <translation type="unfinished">Pfad:</translation>
+ <translation>Pfad:</translation>
+ </message>
+</context>
+<context>
+ <name>CppEditor::Internal::CPPEditor</name>
+ <message>
+ <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+258"/>
+ <source>Sort alphabetically</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1991,17 +2170,17 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/cppeditor/cppclasswizard.cpp" line="+62"/>
<source>Enter class name</source>
- <translation type="unfinished"></translation>
+ <translation>Geben Sie einen Klassennamen ein</translation>
</message>
<message>
<location line="+1"/>
<source>The header and source file names will be derived from the class name</source>
- <translation type="unfinished"></translation>
+ <translation>Die Dateinamen werden aus dem Klassennamen generiert</translation>
</message>
<message>
<location line="+25"/>
<source>Configure...</source>
- <translation type="unfinished"></translation>
+ <translation>Einstellungen...</translation>
</message>
</context>
<context>
@@ -2009,7 +2188,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+116"/>
<source>Error while generating file contents.</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler beim Generieren der Dateien.</translation>
</message>
</context>
<context>
@@ -2017,7 +2196,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="-66"/>
<source>C++ Class Wizard</source>
- <translation type="unfinished"></translation>
+ <translation>Neue C++ Klasse</translation>
</message>
</context>
<context>
@@ -2025,25 +2204,25 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/cppeditor/cpphoverhandler.cpp" line="+87"/>
<source>Unfiltered</source>
- <translation type="unfinished"></translation>
+ <translation>Kein</translation>
</message>
</context>
<context>
<name>CppEditor::Internal::CppPlugin</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+152"/>
+ <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+167"/>
<source>C++</source>
- <translation type="unfinished"></translation>
+ <translation>C++</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a new C++ header file.</source>
- <translation type="unfinished"></translation>
+ <translation>Erzeugt eine neue C++-Header-Datei.</translation>
</message>
<message>
<location line="+1"/>
<source>C++ Header File</source>
- <translation type="unfinished"></translation>
+ <translation>C++ Header-Datei</translation>
</message>
<message>
<location line="+3"/>
@@ -2122,7 +2301,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+1"/>
<source>C++</source>
- <translation type="unfinished"></translation>
+ <translation>C++</translation>
</message>
</context>
<context>
@@ -2135,7 +2314,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+10"/>
<source>Text Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Text Editor</translation>
</message>
</context>
<context>
@@ -2253,7 +2432,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/debugger/breakhandler.cpp" line="+365"/>
<source>Number</source>
- <translation type="unfinished"></translation>
+ <translation>Zahl</translation>
</message>
<message>
<location line="+0"/>
@@ -2263,7 +2442,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+0"/>
<source>File</source>
- <translation type="unfinished">Datei</translation>
+ <translation>Datei</translation>
</message>
<message>
<location line="+0"/>
@@ -2332,22 +2511,22 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Debugger::Internal::CdbDebugEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdbdebugengine.cpp" line="+122"/>
+ <location filename="../../../src/plugins/debugger/cdb/cdbdebugengine.cpp" line="+123"/>
<source>Unable to load the debugger engine library '%1': %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+110"/>
<source>Unable to resolve '%1' in the debugger engine library '%2'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+225"/>
+ <location line="+229"/>
<source>The dumper library '%1' does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+23"/>
<source>The console stub process was unable to start '%1'.</source>
<translation type="unfinished"></translation>
</message>
@@ -2372,7 +2551,7 @@ Sollen sie überschrieben werden?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+428"/>
+ <location line="+479"/>
<source>Unable to assign the value '%1' to '%2': %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2382,7 +2561,7 @@ Sollen sie überschrieben werden?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+83"/>
<location line="+6"/>
<source>Debugger Error</source>
<translation type="unfinished"></translation>
@@ -2406,7 +2585,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+176"/>
<source>Debug</source>
- <translation type="unfinished"></translation>
+ <translation>Debuggen</translation>
</message>
</context>
<context>
@@ -2414,114 +2593,114 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+298"/>
<source>Start and Debug External Application...</source>
- <translation type="unfinished"></translation>
+ <translation>Debugge externe Anwendung...</translation>
</message>
<message>
<location line="+3"/>
<source>Attach to Running External Application...</source>
- <translation type="unfinished"></translation>
+ <translation>Debugge externe, laufende Anwendung...</translation>
</message>
<message>
<location line="+3"/>
<source>Attach to Core...</source>
- <translation type="unfinished"></translation>
+ <translation>Debugge core-Datei</translation>
</message>
<message>
<location line="+4"/>
<source>Continue</source>
- <translation type="unfinished"></translation>
+ <translation>Fortsetzen</translation>
</message>
<message>
<location line="+4"/>
<location line="+915"/>
<source>Interrupt</source>
- <translation type="unfinished"></translation>
+ <translation>Anhalten</translation>
</message>
<message>
<location line="-911"/>
<source>Reset Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger zurücksetzen</translation>
</message>
<message>
<location line="+3"/>
<source>Step Over</source>
- <translation type="unfinished"></translation>
+ <translation>Einzelschritt über</translation>
</message>
<message>
<location line="+5"/>
<source>Step Into</source>
- <translation type="unfinished"></translation>
+ <translation>Einzelschritt herein</translation>
</message>
<message>
<location line="+5"/>
<source>Step Over Instruction</source>
- <translation type="unfinished"></translation>
+ <translation>Einzelschritt über Anweisung</translation>
</message>
<message>
<location line="+5"/>
<source>Step One Instruction</source>
- <translation type="unfinished"></translation>
+ <translation>Einzelschritt eine Anweisung</translation>
</message>
<message>
<location line="+5"/>
<source>Step Out</source>
- <translation type="unfinished"></translation>
+ <translation>Einzelschritt heraus</translation>
</message>
<message>
<location line="+5"/>
<source>Run to Line</source>
- <translation type="unfinished"></translation>
+ <translation>Ausführen bis Zeile</translation>
</message>
<message>
<location line="+3"/>
<source>Run to Outermost Function</source>
- <translation type="unfinished"></translation>
+ <translation>Ausführen bis zu äußerster Funktion</translation>
</message>
<message>
<location line="+3"/>
<source>Jump to Line</source>
- <translation type="unfinished"></translation>
+ <translation>Zeile anspringen</translation>
</message>
<message>
<location line="+3"/>
<source>Toggle Breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Haltepunkt umschalten</translation>
</message>
<message>
<location line="+3"/>
<source>Set Breakpoint at Function...</source>
- <translation type="unfinished"></translation>
+ <translation>Haltepunkt bei Funktion</translation>
</message>
<message>
<location line="+3"/>
<source>Set Breakpoint at Function "main"</source>
- <translation type="unfinished"></translation>
+ <translation>Haltepunkt bei Funktion main() setzen</translation>
</message>
<message>
<location line="+3"/>
<source>Add to Watch Window</source>
- <translation type="unfinished"></translation>
+ <translation>Zu Watch-Fenster hinzufügen</translation>
</message>
<message>
<location line="+228"/>
<source>Stop requested...</source>
- <translation type="unfinished"></translation>
+ <translation>Stop angefordert...</translation>
</message>
<message>
<location line="+7"/>
<location line="+18"/>
<source>Stopped.</source>
- <translation type="unfinished"></translation>
+ <translation>Angehalten.</translation>
</message>
<message>
<location line="-12"/>
<source>Running requested...</source>
- <translation type="unfinished"></translation>
+ <translation>Fortsetzung angefordert...</translation>
</message>
<message>
<location line="+6"/>
<source>Running...</source>
- <translation type="unfinished"></translation>
+ <translation>Läuft...</translation>
</message>
<message>
<location line="+101"/>
@@ -2537,7 +2716,7 @@ Sollen sie überschrieben werden?</translation>
<location line="+58"/>
<location line="+60"/>
<source>Warning</source>
- <translation type="unfinished"></translation>
+ <translation>Warnung</translation>
</message>
<message>
<location line="-59"/>
@@ -2552,17 +2731,17 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+182"/>
<source>Save Debugger Log</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger Log speichern</translation>
</message>
<message>
<location line="+112"/>
<source>Stop Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger anhalten</translation>
</message>
<message>
<location line="+271"/>
<source>Open Qt preferences</source>
- <translation type="unfinished"></translation>
+ <translation>Qt-Versionseinstellungen öffnen</translation>
</message>
<message>
<location line="+1"/>
@@ -2603,7 +2782,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+284"/>
<source>Toggle Breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Haltepunkt umschalten</translation>
</message>
<message>
<location line="+34"/>
@@ -2613,7 +2792,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+7"/>
<source>Reset Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger zurücksetzen</translation>
</message>
<message>
<location line="+87"/>
@@ -2641,7 +2820,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+72"/>
<source>Debug</source>
- <translation type="unfinished"></translation>
+ <translation>Debuggen</translation>
</message>
</context>
<context>
@@ -2953,7 +3132,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="-10"/>
<source>Running...</source>
- <translation type="unfinished"></translation>
+ <translation>Läuft...</translation>
</message>
<message>
<location line="+139"/>
@@ -3308,7 +3487,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+142"/>
<source>Stopped.</source>
- <translation type="unfinished"></translation>
+ <translation>Angehalten.</translation>
</message>
</context>
<context>
@@ -3378,7 +3557,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+1"/>
<source>File</source>
- <translation type="unfinished">Datei</translation>
+ <translation>Datei</translation>
</message>
<message>
<location line="+1"/>
@@ -3506,7 +3685,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+1"/>
<source>Type</source>
- <translation type="unfinished"></translation>
+ <translation>Typ</translation>
</message>
<message>
<location line="+166"/>
@@ -3684,7 +3863,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location/>
<source>Configure...</source>
- <translation type="unfinished"></translation>
+ <translation>Einstellungen...</translation>
</message>
<message>
<location/>
@@ -3896,7 +4075,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/designer/formwindoweditor.cpp" line="+161"/>
<source>untitled</source>
- <translation type="unfinished"></translation>
+ <translation>kein Titel</translation>
</message>
</context>
<context>
@@ -4010,7 +4189,7 @@ It also automatically sets the correct qt version.</source>
<message>
<location/>
<source>Name:</source>
- <translation type="unfinished">Name:</translation>
+ <translation>Name:</translation>
</message>
<message>
<location/>
@@ -4353,7 +4532,7 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="+112"/>
<source>General</source>
- <translation type="unfinished"></translation>
+ <translation>Allgemein</translation>
</message>
<message>
<location line="+2"/>
@@ -4469,7 +4648,7 @@ Reason: %3</source>
<location filename="../../../src/libs/utils/filesearch.cpp" line="+75"/>
<location line="+102"/>
<source>%1: canceled. %2 occurrences found in %3 files.</source>
- <translation type="unfinished"></translation>
+ <translation>%1: abgebrochen. </translation>
</message>
<message>
<location line="-27"/>
@@ -4517,7 +4696,7 @@ Reason: %3</source>
<message>
<location/>
<source>1</source>
- <translation type="unfinished">1</translation>
+ <translation>1</translation>
</message>
<message>
<location/>
@@ -4535,37 +4714,37 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/find/finddialog.ui"/>
<source>Search for...</source>
- <translation type="unfinished"></translation>
+ <translation>Suche...</translation>
</message>
<message>
<location/>
<source>Sc&ope:</source>
- <translation type="unfinished"></translation>
+ <translation>&Bereich:</translation>
</message>
<message>
<location/>
<source>&Search</source>
- <translation type="unfinished"></translation>
+ <translation>&Suchen</translation>
</message>
<message>
<location/>
<source>Search &for:</source>
- <translation type="unfinished"></translation>
+ <translation>Suche &nach:</translation>
</message>
<message>
<location/>
<source>Close</source>
- <translation type="unfinished"></translation>
+ <translation>Schließen</translation>
</message>
<message>
<location/>
<source>&Case sensitive</source>
- <translation type="unfinished"></translation>
+ <translation>&Groß/Kleinschreibung</translation>
</message>
<message>
<location/>
<source>&Whole words only</source>
- <translation type="unfinished"></translation>
+ <translation>Ganze &Worte</translation>
</message>
</context>
<context>
@@ -4573,12 +4752,12 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/find/findplugin.cpp" line="+135"/>
<source>&Find/Replace</source>
- <translation type="unfinished"></translation>
+ <translation>&Suchen/Ersetzen</translation>
</message>
<message>
<location line="+17"/>
<source>Find Dialog</source>
- <translation type="unfinished"></translation>
+ <translation>Suchdialog</translation>
</message>
<message>
<location line="+2"/>
@@ -4591,37 +4770,32 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/find/findtoolbar.cpp" line="+149"/>
<source>Current Document</source>
- <translation type="unfinished"></translation>
+ <translation>Aktuelles Dokument</translation>
</message>
<message>
<location line="+7"/>
<source>Enter Find String</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Find.EnterFindString</source>
- <translation type="unfinished"></translation>
+ <translation>Suchmuster eingeben</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Ctrl+E</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Find Next</source>
- <translation type="unfinished"></translation>
+ <translation>Nächste Fundstelle</translation>
</message>
<message>
<location line="+7"/>
<source>Find Previous</source>
- <translation type="unfinished"></translation>
+ <translation>Vorhergehende Fundstelle</translation>
</message>
<message>
<location line="+7"/>
<source>Replace && Find Next</source>
- <translation type="unfinished"></translation>
+ <translation>Ersetzen und weitersuchen</translation>
</message>
<message>
<location line="+2"/>
@@ -4631,22 +4805,22 @@ Reason: %3</source>
<message>
<location line="+5"/>
<source>Replace && Find Previous</source>
- <translation type="unfinished"></translation>
+ <translation>Ersetzen und rückwarts weitersuchen</translation>
</message>
<message>
<location line="+8"/>
<source>Replace All</source>
- <translation type="unfinished"></translation>
+ <translation>Alles ersetzen</translation>
</message>
<message>
<location line="+6"/>
<source>Case Sensitive</source>
- <translation type="unfinished"></translation>
+ <translation>Groß/Kleinschreibung</translation>
</message>
<message>
<location line="+9"/>
<source>Whole Words Only</source>
- <translation type="unfinished"></translation>
+ <translation>Ganze Worte</translation>
</message>
</context>
<context>
@@ -4654,22 +4828,22 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/find/findwidget.ui"/>
<source>Find</source>
- <translation type="unfinished"></translation>
+ <translation>Suchen</translation>
</message>
<message>
<location/>
<source>Find:</source>
- <translation type="unfinished"></translation>
+ <translation>Suchen:</translation>
</message>
<message>
<location/>
<source>Replace with:</source>
- <translation type="unfinished"></translation>
+ <translation>Ersetzen durch:</translation>
</message>
<message>
<location/>
<source>All</source>
- <translation type="unfinished"></translation>
+ <translation>Alle</translation>
</message>
</context>
<context>
@@ -4677,137 +4851,23 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/find/searchresultwindow.h" line="+69"/>
<source>Search Results</source>
- <translation type="unfinished"></translation>
+ <translation>Suchergebnisse</translation>
</message>
<message>
<location filename="../../../src/plugins/find/searchresultwindow.cpp" line="+59"/>
<source>No matches found!</source>
- <translation type="unfinished"></translation>
+ <translation>Es wurden keine Treffer gefunden!</translation>
</message>
<message>
<location line="+8"/>
<source>Expand All</source>
- <translation type="unfinished"></translation>
+ <translation>Alles aufklappen</translation>
</message>
</context>
<context>
- <name>GdbOptionPage</name>
+ <name>GdbOptionsPage</name>
<message>
- <location filename="../../../src/plugins/debugger/gdboptionpage.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Gdb interaction</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>This is either a full abolute path leading to the gdb binary you intend to use or the name of a gdb binary that will be searched in your PATH.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Gdb location:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Environment:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>This is either empty or points to a file containing gdb commands that will be executed immediately after gdb starts up.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Gdb startup script:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Behaviour of breakpoint setting in plugins</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>This is the slowest but safest option.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Try to set breakpoints in plugins always automatically.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Try to set breakpoints in selected plugins</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Matching regular expression: </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Never set breakpoints in plugins automatically</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>User interface</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Checking this will populate the source file view automatically but might slow down debugger startup considerably.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Populate source file view automatically</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>When this option is checked, 'Step Into' compresses several steps into one in certain situations, leading to 'less noisy' debugging. So will, e.g., the atomic
- reference counting code be skipped, and a single 'Step Into' for a signal emission will end up directly in the slot connected to it.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Skip known frames when stepping</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Checking this will make enable tooltips for variable values during debugging. Since this can slow down debugging and does not provide reliable information as it does not use scope information, it is switched off by default.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Use tooltips while debugging</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Maximal stack depth:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source><unlimited></source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>GdbOptionsPage</name>
- <message>
- <location filename="../../../src/plugins/debugger/gdboptionspage.ui"/>
+ <location filename="../../../src/plugins/debugger/gdboptionspage.ui"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
@@ -4987,7 +5047,7 @@ Reason: %3</source>
<message>
<location line="+2"/>
<source>Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Projekte</translation>
</message>
<message>
<location line="+124"/>
@@ -5033,7 +5093,7 @@ Reason: %3</source>
<message>
<location line="+3"/>
<source>Delete</source>
- <translation type="unfinished"></translation>
+ <translation>Löschen</translation>
</message>
<message>
<location line="+20"/>
@@ -5465,12 +5525,12 @@ Reason: %3</source>
<message>
<location line="+3"/>
<source>&Undo</source>
- <translation type="unfinished">&Rückgangig</translation>
+ <translation>&Rückgangig</translation>
</message>
<message>
<location line="+3"/>
<source>&Redo</source>
- <translation type="unfinished">&Wiederholen</translation>
+ <translation>&Wiederholen</translation>
</message>
<message>
<location line="+60"/>
@@ -5505,7 +5565,7 @@ Reason: %3</source>
<message>
<location line="+106"/>
<source>File</source>
- <translation type="unfinished">Datei</translation>
+ <translation>Datei</translation>
</message>
<message>
<location line="+1"/>
@@ -5771,7 +5831,7 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/help/contentstoolwindow.cpp" line="+50"/>
<source>Contents</source>
- <translation type="unfinished"></translation>
+ <translation>Inhalt</translation>
</message>
</context>
<context>
@@ -5780,33 +5840,33 @@ Reason: %3</source>
<location filename="../../../src/plugins/help/docsettingspage.cpp" line="+51"/>
<location line="+84"/>
<source>Documentation</source>
- <translation type="unfinished"></translation>
+ <translation>Dokumentation</translation>
</message>
<message>
<location line="-73"/>
<source>Help</source>
- <translation type="unfinished"></translation>
+ <translation>Hilfe</translation>
</message>
<message>
<location line="+23"/>
<location line="+10"/>
<source>Add Documentation</source>
- <translation type="unfinished"></translation>
+ <translation>Dokumentation hinzufügen</translation>
</message>
<message>
<location line="-9"/>
<source>Qt Help Files (*.qch)</source>
- <translation type="unfinished"></translation>
+ <translation>Qt-Hilfedateien (*.qch)</translation>
</message>
<message>
<location line="+10"/>
<source>The file %1 is not a valid Qt Help file!</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei %1 ist keine gültige Qt-Hilfedatei!</translation>
</message>
<message>
<location line="+40"/>
<source>Cannot unregister documentation file %1!</source>
- <translation type="unfinished"></translation>
+ <translation>Die Dokumentationsdatei %1 kann nicht entladen werden!</translation>
</message>
</context>
<context>
@@ -5814,12 +5874,12 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/help/filtersettingspage.cpp" line="+51"/>
<source>Filters</source>
- <translation type="unfinished"></translation>
+ <translation>Filter</translation>
</message>
<message>
<location line="+10"/>
<source>Help</source>
- <translation type="unfinished"></translation>
+ <translation>Hilfe</translation>
</message>
</context>
<context>
@@ -5827,7 +5887,7 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/help/helpindexfilter.cpp" line="+72"/>
<source>Help index</source>
- <translation type="unfinished"></translation>
+ <translation>Hilfe - Index</translation>
</message>
</context>
<context>
@@ -5835,97 +5895,97 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/help/helpmode.cpp" line="+43"/>
<source>Help</source>
- <translation type="unfinished"></translation>
+ <translation>Hilfe</translation>
</message>
</context>
<context>
<name>Help::Internal::HelpPlugin</name>
<message>
- <location filename="../../../src/plugins/help/helpplugin.cpp" line="+165"/>
+ <location filename="../../../src/plugins/help/helpplugin.cpp" line="+177"/>
<location line="+36"/>
<source>Contents</source>
- <translation type="unfinished"></translation>
+ <translation>Inhalt</translation>
</message>
<message>
<location line="-34"/>
<location line="+30"/>
<source>Index</source>
- <translation type="unfinished"></translation>
+ <translation>Index</translation>
</message>
<message>
<location line="-28"/>
<location line="+36"/>
<source>Search</source>
- <translation type="unfinished"></translation>
+ <translation>Suche</translation>
</message>
<message>
<location line="-33"/>
<source>Bookmarks</source>
- <translation type="unfinished"></translation>
+ <translation>Lesezeichen</translation>
</message>
<message>
<location line="+8"/>
<source>Home</source>
- <translation type="unfinished"></translation>
+ <translation>Startseite</translation>
</message>
<message>
<location line="+4"/>
<location line="+168"/>
<source>Previous</source>
- <translation type="unfinished"></translation>
+ <translation>Vorige</translation>
</message>
<message>
<location line="-164"/>
<location line="+165"/>
<source>Next</source>
- <translation type="unfinished"></translation>
+ <translation>Nächste</translation>
</message>
<message>
<location line="-161"/>
<source>Add Bookmark</source>
- <translation type="unfinished"></translation>
+ <translation>Lesezeichen hinzufügen</translation>
</message>
<message>
<location line="+17"/>
<source>Context Help</source>
- <translation type="unfinished"></translation>
+ <translation>Kontexthilfe</translation>
</message>
<message>
<location line="+55"/>
<source>Activate Index in Help mode</source>
- <translation type="unfinished"></translation>
+ <translation>Index im Modus "Hilfe" zeigen</translation>
</message>
<message>
<location line="+7"/>
<source>Activate Contents in Help mode</source>
- <translation type="unfinished"></translation>
+ <translation>Inhalt im Modus "Hilfe" zeigen</translation>
</message>
<message>
<location line="+7"/>
<source>Activate Search in Help mode</source>
- <translation type="unfinished"></translation>
+ <translation>Suchen im Modus "Hilfe" zeigen</translation>
</message>
<message>
<location line="+219"/>
<location line="+4"/>
<location line="+66"/>
<source>Unfiltered</source>
- <translation type="unfinished"></translation>
+ <translation>Kein</translation>
</message>
<message>
<location line="+31"/>
<source><html><head><title>No Documentation</title></head><body><br/><center><b>%1</b><br/>No documentation available.</center></body></html></source>
- <translation type="unfinished"></translation>
+ <translation><html><head><title>Dokumentation fehlt</title></head><body><br/><center><b>%1</b><br/>Es ist keine Dokumentation verfügbar.</center></body></html></translation>
</message>
<message>
<location line="+19"/>
<source><html><head><title>No Documentation</title></head><body><br/><br/><center>No documentation available.</center></body></html></source>
- <translation type="unfinished"></translation>
+ <translation><html><head><title>Dokumentation fehlt</title></head><body><br/><br/><center>Es ist keine Dokumentation verfügbar.</center></body></html></center></body></html></translation>
</message>
<message>
<location line="+44"/>
<source>Filtered by:</source>
- <translation type="unfinished"></translation>
+ <translation>Filter:</translation>
</message>
</context>
<context>
@@ -5933,18 +5993,19 @@ Reason: %3</source>
<message>
<location filename="../../../src/plugins/help/helpengine.cpp" line="+501"/>
<source>Failed to load keyword index file!</source>
- <translation type="unfinished"></translation>
+ <translation>Die Schlüsselwort-Indexdatei konnte nicht geladen werden!</translation>
</message>
<message>
<location line="+14"/>
<source>Cannot open the index file %1</source>
- <translation type="unfinished"></translation>
+ <translation>DIe Indexdatei %1 kann nicht geöffnet werden</translation>
</message>
<message>
<location line="+35"/>
<source>Documentation file %1 does not exist!
Skipping file.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Die Dokumentationsdatei %1 existiert nicht!
+Sie wird übersprungen.</translation>
</message>
</context>
<context>
@@ -5952,12 +6013,12 @@ Skipping file.</source>
<message>
<location filename="../../../src/plugins/help/indextoolwindow.cpp" line="+52"/>
<source>Look for:</source>
- <translation type="unfinished"></translation>
+ <translation>Suche nach:</translation>
</message>
<message>
<location line="+13"/>
<source>Index</source>
- <translation type="unfinished"></translation>
+ <translation>Index</translation>
</message>
</context>
<context>
@@ -5965,28 +6026,28 @@ Skipping file.</source>
<message>
<location filename="../../../src/plugins/help/searchwidget.cpp" line="+158"/>
<source>&Copy</source>
- <translation type="unfinished">&Kopieren</translation>
+ <translation>&Kopieren</translation>
</message>
<message>
<location line="+4"/>
<source>Copy &Link Location</source>
- <translation type="unfinished"></translation>
+ <translation>&Adresse kopieren</translation>
</message>
<message>
<location line="+3"/>
<location line="+36"/>
<source>Open Link in New Tab</source>
- <translation type="unfinished"></translation>
+ <translation>Adresse in neuem Reiter öffnen</translation>
</message>
<message>
<location line="-29"/>
<source>Select All</source>
- <translation type="unfinished"></translation>
+ <translation>Alles auswählen</translation>
</message>
<message>
<location line="+28"/>
<source>Open Link</source>
- <translation type="unfinished"></translation>
+ <translation>Adresse öffnen</translation>
</message>
</context>
<context>
@@ -5995,7 +6056,8 @@ Skipping file.</source>
<location filename="../../../src/plugins/help/helpengine.cpp" line="-117"/>
<source>Documentation file %1 does not exist!
Skipping file.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Die Dokumentationsdatei %1 existiert nicht!
+Sie wird übersprungen.</translation>
</message>
<message>
<location line="+9"/>
@@ -6009,7 +6071,7 @@ Skipping file.</source>
<message>
<location filename="../../../src/shared/help/helpviewer.cpp" line="+222"/>
<source>Open Link in New Tab</source>
- <translation type="unfinished"></translation>
+ <translation>Adresse in neuem Reiter öffnen</translation>
</message>
<message>
<location line="+122"/>
@@ -6019,7 +6081,7 @@ Skipping file.</source>
<message>
<location line="+57"/>
<source>Help</source>
- <translation type="unfinished"></translation>
+ <translation>Hilfe</translation>
</message>
<message>
<location line="+1"/>
@@ -6035,7 +6097,7 @@ Skipping file.</source>
<message>
<location line="+63"/>
<source>Copy &Link Location</source>
- <translation type="unfinished"></translation>
+ <translation>&Adresse kopieren</translation>
</message>
<message>
<location line="+3"/>
@@ -6053,12 +6115,12 @@ Skipping file.</source>
<message>
<location line="+69"/>
<source>Open Link</source>
- <translation type="unfinished"></translation>
+ <translation>Adresse öffnen</translation>
</message>
<message>
<location line="+1"/>
<source>Open Link in New Tab</source>
- <translation type="unfinished"></translation>
+ <translation>Adresse in neuem Reiter öffnen</translation>
</message>
</context>
<context>
@@ -6074,7 +6136,7 @@ Skipping file.</source>
<message>
<location filename="../../../src/plugins/quickopen/quickopenconstants.h" line="+38"/>
<source>Filters</source>
- <translation type="unfinished"></translation>
+ <translation>Filter</translation>
</message>
<message>
<location line="+1"/>
@@ -6093,7 +6155,7 @@ Skipping file.</source>
<location line="+56"/>
<location filename="../../../src/tools/texteditor/mainwindow.cpp" line="+121"/>
<source>File</source>
- <translation type="unfinished">Datei</translation>
+ <translation>Datei</translation>
</message>
<message>
<location line="-60"/>
@@ -6178,7 +6240,7 @@ Skipping file.</source>
<message>
<location line="+26"/>
<source>Debug</source>
- <translation type="unfinished"></translation>
+ <translation>Debuggen</translation>
</message>
<message>
<location line="+105"/>
@@ -6193,7 +6255,7 @@ Skipping file.</source>
<message>
<location line="+146"/>
<source>Open File</source>
- <translation type="unfinished"></translation>
+ <translation>Datei öffnen</translation>
</message>
<message>
<location line="+58"/>
@@ -6293,7 +6355,7 @@ in your .pro file.</source>
<message>
<location/>
<source>Clear</source>
- <translation type="unfinished"></translation>
+ <translation>Löschen</translation>
</message>
</context>
<context>
@@ -6345,7 +6407,7 @@ in your .pro file.</source>
<message>
<location/>
<source>Cancel</source>
- <translation type="unfinished"></translation>
+ <translation>Abbrechen</translation>
</message>
<message>
<location filename="../../../src/plugins/perforce/pendingchangesdialog.cpp" line="+46"/>
@@ -6382,7 +6444,7 @@ in your .pro file.</source>
<location line="+17"/>
<location line="+399"/>
<source>Edit</source>
- <translation type="unfinished"></translation>
+ <translation>Editieren</translation>
</message>
<message>
<location line="-396"/>
@@ -6414,7 +6476,7 @@ in your .pro file.</source>
<location line="+4"/>
<location line="+385"/>
<source>Delete</source>
- <translation type="unfinished"></translation>
+ <translation>Löschen</translation>
</message>
<message>
<location line="-382"/>
@@ -6536,12 +6598,12 @@ in your .pro file.</source>
<message>
<location line="+3"/>
<source>&Undo</source>
- <translation type="unfinished">&Rückgangig</translation>
+ <translation>&Rückgangig</translation>
</message>
<message>
<location line="+3"/>
<source>&Redo</source>
- <translation type="unfinished">&Wiederholen</translation>
+ <translation>&Wiederholen</translation>
</message>
<message>
<location line="+49"/>
@@ -6842,22 +6904,22 @@ in your .pro file.</source>
<message>
<location filename="../../../src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp" line="+55"/>
<source>Details</source>
- <translation type="unfinished"></translation>
+ <translation>Beschreibung</translation>
</message>
<message>
<location line="+1"/>
<source>Error Details</source>
- <translation type="unfinished"></translation>
+ <translation>Fehlermeldungen</translation>
</message>
<message>
<location line="+7"/>
<source>Installed Plugins</source>
- <translation type="unfinished"></translation>
+ <translation>Installierte Plugins</translation>
</message>
<message>
<location line="+33"/>
<source>Plugin Details of %1</source>
- <translation type="unfinished"></translation>
+ <translation>Pluginbeschreibung zu %1</translation>
</message>
<message>
<location line="+20"/>
@@ -7092,7 +7154,7 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/allprojectsfilter.h" line="+51"/>
<source>Files in any project</source>
- <translation type="unfinished"></translation>
+ <translation>Dateien aus allen Projekten</translation>
</message>
</context>
<context>
@@ -7100,12 +7162,12 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/allprojectsfind.cpp" line="+61"/>
<source>All Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Alle Projekte</translation>
</message>
<message>
<location line="+52"/>
<source>File &pattern:</source>
- <translation type="unfinished"></translation>
+ <translation>Such&muster für Dateinamen</translation>
</message>
</context>
<context>
@@ -7131,7 +7193,7 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/applicationrunconfiguration.cpp" line="+89"/>
<source>Run</source>
- <translation type="unfinished"></translation>
+ <translation>Ausführung</translation>
</message>
</context>
<context>
@@ -7139,12 +7201,12 @@ Library base name: %1</source>
<message>
<location line="+52"/>
<source>Starting %1...</source>
- <translation type="unfinished"></translation>
+ <translation>Starte %1...</translation>
</message>
<message>
<location line="+26"/>
<source>%1 exited with code %2</source>
- <translation type="unfinished"></translation>
+ <translation>%1 beendet, Rückgabewert %2</translation>
</message>
</context>
<context>
@@ -7152,7 +7214,7 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.cpp" line="+79"/>
<source>Build Settings</source>
- <translation type="unfinished"></translation>
+ <translation>'Build'-Einstellungen</translation>
</message>
</context>
<context>
@@ -7165,7 +7227,7 @@ Library base name: %1</source>
<message>
<location/>
<source>Configurations</source>
- <translation type="unfinished"></translation>
+ <translation>Konfigurationen</translation>
</message>
<message>
<location/>
@@ -7188,12 +7250,12 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.cpp" line="+29"/>
<source>Create &New</source>
- <translation type="unfinished"></translation>
+ <translation>&Neu erzeugen</translation>
</message>
<message>
<location line="+2"/>
<source>&Clone Selected</source>
- <translation type="unfinished"></translation>
+ <translation>Auswahl duplizieren</translation>
</message>
<message>
<location line="+41"/>
@@ -7204,43 +7266,43 @@ Library base name: %1</source>
<message>
<location line="-65"/>
<source>General</source>
- <translation type="unfinished"></translation>
+ <translation>Allgemein</translation>
</message>
<message>
<location line="+12"/>
<source>Build Steps</source>
- <translation type="unfinished"></translation>
+ <translation>Erstellungsschritte</translation>
</message>
<message>
<location line="+66"/>
<source>Set as Active</source>
- <translation type="unfinished"></translation>
+ <translation>Aktivieren</translation>
</message>
<message>
<location line="+1"/>
<source>Clone</source>
- <translation type="unfinished"></translation>
+ <translation>Duplizieren</translation>
</message>
<message>
<location line="+1"/>
<source>Delete</source>
- <translation type="unfinished"></translation>
+ <translation>Löschen</translation>
</message>
<message>
<location line="+32"/>
<source>New configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Neue Konfiguration</translation>
</message>
<message>
<location line="+0"/>
<location line="+75"/>
<source>New Configuration Name:</source>
- <translation type="unfinished"></translation>
+ <translation>Name der neuen Konfiguration:</translation>
</message>
<message>
<location line="+0"/>
<source>Clone configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguration duplizieren</translation>
</message>
</context>
<context>
@@ -7253,7 +7315,7 @@ Library base name: %1</source>
<message>
<location/>
<source>1</source>
- <translation type="unfinished">1</translation>
+ <translation>1</translation>
</message>
<message>
<location/>
@@ -7278,7 +7340,7 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/buildstepspage.cpp" line="+103"/>
<source>Build Steps</source>
- <translation type="unfinished"></translation>
+ <translation>Erstellungsschritte</translation>
</message>
</context>
<context>
@@ -7287,34 +7349,34 @@ Library base name: %1</source>
<location filename="../../../src/plugins/projectexplorer/compileoutputwindow.cpp" line="+46"/>
<location filename="../../../src/plugins/projectexplorer/compileoutputwindow.h" line="+51"/>
<source>Compile Output</source>
- <translation type="unfinished"></translation>
+ <translation>Kompilierung</translation>
</message>
</context>
<context>
<name>ProjectExplorer::Internal::CoreListenerCheckingForRunningBuild</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+112"/>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+114"/>
<source>Cancel Build && Close</source>
- <translation type="unfinished"></translation>
+ <translation>Erstellen abbrechen und schließen</translation>
</message>
<message>
<location line="+1"/>
<source>Don't Close</source>
- <translation type="unfinished"></translation>
+ <translation>Nicht schließen</translation>
</message>
<message>
- <location line="+2"/>
- <source>Close QtCreator?</source>
+ <location line="+3"/>
+ <source>A project is currently being built.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>A project is currently being built.</source>
+ <location line="-1"/>
+ <source>Close Qt Creator?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Do you want to cancel the build process and close QtCreator anyway?</source>
+ <location line="+2"/>
+ <source>Do you want to cancel the build process and close Qt Creator anyway?</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -7336,7 +7398,7 @@ Library base name: %1</source>
<message>
<location line="+47"/>
<source>File &pattern:</source>
- <translation type="unfinished"></translation>
+ <translation>Such&muster für Dateinamen</translation>
</message>
</context>
<context>
@@ -7344,7 +7406,7 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/customexecutablerunconfiguration.cpp" line="-287"/>
<source>Name:</source>
- <translation type="unfinished">Name:</translation>
+ <translation>Name:</translation>
</message>
<message>
<location line="+4"/>
@@ -7519,7 +7581,7 @@ Library base name: %1</source>
<message>
<location/>
<source>Name:</source>
- <translation type="unfinished">Name:</translation>
+ <translation>Name:</translation>
</message>
<message>
<location/>
@@ -7582,7 +7644,7 @@ Library base name: %1</source>
<message>
<location line="+187"/>
<source>Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Projekte</translation>
</message>
<message>
<location line="+17"/>
@@ -7600,7 +7662,7 @@ Library base name: %1</source>
<message>
<location line="+13"/>
<source>Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Projekte</translation>
</message>
<message>
<location line="+1"/>
@@ -7627,46 +7689,53 @@ Library base name: %1</source>
</message>
</context>
<context>
- <name>ProjectExplorer::Internal::RemoveFileDialog</name>
+ <name>ProjectExplorer::Internal::QtOptionsPageWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/removefiledialog.ui"/>
- <source>Remove File</source>
+ <location filename="../../../src/plugins/projectexplorer/qtoptionspage.cpp" line="+65"/>
+ <source><specify a name></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
- <source>&Delete file permanently</source>
+ <location line="+1"/>
+ <source><specify a path></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
- <source>&Remove from Version Control</source>
+ <location line="+11"/>
+ <source>Select QTDIR</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
- <source>File to remove:</source>
+ <location line="+2"/>
+ <source>Select the Qt Directory</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>ProjectExplorer::Internal::RunSettingsPanel</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.cpp" line="+116"/>
- <source>Run Settings</source>
+ <location line="+211"/>
+ <source>The Qt Version %1 is not installed. Run make install</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%1 is not a valid qt directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Found Qt version %1, using mkspec %2</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>ProjectExplorer::Internal::RunSettingsPropertiesPage</name>
+ <name>ProjectExplorer::Internal::QtVersionManager</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.ui"/>
+ <location filename="../../../src/plugins/projectexplorer/qtversionmanager.ui"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
- <source>Run &configuration:</source>
+ <source>Qt versions</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -7681,50 +7750,154 @@ Library base name: %1</source>
</message>
<message>
<location/>
- <source>Settings</source>
+ <source>Name</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>ProjectExplorer::Internal::SessionDialog</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/sessiondialog.ui"/>
- <source>Session Manager</source>
+ <location/>
+ <source>Path</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
- <source>Choose your session</source>
+ <source>Debugging Helper</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
- <source>Create New Session</source>
+ <source>Version Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
- <source>Clone Session</source>
- <translation type="unfinished"></translation>
+ <source>Path:</source>
+ <translation>Pfad:</translation>
</message>
<message>
<location/>
- <source>Delete Session</source>
+ <source>MinGw Directory:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location/>
+ <source>Debugging Helper:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Show &Log</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Rebuild</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Default Qt Version:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::RemoveFileDialog</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/removefiledialog.ui"/>
+ <source>Remove File</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Delete file permanently</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Remove from Version Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>File to remove:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::RunSettingsPanel</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.cpp" line="+116"/>
+ <source>Run Settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::RunSettingsPropertiesPage</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.ui"/>
+ <source>Form</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Run &configuration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>-</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::SessionDialog</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/sessiondialog.ui"/>
+ <source>Session Manager</source>
+ <translation>Sessionverwaltung</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Choose your session</source>
+ <translation>Sitzung auswählen</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Create New Session</source>
+ <translation>Neue Sitzung erstellen</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Clone Session</source>
+ <translation>Sitzung duplizieren</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Delete Session</source>
+ <translation>Sitzung löschen</translation>
+ </message>
</context>
<context>
<name>ProjectExplorer::Internal::SessionFile</name>
<message>
<location filename="../../../src/plugins/projectexplorer/session.cpp" line="+156"/>
<source>Session</source>
- <translation type="unfinished"></translation>
+ <translation>Sitzung</translation>
</message>
<message>
<location line="+184"/>
<source>Untitled</source>
<comment>default file name to display</comment>
- <translation type="unfinished"></translation>
+ <translation>kein Titel</translation>
</message>
</context>
<context>
@@ -7741,12 +7914,12 @@ Library base name: %1</source>
<location line="-297"/>
<location filename="../../../src/plugins/projectexplorer/taskwindow.h" line="+61"/>
<source>Build Issues</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+11"/>
<source>&Copy</source>
- <translation type="unfinished">&Kopieren</translation>
+ <translation>&Kopieren</translation>
</message>
</context>
<context>
@@ -7804,32 +7977,32 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+63"/>
<source>Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Projekte</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+90"/>
<source>&Build</source>
- <translation type="unfinished"></translation>
+ <translation>&Erstellen</translation>
</message>
<message>
<location line="+6"/>
<source>&Debug</source>
- <translation type="unfinished"></translation>
+ <translation>&Debuggen</translation>
</message>
<message>
<location line="+45"/>
<source>Open With</source>
- <translation type="unfinished"></translation>
+ <translation>Öffnen mit</translation>
</message>
<message>
<location line="+76"/>
<source>Session Manager...</source>
- <translation type="unfinished"></translation>
+ <translation>Sitzungsverwaltung</translation>
</message>
<message>
<location line="+5"/>
<source>New Project...</source>
- <translation type="unfinished"></translation>
+ <translation>Neues Projekt...</translation>
</message>
<message>
<location line="+2"/>
@@ -7839,7 +8012,7 @@ Library base name: %1</source>
<message>
<location line="+5"/>
<source>Load Project...</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt laden</translation>
</message>
<message>
<location line="+2"/>
@@ -7849,33 +8022,33 @@ Library base name: %1</source>
<message>
<location line="+6"/>
<source>Open File</source>
- <translation type="unfinished"></translation>
+ <translation>Datei öffnen</translation>
</message>
<message>
<location line="+7"/>
<source>Show in Finder...</source>
- <translation type="unfinished"></translation>
+ <translation>In Finder anzeigen...</translation>
</message>
<message>
<location line="+12"/>
<source>Recent Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Zuletzt bearbeitete Projekte</translation>
</message>
<message>
<location line="+6"/>
<location line="+798"/>
<source>Unload Project</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt entladen</translation>
</message>
<message>
<location line="-790"/>
<source>Unload All Projects</source>
- <translation type="unfinished"></translation>
+ <translation>Alle Projekte entladen</translation>
</message>
<message>
<location line="+7"/>
<source>Session</source>
- <translation type="unfinished"></translation>
+ <translation>Sitzung</translation>
</message>
<message>
<location line="+10"/>
@@ -7885,7 +8058,7 @@ Library base name: %1</source>
<message>
<location line="+10"/>
<source>Build All</source>
- <translation type="unfinished"></translation>
+ <translation>Alles erstellen</translation>
</message>
<message>
<location line="+2"/>
@@ -7895,18 +8068,18 @@ Library base name: %1</source>
<message>
<location line="+10"/>
<source>Rebuild All</source>
- <translation type="unfinished"></translation>
+ <translation>Alles neu erstellen</translation>
</message>
<message>
<location line="+8"/>
<source>Clean All</source>
- <translation type="unfinished"></translation>
+ <translation>Alles bereinigen</translation>
</message>
<message>
<location line="+6"/>
<location line="+738"/>
<source>Build Project</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt erstellen</translation>
</message>
<message>
<location line="-735"/>
@@ -7916,18 +8089,18 @@ Library base name: %1</source>
<message>
<location line="+5"/>
<source>Rebuild Project</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt neu erstellen</translation>
</message>
<message>
<location line="+6"/>
<source>Clean Project</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt bereinigen</translation>
</message>
<message>
<location line="+13"/>
<location line="+18"/>
<source>Run</source>
- <translation type="unfinished"></translation>
+ <translation>Ausführen</translation>
</message>
<message>
<location line="-16"/>
@@ -7937,7 +8110,7 @@ Library base name: %1</source>
<message>
<location line="+5"/>
<source>Set Run Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Laufzeitkonfiguration setzen</translation>
</message>
<message>
<location line="+16"/>
@@ -7947,13 +8120,13 @@ Library base name: %1</source>
<message>
<location line="+7"/>
<source>Cancel Build</source>
- <translation type="unfinished"></translation>
+ <translation>Erstellen abbrechen</translation>
</message>
<message>
<location line="+7"/>
<location line="+4"/>
<source>Start Debugging</source>
- <translation type="unfinished"></translation>
+ <translation>Debuggen</translation>
</message>
<message>
<location line="+1"/>
@@ -7963,108 +8136,126 @@ Library base name: %1</source>
<message>
<location line="+5"/>
<source>Add New...</source>
- <translation type="unfinished"></translation>
+ <translation>Hinzufügen</translation>
</message>
<message>
<location line="+7"/>
<source>Add Existing Files...</source>
- <translation type="unfinished"></translation>
+ <translation>Existierende Datei hinzufügen</translation>
</message>
<message>
<location line="+7"/>
<source>Remove File...</source>
- <translation type="unfinished"></translation>
+ <translation>Datei entfernen...</translation>
</message>
<message>
<location line="+6"/>
<source>Rename</source>
- <translation type="unfinished"></translation>
+ <translation>Umbenennen</translation>
</message>
<message>
<location line="+118"/>
<source>Load Project</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt laden</translation>
</message>
<message>
<location line="+83"/>
<source>New Project</source>
<comment>Title of dialog</comment>
- <translation type="unfinished">Neues Projekt</translation>
+ <translation>Neues Projekt</translation>
</message>
<message>
<location line="+445"/>
<source>Unload Project "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt "%1" entladen</translation>
</message>
<message>
<location line="+1"/>
<source>Build Project "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt '%1" erstellen</translation>
</message>
<message>
<location line="+375"/>
<source>New File</source>
<comment>Title of dialog</comment>
- <translation type="unfinished"></translation>
+ <translation>Neue Datei</translation>
</message>
<message>
<location line="+13"/>
<source>Add Existing Files</source>
- <translation type="unfinished"></translation>
+ <translation>Existierende Dateien hinzufügen</translation>
</message>
<message>
<location line="+15"/>
<source>Could not add following files to project %1:
</source>
- <translation type="unfinished"></translation>
+ <translation>Die folgenden Dateien konnten nicht zum Projekt %1 hinzugefügt werden:
+</translation>
</message>
<message>
<location line="+2"/>
<source>Add files to project failed</source>
- <translation type="unfinished"></translation>
+ <translation>Das Hinzufügen der Dateien zum Projekt schlug fehl</translation>
</message>
<message>
<location line="+10"/>
<source>Add to Version Control</source>
- <translation type="unfinished"></translation>
+ <translation>Unter Versionsverwaltung stellen</translation>
</message>
<message>
<location line="+1"/>
<source>Add files
%1
to version control (%2)?</source>
- <translation type="unfinished"></translation>
+ <translation>Sollen die Dateien
+%1
+unter Versionsverwaltung (%2) gestellt werden?</translation>
</message>
<message>
<location line="+10"/>
<source>Could not add following files to version control (%1)
</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Die folgenden Dateien konnten nicht unter Versionsverwaltung (%1) gestellt werden
+</translation>
</message>
<message>
<location line="+2"/>
<source>Add files to version control failed</source>
- <translation type="unfinished"></translation>
+ <translation>Die Hinzufügen der Dateien zur Versionsverwaltung schlug fehl</translation>
</message>
<message>
<location line="+51"/>
<source>Remove file failed</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei konnte nicht entfernt werden</translation>
</message>
<message>
<location line="+1"/>
<source>Could not remove file %1 from project %2.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei %1 konnte nicht vom Projekt %2 entfernt werden.</translation>
</message>
<message>
<location line="+14"/>
<source>Delete file failed</source>
- <translation type="unfinished"></translation>
+ <translation>Das Löschen der Datei schlug fehl</translation>
</message>
<message>
<location line="+1"/>
<source>Could not delete file %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei %1 konnte nicht gelöscht werden.</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::QtVersionManager</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/qtversionmanager.cpp" line="+236"/>
+ <location line="+6"/>
+ <source>Auto-detected Qt</source>
+ <translation>Vorgefundene Qt-Installation</translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source><not found></source>
+ <translation><nicht gefunden></translation>
</message>
</context>
<context>
@@ -8072,22 +8263,22 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/projectexplorer/session.cpp" line="+297"/>
<source>Error while loading session</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler beim Laden der Sitzung</translation>
</message>
<message>
<location line="+1"/>
<source>Could not load session %1</source>
- <translation type="unfinished"></translation>
+ <translation>Die Sitzung %1 konnte nicht geladen werden</translation>
</message>
<message>
<location line="+36"/>
<source>Error while saving session</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler beim Speichern der Sitzung</translation>
</message>
<message>
<location line="+1"/>
<source>Could not save session to file %1</source>
- <translation type="unfinished"></translation>
+ <translation>Die Sitzung konnte nicht unter %1 gespeichert werden</translation>
</message>
<message>
<location line="+239"/>
@@ -8098,20 +8289,12 @@ to version control (%2)?</source>
<location line="+4"/>
<location line="+15"/>
<source>Untitled</source>
- <translation type="unfinished"></translation>
+ <translation>Kein Titel</translation>
</message>
<message>
<location line="+2"/>
<source>Session ('%1')</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>QHelpProjectPlugin::Internal::QHelpProjectManager</name>
- <message>
- <location filename="../../../src/plugins/qhelpproject/qhelpprojectmanager.cpp" line="+105"/>
- <source>Qt Help Project File (*.qthp)</source>
- <translation type="unfinished"></translation>
+ <translation>Sitzung ('%1')</translation>
</message>
</context>
<context>
@@ -8249,7 +8432,7 @@ to version control (%2)?</source>
<message>
<location line="+2"/>
<source>Make writable</source>
- <translation type="unfinished"></translation>
+ <translation>Schreibbar machen</translation>
</message>
<message>
<location line="+4"/>
@@ -8266,11 +8449,6 @@ to version control (%2)?</source>
<source>FakeVim properties...</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../../../src/plugins/qhelpproject/qhelpproject.cpp" line="+50"/>
- <source>Files</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../../../src/plugins/qtestlib/qtestlibplugin.cpp" line="+59"/>
<source>Pass</source>
@@ -8294,7 +8472,7 @@ to version control (%2)?</source>
<message>
<location line="+9"/>
<source>Warning</source>
- <translation type="unfinished"></translation>
+ <translation>Warnung</translation>
</message>
<message>
<location line="+1"/>
@@ -8362,36 +8540,43 @@ to version control (%2)?</source>
<name>QrcEditor</name>
<message>
<location filename="../../../src/shared/qrceditor/qrceditor.ui"/>
+ <location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+151"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
+ <location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
+ <location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
+ <location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
+ <location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Prefix:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
+ <location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Language:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
+ <location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Alias:</source>
<translation type="unfinished"></translation>
</message>
@@ -8455,7 +8640,7 @@ to version control (%2)?</source>
<message>
<location/>
<source>1</source>
- <translation type="unfinished">1</translation>
+ <translation>1</translation>
</message>
<message>
<location/>
@@ -8480,7 +8665,7 @@ to version control (%2)?</source>
<message>
<location/>
<source>Cancel</source>
- <translation type="unfinished"></translation>
+ <translation>Abbrechen</translation>
</message>
</context>
<context>
@@ -8508,7 +8693,7 @@ to version control (%2)?</source>
<message>
<location/>
<source>Delete</source>
- <translation type="unfinished"></translation>
+ <translation>Löschen</translation>
</message>
<message>
<location/>
@@ -8593,7 +8778,7 @@ to version control (%2)?</source>
<message>
<location line="+2"/>
<source>Type</source>
- <translation type="unfinished"></translation>
+ <translation>Typ</translation>
</message>
<message>
<location line="+35"/>
@@ -8619,7 +8804,7 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/shared/proparser/proeditor.ui"/>
<source>New</source>
- <translation type="unfinished">Neu</translation>
+ <translation>Neu</translation>
</message>
<message>
<location/>
@@ -8733,7 +8918,7 @@ to version control (%2)?</source>
<context>
<name>Qt4ProjectManager::Internal::ProjectLoadWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+186"/>
+ <location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+191"/>
<source>Import existing settings</source>
<translation type="unfinished"></translation>
</message>
@@ -8753,64 +8938,6 @@ to version control (%2)?</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>Qt4ProjectManager::Internal::Qt4BuildConfigWidget</name>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4buildconfigwidget.ui"/>
- <source>Form</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Configuration Name:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Qt Version:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Manage Qt Versions</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>This Qt-Version is invalid.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Shadow Build:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Build Directory:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source><a href="import">Import existing build</a></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp" line="+57"/>
- <source>Shadow Build Directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+43"/>
- <source>General</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+35"/>
- <source>Default Qt Version</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>Qt4ProjectManager::Internal::Qt4BuildEnvironmentWidget</name>
<message>
@@ -8826,7 +8953,7 @@ to version control (%2)?</source>
<message>
<location/>
<source>&Edit</source>
- <translation type="unfinished">&Bearbeiten</translation>
+ <translation>&Bearbeiten</translation>
</message>
<message>
<location/>
@@ -8844,246 +8971,189 @@ to version control (%2)?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp" line="+84"/>
- <source>Build Environment</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+54"/>
- <source>Reset</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Remove</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::Qt4PriFileNode</name>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4nodes.cpp" line="+278"/>
- <location line="+7"/>
- <source>Failed!</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-7"/>
- <source>Could not open the file for edit with SCC.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Could not set permissions to writable.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+33"/>
- <source>There are unsaved changes for project file %1.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+22"/>
- <source>Error while parsing file %1. Giving up.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Error while changing pro file %1.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::Qt4ProFileNode</name>
- <message>
- <location line="+219"/>
- <source>Error while parsing file %1. Giving up.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+373"/>
- <source>Could not find .pro file for sub dir '%1' in '%2'</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::Qt4ProjectManagerPlugin</name>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp" line="+152"/>
- <location line="+5"/>
- <source>Run qmake</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::Qt4RunConfiguration</name>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4runconfiguration.cpp" line="+69"/>
- <location line="+245"/>
- <source>Qt4RunConfiguration</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+44"/>
- <source>Could not parse %1. The Qt4 run configuration %2 can not be started.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::Qt4RunConfigurationWidget</name>
- <message>
- <location line="-259"/>
- <source>Name:</source>
- <translation type="unfinished">Name:</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Executable:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Working Directory:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>&Arguments:</source>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp" line="+84"/>
+ <source>Build Environment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Run in &Terminal</source>
+ <location line="+54"/>
+ <source>Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)</source>
+ <location line="+2"/>
+ <source>Remove</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>Qt4ProjectManager::Internal::QtDirWidget</name>
+ <name>Qt4ProjectManager::Internal::Qt4PriFileNode</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+385"/>
- <source><specify a name></source>
- <translation type="unfinished"></translation>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4nodes.cpp" line="+279"/>
+ <location line="+7"/>
+ <source>Failed!</source>
+ <translation>Fehler</translation>
</message>
<message>
- <location line="+1"/>
- <source><specify a path></source>
- <translation type="unfinished"></translation>
+ <location line="-7"/>
+ <source>Could not open the file for edit with SCC.</source>
+ <translation>Die Datei konnte nicht mit Hilfe der Versionsverwaltung schreibbar gemacht werden.</translation>
</message>
<message>
- <location line="+10"/>
- <source>Select QTDIR</source>
+ <location line="+7"/>
+ <source>Could not set permissions to writable.</source>
+ <translation>Die Datei konnte schreibbar gemacht werden.</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <source>There are unsaved changes for project file %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Select the Qt Directory</source>
+ <location line="+22"/>
+ <source>Error while parsing file %1. Giving up.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+210"/>
- <source>The Qt Version %1 is not installed. Run make install</source>
+ <location line="+7"/>
+ <source>Error while changing pro file %1.</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::Qt4ProFileNode</name>
<message>
- <location line="+3"/>
- <source>%1 is not a valid qt directory</source>
+ <location line="+219"/>
+ <source>Error while parsing file %1. Giving up.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
- <source>Found Qt version %1, using mkspec %2</source>
+ <location line="+373"/>
+ <source>Could not find .pro file for sub dir '%1' in '%2'</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>Qt4ProjectManager::Internal::QtVersionManager</name>
+ <name>Qt4ProjectManager::Internal::Qt4ProjectConfigWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.ui"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.ui"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
- <source>Qt versions</source>
+ <source>Configuration Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
- <source>+</source>
+ <source>Qt Version:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
- <source>-</source>
+ <source>Manage Qt Versions</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
- <source>Name</source>
+ <source>This Qt-Version is invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
- <source>Path</source>
+ <source>Shadow Build:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
- <source>Debugging Helper</source>
+ <source>Build Directory:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
- <source>Version Name:</source>
+ <source><a href="import">Import existing build</a></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
- <source>Path:</source>
- <translation type="unfinished">Pfad:</translation>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp" line="+62"/>
+ <source>Shadow Build Directory</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location/>
- <source>MinGw Directory:</source>
+ <location line="+45"/>
+ <source>General</source>
+ <translation>Allgemein</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Default Qt Version</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::Qt4ProjectManagerPlugin</name>
<message>
- <location/>
- <source>Debugging Helper:</source>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp" line="+146"/>
+ <location line="+5"/>
+ <source>Run qmake</source>
+ <translation>qmake ausführen</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::Qt4RunConfiguration</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4runconfiguration.cpp" line="+70"/>
+ <location line="+245"/>
+ <source>Qt4RunConfiguration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
- <source>Show &Log</source>
+ <location line="+44"/>
+ <source>Could not parse %1. The Qt4 run configuration %2 can not be started.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::Qt4RunConfigurationWidget</name>
+ <message>
+ <location line="-259"/>
+ <source>Name:</source>
+ <translation>Name:</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Executable:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
- <source>&Rebuild</source>
+ <location line="+3"/>
+ <source>Working Directory:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
- <source>Default Qt Version:</source>
+ <location line="+2"/>
+ <source>&Arguments:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="-306"/>
- <location line="+6"/>
- <source>Auto-detected Qt</source>
+ <location line="+5"/>
+ <source>Run in &Terminal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+55"/>
- <source><not found></source>
+ <location line="+5"/>
+ <source>Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>Qt4ProjectManager::Internal::QtVersionManager</name>
+ <message>
+ <source>Path:</source>
+ <translation type="obsolete">Pfad:</translation>
+ </message>
+</context>
<context>
<name>Qt4ProjectManager::Internal::QtWizard</name>
<message>
@@ -9162,7 +9232,7 @@ to version control (%2)?</source>
<message>
<location/>
<source>New</source>
- <translation type="unfinished">Neu</translation>
+ <translation>Neu</translation>
</message>
<message>
<location/>
@@ -9193,7 +9263,7 @@ to version control (%2)?</source>
<context>
<name>Qt4ProjectManager::MakeStep</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+105"/>
+ <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+106"/>
<source><font color="#ff0000">Could not find make command: %1 in the build environment</font></source>
<translation type="unfinished"></translation>
</message>
@@ -9241,7 +9311,7 @@ to version control (%2)?</source>
<context>
<name>Qt4ProjectManager::Qt4Manager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanager.cpp" line="+134"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanager.cpp" line="+136"/>
<source>Loading project %1 ...</source>
<translation type="unfinished"></translation>
</message>
@@ -9317,7 +9387,7 @@ to version control (%2)?</source>
<message>
<location filename="../../../src/plugins/quickopen/iquickopenfilter.cpp" line="+86"/>
<source>Filter Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Filterkonfiguration</translation>
</message>
<message>
<location line="+5"/>
@@ -9340,7 +9410,7 @@ to version control (%2)?</source>
<message>
<location line="+58"/>
<source>Filter Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Filterkonfiguration</translation>
</message>
<message>
<location line="+13"/>
@@ -9380,7 +9450,7 @@ to version control (%2)?</source>
<message>
<location/>
<source>Name:</source>
- <translation type="unfinished">Name:</translation>
+ <translation>Name:</translation>
</message>
<message>
<location/>
@@ -9499,7 +9569,7 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<message>
<location line="+1"/>
<source>Configure...</source>
- <translation type="unfinished"></translation>
+ <translation>Einstellungen...</translation>
</message>
<message>
<location line="+6"/>
@@ -9537,7 +9607,7 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<message>
<location/>
<source>Edit</source>
- <translation type="unfinished"></translation>
+ <translation>Editieren</translation>
</message>
<message>
<location/>
@@ -9583,7 +9653,7 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<message>
<location/>
<source>Edit</source>
- <translation type="unfinished"></translation>
+ <translation>Editieren</translation>
</message>
<message>
<location/>
@@ -9715,12 +9785,12 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<message>
<location line="+12"/>
<source>&Undo</source>
- <translation type="unfinished">&Rückgangig</translation>
+ <translation>&Rückgangig</translation>
</message>
<message>
<location line="+1"/>
<source>&Redo</source>
- <translation type="unfinished">&Wiederholen</translation>
+ <translation>&Wiederholen</translation>
</message>
</context>
<context>
@@ -9728,7 +9798,7 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<message>
<location filename="../../../src/plugins/resourceeditor/resourceeditorw.cpp" line="+116"/>
<source>untitled</source>
- <translation type="unfinished"></translation>
+ <translation>kein Titel</translation>
</message>
</context>
<context>
@@ -9918,7 +9988,7 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<message>
<location/>
<source>Label</source>
- <translation type="unfinished"></translation>
+ <translation>Sprungmarke</translation>
</message>
<message>
<location/>
@@ -9964,7 +10034,7 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<context>
<name>ShowBuildLog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/showbuildlog.ui"/>
+ <location filename="../../../src/plugins/projectexplorer/showbuildlog.ui"/>
<source>Debugging Helper Build Log</source>
<translation type="unfinished"></translation>
</message>
@@ -10410,7 +10480,7 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<message>
<location line="+5"/>
<source>Delete</source>
- <translation type="unfinished"></translation>
+ <translation>Löschen</translation>
</message>
<message>
<location line="+7"/>
@@ -10485,12 +10555,12 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<message>
<location line="+3"/>
<source>&Undo</source>
- <translation type="unfinished">&Rückgangig</translation>
+ <translation>&Rückgangig</translation>
</message>
<message>
<location line="+3"/>
<source>&Redo</source>
- <translation type="unfinished">&Wiederholen</translation>
+ <translation>&Wiederholen</translation>
</message>
<message>
<location line="+39"/>
@@ -10615,7 +10685,7 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<message>
<location filename="../../../src/plugins/subversion/subversionsubmiteditor.cpp" line="+42"/>
<source>Subversion Submit</source>
- <translation type="unfinished">Subversion Submit</translation>
+ <translation>Subversion Submit</translation>
</message>
</context>
<context>
@@ -10624,17 +10694,17 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<location filename="../../../src/plugins/texteditor/basefilefind.cpp" line="+113"/>
<location line="+19"/>
<source>%1 found</source>
- <translation type="unfinished"></translation>
+ <translation>%1 gefunden</translation>
</message>
<message>
<location line="+12"/>
<source>List of comma separated wildcard filters</source>
- <translation type="unfinished"></translation>
+ <translation>Liste von Suchmustern, durch Kommas getrennt</translation>
</message>
<message>
<location line="+27"/>
<source>Use Regular E&xpressions</source>
- <translation type="unfinished"></translation>
+ <translation>Benutze reguläre Ausdrücke</translation>
</message>
</context>
<context>
@@ -10642,43 +10712,43 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<message>
<location filename="../../../src/plugins/texteditor/basetextdocument.cpp" line="+172"/>
<source>untitled</source>
- <translation type="unfinished"></translation>
+ <translation>kein Titel</translation>
</message>
<message>
<location line="+67"/>
<source><em>Binary data</em></source>
- <translation type="unfinished"></translation>
+ <translation><em>Binäre Daten</em></translation>
</message>
</context>
<context>
<name>TextEditor::BaseTextEditor</name>
<message>
- <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+230"/>
+ <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+234"/>
<source>Print Document</source>
- <translation type="unfinished"></translation>
+ <translation>Dokument drucken</translation>
</message>
<message>
- <location line="+267"/>
+ <location line="+284"/>
<source><b>Error:</b> Could not decode "%1" with "%2"-encoding. Editing not possible.</source>
- <translation type="unfinished"></translation>
+ <translation><b>Fehler:</b> Die Datei "%1" kann nicht mit dem Encoding "%2" dargestellt werden. Sie kann nicht editiert werden.</translation>
</message>
<message>
<location line="+2"/>
<source>Select Encoding</source>
- <translation type="unfinished"></translation>
+ <translation>Encoding auswählen</translation>
</message>
</context>
<context>
<name>TextEditor::BaseTextEditorEditable</name>
<message>
- <location line="+3226"/>
+ <location line="+3361"/>
<source>Line: %1, Col: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Zeile: %1, Spalte: %2</translation>
</message>
<message>
<location line="+1"/>
<source>Line: %1, Col: 999</source>
- <translation type="unfinished"></translation>
+ <translation>Zeile: %1, Spalte: 999</translation>
</message>
</context>
<context>
@@ -10691,77 +10761,77 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<message>
<location/>
<source>Storage</source>
- <translation type="unfinished"></translation>
+ <translation>Abspeichern</translation>
</message>
<message>
<location/>
<source>Removes trailing whitespace on saving.</source>
- <translation type="unfinished"></translation>
+ <translation>Leerzeichen am Zeilenende beim Abspeichern entfernen.</translation>
</message>
<message>
<location/>
<source>&Clean whitespace</source>
- <translation type="unfinished"></translation>
+ <translation>&Leerzeichen bereinigen</translation>
</message>
<message>
<location/>
<source>Clean whitespace in entire document instead of only for changed parts.</source>
- <translation type="unfinished"></translation>
+ <translation>Bereinigt Leerzeichen im gesamten Dokument und nicht nur in den geänderten Teilen.</translation>
</message>
<message>
<location/>
<source>In entire &document</source>
- <translation type="unfinished"></translation>
+ <translation>Im &gesamten Dokument</translation>
</message>
<message>
<location/>
<source>Correct leading whitespace according to tab settings.</source>
- <translation type="unfinished"></translation>
+ <translation>Leerzeichen am Zeilenanfang entsprechend Tabulatoreinstellungen korrigieren.</translation>
</message>
<message>
<location/>
<source>Clean indentation</source>
- <translation type="unfinished"></translation>
+ <translation>Einrückung korrigieren</translation>
</message>
<message>
<location/>
<source>&Ensure newline at end of file</source>
- <translation type="unfinished"></translation>
+ <translation>&Zeilenvorschub am Dateiende anfügen</translation>
</message>
<message>
<location/>
<source>Tabs and Indentation</source>
- <translation type="unfinished"></translation>
+ <translation>Tabulatoren und Einrückung</translation>
</message>
<message>
<location/>
<source>Ta&b size:</source>
- <translation type="unfinished"></translation>
+ <translation>Tabulator&weite:</translation>
</message>
<message>
<location/>
<source>&Indent size:</source>
- <translation type="unfinished"></translation>
+ <translation>&Einrückung:</translation>
</message>
<message>
<location/>
<source>Backspace will go back one indentation level instead of one space.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Rücktaste folgt der Einrückungstiefe anstatt nur ein Zeichen zu löschen.</translation>
</message>
<message>
<location/>
<source>&Backspace follows indentation</source>
- <translation type="unfinished"></translation>
+ <translation>&Rücktaste folgt der Einrückungstiefe</translation>
</message>
<message>
<location/>
<source>Insert &spaces instead of tabs</source>
- <translation type="unfinished"></translation>
+ <translation>Leerzeichen &anstelle Tabulatoren einfügen</translation>
</message>
<message>
<location/>
<source>Enable automatic &indentation</source>
- <translation type="unfinished"></translation>
+ <translation>Automatische Ein&rückung</translation>
</message>
</context>
<context>
@@ -10774,47 +10844,52 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<message>
<location/>
<source>Display</source>
- <translation type="unfinished"></translation>
+ <translation>Anzeige</translation>
</message>
<message>
<location/>
<source>Display line &numbers</source>
- <translation type="unfinished"></translation>
+ <translation>Zeilen&nummern anzeigen</translation>
</message>
<message>
<location/>
<source>Display &folding markers</source>
- <translation type="unfinished"></translation>
+ <translation>Code&folding-Zeichen anzeigen</translation>
</message>
<message>
<location/>
<source>Show tabs and spaces.</source>
- <translation type="unfinished"></translation>
+ <translation>Tabulatoren und Leerzeichen darstellen.</translation>
</message>
<message>
<location/>
<source>&Visualize whitespace</source>
- <translation type="unfinished"></translation>
+ <translation>&Leerzeichen darstellen</translation>
</message>
<message>
<location/>
<source>Highlight current &line</source>
- <translation type="unfinished"></translation>
+ <translation>Aktuelle &Zeile hervorheben</translation>
</message>
<message>
<location/>
<source>Text Wrapping</source>
- <translation type="unfinished"></translation>
+ <translation>Umbruch</translation>
</message>
<message>
<location/>
<source>Enable text &wrapping</source>
- <translation type="unfinished"></translation>
+ <translation>&Umbruch aktivieren</translation>
</message>
<message>
<location/>
<source>Display right &margin at column:</source>
- <translation type="unfinished"></translation>
+ <translation>Rechten &Rand anzeigen bei Spalte:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Highlight &blocks</source>
+ <translation>Blöcke hervorheben</translation>
</message>
</context>
<context>
@@ -10822,13 +10897,14 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<message>
<location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+198"/>
<source>Font & Colors</source>
- <translation type="unfinished"></translation>
+ <translation>Zeichensatz und Farben</translation>
</message>
<message>
<location line="+203"/>
<source>
This is only an example.</source>
- <translation type="unfinished"></translation>
+ <translation>
+ Dies ist ein Beispiel.</translation>
</message>
</context>
<context>
@@ -10836,28 +10912,29 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<message>
<location filename="../../../src/plugins/texteditor/codecselector.cpp" line="+72"/>
<source>Text Encoding</source>
- <translation type="unfinished"></translation>
+ <translation>Text Encoding</translation>
</message>
<message>
<location line="+4"/>
<source>
The following encodings are likely to fit:</source>
- <translation type="unfinished"></translation>
+ <translation>
+Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
</message>
<message>
<location line="+1"/>
<source>Select encoding for "%1".%2</source>
- <translation type="unfinished"></translation>
+ <translation>Auswahl des Encodings für "%1".%2</translation>
</message>
<message>
<location line="+44"/>
<source>Reload with Encoding</source>
- <translation type="unfinished"></translation>
+ <translation>Neu laden</translation>
</message>
<message>
<location line="+1"/>
<source>Save with Encoding</source>
- <translation type="unfinished"></translation>
+ <translation>Mit Encoding abspeichern</translation>
</message>
</context>
<context>
@@ -10865,27 +10942,27 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/texteditor/findinfiles.cpp" line="+55"/>
<source>Files on Disk</source>
- <translation type="unfinished"></translation>
+ <translation>Dateien auf Datenträger</translation>
</message>
<message>
<location line="+37"/>
<source>&Directory:</source>
- <translation type="unfinished"></translation>
+ <translation>&Verzeichnis:</translation>
</message>
<message>
<location line="+13"/>
<source>&Browse</source>
- <translation type="unfinished"></translation>
+ <translation>&Auswählen</translation>
</message>
<message>
<location line="+4"/>
<source>File &pattern:</source>
- <translation type="unfinished"></translation>
+ <translation>Such&muster für Dateinamen</translation>
</message>
<message>
<location line="+18"/>
<source>Directory to search</source>
- <translation type="unfinished"></translation>
+ <translation>Verzeichnis</translation>
</message>
</context>
<context>
@@ -10898,47 +10975,47 @@ The following encodings are likely to fit:</source>
<message>
<location/>
<source>Font</source>
- <translation type="unfinished"></translation>
+ <translation>Zeichensatz</translation>
</message>
<message>
<location/>
<source>Family:</source>
- <translation type="unfinished"></translation>
+ <translation>Name:</translation>
</message>
<message>
<location/>
<source>Size:</source>
- <translation type="unfinished"></translation>
+ <translation>Größe:</translation>
</message>
<message>
<location/>
<source>Color Scheme</source>
- <translation type="unfinished"></translation>
+ <translation>Farbschema:</translation>
</message>
<message>
<location/>
<source>Bold</source>
- <translation type="unfinished"></translation>
+ <translation>Fett</translation>
</message>
<message>
<location/>
<source>Italic</source>
- <translation type="unfinished"></translation>
+ <translation>Kursiv</translation>
</message>
<message>
<location/>
<source>Background:</source>
- <translation type="unfinished"></translation>
+ <translation>Hintergrund:</translation>
</message>
<message>
<location/>
<source>Foreground:</source>
- <translation type="unfinished"></translation>
+ <translation>Zeichen:</translation>
</message>
<message>
<location/>
<source>Erase background</source>
- <translation type="unfinished"></translation>
+ <translation>Hintergrund löschen</translation>
</message>
<message>
<location/>
@@ -10948,7 +11025,7 @@ The following encodings are likely to fit:</source>
<message>
<location/>
<source>Preview:</source>
- <translation type="unfinished"></translation>
+ <translation>Vorschau:</translation>
</message>
</context>
<context>
@@ -10956,12 +11033,12 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/texteditor/linenumberfilter.h" line="+52"/>
<source>Line in current document</source>
- <translation type="unfinished"></translation>
+ <translation>Zeile im aktuellenDokument</translation>
</message>
<message>
<location filename="../../../src/plugins/texteditor/linenumberfilter.cpp" line="+55"/>
<source>Line %1</source>
- <translation type="unfinished"></translation>
+ <translation>Zeile %1</translation>
</message>
</context>
<context>
@@ -10969,22 +11046,22 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/texteditor/texteditorplugin.cpp" line="+93"/>
<source>This creates a new text file (.txt)</source>
- <translation type="unfinished"></translation>
+ <translation>Erzeugt eine neue Textdatei (.txt)</translation>
</message>
<message>
<location line="+1"/>
<source>Text File</source>
- <translation type="unfinished"></translation>
+ <translation>Textdatei</translation>
</message>
<message>
<location line="+2"/>
<source>General</source>
- <translation type="unfinished"></translation>
+ <translation>Allgemein</translation>
</message>
<message>
<location line="+26"/>
<source>Triggers a completion in this scope</source>
- <translation type="unfinished"></translation>
+ <translation>Beginnt eine Ergänzung in diesem Bereich</translation>
</message>
<message>
<location line="+5"/>
@@ -11002,22 +11079,22 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/texteditor/texteditoractionhandler.cpp" line="+115"/>
<source>&Undo</source>
- <translation type="unfinished">&Rückgangig</translation>
+ <translation>&Rückgangig</translation>
</message>
<message>
<location line="+2"/>
<source>&Redo</source>
- <translation type="unfinished">&Wiederholen</translation>
+ <translation>&Wiederholen</translation>
</message>
<message>
<location line="+13"/>
<source>Select Encoding...</source>
- <translation type="unfinished"></translation>
+ <translation>Encoding auswählen...</translation>
</message>
<message>
<location line="+6"/>
<source>Auto-&indent Selection</source>
- <translation type="unfinished"></translation>
+ <translation>Ein&rückung in Auswahl korrigieren</translation>
</message>
<message>
<location line="+2"/>
@@ -11027,7 +11104,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+5"/>
<source>&Visualize Whitespace</source>
- <translation type="unfinished"></translation>
+ <translation>&Leerzeichen anzeigen</translation>
</message>
<message>
<location line="+5"/>
@@ -11037,12 +11114,12 @@ The following encodings are likely to fit:</source>
<message>
<location line="+5"/>
<source>Clean Whitespace</source>
- <translation type="unfinished"></translation>
+ <translation>Leerzeichen bereinigen</translation>
</message>
<message>
<location line="+7"/>
<source>Enable Text &Wrapping</source>
- <translation type="unfinished"></translation>
+ <translation>Text&umbruch aktivieren</translation>
</message>
<message>
<location line="+4"/>
@@ -11052,7 +11129,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+6"/>
<source>(Un)Comment &Selection</source>
- <translation type="unfinished"></translation>
+ <translation>Auswahl aus&kommentieren</translation>
</message>
<message>
<location line="+2"/>
@@ -11062,7 +11139,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+4"/>
<source>Delete &Line</source>
- <translation type="unfinished"></translation>
+ <translation>&Zeile löschen</translation>
</message>
<message>
<location line="+2"/>
@@ -11072,7 +11149,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+3"/>
<source>Collapse</source>
- <translation type="unfinished"></translation>
+ <translation>Einklappen</translation>
</message>
<message>
<location line="+2"/>
@@ -11082,7 +11159,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+4"/>
<source>Expand</source>
- <translation type="unfinished"></translation>
+ <translation>Ausklappen</translation>
</message>
<message>
<location line="+2"/>
@@ -11092,12 +11169,12 @@ The following encodings are likely to fit:</source>
<message>
<location line="+4"/>
<source>(Un)&Collapse All</source>
- <translation type="unfinished"></translation>
+ <translation>Alles ein/aus&klappen</translation>
</message>
<message>
<location line="+5"/>
<source>Increase Font Size</source>
- <translation type="unfinished"></translation>
+ <translation>Schrift vergrößern</translation>
</message>
<message>
<location line="+2"/>
@@ -11107,7 +11184,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+4"/>
<source>Decrease Font Size</source>
- <translation type="unfinished"></translation>
+ <translation>Schrift verkleinern</translation>
</message>
<message>
<location line="+2"/>
@@ -11117,7 +11194,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+4"/>
<source>Goto Block Start</source>
- <translation type="unfinished"></translation>
+ <translation>Zum Blockanfang gehen</translation>
</message>
<message>
<location line="+2"/>
@@ -11127,7 +11204,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+3"/>
<source>Goto Block End</source>
- <translation type="unfinished"></translation>
+ <translation>Zum Blockende gehen</translation>
</message>
<message>
<location line="+2"/>
@@ -11137,7 +11214,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+3"/>
<source>Goto Block Start With Selection</source>
- <translation type="unfinished"></translation>
+ <translation>Zum Blockanfang mit Auswahl gehen</translation>
</message>
<message>
<location line="+2"/>
@@ -11147,7 +11224,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+3"/>
<source>Goto Block End With Selection</source>
- <translation type="unfinished"></translation>
+ <translation>Zum Blockende mit Auswahl gehen</translation>
</message>
<message>
<location line="+2"/>
@@ -11157,7 +11234,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+3"/>
<source>Select Block Up</source>
- <translation type="unfinished"></translation>
+ <translation>Einen Block nach oben auswählen</translation>
</message>
<message>
<location line="+2"/>
@@ -11167,7 +11244,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+3"/>
<source>Select Block Down</source>
- <translation type="unfinished"></translation>
+ <translation>Einen Block nach unten auswählen</translation>
</message>
<message>
<location line="+2"/>
@@ -11177,7 +11254,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+3"/>
<source>Move Line Up</source>
- <translation type="unfinished"></translation>
+ <translation>Eine Zeile nach oben gehen</translation>
</message>
<message>
<location line="+2"/>
@@ -11187,7 +11264,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+3"/>
<source>Move Line Down</source>
- <translation type="unfinished"></translation>
+ <translation>Eine Zeile nach unten gehen</translation>
</message>
<message>
<location line="+2"/>
@@ -11197,7 +11274,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+93"/>
<source> <line number></source>
- <translation type="unfinished"></translation>
+ <translation><Zeilennummer></translation>
</message>
</context>
<context>
@@ -11205,134 +11282,134 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/texteditor/texteditorsettings.cpp" line="+64"/>
<source>Text</source>
- <translation type="unfinished"></translation>
+ <translation>Text</translation>
</message>
<message>
<location line="+4"/>
<source>Link</source>
- <translation type="unfinished"></translation>
+ <translation>Link</translation>
</message>
<message>
<location line="+1"/>
<source>Selection</source>
- <translation type="unfinished"></translation>
+ <translation>Auswahl</translation>
</message>
<message>
<location line="+1"/>
<source>Line Number</source>
- <translation type="unfinished"></translation>
+ <translation>Zeilennummer</translation>
</message>
<message>
<location line="+1"/>
<source>Search Result</source>
- <translation type="unfinished"></translation>
+ <translation>Suchergebnisse</translation>
</message>
<message>
<location line="+1"/>
<source>Search Scope</source>
- <translation type="unfinished"></translation>
+ <translation>Suchbereich</translation>
</message>
<message>
<location line="+1"/>
<source>Parentheses</source>
- <translation type="unfinished"></translation>
+ <translation>Klammern</translation>
</message>
<message>
<location line="+1"/>
<source>Current Line</source>
- <translation type="unfinished"></translation>
+ <translation>Aktuelle Zeile</translation>
</message>
<message>
<location line="+3"/>
<source>Number</source>
- <translation type="unfinished"></translation>
+ <translation>Zahl</translation>
</message>
<message>
<location line="+1"/>
<source>String</source>
- <translation type="unfinished"></translation>
+ <translation>Zeichenkette</translation>
</message>
<message>
<location line="+1"/>
<source>Type</source>
- <translation type="unfinished"></translation>
+ <translation>Typ</translation>
</message>
<message>
<location line="+1"/>
<source>Keyword</source>
- <translation type="unfinished"></translation>
+ <translation>Schlüsselwort</translation>
</message>
<message>
<location line="+1"/>
<source>Operator</source>
- <translation type="unfinished"></translation>
+ <translation>Operator</translation>
</message>
<message>
<location line="+1"/>
<source>Preprocessor</source>
- <translation type="unfinished"></translation>
+ <translation>Präprozessor</translation>
</message>
<message>
<location line="+1"/>
<source>Label</source>
- <translation type="unfinished"></translation>
+ <translation>Sprungmarke</translation>
</message>
<message>
<location line="+1"/>
<source>Comment</source>
- <translation type="unfinished"></translation>
+ <translation>Kommentar</translation>
</message>
<message>
<location line="+1"/>
<source>Doxygen Comment</source>
- <translation type="unfinished"></translation>
+ <translation>Doxygen-Kommentar</translation>
</message>
<message>
<location line="+1"/>
<source>Doxygen Tag</source>
- <translation type="unfinished"></translation>
+ <translation>Doxygen-Schlüsselwort</translation>
</message>
<message>
<location line="+1"/>
<source>Disabled Code</source>
- <translation type="unfinished"></translation>
+ <translation>Deaktivierter Code</translation>
</message>
<message>
<location line="+3"/>
<source>Added Line</source>
- <translation type="unfinished"></translation>
+ <translation>Hinzugefügte Zeile</translation>
</message>
<message>
<location line="+1"/>
<source>Removed Line</source>
- <translation type="unfinished"></translation>
+ <translation>Entfernte Zeile</translation>
</message>
<message>
<location line="+1"/>
<source>Diff File</source>
- <translation type="unfinished"></translation>
+ <translation>Diff-Dateiangabe</translation>
</message>
<message>
<location line="+1"/>
<source>Diff Location</source>
- <translation type="unfinished"></translation>
+ <translation>Diff-Zeilenangabe</translation>
</message>
<message>
<location line="+4"/>
<location line="+8"/>
<location line="+8"/>
<source>Text Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Text Editor</translation>
</message>
<message>
<location line="-10"/>
<source>Behavior</source>
- <translation type="unfinished"></translation>
+ <translation>Verhalten</translation>
</message>
<message>
<location line="+8"/>
<source>Display</source>
- <translation type="unfinished"></translation>
+ <translation>Anzeige</translation>
</message>
</context>
<context>
@@ -11414,7 +11491,7 @@ The following encodings are likely to fit:</source>
<message>
<location line="+0"/>
<source>File</source>
- <translation type="unfinished">Datei</translation>
+ <translation>Datei</translation>
</message>
</context>
<context>
@@ -11631,4 +11708,54 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>welcomePage</name>
+ <message>
+ <source><style>
+h1 {
+ font-size: 24px;
+ font-weight: normal;
+ color: #4d4d4d;
+ margin-top: 0px;
+ margin-bottom: 20px;
+}
+
+p {
+ margin-top: 0px;
+ margin-bottom: 7px;
+}
+</style>
+
+<p>&nbsp;</p>
+<h1>Welcome</h1>
+<!-- QTextDocument does not support line-height, so wrap the lines manually ... -->
+<p>Qt Creator is an intuitive, modern cross platform IDE that</p> <p>enables developers to create graphically appealing applications</p>
+<p>for desktop, embedded, and mobile devices. Click on <strong>Getting</strong></p>
+<p><strong>Started</strong> to begin developing with Qt Creator.</p>
+<hr style="margin-top:15px"/>
+</source>
+ <translation type="obsolete"><style>
+h1 {
+ font-size: 24px;
+ font-weight: normal;
+ color: #4d4d4d;
+ margin-top: 0px;
+ margin-bottom: 20px;
+}
+
+p {
+ margin-top: 0px;
+ margin-bottom: 7px;
+}
+</style>
+
+<p>&nbsp;</p>
+<h1>Welcome</h1>
+<!-- QTextDocument does not support line-height, so wrap the lines manually ... -->
+<p>Qt Creator ist eine intuitive, moderne cross-platform IDE, die</p> <p>es Entwicklern ermöglicht, graphisch ansprechende Anwendungen für die Bereiche Desktop und Embedded sowie</p>
+<p>mobile Geräte zu erstellen. Klicken Sie auf <strong>Start</strong>,</p>
+<p> um die Entwicklung mit Qt Creator zu beginnen.</p>
+<hr style="margin-top:15px"/></translation>
+ </message>
+</context>
</TS>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index a98e6facbffd854719fd39976cdba32b5dca75a9..76a490e231ea4830c394b86bf340802d6d457074 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -347,8 +347,8 @@
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+613"/>
- <source>Build directory:</source>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+626"/>
+ <source>&Change</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -363,12 +363,12 @@
<context>
<name>CMakeProjectManager::Internal::CMakeRunPage</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+249"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+255"/>
<source>Run CMake</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Arguments</source>
<translation type="unfinished"></translation>
</message>
@@ -378,7 +378,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>The directory %1 contains an outdated .cbp file. Qt Creator needs to update this file by running cmake. If you want to add additional command line arguments, add them in the below. Note, that cmake remembers command line arguments from the former runs.</source>
<translation type="unfinished"></translation>
</message>
@@ -387,11 +387,16 @@
<source>The directory %1 specified in a buildconfiguration, does not contain a cbp file. Qt Creator needs to recreate this file, by running cmake. Some projects require command line arguments to the initial cmake call. Note, that cmake remembers command line arguments from the former runs.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+8"/>
+ <source>Qt Creator needs to run cmake in the new build directory. Some projects require command line arguments to the initial cmake call.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+337"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+338"/>
<location line="+10"/>
<source>CMake</source>
<translation type="unfinished"></translation>
@@ -400,7 +405,7 @@
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="-109"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="-108"/>
<source>Qt Creator has detected an in source build. This prevents shadow builds, Qt Creator won't allow you to change the build directory. If you want a shadow build, clean your source directory and open the project again.</source>
<translation type="unfinished"></translation>
</message>
@@ -408,7 +413,7 @@
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+259"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+258"/>
<source>Additional arguments:</source>
<translation type="unfinished"></translation>
</message>
@@ -421,7 +426,12 @@
<context>
<name>CMakeProjectManager::Internal::ShadowBuildPage</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+27"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+28"/>
+ <source>Please enter the directory in which you want to build your project. </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
<translation type="unfinished"></translation>
</message>
@@ -434,7 +444,7 @@
<context>
<name>CMakeProjectManager::Internal::XmlFileUpToDatePage</name>
<message>
- <location line="-22"/>
+ <location line="-25"/>
<source>Qt Creator has found a recent cbp file, which Qt Creator will parse to gather information about the project. You can change the command line arguments used to create this file in the project mode. Click finish to load the project</source>
<translation type="unfinished"></translation>
</message>
@@ -452,6 +462,47 @@
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>CdbDumperHelper</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/cdb/cdbdumperhelper.cpp" line="+253"/>
+ <source>Loading dumpers...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The debugger does not appear to be Qt application.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>The dumper module appears to be already loaded.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Dumper library '%1' loaded.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The dumper library '%1' could not be loaded:
+%2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source><none></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+1"/>
+ <source>%n known types, Qt version: %1, Qt namespace: %2</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+</context>
<context>
<name>CdbOptionsPageWidget</name>
<message>
@@ -1111,6 +1162,14 @@ Would you like to overwrite them?</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>Core::Internal::EditMode</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/editmode.cpp" line="+94"/>
+ <source>Edit</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Core::Internal::EditorSplitter</name>
<message>
@@ -1629,8 +1688,91 @@ Would you like to overwrite them?</source>
<context>
<name>Core::Internal::WelcomeMode</name>
<message>
- <location filename="../../../src/plugins/coreplugin/welcomemode.cpp" line="+227"/>
- <source> (last session)</source>
+ <location filename="../../../src/plugins/coreplugin/welcomemode.cpp" line="+169"/>
+ <source>%1 (last session)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::WelcomePage</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/welcomemode.ui"/>
+ <source><style>
+h1 {
+ font-size: 24px;
+ font-weight: normal;
+ color: #4d4d4d;
+ margin-top: 0px;
+ margin-bottom: 20px;
+}
+
+p {
+ margin-top: 0px;
+ margin-bottom: 7px;
+}
+</style>
+
+<p>&nbsp;</p>
+<h1>Welcome</h1>
+<!-- QTextDocument does not support line-height, so wrap the lines manually ... -->
+<p>Qt Creator is an intuitive, modern cross platform IDE that</p> <p>enables developers to create graphically appealing applications</p>
+<p>for desktop, embedded, and mobile devices. Click on <strong>Getting</strong></p>
+<p><strong>Started</strong> to begin developing with Qt Creator.</p>
+<hr style="margin-top:15px"/>
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>* {
+ background-image: url(":/core/images/welcomemode/btn_getting_started.png");
+}
+
+*:hover {
+ background-image: url(:/core/images/welcomemode/btn_getting_started_hover.png)
+}
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>#recentSessionsFrame {
+border-image: url(:/core/images/welcomemode/rc_combined.png) 8 8 8 8 stretch stretch;
+border-width: 8 8 8 8;
+}
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>* {
+ background-image: url(":/core/images/welcomemode/btn_restore_session.png");
+}
+
+*:hover {
+ background-image: url(:/core/images/welcomemode/btn_restore_session_hover.png)
+}
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>#bottomWidget {
+background-image: url(:/core/images/welcomemode/feedback-bar-background.png);
+}
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>* {
+ background-image: url(":/core/images/welcomemode/btn_feedback.png");
+}
+
+*:hover {
+ background-image: url(:/core/images/welcomemode/btn_feedback_hover.png)
+}
+</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1982,6 +2124,14 @@ Would you like to overwrite them?</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>CppEditor::Internal::CPPEditor</name>
+ <message>
+ <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+258"/>
+ <source>Sort alphabetically</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>CppEditor::Internal::ClassNamePage</name>
<message>
@@ -2027,7 +2177,7 @@ Would you like to overwrite them?</source>
<context>
<name>CppEditor::Internal::CppPlugin</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+152"/>
+ <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+167"/>
<source>C++</source>
<translation type="unfinished"></translation>
</message>
@@ -2328,22 +2478,22 @@ Would you like to overwrite them?</source>
<context>
<name>Debugger::Internal::CdbDebugEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdbdebugengine.cpp" line="+122"/>
+ <location filename="../../../src/plugins/debugger/cdb/cdbdebugengine.cpp" line="+123"/>
<source>Unable to load the debugger engine library '%1': %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+110"/>
<source>Unable to resolve '%1' in the debugger engine library '%2'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+225"/>
+ <location line="+229"/>
<source>The dumper library '%1' does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+23"/>
<source>The console stub process was unable to start '%1'.</source>
<translation type="unfinished"></translation>
</message>
@@ -2368,7 +2518,7 @@ Would you like to overwrite them?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+428"/>
+ <location line="+479"/>
<source>Unable to assign the value '%1' to '%2': %3</source>
<translation type="unfinished"></translation>
</message>
@@ -2378,7 +2528,7 @@ Would you like to overwrite them?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+83"/>
<location line="+6"/>
<source>Debugger Error</source>
<translation type="unfinished"></translation>
@@ -4595,12 +4745,7 @@ Reason: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Find.EnterFindString</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Ctrl+E</source>
<translation type="unfinished"></translation>
</message>
@@ -4689,115 +4834,8 @@ Reason: %3</source>
<context>
<name>GdbOptionPage</name>
<message>
- <location filename="../../../src/plugins/debugger/gdboptionpage.ui"/>
<source>Form</source>
- <translation type="unfinished">フォーム</translation>
- </message>
- <message>
- <location/>
- <source>Environment:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>This is either empty or points to a file containing gdb commands that will be executed immediately after gdb starts up.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>When this option is checked, 'Step Into' compresses several steps into one in certain situations, leading to 'less noisy' debugging. So will, e.g., the atomic
- reference counting code be skipped, and a single 'Step Into' for a signal emission will end up directly in the slot connected to it.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Skip known frames when stepping</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Checking this will make enable tooltips for variable values during debugging. Since this can slow down debugging and does not provide reliable information as it does not use scope information, it is switched off by default.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Use tooltips while debugging</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Gdb interaction</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>This is either a full abolute path leading to the gdb binary you intend to use or the name of a gdb binary that will be searched in your PATH.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Gdb location:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Gdb startup script:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Behaviour of breakpoint setting in plugins</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>This is the slowest but safest option.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Try to set breakpoints in plugins always automatically.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Try to set breakpoints in selected plugins</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Matching regular expression: </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Never set breakpoints in plugins automatically</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>User interface</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Checking this will populate the source file view automatically but might slow down debugger startup considerably.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Populate source file view automatically</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Maximal stack depth:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source><unlimited></source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">フォーム</translation>
</message>
</context>
<context>
@@ -5832,7 +5870,7 @@ Reason: %3</source>
<context>
<name>Help::Internal::HelpPlugin</name>
<message>
- <location filename="../../../src/plugins/help/helpplugin.cpp" line="+165"/>
+ <location filename="../../../src/plugins/help/helpplugin.cpp" line="+177"/>
<location line="+36"/>
<source>Contents</source>
<translation type="unfinished">コンテンツ</translation>
@@ -7285,7 +7323,7 @@ Library base name: %1</source>
<context>
<name>ProjectExplorer::Internal::CoreListenerCheckingForRunningBuild</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+112"/>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+114"/>
<source>Cancel Build && Close</source>
<translation type="unfinished"></translation>
</message>
@@ -7295,18 +7333,18 @@ Library base name: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Close QtCreator?</source>
+ <location line="+3"/>
+ <source>A project is currently being built.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>A project is currently being built.</source>
+ <location line="-1"/>
+ <source>Close Qt Creator?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Do you want to cancel the build process and close QtCreator anyway?</source>
+ <location line="+2"/>
+ <source>Do you want to cancel the build process and close Qt Creator anyway?</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -7619,46 +7657,53 @@ Library base name: %1</source>
</message>
</context>
<context>
- <name>ProjectExplorer::Internal::RemoveFileDialog</name>
+ <name>ProjectExplorer::Internal::QtOptionsPageWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/removefiledialog.ui"/>
- <source>Remove File</source>
+ <location filename="../../../src/plugins/projectexplorer/qtoptionspage.cpp" line="+65"/>
+ <source><specify a name></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
- <source>&Delete file permanently</source>
+ <location line="+1"/>
+ <source><specify a path></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
- <source>&Remove from Version Control</source>
+ <location line="+11"/>
+ <source>Select QTDIR</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
- <source>File to remove:</source>
+ <location line="+2"/>
+ <source>Select the Qt Directory</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>ProjectExplorer::Internal::RunSettingsPanel</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.cpp" line="+116"/>
- <source>Run Settings</source>
+ <location line="+211"/>
+ <source>The Qt Version %1 is not installed. Run make install</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%1 is not a valid qt directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Found Qt version %1, using mkspec %2</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>ProjectExplorer::Internal::RunSettingsPropertiesPage</name>
+ <name>ProjectExplorer::Internal::QtVersionManager</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.ui"/>
+ <location filename="../../../src/plugins/projectexplorer/qtversionmanager.ui"/>
<source>Form</source>
<translation type="unfinished">フォーム</translation>
</message>
<message>
<location/>
- <source>Run &configuration:</source>
+ <source>Qt versions</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -7673,7 +7718,111 @@ Library base name: %1</source>
</message>
<message>
<location/>
- <source>Settings</source>
+ <source>Name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Path</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Debugging Helper</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Version Name:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Path:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>MinGw Directory:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Debugging Helper:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Show &Log</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Rebuild</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Default Qt Version:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::RemoveFileDialog</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/removefiledialog.ui"/>
+ <source>Remove File</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Delete file permanently</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Remove from Version Control</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>File to remove:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::RunSettingsPanel</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.cpp" line="+116"/>
+ <source>Run Settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::RunSettingsPropertiesPage</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.ui"/>
+ <source>Form</source>
+ <translation type="unfinished">フォーム</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Run &configuration:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>-</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Settings</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -7799,7 +7948,7 @@ Library base name: %1</source>
<translation type="unfinished">プãƒã‚¸ã‚§ã‚¯ãƒˆ</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+90"/>
<source>&Build</source>
<translation type="unfinished"></translation>
</message>
@@ -8059,6 +8208,20 @@ to version control (%2)?</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>ProjectExplorer::QtVersionManager</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/qtversionmanager.cpp" line="+236"/>
+ <location line="+6"/>
+ <source>Auto-detected Qt</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source><not found></source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ProjectExplorer::SessionManager</name>
<message>
@@ -8098,14 +8261,6 @@ to version control (%2)?</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>QHelpProjectPlugin::Internal::QHelpProjectManager</name>
- <message>
- <location filename="../../../src/plugins/qhelpproject/qhelpprojectmanager.cpp" line="+105"/>
- <source>Qt Help Project File (*.qthp)</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>QLibrary</name>
<message>
@@ -8249,9 +8404,8 @@ to version control (%2)?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/plugins/qhelpproject/qhelpproject.cpp" line="+50"/>
<source>Files</source>
- <translation>ファイル</translation>
+ <translation type="obsolete">ファイル</translation>
</message>
<message>
<location filename="../../../src/plugins/qtestlib/qtestlibplugin.cpp" line="+59"/>
@@ -8354,36 +8508,43 @@ to version control (%2)?</source>
<name>QrcEditor</name>
<message>
<location filename="../../../src/shared/qrceditor/qrceditor.ui"/>
+ <location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+151"/>
<source>Form</source>
<translation type="unfinished">フォーム</translation>
</message>
<message>
<location/>
+ <location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Add</source>
<translation type="unfinished">è¿½åŠ </translation>
</message>
<message>
<location/>
+ <location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Remove</source>
<translation type="unfinished">削除</translation>
</message>
<message>
<location/>
+ <location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
+ <location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Prefix:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
+ <location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Language:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
+ <location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Alias:</source>
<translation type="unfinished"></translation>
</message>
@@ -8725,7 +8886,7 @@ to version control (%2)?</source>
<context>
<name>Qt4ProjectManager::Internal::ProjectLoadWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+186"/>
+ <location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+191"/>
<source>Import existing settings</source>
<translation type="unfinished"></translation>
</message>
@@ -8748,59 +8909,12 @@ to version control (%2)?</source>
<context>
<name>Qt4ProjectManager::Internal::Qt4BuildConfigWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4buildconfigwidget.ui"/>
<source>Form</source>
- <translation type="unfinished">フォーム</translation>
- </message>
- <message>
- <location/>
- <source>Configuration Name:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Qt Version:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Manage Qt Versions</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>This Qt-Version is invalid.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Shadow Build:</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">フォーム</translation>
</message>
<message>
- <location/>
- <source>Build Directory:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source><a href="import">Import existing build</a></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp" line="+57"/>
- <source>Shadow Build Directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+43"/>
<source>General</source>
- <translation type="unfinished">全般</translation>
- </message>
- <message>
- <location line="+35"/>
- <source>Default Qt Version</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">全般</translation>
</message>
</context>
<context>
@@ -8854,7 +8968,7 @@ to version control (%2)?</source>
<context>
<name>Qt4ProjectManager::Internal::Qt4PriFileNode</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4nodes.cpp" line="+278"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4nodes.cpp" line="+279"/>
<location line="+7"/>
<source>Failed!</source>
<translation type="unfinished"></translation>
@@ -8899,181 +9013,124 @@ to version control (%2)?</source>
</message>
</context>
<context>
- <name>Qt4ProjectManager::Internal::Qt4ProjectManagerPlugin</name>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp" line="+152"/>
- <location line="+5"/>
- <source>Run qmake</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::Qt4RunConfiguration</name>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4runconfiguration.cpp" line="+69"/>
- <location line="+245"/>
- <source>Qt4RunConfiguration</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+44"/>
- <source>Could not parse %1. The Qt4 run configuration %2 can not be started.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::Qt4RunConfigurationWidget</name>
- <message>
- <location line="-259"/>
- <source>Name:</source>
- <translation type="unfinished">åå‰:</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Executable:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Working Directory:</source>
- <translation type="unfinished">作æ¥ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª:</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>&Arguments:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Run in &Terminal</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::QtDirWidget</name>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+385"/>
- <source><specify a name></source>
- <translation type="unfinished"></translation>
- </message>
+ <name>Qt4ProjectManager::Internal::Qt4ProjectConfigWidget</name>
<message>
- <location line="+1"/>
- <source><specify a path></source>
- <translation type="unfinished"></translation>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.ui"/>
+ <source>Form</source>
+ <translation type="unfinished">フォーム</translation>
</message>
<message>
- <location line="+10"/>
- <source>Select QTDIR</source>
+ <location/>
+ <source>Configuration Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Select the Qt Directory</source>
+ <location/>
+ <source>Qt Version:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+210"/>
- <source>The Qt Version %1 is not installed. Run make install</source>
+ <location/>
+ <source>Manage Qt Versions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>%1 is not a valid qt directory</source>
+ <location/>
+ <source>This Qt-Version is invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
- <source>Found Qt version %1, using mkspec %2</source>
+ <location/>
+ <source>Shadow Build:</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Qt4ProjectManager::Internal::QtVersionManager</name>
- <message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.ui"/>
- <source>Form</source>
- <translation type="unfinished">フォーム</translation>
- </message>
<message>
<location/>
- <source>Qt versions</source>
+ <source>Build Directory:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
- <source>+</source>
+ <source><a href="import">Import existing build</a></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
- <source>-</source>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp" line="+62"/>
+ <source>Shadow Build Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
- <source>Name</source>
- <translation type="unfinished"></translation>
+ <location line="+45"/>
+ <source>General</source>
+ <translation type="unfinished">全般</translation>
</message>
<message>
- <location/>
- <source>Path</source>
+ <location line="+35"/>
+ <source>Default Qt Version</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::Qt4ProjectManagerPlugin</name>
<message>
- <location/>
- <source>Version Name:</source>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp" line="+146"/>
+ <location line="+5"/>
+ <source>Run qmake</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::Qt4RunConfiguration</name>
<message>
- <location/>
- <source>Path:</source>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4runconfiguration.cpp" line="+70"/>
+ <location line="+245"/>
+ <source>Qt4RunConfiguration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
- <source>MinGw Directory:</source>
+ <location line="+44"/>
+ <source>Could not parse %1. The Qt4 run configuration %2 can not be started.</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::Qt4RunConfigurationWidget</name>
<message>
- <location/>
- <source>Default Qt Version:</source>
- <translation type="unfinished"></translation>
+ <location line="-259"/>
+ <source>Name:</source>
+ <translation type="unfinished">åå‰:</translation>
</message>
<message>
- <location/>
- <source>Debugging Helper</source>
+ <location line="+6"/>
+ <source>Executable:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
- <source>Debugging Helper:</source>
- <translation type="unfinished"></translation>
+ <location line="+3"/>
+ <source>Working Directory:</source>
+ <translation type="unfinished">作æ¥ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª:</translation>
</message>
<message>
- <location/>
- <source>Show &Log</source>
+ <location line="+2"/>
+ <source>&Arguments:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
- <source>&Rebuild</source>
+ <location line="+5"/>
+ <source>Run in &Terminal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="-306"/>
- <location line="+6"/>
- <source>Auto-detected Qt</source>
+ <location line="+5"/>
+ <source>Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::QtVersionManager</name>
<message>
- <location line="+55"/>
- <source><not found></source>
- <translation type="unfinished"></translation>
+ <source>Form</source>
+ <translation type="obsolete">フォーム</translation>
</message>
</context>
<context>
@@ -9185,7 +9242,7 @@ to version control (%2)?</source>
<context>
<name>Qt4ProjectManager::MakeStep</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+105"/>
+ <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+106"/>
<source><font color="#ff0000">Could not find make command: %1 in the build environment</font></source>
<translation type="unfinished"></translation>
</message>
@@ -9233,7 +9290,7 @@ to version control (%2)?</source>
<context>
<name>Qt4ProjectManager::Qt4Manager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanager.cpp" line="+134"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanager.cpp" line="+136"/>
<source>Loading project %1 ...</source>
<translation type="unfinished"></translation>
</message>
@@ -9956,7 +10013,7 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<context>
<name>ShowBuildLog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/showbuildlog.ui"/>
+ <location filename="../../../src/plugins/projectexplorer/showbuildlog.ui"/>
<source>Debugging Helper Build Log</source>
<translation type="unfinished"></translation>
</message>
@@ -10645,12 +10702,12 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<context>
<name>TextEditor::BaseTextEditor</name>
<message>
- <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+230"/>
+ <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+234"/>
<source>Print Document</source>
<translation type="unfinished">ドã‚ュメントをå°åˆ·</translation>
</message>
<message>
- <location line="+267"/>
+ <location line="+284"/>
<source><b>Error:</b> Could not decode "%1" with "%2"-encoding. Editing not possible.</source>
<translation type="unfinished"></translation>
</message>
@@ -10663,7 +10720,7 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<context>
<name>TextEditor::BaseTextEditorEditable</name>
<message>
- <location line="+3226"/>
+ <location line="+3361"/>
<source>Line: %1, Col: %2</source>
<translation type="unfinished"></translation>
</message>
@@ -10808,6 +10865,11 @@ To do this you type this shortcut and a space in the QuickOpen entry field, and
<source>Display right &margin at column:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location/>
+ <source>Highlight &blocks</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TextEditor::FontSettingsPage</name>
diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp
index d8292551f6d13e2f9ce8f8086605ea565f4085ce..28ff14195e24e7de6f2b0b4ea0c2c02ec701b0a1 100644
--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -36,7 +36,6 @@
/*!
\class Core::Command
\mainclass
- \ingroup qwb
\brief The class...
@@ -197,7 +196,6 @@ QString CommandPrivate::stringWithAppendedShortcut(const QString &str) const
/*!
\class Shortcut
- \ingroup qwb
*/
/*!
@@ -309,7 +307,6 @@ bool Shortcut::isActive() const
/*!
\class Action
- \ingroup qwb
*/
/*!
@@ -401,7 +398,6 @@ QKeySequence Action::keySequence() const
/*!
\class OverrideableAction
- \ingroup qwb
*/
/*!
diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
index 08890a2e1dd1d12db546ffb37c6c0ab93b418e6a..fcfaea289816e9345623ce25161e44110d9bbf01 100644
--- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
@@ -42,7 +42,6 @@ using namespace Core::Internal;
/*!
\class CommandsFile
\brief The CommandsFile class provides a collection of import and export commands.
- \ingroup qwb
\inheaderfile commandsfile.h
*/
diff --git a/src/plugins/coreplugin/basemode.cpp b/src/plugins/coreplugin/basemode.cpp
index 04467c23f8a2c14dc4492eb1366ecf478da2ffa0..b0c3680ebd862535463623c12cf7d35affeb101e 100644
--- a/src/plugins/coreplugin/basemode.cpp
+++ b/src/plugins/coreplugin/basemode.cpp
@@ -38,7 +38,6 @@ using namespace Core;
/*!
\class BaseMode
\mainclass
- \ingroup qwb
\inheaderfile basemode.h
\brief A base implementation of the mode interface IMode.
diff --git a/src/plugins/coreplugin/baseview.cpp b/src/plugins/coreplugin/baseview.cpp
index 0365e64b126798ab938b1c2138035272dc5c228e..a03b6e88a4ef019e8287ca6f4acd6c533bfe39eb 100644
--- a/src/plugins/coreplugin/baseview.cpp
+++ b/src/plugins/coreplugin/baseview.cpp
@@ -33,42 +33,6 @@
using namespace Core;
-/*!
- \class BaseView
- \mainclass
- \ingroup qwb
- \inheaderfile baseview.h
- \brief A base implementation of IView.
-
- The BaseView class can be used directly for most IView implementations.
- It has setter functions for the views properties, and a convenience constructor
- for the most important ones.
-
- The ownership of the widget is given to the BaseView, so when the BaseView is destroyed it
- deletes its widget.
-
- A typical use case is to do the following in the init method of a plugin:
- \code
- bool MyPlugin::init(QString *error_message)
- {
- [...]
- addObject(new Core::BaseView("myplugin.myview",
- new MyWidget,
- QList<int>() << myContextId,
- Qt::LeftDockWidgetArea,
- this));
- [...]
- }
- \endcode
-*/
-
-/*!
- \fn BaseView::BaseView()
-
- Creates a View with empty view name, no widget, empty context, NoDockWidgetArea,
- no menu group and empty default shortcut. You should use the setter functions
- to give the view a meaning.
-*/
BaseView::BaseView(QObject *parent)
: IView(parent),
m_viewName(""),
@@ -78,66 +42,37 @@ BaseView::BaseView(QObject *parent)
{
}
-/*!
- \fn BaseView::~BaseView()
-
- Destructor also destroys the widget.
-*/
BaseView::~BaseView()
{
delete m_widget;
}
-/*!
- \fn const QList<int> &BaseView::context() const
-*/
QList<int> BaseView::context() const
{
return m_context;
}
-/*!
- \fn QWidget *BaseView::widget()
-*/
QWidget *BaseView::widget()
{
return m_widget;
}
-/*!
- \fn const char *BaseView::uniqueViewName() const
-*/
const char *BaseView::uniqueViewName() const
{
return m_viewName;
}
-/*!
- \fn IView::ViewPosition BaseView::defaultPosition() const
-*/
IView::ViewPosition BaseView::defaultPosition() const
{
return m_defaultPosition;
}
-/*!
- \fn void BaseView::setUniqueViewName(const char *name)
-
- \a name
-*/
void BaseView::setUniqueViewName(const char *name)
{
m_viewName = name;
}
-/*!
- \fn QWidget *BaseView::setWidget(QWidget *widget)
-
- The BaseView takes the ownership of the \a widget. The previously
- set widget (if existent) is not deleted but returned, and responsibility
- for deleting it moves to the caller of this method.
-*/
QWidget *BaseView::setWidget(QWidget *widget)
{
QWidget *oldWidget = m_widget;
@@ -145,21 +80,11 @@ QWidget *BaseView::setWidget(QWidget *widget)
return oldWidget;
}
-/*!
- \fn void BaseView::setContext(const QList<int> &context)
-
- \a context
-*/
void BaseView::setContext(const QList<int> &context)
{
m_context = context;
}
-/*!
- \fn void BaseView::setDefaultPosition(IView::ViewPosition position)
-
- \a position
-*/
void BaseView::setDefaultPosition(IView::ViewPosition position)
{
m_defaultPosition = position;
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index 3fd27bb5352522d1291916f119270568ae743dec..5eedf3bab85c4ba904ce06e4ece876a01e65ad1b 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -4,7 +4,6 @@ DEFINES += CORE_LIBRARY
QT += xml \
script \
svg
-
include(../../qworkbenchplugin.pri)
include(../../libs/utils/utils.pri)
include(../../shared/scriptwrapper/scriptwrapper.pri)
@@ -72,7 +71,9 @@ SOURCES += mainwindow.cpp \
sidebar.cpp \
fileiconprovider.cpp \
mimedatabase.cpp \
- icore.cpp
+ icore.cpp \
+ editormanager/ieditor.cpp \
+ dialogs/ioptionspage.cpp
HEADERS += mainwindow.h \
welcomemode.h \
welcomemode_p.h \
@@ -160,12 +161,9 @@ FORMS += dialogs/newdialog.ui \
welcomemode.ui
RESOURCES += core.qrc \
fancyactionbar.qrc
-
-linux-* {
+linux-* {
images.files = images/qtcreator_logo_*.png
- images.path = /share/pixmaps
-
+ images.path = /share/pixmaps
INSTALLS += images
}
-
OTHER_FILES += Core.pluginspec
diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.cpp b/src/plugins/coreplugin/dialogs/ioptionspage.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4db23a8573842050a2ca69f8d92695b4b8702072
--- /dev/null
+++ b/src/plugins/coreplugin/dialogs/ioptionspage.cpp
@@ -0,0 +1,46 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+**************************************************************************/
+
+#include "ioptionspage.h"
+
+/*!
+ \class Core::IOptionsPage
+ \mainclass
+ \brief The IOptionsPage is an interface for providing options pages.
+
+ Guidelines for implementing:
+ \list
+ \o id() is an id used for filtering when calling ICore:: showOptionsDialog()
+ \o trName() is the (translated) name for display.
+ \o category() is the category used for filtering when calling ICore:: showOptionsDialog()
+ \o trCategory() is the translated category
+ \o apply() is called to store the settings. It should detect if any changes have been
+ made and store those.
+ \endlist
+*/
diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h
index 35c4b6b4f4676296664461a985e09f9e52369158..8d895a3da29f4fbf02129beb2a3c4bf96b576616 100644
--- a/src/plugins/coreplugin/dialogs/ioptionspage.h
+++ b/src/plugins/coreplugin/dialogs/ioptionspage.h
@@ -38,21 +38,6 @@
namespace Core {
-/*!
- \class Core::IOptionsPage
- \brief The IOptionsPage is an interface for providing options pages.
-
- Guidelines for implementing:
- \list
- \o id() is an id used for filtering when calling ICore:: showOptionsDialog()
- \o trName() is the (translated) name for display.
- \o category() is the category used for filtering when calling ICore:: showOptionsDialog()
- \o trCategory() is the translated category
- \o apply() is called to store the settings. It should detect if any changes have been
- made and store those.
- \endlist
-*/
-
class CORE_EXPORT IOptionsPage : public QObject
{
Q_OBJECT
diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp
index d9a812bc77f5c562e471db12dd2a45760fdd0511..b3115a7006deb15f39ee4cd95ea2cc0064c37ab0 100644
--- a/src/plugins/coreplugin/editmode.cpp
+++ b/src/plugins/coreplugin/editmode.cpp
@@ -91,7 +91,7 @@ EditMode::~EditMode()
QString EditMode::name() const
{
- return QLatin1String("Edit");
+ return tr("Edit");
}
QIcon EditMode::icon() const
diff --git a/src/plugins/coreplugin/editormanager/ieditor.cpp b/src/plugins/coreplugin/editormanager/ieditor.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..85e5adac347dac9dfe8f3c7d0742ddfad17e153f
--- /dev/null
+++ b/src/plugins/coreplugin/editormanager/ieditor.cpp
@@ -0,0 +1,55 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+**************************************************************************/
+
+#include "ieditor.h"
+
+/*!
+ \class Core::IEditor
+ \brief The IEditor is an interface for providing different editors for different file types.
+
+ Classes that implement this interface are for example the editors for
+ C++ files, ui-files and resource files.
+
+ Whenever a user wants to edit or create a file, the EditorManager scans all
+ EditorFactoryInterfaces for suitable editors. The selected EditorFactory
+ is then asked to create an editor, which must implement this interface.
+
+ Guidelines for implementing:
+ \list
+ \o displayName() is used as a user visible description of the document (usually filename w/o path).
+ \o kind() must be the same value as the kind() of the corresponding EditorFactory.
+ \o The changed() signal should be emitted when the modified state of the document changes
+ (so /bold{not} every time the document changes, but /bold{only once}).
+ \o If duplication is supported, you need to ensure that all duplicates
+ return the same file().
+ \endlist
+
+ \sa Core::EditorFactoryInterface Core::IContext
+
+*/
diff --git a/src/plugins/coreplugin/editormanager/ieditor.h b/src/plugins/coreplugin/editormanager/ieditor.h
index 927220c296faea05637916793bcab0492b709f7a..789863cce39b9084030ed4991501d451ee39cc11 100644
--- a/src/plugins/coreplugin/editormanager/ieditor.h
+++ b/src/plugins/coreplugin/editormanager/ieditor.h
@@ -40,31 +40,6 @@ QT_END_NAMESPACE
namespace Core {
-/*!
- \class Core::IEditor
- \brief The IEditor is an interface for providing different editors for different file types.
-
- Classes that implement this interface are for example the editors for
- C++ files, ui-files and resource files.
-
- Whenever a user wants to edit or create a file, the EditorManager scans all
- EditorFactoryInterfaces for suitable editors. The selected EditorFactory
- is then asked to create an editor, which must implement this interface.
-
- Guidelines for implementing:
- \list
- \o displayName() is used as a user visible description of the document (usually filename w/o path).
- \o kind() must be the same value as the kind() of the corresponding EditorFactory.
- \o The changed() signal should be emitted when the modified state of the document changes
- (so /bold{not} every time the document changes, but /bold{only once}).
- \o If duplication is supported, you need to ensure that all duplicates
- return the same file().
- \endlist
-
- \sa Core::EditorFactoryInterface Core::IContext
-
-*/
-
class CORE_EXPORT IEditor : public IContext
{
Q_OBJECT
@@ -85,8 +60,8 @@ public:
virtual QByteArray saveState() const = 0;
virtual bool restoreState(const QByteArray &state) = 0;
- virtual int currentLine() const { return 0; };
- virtual int currentColumn() const { return 0; };
+ virtual int currentLine() const { return 0; }
+ virtual int currentColumn() const { return 0; }
virtual QToolBar *toolBar() = 0;
diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp
index a13c72accc3147fcd12d987b484bc6a8dc1aea4d..5a9276fd85183df55134fd13eb0cefa253c076d0 100644
--- a/src/plugins/coreplugin/filemanager.cpp
+++ b/src/plugins/coreplugin/filemanager.cpp
@@ -56,7 +56,6 @@ using namespace Core::Internal;
/*!
\class FileManager
\mainclass
- \ingroup qwb
\inheaderfile filemanager.h
\brief Manages a set of IFile objects.
@@ -549,7 +548,7 @@ void FileManager::saveRecentFiles()
The current file is e.g. the file currently opened when an editor is active,
or the selected file in case a Project Explorer is active ...
- \see currentFile
+ \sa currentFile
*/
void FileManager::setCurrentFile(const QString &filePath)
{
@@ -565,7 +564,7 @@ void FileManager::setCurrentFile(const QString &filePath)
The current file is e.g. the file currently opened when an editor is active,
or the selected file in case a Project Explorer is active ...
- \see setCurrentFile
+ \sa setCurrentFile
*/
QString FileManager::currentFile() const
{
diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp
index adf3e933f3dc728602d025551fda2a2809c4bb0b..ac8f87874ba9c619510a4b213118a2a6f1b3cef8 100644
--- a/src/plugins/coreplugin/welcomemode.cpp
+++ b/src/plugins/coreplugin/welcomemode.cpp
@@ -52,7 +52,7 @@ struct WelcomeModePrivate
QWidget *m_widget;
QWidget *m_welcomePage;
- Ui::welcomePage ui;
+ Ui::WelcomePage ui;
WelcomeMode::WelcomePageData lastData;
};
diff --git a/src/plugins/coreplugin/welcomemode.ui b/src/plugins/coreplugin/welcomemode.ui
index c4189e142df7f024ded20be0bbfcbfb0d771fdd7..8692e27c711dd4e4e3a5d4146dc2260fe27fe152 100644
--- a/src/plugins/coreplugin/welcomemode.ui
+++ b/src/plugins/coreplugin/welcomemode.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>welcomePage</class>
- <widget class="QWidget" name="welcomePage">
+ <class>Core::Internal::WelcomePage</class>
+ <widget class="QWidget" name="Core::Internal::WelcomePage">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 3544cf3f2d33345e9bdc0435b4a6414f1a3e5bca..cc28c720e91478e3b0ce644e3620970717400e4d 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -75,6 +75,7 @@
#include <QtGui/QTextEdit>
#include <QtGui/QComboBox>
#include <QtGui/QTreeView>
+#include <QtGui/QSortFilterProxyModel>
using namespace CPlusPlus;
using namespace CppEditor::Internal;
@@ -243,7 +244,22 @@ void CPPEditor::createToolBar(CPPEditorEditable *editable)
m_methodCombo->setMaxVisibleItems(20);
m_overviewModel = new OverviewModel(this);
- m_methodCombo->setModel(m_overviewModel);
+ m_proxyModel = new QSortFilterProxyModel(this);
+ m_proxyModel->setSourceModel(m_overviewModel);
+ if (CppPlugin::instance()->sortedMethodOverview())
+ m_proxyModel->sort(0, Qt::AscendingOrder);
+ else
+ m_proxyModel->sort(-1, Qt::AscendingOrder); // don't sort yet, but set column for sortedMethodOverview()
+ m_proxyModel->setDynamicSortFilter(true);
+ m_proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
+ m_methodCombo->setModel(m_proxyModel);
+
+ m_methodCombo->setContextMenuPolicy(Qt::ActionsContextMenu);
+ 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)));
+ m_methodCombo->addAction(m_sortAction);
connect(m_methodCombo, SIGNAL(activated(int)), this, SLOT(jumpToMethod(int)));
connect(this, SIGNAL(cursorPositionChanged()), this, SLOT(updateMethodBoxIndex()));
@@ -366,7 +382,7 @@ void CPPEditor::updateFileName()
void CPPEditor::jumpToMethod(int)
{
- QModelIndex index = m_methodCombo->view()->currentIndex();
+ QModelIndex index = m_proxyModel->mapToSource(m_methodCombo->view()->currentIndex());
Symbol *symbol = m_overviewModel->symbolFromIndex(index);
if (! symbol)
return;
@@ -374,6 +390,25 @@ void CPPEditor::jumpToMethod(int)
openCppEditorAt(linkToSymbol(symbol));
}
+void CPPEditor::setSortedMethodOverview(bool sort)
+{
+ if (sort != sortedMethodOverview()) {
+ if (sort)
+ m_proxyModel->sort(0, Qt::AscendingOrder);
+ else
+ m_proxyModel->sort(-1, Qt::AscendingOrder);
+ bool block = m_sortAction->blockSignals(true);
+ m_sortAction->setChecked(m_proxyModel->sortColumn() == 0);
+ m_sortAction->blockSignals(block);
+ updateMethodBoxIndex();
+ }
+}
+
+bool CPPEditor::sortedMethodOverview() const
+{
+ return (m_proxyModel->sortColumn() == 0);
+}
+
void CPPEditor::updateMethodBoxIndex()
{
int line = 0, column = 0;
@@ -394,7 +429,7 @@ void CPPEditor::updateMethodBoxIndex()
if (lastIndex.isValid()) {
bool blocked = m_methodCombo->blockSignals(true);
- m_methodCombo->setCurrentIndex(lastIndex.row());
+ m_methodCombo->setCurrentIndex(m_proxyModel->mapFromSource(lastIndex).row());
updateMethodBoxToolTip();
(void) m_methodCombo->blockSignals(blocked);
}
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index ae352b8d6d503e9b7afa6b47ffb4d24ef4be6f84..efae361e0e62b79070839d2c59e34f42a7516c51 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -37,6 +37,7 @@
QT_BEGIN_NAMESPACE
class QComboBox;
+class QSortFilterProxyModel;
QT_END_NAMESPACE
namespace CPlusPlus {
@@ -86,6 +87,7 @@ public:
public slots:
virtual void setFontSettings(const TextEditor::FontSettings &);
+ void setSortedMethodOverview(bool sort);
void switchDeclarationDefinition();
void jumpToDefinition();
@@ -94,7 +96,6 @@ public slots:
void deleteStartOfToken();
void deleteEndOfToken();
-
protected:
void contextMenuEvent(QContextMenuEvent *);
void mouseMoveEvent(QMouseEvent *);
@@ -115,6 +116,7 @@ private slots:
void onDocumentUpdated(CPlusPlus::Document::Ptr doc);
private:
+ bool sortedMethodOverview() const;
CPlusPlus::Symbol *findDefinition(CPlusPlus::Symbol *symbol);
virtual void indentBlock(QTextDocument *doc, QTextBlock block, QChar typedChar);
@@ -161,6 +163,8 @@ private:
QList<int> m_contexts;
QComboBox *m_methodCombo;
CPlusPlus::OverviewModel *m_overviewModel;
+ QSortFilterProxyModel *m_proxyModel;
+ QAction *m_sortAction;
};
} // namespace Internal
diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp
index 29ad67314517bb22d5a10d5fdd09d2b2c6c03a7f..9e17083c2190fba27b2e796a25074c5a35f48034 100644
--- a/src/plugins/cppeditor/cppplugin.cpp
+++ b/src/plugins/cppeditor/cppplugin.cpp
@@ -106,7 +106,8 @@ CppPlugin *CppPlugin::m_instance = 0;
CppPlugin::CppPlugin() :
m_actionHandler(0),
- m_factory(0)
+ m_factory(0),
+ m_sortedMethodOverview(false)
{
m_instance = this;
}
@@ -133,6 +134,20 @@ void CppPlugin::initializeEditor(CPPEditor *editor)
// auto completion
connect(editor, SIGNAL(requestAutoCompletion(ITextEditable*, bool)),
TextEditor::Internal::CompletionSupport::instance(), SLOT(autoComplete(ITextEditable*, bool)));
+ // method combo box sorting
+ connect(this, SIGNAL(methodOverviewSortingChanged(bool)),
+ editor, SLOT(setSortedMethodOverview(bool)));
+}
+
+void CppPlugin::setSortedMethodOverview(bool sorted)
+{
+ m_sortedMethodOverview = sorted;
+ emit methodOverviewSortingChanged(sorted);
+}
+
+bool CppPlugin::sortedMethodOverview() const
+{
+ return m_sortedMethodOverview;
}
bool CppPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
@@ -194,14 +209,30 @@ bool CppPlugin::initialize(const QStringList & /*arguments*/, QString *errorMess
| TextEditor::TextEditorActionHandler::UnCommentSelection
| TextEditor::TextEditorActionHandler::UnCollapseAll);
+ readSettings();
return true;
}
+void CppPlugin::readSettings()
+{
+ m_sortedMethodOverview = Core::ICore::instance()->settings()->value("CppTools/SortedMethodOverview", false).toBool();
+}
+
+void CppPlugin::writeSettings()
+{
+ Core::ICore::instance()->settings()->setValue("CppTools/SortedMethodOverview", m_sortedMethodOverview);
+}
+
void CppPlugin::extensionsInitialized()
{
m_actionHandler->initializeActions();
}
+void CppPlugin::shutdown()
+{
+ writeSettings();
+}
+
void CppPlugin::switchDeclarationDefinition()
{
Core::EditorManager *em = Core::EditorManager::instance();
diff --git a/src/plugins/cppeditor/cppplugin.h b/src/plugins/cppeditor/cppplugin.h
index 151eda3888532ce4d181b550a53f8d4dce94f2ba..4ad8400342b713de24c5ddebf7f7bf9d58217eb3 100644
--- a/src/plugins/cppeditor/cppplugin.h
+++ b/src/plugins/cppeditor/cppplugin.h
@@ -58,10 +58,19 @@ public:
bool initialize(const QStringList &arguments, QString *error_message = 0);
void extensionsInitialized();
+ void shutdown();
// Connect editor to settings changed signals.
void initializeEditor(CPPEditor *editor);
+ bool sortedMethodOverview() const;
+
+signals:
+ void methodOverviewSortingChanged(bool sort);
+
+public slots:
+ void setSortedMethodOverview(bool sorted);
+
private slots:
void switchDeclarationDefinition();
void jumpToDefinition();
@@ -69,11 +78,14 @@ private slots:
private:
friend class CppEditorFactory;
Core::IEditor *createEditor(QWidget *parent);
+ void writeSettings();
+ void readSettings();
static CppPlugin *m_instance;
TextEditor::TextEditorActionHandler *m_actionHandler;
CppEditorFactory *m_factory;
+ bool m_sortedMethodOverview;
};
class CppEditorFactory : public Core::IEditorFactory
diff --git a/src/plugins/find/findplugin.cpp b/src/plugins/find/findplugin.cpp
index 2a5d10470708990a5ed420e1f15ac6ca211a3ce6..37f85326665005d95e94921935d84f88407f38ed 100644
--- a/src/plugins/find/findplugin.cpp
+++ b/src/plugins/find/findplugin.cpp
@@ -47,6 +47,20 @@
#include <QtCore/QtPlugin>
#include <QtCore/QSettings>
+/*!
+ \namespace Find
+ The Find namespace provides everything that has to do with search term based searches.
+*/
+
+/*!
+ \namespace Find::Internal
+ \internal
+*/
+/*!
+ \namespace Find::Internal::ItemDataRoles
+ \internal
+*/
+
Q_DECLARE_METATYPE(Find::IFindFilter*)
namespace {
diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp
index 97f66d5d27565b3d6af0cbabec5b8df8f8ab2a11..675e5334811384a54b1329e286a0db0c4fd149d9 100644
--- a/src/plugins/find/findtoolbar.cpp
+++ b/src/plugins/find/findtoolbar.cpp
@@ -154,7 +154,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
if (QApplication::clipboard()->supportsFindBuffer()) {
m_enterFindStringAction = new QAction(tr("Enter Find String"), this);
- cmd = am->registerAction(m_enterFindStringAction, tr("Find.EnterFindString"), globalcontext);
+ cmd = am->registerAction(m_enterFindStringAction, QLatin1String("Find.EnterFindString"), globalcontext);
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E")));
mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
connect(m_enterFindStringAction, SIGNAL(triggered()), this, SLOT(putSelectionToFindClipboard()));
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 320b89de5036e8b28eff1078747525fe6fe65ad9..af2289699f94152085c719d4cf2966d3f0f0aac7 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -114,9 +114,9 @@ bool CoreListenerCheckingForRunningBuild::coreAboutToClose()
QPushButton *closeAnyway = box.addButton(tr("Cancel Build && Close"), QMessageBox::AcceptRole);
QPushButton *cancelClose = box.addButton(tr("Don't Close"), QMessageBox::RejectRole);
box.setDefaultButton(cancelClose);
- box.setWindowTitle(tr("Close QtCreator?"));
+ box.setWindowTitle(tr("Close Qt Creator?"));
box.setText(tr("A project is currently being built."));
- box.setInformativeText(tr("Do you want to cancel the build process and close QtCreator anyway?"));
+ box.setInformativeText(tr("Do you want to cancel the build process and close Qt Creator anyway?"));
box.exec();
return (box.clickedButton() == closeAnyway);
}
diff --git a/src/plugins/quickopen/quickopenplugin.cpp b/src/plugins/quickopen/quickopenplugin.cpp
index 5ef84c3ea74601c0189ebeaa61eee83047925587..d8834b3bdfea7c27a27eacd683292c99569a5d30 100644
--- a/src/plugins/quickopen/quickopenplugin.cpp
+++ b/src/plugins/quickopen/quickopenplugin.cpp
@@ -51,10 +51,18 @@
#include <extensionsystem/pluginmanager.h>
#include <qtconcurrent/QtConcurrentTools>
+/*!
+ \namespace QuickOpen
+ The QuickOpen namespace provides the hooks for Locator content.
+*/
+/*!
+ \namespace QuickOpen::Internal
+ \internal
+*/
+
using namespace QuickOpen;
using namespace QuickOpen::Internal;
-
namespace {
static bool filterLessThan(const IQuickOpenFilter *first, const IQuickOpenFilter *second)
{
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index e821bce1239a8f0ed14a30ad919b823b7b1a43fc..45ea3c6e992197f12a68651bff0009cc473c26aa 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -135,6 +135,7 @@ ITextEditor *BaseTextEditor::openEditorAt(const QString &fileName,
texteditor->gotoLine(line, column);
return texteditor;
}
+
return 0;
}
@@ -161,9 +162,8 @@ BaseTextEditor::BaseTextEditor(QWidget *parent)
d->extraAreaSelectionAnchorBlockNumber
= d->extraAreaToggleMarkBlockNumber
= d->extraAreaHighlightCollapseBlockNumber
- = d->extraAreaHighlightFadingBlockNumber
+ = d->extraAreaHighlightCollapseColumn
= -1;
- d->extraAreaCollapseAlpha = 255;
d->visibleCollapsedBlockNumber = d->suggestedVisibleCollapsedBlockNumber = -1;
@@ -199,13 +199,6 @@ BaseTextEditor::BaseTextEditor(QWidget *parent)
slotCursorPositionChanged();
setFrameStyle(QFrame::NoFrame);
-
- d->extraAreaTimeLine = new QTimeLine(150, this);
- d->extraAreaTimeLine->setFrameRange(0, 255);
- connect(d->extraAreaTimeLine, SIGNAL(frameChanged(int)), this,
- SLOT(setCollapseIndicatorAlpha(int)));
-
-
connect(Core::EditorManager::instance(), SIGNAL(currentEditorChanged(Core::IEditor*)),
this, SLOT(currentEditorChanged(Core::IEditor*)));
}
@@ -1227,7 +1220,7 @@ void BaseTextEditor::setHighlightBlocks(bool b)
if (d->m_highlightBlocks == b)
return;
d->m_highlightBlocks = b;
- d->m_highlightBlocksInfo = BaseTextEditorPrivateHighlightBlocks();
+ d->extraAreaHighlightCollapseBlockNumber = -1;
_q_highlightBlocks();
}
@@ -1487,6 +1480,8 @@ bool BaseTextEditor::viewportEvent(QEvent *event)
setTextCursor(cursorForPosition(ce->pos()));
} else if (event->type() == QEvent::ToolTip) {
const QHelpEvent *he = static_cast<QHelpEvent*>(event);
+ if (QApplication::keyboardModifiers() & Qt::ControlModifier)
+ return true; // eat tooltip event when control is pressed
const QPoint &pos = he->pos();
// Allow plugins to show tooltips
@@ -1512,14 +1507,22 @@ void BaseTextEditor::resizeEvent(QResizeEvent *e)
QRect(cr.left(), cr.top(), extraAreaWidth(), cr.height())));
}
-QRect BaseTextEditor::collapseBox(const QTextBlock &block)
+QRect BaseTextEditor::collapseBox()
{
- QRectF br = blockBoundingGeometry(block).translated(contentOffset());
- int collapseBoxWidth = fontMetrics().lineSpacing() + 1;
- return QRect(d->m_extraArea->width() - collapseBoxWidth + collapseBoxWidth/4,
- int(br.top()) + collapseBoxWidth/4,
- 2 * (collapseBoxWidth/4) + 1, 2 * (collapseBoxWidth/4) + 1);
+ if (d->m_highlightBlocksInfo.isEmpty() || d->extraAreaHighlightCollapseBlockNumber < 0)
+ return QRect();
+ QTextBlock begin = document()->findBlockByNumber(d->m_highlightBlocksInfo.open.last());
+ QTextBlock end = document()->findBlockByNumber(d->m_highlightBlocksInfo.close.first());
+ if (!begin.isValid() || !end.isValid())
+ return QRect();
+ QRectF br = blockBoundingGeometry(begin).translated(contentOffset());
+ QRectF er = blockBoundingGeometry(end).translated(contentOffset());
+ int collapseBoxWidth = fontMetrics().lineSpacing() + 1;
+ return QRect(d->m_extraArea->width() - collapseBoxWidth,
+ int(br.top()),
+ collapseBoxWidth,
+ er.bottom() - br.top());
}
QTextBlock BaseTextEditor::collapsedBlockAt(const QPoint &pos, QRect *box) const {
@@ -1703,22 +1706,49 @@ void BaseTextEditorPrivate::moveCursorVisible(bool ensureVisible)
static QColor calcBlendColor(const QColor &baseColor, int factor = 1)
{
-const int blendBase = (baseColor.value() > 128) ? 0 : 255;
+ const int blendBase = (baseColor.value() > 128) ? 0 : 255;
// Darker backgrounds may need a bit more contrast
- // (this calculation is temporary solution until we have a setting for this color)
const int blendFactor = (baseColor.value() > 128) ? 8 : 16;
-
QColor blendColor = baseColor;
while (factor--) {
blendColor = QColor(
- (blendBase * blendFactor + blendColor.blue() * (256 - blendFactor)) / 256,
+ (blendBase * blendFactor + blendColor.red() * (256 - blendFactor)) / 256,
(blendBase * blendFactor + blendColor.green() * (256 - blendFactor)) / 256,
(blendBase * blendFactor + blendColor.blue() * (256 - blendFactor)) / 256);
}
return blendColor;
}
+
+static QColor calcBlendColor(const QColor &baseColor, int level, int count)
+{
+ QColor color80;
+ QColor color90;
+
+ if (baseColor.value() > 128) {
+ color80 = baseColor.lighter(90);
+ color90 = baseColor.lighter(95);
+ } else {
+ color80 = baseColor.lighter(110);
+ color90 = baseColor.lighter(105);
+ }
+
+ if (level == count)
+ return baseColor;
+ if (level == 0)
+ return color80;
+ if (level == count - 1)
+ return color90;
+
+ const int blendFactor = level * (256 / (count - 2));
+
+ return QColor(
+ (color90.red() * blendFactor + color80.red() * (256 - blendFactor)) / 256,
+ (color90.green() * blendFactor + color80.green() * (256 - blendFactor)) / 256,
+ (color90.blue() * blendFactor + color80.blue() * (256 - blendFactor)) / 256);
+}
+
void BaseTextEditor::paintEvent(QPaintEvent *e)
{
/*
@@ -1791,7 +1821,7 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
QRectF r = blockBoundingRect(block).translated(offset);
- if (d->m_highlightBlocks) {
+ if (!d->m_highlightBlocksInfo.isEmpty()) {
int n = block.blockNumber();
int depth = 0;
@@ -1802,13 +1832,13 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
if (n > i)
--depth;
- int count = d->m_highlightBlocksInfo.visualIndent.size();
+ int count = d->m_highlightBlocksInfo.count();
if (count) {
QRectF rr = r;
rr.setWidth(viewport()->width());
for(int i = 0; i <= depth; ++i) {
int vi = i > 0 ? d->m_highlightBlocksInfo.visualIndent.at(i-1) : 0;
- painter.fillRect(rr.adjusted(vi, 0, -8*i, 0), calcBlendColor(baseColor, count - i));
+ painter.fillRect(rr.adjusted(vi, 0, -8*i, 0), calcBlendColor(baseColor, i, count));
}
}
}
@@ -2169,6 +2199,9 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e)
TextEditDocumentLayout *documentLayout = qobject_cast<TextEditDocumentLayout*>(doc->documentLayout());
QTC_ASSERT(documentLayout, return);
+ int cursorBlockNumber = textCursor().blockNumber();
+
+ const QColor baseColor = palette().base().color();
QPalette pal = d->m_extraArea->palette();
pal.setCurrentColorGroup(QPalette::Active);
QPainter painter(d->m_extraArea);
@@ -2188,12 +2221,12 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e)
painter.fillRect(e->rect().intersected(QRect(0, 0, extraAreaWidth, INT_MAX)),
pal.color(QPalette::Background));
-
QTextBlock block = firstVisibleBlock();
int blockNumber = block.blockNumber();
int top = (int)blockBoundingGeometry(block).translated(contentOffset()).top();
int bottom = top;
+#if 0
int extraAreaHighlightCollapseEndBlockNumber = -1;
int extraAreaHighlightCollapseBlockNumber = d->extraAreaHighlightCollapseBlockNumber;
@@ -2208,7 +2241,7 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e)
else
extraAreaHighlightCollapseEndBlockNumber = extraAreaHighlightCollapseBlockNumber;
}
-
+#endif
while (block.isValid() && top <= e->rect().bottom()) {
@@ -2265,77 +2298,65 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e)
xoffset += 2;
}
}
-
- if (!userData->ifdefedOut()) {
- collapseAfter = (userData->collapseMode() == TextBlockUserData::CollapseAfter);
- collapseThis = (userData->collapseMode() == TextBlockUserData::CollapseThis);
- hasClosingCollapse = userData->hasClosingCollapse() && (previousBraceDepth > 0);
- }
}
if (d->m_codeFoldingVisible) {
- const QRect box(extraAreaWidth + collapseBoxWidth/4, top + collapseBoxWidth/4,
- 2 * (collapseBoxWidth/4) + 1, 2 * (collapseBoxWidth/4) + 1);
- const QPoint boxCenter = box.center();
-
- QColor textColorAlpha = pal.text().color();
- textColorAlpha.setAlpha(d->extraAreaCollapseAlpha);
- QColor textColorInactive = pal.text().color();
- textColorInactive.setAlpha(100);
- QColor textColor = pal.text().color();
- textColor.setAlpha(qMax(textColorInactive.alpha(), d->extraAreaCollapseAlpha));
-
- const QPen pen( (blockNumber >= extraAreaHighlightCollapseBlockNumber
- && blockNumber <= extraAreaHighlightCollapseEndBlockNumber) ?
- textColorAlpha : pal.base().color());
- const QPen boxPen((blockNumber == extraAreaHighlightCollapseBlockNumber) ?
- textColor : textColorInactive);
- const QPen endPen((blockNumber == extraAreaHighlightCollapseEndBlockNumber) ?
- textColorAlpha : pal.base().color());
- const QPen previousPen((blockNumber-1 >= extraAreaHighlightCollapseBlockNumber
- && blockNumber-1 < extraAreaHighlightCollapseEndBlockNumber) ?
- textColorAlpha : pal.base().color());
- const QPen nextPen((blockNumber+1 > extraAreaHighlightCollapseBlockNumber
- && blockNumber+1 <= extraAreaHighlightCollapseEndBlockNumber) ?
- textColorAlpha : pal.base().color());
-
- TextBlockUserData *nextBlockUserData = TextEditDocumentLayout::testUserData(nextBlock);
-
- bool collapseNext = nextBlockUserData
- && nextBlockUserData->collapseMode()
- == TextBlockUserData::CollapseThis
- && !nextBlockUserData->ifdefedOut();
-
- bool nextHasClosingCollapse = nextBlockUserData
- && nextBlockUserData->hasClosingCollapseInside()
- && nextBlockUserData->ifdefedOut();
-
- bool drawBox = ((collapseAfter || collapseNext) && !nextHasClosingCollapse);
-
- if (braceDepth || (collapseNext && nextBlock.isVisible())) {
- painter.setPen((hasClosingCollapse || !nextBlock.isVisible())? nextPen : pen);
- painter.drawLine(boxCenter.x(), boxCenter.y(), boxCenter.x(), bottom - 1);
- }
-
- if (previousBraceDepth || collapseThis) {
- painter.setPen((collapseAfter || collapseNext) ? previousPen : pen);
- painter.drawLine(boxCenter.x(), top, boxCenter.x(), boxCenter.y());
+ const QRect r(extraAreaWidth+2, top, collapseBoxWidth-4, bottom - top);
+ bool drawBox = !nextBlock.isVisible();
+
+ int minBraceDepth = qMax(braceDepth, previousBraceDepth);
+ if (minBraceDepth > 0) {
+ QColor color = calcBlendColor(baseColor, minBraceDepth);
+ if (!d->m_highlightBlocksInfo.isEmpty()
+ && blockNumber >= d->m_highlightBlocksInfo.open.last()
+ && blockNumber <= d->m_highlightBlocksInfo.close.first())
+ color = color.light();
+ painter.fillRect(r, color);
}
-
- if (drawBox) {
- painter.setPen(boxPen);
- painter.setBrush(pal.base());
- painter.drawRect(box.adjusted(0, 0, -1, -1));
- if (!nextBlock.isVisible())
- painter.drawLine(boxCenter.x(), box.top() + 2, boxCenter.x(), box.bottom() - 2);
- painter.drawLine(box.left() + 2, boxCenter.y(), box.right() - 2, boxCenter.y());
- } else if (hasClosingCollapse || collapseAfter || collapseNext) {
- painter.setPen(endPen);
- painter.drawLine(boxCenter.x() + 1, boxCenter.y(), box.right() - 1, boxCenter.y());
+ bool drawDown = !d->m_highlightBlocksInfo.isEmpty()
+ && blockNumber == d->m_highlightBlocksInfo.open.last();
+ bool drawUp = !d->m_highlightBlocksInfo.isEmpty()
+ && blockNumber == d->m_highlightBlocksInfo.close.first();
+
+ if (drawBox || drawDown || drawUp) {
+ painter.setRenderHint(QPainter::Antialiasing, true);
+ painter.translate(.5, .5);
+ painter.setPen(pal.text().color());
+ painter.setBrush(pal.text().color());
+
+ if (drawBox) {
+ QPointF points1[3] = { QPointF(r.left(), r.center().y()-1),
+ QPointF(r.center().x(), r.top()),
+ QPointF(r.right(), r.center().y()-1) };
+ QPointF points2[3] = { QPointF(r.left(), r.center().y()+1),
+ QPointF(r.center().x(), r.bottom()-1),
+ QPointF(r.right(), r.center().y()+1) };
+ painter.drawPolygon(points1, 3);
+ painter.drawPolygon(points2, 3);
+ } else if (drawUp) {
+
+ // check that we are not collapsed
+ QTextBlock open = doc->findBlockByNumber(d->m_highlightBlocksInfo.open.last());
+ if (open.next().isVisible()) {
+
+ QPointF points[3] = { QPointF(r.left(), r.bottom()-1),
+ QPointF(r.center().x(), r.center().y()),
+ QPointF(r.right(), r.bottom()-1) };
+ painter.drawPolygon(points, 3);
+ }
+ } else if(drawDown) {
+ QPointF points[3] = { QPointF(r.left(), r.top()),
+ QPointF(r.center().x(), r.center().y()),
+ QPointF(r.right(), r.top()) };
+ painter.drawPolygon(points, 3);
+ }
+ painter.translate(-.5, -.5);
+ painter.setRenderHint(QPainter::Antialiasing, false);
}
}
+
painter.restore();
}
@@ -2353,12 +2374,38 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e)
if (d->m_lineNumbersVisible) {
const QString &number = QString::number(blockNumber + 1);
+ if (blockNumber == cursorBlockNumber) {
+ painter.save();
+ QFont f = painter.font();
+ f.setBold(d->m_currentLineNumberFormat.font().bold());
+ f.setItalic(d->m_currentLineNumberFormat.font().italic());
+ painter.setFont(f);
+ painter.setPen(d->m_currentLineNumberFormat.foreground().color());
+ }
painter.drawText(markWidth, top, extraAreaWidth - markWidth - 4, fm.height(), Qt::AlignRight, number);
+ if (blockNumber == cursorBlockNumber)
+ painter.restore();
}
block = nextVisibleBlock;
blockNumber = nextVisibleBlockNumber;
}
+
+ if (d->m_codeFoldingVisible) {
+ painter.drawLine(extraAreaWidth, 0,
+ extraAreaWidth, viewport()->height());
+ painter.drawLine(extraAreaWidth + collapseBoxWidth - 1, 0,
+ extraAreaWidth + collapseBoxWidth - 1, viewport()->height());
+// QRect cb = collapseBox();
+// if (!cb.isEmpty()) {
+// QPen pen(baseColor.value() < 128 ? Qt::white : Qt::black);
+// pen.setWidth(2);
+// painter.setPen(pen);
+// painter.setRenderHint(QPainter::Antialiasing, true);
+// painter.translate(.5, .5);
+// painter.drawRoundedRect(QRect(cb.adjusted(0, 0,-2, -2)), 4, 4);
+// }
+ }
}
void BaseTextEditor::slotModificationChanged(bool m)
@@ -2412,10 +2459,17 @@ void BaseTextEditor::slotCursorPositionChanged()
} else if (d->m_contentsChanged) {
saveCurrentCursorPositionForNavigation();
}
+
+ if (d->m_parenthesesMatchingEnabled) {
+ // Delay update when no matching is displayed yet, to avoid flicker
+ if (extraSelections(ParenthesesMatchingSelection).isEmpty()) {
+ d->m_parenthesesMatchingTimer->start(50);
+ } else {
+ _q_matchParentheses();
+ }
+ }
+
QList<QTextEdit::ExtraSelection> extraSelections;
- setExtraSelections(ParenthesesMatchingSelection, extraSelections); // clear
- if (d->m_parenthesesMatchingEnabled)
- d->m_parenthesesMatchingTimer->start(50);
if (d->m_highlightCurrentLine) {
QTextEdit::ExtraSelection sel;
@@ -2429,6 +2483,9 @@ void BaseTextEditor::slotCursorPositionChanged()
setExtraSelections(CurrentLineSelection, extraSelections);
if (d->m_highlightBlocks) {
+ QTextCursor cursor = textCursor();
+ d->extraAreaHighlightCollapseBlockNumber = cursor.blockNumber();
+ d->extraAreaHighlightCollapseColumn = cursor.position() - cursor.block().position();
d->m_highlightBlocksTimer->start(100);
}
}
@@ -2450,12 +2507,6 @@ void BaseTextEditor::slotUpdateBlockNotify(const QTextBlock &block)
}
}
-void BaseTextEditor::setCollapseIndicatorAlpha(int alpha)
-{
- d->extraAreaCollapseAlpha = alpha;
- d->m_extraArea->update();
-}
-
void BaseTextEditor::timerEvent(QTimerEvent *e)
{
if (e->timerId() == d->autoScrollTimer.timerId()) {
@@ -2545,13 +2596,9 @@ void BaseTextEditor::mousePressEvent(QMouseEvent *e)
void BaseTextEditor::extraAreaLeaveEvent(QEvent *)
{
- if (d->extraAreaHighlightCollapseBlockNumber >= 0) {
- d->extraAreaHighlightFadingBlockNumber = d->extraAreaHighlightCollapseBlockNumber;
- d->extraAreaHighlightCollapseBlockNumber = -1; // missing mouse move event from Qt
- d->extraAreaTimeLine->setDirection(QTimeLine::Backward);
- if (d->extraAreaTimeLine->state() != QTimeLine::Running)
- d->extraAreaTimeLine->start();
- }
+ // fake missing mouse move event from Qt
+ QMouseEvent me(QEvent::MouseMove, QPoint(-1, -1), Qt::NoButton, 0, 0);
+ extraAreaMouseEvent(&me);
}
void BaseTextEditor::extraAreaMouseEvent(QMouseEvent *e)
@@ -2562,43 +2609,48 @@ void BaseTextEditor::extraAreaMouseEvent(QMouseEvent *e)
int markWidth;
extraAreaWidth(&markWidth);
- if (e->type() == QEvent::MouseMove && e->buttons() == 0) { // mouse tracking
+ if (d->m_codeFoldingVisible
+ && e->type() == QEvent::MouseMove && e->buttons() == 0) { // mouse tracking
// Update which folder marker is highlighted
const int highlightBlockNumber = d->extraAreaHighlightCollapseBlockNumber;
+ const int highlightColumn = d->extraAreaHighlightCollapseColumn;
d->extraAreaHighlightCollapseBlockNumber = -1;
+ d->extraAreaHighlightCollapseColumn = -1;
- if (d->m_codeFoldingVisible
- && TextBlockUserData::canCollapse(cursor.block())
- && !TextBlockUserData::hasClosingCollapseInside(cursor.block().next())
- && collapseBox(cursor.block()).contains(e->pos()))
+ if (d->m_highlightBlocks) {
+ QTextCursor cursor = textCursor();
d->extraAreaHighlightCollapseBlockNumber = cursor.blockNumber();
+ d->extraAreaHighlightCollapseColumn = cursor.position() - cursor.block().position();
+ }
- // Set whether the mouse cursor is a hand or normal arrow
- bool hand = (e->pos().x() <= markWidth || d->extraAreaHighlightCollapseBlockNumber >= 0);
- if (hand != (d->m_extraArea->cursor().shape() == Qt::PointingHandCursor))
- d->m_extraArea->setCursor(hand ? Qt::PointingHandCursor : Qt::ArrowCursor);
-
- // Start fading in or out the highlighted folding marker
- if (highlightBlockNumber != d->extraAreaHighlightCollapseBlockNumber) {
- d->extraAreaTimeLine->stop();
- d->extraAreaTimeLine->setDirection(d->extraAreaHighlightCollapseBlockNumber >= 0?
- QTimeLine::Forward : QTimeLine::Backward);
- if (d->extraAreaTimeLine->direction() == QTimeLine::Backward)
- d->extraAreaHighlightFadingBlockNumber = highlightBlockNumber;
- else
- d->extraAreaHighlightFadingBlockNumber = -1;
- if (d->extraAreaTimeLine->state() != QTimeLine::Running)
- d->extraAreaTimeLine->start();
+ int collapseBoxWidth = fontMetrics().lineSpacing() + 1;
+ if (e->pos().x() > extraArea()->width() - collapseBoxWidth) {
+ d->extraAreaHighlightCollapseBlockNumber = cursor.blockNumber();
+ if (!TextBlockUserData::hasClosingCollapse(cursor.block()))
+ d->extraAreaHighlightCollapseColumn = cursor.block().length()-1;
}
+ if (highlightBlockNumber != d->extraAreaHighlightCollapseBlockNumber
+ || highlightColumn != d->extraAreaHighlightCollapseColumn)
+ d->m_highlightBlocksTimer->start(40);
}
if (e->type() == QEvent::MouseButtonPress || e->type() == QEvent::MouseButtonDblClick) {
if (e->button() == Qt::LeftButton) {
- if (d->m_codeFoldingVisible && TextBlockUserData::canCollapse(cursor.block())
- && !TextBlockUserData::hasClosingCollapseInside(cursor.block().next())
- && collapseBox(cursor.block()).contains(e->pos())) {
- toggleBlockVisible(cursor.block());
- d->moveCursorVisible(false);
+ int collapseBoxWidth = fontMetrics().lineSpacing() + 1;
+ if (d->m_codeFoldingVisible && e->pos().x() > extraArea()->width() - collapseBoxWidth) {
+ if (!cursor.block().next().isVisible()) {
+ toggleBlockVisible(cursor.block());
+ d->moveCursorVisible(false);
+ } else if (collapseBox().contains(e->pos())) {
+ cursor.setPosition(
+ document()->findBlockByNumber(d->m_highlightBlocksInfo.open.last()).position()
+ );
+ QTextBlock c = cursor.block();
+ if (!TextBlockUserData::canCollapse(c))
+ c = c.previous();
+ toggleBlockVisible(c);
+ d->moveCursorVisible(false);
+ }
} else if (d->m_marksVisible && e->pos().x() > markWidth) {
QTextCursor selection = cursor;
selection.setVisualNavigation(true);
@@ -3153,34 +3205,38 @@ bool TextBlockUserData::findPreviousOpenParenthesis(QTextCursor *cursor, bool se
return false;
}
-bool TextBlockUserData::findNextClosingParenthesis(QTextCursor *cursor, bool select)
+bool TextBlockUserData::findPreviousBlockOpenParenthesis(QTextCursor *cursor, bool checkStartPosition)
{
QTextBlock block = cursor->block();
- int position = cursor->position();
+ int position = cursor->position() + (checkStartPosition ? 1 : 0 );
int ignore = 0;
while (block.isValid()) {
Parentheses parenList = TextEditDocumentLayout::parentheses(block);
if (!parenList.isEmpty() && !TextEditDocumentLayout::ifdefedOut(block)) {
- for (int i = 0; i < parenList.count(); ++i) {
+ for (int i = parenList.count()-1; i >= 0; --i) {
Parenthesis paren = parenList.at(i);
- if (block == cursor->block() && position - block.position() >= paren.pos)
+ if (paren.chr != QLatin1Char('{') && paren.chr != QLatin1Char('}')
+ && paren.chr != QLatin1Char('+') && paren.chr != QLatin1Char('-'))
continue;
- if (paren.type == Parenthesis::Opened) {
+ if (block == cursor->block() &&
+ (position - block.position() <= paren.pos + (paren.type == Parenthesis::Closed ? 1 : 0)))
+ continue;
+ if (paren.type == Parenthesis::Closed) {
++ignore;
} else if (ignore > 0) {
--ignore;
} else {
- cursor->setPosition(block.position() + paren.pos+1, select ? QTextCursor::KeepAnchor : QTextCursor::MoveAnchor);
+ cursor->setPosition(block.position() + paren.pos);
return true;
}
}
}
- block = block.next();
+ block = block.previous();
}
return false;
}
-bool TextBlockUserData::findPreviousBlockOpenParenthesis(QTextCursor *cursor)
+bool TextBlockUserData::findNextClosingParenthesis(QTextCursor *cursor, bool select)
{
QTextBlock block = cursor->block();
int position = cursor->position();
@@ -3188,25 +3244,22 @@ bool TextBlockUserData::findPreviousBlockOpenParenthesis(QTextCursor *cursor)
while (block.isValid()) {
Parentheses parenList = TextEditDocumentLayout::parentheses(block);
if (!parenList.isEmpty() && !TextEditDocumentLayout::ifdefedOut(block)) {
- for (int i = parenList.count()-1; i >= 0; --i) {
+ for (int i = 0; i < parenList.count(); ++i) {
Parenthesis paren = parenList.at(i);
- if (paren.chr != QLatin1Char('{') && paren.chr != QLatin1Char('}')
- && paren.chr != QLatin1Char('+') && paren.chr != QLatin1Char('-'))
- continue;
if (block == cursor->block() &&
- (position - block.position() <= paren.pos))
- continue;
- if (paren.type == Parenthesis::Closed) {
+ (position - block.position() > paren.pos - (paren.type == Parenthesis::Opened ? 1 : 0)))
+ continue;
+ if (paren.type == Parenthesis::Opened) {
++ignore;
} else if (ignore > 0) {
--ignore;
} else {
- cursor->setPosition(block.position() + paren.pos);
+ cursor->setPosition(block.position() + paren.pos+1, select ? QTextCursor::KeepAnchor : QTextCursor::MoveAnchor);
return true;
}
}
}
- block = block.previous();
+ block = block.next();
}
return false;
}
@@ -3224,7 +3277,8 @@ bool TextBlockUserData::findNextBlockClosingParenthesis(QTextCursor *cursor)
if (paren.chr != QLatin1Char('{') && paren.chr != QLatin1Char('}')
&& paren.chr != QLatin1Char('+') && paren.chr != QLatin1Char('-'))
continue;
- if (block == cursor->block() && position - block.position() >= paren.pos)
+ if (block == cursor->block() &&
+ (position - block.position() > paren.pos - (paren.type == Parenthesis::Opened ? 1 : 0)))
continue;
if (paren.type == Parenthesis::Opened) {
++ignore;
@@ -3317,11 +3371,13 @@ void BaseTextEditor::_q_matchParentheses()
const TextBlockUserData::MatchType backwardMatchType = TextBlockUserData::matchCursorBackward(&backwardMatch);
const TextBlockUserData::MatchType forwardMatchType = TextBlockUserData::matchCursorForward(&forwardMatch);
- if (backwardMatchType == TextBlockUserData::NoMatch && forwardMatchType == TextBlockUserData::NoMatch)
- return;
-
QList<QTextEdit::ExtraSelection> extraSelections;
+ if (backwardMatchType == TextBlockUserData::NoMatch && forwardMatchType == TextBlockUserData::NoMatch) {
+ setExtraSelections(ParenthesesMatchingSelection, extraSelections); // clear
+ return;
+ }
+
if (backwardMatch.hasSelection()) {
QTextEdit::ExtraSelection sel;
if (backwardMatchType == TextBlockUserData::Mismatch) {
@@ -3378,18 +3434,33 @@ void BaseTextEditor::_q_matchParentheses()
void BaseTextEditor::_q_highlightBlocks()
{
- QTextCursor cursor = textCursor();
- QTextCursor closeCursor = cursor;
BaseTextEditorPrivateHighlightBlocks highlightBlocksInfo;
- while (TextBlockUserData::findPreviousBlockOpenParenthesis(&cursor)) {
- highlightBlocksInfo.open.prepend(cursor.blockNumber());
- highlightBlocksInfo.visualIndent.prepend(d->visualIndent(cursor.block()));
- if (TextBlockUserData::findNextBlockClosingParenthesis(&closeCursor))
- highlightBlocksInfo.close.append(closeCursor.blockNumber());
+
+ if (d->extraAreaHighlightCollapseBlockNumber >= 0) {
+ QTextBlock block = document()->findBlockByNumber(d->extraAreaHighlightCollapseBlockNumber);
+ if (block.isValid()) {
+ QTextCursor cursor(block);
+ if (d->extraAreaHighlightCollapseColumn >= 0)
+ cursor.setPosition(cursor.position() + qMin(d->extraAreaHighlightCollapseColumn,
+ block.length()));
+ QTextCursor closeCursor;
+ bool firstRun = true;
+ while (TextBlockUserData::findPreviousBlockOpenParenthesis(&cursor, firstRun)) {
+ firstRun = false;
+ highlightBlocksInfo.open.prepend(cursor.blockNumber());
+ highlightBlocksInfo.visualIndent.prepend(d->visualIndent(cursor.block()));
+ if (closeCursor.isNull())
+ closeCursor = cursor;
+ if (TextBlockUserData::findNextBlockClosingParenthesis(&closeCursor))
+ highlightBlocksInfo.close.append(closeCursor.blockNumber());
+ }
+ }
}
+
if (d->m_highlightBlocksInfo != highlightBlocksInfo) {
d->m_highlightBlocksInfo = highlightBlocksInfo;
viewport()->update();
+ d->m_extraArea->update();
}
}
@@ -3507,10 +3578,11 @@ void BaseTextEditor::setFontSettings(const TextEditor::FontSettings &fs)
const QTextCharFormat selectionFormat = fs.toTextCharFormat(QLatin1String(Constants::C_SELECTION));
const QTextCharFormat lineNumberFormat = fs.toTextCharFormat(QLatin1String(Constants::C_LINE_NUMBER));
const QTextCharFormat searchResultFormat = fs.toTextCharFormat(QLatin1String(Constants::C_SEARCH_RESULT));
- const QTextCharFormat searchScopeFormat = fs.toTextCharFormat(QLatin1String(Constants::C_SEARCH_SCOPE));
+ d->m_searchScopeFormat = fs.toTextCharFormat(QLatin1String(Constants::C_SEARCH_SCOPE));
const QTextCharFormat parenthesesFormat = fs.toTextCharFormat(QLatin1String(Constants::C_PARENTHESES));
- const QTextCharFormat currentLineFormat = fs.toTextCharFormat(QLatin1String(Constants::C_CURRENT_LINE));
- const QTextCharFormat ifdefedOutFormat = fs.toTextCharFormat(QLatin1String(Constants::C_DISABLED_CODE));
+ d->m_currentLineFormat = fs.toTextCharFormat(QLatin1String(Constants::C_CURRENT_LINE));
+ d->m_currentLineNumberFormat = fs.toTextCharFormat(QLatin1String(Constants::C_CURRENT_LINE_NUMBER));
+ d->m_ifdefedOutFormat = fs.toTextCharFormat(QLatin1String(Constants::C_DISABLED_CODE));
QFont font(textFormat.font());
const QColor foreground = textFormat.foreground().color();
@@ -3538,16 +3610,11 @@ void BaseTextEditor::setFontSettings(const TextEditor::FontSettings &fs)
// Search results
d->m_searchResultFormat.setBackground(searchResultFormat.background());
- d->m_searchScopeFormat.setBackground(searchScopeFormat.background());
- d->m_currentLineFormat.setBackground(currentLineFormat.background());
// Matching braces
d->m_matchFormat.setForeground(parenthesesFormat.foreground());
d->m_rangeFormat.setBackground(parenthesesFormat.background());
- // Disabled code
- d->m_ifdefedOutFormat.setForeground(ifdefedOutFormat.foreground());
-
slotUpdateExtraAreaWidth();
}
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index f0669a71046bb3d8acd88b795d0815f7e544d91b..e917696b57eee08f0651c602679ed91e4543bdeb 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -167,7 +167,7 @@ public:
static bool findPreviousOpenParenthesis(QTextCursor *cursor, bool select = false);
static bool findNextClosingParenthesis(QTextCursor *cursor, bool select = false);
- static bool findPreviousBlockOpenParenthesis(QTextCursor *cursor);
+ static bool findPreviousBlockOpenParenthesis(QTextCursor *cursor, bool checkStartPosition = false);
static bool findNextBlockClosingParenthesis(QTextCursor *cursor);
@@ -370,7 +370,6 @@ private slots:
void restoreCursorPosition();
void highlightSearchResults(const QString &txt, QTextDocument::FindFlags findFlags);
void setFindScope(const QTextCursor &);
- void setCollapseIndicatorAlpha(int);
void currentEditorChanged(Core::IEditor *editor);
private:
@@ -460,7 +459,7 @@ private:
void saveCurrentCursorPositionForNavigation();
void toggleBlockVisible(const QTextBlock &block);
- QRect collapseBox(const QTextBlock &block);
+ QRect collapseBox();
QTextBlock collapsedBlockAt(const QPoint &pos, QRect *box = 0) const;
diff --git a/src/plugins/texteditor/basetexteditor_p.h b/src/plugins/texteditor/basetexteditor_p.h
index 844d377768953377d12bb0d5955578fedc127ffb..e9ff2e9f121554ef40708185f1ded312623d8820 100644
--- a/src/plugins/texteditor/basetexteditor_p.h
+++ b/src/plugins/texteditor/basetexteditor_p.h
@@ -33,7 +33,6 @@
#include "basetexteditor.h"
#include <QtCore/QBasicTimer>
-#include <QtCore/QTimeLine>
#include <QtCore/QSharedData>
#include <QtGui/QTextEdit>
@@ -119,6 +118,8 @@ struct BaseTextEditorPrivateHighlightBlocks
QList<int> open;
QList<int> close;
QList<int> visualIndent;
+ inline int count() const { return visualIndent.size(); }
+ inline bool isEmpty() const { return open.isEmpty() || close.isEmpty() || visualIndent.isEmpty(); }
inline bool operator==(const BaseTextEditorPrivateHighlightBlocks &o) const {
return (open == o.open && close == o.close && visualIndent == o.visualIndent);
}
@@ -178,9 +179,7 @@ public:
int extraAreaSelectionAnchorBlockNumber;
int extraAreaToggleMarkBlockNumber;
int extraAreaHighlightCollapseBlockNumber;
- int extraAreaCollapseAlpha;
- int extraAreaHighlightFadingBlockNumber;
- QTimeLine *extraAreaTimeLine;
+ int extraAreaHighlightCollapseColumn;
QBasicTimer collapsedBlockTimer;
int visibleCollapsedBlockNumber;
@@ -209,6 +208,7 @@ public:
QTextCharFormat m_searchResultFormat;
QTextCharFormat m_searchScopeFormat;
QTextCharFormat m_currentLineFormat;
+ QTextCharFormat m_currentLineNumberFormat;
void highlightSearchResults(const QTextBlock &block,
QVector<QTextLayout::FormatRange> *selections);
diff --git a/src/plugins/texteditor/displaysettings.cpp b/src/plugins/texteditor/displaysettings.cpp
index 27480d3dcc5bc3216183cd6defc58757a327c9ef..0dd0c33db524cd1c43ee977994a3c34b5f03000c 100644
--- a/src/plugins/texteditor/displaysettings.cpp
+++ b/src/plugins/texteditor/displaysettings.cpp
@@ -40,7 +40,7 @@ static const char * const showWrapColumnKey = "ShowWrapColumn";
static const char * const wrapColumnKey = "WrapColumn";
static const char * const visualizeWhitespaceKey = "VisualizeWhitespace";
static const char * const displayFoldingMarkersKey = "DisplayFoldingMarkersV2";
-static const char * const highlightCurrentLineKey = "HighlightCurrentLineKey";
+static const char * const highlightCurrentLineKey = "HighlightCurrentLineKeyV2";
static const char * const highlightBlocksKey = "HighlightBlocksKeyV2";
static const char * const groupPostfix = "DisplaySettings";
@@ -53,7 +53,7 @@ DisplaySettings::DisplaySettings() :
m_wrapColumn(80),
m_visualizeWhitespace(false),
m_displayFoldingMarkers(false),
- m_highlightCurrentLine(true),
+ m_highlightCurrentLine(false),
m_highlightBlocks(true)
{
}
diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp
index 8f776f04b009e87ceba081f2e188a52699d0d6d5..aec2acb241a75a240211f098953f84f1fc702b0e 100644
--- a/src/plugins/texteditor/fontsettingspage.cpp
+++ b/src/plugins/texteditor/fontsettingspage.cpp
@@ -137,9 +137,9 @@ QString FormatDescription::trName() const
QColor FormatDescription::foreground() const
{
- if (m_name == QLatin1String("LineNumber"))
+ if (m_name == QLatin1String(Constants::C_LINE_NUMBER))
return QApplication::palette().dark().color();
- if (m_name == QLatin1String("Parentheses"))
+ if (m_name == QLatin1String(Constants::C_PARENTHESES))
return QColor(Qt::red);
return m_format.foreground();
}
diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h
index e598a8911484cba9c91c427d7a5c0d35779cd0a6..a8dfac2b5c055cab713c5930abd9f0ac45f1229d 100644
--- a/src/plugins/texteditor/texteditorconstants.h
+++ b/src/plugins/texteditor/texteditorconstants.h
@@ -72,6 +72,7 @@ const char * const C_SEARCH_RESULT = "SearchResult";
const char * const C_SEARCH_SCOPE = "SearchScope";
const char * const C_PARENTHESES = "Parentheses";
const char * const C_CURRENT_LINE = "CurrentLine";
+const char * const C_CURRENT_LINE_NUMBER = "CurrentLineNumber";
const char * const C_NUMBER = "Number";
const char * const C_STRING = "String";
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index 31204648a1d2a778f8f94d897348c2caf8c28507..ca562d0df182b86e4e6b415fdf85341fdd325afa 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -72,6 +72,7 @@ TextEditorSettings::TextEditorSettings(QObject *parent)
formatDescriptions.push_back(FormatDescription(QLatin1String(C_SEARCH_SCOPE), tr("Search Scope")));
formatDescriptions.push_back(FormatDescription(QLatin1String(C_PARENTHESES), tr("Parentheses")));
formatDescriptions.push_back(FormatDescription(QLatin1String(C_CURRENT_LINE), tr("Current Line")));
+ formatDescriptions.push_back(FormatDescription(QLatin1String(C_CURRENT_LINE_NUMBER), tr("Current Line Number"), Qt::darkGray));
// Standard categories
formatDescriptions.push_back(FormatDescription(QLatin1String(C_NUMBER), tr("Number"), Qt::darkBlue));
diff --git a/tests/manual/gdbdebugger/simple/app.cpp b/tests/manual/gdbdebugger/simple/app.cpp
index 9c5c007a4b95c9ed4a9931aeab6ca5f2ec686427..608198bb28de4f70d4631c920790b70ff9fa909c 100644
--- a/tests/manual/gdbdebugger/simple/app.cpp
+++ b/tests/manual/gdbdebugger/simple/app.cpp
@@ -538,8 +538,20 @@ public:
void testQSharedPointer()
{
- Employee e1(1, "Herbert");
- Employee e2 = e1;
+ //Employee e1(1, "Herbert");
+ //Employee e2 = e1;
+
+ QSharedPointer<int> iptr(new int(43));
+ QSharedPointer<int> iptr2 = iptr;
+ QSharedPointer<int> iptr3 = iptr;
+
+ QSharedPointer<QString> ptr(new QString("hallo"));
+ QSharedPointer<QString> ptr2 = ptr;
+ QSharedPointer<QString> ptr3 = ptr;
+
+ //QWeakPointer<QString> wptr(ptr);
+ //QWeakPointer<QString> wptr2 = wptr;
+ //QWeakPointer<QString> wptr3 = wptr;
}
void stringRefTest(const QString &refstring)