diff --git a/.gitignore b/.gitignore
index e0c76e75e46199e732be9441bf3ad6863279aa4d..91376c885a72bd7067bf46257f63266236c4ea64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,12 +69,13 @@ doc-build
src/corelib/lib
src/network/lib
src/xml/lib/
+run/*
# Binaries
# --------
bin/*.dll
bin/qtcreator.bin
-bin/qtcreator_process_stub
+bin/qtcreator_process_stub*
bin/qtcreator.exe
-doc/qtcreator.qch
+share/doc/qtcreator/qtcreator.qch
tests/manual/cplusplus/cplusplus0
diff --git a/bin/qtcreator b/bin/qtcreator
index f66b08778a6692513342d706daf82102b0c884b4..c142ea825a6ca1a41a9a8e777bfa571c45ac5061 100755
--- a/bin/qtcreator
+++ b/bin/qtcreator
@@ -1,9 +1,5 @@
#!/bin/sh
bindir=$(dirname "$(readlink -nf $0)")
-if test "$(uname -m)" = "x86_64" ; then
- libdir=$(cd "${bindir}/../lib64" ; pwd)
-else
- libdir=$(cd "${bindir}/../lib" ; pwd)
-fi
+libdir=$(cd "${bindir}/../lib" ; pwd)
LD_LIBRARY_PATH="${libdir}/qtcreator:${LD_LIBRARY_PATH}" exec "${bindir}/qtcreator.bin" ${1+"$@"}
diff --git a/qtcreator.pri b/qtcreator.pri
index 0333eca631330c43889e21ead2fa22b4d2909d09..83ff7ceea1c6aaaeb7e02c3b1c51ac1b70943f31 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -35,22 +35,24 @@ isEmpty(TEST):CONFIG(debug, debug|release) {
}
}
-linux-*-64 {
- IDE_LIBRARY_BASENAME = lib64
-} else {
+isEmpty(IDE_LIBRARY_BASENAME) {
IDE_LIBRARY_BASENAME = lib
}
+DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\"
+
equals(TEST, 1) {
QT +=testlib
DEFINES += WITH_TESTS
}
IDE_SOURCE_TREE = $$PWD
-sub_dir = $$_PRO_FILE_PWD_
-sub_dir ~= s,^$$re_escape($$PWD),,
-IDE_BUILD_TREE = $$cleanPath($$OUT_PWD)
-IDE_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,,
+isEmpty(IDE_BUILD_TREE) {
+ sub_dir = $$_PRO_FILE_PWD_
+ sub_dir ~= s,^$$re_escape($$PWD),,
+ IDE_BUILD_TREE = $$cleanPath($$OUT_PWD)
+ IDE_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,,
+}
IDE_APP_PATH = $$IDE_BUILD_TREE/bin
macx {
IDE_APP_TARGET = QtCreator
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index b3f054ffbb2ea639cb6cc418bbb6d3cd7d962f25..47b26368bf09167a52f8dac57b3c2899a466ad94 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -2025,7 +2025,8 @@ static void qDumpQString(QDumper &d)
if (!str.isEmpty()) {
qCheckAccess(str.unicode());
- qCheckAccess(str.unicode() + str.size());
+ if (!str.unicode()[str.size()].isNull()) // must be '\0' terminated
+ qCheckAccess(0);
}
P(d, "value", str);
diff --git a/share/qtcreator/schemes/MS_Visual_C++.kms b/share/qtcreator/schemes/MS_Visual_C++.kms
index abd265f1bad6e4373161abf6c9920e3ecbd32d40..fb549aa23fad92e0325a7db0ca840ce52c92b23b 100644
--- a/share/qtcreator/schemes/MS_Visual_C++.kms
+++ b/share/qtcreator/schemes/MS_Visual_C++.kms
@@ -159,7 +159,7 @@
<shortcut id="QtCreator.ToggleSidebar" >
<key value="Alt+0" />
</shortcut>
- <shortcut id="QtCreator.AboutWorkbench" >
+ <shortcut id="QtCreator.AboutQtCreator" >
<key value="" />
</shortcut>
<shortcut id="QtCreator.AboutPlugins" >
diff --git a/share/qtcreator/schemes/Xcode.kms b/share/qtcreator/schemes/Xcode.kms
index 48bc62913227a1bfaa76e7c72e7cefabd69a7f1e..644fb98f77dc0469195cf450df89230f9468a784 100644
--- a/share/qtcreator/schemes/Xcode.kms
+++ b/share/qtcreator/schemes/Xcode.kms
@@ -60,7 +60,7 @@
<shortcut id="QtCreator.ToggleSidebar" >
<key value="Ctrl+0" />
</shortcut>
- <shortcut id="QtCreator.AboutWorkbench" >
+ <shortcut id="QtCreator.AboutQtCreator" >
<key value="" />
</shortcut>
<shortcut id="QtCreator.AboutPlugins" >
diff --git a/share/qtcreator/snippets/class_generic.snp b/share/qtcreator/snippets/class_generic.snp
index 1f196c3dac842f8e0458816c741777304f8c9320..4f2ca625c0b1f179f4b2cb91080aeff58766e263 100644
--- a/share/qtcreator/snippets/class_generic.snp
+++ b/share/qtcreator/snippets/class_generic.snp
@@ -1,5 +1,5 @@
-<!DOCTYPE QtWorkbenchSnippet>
-<qtworkbench>
+<!DOCTYPE QtCreatorSnippet>
+<qtcreator>
<data>
<variable>Name</variable>
<value type="QString" >Class - Generic</value>
@@ -23,4 +23,4 @@
$selection$
};]]></value>
</data>
-</qtworkbench>
\ No newline at end of file
+</qtcreator>
diff --git a/share/qtcreator/snippets/class_qobject.snp b/share/qtcreator/snippets/class_qobject.snp
index 784233e546f47869d57b918592059cff03503dbd..0b85ccb9bc92f3b89bbe63bc7e3e0af33641efea 100644
--- a/share/qtcreator/snippets/class_qobject.snp
+++ b/share/qtcreator/snippets/class_qobject.snp
@@ -1,5 +1,5 @@
-<!DOCTYPE QtWorkbenchSnippet>
-<qtworkbench>
+<!DOCTYPE QtCreatorSnippet>
+<qtcreator>
<data>
<variable>Name</variable>
<value type="QString" >Class - QObject</value>
@@ -26,4 +26,4 @@ public:
$selection$
};]]></value>
</data>
-</qtworkbench>
+</qtcreator>
diff --git a/share/qtcreator/snippets/class_qwidget.snp b/share/qtcreator/snippets/class_qwidget.snp
index 1edb2d2cc77ac9a7fb1541219a6dc0732d1afef2..94b7eca49834eceab181d6e9cb166c62be738002 100644
--- a/share/qtcreator/snippets/class_qwidget.snp
+++ b/share/qtcreator/snippets/class_qwidget.snp
@@ -1,5 +1,5 @@
-<!DOCTYPE QtWorkbenchSnippet>
-<qtworkbench>
+<!DOCTYPE QtCreatorSnippet>
+<qtcreator>
<data>
<variable>Name</variable>
<value type="QString" >Class - QWidget</value>
@@ -26,4 +26,4 @@ public:
$selection$
};]]></value>
</data>
-</qtworkbench>
\ No newline at end of file
+</qtcreator>
diff --git a/share/qtcreator/snippets/comment.snp b/share/qtcreator/snippets/comment.snp
index bd909a7e7a2945ca07195cb57cc166deafa5e466..4ff028ae11eee6f05ff256567d7cc6043170428f 100644
--- a/share/qtcreator/snippets/comment.snp
+++ b/share/qtcreator/snippets/comment.snp
@@ -1,5 +1,5 @@
-<!DOCTYPE QtWorkbenchSnippet>
-<qtworkbench>
+<!DOCTYPE QtCreatorSnippet>
+<qtcreator>
<data>
<variable>Name</variable>
<value type="QString" >/* ... */ Comment</value>
@@ -20,4 +20,4 @@
<variable>Contents</variable>
<value type="QString" ><![CDATA[/* $anchor$$selection$$cursor$ */]]></value>
</data>
-</qtworkbench>
+</qtcreator>
diff --git a/share/qtcreator/snippets/for.snp b/share/qtcreator/snippets/for.snp
index 16aa633fafe2bd73dac2c2d2a5fd37fe1e415aa1..5bb2b91c8047e207fb0acf642e55a79ccdc29c18 100644
--- a/share/qtcreator/snippets/for.snp
+++ b/share/qtcreator/snippets/for.snp
@@ -1,5 +1,5 @@
-<!DOCTYPE QtWorkbenchSnippet>
-<qtworkbench>
+<!DOCTYPE QtCreatorSnippet>
+<qtcreator>
<data>
<variable>Name</variable>
@@ -45,4 +45,4 @@
</valuemap>
</data>
-</qtworkbench>
\ No newline at end of file
+</qtcreator>
diff --git a/share/qtcreator/snippets/foreach.snp b/share/qtcreator/snippets/foreach.snp
index c00beb99e52026b781a127509b2659d249210b47..7ac7c81451c83ceb69e9f70ff5bf164c45db3868 100644
--- a/share/qtcreator/snippets/foreach.snp
+++ b/share/qtcreator/snippets/foreach.snp
@@ -1,5 +1,5 @@
-<!DOCTYPE QtWorkbenchSnippet>
-<qtworkbench>
+<!DOCTYPE QtCreatorSnippet>
+<qtcreator>
<data>
<variable>Name</variable>
<value type="QString" >foreach statement</value>
@@ -22,4 +22,4 @@
$selection$
}]]></value>
</data>
-</qtworkbench>
+</qtcreator>
diff --git a/share/qtcreator/snippets/if.snp b/share/qtcreator/snippets/if.snp
index 2888590efaa9811fca2c53948bb5b9bf5ccfc5f6..99dd8eaafb2fe117704f512789a7eb6af461ea35 100644
--- a/share/qtcreator/snippets/if.snp
+++ b/share/qtcreator/snippets/if.snp
@@ -1,5 +1,5 @@
-<!DOCTYPE QtWorkbenchSnippet>
-<qtworkbench>
+<!DOCTYPE QtCreatorSnippet>
+<qtcreator>
<data>
<variable>Name</variable>
<value type="QString" >if Statement</value>
@@ -22,4 +22,4 @@
$selection$
}]]></value>
</data>
-</qtworkbench>
+</qtcreator>
diff --git a/share/qtcreator/snippets/ifelse.snp b/share/qtcreator/snippets/ifelse.snp
index 39428555ca347c164656915bbbd7f969de1343b3..8b44e68a4bf91cc50b60f16f3b3485eeb04081e6 100644
--- a/share/qtcreator/snippets/ifelse.snp
+++ b/share/qtcreator/snippets/ifelse.snp
@@ -1,5 +1,5 @@
-<!DOCTYPE QtWorkbenchSnippet>
-<qtworkbench>
+<!DOCTYPE QtCreatorSnippet>
+<qtcreator>
<data>
<variable>Name</variable>
<value type="QString" >if - else Statement</value>
@@ -24,4 +24,4 @@
}]]></value>
</data>
-</qtworkbench>
+</qtcreator>
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index c657df160584eda2c252ae272bc09b1f6b54b059..6489b127f845fd2890e250a9760836eaa7604b5e 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -6,17 +6,17 @@
<message>
<location filename="../../../src/app/main.cpp" line="+133"/>
<source>Failed to load core: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Das Core-Plugin konnte nicht geladen werden: %1</translation>
</message>
<message>
<location line="+5"/>
<source>Unable to send command line arguments to the already running instance. It appears to be not responding.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Kommandozeilen-Argumente konnten nicht an die laufende Instanz übermittelt werden. Sie antwortet nicht.</translation>
</message>
<message>
<location line="+136"/>
<source>Couldn't find 'Core.pluginspec' in %1</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei 'Core.pluginspec' konnte in %1 nicht gefunden werden</translation>
</message>
</context>
<context>
@@ -24,17 +24,17 @@
<message>
<location filename="../../../src/plugins/debugger/attachcoredialog.ui"/>
<source>Start Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger starten</translation>
</message>
<message>
<location/>
<source>Executable:</source>
- <translation type="unfinished"></translation>
+ <translation>Ausführbare Datei:</translation>
</message>
<message>
<location/>
<source>Core File:</source>
- <translation type="unfinished"></translation>
+ <translation>Core-Datei:</translation>
</message>
</context>
<context>
@@ -42,17 +42,17 @@
<message>
<location filename="../../../src/plugins/debugger/attachexternaldialog.ui"/>
<source>Start Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger starten</translation>
</message>
<message>
<location/>
<source>Attach to Process ID:</source>
- <translation type="unfinished"></translation>
+ <translation>Prozess-Id:</translation>
</message>
<message>
<location/>
<source>Filter:</source>
- <translation type="unfinished">Filter:</translation>
+ <translation>Filter:</translation>
</message>
<message>
<location/>
@@ -60,29 +60,6 @@
<translation>Löschen</translation>
</message>
</context>
-<context>
- <name>AttachRemoteDialog</name>
- <message>
- <location filename="../../../src/plugins/debugger/attachremotedialog.ui"/>
- <source>Start Debugger</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Attach to Process ID:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Filter:</source>
- <translation type="unfinished">Filter:</translation>
- </message>
- <message>
- <location/>
- <source>...</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>BINEditor::Internal::BinEditorPlugin</name>
<message>
@@ -149,7 +126,7 @@
<location line="+404"/>
<location line="+1"/>
<source>Bookmark</source>
- <translation type="unfinished">Lesezeichen</translation>
+ <translation>Lesezeichen</translation>
</message>
<message>
<location line="+45"/>
@@ -161,10 +138,6 @@
<source>Remove</source>
<translation>Entfernen</translation>
</message>
- <message>
- <source>You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue?</source>
- <translation type="obsolete">Beim Löschen eines Ordners wird auch der Inhalt gelöscht.<br>Möchten Sie trotzdem fortsetzen?</translation>
- </message>
<message>
<location line="+110"/>
<location line="+9"/>
@@ -192,32 +165,32 @@
<message>
<location line="+2"/>
<source>Show Bookmark</source>
- <translation type="unfinished">Lesezeichen anzeigen</translation>
+ <translation>Lesezeichen anzeigen</translation>
</message>
<message>
<location line="+1"/>
<source>Show Bookmark in New Tab</source>
- <translation type="unfinished">Lesezeichen in neuem Reiter anzeigen</translation>
+ <translation>Lesezeichen in neuem Reiter anzeigen</translation>
</message>
<message>
<location line="+3"/>
<source>Delete Bookmark</source>
- <translation type="unfinished">Lesezeichen löschen</translation>
+ <translation>Lesezeichen löschen</translation>
</message>
<message>
<location line="+1"/>
<source>Rename Bookmark</source>
- <translation type="unfinished">Lesezeichen umbenennen</translation>
+ <translation>Lesezeichen umbenennen</translation>
</message>
<message>
<location line="+38"/>
<source>Filter:</source>
- <translation type="unfinished">Filter:</translation>
+ <translation>Filter:</translation>
</message>
<message>
<location line="+23"/>
<source>Add</source>
- <translation type="unfinished">Hinzufügen</translation>
+ <translation>Hinzufügen</translation>
</message>
<message>
<location line="+9"/>
@@ -235,12 +208,12 @@
<message>
<location line="+23"/>
<source>&Remove Bookmark</source>
- <translation type="unfinished">Lesezeichen &Löschen</translation>
+ <translation>Lesezeichen &Löschen</translation>
</message>
<message>
<location line="+1"/>
<source>Remove all Bookmarks</source>
- <translation type="unfinished">Alle Lesezeichen löschen</translation>
+ <translation>Alle Lesezeichen löschen</translation>
</message>
</context>
<context>
@@ -322,12 +295,12 @@
<message>
<location filename="../../../src/plugins/debugger/breakbyfunction.ui"/>
<source>Set Breakpoint at Function</source>
- <translation type="unfinished"></translation>
+ <translation>Haltepunkt bei Funktion setzen</translation>
</message>
<message>
<location/>
<source>Function to break on:</source>
- <translation type="unfinished"></translation>
+ <translation>Funktion:</translation>
</message>
</context>
<context>
@@ -335,17 +308,17 @@
<message>
<location filename="../../../src/plugins/debugger/breakcondition.ui"/>
<source>Dialog</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location/>
<source>Condition:</source>
- <translation type="unfinished"></translation>
+ <translation>Bedingung:</translation>
</message>
<message>
<location/>
<source>Ignore count:</source>
- <translation type="unfinished"></translation>
+ <translation>Anhalten erst nach:</translation>
</message>
</context>
<context>
@@ -353,7 +326,7 @@
<message>
<location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+626"/>
<source>&Change</source>
- <translation type="unfinished"></translation>
+ <translation>&Ändern</translation>
</message>
</context>
<context>
@@ -361,7 +334,7 @@
<message>
<location filename="../../../src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp" line="+133"/>
<source>Arguments:</source>
- <translation type="unfinished"></translation>
+ <translation>Argumente:</translation>
</message>
</context>
<context>
@@ -369,32 +342,40 @@
<message>
<location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+255"/>
<source>Run CMake</source>
- <translation type="unfinished"></translation>
+ <translation>CMake ausführen</translation>
</message>
<message>
<location line="+7"/>
<source>Arguments</source>
- <translation type="unfinished"></translation>
+ <translation>Argumente</translation>
</message>
<message>
<location line="+16"/>
<source>The directory %1 does not contain a cbp file. Qt Creator needs to create this file by running cmake. Some projects require command line arguments to the initial cmake call.</source>
- <translation type="unfinished"></translation>
+ <translation>Das Verzeichnis %1 enthält keine cbp-Datei. Qt Creator muss die Datei durch einen cmake-Aufruf erzeugen. Für einige Projekte sind dazu Kommandozeilenargumente erforderlich.</translation>
</message>
<message>
<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>
+ <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 below. Note that cmake remembers command line arguments from the previous runs.</source>
+ <translation>Das Verzeichnis %1 enthält eine veraltetet cbp-Datei. Qt Creator muss die Datei durch einen cmake-Aufruf erneuern. Zusätzliche Für Kommandozeilenargumente können unten angegeben werden. Beachten Sie, dass cmake die Argumente vorangegangener Aufrufe speichert.</translation>
</message>
<message>
<location line="+6"/>
- <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>
+ <source>The directory %1 specified in a build-configuration, 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 previous runs.</source>
+ <translation>Das Verzeichnis %1, was in einer Build-Konfiguration angegeben wurde, enthält keine cbp-Datei. Qt Creator muss die Datei durch einen cmake-Aufruf erzeugen. Für einige Projekte sind dazu Kommandozeilenargumente erforderlich. Beachten Sie, dass cmake die Argumente vorangegangener Aufrufe speichert.</translation>
+ </message>
+ <message>
+ <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 previous runs.</source>
+ <translation type="obsolete">Das Verzeichnis %1, was in einer Build-Konfiguration angegeben wurde, enthält keine cbp-Datei. Qt Creator muss die Datei durch einen cmake-Aufruf erzeugen. Für einige Projekte sind dazu Kommandozeilenargumente erforderlich. Beachten Sie, dass cmake die Argumente vorangegangener Aufrufe speichert.</translation>
+ </message>
+ <message>
+ <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 below. Note that cmake remembers command line arguments from the former runs.</source>
+ <translation type="obsolete">Das Verzeichnis %1 enthält eine veraltetet cbp-Datei. Qt Creator muss die Datei durch einen cmake-Aufruf erneuern. Zusätzliche Für Kommandozeilenargumente können unten angegeben werden. </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>
+ <translation> Qt Creator muss cmake im Build-Verzeichnis aufrufen. Für einige Projekte sind dazu Kommandozeilenargumente erforderlich.</translation>
</message>
</context>
<context>
@@ -403,28 +384,32 @@
<location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+264"/>
<location line="+10"/>
<source>CMake</source>
- <translation type="unfinished"></translation>
+ <translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
<message>
<location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="-108"/>
+ <source>Qt Creator has detected an in-source-build which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
+ <translation>Es wurde ein Build im Quellverzeichnis festgestellt, der Shadow-Builds verhindert. Das Build-Verzeichnis kann nicht in Qt Creator geändert werden. Wenn Sie einen Shadow-Build wünschen, bereinigen Sie bitte das Quellverzeichnis und öffnen Sie das Projekt noch einmal.</translation>
+ </message>
+ <message>
<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>
+ <translation type="obsolete">Es wurde ein In-Source-Build festgestellt. </translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+258"/>
+ <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+156"/>
<source>Additional arguments:</source>
- <translation type="unfinished"></translation>
+ <translation>Zusätzliche Argumente:</translation>
</message>
<message>
<location line="+5"/>
<source>Targets:</source>
- <translation type="unfinished"></translation>
+ <translation>Ziele:</translation>
</message>
</context>
<context>
@@ -432,25 +417,29 @@
<message>
<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>
+ <translation>Bitte geben Sie das Verzeichnis ein, in dem das Projekt erstellt werden soll.</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>
+ <translation>Bitte geben Sie das Verzeichnis ein, in dem das Projekt erstellt werden soll. Es wird empfohlen, nicht das Quellverzeichnis zum Erstellen zu verwenden. Das ermöglicht es, verschiedene Builds mit verschiedenen Einstellungen zu erstellen.</translation>
</message>
<message>
<location line="+8"/>
<source>Build directory:</source>
- <translation type="unfinished"></translation>
+ <translation>Build-Verzeichnis:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::XmlFileUpToDatePage</name>
<message>
<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>Qt Creator hat eine cbp-Datei gefunden, die ausgewertet wird. Im Projektmodus können Sie die Kommandozeilenargumente dazu eingeben. Klicken Sie auf Beenden, um das Projekt zu laden.</translation>
+ </message>
+ <message>
<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>
+ <translation type="obsolete">Qt Creator hat eine cbp-Datei gefunden, die ausgewertet wird. Im Projektmodus können Sie die Kommandozeilenargumente dazu eingeben. Klicken Sie auf Beenden, um das Projekt zu laden.</translation>
</message>
</context>
<context>
@@ -458,46 +447,12 @@
<message>
<location filename="../../../src/libs/cplusplus/OverviewModel.cpp" line="+153"/>
<source><Select Symbol></source>
- <translation type="unfinished"></translation>
+ <translation><Symbol auswählen></translation>
</message>
<message>
<location line="+2"/>
<source><No Symbols></source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>CdbDumperHelper</name>
- <message>
- <location filename="../../../src/plugins/debugger/cdb/cdbdumperhelper.cpp" line="+196"/>
- <source>Loading dumpers...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>The debugger does not appear to be Qt application.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <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="+186"/>
- <source>Querying dumpers for '%1'/'%2' (%3)</source>
- <translation type="unfinished"></translation>
+ <translation><keine Symbole></translation>
</message>
</context>
<context>
@@ -510,61 +465,29 @@
<message>
<location/>
<source>These options take effect at the next start of Qt Creator.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Einstellungen werden beim nächsten Start von Qt Creator wirksam.</translation>
</message>
<message>
<location/>
- <source>CDB</source>
- <translation type="unfinished"></translation>
+ <source>Path to "Debugging Tools for Windows":</source>
+ <translation>Pfad zu den "Debugging Tools for Windows":</translation>
</message>
<message>
<location/>
- <source>Path to "Debugging Tools for Windows":</source>
+ <source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
- <source>TextLabel</source>
- <translation type="unfinished"></translation>
+ <source>Cdb</source>
+ <translation>Cdb</translation>
</message>
</context>
<context>
<name>CentralWidget</name>
<message>
- <location filename="../../../src/plugins/help/centralwidget.cpp" line="+102"/>
- <source>Add new page</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+202"/>
<source>Print Document</source>
- <translation>Dokument drucken</translation>
- </message>
- <message>
- <location line="+109"/>
- <location line="+2"/>
- <source>unknown</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+91"/>
- <source>Add New Page</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Close This Page</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Close Other Pages</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Add Bookmark for this Page...</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Dokument drucken</translation>
</message>
</context>
<context>
@@ -577,17 +500,17 @@
<message>
<location/>
<source>Repository Location:</source>
- <translation type="unfinished"></translation>
+ <translation>Repository:</translation>
</message>
<message>
<location/>
<source>Select</source>
- <translation type="unfinished"></translation>
+ <translation>Auswählen</translation>
</message>
<message>
<location/>
<source>Change:</source>
- <translation type="unfinished"></translation>
+ <translation>Änderung:</translation>
</message>
</context>
<context>
@@ -595,12 +518,12 @@
<message>
<location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+96"/>
<source>&CodePaster</source>
- <translation type="unfinished"></translation>
+ <translation>&CodePaster</translation>
</message>
<message>
<location line="+5"/>
<source>Paste Snippet...</source>
- <translation type="unfinished"></translation>
+ <translation>Ausschnitt einfügen...</translation>
</message>
<message>
<location line="+3"/>
@@ -610,7 +533,7 @@
<message>
<location line="+5"/>
<source>Fetch Snippet...</source>
- <translation type="unfinished"></translation>
+ <translation>Ausschnitt holen...</translation>
</message>
<message>
<location line="+3"/>
@@ -620,7 +543,7 @@
<message>
<location line="+99"/>
<source>Waiting for items</source>
- <translation type="unfinished"></translation>
+ <translation>Warte auf Daten</translation>
</message>
</context>
<context>
@@ -628,12 +551,12 @@
<message>
<location line="+37"/>
<source>CodePaster Error</source>
- <translation type="unfinished"></translation>
+ <translation>CodePaster-Fehler</translation>
</message>
<message>
<location line="+1"/>
<source>Could not fetch code</source>
- <translation type="unfinished"></translation>
+ <translation>Es konnte kein Code abgeholt werden</translation>
</message>
</context>
<context>
@@ -641,12 +564,12 @@
<message>
<location line="+49"/>
<source>CodePaster Error</source>
- <translation type="unfinished"></translation>
+ <translation>CodePaster-Fehler</translation>
</message>
<message>
<location line="+0"/>
<source>Some error occured while posting</source>
- <translation type="unfinished"></translation>
+ <translation>Beim Senden trat ein Fehler auf</translation>
</message>
</context>
<context>
@@ -659,7 +582,7 @@
<message>
<location/>
<source>Paste:</source>
- <translation type="unfinished"></translation>
+ <translation>Ausschnitt:</translation>
</message>
</context>
<context>
@@ -672,22 +595,22 @@
<message>
<location/>
<source>CodePaster Server:</source>
- <translation type="unfinished"></translation>
+ <translation>CodePaster Server:</translation>
</message>
<message>
<location/>
<source>Username:</source>
- <translation type="unfinished"></translation>
+ <translation>Nutzername:</translation>
</message>
<message>
<location/>
<source>Copy Paste URL to clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>Kopiere den URL in die Zwischenablage</translation>
</message>
<message>
<location/>
<source>Display Output Pane after sending a post</source>
- <translation type="unfinished"></translation>
+ <translation>Ausgabepanel nach Senden anzeigen</translation>
</message>
<message>
<location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+62"/>
@@ -697,7 +620,7 @@
<message>
<location line="+10"/>
<source>CodePaster</source>
- <translation type="unfinished"></translation>
+ <translation>CodePaster</translation>
</message>
</context>
<context>
@@ -710,48 +633,53 @@
<message>
<location/>
<source>User interface</source>
- <translation type="unfinished"></translation>
+ <translation>Benutzeroberfläche</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>
+ <translation>Die Quelldatei-Ansicht wird automatisch aktualisiert, was den Start des Debuggers beträchtlich verlangsamen kann.</translation>
</message>
<message>
<location/>
<source>Populate source file view automatically</source>
- <translation type="unfinished"></translation>
+ <translation>Quelldatei-Ansicht wird automatisch aktualisieren</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>
+ <translation>Diese Option bewirkt, dass 'Einzelschritt in' in bestimmten Situationen mehrere Schritte zusammenfaßt, was das Debuggen beschleunigt. Zum Beispiel wird der Code des atomaren Referenzzählung übersprungen; und bei der Emission eines Signals gelangt man zum verbundenen Slot.</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>
+ <translation>Bekannte Stellen beim Einzelschritt überspringen</translation>
</message>
<message>
<location/>
<source>Use tooltips while debugging</source>
- <translation type="unfinished"></translation>
+ <translation>Tooltips beim Debuggen benutzen</translation>
</message>
<message>
<location/>
<source>Maximal stack depth:</source>
- <translation type="unfinished"></translation>
+ <translation>Maximale Stack-Tiefe</translation>
</message>
<message>
<location/>
<source><unlimited></source>
- <translation type="unfinished"></translation>
+ <translation><unbegrenzt></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Use alternating row colors in debug views</source>
+ <translation>Alternierende Farben für Debugansichten benutzen</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Checking this will 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>Diese Option aktiviert Tooltips für Variablen beim Debuggen. Das es das Debuggen verlangsamt und wegen der fehlenden Scope-Information nicht zuverlässig ist, ist es per Vorgabe deaktiviert.</translation>
</message>
</context>
<context>
@@ -764,37 +692,37 @@
<message>
<location/>
<source>Code Completion</source>
- <translation type="unfinished"></translation>
+ <translation>Code-Vervollständigung</translation>
</message>
<message>
<location/>
<source>Do a case-sensitive match for completion items.</source>
- <translation type="unfinished"></translation>
+ <translation>Groß/Kleinschreibung bei Vorschlägen beachten.</translation>
</message>
<message>
<location/>
<source>&Case-sensitive completion</source>
- <translation type="unfinished"></translation>
+ <translation>&Groß/Kleinschreibung beachten</translation>
</message>
<message>
<location/>
<source>Automatically insert (, ) and ; when appropriate.</source>
- <translation type="unfinished"></translation>
+ <translation>(, ), ; automatisch einfügen</translation>
</message>
<message>
<location/>
<source>&Automatically insert braces</source>
- <translation type="unfinished"></translation>
+ <translation>&Geschweifte Klammern automatisch einfügen</translation>
</message>
<message>
<location/>
<source>Insert the common prefix of available completion items.</source>
- <translation type="unfinished"></translation>
+ <translation>Gemeinsamen Präfix der passenden Ergänzungsvorschläge einfügen.</translation>
</message>
<message>
<location/>
<source>Autocomplete common &prefix</source>
- <translation type="unfinished"></translation>
+ <translation>Gemeinsamen &Präfix ergänzen</translation>
</message>
</context>
<context>
@@ -881,13 +809,13 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::EditorManager</name>
<message>
- <location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="+185"/>
- <location line="+1438"/>
+ <location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="+186"/>
+ <location line="+1467"/>
<source>Revert to Saved</source>
<translation>Wiederherstellen</translation>
</message>
<message>
- <location line="-1435"/>
+ <location line="-1464"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
@@ -898,6 +826,12 @@ Sollen sie überschrieben werden?</translation>
</message>
<message>
<location line="+1"/>
+ <location line="+1198"/>
+ <source>Close Others</source>
+ <translation>Andere schließen</translation>
+ </message>
+ <message>
+ <location line="-1197"/>
<source>Next Document in History</source>
<translation>Nächstes Dokument im Verlauf</translation>
</message>
@@ -937,7 +871,7 @@ Sollen sie überschrieben werden?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+13"/>
<source>Alt+Tab</source>
<translation type="unfinished"></translation>
</message>
@@ -989,7 +923,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+5"/>
<source>Split Side by Side</source>
- <translation type="unfinished"></translation>
+ <translation>Nebeneinander teilen</translation>
</message>
<message>
<location line="+3"/>
@@ -1037,7 +971,7 @@ Sollen sie überschrieben werden?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+662"/>
+ <location line="+682"/>
<source>Opening File</source>
<translation>Datei Öffnen</translation>
</message>
@@ -1098,7 +1032,12 @@ Sollen sie überschrieben werden?</translation>
<translation>Schließe %1</translation>
</message>
<message>
- <location line="+266"/>
+ <location line="+3"/>
+ <source>Close All Except %1</source>
+ <translation>Alle außer %1 schließen</translation>
+ </message>
+ <message>
+ <location line="+265"/>
<source>You will lose your current changes if you proceed reverting %1.</source>
<translation>Bei der Wiederherstellung von %1 gehen Ihre derzeitigen Änderungen verloren.</translation>
</message>
@@ -1115,13 +1054,13 @@ Sollen sie überschrieben werden?</translation>
<message>
<location line="+54"/>
<source><table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%f</td><td>file name</td></tr><tr><td>%l</td><td>current line number</td></tr><tr><td>%c</td><td>current column number</td></tr><tr><td>%x</td><td>editor's x position on screen</td></tr><tr><td>%y</td><td>editor's y position on screen</td></tr><tr><td>%w</td><td>editor's width in pixels</td></tr><tr><td>%h</td><td>editor's height in pixels</td></tr><tr><td>%W</td><td>editor's width in characters</td></tr><tr><td>%H</td><td>editor's height in characters</td></tr><tr><td>%%</td><td>%</td></tr></table></source>
- <translation type="unfinished"></translation>
+ <translation><table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expandiert zu</th></tr><tr><td>%f</td><td>file name</td></tr><tr><td>%l</td><td>Zeilennummer</td></tr><tr><td>%c</td><td>Spaltennummer</td></tr><tr><td>%x</td><td>X-Koordinate der Position des Editors</td></tr><tr><td>%y</td><td>Y-Koordinate der Position des Editors</td></tr><tr><td>%w</td><td>Breite des Editors (Pixel)</td></tr><tr><td>%h</td><td>Höhe des Editors (Pixel)</td></tr><tr><td>%W</td><td>Breite des Editors (Zeichen)</td></tr><tr><td>%H</td><td>Höhe des Editors (Zeichen)</td></tr><tr><td>%%</td><td>%</td></tr></table></translation>
</message>
</context>
<context>
<name>Core::FileManager</name>
<message>
- <location filename="../../../src/plugins/coreplugin/filemanager.cpp" line="+303"/>
+ <location filename="../../../src/plugins/coreplugin/filemanager.cpp" line="+305"/>
<source>Can't save file</source>
<translation>Die Datei kann nicht gespeichert werden</translation>
</message>
@@ -1131,7 +1070,7 @@ Sollen sie überschrieben werden?</translation>
<translation>Die Datei '%1' kann nicht gespeichert werden. Wollen Sie trotzdem fortsetzen und Ihre Änderungen aufgeben?</translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+112"/>
<source>Overwrite?</source>
<translation>Ãœberschreiben?</translation>
</message>
@@ -1154,14 +1093,6 @@ Sollen sie überschrieben werden?</translation>
<translation>Aktiviere %1</translation>
</message>
</context>
-<context>
- <name>Core::Internal::CommandPrivate</name>
- <message>
- <location filename="../../../src/plugins/coreplugin/actionmanager/command.cpp" line="+130"/>
- <source>Other</source>
- <translation>Andere</translation>
- </message>
-</context>
<context>
<name>Core::Internal::EditMode</name>
<message>
@@ -1246,7 +1177,7 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::EditorView</name>
<message>
- <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+384"/>
+ <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+406"/>
<location line="+35"/>
<source>Placeholder</source>
<translation>Platzhalter</translation>
@@ -1257,7 +1188,7 @@ Sollen sie überschrieben werden?</translation>
<translation>Schließen</translation>
</message>
<message>
- <location line="+193"/>
+ <location line="+200"/>
<source>Make writable</source>
<translation>Schreibbar machen</translation>
</message>
@@ -1330,7 +1261,7 @@ Sollen sie überschrieben werden?</translation>
<message>
<location filename="../../../src/plugins/coreplugin/mainwindow.cpp" line="+150"/>
<source>Qt Creator</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Creator</translation>
</message>
<message>
<location line="+144"/>
@@ -1661,12 +1592,12 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::SaveItemsDialog</name>
<message>
- <location filename="../../../src/plugins/coreplugin/dialogs/saveitemsdialog.cpp" line="+53"/>
+ <location filename="../../../src/plugins/coreplugin/dialogs/saveitemsdialog.cpp" line="+55"/>
<source>Don't Save</source>
<translation>Nicht speichern</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+44"/>
<source>Save All</source>
<translation>Alle speichern</translation>
</message>
@@ -1738,10 +1669,6 @@ Sollen sie überschrieben werden?</translation>
</context>
<context>
<name>Core::Internal::WelcomeMode</name>
- <message>
- <source> (last session)</source>
- <translation type="obsolete"> (letzte Sitzung)</translation>
- </message>
<message>
<location filename="../../../src/plugins/coreplugin/welcomemode.cpp" line="+123"/>
<source>Welcome</source>
@@ -1780,7 +1707,7 @@ p {
<p><strong>Started</strong> to begin developing with Qt Creator.</p>
<hr style="margin-top:15px"/>
</source>
- <translation><style>
+ <translation type="unfinished"><style>
h1 {
font-size: 24px;
font-weight: normal;
@@ -1798,11 +1725,12 @@ p {
<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>Schnelleinstieg</strong>,</p>
-<p> um die Entwicklung mit Qt Creator zu beginnen.</p>
+<p>Qt Creator ist eine plattformübergreifende, moderne und intuitive</p>
+<p>Entwicklungsumgebung, die es Entwicklern ermöglicht,</p>
+<p>graphisch ansprechende Anwendungen für die Bereiche</p>
+<p>Desktop und Embedded sowie mobile Geräte zu erstellen.</p>
+<p>Klicken Sie auf <strong>Schnelleinstieg</strong>, um die Entwicklung</p>
+<p> mit Qt Creator zu beginnen.</p>
<hr style="margin-top:15px"/></translation>
</message>
<message>
@@ -1948,80 +1876,57 @@ p {
<context>
<name>Core::Utils::ConsoleProcess</name>
<message>
- <source>Cannot set up comm channel: %1</source>
- <translation type="obsolete">Es konnte kein Kommunikationskanal hergestellt werden: %1</translation>
- </message>
- <message>
- <source>Cannot create temp file: %1</source>
- <translation type="obsolete">Es konnte keine temporäre Datei erstellt werden: %1</translation>
- </message>
- <message>
- <location filename="../../../src/libs/utils/consoleprocess_unix.cpp" line="+74"/>
- <location filename="../../../src/libs/utils/consoleprocess_win.cpp" line="+72"/>
+ <location filename="../../../src/libs/utils/consoleprocess.cpp" line="+50"/>
<source>Cannot set up communication channel: %1</source>
<translation>Es konnte kein Kommunikationskanal hergestellt werden: %1</translation>
</message>
<message>
- <location line="+8"/>
- <location line="+66"/>
- <location filename="../../../src/libs/utils/consoleprocess_win.cpp" line="+8"/>
+ <location line="+12"/>
<source>Cannot create temporary file: %1</source>
<translation>Es konnte keine temporäre Datei erstellt werden: %1</translation>
</message>
<message>
- <location line="-45"/>
- <location filename="../../../src/libs/utils/consoleprocess_win.cpp" line="+30"/>
+ <location line="-5"/>
<source>Press <RETURN> to close this window...</source>
<translation>Betätigen Sie die <RETURN> Taste, um das Fenster zu schließen...</translation>
</message>
<message>
- <location line="+9"/>
+ <location filename="../../../src/libs/utils/consoleprocess_unix.cpp" line="+111"/>
<source>Cannot start the terminal emulator '%1'.</source>
<translation>Der Terminal-Emulator '%1' konnte nicht gestartet werden.</translation>
</message>
<message>
- <location line="+44"/>
+ <location filename="../../../src/libs/utils/consoleprocess.cpp" line="+10"/>
<source>Cannot create temporary directory '%1': %2</source>
<translation>Das temporäre Verzeichnis '%1' konnte nicht erstellt werden: %2</translation>
</message>
<message>
- <location line="+5"/>
+ <location filename="../../../src/libs/utils/consoleprocess_unix.cpp" line="+49"/>
<source>Cannot create socket '%1': %2</source>
<translation>Der Socket '%1' konnte nicht erstellt werden: %2</translation>
</message>
<message>
- <location line="+32"/>
- <location filename="../../../src/libs/utils/consoleprocess_win.cpp" line="+73"/>
+ <location filename="../../../src/libs/utils/consoleprocess.cpp" line="+10"/>
<source>Cannot change to working directory '%1': %2</source>
<translation>Es konnte nicht zum Arbeitsverzeichnis '%1' gewechselt werden: %2</translation>
</message>
<message>
- <location line="+3"/>
- <location filename="../../../src/libs/utils/consoleprocess_win.cpp" line="+3"/>
+ <location line="+5"/>
<source>Cannot execute '%1': %2</source>
<translation>Das Kommando '%1' konnte nicht ausgeführt werden: %2</translation>
</message>
<message>
- <source>Cannot start terminal emulator %1.</source>
- <translation type="obsolete">E</translation>
- </message>
- <message>
- <source>Cannot create temporary file: %2</source>
- <translation type="obsolete">Es konnte keine temporäre Datei erstellt werden: %1</translation>
- </message>
- <message>
- <location line="+20"/>
- <location filename="../../../src/libs/utils/consoleprocess_win.cpp" line="+21"/>
+ <location line="-10"/>
<source>Unexpected output from helper program.</source>
<translation>Die Ausgabe des Hilfsprogrammes kann nicht ausgewertet werden.</translation>
</message>
<message>
- <location filename="../../../src/libs/utils/consoleprocess_win.cpp" line="-81"/>
+ <location filename="../../../src/libs/utils/consoleprocess_win.cpp" line="+125"/>
<source>The process '%1' could not be started: %2</source>
<translation>Der Prozess '%1; konnte nicht gestartet werden: %2</translation>
</message>
<message>
- <location line="+72"/>
+ <location line="+70"/>
<source>Cannot obtain a handle to the inferior: %1</source>
<translation>Der zu debuggende Prozess konnte nicht angesprochen werden: %1</translation>
</message>
@@ -2421,7 +2326,7 @@ p {
<context>
<name>CppTools</name>
<message>
- <location filename="../../../src/plugins/cpptools/cpptoolsconstants.h" line="+51"/>
+ <location filename="../../../src/plugins/cpptools/cpptoolsconstants.h" line="+52"/>
<source>File naming conventions</source>
<translation>Konventionen für die Bildung von Dateinamen</translation>
</message>
@@ -2502,61 +2407,53 @@ p {
<message>
<location filename="../../../src/plugins/debugger/debuggerconstants.h" line="+56"/>
<source>Common</source>
- <translation type="unfinished"></translation>
+ <translation>Allgemein</translation>
</message>
<message>
<location line="+1"/>
<source>Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+364"/>
+ <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+365"/>
<source><Encoding error></source>
- <translation type="unfinished"></translation>
+ <translation><Encoding-Fehler></translation>
</message>
</context>
<context>
<name>Debugger::Internal::AttachCoreDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+131"/>
+ <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+133"/>
<source>Select Executable</source>
- <translation type="unfinished"></translation>
+ <translation>Ausführbare Datei auswählen</translation>
</message>
<message>
<location line="+3"/>
<source>Select Core File</source>
- <translation type="unfinished"></translation>
+ <translation>Core-Datei auswählen</translation>
</message>
</context>
<context>
<name>Debugger::Internal::AttachExternalDialog</name>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Process ID</source>
- <translation type="unfinished"></translation>
+ <translation>Prozess-Id'</translation>
</message>
<message>
<location line="+1"/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Name</translation>
</message>
<message>
<location line="+1"/>
<source>State</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+163"/>
- <source>Refresh</source>
- <translation type="unfinished">Aktualisieren</translation>
+ <translation>Status</translation>
</message>
-</context>
-<context>
- <name>Debugger::Internal::AttachRemoteDialog</name>
<message>
- <location line="+81"/>
+ <location line="+165"/>
<source>Refresh</source>
- <translation type="unfinished">Aktualisieren</translation>
+ <translation>Aktualisieren</translation>
</message>
</context>
<context>
@@ -2569,7 +2466,7 @@ p {
<message>
<location line="+0"/>
<source>Function</source>
- <translation type="unfinished"></translation>
+ <translation>Funktion</translation>
</message>
<message>
<location line="+0"/>
@@ -2579,75 +2476,75 @@ p {
<message>
<location line="+0"/>
<source>Line</source>
- <translation type="unfinished"></translation>
+ <translation>Datei</translation>
</message>
<message>
<location line="+1"/>
<source>Condition</source>
- <translation type="unfinished"></translation>
+ <translation>Bedingung</translation>
</message>
<message>
<location line="+0"/>
<source>Ignore</source>
- <translation type="unfinished"></translation>
+ <translation>Anhalten nach</translation>
</message>
<message>
<location line="+57"/>
<source>Breakpoint will only be hit if this condition is met.</source>
- <translation type="unfinished"></translation>
+ <translation>Der Haltepunkt wird nur ausgelöst, wenn die Bedingung erfüllt ist.</translation>
</message>
<message>
<location line="+6"/>
<source>Breakpoint will only be hit after being ignored so many times.</source>
- <translation type="unfinished"></translation>
+ <translation>Der Haltepunkt wird ausgelöst, nachdem er vorherh so viele Male übersprungen wurde.</translation>
</message>
</context>
<context>
<name>Debugger::Internal::BreakWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/breakwindow.cpp" line="+52"/>
+ <location filename="../../../src/plugins/debugger/breakwindow.cpp" line="+55"/>
<source>Breakpoints</source>
- <translation type="unfinished"></translation>
+ <translation>Haltepunkte</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+30"/>
<source>Delete breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Haltepunkt löschen</translation>
</message>
<message>
<location line="+2"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
<message>
<location line="+1"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
<message>
<location line="+3"/>
<source>Edit condition...</source>
- <translation type="unfinished"></translation>
+ <translation>Bedingung ändern</translation>
</message>
<message>
<location line="+2"/>
<source>Synchronize breakpoints</source>
- <translation type="unfinished"></translation>
+ <translation>Haltepunkte synchronisieren</translation>
</message>
<message>
<location line="+2"/>
<source>Disable breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Haltepunkt deaktivieren</translation>
</message>
<message>
<location line="+0"/>
<source>Enable breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Haltepunkt aktivieren</translation>
</message>
<message>
<location line="+47"/>
<source>Conditions on Breakpoint %1</source>
- <translation type="unfinished"></translation>
+ <translation>Bedingungen des Haltepunkts %1</translation>
</message>
</context>
<context>
@@ -2655,77 +2552,147 @@ p {
<message>
<location filename="../../../src/plugins/debugger/cdb/cdbdebugengine.cpp" line="+124"/>
<source>Unable to load the debugger engine library '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Die Debugger-Bibliothek konnte '%1' nicht geladen werden: %2</translation>
</message>
<message>
<location line="+110"/>
<source>Unable to resolve '%1' in the debugger engine library '%2'</source>
- <translation type="unfinished"></translation>
+ <translation>'%1' konnte in der Debugger-Bibliothek '%2' nicht gefunden werden</translation>
</message>
<message>
<location line="+229"/>
<source>The dumper library '%1' does not exist.</source>
- <translation type="unfinished"></translation>
+ <translation>Es existiert keine Ausgabe-Hilfsbibliothek '%1'.</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+25"/>
<source>The console stub process was unable to start '%1'.</source>
- <translation type="unfinished"></translation>
+ <translation>Der Konsolenprozess konnte '%1' nicht ausführen.</translation>
</message>
<message>
- <location line="+6"/>
- <source>CdbDebugEngine: Attach to core not supported!</source>
- <translation type="unfinished"></translation>
+ <location line="+8"/>
+ <source>Attaching to core files is not supported!</source>
+ <translation>Das Debuggen von Core-Dateien wird nicht unterstützt!</translation>
</message>
<message>
<location line="+4"/>
- <source>Debugger Running</source>
- <translation type="unfinished"></translation>
+ <source>Debugger running</source>
+ <translation>Debugger läuft</translation>
</message>
<message>
- <location line="+17"/>
- <source>AttachProcess failed for pid %1: %2</source>
- <translation type="unfinished"></translation>
+ <location line="+18"/>
+ <source>Attaching to a process failed for process id %1: %2</source>
+ <translation>Der Debugger konnte sich nicht an den Prozess %1 anhängen: %2</translation>
+ </message>
+ <message>
+ <source>Attaching to a process failed for process id %1: %2</source>
+ <translation type="obsolete">Der Debugger konnte sich nicht an den Prozess %1 anhängen: %2</translation>
</message>
<message>
<location line="+43"/>
- <source>CreateProcess2Wide failed for '%1': %2</source>
- <translation type="unfinished"></translation>
+ <source>Unable to create a process '%1': %2</source>
+ <translation>Es konnte kein Prozess mit '%1' gestartet werden: %2</translation>
</message>
<message>
- <location line="+480"/>
+ <source>Debugger Running</source>
+ <translation type="obsolete">Debugger läuft</translation>
+ </message>
+ <message>
+ <source>AttachProcess failed for pid %1: %2</source>
+ <translation type="obsolete">Der Debugger konnte sich nicht an den Prozess %1 anhängen: %2</translation>
+ </message>
+ <message>
+ <location line="+465"/>
<source>Unable to assign the value '%1' to '%2': %3</source>
- <translation type="unfinished"></translation>
+ <translation>Der Wert '%1' konnte nicht an '%2' zugewiesen werden: %3</translation>
</message>
<message>
- <location line="+226"/>
+ <location line="+218"/>
<source>Cannot retrieve symbols while the debuggee is running.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Symbole können nicht bestimmt werden, solange die zu debuggende Anwendung läuft.</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+85"/>
<location line="+6"/>
<source>Debugger Error</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger-Fehler</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::CdbDumperHelper</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/cdb/cdbdumperhelper.cpp" line="+191"/>
+ <source>injection</source>
+ <translation>Injektion</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>debugger call</source>
+ <translation>Debuggeraufruf</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Loading the custom dumper library '%1' (%2) ...</source>
+ <translation>Ausgabe-Hilfsbibliothek '%1' wird geladen (%2)...</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Loading of the custom dumper library '%1' (%2) failed: %3</source>
+ <translation>Das Laden der Ausgabe-Hilfsbibliothek '%1' (%2) schlug fehl: %3</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Loaded the custom dumper library '%1' (%2).</source>
+ <translation>Die Ausgabe-Hilfsbibliothek '%1' (%2) wurde geladen.</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Disabling dumpers due to debuggee crash...</source>
+ <translation>Ausgabe-Hilfsbibliothek deaktiviert wegen Absturz der zu debuggenden Anwendung...</translation>
+ </message>
+ <message>
+ <location line="+111"/>
+ <source>The debuggee does not appear to be Qt application.</source>
+ <translation>Die zu debuggende Anwendung scheint nicht Qt zu benutzen.</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Initializing dumpers...</source>
+ <translation>Ausgabe-Hilfsbibliothek initialisieren...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom dumper library initialized.</source>
+ <translation>Ausgabe-Hilfsbibliothek wurde initialisiert.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The custom dumper library could not be initialized: %1</source>
+ <translation>Die Ausgabe-Hilfsbibliothek konnte nicht initialisiert werden: %1</translation>
+ </message>
+ <message>
+ <location line="+189"/>
+ <source>Querying dumpers for '%1'/'%2' (%3)</source>
+ <translation>Abfrage der Ausgabe-Hilfsbibliothek für '%1'/'%2' (%3)</translation>
</message>
</context>
<context>
<name>Debugger::Internal::CdbOptionsPageWidget</name>
<message>
<location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="+37"/>
- <source>CDB</source>
- <translation type="unfinished"></translation>
+ <source>Cdb</source>
+ <translation>Cdb</translation>
</message>
<message>
<location line="+10"/>
<source>Autodetect</source>
- <translation type="unfinished"></translation>
+ <translation>Suchen</translation>
</message>
</context>
<context>
<name>Debugger::Internal::DebugMode</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+182"/>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+184"/>
<source>Debug</source>
<translation>Debuggen</translation>
</message>
@@ -2733,33 +2700,18 @@ p {
<context>
<name>Debugger::Internal::DebuggerManager</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+298"/>
- <source>Start and Debug External Application...</source>
- <translation>Debugge externe Anwendung...</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Attach to Running External Application...</source>
- <translation>Debugge externe, laufende Anwendung...</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Attach to Core...</source>
- <translation>Debugge core-Datei</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+308"/>
<source>Continue</source>
<translation>Fortsetzen</translation>
</message>
<message>
<location line="+4"/>
- <location line="+942"/>
+ <location line="+945"/>
<source>Interrupt</source>
<translation>Anhalten</translation>
</message>
<message>
- <location line="-938"/>
+ <location line="-941"/>
<source>Reset Debugger</source>
<translation>Debugger zurücksetzen</translation>
</message>
@@ -2821,10 +2773,10 @@ p {
<message>
<location line="+3"/>
<source>Add to Watch Window</source>
- <translation>Zu Watch-Fenster hinzufügen</translation>
+ <translation>Zu Überwachten Ausdrücken hinzufügen</translation>
</message>
<message>
- <location line="+228"/>
+ <location line="+225"/>
<source>Stop requested...</source>
<translation>Stop angefordert...</translation>
</message>
@@ -2845,92 +2797,117 @@ p {
<translation>Läuft...</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+108"/>
<location line="+23"/>
<source>Changing breakpoint state requires either a fully running or fully stopped application.</source>
- <translation type="unfinished"></translation>
+ <translation>Das Ändern des Haltepunkt-Status erfordert, dass die Anwendung läuft oder vollständig gestoppt ist.</translation>
</message>
<message>
- <location line="+97"/>
+ <location line="+81"/>
<source>Debugging VS executables is not supported.</source>
- <translation type="unfinished"></translation>
+ <translation>Das Debuggen von mit VS erzeugten ausführbaren Dateien wird nicht unterstützt.</translation>
</message>
<message>
- <location line="+58"/>
- <location line="+60"/>
+ <location line="+63"/>
+ <location line="+90"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
- <location line="-59"/>
+ <location line="-89"/>
<source>Cannot attach to PID 0</source>
- <translation type="unfinished"></translation>
+ <translation>Der Debugger kann nicht an die Prozess-Id 0 angehängt werden</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+90"/>
<source>Cannot debug '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>'%1' kann nicht debuggt werden: %2</translation>
</message>
<message>
- <location line="+182"/>
+ <location line="+179"/>
<source>Save Debugger Log</source>
<translation>Debugger Log speichern</translation>
</message>
<message>
- <location line="+112"/>
+ <location line="+103"/>
<source>Stop Debugger</source>
<translation>Debugger anhalten</translation>
</message>
<message>
- <location line="+271"/>
+ <location line="+273"/>
<source>Open Qt preferences</source>
<translation>Qt-Versionseinstellungen öffnen</translation>
</message>
<message>
<location line="+1"/>
<source>Turn helper usage off</source>
- <translation type="unfinished"></translation>
+ <translation>Ausgabe-Hilfsbibliothek deaktivieren</translation>
</message>
<message>
<location line="+1"/>
<source>Continue anyway</source>
- <translation type="unfinished"></translation>
+ <translation>Trotzdem fortsetzen</translation>
</message>
<message>
<location line="+2"/>
<source>Debugging helper missing</source>
- <translation type="unfinished"></translation>
+ <translation>Ausgabe-Hilfsbibliothek nicht gefunden</translation>
</message>
<message>
<location line="+1"/>
<source>The debugger did not find the debugging helper library.</source>
- <translation type="unfinished"></translation>
+ <translation>Der Debugger konnte die Ausgabe-Hilfsbibliothek nicht finden.</translation>
</message>
<message>
<location line="+1"/>
+ <source>The debugging helper is used to nicely format the values of Qt data types and some STL data types. It must be compiled for each Qt version which you can do in the Qt preferences page by selecting a Qt installation and clicking on 'Rebuild' for the debugging helper.</source>
+ <translation>Die Ausgabe-Hilfsbibliothek dient zur Ausgabe der Qt- und einiger STL-spezifischen Datentypen. Sie muss mit jeder benutzten Qt-Version compiliert werden. Das geschieht in der Seite 'Qt-Einstellungen' durch Auswahl der Qt-Installation und Klicken auf 'Erstellen' für die Ausgabe-Hilfsbibliothek.</translation>
+ </message>
+ <message>
<source>The debugging helper is used to nicely format the values of Qt data types and some STL data types. It must be compiled for each Qt version, you can do this in the Qt preferences page by selecting a Qt installation and clicking on 'Rebuild' for the debugging helper.</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Die Ausgabe-Hilfsbibliothek dient zur Ausgabe der Qt- und einiger STL-spezifischen Datentypen. Sie muss mit jeder benutzten Qt-Version compiliert werden. Das geschieht in der Seite 'Qt-Einstellungen' durch Auswahl der Qt-Installation und Klicken auf 'Erstellen' für die Ausgabe-Hilfsbibliothek.</translation>
</message>
</context>
<context>
<name>Debugger::Internal::DebuggerOutputWindow</name>
<message>
<location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="+210"/>
- <source>Gdb</source>
- <translation type="unfinished"></translation>
+ <source>Debugger</source>
+ <translation>Debugger</translation>
</message>
</context>
<context>
<name>Debugger::Internal::DebuggerPlugin</name>
<message>
- <source>Toggle Breakpoint</source>
- <translation type="obsolete">Haltepunkt umschalten</translation>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+287"/>
+ <source>Start and Debug External Application...</source>
+ <translation>Debugge externe Anwendung...</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+307"/>
- <source>Stop Debugger/Interrupt Debugger</source>
+ <location line="+5"/>
+ <source>Attach to Running External Application...</source>
+ <translation>Debugge externe, laufende Anwendung...</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Attach to Core...</source>
+ <translation>Debugge core-Datei</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Start and Attach to Remote Application...</source>
+ <translation>An entfernte Anwendung anhängen...</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Detach debugger</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+37"/>
+ <source>Stop Debugger/Interrupt Debugger</source>
+ <translation>Debugger anhalten/unterbrechen</translation>
+ </message>
<message>
<location line="+7"/>
<source>Reset Debugger</source>
@@ -2939,48 +2916,48 @@ p {
<message>
<location line="+87"/>
<source>&Views</source>
- <translation type="unfinished"></translation>
+ <translation>&Ansichten</translation>
</message>
<message>
<location line="+3"/>
<source>Locked</source>
- <translation type="unfinished"></translation>
+ <translation>Verankert</translation>
</message>
<message>
<location line="+15"/>
<source>Reset to default layout</source>
- <translation type="unfinished"></translation>
+ <translation>Vorgabe wiederherstellen</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+87"/>
<source>Threads:</source>
- <translation type="unfinished"></translation>
+ <translation>Threads:</translation>
</message>
<message>
- <location line="+155"/>
+ <location line="+158"/>
<source>Remove Breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Haltepunkt löschen</translation>
</message>
<message>
<location line="+8"/>
<source>Disable Breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Haltepunkt deaktivieren</translation>
</message>
<message>
<location line="+2"/>
<source>Enable Breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Haltepunkt aktivieren</translation>
</message>
<message>
<location line="+7"/>
<source>Set Breakpoint</source>
- <translation type="unfinished"></translation>
+ <translation>Haltepunkt setzen</translation>
</message>
</context>
<context>
<name>Debugger::Internal::DebuggerRunner</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+72"/>
+ <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+73"/>
<source>Debug</source>
<translation>Debuggen</translation>
</message>
@@ -2988,137 +2965,142 @@ p {
<context>
<name>Debugger::Internal::DebuggerSettings</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggeractions.cpp" line="+111"/>
+ <location filename="../../../src/plugins/debugger/debuggeractions.cpp" line="+112"/>
<source>Debugger properties...</source>
- <translation type="unfinished"></translation>
+ <translation>Debuggereinstellungen...</translation>
</message>
<message>
<location line="+7"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
<message>
<location line="+4"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+4"/>
+ <source>Use alternating row colors</source>
+ <translation>Alternierende Farben für Zeilen benutzen</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Watch expression "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Ãœberwachter Ausdruck "%1"</translation>
</message>
<message>
<location line="+4"/>
<source>Remove watch expression "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Überwachten Ausdruck "%1" löschen</translation>
</message>
<message>
<location line="+4"/>
<source>Watch expression "%1" in separate window</source>
- <translation type="unfinished"></translation>
+ <translation>Ãœberwachter Ausdruck "%1" in separatem Fenster</translation>
</message>
<message>
<location line="+10"/>
<source>Expand item</source>
- <translation type="unfinished"></translation>
+ <translation>Aufklappen</translation>
</message>
<message>
<location line="+4"/>
<source>Collapse item</source>
- <translation type="unfinished"></translation>
+ <translation>Zuklappen</translation>
</message>
<message>
<location line="+9"/>
<source>Use debugging helper</source>
- <translation type="unfinished"></translation>
+ <translation>Ausgabe-Hilfsbibliothek benutzen</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>Debug debugging helper</source>
- <translation type="unfinished"></translation>
+ <translation>Debug-Version der Ausgabe-Hilfsbibliothek</translation>
</message>
<message>
<location line="+6"/>
<source>Recheck debugging helper availability</source>
- <translation type="unfinished"></translation>
+ <translation>Verfügbarkeit der Ausgabe-Hilfsbibliothek prüfen</translation>
</message>
<message>
<location line="+7"/>
- <source>Syncronize breakpoints</source>
- <translation type="unfinished"></translation>
+ <source>Synchronize breakpoints</source>
+ <translation>Haltepunkte synchronisieren</translation>
</message>
<message>
<location line="+12"/>
<source>Hexadecimal</source>
- <translation type="unfinished"></translation>
+ <translation>Hexadezimal</translation>
</message>
<message>
<location line="+9"/>
<source>Decimal</source>
- <translation type="unfinished"></translation>
+ <translation>Dezimal</translation>
</message>
<message>
<location line="+8"/>
<source>Octal</source>
- <translation type="unfinished"></translation>
+ <translation>Oktal</translation>
</message>
<message>
<location line="+8"/>
<source>Binary</source>
- <translation type="unfinished"></translation>
+ <translation>Binär</translation>
</message>
<message>
<location line="+8"/>
<source>Raw</source>
- <translation type="unfinished"></translation>
+ <translation>Rohformat</translation>
</message>
<message>
<location line="+8"/>
<source>Natural</source>
- <translation type="unfinished"></translation>
+ <translation>Natürliches Format</translation>
</message>
<message>
<location line="+25"/>
<source>Automatically quit debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger automatisch beenden</translation>
</message>
<message>
<location line="+6"/>
<source>Use tooltips when debugging</source>
- <translation type="unfinished"></translation>
+ <translation>Tooltips beim Debuggen benutzen</translation>
</message>
<message>
<location line="+6"/>
<source>List source files</source>
- <translation type="unfinished"></translation>
+ <translation>Quelldateien anzeigen</translation>
</message>
<message>
<location line="+6"/>
<source>Skip known frames</source>
- <translation type="unfinished"></translation>
+ <translation>Bekannte Stellen überspringen</translation>
</message>
<message>
<location line="+27"/>
<source>Reload full stack</source>
- <translation type="unfinished"></translation>
+ <translation>Stack vollständig neu laden</translation>
</message>
<message>
<location line="+4"/>
<source>Execute line</source>
- <translation type="unfinished"></translation>
+ <translation>Zeile ausführen</translation>
</message>
</context>
<context>
<name>Debugger::Internal::DebuggingHelperOptionPage</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-545"/>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-585"/>
<source>Debugging Helper</source>
- <translation type="unfinished"></translation>
+ <translation>Ausgabe-Hilfsbibliothek</translation>
</message>
<message>
<location line="+23"/>
<source>Choose DebuggingHelper Location</source>
- <translation type="unfinished"></translation>
+ <translation>Pfad zur Ausgabe-Hilfsbibliothek einstellen</translation>
</message>
<message>
<location line="+28"/>
@@ -3131,184 +3113,217 @@ p {
<message>
<location filename="../../../src/plugins/debugger/disassemblerhandler.cpp" line="+135"/>
<source>Address</source>
- <translation type="unfinished"></translation>
+ <translation>Adresse</translation>
</message>
<message>
<location line="+1"/>
<source>Symbol</source>
- <translation type="unfinished"></translation>
+ <translation>Symbol</translation>
</message>
<message>
<location line="+1"/>
<source>Mnemonic</source>
- <translation type="unfinished"></translation>
+ <translation>Kürzel</translation>
</message>
</context>
<context>
<name>Debugger::Internal::DisassemblerWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/disassemblerwindow.cpp" line="+45"/>
+ <location filename="../../../src/plugins/debugger/disassemblerwindow.cpp" line="+46"/>
<source>Disassembler</source>
- <translation type="unfinished"></translation>
+ <translation>Disassembler</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
<message>
<location line="+1"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
<message>
<location line="+4"/>
<source>Reload disassembler listing</source>
- <translation type="unfinished"></translation>
+ <translation>Dissambler neu laden</translation>
</message>
<message>
<location line="+1"/>
<source>Always reload disassembler listing</source>
- <translation type="unfinished"></translation>
+ <translation>Dissambler immer neu laden</translation>
</message>
</context>
<context>
<name>Debugger::Internal::GdbEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/gdbengine.cpp" line="+273"/>
+ <location filename="../../../src/plugins/debugger/gdbengine.cpp" line="+208"/>
<source>The Gdb process failed to start. Either the invoked program '%1' is missing, or you may have insufficient permissions to invoke the program.</source>
- <translation type="unfinished"></translation>
+ <translation>Der Start des Gdb-Prozesses schlug fehl. Entweder fehlt die ausführbare Datei '%1' oder die Berechtigungen sind nicht ausreichend.</translation>
</message>
<message>
<location line="+6"/>
<source>The Gdb process crashed some time after starting successfully.</source>
- <translation type="unfinished"></translation>
+ <translation>Der Gdb-Prozess ist einige Zeit nach dem Start abgestürzt.</translation>
</message>
<message>
<location line="+4"/>
+ <location line="+39"/>
<source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
- <translation type="unfinished"></translation>
+ <translation>Zeitüberschreitung bei der letzten waitFor...()-Funktion. Der Status des QProcess ist unverändert, und waitFor...() kann nocheinmal gerufen.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-34"/>
<source>An error occurred when attempting to write to the Gdb process. For example, the process may not be running, or it may have closed its input channel.</source>
- <translation type="unfinished"></translation>
+ <translation>Ein Fehler trat beim Versuch des Schreibens zum Gdb-Process auf. Wahrscheinlich läuft der Prozess nicht, oder hat seinen Eingabekanal geschlossen.</translation>
</message>
<message>
<location line="+5"/>
<source>An error occurred when attempting to read from the Gdb process. For example, the process may not be running.</source>
- <translation type="unfinished"></translation>
+ <translation>Ein Fehler trat beim Versuch des Lesens vom Gdb-Process auf. Wahrscheinlich läuft der Prozess nicht.</translation>
</message>
<message>
<location line="+4"/>
<source>An unknown error in the Gdb process occurred. This is the default return value of error().</source>
- <translation type="unfinished"></translation>
+ <translation>Es trat ein unbekannter Fehler im Gdb-Prozess auf.</translation>
</message>
<message>
<location line="+5"/>
- <location line="+1139"/>
- <location line="+20"/>
+ <location line="+39"/>
+ <location line="+970"/>
+ <location line="+19"/>
+ <location line="+407"/>
<source>Error</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler</translation>
</message>
<message>
- <location line="-1045"/>
+ <location line="-1272"/>
<source>Library %1 loaded.</source>
- <translation type="unfinished"></translation>
+ <translation>Bibliothek %1 geladen.</translation>
</message>
<message>
<location line="+6"/>
<source>Library %1 unloaded.</source>
- <translation type="unfinished"></translation>
+ <translation>Bibliothek %1 entladen.</translation>
</message>
<message>
<location line="+4"/>
<source>Thread group %1 created.</source>
- <translation type="unfinished"></translation>
+ <translation>Thread-Gruppe %1 erzeugt.</translation>
</message>
<message>
<location line="+4"/>
<source>Thread %1 created.</source>
- <translation type="unfinished"></translation>
+ <translation>Thread-Gruppe %1 erzeugt.</translation>
</message>
<message>
<location line="+4"/>
<source>Thread group %1 exited.</source>
- <translation type="unfinished"></translation>
+ <translation>Thread-Gruppe %1 beendet.</translation>
</message>
<message>
<location line="+5"/>
<source>Thread %1 in group %2 exited.</source>
- <translation type="unfinished"></translation>
+ <translation>Thread %1 in Gruppe %2 beendet.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Thread %1 selected.</source>
+ <translation>Thread %1 ausgewählt.</translation>
+ </message>
+ <message>
+ <location line="+126"/>
+ <source>Debugger Error</source>
+ <translation>Debugger-Fehler</translation>
+ </message>
+ <message>
+ <location line="+112"/>
+ <source>Stopping temporarily.</source>
+ <translation>Temporär Anhalten.</translation>
+ </message>
+ <message>
+ <location line="+74"/>
+ <source>Continuing after temporary stop.</source>
+ <translation>Fortsetzen nach temporären Anhalten.</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Core file loaded.</source>
+ <translation>Core-Datei geladen.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Thread %1 selected.</source>
+ <location line="-509"/>
+ <source>The upload process failed to start. Either the invoked script '%1' is missing, or you may have insufficient permissions to invoke the program.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
- <source>Reading </source>
+ <location line="+6"/>
+ <source>The upload process crashed some time after starting successfully.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+104"/>
- <source>Debugger Error</source>
+ <location line="+9"/>
+ <source>An error occurred when attempting to write to the upload process. For example, the process may not be running, or it may have closed its input channel.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+104"/>
- <source>Stopping temporarily.</source>
+ <location line="+5"/>
+ <source>An error occurred when attempting to read from the upload process. For example, the process may not be running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+130"/>
- <source>Continuing after temporary stop.</source>
+ <location line="+4"/>
+ <source>An unknown error in the upload process occurred. This is the default return value of error().</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+118"/>
- <source>Core file loaded.</source>
+ <location line="+180"/>
+ <source>Reading %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+153"/>
+ <location line="+422"/>
<source>Jumped. Stopped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+19"/>
- <location line="+243"/>
+ <location line="+25"/>
+ <location line="+241"/>
<source>Run to Function finished. Stopped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-127"/>
- <source>Temporarily stopped.</source>
+ <location line="-161"/>
+ <source>Program exited with exit code %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Program exited after receiving signal %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <source>Handling queued commands.</source>
+ <location line="+3"/>
+ <source>Program exited normally</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+48"/>
<source>Loading %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+55"/>
<source>Stopped at breakpoint.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+30"/>
<source>Stopped: "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+99"/>
<source>The debugger you are using identifies itself as:</source>
<translation type="unfinished"></translation>
</message>
@@ -3320,19 +3335,28 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+30"/>
- <location line="+20"/>
+ <location line="+29"/>
+ <location line="+19"/>
<source>Starting executable failed:
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-10"/>
<source>Running...</source>
- <translation>Läuft...</translation>
+ <translation type="obsolete">Läuft...</translation>
+ </message>
+ <message>
+ <location line="-248"/>
+ <source>Processing queued commands.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+97"/>
+ <source>Stopped.</source>
+ <translation>Angehalten.</translation>
</message>
<message>
- <location line="+139"/>
+ <location line="+299"/>
<location line="+27"/>
<source>Debugger Startup Failure</source>
<translation type="unfinished"></translation>
@@ -3358,7 +3382,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+71"/>
<source>Cannot find debugger initialization script</source>
<translation type="unfinished"></translation>
</message>
@@ -3368,17 +3392,22 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+87"/>
+ <location line="+93"/>
<source>Attached to running process. Stopped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+55"/>
+ <source>Connecting to remote server failed:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
<source>Debugger exited.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+632"/>
+ <location line="+623"/>
<source><could not retreive module information></source>
<translation type="unfinished"></translation>
</message>
@@ -3388,34 +3417,46 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+91"/>
- <location line="+82"/>
+ <location line="+61"/>
+ <source><unknown></source>
+ <extracomment>End address of loaded module</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <location line="+83"/>
<source>Retrieving data for stack view...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+187"/>
+ <location line="+188"/>
<source>'%1' contains no identifier</source>
- <translation type="unfinished"></translation>
+ <translation>'%1' enthält keinen Bezeichner</translation>
</message>
<message>
<location line="+8"/>
<source>String literal %1</source>
- <translation type="unfinished"></translation>
+ <translation>Zeichenketten-Literal %1</translation>
</message>
<message>
<location line="+15"/>
<source>Cowardly refusing to evaluate expression '%1' with potential side effects</source>
- <translation type="unfinished"></translation>
+ <translation>Werte Ausdruck '%1' mit potentiellen Seiteneffekten nicht aus</translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source><not in scope></source>
+ <extracomment>Variable</extracomment>
+ <translation><nicht im Bereich></translation>
</message>
<message>
- <location line="+155"/>
+ <location line="+112"/>
<location line="+42"/>
<source>Retrieving data for watch view (%1 requests pending)...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+208"/>
+ <location line="+209"/>
<source>Finished retrieving data.</source>
<translation type="unfinished"></translation>
</message>
@@ -3425,7 +3466,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+42"/>
<source>Debugging helpers not found.</source>
<translation type="unfinished"></translation>
</message>
@@ -3435,24 +3476,31 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+110"/>
+ <location line="+111"/>
<source>Custom dumper setup: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+146"/>
- <location line="+33"/>
- <source><unavailable></source>
+ <location line="+165"/>
+ <source><0 items></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-19"/>
+ <location line="+7"/>
<source><%1 items></source>
+ <extracomment>In string list</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+124"/>
<source>%1 <shadowed %2></source>
+ <extracomment>Variable %1 <FIXME: does something - bug Andre about it></extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source><shadowed></source>
+ <extracomment>Type of variable <FIXME: what? bug Andre about it></extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@@ -3461,8 +3509,14 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+2"/>
+ <source><anonymous union></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+38"/>
<source><no information></source>
+ <extracomment>About variable's value</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@@ -3471,14 +3525,19 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+19"/>
+ <source>%1 is a typedef.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Retrieving data for tooltip...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+69"/>
<source>The dumper library '%1' does not exist.</source>
- <translation type="unfinished"></translation>
+ <translation>Es existiert keine Dumper-Bibliothek '%1'.</translation>
</message>
</context>
<context>
@@ -3486,17 +3545,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/gdboptionspage.cpp" line="+8"/>
<source>Gdb</source>
- <translation type="unfinished"></translation>
+ <translation>Gdb</translation>
</message>
<message>
<location line="+34"/>
<source>Choose Gdb Location</source>
- <translation type="unfinished"></translation>
+ <translation>Gdb-Pfad auswählen</translation>
</message>
<message>
<location line="+2"/>
<source>Choose Location of Startup Script File</source>
- <translation type="unfinished"></translation>
+ <translation>Pfad zu Startup Script</translation>
</message>
</context>
<context>
@@ -3504,105 +3563,109 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/moduleshandler.cpp" line="+87"/>
<source>Module name</source>
- <translation type="unfinished"></translation>
+ <translation>Modulname</translation>
</message>
<message>
<location line="+1"/>
<source>Symbols read</source>
- <translation type="unfinished"></translation>
+ <translation>Symbole gelesen</translation>
</message>
<message>
<location line="+1"/>
<source>Start address</source>
- <translation type="unfinished"></translation>
+ <translation>Startadresse</translation>
</message>
<message>
<location line="+1"/>
+ <source>End address</source>
+ <translation>Endadresse</translation>
+ </message>
+ <message>
<source>End addAress</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">E</translation>
</message>
</context>
<context>
<name>Debugger::Internal::ModulesWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/moduleswindow.cpp" line="+61"/>
+ <location filename="../../../src/plugins/debugger/moduleswindow.cpp" line="+64"/>
<source>Modules</source>
- <translation type="unfinished"></translation>
+ <translation>Module</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+45"/>
<source>Update module list</source>
- <translation type="unfinished"></translation>
+ <translation>Modulliste aktualisieren</translation>
</message>
<message>
<location line="+1"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
<message>
<location line="+1"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
<message>
<location line="+3"/>
<source>Show source files for module "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Quelldateien des Moduls "%1"</translation>
</message>
<message>
<location line="+2"/>
<source>Load symbols for all modules</source>
- <translation type="unfinished"></translation>
+ <translation>Symbole aller Module laden</translation>
</message>
<message>
<location line="+5"/>
<source>Load symbols for module</source>
- <translation type="unfinished"></translation>
+ <translation>Symbole des Moduls laden</translation>
</message>
<message>
<location line="+1"/>
<source>Edit file</source>
- <translation type="unfinished"></translation>
+ <translation>Datei editieren</translation>
</message>
<message>
<location line="+1"/>
<source>Show symbols</source>
- <translation type="unfinished"></translation>
+ <translation>Symbole anzeigen</translation>
</message>
<message>
<location line="+2"/>
<source>Load symbols for module "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Symbole des Moduls "%1" laden</translation>
</message>
<message>
<location line="+1"/>
<source>Edit file "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Datei "%1" editieren</translation>
</message>
<message>
<location line="+1"/>
<source>Show symbols in file "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Symbole der Datei "%1" laden</translation>
</message>
<message>
<location line="+73"/>
<source>Address</source>
- <translation type="unfinished"></translation>
+ <translation>Adresse</translation>
</message>
<message>
<location line="+0"/>
<source>Code</source>
- <translation type="unfinished"></translation>
+ <translation>Code</translation>
</message>
<message>
<location line="+0"/>
<source>Symbol</source>
- <translation type="unfinished"></translation>
+ <translation>Symbol</translation>
</message>
<message>
<location line="+1"/>
<source>Symbols in "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Symbole in "%1"</translation>
</message>
</context>
<context>
@@ -3628,40 +3691,40 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/registerhandler.cpp" line="+92"/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Name</translation>
</message>
<message>
<location line="+1"/>
<source>Value</source>
- <translation type="unfinished"></translation>
+ <translation>Wert</translation>
</message>
</context>
<context>
<name>Debugger::Internal::RegisterWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/registerwindow.cpp" line="+53"/>
+ <location filename="../../../src/plugins/debugger/registerwindow.cpp" line="+54"/>
<source>Registers</source>
- <translation type="unfinished"></translation>
+ <translation>Register</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+23"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
<message>
<location line="+2"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
<message>
<location line="+4"/>
<source>Reload register listing</source>
- <translation type="unfinished"></translation>
+ <translation>Register neu laden</translation>
</message>
<message>
<location line="+2"/>
<source>Always reload register listing</source>
- <translation type="unfinished"></translation>
+ <translation>Register immer laden</translation>
</message>
</context>
<context>
@@ -3669,17 +3732,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/scriptengine.cpp" line="+455"/>
<source>'%1' contains no identifier</source>
- <translation type="unfinished"></translation>
+ <translation>'%1' enthält keinen Bezeichner</translation>
</message>
<message>
<location line="+5"/>
<source>String literal %1</source>
- <translation type="unfinished"></translation>
+ <translation>Zeichenketten-Literal %1</translation>
</message>
<message>
<location line="+15"/>
<source>Cowardly refusing to evaluate expression '%1' with potential side effects</source>
- <translation type="unfinished"></translation>
+ <translation>Werte Ausdruck '%1' mit potentiellen Seiteneffekten nicht aus</translation>
</message>
<message>
<location line="+142"/>
@@ -3692,35 +3755,35 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/sourcefileswindow.cpp" line="+97"/>
<source>Internal name</source>
- <translation type="unfinished"></translation>
+ <translation>Interner Name</translation>
</message>
<message>
<location line="+1"/>
<source>Full name</source>
- <translation type="unfinished"></translation>
+ <translation>Vollständiger Name</translation>
</message>
</context>
<context>
<name>Debugger::Internal::SourceFilesWindow</name>
<message>
- <location line="+75"/>
+ <location line="+76"/>
<source>Source Files</source>
- <translation type="unfinished"></translation>
+ <translation>Quelldateien</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+27"/>
<source>Reload data</source>
- <translation type="unfinished"></translation>
+ <translation>Daten akualisieren</translation>
</message>
<message>
<location line="+4"/>
<source>Open file</source>
- <translation type="unfinished"></translation>
+ <translation>Datei öffnen</translation>
</message>
<message>
<location line="+3"/>
<source>Open file "%1"'</source>
- <translation type="unfinished"></translation>
+ <translation>Datei '"%1" öffnen</translation>
</message>
</context>
<context>
@@ -3733,23 +3796,23 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+2"/>
<source><More></source>
- <translation type="unfinished"></translation>
+ <translation><Mehr></translation>
</message>
<message>
<location line="+23"/>
<source><table><tr><td>Address:</td><td>%1</td></tr><tr><td>Function: </td><td>%2</td></tr><tr><td>File: </td><td>%3</td></tr><tr><td>Line: </td><td>%4</td></tr><tr><td>From: </td><td>%5</td></tr></table><tr><td>To: </td><td>%6</td></tr></table></source>
<extracomment>Tooltip for variable</extracomment>
- <translation type="unfinished"></translation>
+ <translation><table><tr><td>Adresse:</td><td>%1</td></tr><tr><td>Funktion: </td><td>%2</td></tr><tr><td>Datei: </td><td>%3</td></tr><tr><td>Zeile: </td><td>%4</td></tr><tr><td>Von: </td><td>%5</td></tr></table><tr><td>bis: </td><td>%6</td></tr></table></translation>
</message>
<message>
<location line="+20"/>
<source>Level</source>
- <translation type="unfinished"></translation>
+ <translation>Tiefe</translation>
</message>
<message>
<location line="+1"/>
<source>Function</source>
- <translation type="unfinished"></translation>
+ <translation>Funktion</translation>
</message>
<message>
<location line="+1"/>
@@ -3759,53 +3822,61 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+1"/>
<source>Line</source>
- <translation type="unfinished"></translation>
+ <translation>Datei</translation>
</message>
<message>
<location line="+1"/>
<source>Address</source>
- <translation type="unfinished"></translation>
+ <translation>Adresse</translation>
</message>
</context>
<context>
<name>Debugger::Internal::StackWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/stackwindow.cpp" line="+54"/>
+ <location filename="../../../src/plugins/debugger/stackwindow.cpp" line="+55"/>
<source>Stack</source>
- <translation type="unfinished"></translation>
+ <translation>Stack</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+40"/>
<source>Copy contents to clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>Inhalt in Zwischenablage kopieren</translation>
</message>
<message>
<location line="+3"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
<message>
<location line="+2"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
</context>
<context>
<name>Debugger::Internal::StartExternalDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+67"/>
+ <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+70"/>
<source>Select Executable</source>
- <translation type="unfinished"></translation>
+ <translation>Ausführbare Datei auswählen</translation>
</message>
<message>
<location line="+7"/>
<source>Executable:</source>
- <translation type="unfinished"></translation>
+ <translation>Ausführbare Datei:</translation>
</message>
<message>
<location line="+1"/>
<source>Arguments:</source>
- <translation type="unfinished"></translation>
+ <translation>Argumente:</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::StartRemoteDialog</name>
+ <message>
+ <location line="+45"/>
+ <source>Select Executable</source>
+ <translation>Ausführbare Datei auswählen</translation>
</message>
</context>
<context>
@@ -3813,30 +3884,30 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+107"/>
<source>Thread: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Thread: %1</translation>
</message>
<message>
<location line="+13"/>
<source>Thread ID</source>
- <translation type="unfinished"></translation>
+ <translation>Thread-Id</translation>
</message>
</context>
<context>
<name>Debugger::Internal::ThreadsWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/threadswindow.cpp" line="+50"/>
+ <location filename="../../../src/plugins/debugger/threadswindow.cpp" line="+53"/>
<source>Thread</source>
- <translation type="unfinished"></translation>
+ <translation>Thread</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
<message>
<location line="+1"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
</context>
<context>
@@ -3844,7 +3915,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+68"/>
<source><not in scope></source>
- <translation type="unfinished"></translation>
+ <translation><nicht im Bereich></translation>
</message>
</context>
<context>
@@ -3852,32 +3923,32 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+232"/>
<source>Root</source>
- <translation type="unfinished"></translation>
+ <translation>Wurzelelement</translation>
</message>
<message>
<location line="+9"/>
<source>Locals</source>
- <translation type="unfinished"></translation>
+ <translation>Lokale Variablen</translation>
</message>
<message>
<location line="+9"/>
<source>Tooltip</source>
- <translation type="unfinished"></translation>
+ <translation>Tooltip</translation>
</message>
<message>
<location line="+9"/>
<source>Watchers</source>
- <translation type="unfinished"></translation>
+ <translation>Überwachte Ausdrücke</translation>
</message>
<message>
<location line="+270"/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Name</translation>
</message>
<message>
<location line="+1"/>
<source>Value</source>
- <translation type="unfinished"></translation>
+ <translation>Wert</translation>
</message>
<message>
<location line="+1"/>
@@ -3887,45 +3958,45 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location line="+166"/>
<source><No Locals></source>
- <translation type="unfinished"></translation>
+ <translation><Keine lokalen Variablen></translation>
</message>
<message>
<location line="+3"/>
<source><No Tooltip></source>
- <translation type="unfinished"></translation>
+ <translation><Kein Tooltip></translation>
</message>
<message>
<location line="+3"/>
<source><No Watchers></source>
- <translation type="unfinished"></translation>
+ <translation><keine überwachten Ausdrücke></translation>
</message>
</context>
<context>
<name>Debugger::Internal::WatchWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/watchwindow.cpp" line="+120"/>
+ <location filename="../../../src/plugins/debugger/watchwindow.cpp" line="+121"/>
<source>Locals and Watchers</source>
- <translation type="unfinished"></translation>
+ <translation>Lokale Variablen und Überwachte Ausdrücke</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+81"/>
<source>Adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
<message>
<location line="+1"/>
<source>Always adjust column widths to contents</source>
- <translation type="unfinished"></translation>
+ <translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
<message>
<location line="+18"/>
<source>Insert new watch item</source>
- <translation type="unfinished"></translation>
+ <translation>Neuen Überwachten Ausdruck einfügen</translation>
</message>
<message>
<location line="+16"/>
<source><Edit></source>
- <translation type="unfinished"></translation>
+ <translation><Editieren></translation>
</message>
</context>
<context>
@@ -3933,12 +4004,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="-138"/>
<source>Clear contents</source>
- <translation type="unfinished"></translation>
+ <translation>Inhalt löschen</translation>
</message>
<message>
<location line="+7"/>
<source>Save contents</source>
- <translation type="unfinished"></translation>
+ <translation>Inhalt speichern</translation>
</message>
</context>
<context>
@@ -3951,32 +4022,32 @@ Using gdb 6.7 or later is strongly recommended.</source>
<message>
<location/>
<source>This will enable nice display of Qt and Standard Library objects in the Locals&Watchers view</source>
- <translation type="unfinished"></translation>
+ <translation>Diese Einstellung ermöglicht die Anzeige von Qt- und Standardbibliotheksobjekten in der Ansicht "Lokale Variablen und Über&wachte Ausdrücke"</translation>
</message>
<message>
<location/>
<source>Use debugging helper</source>
- <translation type="unfinished"></translation>
+ <translation>Ausgabe-Hilfsbibliothek benutzen</translation>
</message>
<message>
<location/>
<source>This will load a dumper library</source>
- <translation type="unfinished"></translation>
+ <translation>Lädt die Ausgabe-Hilfsbibliothek</translation>
</message>
<message>
<location/>
<source>Use debugging helper from custom location</source>
- <translation type="unfinished"></translation>
+ <translation>Benutze Ausgabe-Hilfsbibliothek von</translation>
</message>
<message>
<location/>
<source>Location: </source>
- <translation type="unfinished"></translation>
+ <translation>Pfad:</translation>
</message>
<message>
<location/>
<source>Debug debugging helper</source>
- <translation type="unfinished"></translation>
+ <translation>Debug-Version der Ausgabe-Hilfsbibliothek</translation>
</message>
</context>
<context>
@@ -4310,9 +4381,9 @@ Using gdb 6.7 or later is strongly recommended.</source>
</message>
</context>
<context>
- <name>Designer::Internal::WorkbenchIntegration</name>
+ <name>Designer::Internal::QtCreatorIntegration</name>
<message>
- <location filename="../../../src/plugins/designer/workbenchintegration.cpp" line="+72"/>
+ <location filename="../../../src/plugins/designer/qtcreatorintegration.cpp" line="+72"/>
<source>The class definition of '%1' could not be found in %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -4490,12 +4561,12 @@ It also automatically sets the correct qt version.</source>
<message>
<location/>
<source>State</source>
- <translation type="unfinished"></translation>
+ <translation>Status</translation>
</message>
<message>
<location/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Name</translation>
</message>
<message>
<location/>
@@ -4631,7 +4702,7 @@ Reason: %3</source>
<context>
<name>FakeVim::Internal::FakeVimHandler</name>
<message>
- <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+822"/>
+ <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+827"/>
<source>%1,%2</source>
<translation type="unfinished"></translation>
</message>
@@ -4648,7 +4719,7 @@ Reason: %3</source>
</message>
<message>
<location line="+120"/>
- <location line="+673"/>
+ <location line="+685"/>
<location line="+19"/>
<source>E20: Mark '%1' not set</source>
<translation type="unfinished"></translation>
@@ -4714,7 +4785,7 @@ Reason: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+371"/>
+ <location line="+374"/>
<source>Already at oldest change</source>
<translation type="unfinished"></translation>
</message>
@@ -4839,13 +4910,6 @@ Reason: %3</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>FileSearch</name>
- <message>
- <source>%1: canceled. %2 occurrences found in %3 files.</source>
- <translation type="obsolete">%1: abgebrochen. </translation>
- </message>
-</context>
<context>
<name>FilterNameDialogClass</name>
<message>
@@ -4869,7 +4933,7 @@ Reason: %3</source>
<message>
<location/>
<source>Filter:</source>
- <translation type="unfinished">Filter:</translation>
+ <translation>Filter:</translation>
</message>
<message>
<location/>
@@ -4884,7 +4948,7 @@ Reason: %3</source>
<message>
<location/>
<source>Add</source>
- <translation type="unfinished">Hinzufügen</translation>
+ <translation>Hinzufügen</translation>
</message>
<message>
<location/>
@@ -5135,7 +5199,7 @@ Reason: %3</source>
<message>
<location/>
<source>Targets:</source>
- <translation type="unfinished"></translation>
+ <translation>Ziele:</translation>
</message>
</context>
<context>
@@ -5151,7 +5215,7 @@ Reason: %3</source>
<message>
<location line="+401"/>
<source>Build directory:</source>
- <translation type="unfinished"></translation>
+ <translation>Build-Verzeichnis:</translation>
</message>
<message>
<location line="+7"/>
@@ -5167,7 +5231,7 @@ Reason: %3</source>
<context>
<name>GenericProjectManager::Internal::GenericMakeStepConfigWidget</name>
<message>
- <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+274"/>
+ <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+164"/>
<source>Override %1:</source>
<translation type="unfinished"></translation>
</message>
@@ -5321,7 +5385,7 @@ Reason: %3</source>
<message>
<location line="+17"/>
<source>Error</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler</translation>
</message>
<message>
<location line="+1"/>
@@ -5853,7 +5917,7 @@ Reason: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+29"/>
<source>Git Settings</source>
<translation type="unfinished"></translation>
</message>
@@ -5966,6 +6030,45 @@ Reason: %3</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>Help::Internal::CentralWidget</name>
+ <message>
+ <location filename="../../../src/plugins/help/centralwidget.cpp" line="+102"/>
+ <source>Add new page</source>
+ <translation>Neue Seite hinzufügen</translation>
+ </message>
+ <message>
+ <location line="+202"/>
+ <source>Print Document</source>
+ <translation>Dokument drucken</translation>
+ </message>
+ <message>
+ <location line="+109"/>
+ <location line="+2"/>
+ <source>unknown</source>
+ <translation>unbekannt</translation>
+ </message>
+ <message>
+ <location line="+91"/>
+ <source>Add New Page</source>
+ <translation>Neue Seite hinzufügen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Close This Page</source>
+ <translation>Diese Seite schließen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Close Other Pages</source>
+ <translation>Andere Seiten schließen</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Add Bookmark for this Page...</source>
+ <translation>Lesezeichen für diese Seite hinzufügen...</translation>
+ </message>
+</context>
<context>
<name>Help::Internal::ContentsToolWidget</name>
<message>
@@ -6144,7 +6247,7 @@ Reason: %3</source>
<location line="+35"/>
<source>Documentation file %1 does not exist!
Skipping file.</source>
- <translation type="unfinished">Die Dokumentationsdatei %1 existiert nicht!
+ <translation>Die Dokumentationsdatei %1 existiert nicht!
Sie wird übersprungen.</translation>
</message>
</context>
@@ -6196,14 +6299,15 @@ Sie wird übersprungen.</translation>
<location filename="../../../src/plugins/help/helpengine.cpp" line="-117"/>
<source>Documentation file %1 does not exist!
Skipping file.</source>
- <translation type="unfinished">Die Dokumentationsdatei %1 existiert nicht!
+ <translation>Die Dokumentationsdatei %1 existiert nicht!
Sie wird übersprungen.</translation>
</message>
<message>
<location line="+9"/>
<source>Documentation file %1 is not compatible!
Skipping file.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Dokumentationsdatei %1 ist nicht kompatibel!
+Sie wird übersprungen.</translation>
</message>
</context>
<context>
@@ -6216,7 +6320,7 @@ Skipping file.</source>
<message>
<location line="+122"/>
<source><title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div></source>
- <translation type="unfinished"></translation>
+ <translation><title>Fehler 404...</title><div align="center"><br><br><h1>Die Seite konnte nicht gefunden werden</h1><br><h3>'%1'</h3></div></translation>
</message>
<message>
<location line="+57"/>
@@ -6227,12 +6331,12 @@ Skipping file.</source>
<location line="+1"/>
<source>Unable to launch external application.
</source>
- <translation type="unfinished"></translation>
+ <translation>Die externe Anwendung konnte nicht gestartet werden.</translation>
</message>
<message>
<location line="+0"/>
<source>OK</source>
- <translation type="unfinished"></translation>
+ <translation>OK</translation>
</message>
<message>
<location line="+63"/>
@@ -6242,7 +6346,7 @@ Skipping file.</source>
<message>
<location line="+3"/>
<source>Open Link in New Tab Ctrl+LMB</source>
- <translation type="unfinished"></translation>
+ <translation>Link in neuem Reiter öffnen\t(Ctrl+Linke Maustaste)</translation>
</message>
</context>
<context>
@@ -6300,7 +6404,7 @@ Skipping file.</source>
<message>
<location line="-60"/>
<source>Open file</source>
- <translation type="unfinished"></translation>
+ <translation>Datei öffnen</translation>
</message>
<message>
<location line="+1"/>
@@ -6490,7 +6594,7 @@ in your .pro file.</source>
<message>
<location/>
<source>Filter:</source>
- <translation type="unfinished">Filter:</translation>
+ <translation>Filter:</translation>
</message>
<message>
<location/>
@@ -6600,7 +6704,7 @@ in your .pro file.</source>
<location line="+4"/>
<location line="+392"/>
<source>Add</source>
- <translation type="unfinished">Hinzufügen</translation>
+ <translation>Hinzufügen</translation>
</message>
<message>
<location line="-389"/>
@@ -6943,7 +7047,7 @@ in your .pro file.</source>
<message>
<location/>
<source>OK</source>
- <translation type="unfinished"></translation>
+ <translation>OK</translation>
</message>
</context>
<context>
@@ -7007,7 +7111,7 @@ in your .pro file.</source>
<message>
<location/>
<source>Change:</source>
- <translation type="unfinished"></translation>
+ <translation>Änderung:</translation>
</message>
<message>
<location/>
@@ -7020,25 +7124,6 @@ in your .pro file.</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>Perforce::Internal::WorkbenchClientUser</name>
- <message>
- <location filename="../../../src/plugins/perforce/workbenchclientuser.cpp" line="+143"/>
- <location line="+138"/>
- <source>Perforce Error</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-99"/>
- <source>Closing p4 Editor</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Do you want to submit this change list?</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>PluginDialog</name>
<message>
@@ -7180,7 +7265,7 @@ Library base name: %1</source>
<message>
<location/>
<source>Advanced Mode</source>
- <translation type="unfinished"></translation>
+ <translation>Erweiterter Modus</translation>
</message>
</context>
<context>
@@ -7189,82 +7274,85 @@ Library base name: %1</source>
<location filename="../../../src/plugins/projectexplorer/abstractprocessstep.cpp" line="+170"/>
<source><font color="#0000ff">Starting: %1 %2</font>
</source>
- <translation type="unfinished"></translation>
+ <translation><font color="#0000ff">Starte: %1 %2</font>
+</translation>
</message>
<message>
<location line="+7"/>
<source><font color="#0000ff">Exited with code %1.</font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#0000ff">Beendet mit Rückgabewert %1.</font></translation>
</message>
<message>
<location line="+2"/>
<source><font color="#ff0000"><b>Exited with code %1.</b></font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#ff0000"><b>Beendet mit Rückgabewert %1.</b></font></translation>
</message>
<message>
<location line="+7"/>
<source><font color="#ff0000">Could not start process %1 </b></font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#ff0000">Der Prozess %1 konnte nicht gestartet werden</b></font></translation>
</message>
</context>
<context>
<name>ProjectExplorer::BuildManager</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/buildmanager.cpp" line="+131"/>
+ <location filename="../../../src/plugins/projectexplorer/buildmanager.cpp" line="+136"/>
<source><font color="#ff0000">Canceled build.</font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#ff0000">Erstellen abgebrochen.</font></translation>
</message>
<message>
<location line="+56"/>
<source>Build</source>
- <translation type="unfinished"></translation>
+ <translation>Erstellen</translation>
</message>
- <message>
- <location line="+16"/>
- <location line="+35"/>
- <source>Finished %1 of %2 build steps</source>
- <translation type="unfinished"></translation>
+ <message numerus="yes">
+ <location line="-136"/>
+ <source>Finished %n of %1 build steps</source>
+ <translation>
+ <numerusform>Einer von %1 Build-Schritten beendet</numerusform>
+ <numerusform>%n von %1 Build-Schritten beendet</numerusform>
+ </translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+191"/>
<location line="+39"/>
<source><font color="#ff0000">Error while building project %1</font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#ff0000">Fehler beim Erstellen des Projekts %1</font></translation>
</message>
<message>
<location line="-38"/>
<location line="+39"/>
<source><font color="#ff0000">When executing build step '%1'</font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#ff0000">Beim Ausführen des Build-Schritts '%1'</font></translation>
</message>
<message>
<location line="-37"/>
<source>Error while building project %1</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler beim Erstellen des Projekts %1</translation>
</message>
<message>
<location line="+44"/>
<source><b>Running build steps for project %2...</b></source>
- <translation type="unfinished"></translation>
+ <translation><b>Führe Build-Schritte für Projekt %2 aus...</b></translation>
</message>
</context>
<context>
<name>ProjectExplorer::CustomExecutableRunConfiguration</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/customexecutablerunconfiguration.cpp" line="+156"/>
+ <location filename="../../../src/plugins/projectexplorer/customexecutablerunconfiguration.cpp" line="+158"/>
<source>Custom Executable</source>
- <translation type="unfinished"></translation>
+ <translation>Benutzerdefinierte, ausführbare Datei</translation>
</message>
<message>
<location line="+37"/>
<source>Could not find the executable, please specify one.</source>
- <translation type="unfinished"></translation>
+ <translation>Es konnte keine ausführbare Datei gefunden werden; bitte geben Sie eine an.</translation>
</message>
<message>
<location line="+79"/>
<location line="+32"/>
<source>Run %1</source>
- <translation type="unfinished"></translation>
+ <translation>Führe %1 aus</translation>
</message>
</context>
<context>
@@ -7273,7 +7361,7 @@ Library base name: %1</source>
<location line="+37"/>
<location line="+16"/>
<source>Custom Executable</source>
- <translation type="unfinished"></translation>
+ <translation>Benutzerdefinierte ausführbare Datei</translation>
</message>
</context>
<context>
@@ -7281,12 +7369,12 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/environmenteditmodel.cpp" line="+166"/>
<source>Variable</source>
- <translation type="unfinished"></translation>
+ <translation>Variable</translation>
</message>
<message>
<location line="+0"/>
<source>Value</source>
- <translation type="unfinished"></translation>
+ <translation>Wert</translation>
</message>
</context>
<context>
@@ -7315,17 +7403,17 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/applicationlauncher_x11.cpp" line="+123"/>
<source>Failed to start program. Path or permissions wrong?</source>
- <translation type="unfinished"></translation>
+ <translation>Das Programm konnte nicht gestartet werden. Möglicherweise stimmt der Pfad nicht oder die Berechtigungen sind sind ausreichend?</translation>
</message>
<message>
<location line="+3"/>
<source>The program has unexpectedly finished.</source>
- <translation type="unfinished"></translation>
+ <translation>Das Programm ist abgestürzt.</translation>
</message>
<message>
<location line="+3"/>
<source>Some error has occurred while running the program.</source>
- <translation type="unfinished"></translation>
+ <translation>Bei der Ausführung des Programms trat ein Fehler auf.</translation>
</message>
</context>
<context>
@@ -7401,7 +7489,7 @@ Library base name: %1</source>
<location line="+41"/>
<location line="+135"/>
<source>%1 - %2</source>
- <translation type="unfinished"></translation>
+ <translation>%1 - %2</translation>
</message>
<message>
<location line="-65"/>
@@ -7495,7 +7583,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="+113"/>
<source>Cancel Build && Close</source>
<translation>Erstellen abbrechen und schließen</translation>
</message>
@@ -7507,17 +7595,17 @@ Library base name: %1</source>
<message>
<location line="+3"/>
<source>A project is currently being built.</source>
- <translation type="unfinished"></translation>
+ <translation>Es wird gerade ein Projekt erstellt.</translation>
</message>
<message>
<location line="-1"/>
<source>Close Qt Creator?</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Creator schließen?</translation>
</message>
<message>
<location line="+2"/>
<source>Do you want to cancel the build process and close Qt Creator anyway?</source>
- <translation type="unfinished"></translation>
+ <translation>Möchten Sie die Erstellung abbrechen und Qt Creator schließen?</translation>
</message>
</context>
<context>
@@ -7525,7 +7613,7 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/currentprojectfilter.h" line="+54"/>
<source>Files in current project</source>
- <translation type="unfinished"></translation>
+ <translation>Dateien im aktuellen Projekt</translation>
</message>
</context>
<context>
@@ -7533,7 +7621,7 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/currentprojectfind.cpp" line="+62"/>
<source>Current Project</source>
- <translation type="unfinished"></translation>
+ <translation>Aktuelles Projekt</translation>
</message>
<message>
<location line="+47"/>
@@ -7551,22 +7639,22 @@ Library base name: %1</source>
<message>
<location line="+4"/>
<source>Executable:</source>
- <translation type="unfinished"></translation>
+ <translation>Ausführbare Datei:</translation>
</message>
<message>
<location line="+4"/>
<source>Arguments:</source>
- <translation type="unfinished"></translation>
+ <translation>Argumente:</translation>
</message>
<message>
<location line="+4"/>
<source>Working Directory:</source>
- <translation type="unfinished"></translation>
+ <translation>Arbeitsverzeichnis:</translation>
</message>
<message>
<location line="+2"/>
<source>Run in &Terminal</source>
- <translation type="unfinished"></translation>
+ <translation>In &Terminal Ausführen</translation>
</message>
</context>
<context>
@@ -7574,7 +7662,7 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/dependenciespanel.cpp" line="+66"/>
<source>Dependencies</source>
- <translation type="unfinished"></translation>
+ <translation>Abhängigkeiten</translation>
</message>
</context>
<context>
@@ -7582,12 +7670,12 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/dependenciespanel.ui"/>
<source>Project Dependencies</source>
- <translation type="unfinished"></translation>
+ <translation>Abhängigkeiten des Projekts</translation>
</message>
<message>
<location/>
<source>Project Dependencies:</source>
- <translation type="unfinished"></translation>
+ <translation>Abhängigkeiten des Projekts:</translation>
</message>
</context>
<context>
@@ -7595,17 +7683,17 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/projectmodels.cpp" line="+231"/>
<source>%1 of project %2</source>
- <translation type="unfinished"></translation>
+ <translation>%1 von Projekt %2</translation>
</message>
<message>
<location line="+41"/>
<source>Could not rename file</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei konnte nicht umbenannt werden</translation>
</message>
<message>
<location line="+1"/>
<source>Renaming file %1 to %2 failed.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Datei %1 konnte nicht in %2 umbenannt werden.</translation>
</message>
</context>
<context>
@@ -7613,7 +7701,7 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/editorsettingspropertiespage.cpp" line="+62"/>
<source>Editor Settings</source>
- <translation type="unfinished"></translation>
+ <translation>Editoreinstellungen</translation>
</message>
</context>
<context>
@@ -7626,7 +7714,7 @@ Library base name: %1</source>
<message>
<location/>
<source>Default File Encoding:</source>
- <translation type="unfinished"></translation>
+ <translation>Encoding-Vorgabe:</translation>
</message>
</context>
<context>
@@ -7634,12 +7722,12 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/foldernavigationwidget.cpp" line="+193"/>
<source>File System</source>
- <translation type="unfinished"></translation>
+ <translation>Dateisystem</translation>
</message>
<message>
<location line="+18"/>
<source>Synchronize with Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Mit Editor synchronisieren</translation>
</message>
</context>
<context>
@@ -7647,26 +7735,26 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/sessiondialog.cpp" line="+89"/>
<source>New session name</source>
- <translation type="unfinished"></translation>
+ <translation>Name der neuen Sitzung</translation>
</message>
<message>
<location line="+2"/>
<source>Enter the name of the new session:</source>
- <translation type="unfinished"></translation>
+ <translation>Geben Sie den Namen der neuen Sitzung ein:</translation>
</message>
</context>
<context>
<name>ProjectExplorer::Internal::OutputPane</name>
<message>
<location filename="../../../src/plugins/projectexplorer/outputwindow.cpp" line="+70"/>
- <source>Rerun this runconfiguration</source>
- <translation type="unfinished"></translation>
+ <source>Re-run this run-configuration</source>
+ <translation>Ausführungskonfiguration noch einmal ausführen</translation>
</message>
<message>
<location line="+11"/>
<location line="+1"/>
<source>Stop</source>
- <translation type="unfinished"></translation>
+ <translation>Anhalten</translation>
</message>
<message>
<location line="+4"/>
@@ -7676,17 +7764,17 @@ Library base name: %1</source>
<message>
<location line="+56"/>
<source>Application Output</source>
- <translation type="unfinished"></translation>
+ <translation>Ausgabe der Anwendung</translation>
</message>
<message>
<location line="+116"/>
<source>The application is still running. Close it first.</source>
- <translation type="unfinished"></translation>
+ <translation>Die Anwendung läuft noch. Beenden Sie sie zuerst.</translation>
</message>
<message>
<location line="+1"/>
<source>Unable to close</source>
- <translation type="unfinished"></translation>
+ <translation>Schließen fehlgeschlagen</translation>
</message>
</context>
<context>
@@ -7694,7 +7782,7 @@ Library base name: %1</source>
<message>
<location line="+82"/>
<source>Application Output Window</source>
- <translation type="unfinished"></translation>
+ <translation>Ausgabe der Anwendung</translation>
</message>
</context>
<context>
@@ -7702,7 +7790,7 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/processstep.cpp" line="+83"/>
<source>Custom Process Step</source>
- <translation type="unfinished"></translation>
+ <translation>Benutzerdefinierter Verarbeitungsschritt</translation>
</message>
</context>
<context>
@@ -7715,7 +7803,7 @@ Library base name: %1</source>
<message>
<location/>
<source>Enable custom process step</source>
- <translation type="unfinished"></translation>
+ <translation>Benutzerdefinierten Verarbeitungsschritt aktivieren</translation>
</message>
<message>
<location/>
@@ -7725,17 +7813,30 @@ Library base name: %1</source>
<message>
<location/>
<source>Command:</source>
- <translation type="unfinished"></translation>
+ <translation>Kommando:</translation>
</message>
<message>
<location/>
<source>Working Directory:</source>
- <translation type="unfinished"></translation>
+ <translation>Arbeitsverzeichnis:</translation>
</message>
<message>
<location/>
<source>Command Arguments:</source>
- <translation type="unfinished"></translation>
+ <translation>Kommandozeilenargumente:</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::ProjectExplorerSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.cpp" line="+55"/>
+ <source>Build and Run Settings</source>
+ <translation>Build- und Ausführungskonfiguration</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Projectexplorer</source>
+ <translation>Projekt-Explorer</translation>
</message>
</context>
<context>
@@ -7743,7 +7844,7 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/pluginfilefactory.cpp" line="+68"/>
<source>Could not open the following project: '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Das Projekt '%1' konnte nicht geöffnet werden</translation>
</message>
</context>
<context>
@@ -7752,12 +7853,12 @@ Library base name: %1</source>
<location filename="../../../src/plugins/projectexplorer/projectfilewizardextension.cpp" line="+179"/>
<source>Failed to add one or more files to project
'%1' (%2).</source>
- <translation type="unfinished"></translation>
+ <translation>Einige Dateien (%2) konnten nicht zum Projekt '%1' hinzugefügt werden.</translation>
</message>
<message>
<location line="+10"/>
<source>Failed to add '%1' to the version control system.</source>
- <translation type="unfinished"></translation>
+ <translation>'%1' konnte nicht unter Versionskontrolle gestellt werden.</translation>
</message>
</context>
<context>
@@ -7765,17 +7866,17 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/projecttreewidget.cpp" line="+140"/>
<source>Simplify tree</source>
- <translation type="unfinished"></translation>
+ <translation>Baum vereinfachen</translation>
</message>
<message>
<location line="+5"/>
<source>Hide generated files</source>
- <translation type="unfinished"></translation>
+ <translation>Generierte Dateien nicht zeigen</translation>
</message>
<message>
<location line="+24"/>
<source>Synchronize with Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Mit Editor synchronisieren</translation>
</message>
</context>
<context>
@@ -7788,7 +7889,7 @@ Library base name: %1</source>
<message>
<location line="+17"/>
<source>Filter tree</source>
- <translation type="unfinished"></translation>
+ <translation>Baum filtern</translation>
</message>
</context>
<context>
@@ -7796,7 +7897,7 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/projectwindow.cpp" line="+62"/>
<source>Project Explorer</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt-Explorer</translation>
</message>
<message>
<location line="+13"/>
@@ -7806,12 +7907,12 @@ Library base name: %1</source>
<message>
<location line="+1"/>
<source>Startup</source>
- <translation type="unfinished"></translation>
+ <translation>Start</translation>
</message>
<message>
<location line="+1"/>
<source>Path</source>
- <translation type="unfinished"></translation>
+ <translation>Pfad</translation>
</message>
</context>
<context>
@@ -7819,19 +7920,41 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/projectwizardpage.cpp" line="+110"/>
<source>Add to &VCS (%1)</source>
- <translation type="unfinished"></translation>
+ <translation>Unter &Versionskontrolle (%1) stellen</translation>
</message>
<message>
<location line="+8"/>
<source>Files to be added:</source>
- <translation type="unfinished"></translation>
+ <translation>Zu erzeugende Dateien:</translation>
</message>
</context>
<context>
- <name>ProjectExplorer::Internal::QtVersionManager</name>
+ <name>ProjectExplorer::Internal::ProjetExplorerSettingsPageUi</name>
<message>
- <source>Path:</source>
- <translation type="obsolete">Pfad:</translation>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.ui"/>
+ <source>Form</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Build Settings</source>
+ <translation>'Build'-Einstellungen</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Save all files before Build</source>
+ <translation>Alle Dateien vor Erstellen speichern</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Run Settings</source>
+ <translatorcomment>Projekt stets vor Ausführung stets erstellen</translatorcomment>
+ <translation>Einstellungen zur Ausführung</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Always build Project before Running</source>
+ <translation>Projekt vor Ausführung stets erstellen</translation>
</message>
</context>
<context>
@@ -7839,22 +7962,22 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/removefiledialog.ui"/>
<source>Remove File</source>
- <translation type="unfinished"></translation>
+ <translation>Datei entfernen</translation>
</message>
<message>
<location/>
<source>&Delete file permanently</source>
- <translation type="unfinished"></translation>
+ <translation>Datei &löschen</translation>
</message>
<message>
<location/>
<source>&Remove from Version Control</source>
- <translation type="unfinished"></translation>
+ <translation>Aus &Versionskontrolle entfernen</translation>
</message>
<message>
<location/>
<source>File to remove:</source>
- <translation type="unfinished"></translation>
+ <translation>Datei:</translation>
</message>
</context>
<context>
@@ -7862,7 +7985,7 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.cpp" line="+116"/>
<source>Run Settings</source>
- <translation type="unfinished"></translation>
+ <translation>Ausführung</translation>
</message>
</context>
<context>
@@ -7875,7 +7998,7 @@ Library base name: %1</source>
<message>
<location/>
<source>Run &configuration:</source>
- <translation type="unfinished"></translation>
+ <translation>Ausführungskonfiguration</translation>
</message>
<message>
<location/>
@@ -7890,7 +8013,7 @@ Library base name: %1</source>
<message>
<location/>
<source>Settings</source>
- <translation type="unfinished"></translation>
+ <translation>Einstellungen</translation>
</message>
</context>
<context>
@@ -7940,7 +8063,7 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/taskwindow.cpp" line="+615"/>
<source>File not found: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Datei nicht gefunden: %1</translation>
</message>
</context>
<context>
@@ -7962,12 +8085,12 @@ Library base name: %1</source>
<message>
<location filename="../../../src/plugins/projectexplorer/winguiprocess.cpp" line="+122"/>
<source>The process could not be started!</source>
- <translation type="unfinished"></translation>
+ <translation>Der Prozess konnte nicht gestartet werden!</translation>
</message>
<message>
<location line="+7"/>
<source>Cannot retrieve debugging output!</source>
- <translation type="unfinished"></translation>
+ <translation>Es konnte keine Debugausgabe erhalten werden!</translation>
</message>
</context>
<context>
@@ -7980,22 +8103,22 @@ Library base name: %1</source>
<message>
<location/>
<source>Project management</source>
- <translation type="unfinished"></translation>
+ <translation>Projektmanagement</translation>
</message>
<message>
<location/>
<source>&Add to Project</source>
- <translation type="unfinished"></translation>
+ <translation>Zu Projekt &hinzufügen</translation>
</message>
<message>
<location/>
<source>&Project</source>
- <translation type="unfinished"></translation>
+ <translation>&Projekt</translation>
</message>
<message>
<location/>
<source>Add to &version control</source>
- <translation type="unfinished"></translation>
+ <translation>Unter &Versionskontrolle stellen</translation>
</message>
<message>
<location/>
@@ -8004,7 +8127,11 @@ Library base name: %1</source>
</source>
- <translation type="unfinished"></translation>
+ <translation>Die folgenden Dateien werden hinzugefügt:
+
+
+
+</translation>
</message>
</context>
<context>
@@ -8015,7 +8142,7 @@ Library base name: %1</source>
<translation>Projekte</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+88"/>
<source>&Build</source>
<translation>&Erstellen</translation>
</message>
@@ -8071,12 +8198,12 @@ Library base name: %1</source>
</message>
<message>
<location line="+6"/>
- <location line="+798"/>
+ <location line="+808"/>
<source>Unload Project</source>
<translation>Projekt entladen</translation>
</message>
<message>
- <location line="-790"/>
+ <location line="-800"/>
<source>Unload All Projects</source>
<translation>Alle Projekte entladen</translation>
</message>
@@ -8088,7 +8215,7 @@ Library base name: %1</source>
<message>
<location line="+10"/>
<source>Set Build Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Build-Konfiguration setzen</translation>
</message>
<message>
<location line="+10"/>
@@ -8112,12 +8239,12 @@ Library base name: %1</source>
</message>
<message>
<location line="+6"/>
- <location line="+738"/>
+ <location line="+748"/>
<source>Build Project</source>
<translation>Projekt erstellen</translation>
</message>
<message>
- <location line="-735"/>
+ <location line="-745"/>
<source>Ctrl+B</source>
<translation type="unfinished"></translation>
</message>
@@ -8150,7 +8277,7 @@ Library base name: %1</source>
<message>
<location line="+16"/>
<source>Go to Task Window</source>
- <translation type="unfinished"></translation>
+ <translation>Zu Ausgabefenster gehen</translation>
</message>
<message>
<location line="+7"/>
@@ -8189,7 +8316,7 @@ Library base name: %1</source>
<translation>Umbenennen</translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+120"/>
<source>Load Project</source>
<translation>Projekt laden</translation>
</message>
@@ -8200,7 +8327,7 @@ Library base name: %1</source>
<translation>Neues Projekt</translation>
</message>
<message>
- <location line="+445"/>
+ <location line="+453"/>
<source>Unload Project "%1"</source>
<translation>Projekt "%1" entladen</translation>
</message>
@@ -8210,7 +8337,7 @@ Library base name: %1</source>
<translation>Projekt '%1" erstellen</translation>
</message>
<message>
- <location line="+375"/>
+ <location line="+387"/>
<source>New File</source>
<comment>Title of dialog</comment>
<translation>Neue Datei</translation>
@@ -8250,7 +8377,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<location line="+10"/>
<source>Could not add following files to version control (%1)
</source>
- <translation type="unfinished">Die folgenden Dateien konnten nicht unter Versionsverwaltung (%1) gestellt werden
+ <translation>Die folgenden Dateien konnten nicht unter Versionsverwaltung (%1) gestellt werden
</translation>
</message>
<message>
@@ -8279,17 +8406,6 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<translation>Die Datei %1 konnte nicht gelöscht werden.</translation>
</message>
</context>
-<context>
- <name>ProjectExplorer::QtVersionManager</name>
- <message>
- <source>Auto-detected Qt</source>
- <translation type="obsolete">Vorgefundene Qt-Installation</translation>
- </message>
- <message>
- <source><not found></source>
- <translation type="obsolete"><nicht gefunden></translation>
- </message>
-</context>
<context>
<name>ProjectExplorer::SessionManager</name>
<message>
@@ -8315,7 +8431,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location line="+239"/>
<source>Qt Creator</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Creator</translation>
</message>
<message>
<location line="+4"/>
@@ -8426,7 +8542,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location/>
<source>Additional arguments:</source>
- <translation type="unfinished"></translation>
+ <translation>Zusätzliche Argumente:</translation>
</message>
<message>
<location/>
@@ -8447,7 +8563,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="-478"/>
+ <location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="-480"/>
<source>File is Read Only</source>
<translation type="unfinished"></translation>
</message>
@@ -8580,7 +8696,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<location/>
<location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Add</source>
- <translation type="unfinished">Hinzufügen</translation>
+ <translation>Hinzufügen</translation>
</message>
<message>
<location/>
@@ -8692,7 +8808,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location/>
<source>OK</source>
- <translation type="unfinished"></translation>
+ <translation>OK</translation>
</message>
<message>
<location/>
@@ -9141,7 +9257,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+45"/>
+ <location line="+52"/>
<source>Could not parse %1. The Qt4 run configuration %2 can not be started.</source>
<translation type="unfinished"></translation>
</message>
@@ -9149,19 +9265,19 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>Qt4ProjectManager::Internal::Qt4RunConfigurationWidget</name>
<message>
- <location line="-260"/>
+ <location line="-267"/>
<source>Name:</source>
<translation>Name:</translation>
</message>
<message>
<location line="+6"/>
<source>Executable:</source>
- <translation type="unfinished"></translation>
+ <translation>Ausführbare Datei:</translation>
</message>
<message>
<location line="+3"/>
<source>Working Directory:</source>
- <translation type="unfinished"></translation>
+ <translation>Arbeitsverzeichnis:</translation>
</message>
<message>
<location line="+2"/>
@@ -9171,7 +9287,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location line="+5"/>
<source>Run in &Terminal</source>
- <translation type="unfinished"></translation>
+ <translation>In &Terminal Ausführen</translation>
</message>
<message>
<location line="+5"/>
@@ -9247,17 +9363,17 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Name</translation>
</message>
<message>
<location/>
<source>Path</source>
- <translation type="unfinished"></translation>
+ <translation>Pfad</translation>
</message>
<message>
<location/>
<source>Debugging Helper</source>
- <translation type="unfinished"></translation>
+ <translation>Ausgabe-Hilfsbibliothek</translation>
</message>
<message>
<location/>
@@ -9399,12 +9515,12 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>Qt4ProjectManager::MakeStep</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+105"/>
+ <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+78"/>
<source><font color="#ff0000">Could not find make command: %1 in the build environment</font></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+50"/>
<source><font color="#0000ff"><b>No Makefile found, assuming project is clean.</b></font></source>
<translation type="unfinished"></translation>
</message>
@@ -9412,7 +9528,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>Qt4ProjectManager::MakeStepConfigWidget</name>
<message>
- <location line="+66"/>
+ <location line="+52"/>
<source>Override %1:</source>
<translation type="unfinished"></translation>
</message>
@@ -9495,7 +9611,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>QtDumperHelper</name>
<message>
- <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+154"/>
+ <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+163"/>
<source><none></source>
<translation type="unfinished"></translation>
</message>
@@ -9545,7 +9661,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location filename="../../../src/plugins/qtscripteditor/qtscripteditor.cpp" line="+226"/>
<source><Select Symbol></source>
- <translation type="unfinished"></translation>
+ <translation><Symbol auswählen></translation>
</message>
</context>
<context>
@@ -9743,7 +9859,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location line="+17"/>
<source>Type to locate</source>
- <translation type="unfinished">Suchmuster</translation>
+ <translation>Suchmuster</translation>
</message>
<message>
<location line="+171"/>
@@ -9977,6 +10093,11 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<source>The following files have unsaved changes:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location/>
+ <source>Automatically save all Files before building</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SettingsDialog</name>
@@ -10089,7 +10210,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location line="+41"/>
<source>Open file</source>
- <translation type="unfinished"></translation>
+ <translation>Datei öffnen</translation>
</message>
<message>
<location line="+2"/>
@@ -10142,7 +10263,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location/>
<source>Filter:</source>
- <translation type="unfinished">Filter:</translation>
+ <translation>Filter:</translation>
</message>
<message>
<location/>
@@ -10283,7 +10404,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location line="+14"/>
<source>Source Files</source>
- <translation type="unfinished"></translation>
+ <translation>Quelldateien</translation>
</message>
<message>
<location line="+17"/>
@@ -10557,16 +10678,49 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<message>
<location filename="../../../src/plugins/debugger/startexternaldialog.ui"/>
<source>Start Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Debugger starten</translation>
</message>
<message>
<location/>
<source>Executable:</source>
- <translation type="unfinished"></translation>
+ <translation>Ausführbare Datei:</translation>
</message>
<message>
<location/>
<source>Arguments:</source>
+ <translation>Argumente:</translation>
+ </message>
+</context>
+<context>
+ <name>StartRemoteDialog</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/startremotedialog.ui"/>
+ <source>Start Debugger</source>
+ <translation>Debugger starten</translation>
+ </message>
+ <message>
+ <location/>
+ <source>localhost:5115</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Architecture:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Host and port:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Use server start script:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Server start script:</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -10627,14 +10781,14 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Subversion::Internal::SubversionPlugin</name>
<message>
- <location filename="../../../src/plugins/subversion/subversionplugin.cpp" line="+310"/>
+ <location filename="../../../src/plugins/subversion/subversionplugin.cpp" line="+312"/>
<source>&Subversion</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>Add</source>
- <translation type="unfinished">Hinzufügen</translation>
+ <translation>Hinzufügen</translation>
</message>
<message>
<location line="+5"/>
@@ -10802,7 +10956,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<translation>Es konnte keine temporäre Datei erstellt werden: %1</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+184"/>
<source>Describe</source>
<translation type="unfinished"></translation>
</message>
@@ -10887,7 +11041,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>TextEditor::BaseTextEditor</name>
<message>
- <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+228"/>
+ <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+227"/>
<source>Print Document</source>
<translation>Dokument drucken</translation>
</message>
@@ -10905,7 +11059,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>TextEditor::BaseTextEditorEditable</name>
<message>
- <location line="+3607"/>
+ <location line="+3570"/>
<source>Line: %1, Col: %2</source>
<translation>Zeile: %1, Spalte: %2</translation>
</message>
@@ -11055,11 +11209,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<source>Highlight &blocks</source>
<translation>Blöcke hervorheben</translation>
</message>
- <message>
- <location/>
- <source>Use fancy style</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location/>
<source>Animate matching parentheses</source>
@@ -11629,7 +11778,7 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<message>
<location line="+1"/>
<source>Common</source>
- <translation type="unfinished"></translation>
+ <translation>Allgemein</translation>
</message>
</context>
<context>
@@ -11637,7 +11786,7 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<message>
<location filename="../../../src/plugins/vcsbase/nicknamedialog.cpp" line="+217"/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Name</translation>
</message>
<message>
<location line="+0"/>
@@ -11665,7 +11814,7 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<message>
<location filename="../../../src/plugins/vcsbase/submitfilemodel.cpp" line="+43"/>
<source>State</source>
- <translation type="unfinished"></translation>
+ <translation>Status</translation>
</message>
<message>
<location line="+0"/>
@@ -11887,54 +12036,4 @@ 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_it.ts b/share/qtcreator/translations/qtcreator_it.ts
new file mode 100644
index 0000000000000000000000000000000000000000..9c335abd6377496549108178b175544ed7db615e
--- /dev/null
+++ b/share/qtcreator/translations/qtcreator_it.ts
@@ -0,0 +1,11913 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="it">
+<context>
+ <name>Application</name>
+ <message>
+ <location filename="../../../src/app/main.cpp" line="+133"/>
+ <source>Failed to load core: %1</source>
+ <translation>Errore nel caricamento del core: %1</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Unable to send command line arguments to the already running instance. It appears to be not responding.</source>
+ <translation>Impossibile inviare i parametri della linea di comando all'istanza in esecuzione. Sembra non rispondere.</translation>
+ </message>
+ <message>
+ <location line="+136"/>
+ <source>Couldn't find 'Core.pluginspec' in %1</source>
+ <translation>Impossibile trovare 'Core.pluginspec' in %1</translation>
+ </message>
+</context>
+<context>
+ <name>AttachCoreDialog</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/attachcoredialog.ui"/>
+ <source>Start Debugger</source>
+ <translation>Avvia il Debug</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Executable:</source>
+ <translation>Eseguibile:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Core File:</source>
+ <translation>File Core:</translation>
+ </message>
+</context>
+<context>
+ <name>AttachExternalDialog</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/attachexternaldialog.ui"/>
+ <source>Start Debugger</source>
+ <translation>Avvia il Debug</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Attach to Process ID:</source>
+ <translation>Collegati all'ID di Processo:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Filter:</source>
+ <translation>Filtro:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Clear</source>
+ <translation>Cancella</translation>
+ </message>
+</context>
+<context>
+ <name>AttachTcfDialog</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/attachtcfdialog.ui"/>
+ <source>Start Debugger</source>
+ <translation>Avvia il Debug</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Host and port:</source>
+ <translation>Host e porta:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>localhost:5115</source>
+ <translation>localhost:5115</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Architecture:</source>
+ <translation>Architettura:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Use server start script:</source>
+ <translation>Usa script di avvio del server:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Server start script:</source>
+ <translation>Script di avvio del server:</translation>
+ </message>
+</context>
+<context>
+ <name>BINEditor::Internal::BinEditorPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/bineditor/bineditorplugin.cpp" line="+377"/>
+ <source>&Undo</source>
+ <translation>&Annulla</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&Redo</source>
+ <translation>&Ripeti</translation>
+ </message>
+</context>
+<context>
+ <name>BookmarkDialog</name>
+ <message>
+ <location filename="../../../src/shared/help/bookmarkdialog.ui"/>
+ <source>Add Bookmark</source>
+ <translation>Aggiungi un Segnalibro</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Bookmark:</source>
+ <translation>Segnalibro:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Add in Folder:</source>
+ <translation>Inserisci nella Cartella:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>+</source>
+ <translation>+</translation>
+ </message>
+ <message>
+ <location/>
+ <source>New Folder</source>
+ <translation>Nuova Cartella</translation>
+ </message>
+ <message>
+ <location filename="../../../src/shared/help/bookmarkmanager.cpp" line="+172"/>
+ <location line="+18"/>
+ <location line="+36"/>
+ <location line="+24"/>
+ <location line="+32"/>
+ <source>Bookmarks</source>
+ <translation>Segnalibri</translation>
+ </message>
+ <message>
+ <location line="-69"/>
+ <source>Delete Folder</source>
+ <translation>Cancella la Cartella</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rename Folder</source>
+ <translation>Rinomina la Cartella</translation>
+ </message>
+</context>
+<context>
+ <name>BookmarkManager</name>
+ <message>
+ <location line="+404"/>
+ <location line="+1"/>
+ <source>Bookmark</source>
+ <translation>Segnalibro</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Bookmarks</source>
+ <translation>Segnalibri</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>Remove</source>
+ <translation>Rimuovi</translation>
+ </message>
+ <message>
+ <location line="+110"/>
+ <location line="+9"/>
+ <source>New Folder</source>
+ <translation>Nuova Cartella</translation>
+ </message>
+ <message>
+ <location line="-118"/>
+ <source>You are going to delete a Folder which will also<br>remove its content. Are you sure to continue?</source>
+ <translation>Stai per cancellare una Cartella, questo cancellerà <br>anche il suo contenuto. Sei sicuro di volerlo fare?</translation>
+ </message>
+</context>
+<context>
+ <name>BookmarkWidget</name>
+ <message>
+ <location line="-319"/>
+ <source>Delete Folder</source>
+ <translation>Cancella la Cartella</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rename Folder</source>
+ <translation>Rinomina la Cartella</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Show Bookmark</source>
+ <translation>Mostra il Segnalibro</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show Bookmark in New Tab</source>
+ <translation>Mostra il Segnalibro in una Nuova Scheda</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Delete Bookmark</source>
+ <translation>Cancella il Segnalibro</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Rename Bookmark</source>
+ <translation>Rinomina il Segnalibro</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>Filter:</source>
+ <translation>Filtro:</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Add</source>
+ <translation>Aggiungi</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Remove</source>
+ <translation>Rimuovi</translation>
+ </message>
+</context>
+<context>
+ <name>Bookmarks::Internal::BookmarkView</name>
+ <message>
+ <location filename="../../../src/plugins/bookmarks/bookmarkmanager.cpp" line="+206"/>
+ <source>Bookmarks</source>
+ <translation>Segnalibri</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>&Remove Bookmark</source>
+ <translation>&Rimuovi Segnalibro</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Remove all Bookmarks</source>
+ <translation>Rimuovi tutti i Segnalibri</translation>
+ </message>
+</context>
+<context>
+ <name>Bookmarks::Internal::BookmarksPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/bookmarks/bookmarksplugin.cpp" line="+82"/>
+ <source>&Bookmarks</source>
+ <translation>&Segnalibri</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <location line="+79"/>
+ <source>Toggle Bookmark</source>
+ <translation>Commuta il Segnalibro</translation>
+ </message>
+ <message>
+ <location line="-75"/>
+ <source>Ctrl+M</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Meta+M</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Move Up</source>
+ <translation>Sposta Su</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Move Down</source>
+ <translation>Sposta Giu</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Previous Bookmark</source>
+ <translation>Segnalibro Precedente</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Ctrl+,</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Meta+,</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Next Bookmark</source>
+ <translation>Segnalibro Successivo</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Ctrl+.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Meta+.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Previous Bookmark In Document</source>
+ <translation>Segnalibro Precedente nel Documento</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Next Bookmark In Document</source>
+ <translation>Segnalibro Successivo nel Documento</translation>
+ </message>
+</context>
+<context>
+ <name>BreakByFunctionDialog</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/breakbyfunction.ui"/>
+ <source>Set Breakpoint at Function</source>
+ <translation>Imposta l'Interruzione alla Funzione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Function to break on:</source>
+ <translation>Funzione dove interrompere:</translation>
+ </message>
+</context>
+<context>
+ <name>BreakCondition</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/breakcondition.ui"/>
+ <source>Condition:</source>
+ <translation>Condizione:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Ignore count:</source>
+ <translation>Numero di scarti:</translation>
+ </message>
+</context>
+<context>
+ <name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
+ <message>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+626"/>
+ <source>&Change</source>
+ <translation>&Cambia</translation>
+ </message>
+</context>
+<context>
+ <name>CMakeProjectManager::Internal::CMakeRunConfiguration</name>
+ <message>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp" line="+133"/>
+ <source>Arguments:</source>
+ <translation>Parametri:</translation>
+ </message>
+</context>
+<context>
+ <name>CMakeProjectManager::Internal::CMakeRunPage</name>
+ <message>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+255"/>
+ <source>Run CMake</source>
+ <translation>Avvia CMake</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Arguments</source>
+ <translation>Parametri</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>The directory %1 does not contain a cbp file. Qt Creator needs to create this file by running cmake. Some projects require command line arguments to the initial cmake call.</source>
+ <translation>La cartella %1 non contiene un file cbp. Qt Creator creerà questo file eseguendo cmake. Alcuni progetti necessitano di parametri per la chiamata a cmake iniziale.</translation>
+ </message>
+ <message>
+ <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 below. Note that cmake remembers command line arguments from the previous runs.</source>
+ <translation>La cartella %1 contiene un file .cbp obsoleto. Qt Creator deve aggiornare questo file lanciando cmake. Se vuoi aggiungere dei parametri alla chiamata, aggiungili qui sotto. CMake ricorda inoltre i parametri delle esecuzioni precedenti.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The directory %1 specified in a build-configuration, 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 previous runs.</source>
+ <translation>La cartella %1, impostata in una configurazione di compilazione, non contiene un file cbp. Qt Creator deve ricreare questo file, lanciando cmake. Alcuni progetti necessitano di parametri per la chiamata iniziale a cmake. CMake ricorda inoltre i parametri delle esecuzioni precedenti.</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>Qt Creator deve eseguire cmake nella nuova directory di compilazione. Alcuni progetti necessitano di parametri per la chiamata iniziale a cmake.</translation>
+ </message>
+</context>
+<context>
+ <name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+264"/>
+ <location line="+10"/>
+ <source>CMake</source>
+ <translation>CMake</translation>
+ </message>
+</context>
+<context>
+ <name>CMakeProjectManager::Internal::InSourceBuildPage</name>
+ <message>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="-108"/>
+ <source>Qt Creator has detected an in-source-build which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
+ <translation>Qt Creator ha rilevato che la compilazione avviene nella cartella dei file sorgenti e ciò impedisce la compilazione in cartelle separate. Qt Creator non permette di di cambiare la cartella di compilazione, perciò se vuoi una compilazione in cartella separata, pulisci la cartella dei file sorgenti e apri nuovamente il progetto.</translation>
+ </message>
+</context>
+<context>
+ <name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
+ <message>
+ <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+156"/>
+ <source>Additional arguments:</source>
+ <translation>Parametri aggiuntivi:</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Targets:</source>
+ <translation>Destinazioni:</translation>
+ </message>
+</context>
+<context>
+ <name>CMakeProjectManager::Internal::ShadowBuildPage</name>
+ <message>
+ <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+28"/>
+ <source>Please enter the directory in which you want to build your project. </source>
+ <translation>Inserisci la cartella in cui vuoi compilare il tuo progetto. </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>Inserisci la cartella in cui vuoi compilare il tuo progetto. Qt Creator suggerisce di non usare la cartella dei file sorgenti per la compilazione. Questo assicura che la cartella dei file sorgenti rimanga pulita e permette compilazioni multiple con impostazioni differenti.</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Build directory:</source>
+ <translation>Cartella di compilazione:</translation>
+ </message>
+</context>
+<context>
+ <name>CMakeProjectManager::Internal::XmlFileUpToDatePage</name>
+ <message>
+ <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>Qt Creator ha rilevato un file cbp recente, e lo leggerà per ricavare informazioni sul progetto. Puoi cambiare i parametri usati per creare questo file nella modalità di progetto. Fai clic su fine per caricare il progetto.</translation>
+ </message>
+</context>
+<context>
+ <name>CPlusPlus::OverviewModel</name>
+ <message>
+ <location filename="../../../src/libs/cplusplus/OverviewModel.cpp" line="+153"/>
+ <source><Select Symbol></source>
+ <translation><Scegli un Simbolo></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source><No Symbols></source>
+ <translation><Nessun Simbolo></translation>
+ </message>
+</context>
+<context>
+ <name>CdbOptionsPageWidget</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/cdb/cdboptionspagewidget.ui"/>
+ <source>These options take effect at the next start of Qt Creator.</source>
+ <translation>Queste opzioni saranno effettive dal prossimo riavvio di Qt Creator.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Path to "Debugging Tools for Windows":</source>
+ <translation>Percorso per "Strumenti di Debug per Windows":</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Cdb</source>
+ <translation>Cdb</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Debugger Paths</source>
+ <translation>Percorsi del Debugger</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Symbol paths:</source>
+ <translation>Percorsi dei Simboli:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Source paths:</source>
+ <translation>Percorso dei sorgenti:</translation>
+ </message>
+</context>
+<context>
+ <name>ChangeSelectionDialog</name>
+ <message>
+ <location filename="../../../src/plugins/git/changeselectiondialog.ui"/>
+ <source>Repository Location:</source>
+ <translation>Posizione del deposito:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Select</source>
+ <translation>Seleziona</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Change:</source>
+ <translation>Cambia:</translation>
+ </message>
+</context>
+<context>
+ <name>CodePaster::CodepasterPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+96"/>
+ <source>&CodePaster</source>
+ <translation>&CodePaster</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Paste Snippet...</source>
+ <translation>Imcolla Frammento...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Alt+C,Alt+P</source>
+ <translation>Alt+C,Alt+I</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Fetch Snippet...</source>
+ <translation>Carica Frammento...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Alt+C,Alt+F</source>
+ <translation>Alt+C,Alt+C</translation>
+ </message>
+ <message>
+ <location line="+99"/>
+ <source>Waiting for items</source>
+ <translation>Sto aspettando gli elementi</translation>
+ </message>
+</context>
+<context>
+ <name>CodePaster::CustomFetcher</name>
+ <message>
+ <location line="+37"/>
+ <source>CodePaster Error</source>
+ <translation>Errore CodePaster</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Could not fetch code</source>
+ <translation>Non riesco a caricare il codice</translation>
+ </message>
+</context>
+<context>
+ <name>CodePaster::CustomPoster</name>
+ <message>
+ <location line="+49"/>
+ <source>CodePaster Error</source>
+ <translation>Errore CodePaster</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Some error occured while posting</source>
+ <translation>C'è stato un errore nella spedizione</translation>
+ </message>
+</context>
+<context>
+ <name>CodePaster::PasteSelectDialog</name>
+ <message>
+ <location filename="../../../src/plugins/cpaster/pasteselect.ui"/>
+ <source>Paste:</source>
+ <translation>Incolla:</translation>
+ </message>
+</context>
+<context>
+ <name>CodePaster::SettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/cpaster/settingspage.ui"/>
+ <source>CodePaster Server:</source>
+ <translation>Server CodePaster:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Username:</source>
+ <translation>Nome utente:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Copy Paste URL to clipboard</source>
+ <translation>Copia l'URL negli appunti</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Display Output Pane after sending a post</source>
+ <translation>Mostra la Finestra di Output dopo una spedizione</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+62"/>
+ <source>General</source>
+ <translation>Generale</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>CodePaster</source>
+ <translation>CodePaster</translation>
+ </message>
+</context>
+<context>
+ <name>CommonOptionsPage</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/commonoptionspage.ui"/>
+ <source>User interface</source>
+ <translation>Interfaccia utente</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Checking this will populate the source file view automatically but might slow down debugger startup considerably.</source>
+ <translation>Marcando questa casella la vista dei file sorgente sarà riempita automaticamente, ma l'avvio del debugger risulterà rallentato.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Populate source file view automatically</source>
+ <translation>Riempimento automatico della vista dei file sorgente</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>Quando questa casella è marcata 'Entra in' comprime più passi in uno in certe situazioni, rendendo il debug 'meno rumoroso'. Ad esempio il reference counting atomico sarà saltato, e un "Entra in" relativo all'emissione di un segnale porterà direttamente allo slot connesso al segnale.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Skip known frames when stepping</source>
+ <translation>Semplifica le sequenze note</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Use tooltips while debugging</source>
+ <translation>Usa i suggerimenti durante il debug</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Maximal stack depth:</source>
+ <translation>Dimesione massima dello stack:</translation>
+ </message>
+ <message>
+ <location/>
+ <source><unlimited></source>
+ <translation><illimitata></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Use alternating row colors in debug views</source>
+ <translation>Alterna i colori delle righe nelle finestre di debug</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Checking this will 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>Marcando questa casella si abiliteranno i suggerimenti dei valori delle variabili durante il debug. Dato che questo può rallentare il debug e non fornisce informazioni affidabili dato che non usa informazioni di contesto, questa opzione è normalmente disattivata.</translation>
+ </message>
+</context>
+<context>
+ <name>CompletionSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/cpptools/completionsettingspage.ui"/>
+ <source>Code Completion</source>
+ <translation>Completamento del Codice</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Do a case-sensitive match for completion items.</source>
+ <translation>Distingui le maiuscole negli elementi del completamento.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Case-sensitive completion</source>
+ <translation>Distingui le &Maiuscole</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Automatically insert (, ) and ; when appropriate.</source>
+ <translation>Inserisci automaticamente (, ) e ; dove appropriato.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Automatically insert braces</source>
+ <translation>&Parentesi automatiche</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Insert the common prefix of available completion items.</source>
+ <translation>Inserisci il prefisso comune dei completamenti disponibili.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Autocomplete common &prefix</source>
+ <translation>Autocompleta il prefisso &comune</translation>
+ </message>
+</context>
+<context>
+ <name>ContentWindow</name>
+ <message>
+ <location filename="../../../src/shared/help/contentwindow.cpp" line="+131"/>
+ <source>Open Link</source>
+ <translation>Apri il Collegamento</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Open Link in New Tab</source>
+ <translation>Apri il Collegamento in una Nuova Scheda</translation>
+ </message>
+</context>
+<context>
+ <name>Core::BaseFileWizard</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/basefilewizard.cpp" line="+136"/>
+ <source>Unable to create the directory %1.</source>
+ <translation>Impossibile creare la cartella %1.</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Unable to open %1 for writing: %2</source>
+ <translation>Impossibile aprire %1 in scrittura: %2</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error while writing to %1: %2</source>
+ <translation>Errore durante la scrittura su %1: %2</translation>
+ </message>
+ <message>
+ <location line="+296"/>
+ <location line="+30"/>
+ <location line="+7"/>
+ <location line="+6"/>
+ <source>File Generation Failure</source>
+ <translation>Errore Generando il File</translation>
+ </message>
+ <message>
+ <location line="-22"/>
+ <location line="+110"/>
+ <source>Existing files</source>
+ <translation>File esistenti</translation>
+ </message>
+ <message>
+ <location line="-62"/>
+ <source>Failed to open an editor for '%1'.</source>
+ <translation>Impossibile aprire un editor per '%1'.</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source> [read only]</source>
+ <translation> [sola lettura]</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> [directory]</source>
+ <translation> [cartella]</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source> [symbolic link]</source>
+ <translation> [link simbolico]</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>The project directory %1 contains files which cannot be overwritten:
+%2.</source>
+ <translation>La cartella di progetto %1 contiene file che non possono essere sovrascritti:
+%2.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>The following files already exist in the directory %1:
+%2.
+Would you like to overwrite them?</source>
+ <translation>Questi file sono già presenti nella cartella %1:
+%2.
+Vuoi sovrascriverli?</translation>
+ </message>
+</context>
+<context>
+ <name>Core::EditorManager</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="+186"/>
+ <location line="+1483"/>
+ <source>Revert to Saved</source>
+ <translation>Torna al Salvato</translation>
+ </message>
+ <message>
+ <location line="-1480"/>
+ <source>Close</source>
+ <translation>Chiudi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Close All</source>
+ <translation>Chiudi Tutti</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+1214"/>
+ <source>Close Others</source>
+ <translation>Chiudi gli Altri</translation>
+ </message>
+ <message>
+ <location line="-1213"/>
+ <source>Next Document in History</source>
+ <translation>Documento Successivo nella Cronologia</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Previous Document in History</source>
+ <translation>Documento Precedente nella Cronologia</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Go back</source>
+ <translation>Indietro</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Go forward</source>
+ <translation>Avanti</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Open in External Editor</source>
+ <translation>Apri con un Editor Esterno</translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>Revert File to Saved</source>
+ <translation>Torna al file Salvato</translation>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Ctrl+W</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Ctrl+Shift+W</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Alt+Tab</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+Tab</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Alt+Shift+Tab</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+Shift+Tab</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Ctrl+Alt+Left</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Alt+Left</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Ctrl+Alt+Right</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Alt+Right</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Split</source>
+ <translation>Dividi</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Ctrl+E,2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Split Side by Side</source>
+ <translation>Dividi Parte a Parte</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Ctrl+E,3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Remove Current Split</source>
+ <translation>Rimuovi la Divisione Corrente</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Ctrl+E,0</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Remove All Splits</source>
+ <translation>Rimuovi Tutte le Divisioni</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Ctrl+E,1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Goto Other Split</source>
+ <translation>Vai all'Altra Divisione</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Ctrl+E,o</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>&Advanced</source>
+ <translation>&Avanzate</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Alt+V,Alt+I</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+681"/>
+ <source>Opening File</source>
+ <translation>Apertura del File</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Cannot open file %1!</source>
+ <translation>Non posso aprire il file %1!</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Open File</source>
+ <translation>Apri file</translation>
+ </message>
+ <message>
+ <location line="+176"/>
+ <location line="+8"/>
+ <source>Failed!</source>
+ <translation>Non riuscito!</translation>
+ </message>
+ <message>
+ <location line="-8"/>
+ <source>Could not open the file for edit with SCC.</source>
+ <translation>Impossibile aprire il file per modifica con l'SCC.</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Could not set permissions to writable.</source>
+ <translation>Impossibile impostare il permesso di scrittura.</translation>
+ </message>
+ <message>
+ <location line="+90"/>
+ <source><b>Warning:</b> You are changing a read-only file.</source>
+ <translation><b>Attenzione:</b> Stai modificando un file di sola lettura.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Make writable</source>
+ <translation>Rendi scrivibile</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Save %1 As...</source>
+ <translation>Salva %1 con Nome...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&Save %1</source>
+ <translation>&Salva %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Revert %1 to Saved</source>
+ <translation>Torna %1 al file Salvato</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Close %1</source>
+ <translation>Chiudi %1</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Close All Except %1</source>
+ <translation>Chiudi Tutti Tranne %1</translation>
+ </message>
+ <message>
+ <location line="+265"/>
+ <source>You will lose your current changes if you proceed reverting %1.</source>
+ <translation>Perderai le modifiche correnti se ricarichi %1.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Proceed</source>
+ <translation>Procedi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Cancel</source>
+ <translation>Annulla</translation>
+ </message>
+ <message>
+ <location line="+54"/>
+ <source><table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%f</td><td>file name</td></tr><tr><td>%l</td><td>current line number</td></tr><tr><td>%c</td><td>current column number</td></tr><tr><td>%x</td><td>editor's x position on screen</td></tr><tr><td>%y</td><td>editor's y position on screen</td></tr><tr><td>%w</td><td>editor's width in pixels</td></tr><tr><td>%h</td><td>editor's height in pixels</td></tr><tr><td>%W</td><td>editor's width in characters</td></tr><tr><td>%H</td><td>editor's height in characters</td></tr><tr><td>%%</td><td>%</td></tr></table></source>
+ <translation><table border=1 cellspacing=0 cellpadding=3><tr><th>Variabile</th><th>Espansa in</th></tr><tr><td>%f</td><td>nome del file</td></tr><tr><td>%l</td><td>numero di riga corrente</td></tr><tr><td>%c</td><td>numero di colonna corrente</td></tr><tr><td>%x</td><td>posizione x dell'editor</td></tr><tr><td>%y</td><td>posizione y dell'editor</td></tr><tr><td>%w</td><td>larghezza dell'editor, in pixel</td></tr><tr><td>%h</td><td>altezza dell'editor, in pixel</td></tr><tr><td>%W</td><td>larghezza dell'editor, in caratteri</td></tr><tr><td>%H</td><td>altezza dell'editor, in caratteri</td></tr><tr><td>%%</td><td>%</td></tr></table></translation>
+ </message>
+</context>
+<context>
+ <name>Core::FileManager</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/filemanager.cpp" line="+305"/>
+ <source>Can't save file</source>
+ <translation>Impossibile salvare il file</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Can't save changes to '%1'. Do you want to continue and loose your changes?</source>
+ <translation>Impossibile salvare le modifiche a '%1'. Vuoi continuare e perdere le tue modifiche?</translation>
+ </message>
+ <message>
+ <location line="+113"/>
+ <source>Overwrite?</source>
+ <translation>Sovrascrivere?</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>An item named '%1' already exists at this location. Do you want to overwrite it?</source>
+ <translation>L'elemento '%1' è già presente in questa posizione. Vuoi sovrascriverlo?</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Save File As</source>
+ <translation>Salva il File Come</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::ComboBox</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/sidebar.cpp" line="+362"/>
+ <source>Activate %1</source>
+ <translation>Attiva %1</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::EditMode</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/editmode.cpp" line="+94"/>
+ <source>Edit</source>
+ <translation>Modifica</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::EditorSplitter</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/editormanager/editorsplitter.cpp" line="+75"/>
+ <source>Split Left/Right</source>
+ <translation>Dividi Sinistra/Destra</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Split Top/Bottom</source>
+ <translation>Dividi Sopra/Sotto</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Unsplit</source>
+ <translation>Unisci</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Default Splitter Layout</source>
+ <translation>Struttura Divisione Predefinita</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Save Current as Default</source>
+ <translation>Salva l'Attuale come Predefinita</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Restore Default Layout</source>
+ <translation>Ripristina la Struttura Predefinita</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Previous Document</source>
+ <translation>Documento Precedente</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Alt+Left</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Next Document</source>
+ <translation>Documento Successivo</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Alt+Right</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Previous Group</source>
+ <translation>Gruppo Precedente</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Next Group</source>
+ <translation>Gruppo Successivo</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Move Document to Previous Group</source>
+ <translation>Sposta il Documento al Gruppo Precedente</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Move Document to Next Group</source>
+ <translation>Sposta il Documento al Gruppo Successivo</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::EditorView</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+451"/>
+ <location line="+35"/>
+ <source>Placeholder</source>
+ <translation>Segnaposto</translation>
+ </message>
+ <message>
+ <location line="-29"/>
+ <source>Close</source>
+ <translation>Chiudi</translation>
+ </message>
+ <message>
+ <location line="+200"/>
+ <source>Make writable</source>
+ <translation>Rendi scrivibile</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File is writable</source>
+ <translation>Il file è scrivibile</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::GeneralSettings</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/generalsettings.cpp" line="+56"/>
+ <source>General</source>
+ <translation>Generale</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Environment</source>
+ <translation>Ambiente</translation>
+ </message>
+ <message>
+ <location line="+75"/>
+ <source>Variables</source>
+ <translation>Variabili</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/generalsettings.ui"/>
+ <source>General settings</source>
+ <translation>Impostazioni Generali</translation>
+ </message>
+ <message>
+ <location/>
+ <source>User &interface color:</source>
+ <translation>Colore &interfaccia utente:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Reset to default</source>
+ <translation>Ripristina predefinito</translation>
+ </message>
+ <message>
+ <location/>
+ <source>R</source>
+ <translation>R</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Terminal:</source>
+ <translation>Terminale:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>External editor:</source>
+ <translation>Editor esterno:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>?</source>
+ <translation>?</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::MainWindow</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/mainwindow.cpp" line="+150"/>
+ <source>Qt Creator</source>
+ <translation>Qt Creator</translation>
+ </message>
+ <message>
+ <location line="+144"/>
+ <source>Output</source>
+ <translation>Uscita</translation>
+ </message>
+ <message>
+ <location line="+161"/>
+ <source>&File</source>
+ <translation>&File</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&Edit</source>
+ <translation>&Modifica</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>&Tools</source>
+ <translation>&Strumenti</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>&Window</source>
+ <translation>&Finestra</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>&Help</source>
+ <translation>&Guida</translation>
+ </message>
+ <message>
+ <location line="+62"/>
+ <source>&New...</source>
+ <translation>&Nuovo...</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&Open...</source>
+ <translation>&Apri...</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&Open With...</source>
+ <translation>&Apri con...</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Recent Files</source>
+ <translation>File Recenti</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <location line="+4"/>
+ <source>&Save</source>
+ <translation>&Salva</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <location line="+6"/>
+ <source>Save &As...</source>
+ <translation>Salva con &Nome...</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <location line="+10"/>
+ <source>Ctrl+Shift+S</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Save A&ll</source>
+ <translation>Salva T&utti</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>&Print...</source>
+ <translation>Stam&pa...</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>E&xit</source>
+ <translation>&Esci</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+Q</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <location line="+4"/>
+ <source>&Undo</source>
+ <translation>&Annulla</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <location line="+4"/>
+ <source>&Redo</source>
+ <translation>&Ripeti</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Cu&t</source>
+ <translation>&Taglia</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&Copy</source>
+ <translation>&Copia</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&Paste</source>
+ <translation>&Incolla</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&Select All</source>
+ <translation>&Seleziona tutto</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&Go To Line...</source>
+ <translation>&Vai alla Linea...</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+L</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>&Options...</source>
+ <translation>&Opzioni...</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Minimize</source>
+ <translation>Minimizza</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Zoom</source>
+ <translation>Zoom</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Show Sidebar</source>
+ <translation>Mostra Barra Laterale</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Full Screen</source>
+ <translation>Schermo Intero</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>About &Qt Creator</source>
+ <translation>Informazioni su &Qt Creator</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>About &Qt Creator...</source>
+ <translation>Informazioni su &Qt Creator...</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>About &Plugins...</source>
+ <translation>Informazioni sui &Plugin...</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>New</source>
+ <comment>Title of dialog</comment>
+ <translation>Nuovo</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::MessageOutputWindow</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/messageoutputwindow.cpp" line="+76"/>
+ <source>General</source>
+ <translation>Generale</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::NavComboBox</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/navigationwidget.cpp" line="+524"/>
+ <source>Activate %1</source>
+ <translation>Attiva %1</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::NavigationSubWidget</name>
+ <message>
+ <location line="-149"/>
+ <source>Split</source>
+ <translation>Dividi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Close</source>
+ <translation>Chiudi</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::NavigationWidget</name>
+ <message>
+ <location line="-35"/>
+ <source>Activate %1 Pane</source>
+ <translation>Attiva il Pannello %1</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::NewDialog</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/dialogs/newdialog.ui"/>
+ <source>New Project</source>
+ <translation>Nuovo Progetto</translation>
+ </message>
+ <message>
+ <location/>
+ <source>1</source>
+ <translation>1</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::OpenEditorsWidget</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/editormanager/openeditorsview.cpp" line="+94"/>
+ <source>Open Documents</source>
+ <translation>Documenti Aperti</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::OpenEditorsWindow</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/editormanager/openeditorswindow.cpp" line="+211"/>
+ <source>*</source>
+ <translation>*</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::OpenWithDialog</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/dialogs/openwithdialog.cpp" line="+43"/>
+ <source>Open file '%1' with:</source>
+ <translation>Apri il file '%1' con:</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::OutputPaneManager</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/outputpane.cpp" line="+171"/>
+ <source>Output</source>
+ <translation>Uscita</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Clear</source>
+ <translation>Cancella</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Next Item</source>
+ <translation>Elemento Successivo</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Previous Item</source>
+ <translation>Elemento Precedente</translation>
+ </message>
+ <message>
+ <location line="+56"/>
+ <source>Output &Panes</source>
+ <translation>&Pannelli di Uscita</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::PluginDialog</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/plugindialog.cpp" line="+54"/>
+ <source>Details</source>
+ <translation>Dettagli</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error Details</source>
+ <translation>Dettagli Errore</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Close</source>
+ <translation>Chiudi</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Installed Plugins</source>
+ <translation>Plugin Installati</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Plugin Details of %1</source>
+ <translation>Dettagli Plugin di %1</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Plugin Errors of %1</source>
+ <translation>Errore Plugin di %1</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::ProgressView</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/progressmanager/progressview.cpp" line="+47"/>
+ <source>Processes</source>
+ <translation>Processi</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::SaveItemsDialog</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/dialogs/saveitemsdialog.cpp" line="+55"/>
+ <source>Don't Save</source>
+ <translation>Non Salvare</translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>Save All</source>
+ <translation>Salva Tutti</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Save</source>
+ <translation>Salva</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Save Selected</source>
+ <translation>Salva Selezionati</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::ShortcutSettings</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/dialogs/shortcutsettings.cpp" line="+70"/>
+ <source>Keyboard</source>
+ <translation>Tastiera</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Environment</source>
+ <translation>Ambiente</translation>
+ </message>
+ <message>
+ <location line="+160"/>
+ <source>Import Keyboard Mapping Scheme</source>
+ <translation>Importa la Mappatura della Tastiera</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+32"/>
+ <source>Keyboard Mapping Scheme (*.kms)</source>
+ <translation>Mappatura della Tastiera (*.kms)</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Export Keyboard Mapping Scheme</source>
+ <translation>Esporta Mappatura della Tastiera</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::SideBarWidget</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/sidebar.cpp" line="-131"/>
+ <source>Split</source>
+ <translation>Dividi</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Close</source>
+ <translation>Chiudi</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::VersionDialog</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/versiondialog.cpp" line="+57"/>
+ <source>About Qt Creator</source>
+ <translation>Informazioni su Qt Creator</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source><h3>Qt Creator %1</h3>Based on Qt %2<br/><br/>Built on </source>
+ <translation><h3>Qt Creator %1</h3>Basato su Qt %2<br/><br/>Creato su </translation>
+ </message>
+</context>
+<context>
+ <name>Core::Internal::WelcomeMode</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/welcomemode.cpp" line="+123"/>
+ <source>Welcome</source>
+ <translation>Benvenuto</translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>%1 (last session)</source>
+ <translation>%1 (sessione precedente)</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>Benvenuto</h1>
+<!-- QTextDocument does not support line-height, so wrap the lines manually ... -->
+<p>Qt Creator è un IDE moderno, intuitivo e multi-piattaforma che</p> <p>aiuta gli sviluppatori a creare applicazioni attraenti per</p>
+<p>dispositivi desktop, embedded e mobile. Fai clic su <strong>Comincia</strong></p>
+<p>per iniziare a sviluppare con Qt Creator.</p>
+<hr style="margin-top:15px"/>
+</translation>
+ </message>
+ <message>
+ <location/>
+ <source>* {
+ border-image: url(:/core/images/welcomemode/btn_27.png) 7;
+ border-width: 7;
+ padding: -2px 0;
+ font-size: 12px;
+ font-family: lucida sans, dejavu sans, sans serif;
+ color: black;
+}
+
+*:hover {
+ border-image: url(:/core/images/welcomemode/btn_27_hover.png) 7;
+ color: white;
+}
+</source>
+ <translation>* {
+ border-image: url(:/core/images/welcomemode/btn_27.png) 7;
+ border-width: 7;
+ padding: -2px 0;
+ font-size: 12px;
+ font-family: lucida sans, dejavu sans, sans serif;
+ color: black;
+}
+
+*:hover {
+ border-image: url(:/core/images/welcomemode/btn_27_hover.png) 7;
+ color: white;
+}
+</translation>
+ </message>
+ <message>
+ <location/>
+ <source><qt>Getting Started &gt;&gt;</source>
+ <translation><qt>Comincia &gt;&gt;</translation>
+ </message>
+ <message>
+ <location/>
+ <source>#recentSessionsFrame {
+ border-image: url(:/core/images/welcomemode/rc_combined.png) 8;
+ border-width: 8;
+}
+</source>
+ <translation>#recentSessionsFrame {
+ border-image: url(:/core/images/welcomemode/rc_combined.png) 8;
+ border-width: 8;
+}
+</translation>
+ </message>
+ <message>
+ <location/>
+ <source>* {
+ border-image: url(:/core/images/welcomemode/btn_26.png) 7;
+ border-width: 7;
+ padding: -2px 0;
+ font-size: 12px;
+ font-family: lucida sans, dejavu sans, sans serif;
+ color: black;
+}
+
+*:hover {
+ border-image: url(:/core/images/welcomemode/btn_26_hover.png) 7;
+ color: white;
+}
+</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location/>
+ <source><qt>Restore Last Session &gt;&gt;</source>
+ <translation><qt>Sessione Precedente &gt;&gt;</translation>
+ </message>
+ <message>
+ <location/>
+ <source>#bottomWidget {
+ background-image: url(:/core/images/welcomemode/feedback-bar-background.png);
+}
+</source>
+ <translation>#bottomWidget {
+ background-image: url(:/core/images/welcomemode/feedback-bar-background.png);
+}
+</translation>
+ </message>
+ <message>
+ <location/>
+ <source>* {
+ border-image: url(:/core/images/welcomemode/btn_26.png) 7;
+ border-width: 7;
+ padding: -2px 2px;
+ font-size: 12px;
+ font-family: lucida sans, dejavu sans, sans serif;
+}
+
+*:hover {
+ border-image: url(:/core/images/welcomemode/btn_26_hover.png) 7;
+ color: white;
+}
+</source>
+ <translation>* {
+ border-image: url(:/core/images/welcomemode/btn_26.png) 7;
+ border-width: 7;
+ padding: -2px 2px;
+ font-size: 12px;
+ font-family: lucida sans, dejavu sans, sans serif;
+}
+
+*:hover {
+ border-image: url(:/core/images/welcomemode/btn_26_hover.png) 7;
+ color: white;
+}
+</translation>
+ </message>
+ <message>
+ <location/>
+ <source><qt>Feedback&nbsp;&nbsp;<img src=":/core/images/welcomemode/feedback_arrow.png" /></source>
+ <translation><qt>Commenti&nbsp;&nbsp;<img src=":/core/images/welcomemode/feedback_arrow.png" /></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Help us make Qt Creator even better</source>
+ <translation>Aiutaci a migliorare Qt Creator</translation>
+ </message>
+</context>
+<context>
+ <name>Core::ModeManager</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/modemanager.cpp" line="+144"/>
+ <source>Switch to %1 mode</source>
+ <translation>Passa alla modalità %1</translation>
+ </message>
+</context>
+<context>
+ <name>Core::ScriptManager</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/scriptmanager/scriptmanager.cpp" line="+237"/>
+ <source>Exception at line %1: %2
+%3</source>
+ <translation>Eccezione alla linea %1: %2
+%3</translation>
+ </message>
+ <message>
+ <location line="+67"/>
+ <source>Unknown error</source>
+ <translation>Errore sconosciuto</translation>
+ </message>
+</context>
+<context>
+ <name>Core::StandardFileWizard</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/basefilewizard.cpp" line="+73"/>
+ <source>New %1</source>
+ <translation>Nuovo %1</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Utils::ClassNameValidatingLineEdit</name>
+ <message>
+ <location filename="../../../src/libs/utils/classnamevalidatinglineedit.cpp" line="+85"/>
+ <source>The class name must not contain namespace delimiters.</source>
+ <translation>Il nome della classe non deve contenere namespace.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Please enter a class name.</source>
+ <translation>Inserisci il nome di una classe.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>The class name contains invalid characters.</source>
+ <translation>Il nome della classe contiene caratteri non validi.</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Utils::ConsoleProcess</name>
+ <message>
+ <location filename="../../../src/libs/utils/consoleprocess.cpp" line="+50"/>
+ <source>Cannot set up communication channel: %1</source>
+ <translation>Impossibile impostare il canale di comunicazione: %1</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cannot create temporary file: %1</source>
+ <translation>Impossibile creare il file temporaneo: %1</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>Press <RETURN> to close this window...</source>
+ <translation>Premi <INVIO> per chiudere questa finestra...</translation>
+ </message>
+ <message>
+ <location filename="../../../src/libs/utils/consoleprocess_unix.cpp" line="+111"/>
+ <source>Cannot start the terminal emulator '%1'.</source>
+ <translation>Impossibile avviare l'emulatore di terminale '%1'.</translation>
+ </message>
+ <message>
+ <location filename="../../../src/libs/utils/consoleprocess.cpp" line="+10"/>
+ <source>Cannot create temporary directory '%1': %2</source>
+ <translation>Impossibile create la cartella temporanea '%1': %2</translation>
+ </message>
+ <message>
+ <location filename="../../../src/libs/utils/consoleprocess_unix.cpp" line="+49"/>
+ <source>Cannot create socket '%1': %2</source>
+ <translation>Impossibile creare il socket '%1': %2</translation>
+ </message>
+ <message>
+ <location filename="../../../src/libs/utils/consoleprocess.cpp" line="+10"/>
+ <source>Cannot change to working directory '%1': %2</source>
+ <translation>Impossibile entrare nella cartella di lavoro '%1': %2</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Cannot execute '%1': %2</source>
+ <translation>Impossibile eseguire '%1': %2</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>Unexpected output from helper program.</source>
+ <translation>Uscita non attesa dal programma helper.</translation>
+ </message>
+ <message>
+ <location filename="../../../src/libs/utils/consoleprocess_win.cpp" line="+125"/>
+ <source>The process '%1' could not be started: %2</source>
+ <translation>Impossibile avviare il processo '%1': %2</translation>
+ </message>
+ <message>
+ <location line="+70"/>
+ <source>Cannot obtain a handle to the inferior: %1</source>
+ <translation>Impossibile ottenere un collegamento a: %1</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Cannot obtain exit status from inferior: %1</source>
+ <translation>Impossibile ottenere lo stato di uscita da: %1</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Utils::FileNameValidatingLineEdit</name>
+ <message>
+ <location filename="../../../src/libs/utils/filenamevalidatinglineedit.cpp" line="+96"/>
+ <source>The name must not be empty</source>
+ <translation>Il nome non deve essere vuoto</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>The name must not contain any of the characters '%1'.</source>
+ <translation>Il nome non deve contenere i caratteri '%1'.</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>The name must not contain '%1'.</source>
+ <translation>Il nome non deve contenere '%1'.</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The name must not match that of a MS Windows device. (%1).</source>
+ <translation>Il nome non può essere quello di un dispositivo MS Windows (%1).</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Utils::FileSearch</name>
+ <message numerus="yes">
+ <location filename="../../../src/libs/utils/filesearch.cpp" line="+46"/>
+ <source>%1: canceled. %n occurrences found in %2 files.</source>
+ <translation>
+ <numerusform>%1: annullato. %n ricorrenza trovata in %2 file.</numerusform>
+ <numerusform>%1: annullato. %n ricorrenze trovate in %2 file.</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location line="+8"/>
+ <source>%1: %n occurrences found in %2 files.</source>
+ <translation>
+ <numerusform>%1: %n ricorrenza trovata in %2 file.</numerusform>
+ <numerusform>%1: %n ricorrenze trovate in %2 file.</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location line="+8"/>
+ <source>%1: %n occurrences found in %2 of %3 files.</source>
+ <translation>
+ <numerusform>%1: %n ricorrenza trovata in %2 di %3 file.</numerusform>
+ <numerusform>%1: %n ricorrenze trovate in %2 di %3 file.</numerusform>
+ </translation>
+ </message>
+</context>
+<context>
+ <name>Core::Utils::NewClassWidget</name>
+ <message>
+ <location filename="../../../src/libs/utils/newclasswidget.ui"/>
+ <source>Class name:</source>
+ <translation>Nome classe:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Base class:</source>
+ <translation>Classe Base:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Header file:</source>
+ <translation>File Header:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Source file:</source>
+ <translation>File Sorgente:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Generate form:</source>
+ <translation>Genera form:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Form file:</source>
+ <translation>File form:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Path:</source>
+ <translation>Percorso:</translation>
+ </message>
+ <message>
+ <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+393"/>
+ <source>Invalid base class name</source>
+ <translation>Nome della classe base non valido</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Invalid header file name: '%1'</source>
+ <translation>Nome del file header non valido: '%1'</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Invalid source file name: '%1'</source>
+ <translation>Nome del file sorgente non valido: '%1'</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Invalid form file name: '%1'</source>
+ <translation>Nome del file form non valido: '%1'</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Utils::PathChooser</name>
+ <message>
+ <location filename="../../../src/libs/utils/pathchooser.cpp" line="+49"/>
+ <source>Choose...</source>
+ <translation>Scegli...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Browse...</source>
+ <translation>Sfoglia...</translation>
+ </message>
+ <message>
+ <location line="+117"/>
+ <source>Choose a directory</source>
+ <translation>Scegli una cartella</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Choose a file</source>
+ <translation>Scegli un file</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>The path must not be empty.</source>
+ <translation>Il percorso non può essere vuoto.</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>The path '%1' does not exist.</source>
+ <translation>Il percorso '%1' non esiste.</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>The path '%1' is not a directory.</source>
+ <translation>Il percorso '%1' non è una cartella.</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>The path '%1' is not a file.</source>
+ <translation>Il percorso '%1' non è un file.</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Path:</source>
+ <translation>Percorso:</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Utils::PathListEditor</name>
+ <message>
+ <location filename="../../../src/libs/utils/pathlisteditor.cpp" line="+120"/>
+ <source>Insert...</source>
+ <translation>Inserisci...</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Add...</source>
+ <translation>Aggiungi...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Delete line</source>
+ <translation>Cancella riga</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation>Cancella</translation>
+ </message>
+ <message>
+ <location line="+130"/>
+ <source>From "%1"</source>
+ <translation>Da "%1"</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Utils::ProjectIntroPage</name>
+ <message>
+ <location filename="../../../src/libs/utils/projectintropage.ui"/>
+ <source>Introduction and project location</source>
+ <translation>Introduzione e posizione del progetto</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Name:</source>
+ <translation>Nome:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Create in:</source>
+ <translation>Crea in:</translation>
+ </message>
+ <message>
+ <location filename="../../../src/libs/utils/projectintropage.cpp" line="+66"/>
+ <source><Enter_Name></source>
+ <translation><Inserisci__Nome></translation>
+ </message>
+ <message>
+ <location line="+97"/>
+ <source>The project already exists.</source>
+ <translation>Il progetto è già presente.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>A file with that name already exists.</source>
+ <translation>Un file con lo stesso nome è già presente.</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Utils::ProjectNameValidatingLineEdit</name>
+ <message>
+ <location filename="../../../src/libs/utils/projectnamevalidatinglineedit.cpp" line="+51"/>
+ <source>The name must not contain the '.'-character.</source>
+ <translation>Il nome non può contenere il carattere '.'.</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Utils::SubmitEditorWidget</name>
+ <message>
+ <location filename="../../../src/libs/utils/submiteditorwidget.ui"/>
+ <source>Subversion Submit</source>
+ <translation>Invio Subversion</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Des&cription</source>
+ <translation>Des&crizione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>F&iles</source>
+ <translation>F&ile</translation>
+ </message>
+</context>
+<context>
+ <name>Core::Utils::WizardPage</name>
+ <message>
+ <location filename="../../../src/libs/utils/filewizardpage.ui"/>
+ <source>Choose the location</source>
+ <translation>Scegli la posizione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Name:</source>
+ <translation>Nome:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Path:</source>
+ <translation>Percorso:</translation>
+ </message>
+</context>
+<context>
+ <name>CppEditor::Internal::CPPEditor</name>
+ <message>
+ <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+258"/>
+ <source>Sort alphabetically</source>
+ <translation>Ordine alfabetico</translation>
+ </message>
+</context>
+<context>
+ <name>CppEditor::Internal::ClassNamePage</name>
+ <message>
+ <location filename="../../../src/plugins/cppeditor/cppclasswizard.cpp" line="+62"/>
+ <source>Enter class name</source>
+ <translation>Inserisci il nome della classe</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The header and source file names will be derived from the class name</source>
+ <translation>I nomi dei file header e sorgente saranno derivati dal nome della classe</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Configure...</source>
+ <translation>Configura...</translation>
+ </message>
+</context>
+<context>
+ <name>CppEditor::Internal::CppClassWizard</name>
+ <message>
+ <location line="+116"/>
+ <source>Error while generating file contents.</source>
+ <translation>Errore durante la generazione del contenuto dei file.</translation>
+ </message>
+</context>
+<context>
+ <name>CppEditor::Internal::CppClassWizardDialog</name>
+ <message>
+ <location line="-66"/>
+ <source>C++ Class Wizard</source>
+ <translation>Assistente alla creazione Classe C++</translation>
+ </message>
+</context>
+<context>
+ <name>CppEditor::Internal::CppHoverHandler</name>
+ <message>
+ <location filename="../../../src/plugins/cppeditor/cpphoverhandler.cpp" line="+87"/>
+ <source>Unfiltered</source>
+ <translation>Non filtrato</translation>
+ </message>
+</context>
+<context>
+ <name>CppEditor::Internal::CppPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+167"/>
+ <source>C++</source>
+ <translation>C++</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Creates a new C++ header file.</source>
+ <translation>Crea un nuovo file header C++.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>C++ Header File</source>
+ <translation>File Header C++</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Creates a new C++ source file.</source>
+ <translation>Crea un nuovo file sorgente C++.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>C++ Source File</source>
+ <translation>File Sorgente C++</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>C++ Class</source>
+ <translation>Classe C++</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Creates a header and a source file for a new class.</source>
+ <translation>Crea i file header e sorgente per una nuova classe.</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Follow Symbol under Cursor</source>
+ <translation>Segui il Simbolo sotto al Cursore</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Switch between Method Declaration/Definition</source>
+ <translation>Passa tra Dichiarazione e Definizione del Metodo</translation>
+ </message>
+</context>
+<context>
+ <name>CppFileSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/cpptools/cppfilesettingspage.ui"/>
+ <source>Header suffix:</source>
+ <translation>Estensione header:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>This determines how the file names of the class wizards are generated ("MyClass.h" versus "myclass.h").</source>
+ <translation>Determina come siano generati i nomi dei file nell'assistente alla creazione della classe ("MiaClasse.h" contro "miaclasse.h").</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Lower case file names:</source>
+ <translation>Nomi dei file in minuscolo:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Source suffix:</source>
+ <translation>Estensione sorgente:</translation>
+ </message>
+</context>
+<context>
+ <name>CppPreprocessor</name>
+ <message>
+ <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+474"/>
+ <source>%1: No such file or directory</source>
+ <translation>%1: File o cartella inesistente.</translation>
+ </message>
+</context>
+<context>
+ <name>CppTools</name>
+ <message>
+ <location filename="../../../src/plugins/cpptools/cpptoolsconstants.h" line="+52"/>
+ <source>File naming conventions</source>
+ <translation>Convenzioni sul nome dei file</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>C++</source>
+ <translation>C++</translation>
+ </message>
+</context>
+<context>
+ <name>CppTools::Internal::CompletionSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/cpptools/completionsettingspage.cpp" line="+57"/>
+ <source>Completion</source>
+ <translation>Completamento</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Text Editor</source>
+ <translation>Editor di Testo</translation>
+ </message>
+</context>
+<context>
+ <name>CppTools::Internal::CppClassesFilter</name>
+ <message>
+ <location filename="../../../src/plugins/cpptools/cppclassesfilter.h" line="+46"/>
+ <source>Classes</source>
+ <translation>Classi</translation>
+ </message>
+</context>
+<context>
+ <name>CppTools::Internal::CppFunctionsFilter</name>
+ <message>
+ <location filename="../../../src/plugins/cpptools/cppfunctionsfilter.h" line="+46"/>
+ <source>Methods</source>
+ <translation>Metodi</translation>
+ </message>
+</context>
+<context>
+ <name>CppTools::Internal::CppModelManager</name>
+ <message>
+ <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+253"/>
+ <source>Indexing</source>
+ <translation>Indicizzazione</translation>
+ </message>
+</context>
+<context>
+ <name>CppTools::Internal::CppQuickOpenFilter</name>
+ <message>
+ <location filename="../../../src/plugins/cpptools/cppquickopenfilter.h" line="+53"/>
+ <source>Classes and Methods</source>
+ <translation>Classi e Metodi</translation>
+ </message>
+</context>
+<context>
+ <name>CppTools::Internal::CppToolsPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/cpptools/cpptoolsplugin.cpp" line="+102"/>
+ <source>&C++</source>
+ <translation>&C++</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Switch Header/Source</source>
+ <translation>Passa tra Header/Sorgente</translation>
+ </message>
+</context>
+<context>
+ <name>CppTools::Internal::FunctionArgumentWidget</name>
+ <message>
+ <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+391"/>
+ <source>%1 of %2</source>
+ <translation>%1 di %2</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/debuggerconstants.h" line="+56"/>
+ <source>Common</source>
+ <translation>Comune</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Debugger</source>
+ <translation>Debugger</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+365"/>
+ <source><Encoding error></source>
+ <translation><Errore di codifica></translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::AttachCoreDialog</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+134"/>
+ <source>Select Executable</source>
+ <translation>Scegli l'Eseguibile</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Select Core File</source>
+ <translation>Scegli il File Core</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::AttachExternalDialog</name>
+ <message>
+ <location line="-58"/>
+ <source>Process ID</source>
+ <translation>ID di Processo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Name</source>
+ <translation>Nome</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>State</source>
+ <translation>Stato</translation>
+ </message>
+ <message>
+ <location line="+165"/>
+ <source>Refresh</source>
+ <translation>Aggiorna</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::AttachTcfDialog</name>
+ <message>
+ <location line="+71"/>
+ <source>Select Executable</source>
+ <translation>Scegli l'Eseguibile</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::BreakHandler</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/breakhandler.cpp" line="+387"/>
+ <source>Number</source>
+ <translation>Numero</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Function</source>
+ <translation>Funzione</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>File</source>
+ <translation>File</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Line</source>
+ <translation>Riga</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Condition</source>
+ <translation>Condizione</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Ignore</source>
+ <translation>Ignora</translation>
+ </message>
+ <message>
+ <location line="+57"/>
+ <source>Breakpoint will only be hit if this condition is met.</source>
+ <translation>L'interruzione avverrà solo se questa condizione è soddisfatta.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Breakpoint will only be hit after being ignored so many times.</source>
+ <translation>L'interruzione avverrà dopo essere stata ignorata per queste volte.</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::BreakWindow</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/breakwindow.cpp" line="+55"/>
+ <source>Breakpoints</source>
+ <translation>Punti di Interruzione</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Delete breakpoint</source>
+ <translation>Cancella punto di interruzione</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Adjust column widths to contents</source>
+ <translation>Adatta la larghezza delle colonne al contenuto</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Always adjust column widths to contents</source>
+ <translation>Adatta sempre la larghezza al contenuto</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Edit condition...</source>
+ <translation>Modifica la condizione...</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Synchronize breakpoints</source>
+ <translation>Sincronizza i punti di interruzione</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Disable breakpoint</source>
+ <translation>Disabilita punto di interruzione</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Enable breakpoint</source>
+ <translation>Abilita punto di interruzione</translation>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>Conditions on Breakpoint %1</source>
+ <translation>Condizioni sul punto di interruzione %1</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::CdbDebugEngine</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/cdb/cdbdebugengine.cpp" line="+124"/>
+ <source>Unable to load the debugger engine library '%1': %2</source>
+ <translation>Impossibile caricare la libreria del debugger '%1': %2</translation>
+ </message>
+ <message>
+ <location line="+110"/>
+ <source>Unable to resolve '%1' in the debugger engine library '%2'</source>
+ <translation>Impossibile risolvere '%1' nella libreria del debugger '%2'</translation>
+ </message>
+ <message>
+ <location line="+232"/>
+ <source>The dumper library '%1' does not exist.</source>
+ <translation>La libreria dumper '%1' non esiste.</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>The console stub process was unable to start '%1'.</source>
+ <translation>Il caricatore da console non è riuscito a lanciare '%1'.</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Attaching to core files is not supported!</source>
+ <translation>L'aggancio al core non è supportato!</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Debugger running</source>
+ <translation>Debugger in esecuzione</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Attaching to a process failed for process id %1: %2</source>
+ <translation>Aggancio al processo non riuscito per il pid %1: %2</translation>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Unable to create a process '%1': %2</source>
+ <translation>Impossibile creare il processo '%1': %2</translation>
+ </message>
+ <message>
+ <location line="+465"/>
+ <source>Unable to assign the value '%1' to '%2': %3</source>
+ <translation>Impossibile assegnare il valore '%1' a '%2': %3</translation>
+ </message>
+ <message>
+ <location line="+218"/>
+ <source>Cannot retrieve symbols while the debuggee is running.</source>
+ <translation>Impossibile recuperare i simboli mentre il debugger è in esecuzione.</translation>
+ </message>
+ <message>
+ <location line="+85"/>
+ <location line="+6"/>
+ <source>Debugger Error</source>
+ <translation>Errore del Debugger</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::CdbDumperHelper</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/cdb/cdbdumperhelper.cpp" line="+191"/>
+ <source>injection</source>
+ <translation>iniezione</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>debugger call</source>
+ <translation>chiamata al debugger</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Loading the custom dumper library '%1' (%2) ...</source>
+ <translation>Caricamento della libreria dei dumper speciali '%1' (%2) ...</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Loading of the custom dumper library '%1' (%2) failed: %3</source>
+ <translation>Errore nel caricamento della libreria dei dumper speciali '%1' (%2): %3</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Loaded the custom dumper library '%1' (%2).</source>
+ <translation>La libreria dei dumper speciali è stata caricata '%1' (%2).</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Disabling dumpers due to debuggee crash...</source>
+ <translation>Disabilitazione dei dumper a causa del crash del programma di cui si sta facendo il debug...</translation>
+ </message>
+ <message>
+ <location line="+111"/>
+ <source>The debuggee does not appear to be Qt application.</source>
+ <translation>Il programma di cui si sta eseguendo il debug non pare un'applicazione Qt.</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Initializing dumpers...</source>
+ <translation>Inizializzazione dei dumper...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom dumper library initialized.</source>
+ <translation>La libreria dei dumper speciali è stata inizializzata.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The custom dumper library could not be initialized: %1</source>
+ <translation>La libreria dei dumper speciali non può essere inizializzata: %1</translation>
+ </message>
+ <message>
+ <location line="+189"/>
+ <source>Querying dumpers for '%1'/'%2' (%3)</source>
+ <translation>Interrogazione dei dumper per '%1'/'%2' (%3)</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::CdbOptionsPageWidget</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="+37"/>
+ <source>Cdb</source>
+ <translation>Cdb</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Autodetect</source>
+ <translation>Autorilevamento</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::CdbSymbolPathListEditor</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp" line="+42"/>
+ <source>Symbol Server...</source>
+ <translation>Server dei Simboli...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Adds the Microsoft symbol server providing symbols for operating system libraries.Requires specifying a local cache directory.</source>
+ <translation>Aggiunge il server dei simboli Microsoft, che fornisce i simboli delle librerie del sistema operativo. Richiede di impostare una cartella di cache locale.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Pick a local cache directory</source>
+ <translation>Scegli una cartella di cache locale</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::DebugMode</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+185"/>
+ <source>Debug</source>
+ <translation>Debug</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::DebuggerManager</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+311"/>
+ <source>Continue</source>
+ <translation>Continua</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <location line="+956"/>
+ <source>Interrupt</source>
+ <translation>Interrompi</translation>
+ </message>
+ <message>
+ <location line="-952"/>
+ <source>Reset Debugger</source>
+ <translation>Reimposta il Debugger</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Step Over</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Step Into</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Step Over Instruction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Step One Instruction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Step Out</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Run to Line</source>
+ <translation>Esegui fino alla Riga</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Run to Outermost Function</source>
+ <translation>Esegui fino alla Funzione più Esterna</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Jump to Line</source>
+ <translation>Salta alla Riga</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Toggle Breakpoint</source>
+ <translation>Commuta Punto di Interruzione</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Set Breakpoint at Function...</source>
+ <translation>Imposta Punto di Interruzione alla Funzione...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Set Breakpoint at Function "main"</source>
+ <translation>Imposta Punto di Interruzione alla Funzione "main"</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Add to Watch Window</source>
+ <translation>Aggiungi alla Finestra di Osservazione</translation>
+ </message>
+ <message>
+ <location line="+209"/>
+ <source>Stop requested...</source>
+ <translation>Richiesta interruzione...</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+18"/>
+ <source>Stopped.</source>
+ <translation>Fermato.</translation>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>Running requested...</source>
+ <translation>Richiesta esecuzione...</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Running...</source>
+ <translation>In esecuzione...</translation>
+ </message>
+ <message>
+ <location line="+108"/>
+ <location line="+23"/>
+ <source>Changing breakpoint state requires either a fully running or fully stopped application.</source>
+ <translation>Per commutare un punto di interruzione si richiede un'applicazione completamente in esecuzione oppure completamente arrestata.</translation>
+ </message>
+ <message>
+ <location line="+77"/>
+ <source>Debugging VS executables is not supported.</source>
+ <translation>Il debug degli eseguibili VS non è supportato.</translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <location line="+125"/>
+ <source>Warning</source>
+ <translation>Attenzione</translation>
+ </message>
+ <message>
+ <location line="-124"/>
+ <source>Cannot attach to PID 0</source>
+ <translation>Impossibile collegarsi al PID 0</translation>
+ </message>
+ <message>
+ <location line="+125"/>
+ <source>Cannot debug '%1': %2</source>
+ <translation>Impossibile debuggare '%1': %2</translation>
+ </message>
+ <message>
+ <location line="+178"/>
+ <source>Save Debugger Log</source>
+ <translation>Salva il Log del Debugger</translation>
+ </message>
+ <message>
+ <location line="+103"/>
+ <source>Stop Debugger</source>
+ <translation>Ferma il Debugger</translation>
+ </message>
+ <message>
+ <location line="+273"/>
+ <source>Open Qt preferences</source>
+ <translation>Apri le preferenze Qt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Turn helper usage off</source>
+ <translation>Disattiva l'utilizzo degli helper</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Continue anyway</source>
+ <translation>Continua comunque</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Debugging helper missing</source>
+ <translation>Mancano gli helper per il debug</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The debugger did not find the debugging helper library.</source>
+ <translation>Il debugger non ha trovato la libreria helper.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The debugging helper is used to nicely format the values of Qt data types and some STL data types. It must be compiled for each Qt version which you can do in the Qt preferences page by selecting a Qt installation and clicking on 'Rebuild' for the debugging helper.</source>
+ <translation>La libreria helper per il debug serve a presentare i valori dei tipi di dati Qt e di alcuni tipi STL. Deve essere compilata per ogni versione di Qt e per farlo è necessario aprire le preferenze Qt, selezionare una versione di Qt e fare clic su 'Ricompila'.</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::DebuggerOutputWindow</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="+210"/>
+ <source>Debugger</source>
+ <translation>Debugger</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::DebuggerPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+287"/>
+ <source>Start and Debug External Application...</source>
+ <translation>Avvio e Debug di Applicazione Esterna...</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Attach to Running External Application...</source>
+ <translation>Collegamento ad una Applicazione in Esecuzione...</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Attach to Core...</source>
+ <translation>Collegamento ad un Core...</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Attach to Running Tcf Agent...</source>
+ <translation>Collegamento ad un Agente Tcf in Esecuzione...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This attaches to a running 'Target Communication Framework' agent.</source>
+ <translation>Ci si collega ad un agente 'Target Communication Framework' in esecuzione.</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Start and Attach to Remote Application...</source>
+ <translation>Avvia e Collegati ad un'Applicazione Remota...</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Detach debugger</source>
+ <translation>Stacca il debugger</translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Stop Debugger/Interrupt Debugger</source>
+ <translation>Ferma/Interrompi il Debugger</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Reset Debugger</source>
+ <translation>Reimposta il Debugger</translation>
+ </message>
+ <message>
+ <location line="+87"/>
+ <source>&Views</source>
+ <translation>&Viste</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Locked</source>
+ <translation>Bloccato</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Reset to default layout</source>
+ <translation>Ripristina la struttura predefinita</translation>
+ </message>
+ <message>
+ <location line="+87"/>
+ <source>Threads:</source>
+ <translation>Thread:</translation>
+ </message>
+ <message>
+ <location line="+158"/>
+ <source>Remove Breakpoint</source>
+ <translation>Rimuovi Punto di Interruzione</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Disable Breakpoint</source>
+ <translation>Disabilita Punto di Interruzione</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Enable Breakpoint</source>
+ <translation>Abilita Punto di Interruzione</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Set Breakpoint</source>
+ <translation>Imposta Punto di Interruzione</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::DebuggerRunner</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+73"/>
+ <source>Debug</source>
+ <translation>Debug</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::DebuggerSettings</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/debuggeractions.cpp" line="+112"/>
+ <source>Debugger properties...</source>
+ <translation>Proprietà del Debugger...</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Adjust column widths to contents</source>
+ <translation>Adatta la larghezza delle colonne al contenuto</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Always adjust column widths to contents</source>
+ <translation>Adatta sempre la larghezza al contenuto</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Use alternating row colors</source>
+ <translation>Alterna i colori delle righe</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Watch expression "%1"</source>
+ <translation>Osserva espressione "%1"</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Remove watch expression "%1"</source>
+ <translation>Rimuovi osserva espressione "%1"</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Watch expression "%1" in separate window</source>
+ <translation>Osserva espressione "%1" in un'altra finestra</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Expand item</source>
+ <translation>Espandi elemento</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Collapse item</source>
+ <translation>Comprimi elemento</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Use debugging helper</source>
+ <translation>Usa l'helper del debug</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Debug debugging helper</source>
+ <translation>Debug dell'helper di debug</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Recheck debugging helper availability</source>
+ <translation>Controlla la disponibilità dell'helper di debug</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Synchronize breakpoints</source>
+ <translation>Sincronizza i punti di interruzione</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Hexadecimal</source>
+ <translation>Esadecimale</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Decimal</source>
+ <translation>Decimale</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Octal</source>
+ <translation>Ottale</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Binary</source>
+ <translation>Binario</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Raw</source>
+ <translation>Grezzo</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Natural</source>
+ <translation>Naturale</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Automatically quit debugger</source>
+ <translation>Chiudi il debugger automaticamente</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Use tooltips when debugging</source>
+ <translation>Usa i suggerimenti durante il debug</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>List source files</source>
+ <translation>Mostra i file sorgenti</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Skip known frames</source>
+ <translation>Semplifica le sequenze note</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Reload full stack</source>
+ <translation>Ricarica lo stack completo</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Execute line</source>
+ <translation>Esegui riga</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::DebuggingHelperOptionPage</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-597"/>
+ <source>Debugging Helper</source>
+ <translation>Helper del Debug</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Choose DebuggingHelper Location</source>
+ <translation>Scegli la posizione dell'Helper del Debug</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Ctrl+Shift+F11</source>
+ <translation>Ctrl+Shift+F11</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::DisassemblerHandler</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/disassemblerhandler.cpp" line="+135"/>
+ <source>Address</source>
+ <translation>Indirizzo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Symbol</source>
+ <translation>Simbolo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Mnemonic</source>
+ <translation>Mnemonico</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::DisassemblerWindow</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/disassemblerwindow.cpp" line="+46"/>
+ <source>Disassembler</source>
+ <translation>Disassemblatore</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Adjust column widths to contents</source>
+ <translation>Adatta la larghezza delle colonne al contenuto</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Always adjust column widths to contents</source>
+ <translation>Adatta sempre la larghezza al contenuto</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Reload disassembler listing</source>
+ <translation>Ricarica il testo del disassemblatore</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Always reload disassembler listing</source>
+ <translation>Ricarica sempre il testo del disassemblatore</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::GdbEngine</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/gdbengine.cpp" line="+198"/>
+ <source>The Gdb process failed to start. Either the invoked program '%1' is missing, or you may have insufficient permissions to invoke the program.</source>
+ <translation>Il progesso Gdb non è partito. Può essere che manchi il programma '%1' o che i permessi siano insufficienti.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The Gdb process crashed some time after starting successfully.</source>
+ <translation>Il processo Gdb è andato in crash dopo essere stato avviato correttamente.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <location line="+39"/>
+ <source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
+ <translation>L'ultima funzione waitFor...() è andata oltre il tempo masimo. Lo stato del QProcess non è cambiato, e puoi provare a chiamare waitFor...() nuovamente.</translation>
+ </message>
+ <message>
+ <location line="-34"/>
+ <source>An error occurred when attempting to write to the Gdb process. For example, the process may not be running, or it may have closed its input channel.</source>
+ <translation>C'è stato un errore inviando dati al progesso Gdb. Può darsi che il processo non sia in esecuzione o potrebbe avere chiuso il suo canale d'ingresso.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>An error occurred when attempting to read from the Gdb process. For example, the process may not be running.</source>
+ <translation>C'è stato un errore leggendo i dati dal processo Gdb. Può essere che il processo non sia più in esecuzione.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>An unknown error in the Gdb process occurred. This is the default return value of error().</source>
+ <translation>C'è stato un errore sconosciuto relativo al processo Gdb. Questo è il valore di ritorno di error().</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <location line="+39"/>
+ <location line="+970"/>
+ <location line="+19"/>
+ <location line="+407"/>
+ <source>Error</source>
+ <translation>Errore</translation>
+ </message>
+ <message>
+ <location line="-1425"/>
+ <source>The upload process failed to start. Either the invoked script '%1' is missing, or you may have insufficient permissions to invoke the program.</source>
+ <translation>Non è stato possibile avviare il processo di caricamento. Potrebbe mancare lo script '%1', o potresti avere i permessi insufficienti all'avvio del programma.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The upload process crashed some time after starting successfully.</source>
+ <translation>Il processo di caricamento è andato in crash dopo essere stato avviato correttamente.</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>An error occurred when attempting to write to the upload process. For example, the process may not be running, or it may have closed its input channel.</source>
+ <translation>C'è stato un errore inviando dati al progesso di caricamento. Può darsi che il processo non sia in esecuzione o potrebbe avere chiuso il suo canale d'ingresso.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>An error occurred when attempting to read from the upload process. For example, the process may not be running.</source>
+ <translation>C'è stato un errore leggendo i dati dal processo di caricamento. Può essere che il processo non sia più in esecuzione.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>An unknown error in the upload process occurred. This is the default return value of error().</source>
+ <translation>C'è stato un errore sconosciuto relativo al processo di caricamento. Questo è il valore di ritorno di error().</translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>Library %1 loaded.</source>
+ <translation>Libreria '%1' caricata.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Library %1 unloaded.</source>
+ <translation>Libreria '%1' rimossa.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Thread group %1 created.</source>
+ <translation>Creato il gruppo di thread %1.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Thread %1 created.</source>
+ <translation>Creato il thread %1.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Thread group %1 exited.</source>
+ <translation>Il gruppo di thread %1 è uscito.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Thread %1 in group %2 exited.</source>
+ <translation>Il thread %1 del gruppo %2 è uscito.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Thread %1 selected.</source>
+ <translation>Selezionato il thread %1.</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Reading %1...</source>
+ <translation>Lettura di %1...</translation>
+ </message>
+ <message>
+ <location line="+102"/>
+ <source>Debugger Error</source>
+ <translation>Errore del Debugger</translation>
+ </message>
+ <message>
+ <location line="+112"/>
+ <source>Stopping temporarily.</source>
+ <translation>Interruzione temporanea.</translation>
+ </message>
+ <message>
+ <location line="+74"/>
+ <source>Continuing after temporary stop.</source>
+ <translation>Continuo dopo l'interruzione temporanea.</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Core file loaded.</source>
+ <translation>Caricato il file core.</translation>
+ </message>
+ <message>
+ <location line="+117"/>
+ <source>Jumped. Stopped.</source>
+ <translation>Salto concluso. Fermato.</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <location line="+241"/>
+ <source>Run to Function finished. Stopped.</source>
+ <translation>Esegui fino alla Funzione concluso. Fermato.</translation>
+ </message>
+ <message>
+ <location line="-161"/>
+ <source>Program exited with exit code %1</source>
+ <translation>Il programma è uscito con il codice %1</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Program exited after receiving signal %1</source>
+ <translation>Il programma è uscito dopo aver ricevuto il segnale %1</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Program exited normally</source>
+ <translation>Il programma è uscito normalmente</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Processing queued commands.</source>
+ <translation>Esecuzione dei comandi accodati.</translation>
+ </message>
+ <message>
+ <location line="+2457"/>
+ <source><0 items></source>
+ <translation><0 elementi></translation>
+ </message>
+ <message>
+ <location line="-2443"/>
+ <source>Loading %1...</source>
+ <translation>Caricamento di %1...</translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source>Stopped at breakpoint.</source>
+ <translation>Fermato al punto di interruzione.</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Stopped.</source>
+ <translation>Fermato.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Stopped: "%1"</source>
+ <translation>Fermato: "%1"</translation>
+ </message>
+ <message>
+ <location line="+99"/>
+ <source>The debugger you are using identifies itself as:</source>
+ <translation>Il debugger che stai usando si identifica come:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This version is not officially supported by Qt Creator.
+Debugging will most likely not work well.
+Using gdb 6.7 or later is strongly recommended.</source>
+ <translation>Questa versione non è supportata ufficialmente da Qt Creator.
+Il debug probabilmente non funzionerà molto bene.
+L'utilizzo di gdb 6.7 o successivi è fortemente consigliato.</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <location line="+19"/>
+ <source>Starting executable failed:
+</source>
+ <translation>Avvio dell'eseguibile non riuscito:</translation>
+ </message>
+ <message>
+ <location line="+148"/>
+ <location line="+27"/>
+ <source>Debugger Startup Failure</source>
+ <translation>Errore in Avvio del Debugger</translation>
+ </message>
+ <message>
+ <location line="-26"/>
+ <source>Cannot set up communication with child process: %1</source>
+ <translation>Impossibile instaurare una comunicazione con il processo figlio: %1</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Starting Debugger: </source>
+ <translation>Avvio del Debugger:</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Cannot start debugger: %1</source>
+ <translation>Impossibile avviare il debugger: %1</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Gdb Running...</source>
+ <translation>Gdb in Esecuzione...</translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>Cannot find debugger initialization script</source>
+ <translation>Impossibile trovare lo script di inizializzazione del debugger</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The debugger settings point to a script file at '%1' which is not accessible. If a script file is not needed, consider clearing that entry to avoid this warning. </source>
+ <translation>Le impostazioni del debugger puntano da un file di script '%1' che non è accessibile. Se non si ha bisogno del file di script, cancellare quell'impostazione per evitare questo avviso.</translation>
+ </message>
+ <message>
+ <location line="+93"/>
+ <source>Attached to running process. Stopped.</source>
+ <translation>Collegato al processo in esecuzione. Fermato.</translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source>Connecting to remote server failed:</source>
+ <translation>Problema con la connessione al server remoto:</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Debugger exited.</source>
+ <translation>Il debugger è uscito.</translation>
+ </message>
+ <message>
+ <location line="+623"/>
+ <source><could not retreive module information></source>
+ <translation><impossibile recuperare le informazioni del modulo></translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>Unable to run '%1': %2</source>
+ <translation>Impossibile eseguire '%1': %2</translation>
+ </message>
+ <message>
+ <location line="+61"/>
+ <source><unknown></source>
+ <extracomment>End address of loaded module</extracomment>
+ <translation><sconosciuto></translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <location line="+83"/>
+ <source>Retrieving data for stack view...</source>
+ <translation>Recupero dei dati per la vista dello stack...</translation>
+ </message>
+ <message>
+ <location line="+188"/>
+ <source>'%1' contains no identifier</source>
+ <translation>'%1' non contiene un identificatore</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>String literal %1</source>
+ <translation>Stringa %1</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cowardly refusing to evaluate expression '%1' with potential side effects</source>
+ <translation>Rifiuto la valutazione dell'espressione '%1' con potenziali effetti collaterali</translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source><not in scope></source>
+ <extracomment>Variable</extracomment>
+ <translation><fuori contesto></translation>
+ </message>
+ <message>
+ <location line="+112"/>
+ <location line="+42"/>
+ <source>Retrieving data for watch view (%1 requests pending)...</source>
+ <translation>Recupero dei dati per la vista delle osservazioni (%1 richieste rimanenti)...</translation>
+ </message>
+ <message>
+ <location line="+209"/>
+ <source>Finished retrieving data.</source>
+ <translation>Fine del recupero dei dati.</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Cannot evaluate expression: %1</source>
+ <translation>Impossibile valutare l'espressione: %1</translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Debugging helpers not found.</source>
+ <translation>Helper per il debug non trovati.</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>%1 custom dumpers found.</source>
+ <translation>Trovati %1 dumper speciali.</translation>
+ </message>
+ <message>
+ <location line="+111"/>
+ <source>Custom dumper setup: %1</source>
+ <translation>Setup dumper speciali: %1</translation>
+ </message>
+ <message>
+ <location line="+172"/>
+ <source><%1 items></source>
+ <extracomment>In string list</extracomment>
+ <translation><%1 elementi></translation>
+ </message>
+ <message>
+ <location line="+124"/>
+ <source>%1 <shadowed %2></source>
+ <extracomment>Variable %1 <FIXME: does something - bug Andre about it></extracomment>
+ <translation>%1 <oscura %2></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source><shadowed></source>
+ <extracomment>Type of variable <FIXME: what? bug Andre about it></extracomment>
+ <translation><oscurata></translation>
+ </message>
+ <message>
+ <location line="+159"/>
+ <source><n/a></source>
+ <translation><n/d></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source><anonymous union></source>
+ <translation><unione anonima></translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source><no information></source>
+ <extracomment>About variable's value</extracomment>
+ <translation><nessuna informazione></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Unknown error: </source>
+ <translation>Errore sconosciuto:</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>%1 is a typedef.</source>
+ <translation>%1 è un typedef.</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Retrieving data for tooltip...</source>
+ <translation>Recupero dei dati per il suggerimento...</translation>
+ </message>
+ <message>
+ <location line="+69"/>
+ <source>The dumper library '%1' does not exist.</source>
+ <translation>La libreria dei dumper '%1' non esiste.</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::GdbOptionsPage</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/gdboptionspage.cpp" line="+8"/>
+ <source>Gdb</source>
+ <translation>Gdb</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Choose Gdb Location</source>
+ <translation>Scegli la posizione di Gdb</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Choose Location of Startup Script File</source>
+ <translation>Scegli la posizione dello Script di Avvio</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::ModulesModel</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/moduleshandler.cpp" line="+87"/>
+ <source>Module name</source>
+ <translation>Nome del Modulo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Symbols read</source>
+ <translation>Simboli letti</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Start address</source>
+ <translation>Indirizzo di partenza</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>End address</source>
+ <translation>Indirizzo di fine</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::ModulesWindow</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/moduleswindow.cpp" line="+64"/>
+ <source>Modules</source>
+ <translation>Moduli</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Update module list</source>
+ <translation>Aggiorna la lista dei moduli</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Adjust column widths to contents</source>
+ <translation>Adatta la larghezza delle colonne al contenuto</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Always adjust column widths to contents</source>
+ <translation>Adatta sempre la larghezza al contenuto</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show source files for module "%1"</source>
+ <translation>Mostra i file sorgenti per il modulo "%1"</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Load symbols for all modules</source>
+ <translation>Carica i simboli per tutti i moduli</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Load symbols for module</source>
+ <translation>Carica i simboli del modulo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit file</source>
+ <translation>Modifica il file</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show symbols</source>
+ <translation>Mostra i simboli</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Load symbols for module "%1"</source>
+ <translation>Carica i simboli per il modulo "%1"</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit file "%1"</source>
+ <translation>Modifica il file "%1"</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show symbols in file "%1"</source>
+ <translation>Mostra i simboli dei file "%1"</translation>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Address</source>
+ <translation>Indirizzo</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Code</source>
+ <translation>Codice</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Symbol</source>
+ <translation>Simbolo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Symbols in "%1"</source>
+ <translation>Simboli in "%1"</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::OutputCollector</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/outputcollector.cpp" line="+92"/>
+ <source>Cannot create temporary file: %2</source>
+ <translation>Impossibile creare il file temporaneo: %2</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Cannot create FiFo %1: %2</source>
+ <translation>Impossibile creare la FiFo %1: %2</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Cannot open FiFo %1: %2</source>
+ <translation>Impossibile aprire la FiFo %1: %2</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::RegisterHandler</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/registerhandler.cpp" line="+92"/>
+ <source>Name</source>
+ <translation>Nome</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Value</source>
+ <translation>Valore</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::RegisterWindow</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/registerwindow.cpp" line="+54"/>
+ <source>Registers</source>
+ <translation>Registri</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Adjust column widths to contents</source>
+ <translation>Adatta la larghezza delle colonne al contenuto</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Always adjust column widths to contents</source>
+ <translation>Adatta sempre la larghezza al contenuto</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Reload register listing</source>
+ <translation>Ricarica i registri</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Always reload register listing</source>
+ <translation>Ricarica sempre i registri</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::ScriptEngine</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/scriptengine.cpp" line="+455"/>
+ <source>'%1' contains no identifier</source>
+ <translation>'%1' non contiene identificatori</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>String literal %1</source>
+ <translation>Stringa %1</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cowardly refusing to evaluate expression '%1' with potential side effects</source>
+ <translation>Rifiuto la valutazione dell'espressione '%1' con potenziali effetti collaterali</translation>
+ </message>
+ <message>
+ <location line="+142"/>
+ <source>Stopped.</source>
+ <translation>Fermato.</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::SourceFilesModel</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/sourcefileswindow.cpp" line="+97"/>
+ <source>Internal name</source>
+ <translation>Nome interno</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Full name</source>
+ <translation>Nome completo</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::SourceFilesWindow</name>
+ <message>
+ <location line="+76"/>
+ <source>Source Files</source>
+ <translation>File Sorgenti</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Reload data</source>
+ <translation>Ricarica i dati</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Open file</source>
+ <translation>Apri file</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open file "%1"'</source>
+ <translation>Apri file "%1"</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::StackHandler</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+82"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source><More></source>
+ <translation><Successivi></translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source><table><tr><td>Address:</td><td>%1</td></tr><tr><td>Function: </td><td>%2</td></tr><tr><td>File: </td><td>%3</td></tr><tr><td>Line: </td><td>%4</td></tr><tr><td>From: </td><td>%5</td></tr></table><tr><td>To: </td><td>%6</td></tr></table></source>
+ <extracomment>Tooltip for variable</extracomment>
+ <translation><table><tr><td>Indirizzo:</td><td>%1</td></tr><tr><td>Funzione: </td><td>%2</td></tr><tr><td>File: </td><td>%3</td></tr><tr><td>Riga: </td><td>%4</td></tr><tr><td>Da: </td><td>%5</td></tr></table><tr><td>A: </td><td>%6</td></tr></table></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Level</source>
+ <translation>Livello</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Function</source>
+ <translation>Funzione</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>File</source>
+ <translation>File</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Line</source>
+ <translation>Riga</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Address</source>
+ <translation>Indirizzo</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::StackWindow</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/stackwindow.cpp" line="+55"/>
+ <source>Stack</source>
+ <translation>Stack</translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Copy contents to clipboard</source>
+ <translation>Copia il contenuto negli appunti</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Adjust column widths to contents</source>
+ <translation>Adatta la larghezza delle colonne al contenuto</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Always adjust column widths to contents</source>
+ <translation>Adatta sempre la larghezza al contenuto</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::StartExternalDialog</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+87"/>
+ <source>Select Executable</source>
+ <translation>Seleziona l'Eseguibile</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Executable:</source>
+ <translation>Eseguibile:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Arguments:</source>
+ <translation>Parametri:</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::StartRemoteDialog</name>
+ <message>
+ <location line="+45"/>
+ <source>Select Executable</source>
+ <translation>Scegli l'Eseguibile</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::TcfEngine</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/tcfengine.cpp" line="+141"/>
+ <source>Socket error: %1</source>
+ <translation>Errore del socket: %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error</source>
+ <translation>Errore</translation>
+ </message>
+ <message>
+ <location line="+246"/>
+ <source>Stopped.</source>
+ <translation>Fermato.</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::ThreadsHandler</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+107"/>
+ <source>Thread: %1</source>
+ <translation>Thread: %1</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Thread ID</source>
+ <translation>ID del Thread</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::ThreadsWindow</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/threadswindow.cpp" line="+53"/>
+ <source>Thread</source>
+ <translation>Thread</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Adjust column widths to contents</source>
+ <translation>Adatta la larghezza delle colonne al contenuto</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Always adjust column widths to contents</source>
+ <translation>Adatta sempre la larghezza al contenuto</translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::WatchData</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+68"/>
+ <source><not in scope></source>
+ <translation><fuori contesto></translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::WatchHandler</name>
+ <message>
+ <location line="+232"/>
+ <source>Root</source>
+ <translation>Radice</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Locals</source>
+ <translation>Variabili Locali</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Tooltip</source>
+ <translation>Suggerimenti</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Watchers</source>
+ <translation>Osservazione</translation>
+ </message>
+ <message>
+ <location line="+270"/>
+ <source>Name</source>
+ <translation>Nome</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Value</source>
+ <translation>Valore</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Type</source>
+ <translation>Tipo</translation>
+ </message>
+ <message>
+ <location line="+166"/>
+ <source><No Locals></source>
+ <translation><Niente Variabili Locali></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source><No Tooltip></source>
+ <translation><Niente Suggerimenti></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source><No Watchers></source>
+ <translation><Niente Osservazioni></translation>
+ </message>
+</context>
+<context>
+ <name>Debugger::Internal::WatchWindow</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/watchwindow.cpp" line="+121"/>
+ <source>Locals and Watchers</source>
+ <translation>Variabili Locali e Osservazione</translation>
+ </message>
+ <message>
+ <location line="+81"/>
+ <source>Adjust column widths to contents</source>
+ <translation>Adatta la larghezza delle colonne al contenuto</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Always adjust column widths to contents</source>
+ <translation>Adatta sempre la larghezza al contenuto</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Insert new watch item</source>
+ <translation>Inserisci una nuova osservazione</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source><Edit></source>
+ <translation><Modifica></translation>
+ </message>
+</context>
+<context>
+ <name>DebuggerPane</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="-138"/>
+ <source>Clear contents</source>
+ <translation>Cancella il contenuto</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Save contents</source>
+ <translation>Salva il contenuto</translation>
+ </message>
+</context>
+<context>
+ <name>DebuggingHelperOptionPage</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/dumperoptionpage.ui"/>
+ <source>This will enable nice display of Qt and Standard Library objects in the Locals&Watchers view</source>
+ <translation>Marcando questa casella si abilita la visualizzazione dei tipi Qt e STL nella vista Variabili Locali & Osservazione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Use debugging helper</source>
+ <translation>Usa l'helper del debug</translation>
+ </message>
+ <message>
+ <location/>
+ <source>This will load a dumper library</source>
+ <translation>Marcando questa casella si caricherà una libreria di dumper</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Use debugging helper from custom location</source>
+ <translation>Usa un helper del debug personale</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Location: </source>
+ <translation>Posizione: </translation>
+ </message>
+ <message>
+ <location/>
+ <source>Debug debugging helper</source>
+ <translation>Debug dell'helper di debug</translation>
+ </message>
+</context>
+<context>
+ <name>DependenciesModel</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/dependenciespanel.cpp" line="+118"/>
+ <source>Unable to add dependency</source>
+ <translation>Impossibile aggiungere la dipendenza</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This would create a circular dependency.</source>
+ <translation>Questo creerebbe una dipendenza circolare.</translation>
+ </message>
+</context>
+<context>
+ <name>Designer</name>
+ <message>
+ <location filename="../../../src/shared/qrceditor/resourcefile.cpp" line="+85"/>
+ <location line="+63"/>
+ <source>file name is empty</source>
+ <translation>il nome del file è vuoto</translation>
+ </message>
+ <message>
+ <location line="-46"/>
+ <source>XML error on line %1, col %2: %3</source>
+ <translation>Errore XML alla riga %1, colonna %2: %3</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>no <RCC> root element</source>
+ <translation>non è presente l'elemento <RCC> nella radice</translation>
+ </message>
+</context>
+<context>
+ <name>Designer::Internal::EditorWidget</name>
+ <message>
+ <location filename="../../../src/plugins/designer/editorwidget.cpp" line="+174"/>
+ <source>Action editor</source>
+ <translation>Editor delle azioni</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Signals and slots editor</source>
+ <translation>Editor di segnali e slot</translation>
+ </message>
+</context>
+<context>
+ <name>Designer::Internal::FormClassWizard</name>
+ <message>
+ <location filename="../../../src/plugins/designer/cpp/formclasswizard.cpp" line="+93"/>
+ <source>Internal error: FormClassWizard::generateFiles: empty template contents</source>
+ <translation>Errore interno: FormClassWizard::generateFiles: contenuto del template vuoto</translation>
+ </message>
+</context>
+<context>
+ <name>Designer::Internal::FormClassWizardDialog</name>
+ <message>
+ <location filename="../../../src/plugins/designer/cpp/formclasswizarddialog.cpp" line="+52"/>
+ <source>Qt Designer Form Class</source>
+ <translation>Classe Form di Qt Designer</translation>
+ </message>
+</context>
+<context>
+ <name>Designer::Internal::FormClassWizardPage</name>
+ <message>
+ <location filename="../../../src/plugins/designer/cpp/formclasswizardpage.ui"/>
+ <source>Choose a class name</source>
+ <translation>Scegli il nome della classe</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Class</source>
+ <translation>Classe</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Configure...</source>
+ <translation>Configura...</translation>
+ </message>
+ <message>
+ <location/>
+ <source>More</source>
+ <translation><Altro></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Embedding of the UI class</source>
+ <translation>Integrazione della classe UI</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Aggregation as a pointer member</source>
+ <translation>Aggregazione come membro puntatore</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Aggregation</source>
+ <translation>Aggregazione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Multiple Inheritance</source>
+ <translation>Eredità Multipla</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Support for changing languages at runtime</source>
+ <translation>Supporta il cambio della lingua durante l'esecuzione</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/designer/cpp/formclasswizardpage.cpp" line="+194"/>
+ <source>%1 - Error</source>
+ <translation>%1 - Errore</translation>
+ </message>
+</context>
+<context>
+ <name>Designer::Internal::FormEditorPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/designer/formeditorplugin.cpp" line="+148"/>
+ <source>Qt</source>
+ <translation>Qt</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Qt Designer Form</source>
+ <translation>Form di Qt Designer</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This creates a new Qt Designer form file.</source>
+ <translation>Questo crea un nuovo file form Qt Designer.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Qt Designer Form Class</source>
+ <translation>Classe Form di Qt Designer</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This creates a new Qt Designer form class.</source>
+ <translation>Questo crea una nuova classe form di Qt Designer.</translation>
+ </message>
+</context>
+<context>
+ <name>Designer::Internal::FormEditorW</name>
+ <message>
+ <location filename="../../../src/plugins/designer/formeditorw.cpp" line="+272"/>
+ <source>Designer widgetbox</source>
+ <translation>Collezione Widget</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Object inspector</source>
+ <translation>Ispettore Oggetto</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Property editor</source>
+ <translation>Editor delle Proprietà </translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Signals and slots editor</source>
+ <translation>Editor di segnali e slot</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Action editor</source>
+ <translation>Editor delle azioni</translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>For&m editor</source>
+ <translation>Editor dei For&m</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Edit widgets</source>
+ <translation>Modifica i widget</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>F3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Edit signals/slots</source>
+ <translation>Modifica segnali/slot</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>F4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Edit buddies</source>
+ <translation>Modifica amici</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Edit tab order</source>
+ <translation>Modifica l'ordine di tabulazione</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Meta+H</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Ctrl+H</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Meta+L</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Ctrl+L</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Meta+G</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Ctrl+G</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Meta+J</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Ctrl+J</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Ctrl+Alt+R</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>About Qt Designer plugins....</source>
+ <translation>Informazioni sui plugin Qt Designer...</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Preview in</source>
+ <translation>Anteprima in</translation>
+ </message>
+ <message>
+ <location line="+53"/>
+ <source>Designer</source>
+ <translation>Designer</translation>
+ </message>
+ <message>
+ <location line="+131"/>
+ <source>The image could not be create: %1</source>
+ <translation>L'immagine non può essere creata: %1</translation>
+ </message>
+</context>
+<context>
+ <name>Designer::Internal::FormTemplateWizardPage</name>
+ <message>
+ <location filename="../../../src/plugins/designer/formtemplatewizardpage.cpp" line="+62"/>
+ <source>Choose a form template</source>
+ <translation>Scegli un modello di form</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>%1 - Error</source>
+ <translation>%1 - Errore</translation>
+ </message>
+</context>
+<context>
+ <name>Designer::Internal::FormWindowEditor</name>
+ <message>
+ <location filename="../../../src/plugins/designer/formwindoweditor.cpp" line="+161"/>
+ <source>untitled</source>
+ <translation>senza titolo</translation>
+ </message>
+</context>
+<context>
+ <name>Designer::Internal::FormWindowFile</name>
+ <message>
+ <location filename="../../../src/plugins/designer/formwindowfile.cpp" line="+76"/>
+ <source>Error saving %1</source>
+ <translation>Errore durante il salvataggio di %1</translation>
+ </message>
+ <message>
+ <location line="+100"/>
+ <source>Unable to open %1: %2</source>
+ <translation>Impossibile aprire %1: %2</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Unable to write to %1: %2</source>
+ <translation>Impossibile scrivere su %1: %2</translation>
+ </message>
+</context>
+<context>
+ <name>Designer::Internal::FormWizardDialog</name>
+ <message>
+ <location filename="../../../src/plugins/designer/formwizarddialog.cpp" line="+60"/>
+ <source>Qt Designer Form</source>
+ <translation>Form di Qt Designer</translation>
+ </message>
+</context>
+<context>
+ <name>Designer::Internal::QtCreatorIntegration</name>
+ <message>
+ <location filename="../../../src/plugins/designer/qtcreatorintegration.cpp" line="+72"/>
+ <source>The class definition of '%1' could not be found in %2.</source>
+ <translation>La definizione della classe '%1' non è stata trovata in %2.</translation>
+ </message>
+ <message>
+ <location line="+462"/>
+ <source>Error finding/adding a slot.</source>
+ <translation>Errore durante la ricerca/aggiunta dello slot.</translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>No documents matching '%1' could be found.
+Rebuilding the project might help.</source>
+ <translation>Non è stato possibile trovare documenti contenenti '%1'.
+La ricompilazione del progetto potrebbe aiutare.</translation>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Unable to add the method definition.</source>
+ <translation>Impossibile aggiungere la definizione del metodo.</translation>
+ </message>
+</context>
+<context>
+ <name>Designer::Internal::SettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/designer/settingspage.cpp" line="+63"/>
+ <source>Designer</source>
+ <translation>Designer</translation>
+ </message>
+</context>
+<context>
+ <name>DocSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/help/docsettingspage.ui"/>
+ <source>Registered Documentation:</source>
+ <translation>Documentazione Registrata:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Add...</source>
+ <translation>Aggiungi...</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Remove</source>
+ <translation>Rimuovi</translation>
+ </message>
+</context>
+<context>
+ <name>EmbeddedPropertiesPage</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/embeddedpropertiespage.ui"/>
+ <source>Use Virtual Box
+Note: This adds the toolchain to the build environment and runs the program inside a virtual machine.
+It also automatically sets the correct qt version.</source>
+ <translation>Usa Virtual Box
+Nota: verrà aggiunta la toolchain dell'ambiente di compilazione e il programma sarà eseguito in una macchina virtuale.
+Imposta automaticamente la versione qt corretta.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Skin:</source>
+ <translation>Tema:</translation>
+ </message>
+</context>
+<context>
+ <name>ExtensionSystem::Internal::PluginDetailsView</name>
+ <message>
+ <location filename="../../../src/libs/extensionsystem/plugindetailsview.ui"/>
+ <source>Name:</source>
+ <translation>Nome:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Version:</source>
+ <translation>Versione:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Compatibility Version:</source>
+ <translation>Versione di Compatibilità :</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Vendor:</source>
+ <translation>Produttore:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Url:</source>
+ <translation>Url:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Location:</source>
+ <translation>Posizione:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Description:</source>
+ <translation>Descrizione:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Copyright:</source>
+ <translation>Copyright:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>License:</source>
+ <translation>Licenza:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Dependencies:</source>
+ <translation>Dipendenze:</translation>
+ </message>
+</context>
+<context>
+ <name>ExtensionSystem::Internal::PluginErrorView</name>
+ <message>
+ <location filename="../../../src/libs/extensionsystem/pluginerrorview.ui"/>
+ <source>State:</source>
+ <translation>Stato:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Error Message:</source>
+ <translation>Messaggio d'Errore:</translation>
+ </message>
+</context>
+<context>
+ <name>ExtensionSystem::Internal::PluginSpecPrivate</name>
+ <message>
+ <location filename="../../../src/libs/extensionsystem/pluginspec.cpp" line="+415"/>
+ <source>File does not exist: %1</source>
+ <translation>Il file non esiste: %1</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Could not open file for read: %1</source>
+ <translation>Impossibile aprire il file in lettura: %1</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Error parsing file %1: %2, at line %3, column %4</source>
+ <translation>Errore leggendo dal file %1: %2, alla riga %3, colonna %4</translation>
+ </message>
+</context>
+<context>
+ <name>ExtensionSystem::Internal::PluginView</name>
+ <message>
+ <location filename="../../../src/libs/extensionsystem/pluginview.ui"/>
+ <source>State</source>
+ <translation>Stato</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Name</source>
+ <translation>Nome</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Version</source>
+ <translation>Versione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Vendor</source>
+ <translation>Produttore</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Location</source>
+ <translation>Posizione</translation>
+ </message>
+</context>
+<context>
+ <name>ExtensionSystem::PluginErrorView</name>
+ <message>
+ <location filename="../../../src/libs/extensionsystem/pluginerrorview.cpp" line="+78"/>
+ <source>Invalid</source>
+ <translation>Non valido</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Description file found, but error on read</source>
+ <translation>Il file di descrizione è stato trovato, ma c'è stato un errore in lettura</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Read</source>
+ <translation>Letto</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Description successfully read</source>
+ <translation>La descrizione è stata letta con successo</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Resolved</source>
+ <translation>Risolto</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Dependencies are successfully resolved</source>
+ <translation>Le dipendenze sono state risolte correttamente</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Loaded</source>
+ <translation>Caricato</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Library is loaded</source>
+ <translation>La libreria è caricata</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Initialized</source>
+ <translation>Inizializzato</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Plugin's initialization method succeeded</source>
+ <translation>La funzione di inizializzazione del plugin ha avuto successo</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Running</source>
+ <translation>In esecuzione</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Plugin successfully loaded and running</source>
+ <translation>Il plugin è stato caricato correttamente ed è in esecuzione</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Stopped</source>
+ <translation>Fermato</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Plugin was shut down</source>
+ <translation>Il plugin è stato fermato</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Deleted</source>
+ <translation>Cancellato</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Plugin ended it's life cycle and was deleted</source>
+ <translation>Il plugin ha concluso il suo ciclo di vita ed è stato cancellato</translation>
+ </message>
+</context>
+<context>
+ <name>ExtensionSystem::PluginManager</name>
+ <message>
+ <location filename="../../../src/libs/extensionsystem/pluginmanager.cpp" line="+618"/>
+ <source>Circular dependency detected:
+</source>
+ <translation>Rilevata una dipendenza circolare:</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%1(%2) depends on
+</source>
+ <translation>%1(%2) dipende da
+</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%1(%2)</source>
+ <translation>%1(%2)</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cannot load plugin because dependencies are not resolved</source>
+ <translation>Impossibile caricare il plugin poiché le dipendenze non sono risolte</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <location line="+29"/>
+ <source>Cannot load plugin because dependency failed to load: %1(%2)
+Reason: %3</source>
+ <translation>Impossibile caricare il plugin perché la dipendenza non è stata caricata: %1(%2)
+Causa: %3</translation>
+ </message>
+</context>
+<context>
+ <name>FakeVim::Internal::FakeVimHandler</name>
+ <message>
+ <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+827"/>
+ <source>%1,%2</source>
+ <translation>%1,%2</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+3"/>
+ <source>%1</source>
+ <translation>%1</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Not implemented in FakeVim</source>
+ <translation>Non implementato in FakeVim</translation>
+ </message>
+ <message>
+ <location line="+120"/>
+ <location line="+685"/>
+ <location line="+19"/>
+ <source>E20: Mark '%1' not set</source>
+ <translation>E20: Mark '%1' non impostato</translation>
+ </message>
+ <message>
+ <location line="+103"/>
+ <source>File '%1' exists (add ! to override)</source>
+ <translation>Il file '%1' esiste (aggiungi ! per procedere)</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Cannot open file '%1' for writing</source>
+ <translation>Impossibile aprire il file '%1' in scrittura</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>"%1" %2 %3L, %4C written</source>
+ <translation>"%1" %2 %3R, %4C scritto</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Cannot open file '%1' for reading</source>
+ <translation>Impossibile aprire il file '%1' in lettura</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>"%1" %2L, %3C</source>
+ <translation>"%1" %2R, %3C</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>%1 lines filtered</source>
+ <translation>%1 righe filtrate</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>%1 lines >ed %2 time</source>
+ <translation>%1 righe >ed %2 volte</translation>
+ </message>
+ <message>
+ <location line="+82"/>
+ <source>E512: Unknown option: </source>
+ <translation>E512: Opzione sconosciuta: </translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>E492: Not an editor command: </source>
+ <translation>E492: Non è un comando di modifica: </translation>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>search hit BOTTOM, continuing at TOP</source>
+ <translation>la ricerca è arrivata alla FINE, continuo dall'INIZIO</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>search hit TOP, continuing at BOTTOM</source>
+ <translation>la ricerca è arrivata all'INIZIO, continuo dalla FINE</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>E486: Pattern not found: </source>
+ <translation>E486: Pattern non trovato: </translation>
+ </message>
+ <message>
+ <location line="+374"/>
+ <source>Already at oldest change</source>
+ <translation>Già alla modifica più vecchia</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Already at newest change</source>
+ <translation>Già alla modifica più recente</translation>
+ </message>
+</context>
+<context>
+ <name>FakeVim::Internal::FakeVimOptionPage</name>
+ <message>
+ <location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="+112"/>
+ <source>General</source>
+ <translation>Generale</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>FakeVim</source>
+ <translation>FakeVim</translation>
+ </message>
+</context>
+<context>
+ <name>FakeVim::Internal::FakeVimPluginPrivate</name>
+ <message>
+ <location line="+299"/>
+ <location line="+141"/>
+ <source>Quit FakeVim</source>
+ <translation>Esci da FakeVim</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>FakeVim Information</source>
+ <translation>Informazioni su FakeVim</translation>
+ </message>
+</context>
+<context>
+ <name>FakeVimOptionPage</name>
+ <message>
+ <location filename="../../../src/plugins/fakevim/fakevimoptions.ui"/>
+ <source>Use FakeVim</source>
+ <translation>Usa FakeVim</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Vim style settings</source>
+ <translation>Impostazioni dello stile Vim</translation>
+ </message>
+ <message>
+ <location/>
+ <source>vim's "expandtab" option</source>
+ <translation>opzione "expandtab" di vim</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Expand tabulators:</source>
+ <translation>Espandi le tabulazioni:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Highlight search results:</source>
+ <translation>Evidenzia i risultati della ricerca:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Shift width:</source>
+ <translation>Larghezza spostamento:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Smart tabulators:</source>
+ <translation>Tabulazioni intelligenti:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Start of line:</source>
+ <translation>Inizio della riga:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>vim's "tabstop" option</source>
+ <translation>opzione "tabstop" di vim</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Tabulator size:</source>
+ <translation>Larghezza della tabulazione:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Backspace:</source>
+ <translation>Backspace:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>VIM's "autoindent" option</source>
+ <translation>opzione "autoindent" di vim</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Automatic indentation:</source>
+ <translation>Indentazione automatica:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Copy text editor settings</source>
+ <translation>Copia stile dall'editor di testo</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Set Qt style</source>
+ <translation>Stile Qt</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Set plain style</source>
+ <translation>Stile semplice</translation>
+ </message>
+</context>
+<context>
+ <name>FilterNameDialogClass</name>
+ <message>
+ <location filename="../../../src/shared/help/filternamedialog.ui"/>
+ <source>Add Filter Name</source>
+ <translation>Aggiungi Nome Filtrato</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Filter Name:</source>
+ <translation>Filtra il Nome:</translation>
+ </message>
+</context>
+<context>
+ <name>FilterSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/help/filtersettingspage.ui"/>
+ <source>Filter:</source>
+ <translation>Filtro:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Attributes:</source>
+ <translation>Attributi:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>1</source>
+ <translation>1</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Add</source>
+ <translation>Aggiungi</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Remove</source>
+ <translation>Rimuovi</translation>
+ </message>
+</context>
+<context>
+ <name>Find::Internal::FindDialog</name>
+ <message>
+ <location filename="../../../src/plugins/find/finddialog.ui"/>
+ <source>Search for...</source>
+ <translation>Cerca...</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Sc&ope:</source>
+ <translation>Ambit&o:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Search</source>
+ <translation>&Cerca</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Search &for:</source>
+ <translation>Co&sa:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Close</source>
+ <translation>Chiudi</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Case sensitive</source>
+ <translation>Distingui le &Maiuscole</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Whole words only</source>
+ <translation>&Parole intere</translation>
+ </message>
+</context>
+<context>
+ <name>Find::Internal::FindPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/find/findplugin.cpp" line="+149"/>
+ <source>&Find/Replace</source>
+ <translation>&Cerca/Sostituisci</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Find Dialog</source>
+ <translation>Finestra di Ricerca</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+Shift+F</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>Find::Internal::FindToolBar</name>
+ <message>
+ <location filename="../../../src/plugins/find/findtoolbar.cpp" line="+149"/>
+ <source>Current Document</source>
+ <translation>Documento Corrente</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Enter Find String</source>
+ <translation>Inserire la Stringa di Ricerca</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+E</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Find Next</source>
+ <translation>Trova Successivo</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Find Previous</source>
+ <translation>Trova Precedente</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Replace && Find Next</source>
+ <translation>Sostituisci && Trova Successivo</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+=</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Replace && Find Previous</source>
+ <translation>Sostituisci && Trova Precedente</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Replace All</source>
+ <translation>Sostituisci Tutto</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Case Sensitive</source>
+ <translation>Distingui le Maiuscole</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Whole Words Only</source>
+ <translation>Parole Intere</translation>
+ </message>
+</context>
+<context>
+ <name>Find::Internal::FindWidget</name>
+ <message>
+ <location filename="../../../src/plugins/find/findwidget.ui"/>
+ <source>Find</source>
+ <translation>Trova</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Find:</source>
+ <translation>Trova:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Replace with:</source>
+ <translation>Sostituisci con:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>All</source>
+ <translation>Tutti</translation>
+ </message>
+</context>
+<context>
+ <name>Find::SearchResultWindow</name>
+ <message>
+ <location filename="../../../src/plugins/find/searchresultwindow.cpp" line="+60"/>
+ <source>No matches found!</source>
+ <translation>Nessuna corrispondenza trovata!</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Expand All</source>
+ <translation>Espandi Tutto</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/find/searchresultwindow.h" line="+69"/>
+ <source>Search Results</source>
+ <translation>Risultati della Ricerca</translation>
+ </message>
+</context>
+<context>
+ <name>GdbOptionsPage</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/gdboptionspage.ui"/>
+ <source>Gdb interaction</source>
+ <translation>Interazione con gdb</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>Questo può essere il percorso assoluto completo dell'eseguibile gdb che vuoi usare, oppure il nome di un eseguibile che sarà cercato nel tuo PATH.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Gdb location:</source>
+ <translation>Posizione gdb:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Environment:</source>
+ <translation>Ambiente:</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>Questo può essere vuoto, o puntare ad un file contenente comandi gdb che saranno eseguiti all'avvio di gdb.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Gdb startup script:</source>
+ <translation>Script di avvio gdb:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Behaviour of breakpoint setting in plugins</source>
+ <translation>Impostazione di punti di interruzione nei plugin</translation>
+ </message>
+ <message>
+ <location/>
+ <source>This is the slowest but safest option.</source>
+ <translation>Questa è l'impostazione più lenta e più sicura.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Try to set breakpoints in plugins always automatically.</source>
+ <translation>Imposta i punti di interruzione nei plugin automaticamente.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Try to set breakpoints in selected plugins</source>
+ <translation>Imposta i punti di interruzione nei plugin selezionati</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Matching regular expression: </source>
+ <translation>Secondo l'espressione regolare:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Never set breakpoints in plugins automatically</source>
+ <translation>Non impostare mai i punti di interruzione automaticamente</translation>
+ </message>
+</context>
+<context>
+ <name>GenericMakeStep</name>
+ <message>
+ <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.ui"/>
+ <source>Override %1:</source>
+ <translation>Ridefinisci %1:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Make arguments:</source>
+ <translation>Parametri make:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Targets:</source>
+ <translation>Destinazioni:</translation>
+ </message>
+</context>
+<context>
+ <name>GenericProject</name>
+ <message>
+ <location filename="../../../src/plugins/genericprojectmanager/genericproject.cpp" line="+90"/>
+ <source><new></source>
+ <translation><nuovo></translation>
+ </message>
+</context>
+<context>
+ <name>GenericProjectManager::Internal::GenericBuildSettingsWidget</name>
+ <message>
+ <location line="+401"/>
+ <source>Build directory:</source>
+ <translation>Cartella di compilazione:</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Tool chain:</source>
+ <translation>Tool chain:</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Generic Manager</source>
+ <translation>Manager Generico</translation>
+ </message>
+</context>
+<context>
+ <name>GenericProjectManager::Internal::GenericMakeStepConfigWidget</name>
+ <message>
+ <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+164"/>
+ <source>Override %1:</source>
+ <translation>Ridefinisci %1:</translation>
+ </message>
+</context>
+<context>
+ <name>GenericProjectManager::Internal::GenericProjectWizard</name>
+ <message>
+ <location filename="../../../src/plugins/genericprojectmanager/genericprojectwizard.cpp" line="+246"/>
+ <source>Import of Makefile-based Project</source>
+ <translation>Importazione di un Progetto basato su Makefile</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Creates a generic project, supporting any build system.</source>
+ <translation>Crea un progetto generico, che supporta qualsiasi sistema di build.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Projects</source>
+ <translation>Progetti</translation>
+ </message>
+ <message>
+ <location line="+124"/>
+ <source>The project %1 could not be opened.</source>
+ <translation>Non è possibile aprire il progetto %1.</translation>
+ </message>
+</context>
+<context>
+ <name>GenericProjectManager::Internal::GenericProjectWizardDialog</name>
+ <message>
+ <location line="-249"/>
+ <source>Import of Makefile-based Project</source>
+ <translation>Importazione di un Progetto basato su Makefile</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Generic Project</source>
+ <translation>Progetto Generico</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Project name:</source>
+ <translation>Nome progetto:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Location:</source>
+ <translation>Posizione:</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Second Page Title</source>
+ <translation>Titolo della Seconda Pagina</translation>
+ </message>
+</context>
+<context>
+ <name>Git::Internal::BranchDialog</name>
+ <message>
+ <location filename="../../../src/plugins/git/branchdialog.ui"/>
+ <source>Branches</source>
+ <translation>Rami</translation>
+ </message>
+ <message>
+ <location/>
+ <source>General information</source>
+ <translation>Informazioni Generali</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Repository:</source>
+ <translation>Deposito:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Remote branches</source>
+ <translation>Rami remoti</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/git/branchdialog.cpp" line="+75"/>
+ <source>Checkout</source>
+ <translation>Checkout</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Delete</source>
+ <translation>Elimina</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Unable to find the repository directory for '%1'.</source>
+ <translation>Impossibile trovare il deposito di '%1'.</translation>
+ </message>
+ <message>
+ <location line="+69"/>
+ <source>Delete Branch</source>
+ <translation>Cancella Ramo</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Would you like to delete the branch '%1'?</source>
+ <translation>Vuoi cancellare il ramo '%1'?</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Failed to delete branch</source>
+ <translation>Cancellazione del ramo non riuscita</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Failed to create branch</source>
+ <translation>Creazione del ramo non riuscita</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Failed to stash</source>
+ <translation>Stash non riuscito</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>Would you like to create a local branch '%1' tracking the remote branch '%2'?</source>
+ <translation>Vuoi creare un ramo locale '%1' che tenga traccia del ramo remoto '%2'?</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Create branch</source>
+ <translation>Crea ramo</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Failed to create a tracking branch</source>
+ <translation>Creazione del ramo con traccia non riuscita</translation>
+ </message>
+</context>
+<context>
+ <name>Git::Internal::ChangeSelectionDialog</name>
+ <message>
+ <location filename="../../../src/plugins/git/changeselectiondialog.cpp" line="+42"/>
+ <source>Select a Git commit</source>
+ <translation>Selezionare un commit Git</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Select Git repository</source>
+ <translation>Selezionare un deposito Git</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Error</source>
+ <translation>Errore</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Selected directory is not a Git repository</source>
+ <translation>La cartella selezionata non è un deposito Git</translation>
+ </message>
+</context>
+<context>
+ <name>Git::Internal::GitClient</name>
+ <message>
+ <location filename="../../../src/plugins/git/gitclient.cpp" line="+65"/>
+ <source>Note that the git plugin for QtCreator is not able to interact with the server so far. Thus, manual ssh-identification etc. will not work.</source>
+ <translation>Il plugin git di Qt Creator non è ancora in grado di interagire con il server. Perciò l'identificazione ssh manuale e cose simili non funzioneranno.</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Unable to determine the repository for %1.</source>
+ <translation>Impossibile trovare il deposito di '%1'.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Unable to parse the file output.</source>
+ <translation>Impossibile leggere il file di uscita.</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>%1 Executing: %2 %3
+</source>
+ <extracomment><timestamp> Executing: <executable> <arguments></extracomment>
+ <translation>%1 Eseguo: %2 %3
+</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Waiting for data...</source>
+ <translation>In attesa dei dati...</translation>
+ </message>
+ <message>
+ <location line="+100"/>
+ <source>Git Diff</source>
+ <translation>Git Diff</translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>Git Diff %1</source>
+ <translation>Git Diff %1</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Git Log %1</source>
+ <translation>Git Log %1</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Git Show %1</source>
+ <translation>Git Show %1</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Git Blame %1</source>
+ <translation>Git Blame %1</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+56"/>
+ <source>Unable to add %n file(s) to %1: %2</source>
+ <translation>
+ <numerusform>Impossibile aggiungere il file a %1: %2</numerusform>
+ <numerusform>Impossibile aggiungere %n file a %1: %2</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location line="+37"/>
+ <source>Unable to reset %n file(s) in %1: %2</source>
+ <translation>
+ <numerusform>Impossibile fare il reset del file in %1: %2</numerusform>
+ <numerusform>Impossibile fare il reset di %n file in %1: %2</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location line="+18"/>
+ <source>Unable to checkout %n file(s) in %1: %2</source>
+ <translation>
+ <numerusform>Impossibile fare il checkout del file in %1: %2</numerusform>
+ <numerusform>Impossibile fare il checkout di %n file in %1: %2</numerusform>
+ </translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Unable stash in %1: %2</source>
+ <translation>Impossibile fare lo stash in %1: %2</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Unable to run branch command: %1: %2</source>
+ <translation>Impossibile eseguire il comando di branch: %1: %2</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Unable to run show: %1: %2</source>
+ <translation>Impossibile eseguire show: %1: %2</translation>
+ </message>
+ <message>
+ <location line="+142"/>
+ <source>Changes</source>
+ <translation>Modifiche</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>You have modified files. Would you like to stash your changes?</source>
+ <translation>Sono presenti modifiche ai file. Vuoi fare lo stash delle modifiche?</translation>
+ </message>
+ <message>
+ <location line="+51"/>
+ <source>Unable to obtain the status: %1</source>
+ <translation>Impossibile ottenere lo stato: %1</translation>
+ </message>
+ <message>
+ <location line="+50"/>
+ <source>The repository %1 is not initialized yet.</source>
+ <translation>Il deposito %1 non è ancora inizializzato.</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+102"/>
+ <source>Committed %n file(s).
+</source>
+ <translation>
+ <numerusform>Eseguito il commit di un file.</numerusform>
+ <numerusform>Eseguito il commit di %n file.</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location line="+1"/>
+ <source>Unable to commit %n file(s): %1
+</source>
+ <translation>
+ <numerusform>Impossibile eseguire il commit del file: %1</numerusform>
+ <numerusform>Impossibile eseguire il commit di %n file: %1</numerusform>
+ </translation>
+ </message>
+ <message>
+ <location line="+81"/>
+ <source>Revert</source>
+ <translation>Ripristina</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The file has been changed. Do you want to revert it?</source>
+ <translation>Il file è stato modificato. Vuoi ripristinarlo?</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>The file is not modified.</source>
+ <translation>Il file non è stato modificato.</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>There are no modified files.</source>
+ <translation>Non ci sono file modificati.</translation>
+ </message>
+</context>
+<context>
+ <name>Git::Internal::GitOutputWindow</name>
+ <message>
+ <location filename="../../../src/plugins/git/gitoutputwindow.cpp" line="+48"/>
+ <source>Git Output</source>
+ <translation>Output di Git</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Git</source>
+ <translation>Git</translation>
+ </message>
+</context>
+<context>
+ <name>Git::Internal::GitPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/git/gitplugin.cpp" line="+269"/>
+ <source>&Git</source>
+ <translation>&Git</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Diff Current File</source>
+ <translation>Diff del file corrente</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Alt+G,Alt+D</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>File Status</source>
+ <translation>Stato del file</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Alt+G,Alt+S</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Log File</source>
+ <translation>Log del file</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Alt+G,Alt+L</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Blame</source>
+ <translation>Blame</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Alt+G,Alt+B</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Undo Changes</source>
+ <translation>Annulla le Modifiche</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Alt+G,Alt+U</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Stage File for Commit</source>
+ <translation>Prepara il file per il commit</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Alt+G,Alt+A</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Unstage File from Commit</source>
+ <translation>Rimuovi il file dal commit</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Revert...</source>
+ <translation>Ripristina...</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Diff Current Project</source>
+ <translation>Diff del progetto corrente</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Project Status</source>
+ <translation>Stato del progetto</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <location line="+454"/>
+ <source>Log Project</source>
+ <translation>Log del progetto</translation>
+ </message>
+ <message>
+ <location line="-451"/>
+ <source>Alt+G,Alt+K</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Undo Project Changes</source>
+ <translation>Annulla le modifiche al progetto</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Stash</source>
+ <translation>Stash</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Saves the current state of your work.</source>
+ <translation>Salva lo stato corrente del tuo lavoro.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Pull</source>
+ <translation>Recupera</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Stash Pop</source>
+ <translation>Pop di uno stash</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Restores changes saved to the stash list using "Stash".</source>
+ <translation>Ripristina le modifiche salvate nella lista degli stash usando "Stash".</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Commit...</source>
+ <translation>Nuova revisione...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Alt+G,Alt+C</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Push</source>
+ <translation>Propaga</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Branches...</source>
+ <translation>Rami...</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>List Stashes</source>
+ <translation>Lista degli stash</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Show Commit...</source>
+ <translation>Mostra una revisione...</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Commit</source>
+ <translation>Revisione</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Diff Selected Files</source>
+ <translation>Diff dei file selezionati</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&Undo</source>
+ <translation>&Annulla</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&Redo</source>
+ <translation>&Ripeti</translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source>Could not find working directory</source>
+ <translation>Non trovo la cartella di lavoro</translation>
+ </message>
+ <message>
+ <location line="+85"/>
+ <source>Another submit is currently beeing executed.</source>
+ <translation>Si sta già creando una revisione.</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>Cannot create temporary file: %1</source>
+ <translation>Impossibile creare il file temporaneo: %1</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Closing git editor</source>
+ <translation>Chiusura dell'editor git</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do you want to commit the change?</source>
+ <translation>Vuoi creare una revisione con la modifica?</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The commit message check failed. Do you want to commit the change?</source>
+ <translation>Il controllo sul messaggio della nuova revisione è fallito. Vuoi creare la revisione?</translation>
+ </message>
+ <message>
+ <location line="+106"/>
+ <source>File</source>
+ <translation>File</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Diff %1</source>
+ <translation>Diff %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Status Related to %1</source>
+ <translation>Stato di %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Log of %1</source>
+ <translation>Log di %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Blame for %1</source>
+ <translation>Blame su %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Undo Changes for %1</source>
+ <translation>Annulla le modifiche di %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Stage %1 for Commit</source>
+ <translation>Prepara %1 per il commit</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unstage %1 from Commit</source>
+ <translation>Rimuovi %1 dal commit</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Revert %1...</source>
+ <translation>Ripristina %1...</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Diff Project</source>
+ <translation>Diff del progetto</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Status Project</source>
+ <translation>Stato del progetto</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Diff Project %1</source>
+ <translation>Diff del progetto %1</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Status Project %1</source>
+ <translation>Stato del progetto %1</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Log Project %1</source>
+ <translation>Log del progetto %1</translation>
+ </message>
+</context>
+<context>
+ <name>Git::Internal::GitSettings</name>
+ <message>
+ <location filename="../../../src/plugins/git/gitsettings.cpp" line="+100"/>
+ <source>The binary '%1' could not be located in the path '%2'</source>
+ <translation>Impossibile trovare il binario '%1' nel percorso '%2'</translation>
+ </message>
+</context>
+<context>
+ <name>Git::Internal::GitSubmitEditor</name>
+ <message>
+ <location filename="../../../src/plugins/git/gitsubmiteditor.cpp" line="+55"/>
+ <source>Git Commit</source>
+ <translation>Nuova revisione git</translation>
+ </message>
+</context>
+<context>
+ <name>Git::Internal::GitSubmitPanel</name>
+ <message>
+ <location filename="../../../src/plugins/git/gitsubmitpanel.ui"/>
+ <source>General Information</source>
+ <translation>Informazioni Generali</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Repository:</source>
+ <translation>Deposito:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>repository</source>
+ <translation>deposito</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Branch:</source>
+ <translation>Ramo:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>branch</source>
+ <translation>ramo</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Commit Information</source>
+ <translation>Informazioni del Commit</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Author:</source>
+ <translation>Autore:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Email:</source>
+ <translation>Email:</translation>
+ </message>
+</context>
+<context>
+ <name>Git::Internal::LocalBranchModel</name>
+ <message>
+ <location filename="../../../src/plugins/git/branchmodel.cpp" line="+181"/>
+ <source><New branch></source>
+ <translation><nuovo branch></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Type to create a new branch</source>
+ <translation>Scrivi il nome del nuovo ramo</translation>
+ </message>
+</context>
+<context>
+ <name>Git::Internal::SettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/git/settingspage.ui"/>
+ <source>Environment variables</source>
+ <translation>Variabili d'ambiente</translation>
+ </message>
+ <message>
+ <location/>
+ <source>PATH:</source>
+ <translation>PATH:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>From system</source>
+ <translation>Dal sistema</translation>
+ </message>
+ <message>
+ <location/>
+ <source><b>Note:</b></source>
+ <translation><b>Nota:</b></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Git needs to find Perl in the environment as well.</source>
+ <translation>Git necessita di tovare anche Perl nell'ambiente.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Log commit display count:</source>
+ <translation>Numero di revisioni da mostrare per un Log:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Note that huge amount of commits might take some time.</source>
+ <translation>Un numero elevato di revisioni può richiedere parecchio tempo.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Timeout (seconds):</source>
+ <translation>Timeout (secondi):</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/git/settingspage.cpp" line="+85"/>
+ <source>Git</source>
+ <translation>Git</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Git Settings</source>
+ <translation>Impostazioni di Git</translation>
+ </message>
+</context>
+<context>
+ <name>GitCommand</name>
+ <message>
+ <location filename="../../../src/plugins/git/gitcommand.cpp" line="+64"/>
+ <source>
+'%1' failed (exit code %2).
+</source>
+ <translation>
+'%1' è fallito (codice di uscita %2).
+</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>
+'%1' completed (exit code %2).
+</source>
+ <translation>
+'%1' completato (codice di uscita %2).
+</translation>
+ </message>
+</context>
+<context>
+ <name>HelloWorld::Internal::HelloWorldPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/helloworld/helloworldplugin.cpp" line="+85"/>
+ <source>Say "&Hello World!"</source>
+ <translation>Dimmi "&Ciao Mondo!"</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>&Hello World</source>
+ <translation>&Ciao Mondo</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Hello world!</source>
+ <translation>Ciao mondo!</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Hello World PushButton!</source>
+ <translation>Bottone Ciao Mondo!</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Hello World!</source>
+ <translation>Ciao Mondo!</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Hello World! Beautiful day today, isn't it?</source>
+ <translation>Ciao Mondo! Hai visto che bella giornata, oggi?</translation>
+ </message>
+</context>
+<context>
+ <name>HelloWorld::Internal::HelloWorldWindow</name>
+ <message>
+ <location filename="../../../src/plugins/helloworld/helloworldwindow.cpp" line="+41"/>
+ <source>Focus me to activate my context!</source>
+ <translation>Posizionati su di me per attivare il mio contesto!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Hello, world!</source>
+ <translation>Ciao, mondo!</translation>
+ </message>
+</context>
+<context>
+ <name>Help::Internal::CentralWidget</name>
+ <message>
+ <location filename="../../../src/plugins/help/centralwidget.cpp" line="+102"/>
+ <source>Add new page</source>
+ <translation>Aggiungi una pagina</translation>
+ </message>
+ <message>
+ <location line="+202"/>
+ <source>Print Document</source>
+ <translation>Stampa il Documento</translation>
+ </message>
+ <message>
+ <location line="+109"/>
+ <location line="+2"/>
+ <source>unknown</source>
+ <translation>sconosciuto</translation>
+ </message>
+ <message>
+ <location line="+91"/>
+ <source>Add New Page</source>
+ <translation>Aggiungi una Pagina</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Close This Page</source>
+ <translation>Chiudi questa Pagina</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Close Other Pages</source>
+ <translation>Chiudi le Altre Pagine</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Add Bookmark for this Page...</source>
+ <translation>Aggiungi un Segnalibro su questa Pagina...</translation>
+ </message>
+</context>
+<context>
+ <name>Help::Internal::ContentsToolWidget</name>
+ <message>
+ <location filename="../../../src/plugins/help/contentstoolwindow.cpp" line="+50"/>
+ <source>Contents</source>
+ <translation>Contenuti</translation>
+ </message>
+</context>
+<context>
+ <name>Help::Internal::DocSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/help/docsettingspage.cpp" line="+51"/>
+ <location line="+84"/>
+ <source>Documentation</source>
+ <translation>Documentazione</translation>
+ </message>
+ <message>
+ <location line="-73"/>
+ <source>Help</source>
+ <translation>Guida</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <location line="+10"/>
+ <source>Add Documentation</source>
+ <translation>Aggiungi Documentazione</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>Qt Help Files (*.qch)</source>
+ <translation>File Qt Help (*.qch)</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The file %1 is not a valid Qt Help file!</source>
+ <translation>Il file %1 non è un file Qt Help valido!</translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Cannot unregister documentation file %1!</source>
+ <translation>Impossibile de-registrare il file di documentazione %1!</translation>
+ </message>
+</context>
+<context>
+ <name>Help::Internal::FilterSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/help/filtersettingspage.cpp" line="+51"/>
+ <source>Filters</source>
+ <translation>Filtri</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Help</source>
+ <translation>Guida</translation>
+ </message>
+</context>
+<context>
+ <name>Help::Internal::HelpIndexFilter</name>
+ <message>
+ <location filename="../../../src/plugins/help/helpindexfilter.cpp" line="+72"/>
+ <source>Help index</source>
+ <translation>Indice della guida</translation>
+ </message>
+</context>
+<context>
+ <name>Help::Internal::HelpMode</name>
+ <message>
+ <location filename="../../../src/plugins/help/helpmode.cpp" line="+43"/>
+ <source>Help</source>
+ <translation>Guida</translation>
+ </message>
+</context>
+<context>
+ <name>Help::Internal::HelpPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/help/helpplugin.cpp" line="+177"/>
+ <location line="+36"/>
+ <source>Contents</source>
+ <translation>Contenuti</translation>
+ </message>
+ <message>
+ <location line="-34"/>
+ <location line="+30"/>
+ <source>Index</source>
+ <translation>Indice</translation>
+ </message>
+ <message>
+ <location line="-28"/>
+ <location line="+36"/>
+ <source>Search</source>
+ <translation>Cerca</translation>
+ </message>
+ <message>
+ <location line="-33"/>
+ <source>Bookmarks</source>
+ <translation>Segnalibri</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Home</source>
+ <translation>Home</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <location line="+168"/>
+ <source>Previous</source>
+ <translation>Indietro</translation>
+ </message>
+ <message>
+ <location line="-164"/>
+ <location line="+165"/>
+ <source>Next</source>
+ <translation>Avanti</translation>
+ </message>
+ <message>
+ <location line="-161"/>
+ <source>Add Bookmark</source>
+ <translation>Aggiungi un Segnalibro</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Context Help</source>
+ <translation>Aiuto Contestuale</translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source>Activate Index in Help mode</source>
+ <translation>Attiva l'Indice nella Guida</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Activate Contents in Help mode</source>
+ <translation>Attiva i contenuti nella Guida</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Activate Search in Help mode</source>
+ <translation>Attiva la ricerca nella Guida</translation>
+ </message>
+ <message>
+ <location line="+219"/>
+ <location line="+4"/>
+ <location line="+66"/>
+ <source>Unfiltered</source>
+ <translation>Non filtrato</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><html><head><title>Nessuna Documentazione</title></head><body><br/><center><b>%1</b><br/>Non è disponibile alcuna documentazione.</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><html><head><title>Nessuna Documentazione</title></head><body><br/><br/><center>Non è disponibile alcuna documentazione.</center></body></html></translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>Filtered by:</source>
+ <translation>Filtrato da:</translation>
+ </message>
+</context>
+<context>
+ <name>Help::Internal::IndexThread</name>
+ <message>
+ <location filename="../../../src/plugins/help/helpengine.cpp" line="+501"/>
+ <source>Failed to load keyword index file!</source>
+ <translation>Impossibile caricare l'indice delle parole chiave!</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Cannot open the index file %1</source>
+ <translation>Impossibile aprire l'indice %1</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Documentation file %1 does not exist!
+Skipping file.</source>
+ <translation>Il file della documentazione %1 non esiste!
+Tralascio il file.</translation>
+ </message>
+</context>
+<context>
+ <name>Help::Internal::IndexToolWidget</name>
+ <message>
+ <location filename="../../../src/plugins/help/indextoolwindow.cpp" line="+52"/>
+ <source>Look for:</source>
+ <translation>Cerca:</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Index</source>
+ <translation>Indice</translation>
+ </message>
+</context>
+<context>
+ <name>Help::Internal::SearchWidget</name>
+ <message>
+ <location filename="../../../src/plugins/help/searchwidget.cpp" line="+158"/>
+ <source>&Copy</source>
+ <translation>&Copia</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Copy &Link Location</source>
+ <translation>Copia il &Collegamento</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <location line="+36"/>
+ <source>Open Link in New Tab</source>
+ <translation>Apri il Collegamento in una Nuova Scheda</translation>
+ </message>
+ <message>
+ <location line="-29"/>
+ <source>Select All</source>
+ <translation>Seleziona Tutto</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Open Link</source>
+ <translation>Apri il Collegamento</translation>
+ </message>
+</context>
+<context>
+ <name>Help::Internal::TitleMapThread</name>
+ <message>
+ <location filename="../../../src/plugins/help/helpengine.cpp" line="-117"/>
+ <source>Documentation file %1 does not exist!
+Skipping file.</source>
+ <translation>Il file della documentazione %1 non esiste!
+Tralascio il file.</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Documentation file %1 is not compatible!
+Skipping file.</source>
+ <translation>Il file della documentazione %1 non è compatibile!
+Tralascio il file.</translation>
+ </message>
+</context>
+<context>
+ <name>HelpViewer</name>
+ <message>
+ <location filename="../../../src/shared/help/helpviewer.cpp" line="+221"/>
+ <source>Open Link in New Tab</source>
+ <translation>Apri il Collegamento in una Nuova Scheda</translation>
+ </message>
+ <message>
+ <location line="+122"/>
+ <source><title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div></source>
+ <translation><title>Errore 404...</title><div align="center"><br><br><h1>Non è stato possibile trovare la pagina</h1><br><h3>'%1'</h3></div></translation>
+ </message>
+ <message>
+ <location line="+57"/>
+ <source>Help</source>
+ <translation>Guida</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unable to launch external application.
+</source>
+ <translation>Impossibile lanciare l'applicazione esterna.
+</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>Copy &Link Location</source>
+ <translation>Copia il Co&llegamento</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open Link in New Tab Ctrl+LMB</source>
+ <translation>Apri il Collegamento in una Nuova Scheda Ctrl+LMB</translation>
+ </message>
+</context>
+<context>
+ <name>IndexWindow</name>
+ <message>
+ <location filename="../../../src/shared/help/indexwindow.cpp" line="+52"/>
+ <source>&Look for:</source>
+ <translation>&Cerca:</translation>
+ </message>
+ <message>
+ <location line="+69"/>
+ <source>Open Link</source>
+ <translation>Apri il Collegamento</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Open Link in New Tab</source>
+ <translation>Apri il Collegamento in una Nuova Scheda</translation>
+ </message>
+</context>
+<context>
+ <name>InputPane</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="+75"/>
+ <source>Type Ctrl-<Return> to execute a line.</source>
+ <translation>Premi Ctrl-<Invio> per eseguire la riga.</translation>
+ </message>
+</context>
+<context>
+ <name>Locator</name>
+ <message>
+ <location filename="../../../src/plugins/quickopen/quickopenconstants.h" line="+38"/>
+ <source>Filters</source>
+ <translation>Filtri</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Locator</source>
+ <translation>Ricerca Rapida</translation>
+ </message>
+</context>
+<context>
+ <name>MainWindow</name>
+ <message>
+ <location filename="../../../src/tools/qdebugger/mainwindow.cpp" line="+155"/>
+ <source>Open file</source>
+ <translation>Apri file</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ctrl+O</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Quit</source>
+ <translation>Esci</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ctrl+Q</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Run to main()</source>
+ <translation>Esegui fino al main()</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ctrl+F5</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>F5</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Shift+F5</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>F6</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>F7</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Shift+F6</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Shift+F9</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Shift+F7</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Shift+F8</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>F8</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>ALT+D,ALT+W</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Files</source>
+ <translation>File</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <location filename="../../../src/tools/texteditor/mainwindow.cpp" line="+121"/>
+ <source>File</source>
+ <translation>File</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Debug</source>
+ <translation>Debug</translation>
+ </message>
+ <message>
+ <location line="+105"/>
+ <source>Not a runnable project</source>
+ <translation>Non è un progetto eseguibile</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The current startup project can not be run.</source>
+ <translation>Il progetto corrente non può essere eseguito.</translation>
+ </message>
+ <message>
+ <location line="+146"/>
+ <source>Open File</source>
+ <translation>Apri File</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Cannot find special data dumpers</source>
+ <translation>Impossibile trovare dumper di dati personali</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The debugged binary does not contain information needed for nice display of Qt data types.
+
+Make sure you use something like
+
+SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
+
+in your .pro file.</source>
+ <translation>L'eseguibile di cui si sta facendo il debug non contiene le informazioni necessarie alla visualizzazione dei tipi di dati Qt.
+
+Puoi risolvere inserendo qualcosa tipo
+
+SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
+
+nel tuo file .pro.</translation>
+ </message>
+ <message>
+ <location filename="../../../src/tools/texteditor/mainwindow.cpp" line="+62"/>
+ <source>Open Executable File</source>
+ <translation>Apri l'Eseguibile</translation>
+ </message>
+</context>
+<context>
+ <name>MakeStep</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/makestep.ui"/>
+ <source>Override %1:</source>
+ <translation>Ridefinisci %1:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Make arguments:</source>
+ <translation>Parametri make:</translation>
+ </message>
+</context>
+<context>
+ <name>MimeDatabase</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/mimedatabase.cpp" line="+650"/>
+ <source>Not a number '%1'.</source>
+ <translation>Non è un numero '%1'.</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Empty match value detected.</source>
+ <translation>Rilevato valore di confronto vuoto.</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Missing 'type'-attribute</source>
+ <translation>Manca l'attributo 'tipo'</translation>
+ </message>
+ <message>
+ <location line="+49"/>
+ <source>Unexpected element <%1></source>
+ <translation>Elemento inaspettato <%1></translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>An error has been encountered at line %1 of %2: %3:</source>
+ <translation>E' stato incontrato un errore alla riga %1 di %2: %3:</translation>
+ </message>
+ <message>
+ <location line="+115"/>
+ <source>Cannot open %1: %2</source>
+ <translation>Impossibile aprire %1: %2</translation>
+ </message>
+</context>
+<context>
+ <name>MyMain</name>
+ <message>
+ <location filename="../../../src/libs/aggregation/examples/text/main.cpp" line="+57"/>
+ <location line="+1"/>
+ <location line="+1"/>
+ <source>N/A</source>
+ <translation>N/D</translation>
+ </message>
+</context>
+<context>
+ <name>NickNameDialog</name>
+ <message>
+ <location filename="../../../src/plugins/vcsbase/nicknamedialog.ui"/>
+ <source>Nick Names</source>
+ <translation>Nick Name</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Filter:</source>
+ <translation>Filtro:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Clear</source>
+ <translation>Cancella</translation>
+ </message>
+</context>
+<context>
+ <name>OpenWithDialog</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/dialogs/openwithdialog.ui"/>
+ <source>Open File With...</source>
+ <translation>Apri il file con...</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Open file extension with:</source>
+ <translation>Apri l'estensione del file con:</translation>
+ </message>
+</context>
+<context>
+ <name>Perforce::Internal::ChangeNumberDialog</name>
+ <message>
+ <location filename="../../../src/plugins/perforce/changenumberdialog.ui"/>
+ <source>Change Number</source>
+ <translation>Numero della Modifica</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Change Number:</source>
+ <translation>Numero della Modifica:</translation>
+ </message>
+</context>
+<context>
+ <name>Perforce::Internal::PendingChangesDialog</name>
+ <message>
+ <location filename="../../../src/plugins/perforce/pendingchangesdialog.ui"/>
+ <source>P4 Pending Changes</source>
+ <translation>P4 Modifiche in Sospeso</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Submit</source>
+ <translation>Invio</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Cancel</source>
+ <translation>Annulla</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/perforce/pendingchangesdialog.cpp" line="+46"/>
+ <source>Change %1: %2</source>
+ <translation>Modifica %1: %2</translation>
+ </message>
+</context>
+<context>
+ <name>Perforce::Internal::PerforceOutputWindow</name>
+ <message>
+ <location filename="../../../src/plugins/perforce/perforceoutputwindow.cpp" line="+48"/>
+ <source>Perforce Output</source>
+ <translation>Output di Perforce</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Diff</source>
+ <translation>Diff</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Perforce</source>
+ <translation>Perforce</translation>
+ </message>
+</context>
+<context>
+ <name>Perforce::Internal::PerforcePlugin</name>
+ <message>
+ <location filename="../../../src/plugins/perforce/perforceplugin.cpp" line="+249"/>
+ <source>&Perforce</source>
+ <translation>&Perforce</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <location line="+384"/>
+ <source>Edit</source>
+ <translation>Modifica</translation>
+ </message>
+ <message>
+ <location line="-381"/>
+ <source>Alt+P,Alt+E</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit File</source>
+ <translation>Modifica il File</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <location line="+377"/>
+ <source>Add</source>
+ <translation>Aggiungi</translation>
+ </message>
+ <message>
+ <location line="-374"/>
+ <source>Alt+P,Alt+A</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Add File</source>
+ <translation>Aggiungi il File</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <location line="+370"/>
+ <source>Delete</source>
+ <translation>Elimina</translation>
+ </message>
+ <message>
+ <location line="-367"/>
+ <source>Delete File</source>
+ <translation>Cancella il File</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <location line="+364"/>
+ <source>Revert</source>
+ <translation>Ripristina</translation>
+ </message>
+ <message>
+ <location line="-361"/>
+ <source>Alt+P,Alt+R</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Revert File</source>
+ <translation>Ripristina il file</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <location line="+3"/>
+ <source>Diff Current File</source>
+ <translation>Diff del file corrente</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <location line="+4"/>
+ <source>Diff Current Project/Session</source>
+ <translation>Diff del progetto/sessione corrente</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Alt+P,Alt+D</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Diff Opened Files</source>
+ <translation>Diff dei File Aperti</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Opened</source>
+ <translation>Aperti</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Alt+P,Alt+O</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Submit Project</source>
+ <translation>Invia Progetto</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Alt+P,Alt+S</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Pending Changes...</source>
+ <translation>Modifiche in Sospeso...</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Describe...</source>
+ <translation>Descrivi...</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <location line="+3"/>
+ <location line="+298"/>
+ <source>Annotate Current File</source>
+ <translation>Annota il File Corrente</translation>
+ </message>
+ <message>
+ <location line="-294"/>
+ <source>Annotate...</source>
+ <translation>Annota...</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <location line="+4"/>
+ <location line="+286"/>
+ <source>Filelog Current File</source>
+ <translation>Filelog del File Corrente</translation>
+ </message>
+ <message>
+ <location line="-287"/>
+ <source>Alt+P,Alt+F</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Filelog...</source>
+ <translation>Filelog...</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Submit</source>
+ <translation>Invio</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Diff Selected Files</source>
+ <translation>Diff dei File Selezionati</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&Undo</source>
+ <translation>&Annulla</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&Redo</source>
+ <translation>&Ripeti</translation>
+ </message>
+ <message>
+ <location line="+49"/>
+ <source>p4 revert</source>
+ <translation>ripristina p4</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The file has been changed. Do you want to revert it?</source>
+ <translation>Il file è stato modificato. Vuoi ripristinarlo?</translation>
+ </message>
+ <message>
+ <location line="+49"/>
+ <location line="+257"/>
+ <location line="+232"/>
+ <source>No p4 executable specified!</source>
+ <translation>Non è stato specificato l'eseguibile p4!</translation>
+ </message>
+ <message>
+ <location line="-484"/>
+ <source>Another submit is currently executed.</source>
+ <translation>Un altro invio è già in corso.</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Cannot create temporary file.</source>
+ <translation>Impossibile creare il file temporaneo.</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Project has no files</source>
+ <translation>Il progetto non ha file</translation>
+ </message>
+ <message>
+ <location line="+50"/>
+ <source>p4 annotate</source>
+ <translation>p4 annotate</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>p4 annotate %1</source>
+ <translation>p4 annotate %1</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>p4 filelog</source>
+ <translation>p4 filelog</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>p4 filelog %1</source>
+ <translation>p4 filelog %1</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Edit %1</source>
+ <translation>Modifica %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Add %1</source>
+ <translation>Aggiungi %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Delete %1</source>
+ <translation>Cancella %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Revert %1</source>
+ <translation>Ripristina %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Diff %1</source>
+ <translation>Diff %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Annotate %1</source>
+ <translation>Annota %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Filelog %1</source>
+ <translation>Filelog %1</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Diff</source>
+ <translation>Diff</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Diff Project %1</source>
+ <translation>Diff del Progetto %1</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Diff Current Project/Soluion</source>
+ <translation>Diff del Progetto/Sessione corrente</translation>
+ </message>
+ <message>
+ <location line="+110"/>
+ <source>%1 Executing: %2
+</source>
+ <translation>%1 Eseguo: %2
+</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>The process terminated with exit code %1.</source>
+ <translation>Il processo è terminato con il codice di uscita %1.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>The process terminated abnormally.</source>
+ <translation>Il processo è terminato in modo anomalo.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Could not start perforce '%1'. Please check your settings in the preferences.</source>
+ <translation>Impossibile avviare perforce '%1'. Controlla le tue impostazioni nelle preferenze.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Perforce did not respond within timeout limit (%1 ms).</source>
+ <translation>Perforce non ha risposto entro il limite di tempo (%1 ms).</translation>
+ </message>
+ <message>
+ <location line="+85"/>
+ <source>p4 diff %1</source>
+ <translation>p4 diff %1</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>p4 describe %1</source>
+ <translation>p4 describe %1</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Closing p4 Editor</source>
+ <translation>Chiusura dell'editor p4</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do you want to submit this change list?</source>
+ <translation>Vuoi inviare questa lista di modifiche?</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The commit message check failed. Do you want to submit this change list</source>
+ <translation>Il controllo del messaggio del commit è fallito. Vuoi inviare questa lista di modifiche</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <location line="+8"/>
+ <source>Cannot execute p4 submit.</source>
+ <translation>Impossibile eseguire il submit p4.</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Pending change</source>
+ <translation>Modifica in attesa</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Could not submit the change, because your workspace was out of date. Created a pending submit instead.</source>
+ <translation>Impossibile inviare la modifica, perché il tuo workspace non è aggiornato. Creato un submit in sospeso.</translation>
+ </message>
+ <message>
+ <location line="+167"/>
+ <source>Timeout waiting for "where" (%1).</source>
+ <translation>Superato il limite di tempo in attesa di "where" (%1).</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Error running "where" on %1: The file is not mapped</source>
+ <translation>Errore in esecuzione di "where" su %1. Il file non è mappato</translation>
+ </message>
+</context>
+<context>
+ <name>Perforce::Internal::PerforceSubmitEditor</name>
+ <message>
+ <location filename="../../../src/plugins/perforce/perforcesubmiteditor.cpp" line="+49"/>
+ <source>Perforce Submit</source>
+ <translation>Invio Perforce</translation>
+ </message>
+</context>
+<context>
+ <name>Perforce::Internal::PromptDialog</name>
+ <message>
+ <location filename="../../../src/plugins/perforce/promptdialog.ui"/>
+ <source>Perforce Prompt</source>
+ <translation>Richiesta Perforce</translation>
+ </message>
+ <message>
+ <location/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+</context>
+<context>
+ <name>Perforce::Internal::SettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/perforce/settingspage.ui"/>
+ <source>P4 Command:</source>
+ <translation>Comando P4:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Use default P4 environment variables</source>
+ <translation>Usa le variabili d'ambiente predefinite di P4</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Environment variables</source>
+ <translation>Variabili d'ambiente</translation>
+ </message>
+ <message>
+ <location/>
+ <source>P4 Client:</source>
+ <translation>Client P4:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>P4 User:</source>
+ <translation>Utente P4:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>P4 Port:</source>
+ <translation>Porta P4:</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/perforce/settingspage.cpp" line="+96"/>
+ <source>Perforce</source>
+ <translation>Perforce</translation>
+ </message>
+</context>
+<context>
+ <name>Perforce::Internal::SettingsPageWidget</name>
+ <message>
+ <location line="-49"/>
+ <source>Perforce Command</source>
+ <translation>Comando Perforce</translation>
+ </message>
+</context>
+<context>
+ <name>Perforce::Internal::SubmitPanel</name>
+ <message>
+ <location filename="../../../src/plugins/perforce/submitpanel.ui"/>
+ <source>Submit</source>
+ <translation>Invio</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Change:</source>
+ <translation>Cambia:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Client:</source>
+ <translation>Client:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>User:</source>
+ <translation>Utente:</translation>
+ </message>
+</context>
+<context>
+ <name>PluginDialog</name>
+ <message>
+ <location filename="../../../src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp" line="+55"/>
+ <source>Details</source>
+ <translation>Dettagli</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error Details</source>
+ <translation>Dettagli Errore</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Installed Plugins</source>
+ <translation>Plugin Installati</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <source>Plugin Details of %1</source>
+ <translation>Dettagli Plugin di %1</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Plugin Errors of %1</source>
+ <translation>Errore Plugin di %1</translation>
+ </message>
+</context>
+<context>
+ <name>PluginManager</name>
+ <message>
+ <location filename="../../../src/libs/extensionsystem/optionsparser.cpp" line="+106"/>
+ <location line="+18"/>
+ <source>The plugin '%1' does not exist.</source>
+ <translation>Il plugin '%1' non esiste.</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Unknown option %1</source>
+ <translation>Opzione sconosciuta %1</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>The option %1 requires an argument.</source>
+ <translation>L'opzione %1 richiede un parametro.</translation>
+ </message>
+</context>
+<context>
+ <name>PluginSpec</name>
+ <message>
+ <location filename="../../../src/libs/extensionsystem/pluginspec.cpp" line="+22"/>
+ <source>'%1' misses attribute '%2'</source>
+ <translation>In '%1' manca l'attributo '%2'</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>'%1' has invalid format</source>
+ <translation>'%1' ha un formato non valido</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Invalid element '%1'</source>
+ <translation>Elemento '%1' non valido</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Unexpected closing element '%1'</source>
+ <translation>Elemento di chiusura '%1' non atteso</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Unexpected token</source>
+ <translation>Elemento non atteso</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Expected element '%1' as top level element</source>
+ <translation>Atteso l'elemento '%1' come elemento di primo livello</translation>
+ </message>
+ <message>
+ <location line="+234"/>
+ <source>Resolving dependencies failed because state != Read</source>
+ <translation>La risoluzione delle dipendenze non è riuscita poiché state != Read</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Could not resolve dependency '%1(%2)'</source>
+ <translation>Impossibile risolvere la dipendenza '%1(%2)'</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Loading the library failed because state != Resolved</source>
+ <translation>Il caricamento della libreria è fallito poiché state != Resolved</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>
+Library base name: %1</source>
+ <translation>
+Nome di base della libreria: %1</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Plugin is not valid (doesn't derive from IPlugin)</source>
+ <translation>Il plugin non è valido (non deriva da IPlugin)</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Initializing the plugin failed because state != Loaded</source>
+ <translation>L'inizializzazione del plugin non è riuscita poiché state != Loaded</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Internal error: have no plugin instance to initialize</source>
+ <translation>Errore interno: non ho un'istanza di plugin da inizializzare</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Plugin initialization failed: %1</source>
+ <translation>L'inizializzazione del plugin è fallita: %1</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Cannot perform extensionsInitialized because state != Initialized</source>
+ <translation>Impossibile eseguire extensionsInitialized poiché state != Initialized</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Internal error: have no plugin instance to perform extensionsInitialized</source>
+ <translation>Errore interno: non ho un'istanza di plugin su cui eseguire extensionsInitialized</translation>
+ </message>
+</context>
+<context>
+ <name>ProEditorContainer</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/proeditorcontainer.ui"/>
+ <source>Advanced Mode</source>
+ <translation>Modalità Avanzata</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::AbstractProcessStep</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/abstractprocessstep.cpp" line="+170"/>
+ <source><font color="#0000ff">Starting: %1 %2</font>
+</source>
+ <translation><font color="#0000ff">Eseguo: %1 %2</font>
+</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source><font color="#0000ff">Exited with code %1.</font></source>
+ <translation><font color="#0000ff">Uscito con codice %1.</font></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source><font color="#ff0000"><b>Exited with code %1.</b></font></source>
+ <translation><font color="#ff0000"><b>Uscito con codice %1.</b></font></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source><font color="#ff0000">Could not start process %1 </b></font></source>
+ <translation><font color="#ff0000">Impossibile avviare il processo %1 </b></font></translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::BuildManager</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/buildmanager.cpp" line="+136"/>
+ <source><font color="#ff0000">Canceled build.</font></source>
+ <translation><font color="#ff0000">Compilazione annullata.</font></translation>
+ </message>
+ <message>
+ <location line="+56"/>
+ <source>Build</source>
+ <translation>Compilazione</translation>
+ </message>
+ <message numerus="yes">
+ <location line="-136"/>
+ <source>Finished %n of %1 build steps</source>
+ <translation>
+ <numerusform>Conclusa la prima fase di %1</numerusform>
+ <numerusform>Conclusa la fase %n di %1</numerusform>
+ </translation>
+ </message>
+ <message>
+ <location line="+191"/>
+ <location line="+39"/>
+ <source><font color="#ff0000">Error while building project %1</font></source>
+ <translation><font color="#ff0000">Errore durante la compilazione del progetto %1</font></translation>
+ </message>
+ <message>
+ <location line="-38"/>
+ <location line="+39"/>
+ <source><font color="#ff0000">When executing build step '%1'</font></source>
+ <translation><font color="#ff0000">Durante il passo '%1'</font></translation>
+ </message>
+ <message>
+ <location line="-37"/>
+ <source>Error while building project %1</source>
+ <translation>Errore durante la compilazione del progetto %1</translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source><b>Running build steps for project %2...</b></source>
+ <translation><b>Avvio delle fasi di compilazione del progetto %2...</b></translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::CustomExecutableRunConfiguration</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/customexecutablerunconfiguration.cpp" line="+158"/>
+ <source>Custom Executable</source>
+ <translation>Eseguibile Speciale</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Could not find the executable, please specify one.</source>
+ <translation>Non è stato trovato l'eseguibile, specificane uno.</translation>
+ </message>
+ <message>
+ <location line="+79"/>
+ <location line="+32"/>
+ <source>Run %1</source>
+ <translation>Esegui %1</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::CustomExecutableRunConfigurationFactory</name>
+ <message>
+ <location line="+37"/>
+ <location line="+16"/>
+ <source>Custom Executable</source>
+ <translation>Eseguibile Speciale</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::EnvironmentModel</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/environmenteditmodel.cpp" line="+166"/>
+ <source>Variable</source>
+ <translation>Variabile</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Value</source>
+ <translation>Valore</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::AllProjectsFilter</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/allprojectsfilter.h" line="+51"/>
+ <source>Files in any project</source>
+ <translation>File in tutti i progetti</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::AllProjectsFind</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/allprojectsfind.cpp" line="+61"/>
+ <source>All Projects</source>
+ <translation>Tutti i Progetti</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>File &pattern:</source>
+ <translation>&Schema file:</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::ApplicationLauncher</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/applicationlauncher_x11.cpp" line="+123"/>
+ <source>Failed to start program. Path or permissions wrong?</source>
+ <translation>Non è possibile avviare il programma. Il percorso o i permessi sono errati?</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>The program has unexpectedly finished.</source>
+ <translation>Il programma è finito inaspettatamente.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Some error has occurred while running the program.</source>
+ <translation>C'è stato un errore durante l'esecuzione del programma.</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::ApplicationRunConfigurationRunner</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/applicationrunconfiguration.cpp" line="+89"/>
+ <source>Run</source>
+ <translation>Esegui</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::ApplicationRunControl</name>
+ <message>
+ <location line="+52"/>
+ <source>Starting %1...</source>
+ <translation>Avvio di %1...</translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>%1 exited with code %2</source>
+ <translation>%1 è uscito con il codice %2</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::BuildSettingsPanel</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.cpp" line="+79"/>
+ <source>Build Settings</source>
+ <translation>Impostazioni di Compilazione</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::BuildSettingsPropertiesPage</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.ui"/>
+ <source>Configurations</source>
+ <translation>Configurazioni</translation>
+ </message>
+ <message>
+ <location/>
+ <source>+</source>
+ <translation>+</translation>
+ </message>
+ <message>
+ <location/>
+ <source>-</source>
+ <translation>-</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::BuildSettingsWidget</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.cpp" line="+29"/>
+ <source>Create &New</source>
+ <translation>Crea &Nuovo</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&Clone Selected</source>
+ <translation>&Clona il Selezionato</translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <location line="+135"/>
+ <source>%1 - %2</source>
+ <translation>%1 - %2</translation>
+ </message>
+ <message>
+ <location line="-65"/>
+ <source>General</source>
+ <translation>Generale</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Build Steps</source>
+ <translation>Fasi di Compilazione</translation>
+ </message>
+ <message>
+ <location line="+66"/>
+ <source>Set as Active</source>
+ <translation>Imposta come Attivo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clone</source>
+ <translation>Clona</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Delete</source>
+ <translation>Elimina</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>New configuration</source>
+ <translation>Nuova configurazione</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <location line="+75"/>
+ <source>New Configuration Name:</source>
+ <translation>Nome della Nuova Configurazione:</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Clone configuration</source>
+ <translation>Clona la configurazione</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::BuildStepsPage</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/buildstepspage.ui"/>
+ <source>1</source>
+ <translation>1</translation>
+ </message>
+ <message>
+ <location/>
+ <source>+</source>
+ <translation>+</translation>
+ </message>
+ <message>
+ <location/>
+ <source>-</source>
+ <translation>-</translation>
+ </message>
+ <message>
+ <location/>
+ <source>^</source>
+ <translation>^</translation>
+ </message>
+ <message>
+ <location/>
+ <source>v</source>
+ <translation>v</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/buildstepspage.cpp" line="+103"/>
+ <source>Build Steps</source>
+ <translation>Fasi di Compilazione</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::CompileOutputWindow</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/compileoutputwindow.cpp" line="+47"/>
+ <location filename="../../../src/plugins/projectexplorer/compileoutputwindow.h" line="+51"/>
+ <source>Compile Output</source>
+ <translation>Output di Compilazione</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::CoreListenerCheckingForRunningBuild</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+113"/>
+ <source>Cancel Build && Close</source>
+ <translation>Annulla la Compilazione && Chiudi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Don't Close</source>
+ <translation>Non Chiudere</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Close Qt Creator?</source>
+ <translation>Chiudere Qt Creator?</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>A project is currently being built.</source>
+ <translation>Un progetto è in compilazione.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do you want to cancel the build process and close Qt Creator anyway?</source>
+ <translation>Vuoi annullare il processo di compilazione e chiudere Qt Creator comunque?</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::CurrentProjectFilter</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/currentprojectfilter.h" line="+54"/>
+ <source>Files in current project</source>
+ <translation>File nel progetto corrente</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::CurrentProjectFind</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/currentprojectfind.cpp" line="+62"/>
+ <source>Current Project</source>
+ <translation>Progetto Corrente</translation>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>File &pattern:</source>
+ <translation>&Schema file:</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::CustomExecutableConfigurationWidget</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/customexecutablerunconfiguration.cpp" line="-287"/>
+ <source>Name:</source>
+ <translation>Nome:</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Executable:</source>
+ <translation>Eseguibile:</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Arguments:</source>
+ <translation>Parametri:</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Working Directory:</source>
+ <translation>Cartella di Lavoro:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Run in &Terminal</source>
+ <translation>Esegui nel &Terminale</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::DependenciesPanel</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/dependenciespanel.cpp" line="+66"/>
+ <source>Dependencies</source>
+ <translation>Dipendenze</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::DependenciesWidget</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/dependenciespanel.ui"/>
+ <source>Project Dependencies</source>
+ <translation>Dipendenze del Progetto</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Project Dependencies:</source>
+ <translation>Dipendenze del Progetto:</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::DetailedModel</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/projectmodels.cpp" line="+231"/>
+ <source>%1 of project %2</source>
+ <translation>%1 del progetto %2</translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Could not rename file</source>
+ <translation>Impossibile rinominare il file</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Renaming file %1 to %2 failed.</source>
+ <translation>Non è stato possibile rinominare %1 in %2.</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::EditorSettingsPanel</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/editorsettingspropertiespage.cpp" line="+62"/>
+ <source>Editor Settings</source>
+ <translation>Impostazioni dell Editor</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::EditorSettingsPropertiesPage</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/editorsettingspropertiespage.ui"/>
+ <source>Default File Encoding:</source>
+ <translation>Codifica File Predefinita:</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::FolderNavigationWidgetFactory</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/foldernavigationwidget.cpp" line="+193"/>
+ <source>File System</source>
+ <translation>File System</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Synchronize with Editor</source>
+ <translation>Sincronizza con l'Editor</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::NewSessionInputDialog</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/sessiondialog.cpp" line="+89"/>
+ <source>New session name</source>
+ <translation>Nome della nuova sessione</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Enter the name of the new session:</source>
+ <translation>Inserisci il nome della nuova sessione:</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::OutputPane</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/outputwindow.cpp" line="+70"/>
+ <source>Re-run this run-configuration</source>
+ <translation>Riavvia questa esecuzione</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <location line="+1"/>
+ <source>Stop</source>
+ <translation>Ferma</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Ctrl+Shift+R</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+56"/>
+ <source>Application Output</source>
+ <translation>Output dell'Applicazione</translation>
+ </message>
+ <message>
+ <location line="+116"/>
+ <source>The application is still running. Close it first.</source>
+ <translation>L'applicazione è ancora in esecuzione. Prima chiudila.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unable to close</source>
+ <translation>Impossibile chiudere</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::OutputWindow</name>
+ <message>
+ <location line="+82"/>
+ <source>Application Output Window</source>
+ <translation>Finestra di Output dell'Applicazione</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::ProcessStep</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/processstep.cpp" line="+83"/>
+ <source>Custom Process Step</source>
+ <translation>Fase Speciale</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::ProcessStepWidget</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/processstep.ui"/>
+ <source>Enable custom process step</source>
+ <translation>Abilita fase speciale</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Name:</source>
+ <translation>Nome:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Command:</source>
+ <translation>Comando:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Working Directory:</source>
+ <translation>Directory di Lavoro:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Command Arguments:</source>
+ <translation>Parametri del Comando:</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::ProjectExplorerSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.cpp" line="+55"/>
+ <source>Build and Run Settings</source>
+ <translation>Impostazioni di Compilazione ed Esecuzione</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Projectexplorer</source>
+ <translation>Projectexplorer</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::ProjectFileFactory</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/pluginfilefactory.cpp" line="+68"/>
+ <source>Could not open the following project: '%1'</source>
+ <translation>Non è stato possibile aprire il progetto: '%1'</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::ProjectFileWizardExtension</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/projectfilewizardextension.cpp" line="+179"/>
+ <source>Failed to add one or more files to project
+'%1' (%2).</source>
+ <translation>Non è stato possibile aggiungere file al progetto
+'%1' (%2).</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Failed to add '%1' to the version control system.</source>
+ <translation>Non è stato possibile aggiungere '%1' al sistema di revisione del codice.</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::ProjectTreeWidget</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/projecttreewidget.cpp" line="+140"/>
+ <source>Simplify tree</source>
+ <translation>Semplifica albero</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Hide generated files</source>
+ <translation>Nascondi i file generati</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Synchronize with Editor</source>
+ <translation>Sincronizza con l'Editor</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::ProjectTreeWidgetFactory</name>
+ <message>
+ <location line="+187"/>
+ <source>Projects</source>
+ <translation>Progetti</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Filter tree</source>
+ <translation>Filtra l'albero</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::ProjectWindow</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/projectwindow.cpp" line="+62"/>
+ <source>Project Explorer</source>
+ <translation>Progetto</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Projects</source>
+ <translation>Progetti</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Startup</source>
+ <translation>Avvio</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Path</source>
+ <translation>Percorso</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::ProjectWizardPage</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/projectwizardpage.cpp" line="+110"/>
+ <source>Add to &VCS (%1)</source>
+ <translation>Aggiungi al &VCS (%1)</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Files to be added:</source>
+ <translation>File da aggiungere:</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::ProjetExplorerSettingsPageUi</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.ui"/>
+ <source>Build Settings</source>
+ <translation>Impostazioni di Compilazione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Save all files before Build</source>
+ <translation>Salva tutti i file prima della Compilazione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Run Settings</source>
+ <translation>Impostazioni di Esecuzione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Always build Project before Running</source>
+ <translation>Compila sempre il Progetto prima dell'Esecuzione</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::RemoveFileDialog</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/removefiledialog.ui"/>
+ <source>Remove File</source>
+ <translation>Rimozione del File</translation>
+ </message>
+ <message>
+ <location/>
+ <source>File to remove:</source>
+ <translation>File da rimuovere:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Delete file permanently</source>
+ <translation>&Cancella il file in modo permanente</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Remove from Version Control</source>
+ <translation>&Rimuovi dal sistema di revisione</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::RunSettingsPanel</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.cpp" line="+116"/>
+ <source>Run Settings</source>
+ <translation>Impostazioni di Esecuzione</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::RunSettingsPropertiesPage</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.ui"/>
+ <source>Run &configuration:</source>
+ <translation>Ese&cuzione di:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>+</source>
+ <translation>+</translation>
+ </message>
+ <message>
+ <location/>
+ <source>-</source>
+ <translation>-</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Settings</source>
+ <translation>Impostazioni</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::SessionDialog</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/sessiondialog.ui"/>
+ <source>Session Manager</source>
+ <translation>Gestione della Sessione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Choose your session</source>
+ <translation>Scegli una sessione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Create New Session</source>
+ <translation>Crea Nuova</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Clone Session</source>
+ <translation>Clona</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Delete Session</source>
+ <translation>Elimina</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::SessionFile</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/session.cpp" line="+156"/>
+ <source>Session</source>
+ <translation>Sessione</translation>
+ </message>
+ <message>
+ <location line="+184"/>
+ <source>Untitled</source>
+ <comment>default file name to display</comment>
+ <translation>Senza titolo</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::TaskDelegate</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/taskwindow.cpp" line="+615"/>
+ <source>File not found: %1</source>
+ <translation>File non trovato: %1</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::TaskWindow</name>
+ <message>
+ <location line="-347"/>
+ <location filename="../../../src/plugins/projectexplorer/taskwindow.h" line="+61"/>
+ <source>Build Issues</source>
+ <translation>Problemi di Compilazione</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>&Copy</source>
+ <translation>&Copia</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::WinGuiProcess</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/winguiprocess.cpp" line="+122"/>
+ <source>The process could not be started!</source>
+ <translation>Non è stato possibile avviare il processo!</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Cannot retrieve debugging output!</source>
+ <translation>Non è possibile recuperare l'output di debug!</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::Internal::WizardPage</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/projectwizardpage.ui"/>
+ <source>Project management</source>
+ <translation>Gestione progetto</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Add to Project</source>
+ <translation>&Aggiungi al Progetto</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Project</source>
+ <translation>&Progetto</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Add to &version control</source>
+ <translation>Aggiungi al &VCS</translation>
+ </message>
+ <message>
+ <location/>
+ <source>The following files will be added:
+
+
+
+</source>
+ <translation>Saranno aggiunti i file seguenti:
+
+
+
+</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::ProjectExplorerPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+63"/>
+ <source>Projects</source>
+ <translation>Progetti</translation>
+ </message>
+ <message>
+ <location line="+88"/>
+ <source>&Build</source>
+ <translation>&Compila</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&Debug</source>
+ <translation>&Debug</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Open With</source>
+ <translation>Apri con</translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>Session Manager...</source>
+ <translation>Gestione della Sessione...</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>New Project...</source>
+ <translation>Nuovo Progetto...</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+Shift+N</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Load Project...</source>
+ <translation>Carica Progetto...</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+Shift+O</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open File</source>
+ <translation>Apri File</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Show in Finder...</source>
+ <translation>Mostra nel Finder...</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Recent Projects</source>
+ <translation>Progetti Recenti</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <location line="+808"/>
+ <source>Unload Project</source>
+ <translation>Chiudi Progetto</translation>
+ </message>
+ <message>
+ <location line="-800"/>
+ <source>Unload All Projects</source>
+ <translation>Chiudi Tutti i Progetti</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Session</source>
+ <translation>Sessione</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Set Build Configuration</source>
+ <translation>Compilazione di</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Build All</source>
+ <translation>Compila Tutto</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+Shift+B</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Rebuild All</source>
+ <translation>Ricompila Tutto</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Clean All</source>
+ <translation>Pulisci Tutto</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <location line="+748"/>
+ <source>Build Project</source>
+ <translation>Compila il Progetto</translation>
+ </message>
+ <message>
+ <location line="-745"/>
+ <source>Ctrl+B</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Rebuild Project</source>
+ <translation>Ricompila il Progetto</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Clean Project</source>
+ <translation>Pulisci il Progetto</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <location line="+18"/>
+ <source>Run</source>
+ <translation>Esegui</translation>
+ </message>
+ <message>
+ <location line="-16"/>
+ <source>Ctrl+R</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Set Run Configuration</source>
+ <translation>Esecuzione di</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Go to Task Window</source>
+ <translation>Vai alla Finestra dei Task</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Cancel Build</source>
+ <translation>Annulla la Compilazione</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+4"/>
+ <source>Start Debugging</source>
+ <translation>Avvia il Debug</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>F5</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Add New...</source>
+ <translation>Aggiungi Nuovo...</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Add Existing Files...</source>
+ <translation>Aggiungi File Esistenti...</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Remove File...</source>
+ <translation>Rimuovi File...</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Rename</source>
+ <translation>Rinomina</translation>
+ </message>
+ <message>
+ <location line="+120"/>
+ <source>Load Project</source>
+ <translation>Carica Progetto</translation>
+ </message>
+ <message>
+ <location line="+83"/>
+ <source>New Project</source>
+ <comment>Title of dialog</comment>
+ <translation>Nuovo Progetto</translation>
+ </message>
+ <message>
+ <location line="+453"/>
+ <source>Unload Project "%1"</source>
+ <translation>Chiudi il Progetto "%1"</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Build Project "%1"</source>
+ <translation>Compila il Progetto "%1"</translation>
+ </message>
+ <message>
+ <location line="+390"/>
+ <source>New File</source>
+ <comment>Title of dialog</comment>
+ <translation>Nuovo File</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Add Existing Files</source>
+ <translation>Aggiungi File Esistenti</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Could not add following files to project %1:
+</source>
+ <translation>Non è stato possibile aggiungere questi file al progetto %1:
+</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Add files to project failed</source>
+ <translation>Impossibile aggiungere file al progetto</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Add to Version Control</source>
+ <translation>Aggiungi al VCS</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Add files
+%1
+to version control (%2)?</source>
+ <translation>Aggiungere i file
+%1
+al VCS (%2)?</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Could not add following files to version control (%1)
+</source>
+ <translation>Non è stato possibile aggiungere questi file al VCS (%1)
+</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Add files to version control failed</source>
+ <translation>Impossibile aggiungere file al VCS</translation>
+ </message>
+ <message>
+ <location line="+51"/>
+ <source>Remove file failed</source>
+ <translation>Rimozione del file fallita</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Could not remove file %1 from project %2.</source>
+ <translation>Non è stato possibile rimuovere il file %1 dal progetto %2.</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Delete file failed</source>
+ <translation>Cancellazione del file fallita</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Could not delete file %1.</source>
+ <translation>Non è stato possibile cancellare il file %1.</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::SessionManager</name>
+ <message>
+ <location filename="../../../src/plugins/projectexplorer/session.cpp" line="+297"/>
+ <source>Error while loading session</source>
+ <translation>Errore durante il caricamento della sessione</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Could not load session %1</source>
+ <translation>Impossibile caricare la sessione %1</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>Error while saving session</source>
+ <translation>Errore durante il salvataggio della sessione</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Could not save session to file %1</source>
+ <translation>Impossibile salvare la sessione sul file %1</translation>
+ </message>
+ <message>
+ <location line="+239"/>
+ <source>Qt Creator</source>
+ <translation>Qt Creator</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <location line="+15"/>
+ <source>Untitled</source>
+ <translation>Senza titolo</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Session ('%1')</source>
+ <translation>Sessione ('%1')</translation>
+ </message>
+</context>
+<context>
+ <name>QLibrary</name>
+ <message>
+ <location filename="../../../src/libs/extensionsystem/patchedpluginloader.cpp" line="+360"/>
+ <source>Could not mmap '%1': %2</source>
+ <translation>Non è stato possibile fare mmap '%1': '%2'</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Plugin verification data mismatch in '%1'</source>
+ <translation>Errore nella verifica dei dati del plugin su '%1'</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Could not unmap '%1': %2</source>
+ <translation>Non è stato possibile fare unmap '%1': '%2'</translation>
+ </message>
+ <message>
+ <location line="+281"/>
+ <location line="+141"/>
+ <source>The shared library was not found.</source>
+ <translation>Non è stata trovata la libreria.</translation>
+ </message>
+ <message>
+ <location line="-139"/>
+ <source>The file '%1' is not a valid Qt plugin.</source>
+ <translation>Il file '%1' non è un Qt plugin valido.</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5]</source>
+ <translation>Il plugin '%1' usa una libreria Qt non compatibile. (%2.%3.%4) [%5]</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3"</source>
+ <translation>Il plugin '%1' usa una libreria Qt non compatibile. Attesa la build key "%2", al posto di "%3"</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.)</source>
+ <translation>Il plugin '%1' usa una libreria Qt non compatibile (non è possibile mescolare librerie debug e release).</translation>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>The plugin was not loaded.</source>
+ <translation>Il plugin non è stato caricato.</translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Unknown error</source>
+ <translation>Errore sconosciuto</translation>
+ </message>
+ <message>
+ <location line="+171"/>
+ <location line="+97"/>
+ <source>Cannot load library %1: %2</source>
+ <translation>Impossibile caricare la libreria %1: %2</translation>
+ </message>
+ <message>
+ <location line="-81"/>
+ <location line="+107"/>
+ <source>Cannot unload library %1: %2</source>
+ <translation>Impossibile chiudere la libreria %1: %2</translation>
+ </message>
+ <message>
+ <location line="-83"/>
+ <location line="+98"/>
+ <source>Cannot resolve symbol "%1" in %2: %3</source>
+ <translation>Impossibile risolvere il simbolo "%1" in %2: %3</translation>
+ </message>
+</context>
+<context>
+ <name>QMakeStep</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qmakestep.ui"/>
+ <source>QMake Build Configuration:</source>
+ <translation>Configurazione di QMake:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>debug</source>
+ <translation>debug</translation>
+ </message>
+ <message>
+ <location/>
+ <source>release</source>
+ <translation>release</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Additional arguments:</source>
+ <translation>Parametri aggiuntivi:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Effective qmake call:</source>
+ <translation>Chiamata effettiva a qmake:</translation>
+ </message>
+</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location filename="../../../src/libs/utils/reloadpromptutils.cpp" line="+40"/>
+ <source>File Changed</source>
+ <translation>File Modificato</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The file %1 has changed outside Qt Creator. Do you want to reload it?</source>
+ <translation>Il file %1 è stato modificato fuori da Qt Creator. Vuoi ricaricarlo?</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="-483"/>
+ <source>File is Read Only</source>
+ <translation>Il file è di Sola Lettura</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The file %1 is read only.</source>
+ <translation>Il file %1 è di sola lettura.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Open with VCS (%1)</source>
+ <translation>Apri con il VCS (%1)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Make writable</source>
+ <translation>Rendi scrivibile</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Save as ...</source>
+ <translation>Salva con nome...</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/fakevim/fakevimactions.cpp" line="+117"/>
+ <source>Toggle vim-style editing</source>
+ <translation>Commuta l'editor vim-style</translation>
+ </message>
+ <message>
+ <location line="+50"/>
+ <source>FakeVim properties...</source>
+ <translation>Proprietà di FakeVim...</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/qtestlib/qtestlibplugin.cpp" line="+59"/>
+ <source>Pass</source>
+ <translation>Passato</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Expected Failure</source>
+ <translation>Atteso Fallimento</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failure</source>
+ <translation>Fallimento</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Expected Pass</source>
+ <translation>Atteso Passaggio</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Warning</source>
+ <translation>Warning</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Qt Warning</source>
+ <translation>Qt Warning</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Qt Debug</source>
+ <translation>Qt Debug</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Critical</source>
+ <translation>Critical</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Fatal</source>
+ <translation>Fatal</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Skipped</source>
+ <translation>Skipped</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Info</source>
+ <translation>Info</translation>
+ </message>
+</context>
+<context>
+ <name>QTestLib::Internal::QTestOutputPane</name>
+ <message>
+ <location line="+266"/>
+ <source>Test Results</source>
+ <translation>Risultati del test</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Result</source>
+ <translation>Risultato</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Messaggio</translation>
+ </message>
+</context>
+<context>
+ <name>QTestLib::Internal::QTestOutputWidget</name>
+ <message>
+ <location line="+45"/>
+ <source>All Incidents</source>
+ <translation>Tutti gli Incidenti</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Show Only:</source>
+ <translation>Mostra Solo:</translation>
+ </message>
+</context>
+<context>
+ <name>QrcEditor</name>
+ <message>
+ <location filename="../../../src/shared/qrceditor/qrceditor.ui"/>
+ <source>Add</source>
+ <translation>Aggiungi</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Remove</source>
+ <translation>Rimuovi</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Properties</source>
+ <translation>Proprietà </translation>
+ </message>
+ <message>
+ <location/>
+ <source>Prefix:</source>
+ <translation>Prefisso:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Language:</source>
+ <translation>Lingua:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Alias:</source>
+ <translation>Alias:</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::ConsoleAppWizard</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp" line="+58"/>
+ <source>Qt4 Console Application</source>
+ <translation>Applicazione Qt4 per Linea di Comando</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Creates a Qt4 console application.</source>
+ <translation>Crea una applicazione per console Qt4.</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::ConsoleAppWizardDialog</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp" line="+52"/>
+ <source>This wizard generates a Qt4 console application project. The application derives from QCoreApplication and does not present a GUI. You can press 'Finish' at any point in time.</source>
+ <translation>Questa procedura guidata genera un progetto per applicazione console Qt4. L'applicazione deriva da QCoreApplication e non ha una GUI. Puoi premere 'Fine' in qualsiasi momento.</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::EmbeddedPropertiesPanel</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/embeddedpropertiespage.cpp" line="+80"/>
+ <source>Embedded Linux</source>
+ <translation>Embedded Linux</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::EmptyProjectWizard</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp" line="+40"/>
+ <source>Empty Qt4 Project</source>
+ <translation>Progetto Qt4 Vuoto</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Creates an empty Qt project.</source>
+ <translation>Crea un progetto Qt4 vuoto.</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::EmptyProjectWizardDialog</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp" line="+50"/>
+ <source>This wizard generates an empty Qt4 project. Add files to it later on by using the other wizards. You can press 'Finish' at any point in time.</source>
+ <translation>Questa procedura guidata genera un progetto Qt4 vuoto. Altri file potranno essere aggiunti in seguito con altre procedure guidate. Puoi premere 'Fine' in qualsiasi momento.</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::EnvEditDialog</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/enveditdialog.ui"/>
+ <source>Build Environment</source>
+ <translation>Ambiente di Compilazione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Make Command:</source>
+ <translation>Comando Make:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Build Environment:</source>
+ <translation>Ambiente di Compilazione:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>mkspec:</source>
+ <translation>mkspec:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>0</source>
+ <translation>0</translation>
+ </message>
+ <message>
+ <location/>
+ <source>1</source>
+ <translation>1</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Values:</source>
+ <translation>Valori:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Variable:</source>
+ <translation>Variabile:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Import</source>
+ <translation>Importa</translation>
+ </message>
+ <message>
+ <location/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Cancel</source>
+ <translation>Annulla</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::EnvVariablesPage</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/envvariablespage.ui"/>
+ <source>Build Environments</source>
+ <translation>Ambienti di Compilazione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Add...</source>
+ <translation>Aggiungi...</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Edit...</source>
+ <translation>Modifica...</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Delete</source>
+ <translation>Elimina</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Default mkspec:</source>
+ <translation>mkspec predefinito:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Default make command:</source>
+ <translation>Comando make predefinito:</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::FilesPage</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/filespage.cpp" line="+45"/>
+ <source>Class Information</source>
+ <translation>Informazioni sulla Classe</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Specify basic information about the classes for which you want to generate skeleton source code files.</source>
+ <translation>Inserisci le informazioni fondamentali sulla classe di cui vuoi generare lo scheletro dei file sorgenti.</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::GuiAppWizard</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/guiappwizard.cpp" line="+72"/>
+ <source>Qt4 Gui Application</source>
+ <translation>Applicazione Qt4 Gui</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Creates a Qt4 Gui Application with one form.</source>
+ <translation>Crea una applicazione Gui Qt4 con una form.</translation>
+ </message>
+ <message>
+ <location line="+92"/>
+ <source>The template file '%1' could not be opened for reading: %2</source>
+ <translation>Il file template '%1' non può essere aperto in lettura: %2</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::GuiAppWizardDialog</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp" line="+63"/>
+ <source>This wizard generates a Qt4 GUI application project. The application derives by default from QApplication and includes an empty widget.</source>
+ <translation>Questa procedura guidata genera un progetto per applicazione Gui Qt4. L'applicazione deriva da QApplication ed include un widget vuoto.</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::LibraryWizard</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/librarywizard.cpp" line="+50"/>
+ <source>C++ Library</source>
+ <translation>Libreria C++</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Creates a C++ Library.</source>
+ <translation>Crea una Libreria C++.</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::LibraryWizardDialog</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp" line="+122"/>
+ <source>Shared library</source>
+ <translation>Libreria condivisa</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Statically linked library</source>
+ <translation>Libreria statica</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Qt 4 plugin</source>
+ <translation>Plugin Qt4</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Type</source>
+ <translation>Tipo</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>This wizard generates a C++ library project.</source>
+ <translation>Questa procedura guidata genera un progetto per una libreria C++.</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::ModulesPage</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/modulespage.cpp" line="+50"/>
+ <source>Select required modules</source>
+ <translation>Marca i moduli richiesti</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Select the modules you want to include in your project. The recommended modules for this project are selected by default.</source>
+ <translation>Seleziona tutti i moduli che vuoi includere nel tuo progetto. Quelli raccomandati per questo progetto sono già selezionati.</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::ProEditor</name>
+ <message>
+ <location filename="../../../src/shared/proparser/proeditor.ui"/>
+ <source>New</source>
+ <translation>Nuovo</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Remove</source>
+ <translation>Rimuovi</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Up</source>
+ <translation>Su</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Down</source>
+ <translation>Giu</translation>
+ </message>
+ <message>
+ <location filename="../../../src/shared/proparser/proeditor.cpp" line="+51"/>
+ <source>Cut</source>
+ <translation>Taglia</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy</source>
+ <translation>Copia</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Paste</source>
+ <translation>Incolla</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Ctrl+X</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ctrl+C</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ctrl+V</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Add Variable</source>
+ <translation>Aggiungi Variabile</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Add Scope</source>
+ <translation>Aggiungi Ambito</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Add Block</source>
+ <translation>Aggiungi Blocco</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::ProEditorModel</name>
+ <message>
+ <location filename="../../../src/shared/proparser/proeditormodel.cpp" line="+446"/>
+ <source><Global Scope></source>
+ <translation><Ambito Globale></translation>
+ </message>
+ <message>
+ <location line="+74"/>
+ <source>Change Item</source>
+ <translation>Cambia Elemento</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Change Variable Assignment</source>
+ <translation>Cambia Assegnazione della Variabile</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Change Variable Type</source>
+ <translation>Cambia Tipo della Variabile</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Change Scope Condition</source>
+ <translation>Cambia Condizione di Ambito</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Change Expression</source>
+ <translation>Cambia Espressione</translation>
+ </message>
+ <message>
+ <location line="+51"/>
+ <source>Move Item</source>
+ <translation>Sposta Elemento</translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Remove Item</source>
+ <translation>Rimuovi Elemento</translation>
+ </message>
+ <message>
+ <location line="+49"/>
+ <source>Insert Item</source>
+ <translation>Inserisci Elemento</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::ProjectLoadWizard</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+189"/>
+ <source>Import existing settings</source>
+ <translation>Importa le impostazioni esistenti</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Qt Creator has found an already existing build in the source directory.<br><br><b>Qt Version:</b> %1<br><b>Build configuration:</b> %2<br></source>
+ <translation>Qt creator ha rilevato una compilazione precedente nella cartella dei sorgenti.<br><br><b>Versione Qt:</b> %1<br><b>Configurazione della Compilazione:</b> %2<br></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Import existing build settings.</source>
+ <translation>Importa le impostazioni della compilazione esistenti.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source><b>Note:</b> Importing the settings will automatically add the Qt Version from:<br><b>%1</b> to the list of qt versions.</source>
+ <translation><b>Nota:</b> Importando le impostazioni, si aggiungerà automaticamente la Versione di Qt in:<br><b>%1</b> alla lista della versioni di qt.</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::Qt4BuildEnvironmentWidget</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4buildenvironmentwidget.ui"/>
+ <source>Clear system environment</source>
+ <translation>Pulisci l'ambiente di sistema</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Edit</source>
+ <translation>&Modifica</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Add</source>
+ <translation>&Aggiungi</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Reset</source>
+ <translation>&Ripristina</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Unset</source>
+ <translation>&Togli</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp" line="+84"/>
+ <source>Build Environment</source>
+ <translation>Ambiente di Compilazione</translation>
+ </message>
+ <message>
+ <location line="+54"/>
+ <source>Reset</source>
+ <translation>Ripristina</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Remove</source>
+ <translation>Rimuovi</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::Qt4PriFileNode</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4nodes.cpp" line="+280"/>
+ <location line="+7"/>
+ <source>Failed!</source>
+ <translation>Non riuscito!</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Could not open the file for edit with SCC.</source>
+ <translation>Impossibile aprire il file per modifica con l'SCC.</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Could not set permissions to writable.</source>
+ <translation>Impossibile impostare il permesso di scrittura.</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <source>There are unsaved changes for project file %1.</source>
+ <translation>Ci sono delle modifiche non salvati sul file di progetto %1.</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Error while parsing file %1. Giving up.</source>
+ <translation>Errore durante la lettura del file %1. Rinuncio.</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Error while changing pro file %1.</source>
+ <translation>Errore durante la modifica del file pro %1.</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::Qt4ProFileNode</name>
+ <message>
+ <location line="+227"/>
+ <source>Error while parsing file %1. Giving up.</source>
+ <translation>Errore durante la lettura del file %1. Rinuncio.</translation>
+ </message>
+ <message>
+ <location line="+373"/>
+ <source>Could not find .pro file for sub dir '%1' in '%2'</source>
+ <translation>Impossibile trovare il file .pro della sottocartella '%1' in '%2'</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::Qt4ProjectConfigWidget</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.ui"/>
+ <source>Configuration Name:</source>
+ <translation>Nome della Configurazione:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Qt Version:</source>
+ <translation>Versione Qt:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Manage Qt Versions</source>
+ <translation>Gestione Versioni Qt</translation>
+ </message>
+ <message>
+ <location/>
+ <source>This Qt-Version is invalid.</source>
+ <translation>Questa Versione Qt non è valida.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Shadow Build:</source>
+ <translation>Compila in cartella separata:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Build Directory:</source>
+ <translation>Cartella di Compilazione:</translation>
+ </message>
+ <message>
+ <location/>
+ <source><a href="import">Import existing build</a></source>
+ <translation><a href="import">Importa compilazione esistente</a></translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp" line="+59"/>
+ <source>Shadow Build Directory</source>
+ <translation>Cartella di Compilazione</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>General</source>
+ <translation>Generale</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Default Qt Version</source>
+ <translation>Versione Qt Predefinita</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::Qt4ProjectManagerPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp" line="+154"/>
+ <location line="+5"/>
+ <source>Run qmake</source>
+ <translation>Avvia qmake</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>Qt4RunConfiguration</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Could not parse %1. The Qt4 run configuration %2 can not be started.</source>
+ <translation>Impossibile leggere %1. L'esecuzione '%2' non può essere avviata.</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::Qt4RunConfigurationWidget</name>
+ <message>
+ <location line="-267"/>
+ <source>Name:</source>
+ <translation>Nome:</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Executable:</source>
+ <translation>Eseguibile:</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Working Directory:</source>
+ <translation>Cartella di Lavoro:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&Arguments:</source>
+ <translation>&Parametri:</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Run in &Terminal</source>
+ <translation>Esegui nel &Terminale</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)</source>
+ <translation>Utilizza la versione di debug dei framework (DYLD_IMAGE_SUFFIX=_debug)</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::QtOptionsPageWidget</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qtoptionspage.cpp" line="+65"/>
+ <source><specify a name></source>
+ <translation><specifica un nome></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source><specify a path></source>
+ <translation><specifica un percorso></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select QTDIR</source>
+ <translation>Selezionare QTDIR</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Select the Qt Directory</source>
+ <translation>Selezionare la Cartella Qt</translation>
+ </message>
+ <message>
+ <location line="+211"/>
+ <source>The Qt Version %1 is not installed. Run make install</source>
+ <translation>La Versione Qt %1 non è installata. Esegui make install</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%1 is not a valid qt directory</source>
+ <translation>%1 non è una cartella qt valida</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Found Qt version %1, using mkspec %2</source>
+ <translation>Trovata la versione Qt %1, uso l'mkspec %2</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::QtVersionManager</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.ui"/>
+ <source>Qt versions</source>
+ <translation>Versioni Qt</translation>
+ </message>
+ <message>
+ <location/>
+ <source>+</source>
+ <translation>+</translation>
+ </message>
+ <message>
+ <location/>
+ <source>-</source>
+ <translation>-</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Name</source>
+ <translation>Nome</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Path</source>
+ <translation>Percorso</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Debugging Helper</source>
+ <translation>Helper del Debug</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Version Name:</source>
+ <translation>Nome della Versione:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Path:</source>
+ <translation>Percorso:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>MinGw Directory:</source>
+ <translation>Cartella MinGw:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Debugging Helper:</source>
+ <translation>Helper del Debug:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Show &Log</source>
+ <translation>Mostra &Log</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Rebuild</source>
+ <translation>&Ricompila</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Default Qt Version:</source>
+ <translation>Versione Qt Predefinita:</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::QtWizard</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/wizards/qtwizard.cpp" line="+91"/>
+ <source>The project %1 could not be opened.</source>
+ <translation>Impossibile aprire il progetto %1.</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Internal::ValueEditor</name>
+ <message>
+ <location filename="../../../src/shared/proparser/valueeditor.ui"/>
+ <source>Edit Variable</source>
+ <translation>Modifica Variabile</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Variable Name:</source>
+ <translation>Nome Variabile:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Assignment Operator:</source>
+ <translation>Operatore di Assegnazione:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Variable:</source>
+ <translation>Variabile:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Append (+=)</source>
+ <translation>Aggiungi (+=)</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Remove (-=)</source>
+ <translation>Rimuovi (-=)</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Replace (~=)</source>
+ <translation>Sostituisci (~=)</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Set (=)</source>
+ <translation>Imposta (=)</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Unique (*=)</source>
+ <translation>Unica (*=)</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Select Item</source>
+ <translation>Scegli Elemento</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Edit Item</source>
+ <translation>Modifica Elemento</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Select Items</source>
+ <translation>Scegli Elementi</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Edit Items</source>
+ <translation>Modifica Elementi</translation>
+ </message>
+ <message>
+ <location/>
+ <source>New</source>
+ <translation>Nuovo</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Remove</source>
+ <translation>Rimuovi</translation>
+ </message>
+ <message>
+ <location filename="../../../src/shared/proparser/valueeditor.cpp" line="+252"/>
+ <source>Edit Values</source>
+ <translation>Modifica i Valori</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Edit %1</source>
+ <translation>Modifica %1</translation>
+ </message>
+ <message>
+ <location line="+69"/>
+ <source>Edit Scope</source>
+ <translation>Modifica Ambito</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Edit Advanced Expression</source>
+ <translation>Modifica Espressione Avanzata</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::MakeStep</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+78"/>
+ <source><font color="#ff0000">Could not find make command: %1 in the build environment</font></source>
+ <translation><font color="#ff0000">Impossibile trovare il comando make: %1 nell'ambiente di compilazione</font></translation>
+ </message>
+ <message>
+ <location line="+50"/>
+ <source><font color="#0000ff"><b>No Makefile found, assuming project is clean.</b></font></source>
+ <translation><font color="#0000ff"><b>Non trovo il Makefile. Assumo che il progetto sia pulito.</b></font></translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::MakeStepConfigWidget</name>
+ <message>
+ <location line="+52"/>
+ <source>Override %1:</source>
+ <translation>Ridefinisci %1:</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::QMakeStep</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="+107"/>
+ <source>
+<font color="#ff0000"><b>No valid Qt version set. Set one in Preferences </b></font>
+</source>
+ <translation>
+<font color="#ff0000"><b>Non è stata impostata una Versione Qt valida. Impostane una nelle Preferenze </b></font>
+</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>
+<font color="#ff0000"><b>No valid Qt version set. Set one in Tools/Options </b></font>
+</source>
+ <translation>
+<font color="#ff0000"><b>Non è stata impostata una Versione Qt valida. Impostane una in Strumenti/Opzioni </b></font>
+</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>QMAKESPEC from environment (%1) overrides mkspec of selected Qt (%2).</source>
+ <translation>La variabile QMAKESPEC dell'ambiente (%1) ridefinisce l'mkspec della Versione Qt selezionata (%2).</translation>
+ </message>
+ <message>
+ <location line="+53"/>
+ <source><font color="#0000ff">Configuration unchanged, skipping QMake step.</font></source>
+ <translation><font color="#0000ff">La configurazione non è cambiata, salto la fase QMake.</font></translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::Qt4Manager</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanager.cpp" line="+133"/>
+ <source>Loading project %1 ...</source>
+ <translation>Caricamento del progetto %1 ...</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Failed opening project '%1': Project file does not exist</source>
+ <translation>Non è stato possibile aprire il progetto '%1': il file di progetto non esiste</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+7"/>
+ <source>Failed opening project</source>
+ <translation>Impossibile aprire il progetto</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Failed opening project '%1': Project already open</source>
+ <translation>Non è stato possibile aprire il progetto '%1': il progetto è già aperto</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Opening %1 ...</source>
+ <translation>Apertura di %1 ...</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Done opening project</source>
+ <translation>Progetto aperto</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::QtVersionManager</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+238"/>
+ <source><not found></source>
+ <translation><non trovato></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <location line="+6"/>
+ <source>Auto-detected Qt</source>
+ <translation>Qt auto-rilevate</translation>
+ </message>
+</context>
+<context>
+ <name>QtDumperHelper</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+163"/>
+ <source><none></source>
+ <translation><nessuno></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+1"/>
+ <source>%n known types, Qt version: %1, Qt namespace: %2</source>
+ <translation>
+ <numerusform>un tipo conosciuto, versione Qt: %1, namespace Qt: %2</numerusform>
+ <numerusform>%n tipi conosciuti, versione Qt: %1, namespace Qt: %2</numerusform>
+ </translation>
+ </message>
+</context>
+<context>
+ <name>QtScriptEditor::Internal::QtScriptEditorActionHandler</name>
+ <message>
+ <location filename="../../../src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp" line="+96"/>
+ <source>Qt Script Error</source>
+ <translation>Errore Qt Script</translation>
+ </message>
+</context>
+<context>
+ <name>QtScriptEditor::Internal::QtScriptEditorPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/qtscripteditor/qtscripteditorplugin.cpp" line="+97"/>
+ <location line="+1"/>
+ <source>Qt Script file</source>
+ <translation>File Qt Script</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Qt</source>
+ <translation>Qt</translation>
+ </message>
+ <message>
+ <location line="+57"/>
+ <source>Run</source>
+ <translation>Esegui</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+R</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>QtScriptEditor::Internal::ScriptEditor</name>
+ <message>
+ <location filename="../../../src/plugins/qtscripteditor/qtscripteditor.cpp" line="+226"/>
+ <source><Select Symbol></source>
+ <translation><Scegli un Simbolo></translation>
+ </message>
+</context>
+<context>
+ <name>QuickOpen::IQuickOpenFilter</name>
+ <message>
+ <location filename="../../../src/plugins/quickopen/iquickopenfilter.cpp" line="+86"/>
+ <source>Filter Configuration</source>
+ <translation>Configurazione del Filtro</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Limit to prefix</source>
+ <translation>Limita al prefisso</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Prefix:</source>
+ <translation>Prefisso:</translation>
+ </message>
+</context>
+<context>
+ <name>QuickOpen::Internal::DirectoryFilter</name>
+ <message>
+ <location filename="../../../src/plugins/quickopen/directoryfilter.cpp" line="+44"/>
+ <source>Generic Directory Filter</source>
+ <translation>Filtro Cartella Generica</translation>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Filter Configuration</source>
+ <translation>Configurazione del Filtro</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+109"/>
+ <source>%1 filter update: %n files</source>
+ <translation>
+ <numerusform>%1 aggiornamento filtri: un file</numerusform>
+ <numerusform>%1 aggiornamento filtri: %n file</numerusform>
+ </translation>
+ </message>
+ <message>
+ <location line="-64"/>
+ <location line="+11"/>
+ <source>Choose a directory to add</source>
+ <translation>Scegli una cartella da aggiungere</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>%1 filter update: 0 files</source>
+ <translation>%1 aggiornamento filtri: 0 file</translation>
+ </message>
+ <message>
+ <location line="+64"/>
+ <source>%1 filter update: canceled</source>
+ <translation>%1 aggiornamento filtri: annullato</translation>
+ </message>
+</context>
+<context>
+ <name>QuickOpen::Internal::DirectoryFilterOptions</name>
+ <message>
+ <location filename="../../../src/plugins/quickopen/directoryfilter.ui"/>
+ <source>Name:</source>
+ <translation>Nome:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>File Types:</source>
+ <translation>Tipi di File:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Specify file name filters, separated by comma. Filters may contain wildcards.</source>
+ <translation>Specifica filtri sul nome, separati da una virgola. I filtri possono contenere wildcard.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Prefix:</source>
+ <translation>Prefisso:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Limit to prefix</source>
+ <translation>Limita al prefisso</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Add...</source>
+ <translation>Aggiungi...</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Edit...</source>
+ <translation>Modifica...</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Remove</source>
+ <translation>Rimuovi</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Directories:</source>
+ <translation>Cartelle:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Specify a short word/abbreviation that can be used to restrict completions to files from this directory tree.
+To do this, you type this shortcut and a space in the Locator entry field, and then the word to search for.</source>
+ <translation>Specifica la parola breve/abbreviazione che sarà usata per restringere il completamento ai file di queste cartelle.
+Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da cercare nella casella di Ricerca Rapida.</translation>
+ </message>
+</context>
+<context>
+ <name>QuickOpen::Internal::FileSystemFilter</name>
+ <message>
+ <location filename="../../../src/plugins/quickopen/filesystemfilter.h" line="+54"/>
+ <source>Files in file system</source>
+ <translation>File nel file system</translation>
+ </message>
+</context>
+<context>
+ <name>QuickOpen::Internal::FileSystemFilterOptions</name>
+ <message>
+ <location filename="../../../src/plugins/quickopen/filesystemfilter.ui"/>
+ <source>Filter configuration</source>
+ <translation>Configurazione del filtro</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Prefix:</source>
+ <translation>Prefisso:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Limit to prefix</source>
+ <translation>Limita al prefisso</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Include hidden files</source>
+ <translation>Includi i file nascosti</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Filter:</source>
+ <translation>Filtro:</translation>
+ </message>
+</context>
+<context>
+ <name>QuickOpen::Internal::OpenDocumentsFilter</name>
+ <message>
+ <location filename="../../../src/plugins/quickopen/opendocumentsfilter.h" line="+53"/>
+ <source>Open documents</source>
+ <translation>Documenti aperti</translation>
+ </message>
+</context>
+<context>
+ <name>QuickOpen::Internal::QuickOpenFiltersFilter</name>
+ <message>
+ <location filename="../../../src/plugins/quickopen/quickopenfiltersfilter.cpp" line="+53"/>
+ <source>Available filters</source>
+ <translation>Filtri disponibili</translation>
+ </message>
+</context>
+<context>
+ <name>QuickOpen::Internal::QuickOpenPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/quickopen/quickopenplugin.cpp" line="+255"/>
+ <source>Indexing</source>
+ <translation>Indicizzazione</translation>
+ </message>
+</context>
+<context>
+ <name>QuickOpen::Internal::QuickOpenToolWindow</name>
+ <message>
+ <location filename="../../../src/plugins/quickopen/quickopentoolwindow.cpp" line="+254"/>
+ <source>Refresh</source>
+ <translation>Aggiorna</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Configure...</source>
+ <translation>Configura...</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Locate...</source>
+ <translation>Trova...</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Type to locate</source>
+ <translation>Trova qui</translation>
+ </message>
+ <message>
+ <location line="+171"/>
+ <source><type here></source>
+ <translation><scrivi qui></translation>
+ </message>
+</context>
+<context>
+ <name>QuickOpen::Internal::SettingsDialog</name>
+ <message>
+ <location filename="../../../src/plugins/quickopen/settingswidget.ui"/>
+ <source>Configure Filters</source>
+ <translation>Configura i Filtri</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Add</source>
+ <translation>Aggiungi</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Remove</source>
+ <translation>Rimuovi</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Edit</source>
+ <translation>Modifica</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Refresh Intervall:</source>
+ <translation>Intervallo di aggiornamento:</translation>
+ </message>
+ <message>
+ <location/>
+ <source> min</source>
+ <translation> min</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Refresh now!</source>
+ <translation>Aggiorna adesso!</translation>
+ </message>
+</context>
+<context>
+ <name>QuickOpen::Internal::SettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/quickopen/settingspage.cpp" line="+159"/>
+ <source>%1 (Prefix: %2)</source>
+ <translation>%1 (Prefisso: %2)</translation>
+ </message>
+</context>
+<context>
+ <name>QuickOpen::Internal::SettingsWidget</name>
+ <message>
+ <location filename="../../../src/plugins/quickopen/settingspage.ui"/>
+ <source>Configure Filters</source>
+ <translation>Configura i Filtri</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Add</source>
+ <translation>Aggiungi</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Remove</source>
+ <translation>Rimuovi</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Edit</source>
+ <translation>Modifica</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Refresh Interval:</source>
+ <translation>Intervallo di aggiornamento:</translation>
+ </message>
+ <message>
+ <location/>
+ <source> min</source>
+ <translation> min</translation>
+ </message>
+</context>
+<context>
+ <name>RegExp::Internal::RegExpWindow</name>
+ <message>
+ <location filename="../../../src/plugins/regexp/regexpwindow.cpp" line="+46"/>
+ <source>&Pattern:</source>
+ <translation>&Pattern:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&Escaped Pattern:</source>
+ <translation>Sequenza di &Escape:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&Pattern Syntax:</source>
+ <translation>&Sintassi del Pattern:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&Text:</source>
+ <translation>&Testo:</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Case &Sensitive</source>
+ <translation>Distingui le &Maiuscole</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&Minimal</source>
+ <translation>&Minimale</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Index of Match:</source>
+ <translation>Indice della Corrispondenza:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Matched Length:</source>
+ <translation>Lunghezza della Corrispondenza:</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Regular expression v1</source>
+ <translation>Espressione Regolare v1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Regular expression v2</source>
+ <translation>Espressione Regolare v2</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Wildcard</source>
+ <translation>Wildcard</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Fixed string</source>
+ <translation>Stringa fissa</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>Capture %1:</source>
+ <translation>Cattura %1:</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Match:</source>
+ <translation>Corrispondenza:</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Regular Expression</source>
+ <translation>Espressione Regolare</translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>Enter pattern from code...</source>
+ <translation>Inserisci il pattern dal codice...</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Clear patterns</source>
+ <translation>Cancella i pattern</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Clear texts</source>
+ <translation>Cancella il testo</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Enter pattern from code</source>
+ <translation>Inserisci il pattern dal codice</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Pattern</source>
+ <translation>Pattern</translation>
+ </message>
+</context>
+<context>
+ <name>ResourceEditor::Internal::ResourceEditorPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/resourceeditor/resourceeditorplugin.cpp" line="+77"/>
+ <location line="+1"/>
+ <source>Resource file</source>
+ <translation>File delle Risorse</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Qt</source>
+ <translation>Qt</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&Undo</source>
+ <translation>&Annulla</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&Redo</source>
+ <translation>&Ripeti</translation>
+ </message>
+</context>
+<context>
+ <name>ResourceEditor::Internal::ResourceEditorW</name>
+ <message>
+ <location filename="../../../src/plugins/resourceeditor/resourceeditorw.cpp" line="+116"/>
+ <source>untitled</source>
+ <translation>senza titolo</translation>
+ </message>
+</context>
+<context>
+ <name>SaveItemsDialog</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/dialogs/saveitemsdialog.ui"/>
+ <source>Save Changes</source>
+ <translation>Salva le Modifiche</translation>
+ </message>
+ <message>
+ <location/>
+ <source>The following files have unsaved changes:</source>
+ <translation>Questi file hanno delle modifiche non salvate:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Automatically save all Files before building</source>
+ <translation>Salva i file automaticamente prima di compilare</translation>
+ </message>
+</context>
+<context>
+ <name>SettingsDialog</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/dialogs/settingsdialog.ui"/>
+ <source>Options</source>
+ <translation>Opzioni</translation>
+ </message>
+ <message>
+ <location/>
+ <source>0</source>
+ <translation>0</translation>
+ </message>
+</context>
+<context>
+ <name>SharedTools::QrcEditor</name>
+ <message>
+ <location filename="../../../src/shared/qrceditor/qrceditor.cpp" line="+57"/>
+ <source>Add Files</source>
+ <translation>Aggiungi File</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Add Prefix</source>
+ <translation>Aggiungi Prefisso</translation>
+ </message>
+ <message>
+ <location line="+156"/>
+ <source>Invalid file</source>
+ <translation>File non valido</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy</source>
+ <translation>Copia</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Skip</source>
+ <translation>Salta</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Abort</source>
+ <translation>Interrompi</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The file %1 is not in a subdirectory of the resource file. Continuing will result in an invalid resource file.</source>
+ <translation>Il file %1 non è in una sottocartella del file di risorse. Procedere genererebbe un file delle risorse non valido.</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Choose copy location</source>
+ <translation>Scegli la posizione della copia</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Overwrite failed</source>
+ <translation>Sovrascrittura fallita</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Could not overwrite file %1.</source>
+ <translation>Impossibile sovrascrivere il file %1.</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Copying failed</source>
+ <translation>Copia fallita</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Could not copy the file to %1.</source>
+ <translation>Impossibile copiare il file su %1.</translation>
+ </message>
+</context>
+<context>
+ <name>SharedTools::ResourceView</name>
+ <message>
+ <location filename="../../../src/shared/qrceditor/resourceview.cpp" line="+362"/>
+ <source>Add Files...</source>
+ <translation>Aggiungi File...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change Alias...</source>
+ <translation>Cambia l'Alias...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Add Prefix...</source>
+ <translation>Aggiungi Prefisso...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change Prefix...</source>
+ <translation>Cambia Prefisso...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change Language...</source>
+ <translation>Cambia Lingua...</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Remove Item</source>
+ <translation>Rimuovi Elemento</translation>
+ </message>
+ <message>
+ <location line="+41"/>
+ <source>Open file</source>
+ <translation>Apri file</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>All files (*)</source>
+ <translation>Tutti i file (*)</translation>
+ </message>
+ <message>
+ <location line="+93"/>
+ <source>Change Prefix</source>
+ <translation>Cambia Prefisso</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Input Prefix:</source>
+ <translation>Inserisci il Prefisso:</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Change Language</source>
+ <translation>Cambia Lingua</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Language:</source>
+ <translation>Lingua:</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Change File Alias</source>
+ <translation>Cambia l'Alias del file</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Alias:</source>
+ <translation>Alias:</translation>
+ </message>
+</context>
+<context>
+ <name>ShortcutSettings</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/dialogs/shortcutsettings.ui"/>
+ <source>Keyboard Shortcuts</source>
+ <translation>Scorciatoie della Tastiera</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Filter:</source>
+ <translation>Filtro:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Command</source>
+ <translation>Comando</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Label</source>
+ <translation>Etichetta</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Shortcut</source>
+ <translation>Scorciatoia</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Defaults</source>
+ <translation>Predefiniti</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Import...</source>
+ <translation>Importa...</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Export...</source>
+ <translation>Esporta...</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Key Sequence</source>
+ <translation>Sequenza di Tasti</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Shortcut:</source>
+ <translation>Scorciatoia:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Reset</source>
+ <translation>Ripristina</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Remove</source>
+ <translation>Rimuovi</translation>
+ </message>
+</context>
+<context>
+ <name>ShowBuildLog</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/showbuildlog.ui"/>
+ <source>Debugging Helper Build Log</source>
+ <translation>Log di Compilazione dell'Helper del Debug</translation>
+ </message>
+</context>
+<context>
+ <name>SimpleProEditor</name>
+ <message>
+ <location filename="../../../src/plugins/qt4projectmanager/speinfo.cpp" line="+59"/>
+ <source>Debug and Release</source>
+ <translation>Debug e Release</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Debug specific</source>
+ <translation>Specifico del Debug</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Release specific</source>
+ <translation>Specifico del Release</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>All platforms</source>
+ <translation>Tutte le piattaforme</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>MS Windows specific</source>
+ <translation>Specifico di MS Windows</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Linux/Unix specific</source>
+ <translation>Specifico di Linux/Unix</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Mac OSX specific</source>
+ <translation>Specifico di Max OSX</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Target Options</source>
+ <translation>Opzioni Destinazione</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Type and name of the target.</source>
+ <translation>Tipo e nome della destinazione.</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Preprocessor Definitions</source>
+ <translation>Definizioni del Preprocessore</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Setting of the preprocessor definitions.</source>
+ <translation>Impostazione delle definizioni del preprocessore.</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Include path</source>
+ <translation>Percorso degli Include</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Setting of the pathes where the header files are located.</source>
+ <translation>Impostazione dei percorsi dove si trovano i file header.</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Libraries</source>
+ <translation>Librerie</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Defining the libraries to link the target against and the pathes where these are located.</source>
+ <translation>Definizione delle librerie con cui linkare la destinazione a dei percorsi che le contengono.</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Source Files</source>
+ <translation>File Sorgenti</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Header Files</source>
+ <translation>File Header</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Forms</source>
+ <translation>Form</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Qt Modules</source>
+ <translation>Moduli Qt</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Setting up which of the Qt modules will be used in the target application.</source>
+ <translation>Imposta quali moduli Qt saranno usati nell'applicazione di destinazione.</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Resource files</source>
+ <translation>File delle Risorse</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Target name</source>
+ <translation>Nome Destinazione</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>The name of the resulting target.</source>
+ <translation>Il nome della destinazione.</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Configuration</source>
+ <translation>Configurazione</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Configuration.</source>
+ <translation>Configurazione.</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Destination directory</source>
+ <translation>Cartella di Destinazione</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Where the resulting target will be created.</source>
+ <translation>La destinazione sarà creata qui dentro.</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>QtCore Module</source>
+ <translation>Modulo QtCore</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Core non-GUI classes used by other modules</source>
+ <translation>Classi di Core, non-GUI, usate dagli altri moduli</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>QtGui Module</source>
+ <translation>Modulo QtGui</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Graphical user interface components</source>
+ <translation>Componenti dell'interfaccia grafica</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>QtNetwork Module</source>
+ <translation>Modulo QtNetwork</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Classes for network programming</source>
+ <translation>Classi per la programmazione della rete</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>QtOpenGL Module</source>
+ <translation>Modulo QtOpenGL</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>OpenGL support classes</source>
+ <translation>Classi per il supporto OpenGL</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>QtSql Module</source>
+ <translation>Modulo QtSql</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Classes for database integration using SQL</source>
+ <translation>Classi per l'integrazione con database SQL</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>QtScript Module</source>
+ <translation>Modulo QtScript</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Classes for evaluating Qt Scripts</source>
+ <translation>Classi per l'esecuzione di Qt Script</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>QtSvg Module</source>
+ <translation>Modulo QtSvg</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Classes for displaying the contents of SVG files</source>
+ <translation>Classi per la visualizzazione del contenuto di file SVG</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>QtWebKit Module</source>
+ <translation>Modulo QtWebKit</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Classes for displaying and editing Web content</source>
+ <translation>Classi per la visualizzazione e modifica del contenuto Web</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>QtXml Module</source>
+ <translation>Modulo QtXml</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Classes for handling XML</source>
+ <translation>Classi per la gestione di XML</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>QtXmlPatterns Module</source>
+ <translation>Modulo QtXmlPatterns</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>An XQuery/XPath engine for XML and custom data models</source>
+ <translation>Un motore XQuery/XPath per XML e modelli di dati speciali</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Phonon Module</source>
+ <translation>Modulo Phonon</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Multimedia framework classes</source>
+ <translation>Classi del framework multimediale</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Qt3Support Module</source>
+ <translation>Modulo Qt3Support</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Classes that ease porting from Qt 3 to Qt 4</source>
+ <translation>Classi che facilitano il porting da Qt 3 a Qt 4</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>QtTest Module</source>
+ <translation>Modulo QtTest</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Tool classes for unit testing</source>
+ <translation>Classi di ausilio per lo unit testing</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>QtDBus module</source>
+ <translation>Modulo QtDBus</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Classes for Inter-Process Communication using the D-Bus</source>
+ <translation>Classi per la comunicazione-intra-processo usando il D-Bus</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Application</source>
+ <translation>Applicazione</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Create a standalone application</source>
+ <translation>Crea un'applicazione</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Dynamic Library</source>
+ <translation>Libreria Condivisa</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Create a dynamic library for usage in other applications</source>
+ <translation>Crea una libreria condivisa per l'uso in altre applicazioni</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Static Library</source>
+ <translation>Libreria Statica</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Create a static library for usage in other applications</source>
+ <translation>Crea una libreria statica per l'uso in altre applicazioni</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Add Operator</source>
+ <translation>Operatore di Aggiunta</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Remove Operator</source>
+ <translation>Operatore di Rimozione</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Replace Operator</source>
+ <translation>Operatore di Sostituzione</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Set Operator</source>
+ <translation>Operatore di Assegnazione</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Unique Add Operator</source>
+ <translation>Operatore di Aggiunta Unica</translation>
+ </message>
+</context>
+<context>
+ <name>Snippets::Internal::SnippetsPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/snippets/snippetsplugin.cpp" line="+94"/>
+ <source>Snippets</source>
+ <translation>Frammenti</translation>
+ </message>
+</context>
+<context>
+ <name>Snippets::Internal::SnippetsWindow</name>
+ <message>
+ <location filename="../../../src/plugins/snippets/snippetswindow.cpp" line="+58"/>
+ <source>Snippets</source>
+ <translation>Frammenti</translation>
+ </message>
+</context>
+<context>
+ <name>StartExternalDialog</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/startexternaldialog.ui"/>
+ <source>Start Debugger</source>
+ <translation>Avvia il Debug</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Executable:</source>
+ <translation>Eseguibile:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Arguments:</source>
+ <translation>Parametri:</translation>
+ </message>
+</context>
+<context>
+ <name>StartRemoteDialog</name>
+ <message>
+ <location filename="../../../src/plugins/debugger/startremotedialog.ui"/>
+ <source>Start Debugger</source>
+ <translation>Avvia il Debug</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Host and port:</source>
+ <translation>Host e porta:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>localhost:5115</source>
+ <translation>localhost:5115</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Architecture:</source>
+ <translation>Architettura:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Use server start script:</source>
+ <translation>Usa script di avvio del server:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Server start script:</source>
+ <translation>Script di avvio del server:</translation>
+ </message>
+</context>
+<context>
+ <name>Subversion::Internal::SettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/subversion/settingspage.ui"/>
+ <source>Subversion Command:</source>
+ <translation>Comando Subversion:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Authentication</source>
+ <translation>Autenticazione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>User name:</source>
+ <translation>Nome utente:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Password:</source>
+ <translation>Password:</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/subversion/settingspage.cpp" line="+84"/>
+ <source>Subversion</source>
+ <translation>Subversion</translation>
+ </message>
+</context>
+<context>
+ <name>Subversion::Internal::SettingsPageWidget</name>
+ <message>
+ <location line="-34"/>
+ <source>Subversion Command</source>
+ <translation>Comando Subversion</translation>
+ </message>
+</context>
+<context>
+ <name>Subversion::Internal::SubversionOutputWindow</name>
+ <message>
+ <location filename="../../../src/plugins/subversion/subversionoutputwindow.cpp" line="+43"/>
+ <source>Subversion Output</source>
+ <translation>Output di Subversion</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Subversion</source>
+ <translation>Subversion</translation>
+ </message>
+</context>
+<context>
+ <name>Subversion::Internal::SubversionPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/subversion/subversionplugin.cpp" line="+312"/>
+ <source>&Subversion</source>
+ <translation>&Subversion</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Add</source>
+ <translation>Aggiungi</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Alt+S,Alt+A</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Delete</source>
+ <translation>Elimina</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Revert</source>
+ <translation>Ripristina</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Diff Project</source>
+ <translation>Diff del progetto</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Diff Current File</source>
+ <translation>Diff del file corrente</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Alt+S,Alt+D</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Commit All Files</source>
+ <translation>Esegui il Commit di Tutti i File</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Commit Current File</source>
+ <translation>Esegui il Commit del File Corrente</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Alt+S,Alt+C</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Filelog Current File</source>
+ <translation>Filelog del File Corrente</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Annotate Current File</source>
+ <translation>Annota il File Corrente</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Describe...</source>
+ <translation>Descrivi...</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Project Status</source>
+ <translation>Stato del progetto</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Update Project</source>
+ <translation>Aggiorna il Progetto</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Commit</source>
+ <translation>Revisione</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Diff Selected Files</source>
+ <translation>Diff dei file selezionati</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&Undo</source>
+ <translation>&Annulla</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&Redo</source>
+ <translation>&Ripeti</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>Closing Subversion Editor</source>
+ <translation>Chiusura dell'editor subversion</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do you want to commit the change?</source>
+ <translation>Vuoi creare una revisione con la modifica?</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The commit message check failed. Do you want to commit the change?</source>
+ <translation>Il controllo sul messaggio della nuova revisione è fallito. Vuoi creare la revisione?</translation>
+ </message>
+ <message>
+ <location line="+97"/>
+ <source>Add %1</source>
+ <translation>Aggiungi %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Delete %1</source>
+ <translation>Cancella %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Revert %1</source>
+ <translation>Ripristina %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Diff %1</source>
+ <translation>Diff %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Commit %1</source>
+ <translation>Esegui il Commit di %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Filelog %1</source>
+ <translation>Filelog %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Annotate %1</source>
+ <translation>Annota %1</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>The file has been changed. Do you want to revert it?</source>
+ <translation>Il file è stato modificato. Vuoi ripristinarlo?</translation>
+ </message>
+ <message>
+ <location line="+90"/>
+ <source>The commit list spans several respositories (%1). Please commit them one by one.</source>
+ <translation>La lista dei commit include più depositi (%1). Esegui il commit su ciascuno separatamente.</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Another commit is currently being executed.</source>
+ <translation>Si sta già creando eseguendo un commit.</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>There are no modified files.</source>
+ <translation>Non ci sono file modificati.</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cannot create temporary file: %1</source>
+ <translation>Impossibile creare il file temporaneo: %1</translation>
+ </message>
+ <message>
+ <location line="+184"/>
+ <source>Describe</source>
+ <translation>Descrivi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Revision number:</source>
+ <translation>Numero della revisione:</translation>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>No subversion executable specified!</source>
+ <translation>Non è stato specificato l'eseguibile subversion!</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>%1 Executing: %2 %3
+</source>
+ <extracomment><timestamp> Executing: <executable> <arguments></extracomment>
+ <translation>%1 Eseguo: %2 %3
+</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>The process terminated with exit code %1.</source>
+ <translation>Il processo è terminato con il codice di uscita %1.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>The process terminated abnormally.</source>
+ <translation>Il processo è terminato in modo anomalo.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Could not start subversion '%1'. Please check your settings in the preferences.</source>
+ <translation>Impossibile avviare subversion '%1'. Controlla le tue impostazioni nelle preferenze.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Subversion did not respond within timeout limit (%1 ms).</source>
+ <translation>Subversion non ha risposto entro il limite di tempo (%1 ms).</translation>
+ </message>
+</context>
+<context>
+ <name>Subversion::Internal::SubversionSubmitEditor</name>
+ <message>
+ <location filename="../../../src/plugins/subversion/subversionsubmiteditor.cpp" line="+42"/>
+ <source>Subversion Submit</source>
+ <translation>Invio Subversion</translation>
+ </message>
+</context>
+<context>
+ <name>TextEditor::BaseFileFind</name>
+ <message>
+ <location filename="../../../src/plugins/texteditor/basefilefind.cpp" line="+113"/>
+ <location line="+19"/>
+ <source>%1 found</source>
+ <translation>%1 trovati</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>List of comma separated wildcard filters</source>
+ <translation>Lista di filtri con wildcard separati da una virgola</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Use Regular E&xpressions</source>
+ <translation>Usa &Espressioni Regolari</translation>
+ </message>
+</context>
+<context>
+ <name>TextEditor::BaseTextDocument</name>
+ <message>
+ <location filename="../../../src/plugins/texteditor/basetextdocument.cpp" line="+174"/>
+ <source>untitled</source>
+ <translation>senza titolo</translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source><em>Binary data</em></source>
+ <translation><em>Dati binari</em></translation>
+ </message>
+</context>
+<context>
+ <name>TextEditor::BaseTextEditor</name>
+ <message>
+ <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+227"/>
+ <source>Print Document</source>
+ <translation>Stampa il Documento</translation>
+ </message>
+ <message>
+ <location line="+284"/>
+ <source><b>Error:</b> Could not decode "%1" with "%2"-encoding. Editing not possible.</source>
+ <translation><b>Errore:</b> Impossibile decodificare "%1" con l'encoding "%2". Modifica non consentita.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Select Encoding</source>
+ <translation>Seleziona Codifica</translation>
+ </message>
+</context>
+<context>
+ <name>TextEditor::BaseTextEditorEditable</name>
+ <message>
+ <location line="+3561"/>
+ <source>Line: %1, Col: %2</source>
+ <translation>Riga: %1, Col: %2</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Line: %1, Col: 999</source>
+ <translation>Riga: %1, Col: 999</translation>
+ </message>
+</context>
+<context>
+ <name>TextEditor::BehaviorSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/texteditor/behaviorsettingspage.ui"/>
+ <source>Storage</source>
+ <translation>Salvataggio</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Removes trailing whitespace on saving.</source>
+ <translation>Rimuove gli spazi in coda al salvataggio.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Clean whitespace</source>
+ <translation>&Pulizia spaziature</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Clean whitespace in entire document instead of only for changed parts.</source>
+ <translation>Pulisce gli spazi in tutto il documento, non solo nelle parti modificate.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>In entire &document</source>
+ <translation>In tutto il &documento</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Correct leading whitespace according to tab settings.</source>
+ <translation>Correggi le tabulazioni del documento.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Clean indentation</source>
+ <translation>Pulizia indentazione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Ensure newline at end of file</source>
+ <translation>&Garantisci una riga vuota alla fine del file</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Tabs and Indentation</source>
+ <translation>Tab ed Indentazione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Ta&b size:</source>
+ <translation>Ta&b:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Indent size:</source>
+ <translation>&Indentazione:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Backspace will go back one indentation level instead of one space.</source>
+ <translation>Backspace cancellerà un livello di indentazione al posto di uno spazio.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Backspace follows indentation</source>
+ <translation>&Backspace segue l'indentazione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Insert &spaces instead of tabs</source>
+ <translation>Inserisci &spazi invece che tab</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Enable automatic &indentation</source>
+ <translation>Abilita l'&indentazione automatica</translation>
+ </message>
+</context>
+<context>
+ <name>TextEditor::DisplaySettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/texteditor/displaysettingspage.ui"/>
+ <source>Display</source>
+ <translation>Visualizzazione</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Display line &numbers</source>
+ <translation>Mostra il &numero della righe</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Display &folding markers</source>
+ <translation>Mostra i segni di &raggruppamento del codice</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Show tabs and spaces.</source>
+ <translation>Mostra i tab e gli spazi.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Visualize whitespace</source>
+ <translation>&Mostra spaziature</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Highlight current &line</source>
+ <translation>Evidenzia la r&iga corrente</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Highlight &blocks</source>
+ <translation>Evidenzia i &blocchi</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Text Wrapping</source>
+ <translation>Ritorno a capo</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Enable text &wrapping</source>
+ <translation>Abilita il ri&torno a capo</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Display right &margin at column:</source>
+ <translation>Mostra il &margine destro alla colonna:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Animate matching parentheses</source>
+ <translation>Mostra l'animazione sulle parentesi</translation>
+ </message>
+</context>
+<context>
+ <name>TextEditor::FontSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+198"/>
+ <source>Font & Colors</source>
+ <translation>Font & Colori</translation>
+ </message>
+ <message>
+ <location line="+203"/>
+ <source>
+ This is only an example.</source>
+ <translation>
+ Questo è solo un esempio.</translation>
+ </message>
+</context>
+<context>
+ <name>TextEditor::Internal::CodecSelector</name>
+ <message>
+ <location filename="../../../src/plugins/texteditor/codecselector.cpp" line="+72"/>
+ <source>Text Encoding</source>
+ <translation>Codifica del Testo</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>
+The following encodings are likely to fit:</source>
+ <translation>
+Queste codifiche dovrebbero andare bene:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Select encoding for "%1".%2</source>
+ <translation>Seleziona la codifica per "%1".%2</translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>Reload with Encoding</source>
+ <translation>Ricarica con Codifica</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Save with Encoding</source>
+ <translation>Salva con Codifica</translation>
+ </message>
+</context>
+<context>
+ <name>TextEditor::Internal::FindInFiles</name>
+ <message>
+ <location filename="../../../src/plugins/texteditor/findinfiles.cpp" line="+55"/>
+ <source>Files on Disk</source>
+ <translation>File sul Disco</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>&Directory:</source>
+ <translation>&Cartella:</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>&Browse</source>
+ <translation>&Sfoglia</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>File &pattern:</source>
+ <translation>&Schema file:</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Directory to search</source>
+ <translation>Cartella di ricerca</translation>
+ </message>
+</context>
+<context>
+ <name>TextEditor::Internal::FontSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/texteditor/fontsettingspage.ui"/>
+ <source>Font</source>
+ <translation>Tipo di carattere</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Family:</source>
+ <translation>Famiglia:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Size:</source>
+ <translation>Dimensione:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Color Scheme</source>
+ <translation>Schema dei Colori</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Bold</source>
+ <translation>Grassetto</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Italic</source>
+ <translation>Corsivo</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Background:</source>
+ <translation>Sfondo:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Foreground:</source>
+ <translation>Primo piano:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Erase background</source>
+ <translation>Cancella sfondo</translation>
+ </message>
+ <message>
+ <location/>
+ <source>x</source>
+ <translation>x</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Preview:</source>
+ <translation>Anteprima:</translation>
+ </message>
+</context>
+<context>
+ <name>TextEditor::Internal::LineNumberFilter</name>
+ <message>
+ <location filename="../../../src/plugins/texteditor/linenumberfilter.cpp" line="+55"/>
+ <source>Line %1</source>
+ <translation>Riga %1</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/texteditor/linenumberfilter.h" line="+52"/>
+ <source>Line in current document</source>
+ <translation>Riga nel documento corrente</translation>
+ </message>
+</context>
+<context>
+ <name>TextEditor::Internal::TextEditorPlugin</name>
+ <message>
+ <location filename="../../../src/plugins/texteditor/texteditorplugin.cpp" line="+93"/>
+ <source>This creates a new text file (.txt)</source>
+ <translation>Crea un nuovo file di testo (.txt)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Text File</source>
+ <translation>File di Testo</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>General</source>
+ <translation>Generale</translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>Triggers a completion in this scope</source>
+ <translation>Lancia il completamento in questo contesto</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Ctrl+Space</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Meta+Space</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>TextEditor::TextEditorActionHandler</name>
+ <message>
+ <location filename="../../../src/plugins/texteditor/texteditoractionhandler.cpp" line="+115"/>
+ <source>&Undo</source>
+ <translation>&Annulla</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&Redo</source>
+ <translation>&Ripeti</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Select Encoding...</source>
+ <translation>Seleziona Codifica...</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Auto-&indent Selection</source>
+ <translation>Auto-&indenta la Selezione</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+I</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>&Visualize Whitespace</source>
+ <translation>&Mostra Spaziature</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Ctrl+E, Ctrl+V</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Clean Whitespace</source>
+ <translation>Pulizia Spaziature</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Enable Text &Wrapping</source>
+ <translation>Abilita il Ri&torno a Capo</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Ctrl+E, Ctrl+W</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>(Un)Comment &Selection</source>
+ <translation>(De)Commenta la &Selezione</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+/</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Delete &Line</source>
+ <translation>Cancella &Riga</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Shift+Del</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Collapse</source>
+ <translation>Comprimi</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+<</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Expand</source>
+ <translation>Espandi</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>(Un)&Collapse All</source>
+ <translation>(De)&Comprimi Tutti</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Increase Font Size</source>
+ <translation>Aumenta la Dimensione dei Caratteri</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl++</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Decrease Font Size</source>
+ <translation>Diminuisci la Dimensione dei Caratteri</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+-</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Goto Block Start</source>
+ <translation>Vai all'Inizio del Blocco</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+[</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Block End</source>
+ <translation>Vai alla Fine del Blocco</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+]</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Block Start With Selection</source>
+ <translation>Vai all'Inizio del Blocco con la Selezione</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+{</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Block End With Selection</source>
+ <translation>Vai alla Fine del Blocco con la Selezione</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Select Block Up</source>
+ <translation>Sposta il Blocco in Su</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+U</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Select Block Down</source>
+ <translation>Sposta il Blocco in Giu</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+Shift+U</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Move Line Up</source>
+ <translation>Sposta la Riga in Su</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+Shift+Up</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Move Line Down</source>
+ <translation>Sposta la Riga in Giu</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Ctrl+Shift+Down</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+93"/>
+ <source> <line number></source>
+ <translation><numero di riga></translation>
+ </message>
+</context>
+<context>
+ <name>TextEditor::TextEditorSettings</name>
+ <message>
+ <location filename="../../../src/plugins/texteditor/texteditorsettings.cpp" line="+64"/>
+ <source>Text</source>
+ <translation>Testo</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Link</source>
+ <translation>Collegamento</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Selection</source>
+ <translation>Selezione</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Line Number</source>
+ <translation>Numero Riga</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Search Result</source>
+ <translation>Risultato della Ricerca</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Search Scope</source>
+ <translation>Ambito della Ricerca</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Parentheses</source>
+ <translation>Parentesi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Current Line</source>
+ <translation>Riga Corrente</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Current Line Number</source>
+ <translation>Numero della Riga Corrente</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Number</source>
+ <translation>Numero</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>String</source>
+ <translation>Stringa</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Type</source>
+ <translation>Tipo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Keyword</source>
+ <translation>Parola Chiave</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Operator</source>
+ <translation>Operatore</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Preprocessor</source>
+ <translation>Preprocessore</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Label</source>
+ <translation>Etichetta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Comment</source>
+ <translation>Commento</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Doxygen Comment</source>
+ <translation>Commento Doxygen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Doxygen Tag</source>
+ <translation>Tag Doxygen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Disabled Code</source>
+ <translation>Codice Disabilitato</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Added Line</source>
+ <translation>Riga Aggiunta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Removed Line</source>
+ <translation>Riga Rimossa</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Diff File</source>
+ <translation>File Diff</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Diff Location</source>
+ <translation>Posizione Diff</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <location line="+8"/>
+ <location line="+8"/>
+ <source>Text Editor</source>
+ <translation>Editor di Testo</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>Behavior</source>
+ <translation>Comportamento</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Display</source>
+ <translation>Visualizzazione</translation>
+ </message>
+</context>
+<context>
+ <name>TopicChooser</name>
+ <message>
+ <location filename="../../../src/shared/help/topicchooser.ui"/>
+ <source>Choose Topic</source>
+ <translation>Scelta Argomento</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Topics</source>
+ <translation>&Argomenti</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Display</source>
+ <translation>&Visualizza</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Close</source>
+ <translation>&Chiudi</translation>
+ </message>
+ <message>
+ <location filename="../../../src/shared/help/topicchooser.cpp" line="+42"/>
+ <source>Choose a topic for <b>%1</b>:</source>
+ <translation>Scegli un argomento per <b>%1</b>:</translation>
+ </message>
+</context>
+<context>
+ <name>VCSBase</name>
+ <message>
+ <location filename="../../../src/plugins/vcsbase/vcsbaseconstants.h" line="+38"/>
+ <source>Version Control</source>
+ <translation>Controllo di Revisione</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Common</source>
+ <translation>Comune</translation>
+ </message>
+</context>
+<context>
+ <name>VCSBase::Internal::NickNameDialog</name>
+ <message>
+ <location filename="../../../src/plugins/vcsbase/nicknamedialog.cpp" line="+217"/>
+ <source>Name</source>
+ <translation>Nome</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>E-mail</source>
+ <translation>E-mail</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Alias</source>
+ <translation>Alias</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Alias e-mail</source>
+ <translation>E-mail alias</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cannot open '%1': %2</source>
+ <translation>Impossibile aprire '%1': %2</translation>
+ </message>
+</context>
+<context>
+ <name>VCSBase::SubmitFileModel</name>
+ <message>
+ <location filename="../../../src/plugins/vcsbase/submitfilemodel.cpp" line="+43"/>
+ <source>State</source>
+ <translation>Stato</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>File</source>
+ <translation>File</translation>
+ </message>
+</context>
+<context>
+ <name>VCSBase::VCSBaseEditor</name>
+ <message>
+ <location filename="../../../src/plugins/vcsbase/vcsbaseeditor.cpp" line="+315"/>
+ <source>Describe change %1</source>
+ <translation>Descrivi la modifica %1</translation>
+ </message>
+</context>
+<context>
+ <name>VCSBase::VCSBaseSubmitEditor</name>
+ <message>
+ <location filename="../../../src/plugins/vcsbase/vcsbasesubmiteditor.cpp" line="+134"/>
+ <source>Check message</source>
+ <translation>Controlla il messaggio</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Insert name...</source>
+ <translation>Inserisci il nome...</translation>
+ </message>
+ <message>
+ <location line="+361"/>
+ <source>Submit Message Check failed</source>
+ <translation>Controllo del Messaggio di Submit fallito</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Unable to open '%1': %2</source>
+ <translation>Impossibile aprire '%1': %2</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The check script '%1' could not be started: %2</source>
+ <translation>Lo script di verifica '%1' non può essere lanciato: %2</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>The check script '%1' could not be run: %2</source>
+ <translation>Lo script di verifica '%1' non può essere eseguito: %2</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>The check script returned exit code %1.</source>
+ <translation>Lo script di verifica è uscito con il codice %1.</translation>
+ </message>
+</context>
+<context>
+ <name>VCSBaseSettingsPage</name>
+ <message>
+ <location filename="../../../src/plugins/vcsbase/vcsbasesettingspage.ui"/>
+ <source>Prompt to submit</source>
+ <translation>Prompt del submit</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Wrap submit message at:</source>
+ <translation>Ritorno a capo del messaggio alla colonna:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure.</source>
+ <translation>Un eseguibile che sia chiamato con il file temporaneo contenente il messaggio di submit come primo parametro. Deve uscire con un valore != 0 e scrivere un messaggio sullo standard error per indicare un problema.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Submit message check script:</source>
+ <translation>Script di controllo del messaggio:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>A file listing user names and email addresses in a 4-column mailmap format:
+name <email> alias <email></source>
+ <translation>Un file contenente nomi utenti e mail nel formato mailmap a 4 colonne:
+nome <email> alias <email></translation>
+ </message>
+ <message>
+ <location/>
+ <source>User/alias configuration file:</source>
+ <translation>File di configurazione utenti/alias:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor.</source>
+ <translation>Un file semplice che contiene righe con nomi dei campi tipo "Reviewed-By:" che saranno aggiunti sotto l'editor del submit.</translation>
+ </message>
+ <message>
+ <location/>
+ <source>User fields configuration file:</source>
+ <translation>File di configurazione dei campi utente:</translation>
+ </message>
+</context>
+<context>
+ <name>VCSManager</name>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/vcsmanager.cpp" line="+132"/>
+ <source>Version Control</source>
+ <translation>Controllo di Revisione</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Would you like to remove this file from the version control system (%1)?
+Note: This might remove the local file.</source>
+ <translation>Vuoi rimuovere questo file dal VCS (%1)?
+Nota: questa operazione potrebbe cancellare il file locale.</translation>
+ </message>
+</context>
+<context>
+ <name>View</name>
+ <message>
+ <location filename="../../../src/shared/cpaster/view.cpp" line="+89"/>
+ <source>Paste</source>
+ <translation>Incolla</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <location line="+41"/>
+ <source><Username></source>
+ <translation><Nome utente></translation>
+ </message>
+ <message>
+ <location line="-33"/>
+ <location line="+38"/>
+ <source><Description></source>
+ <translation><Descrizione></translation>
+ </message>
+ <message>
+ <location line="-30"/>
+ <location line="+35"/>
+ <source><Comment></source>
+ <translation><Commento></translation>
+ </message>
+</context>
+<context>
+ <name>ViewDialog</name>
+ <message>
+ <location filename="../../../src/shared/cpaster/view.ui"/>
+ <source>Send to Codepaster</source>
+ <translation>Invia a Codepaster</translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Username:</source>
+ <translation>Nome &utente:</translation>
+ </message>
+ <message>
+ <location/>
+ <source><Username></source>
+ <translation><Nome utente></translation>
+ </message>
+ <message>
+ <location/>
+ <source>&Description:</source>
+ <translation>&Descrizione:</translation>
+ </message>
+ <message>
+ <location/>
+ <source><Description></source>
+ <translation><Descrizione></translation>
+ </message>
+ <message>
+ <location/>
+ <source><html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;Comment&gt;</p></body></html></source>
+ <translation><html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;Commento&gt;</p></body></html></translation>
+ </message>
+ <message>
+ <location/>
+ <source>Parts to send to codepaster</source>
+ <translation>Parti da inviare a codepaster</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Patch 1</source>
+ <translation>Patch 1</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Patch 2</source>
+ <translation>Patch 2</translation>
+ </message>
+</context>
+<context>
+ <name>mainClass</name>
+ <message>
+ <location filename="../../../src/libs/aggregation/examples/text/main.ui"/>
+ <source>main</source>
+ <translation>main</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Text1:</source>
+ <translation>Testo1:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>N/A</source>
+ <translation>N/D</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Text2:</source>
+ <translation>Testo2:</translation>
+ </message>
+ <message>
+ <location/>
+ <source>Text3:</source>
+ <translation>Testo3:</translation>
+ </message>
+</context>
+</TS>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 76a490e231ea4830c394b86bf340802d6d457074..856539bf09faacf19383712df2fa6fff7b945e06 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -4080,9 +4080,9 @@ Using gdb 6.7 or later is strongly recommended.</source>
</message>
</context>
<context>
- <name>Designer::Internal::WorkbenchIntegration</name>
+ <name>Designer::Internal::QtCreatorIntegration</name>
<message>
- <location filename="../../../src/plugins/designer/workbenchintegration.cpp" line="+72"/>
+ <location filename="../../../src/plugins/designer/qtcreatorintegration.cpp" line="+72"/>
<source>The class definition of '%1' could not be found in %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -6847,25 +6847,6 @@ in your .pro file.</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>Perforce::Internal::WorkbenchClientUser</name>
- <message>
- <location filename="../../../src/plugins/perforce/workbenchclientuser.cpp" line="+143"/>
- <location line="+138"/>
- <source>Perforce Error</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-99"/>
- <source>Closing p4 Editor</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Do you want to submit this change list?</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>PluginDialog</name>
<message>
diff --git a/share/qtcreator/translations/translations.pro b/share/qtcreator/translations/translations.pro
index d404128cdf2c2942d5c2925f5f06fa2988f521a5..1910b3cfa4d00f3288ace4b0f4068bbd6f3e7a32 100644
--- a/share/qtcreator/translations/translations.pro
+++ b/share/qtcreator/translations/translations.pro
@@ -1,6 +1,6 @@
include(../../../qtcreator.pri)
-TRANSLATIONS = de ja
+TRANSLATIONS = de it ja
# var, prepend, append
defineReplace(prependAll) {
diff --git a/src/app/main.cpp b/src/app/main.cpp
index eb403eebdf27402db2e3a06e53a885654362e385..e1800de1f11d822f1a02ff392ea40e858d4573f7 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -182,11 +182,7 @@ static inline QStringList getPluginPaths()
// 1) "plugins" (Win/Linux)
QString pluginPath = rootDirPath;
pluginPath += QDir::separator();
-#if defined(QT_ARCH_X86_64) && defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
- pluginPath += QLatin1String("lib64");
-#else
- pluginPath += QLatin1String("lib");
-#endif
+ pluginPath += QLatin1String(IDE_LIBRARY_BASENAME);
pluginPath += QDir::separator();
pluginPath += QLatin1String("qtcreator");
pluginPath += QDir::separator();
diff --git a/src/libs/aggregation/aggregation.pro b/src/libs/aggregation/aggregation.pro
index c970be0ed157e36ee7aeb78a36718e5d0943b7b1..b601bbc0610d5ae5d608cc50f2e315ae4b142534 100644
--- a/src/libs/aggregation/aggregation.pro
+++ b/src/libs/aggregation/aggregation.pro
@@ -1,7 +1,7 @@
TEMPLATE = lib
TARGET = Aggregation
-include(../../qworkbenchlibrary.pri)
+include(../../qtcreatorlibrary.pri)
DEFINES += AGGREGATION_LIBRARY
diff --git a/src/libs/cplusplus/cplusplus.pro b/src/libs/cplusplus/cplusplus.pro
index f13ef15fa2a0082dc8be83bc0bc38253d99dcaab..a6e804439ba0a2a707a6c3e2454cd4d6bc32f430 100644
--- a/src/libs/cplusplus/cplusplus.pro
+++ b/src/libs/cplusplus/cplusplus.pro
@@ -5,5 +5,5 @@ TARGET = CPlusPlus
DEFINES += NDEBUG
unix:QMAKE_CXXFLAGS_DEBUG += -O3
-include(../../qworkbenchlibrary.pri)
+include(../../qtcreatorlibrary.pri)
include(cplusplus-lib.pri)
diff --git a/src/libs/extensionsystem/extensionsystem.pro b/src/libs/extensionsystem/extensionsystem.pro
index ee9a8b8ea0bcdb111eab00bcd114b300e8412fc8..ce05c408c468cff09dd988364c163ba8d06c79b8 100644
--- a/src/libs/extensionsystem/extensionsystem.pro
+++ b/src/libs/extensionsystem/extensionsystem.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
TARGET = ExtensionSystem
QT += xml
DEFINES += EXTENSIONSYSTEM_LIBRARY
-include(../../qworkbenchlibrary.pri)
+include(../../qtcreatorlibrary.pri)
include(extensionsystem_dependencies.pri)
unix:!macx {
diff --git a/src/libs/extensionsystem/plugindetailsview.ui b/src/libs/extensionsystem/plugindetailsview.ui
index e73c9de39b013fe8e7c309d305cacb24cb19d4de..e22d2617ac11f626a6d3b00f4978d711e94adc43 100644
--- a/src/libs/extensionsystem/plugindetailsview.ui
+++ b/src/libs/extensionsystem/plugindetailsview.ui
@@ -9,9 +9,6 @@
<height>505</height>
</rect>
</property>
- <property name="windowTitle" >
- <string>Form</string>
- </property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>2</number>
@@ -37,9 +34,6 @@
</item>
<item row="0" column="1" >
<widget class="QLabel" name="name" >
- <property name="text" >
- <string>TextLabel</string>
- </property>
</widget>
</item>
<item row="1" column="0" >
@@ -54,9 +48,6 @@
</item>
<item row="1" column="1" >
<widget class="QLabel" name="version" >
- <property name="text" >
- <string>TextLabel</string>
- </property>
</widget>
</item>
<item row="2" column="0" >
@@ -71,9 +62,6 @@
</item>
<item row="2" column="1" >
<widget class="QLabel" name="compatVersion" >
- <property name="text" >
- <string>TextLabel</string>
- </property>
</widget>
</item>
<item row="3" column="0" >
@@ -88,9 +76,6 @@
</item>
<item row="3" column="1" >
<widget class="QLabel" name="vendor" >
- <property name="text" >
- <string>TextLabel</string>
- </property>
</widget>
</item>
<item row="4" column="0" >
@@ -105,9 +90,6 @@
</item>
<item row="4" column="1" >
<widget class="QLabel" name="url" >
- <property name="text" >
- <string>TextLabel</string>
- </property>
</widget>
</item>
<item row="5" column="0" >
@@ -122,9 +104,6 @@
</item>
<item row="5" column="1" >
<widget class="QLabel" name="location" >
- <property name="text" >
- <string>TextLabel</string>
- </property>
<property name="wordWrap" >
<bool>false</bool>
</property>
@@ -179,9 +158,6 @@
</item>
<item row="7" column="1" >
<widget class="QLabel" name="copyright" >
- <property name="text" >
- <string>TextLabel</string>
- </property>
</widget>
</item>
<item row="8" column="0" >
diff --git a/src/libs/extensionsystem/pluginerrorview.ui b/src/libs/extensionsystem/pluginerrorview.ui
index 69f49e53c66209de5a4786a5770d49caa8e2c4e1..1120263eb30b66e26173f9183388aed3a393f2cf 100644
--- a/src/libs/extensionsystem/pluginerrorview.ui
+++ b/src/libs/extensionsystem/pluginerrorview.ui
@@ -9,9 +9,6 @@
<height>342</height>
</rect>
</property>
- <property name="windowTitle" >
- <string>Form</string>
- </property>
<layout class="QGridLayout" name="gridLayout" >
<property name="margin" >
<number>2</number>
@@ -28,9 +25,6 @@
</item>
<item row="0" column="1" >
<widget class="QLabel" name="state" >
- <property name="text" >
- <string>TextLabel</string>
- </property>
</widget>
</item>
<item row="1" column="0" >
diff --git a/src/libs/extensionsystem/pluginview.ui b/src/libs/extensionsystem/pluginview.ui
index 8d9123dfbf43cc2ac856ef23edbaaec5b5e406bc..a995bbe8ed74f568e3d01205567062ea24259649 100644
--- a/src/libs/extensionsystem/pluginview.ui
+++ b/src/libs/extensionsystem/pluginview.ui
@@ -10,9 +10,6 @@
<height>304</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>2</number>
diff --git a/src/libs/qtconcurrent/qtconcurrent.pro b/src/libs/qtconcurrent/qtconcurrent.pro
index 46302f11cdecf86107c07fa28ad2570421d3f22f..b80e4ffd92faa0e987db1556af4110beab84399e 100644
--- a/src/libs/qtconcurrent/qtconcurrent.pro
+++ b/src/libs/qtconcurrent/qtconcurrent.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
TARGET = QtConcurrent
DEFINES += BUILD_QTCONCURRENT
-include(../../qworkbenchlibrary.pri)
+include(../../qtcreatorlibrary.pri)
HEADERS += \
qtconcurrent_global.h \
diff --git a/src/libs/utils/abstractprocess.h b/src/libs/utils/abstractprocess.h
index d3671f55a4085e50ec2f83ab33bf7767748b1365..b7edcd889ec9cfe20a0184e776306c02b8994928 100644
--- a/src/libs/utils/abstractprocess.h
+++ b/src/libs/utils/abstractprocess.h
@@ -37,7 +37,7 @@
namespace Core {
namespace Utils {
-class QWORKBENCH_UTILS_EXPORT AbstractProcess
+class QTCREATOR_UTILS_EXPORT AbstractProcess
{
public:
AbstractProcess() {}
diff --git a/src/libs/utils/basevalidatinglineedit.h b/src/libs/utils/basevalidatinglineedit.h
index a57d04b49a33d362cf36ed61cdef8f0da85c6b63..fc619047d9a43bd6b9f88b07ef2f0d9002b307fb 100644
--- a/src/libs/utils/basevalidatinglineedit.h
+++ b/src/libs/utils/basevalidatinglineedit.h
@@ -50,7 +50,7 @@ struct BaseValidatingLineEditPrivate;
* "<Enter name here>". This results in state 'DisplayingInitialText', which
* is not valid, but is not marked red.
*/
-class QWORKBENCH_UTILS_EXPORT BaseValidatingLineEdit : public QLineEdit
+class QTCREATOR_UTILS_EXPORT BaseValidatingLineEdit : public QLineEdit
{
Q_OBJECT
Q_DISABLE_COPY(BaseValidatingLineEdit)
diff --git a/src/libs/utils/classnamevalidatinglineedit.h b/src/libs/utils/classnamevalidatinglineedit.h
index 69fb4f749893ab9161a495e1bcf7748b483ad5f0..e5a980e018b30fcee1842c0e2f2854493cbf3115 100644
--- a/src/libs/utils/classnamevalidatinglineedit.h
+++ b/src/libs/utils/classnamevalidatinglineedit.h
@@ -41,7 +41,7 @@ struct ClassNameValidatingLineEditPrivate;
/* A Line edit that validates a C++ class name and emits a signal
* to derive suggested file names from it. */
-class QWORKBENCH_UTILS_EXPORT ClassNameValidatingLineEdit
+class QTCREATOR_UTILS_EXPORT ClassNameValidatingLineEdit
: public Core::Utils::BaseValidatingLineEdit
{
Q_DISABLE_COPY(ClassNameValidatingLineEdit)
diff --git a/src/libs/utils/codegeneration.cpp b/src/libs/utils/codegeneration.cpp
index 7e019b67c2200af39b5170f2491010cb6c367ecd..b20e5598c80cac8f1ebf922b5c47a4f437e6c6d8 100644
--- a/src/libs/utils/codegeneration.cpp
+++ b/src/libs/utils/codegeneration.cpp
@@ -53,7 +53,7 @@ static QString toAlphaNum(const QString &s)
return rc;
}
-QWORKBENCH_UTILS_EXPORT QString headerGuard(const QString &file)
+QTCREATOR_UTILS_EXPORT QString headerGuard(const QString &file)
{
const QFileInfo fi(file);
QString rc = toAlphaNum(fi.completeBaseName()).toUpper();
@@ -62,7 +62,7 @@ QWORKBENCH_UTILS_EXPORT QString headerGuard(const QString &file)
return rc;
}
-QWORKBENCH_UTILS_EXPORT
+QTCREATOR_UTILS_EXPORT
void writeIncludeFileDirective(const QString &file, bool globalInclude,
QTextStream &str)
{
@@ -71,7 +71,7 @@ void writeIncludeFileDirective(const QString &file, bool globalInclude,
str << QLatin1String("#include ") << opening << file << closing << QLatin1Char('\n');
}
-QWORKBENCH_UTILS_EXPORT
+QTCREATOR_UTILS_EXPORT
QString writeOpeningNameSpaces(const QStringList &l, const QString &indent,
QTextStream &str)
{
@@ -87,7 +87,7 @@ QString writeOpeningNameSpaces(const QStringList &l, const QString &indent,
return rc;
}
-QWORKBENCH_UTILS_EXPORT
+QTCREATOR_UTILS_EXPORT
void writeClosingNameSpaces(const QStringList &l, const QString &indent,
QTextStream &str)
{
diff --git a/src/libs/utils/codegeneration.h b/src/libs/utils/codegeneration.h
index 874bb12dcf4fd8e48dec078ae489d6b9da6cfdcf..03b2a578328174fa1fcf7250b0342dc0207b65eb 100644
--- a/src/libs/utils/codegeneration.h
+++ b/src/libs/utils/codegeneration.h
@@ -41,22 +41,22 @@ QT_END_NAMESPACE
namespace Core {
namespace Utils {
-QWORKBENCH_UTILS_EXPORT QString headerGuard(const QString &file);
+QTCREATOR_UTILS_EXPORT QString headerGuard(const QString &file);
-QWORKBENCH_UTILS_EXPORT
+QTCREATOR_UTILS_EXPORT
void writeIncludeFileDirective(const QString &file,
bool globalInclude,
QTextStream &str);
// Write opening namespaces and return an indentation string to be used
// in the following code if there are any.
-QWORKBENCH_UTILS_EXPORT
+QTCREATOR_UTILS_EXPORT
QString writeOpeningNameSpaces(const QStringList &namespaces,
const QString &indent,
QTextStream &str);
// Close namespacesnamespaces
-QWORKBENCH_UTILS_EXPORT
+QTCREATOR_UTILS_EXPORT
void writeClosingNameSpaces(const QStringList &namespaces,
const QString &indent,
QTextStream &str);
diff --git a/src/libs/utils/consoleprocess.h b/src/libs/utils/consoleprocess.h
index 4604a1f6752611f06d64c8677f03713d5913252b..f753bc9cae21ca3b360a33bee4e6d513f4531ccb 100644
--- a/src/libs/utils/consoleprocess.h
+++ b/src/libs/utils/consoleprocess.h
@@ -54,7 +54,7 @@ QT_END_NAMESPACE
namespace Core {
namespace Utils {
-class QWORKBENCH_UTILS_EXPORT ConsoleProcess : public QObject, public AbstractProcess
+class QTCREATOR_UTILS_EXPORT ConsoleProcess : public QObject, public AbstractProcess
{
Q_OBJECT
diff --git a/src/libs/utils/fancylineedit.h b/src/libs/utils/fancylineedit.h
index c06e39d7b17cf9cfa5db83707487fe60bd0a9475..0c1447eb188a8a63657d20bbd7eaf2567342fe6c 100644
--- a/src/libs/utils/fancylineedit.h
+++ b/src/libs/utils/fancylineedit.h
@@ -46,7 +46,7 @@ class FancyLineEditPrivate;
* text if isShowingHintText() returns true (that is, does not contain
* valid user input).
*/
-class QWORKBENCH_UTILS_EXPORT FancyLineEdit : public QLineEdit
+class QTCREATOR_UTILS_EXPORT FancyLineEdit : public QLineEdit
{
Q_DISABLE_COPY(FancyLineEdit)
Q_OBJECT
diff --git a/src/libs/utils/filenamevalidatinglineedit.h b/src/libs/utils/filenamevalidatinglineedit.h
index 60145bdf4ca12400a6377cea17304e40704ef2a7..36491be1b853a05404085e8ae34ea95cf2bbee68 100644
--- a/src/libs/utils/filenamevalidatinglineedit.h
+++ b/src/libs/utils/filenamevalidatinglineedit.h
@@ -39,7 +39,7 @@ namespace Utils {
* A control that let's the user choose a file name, based on a QLineEdit. Has
* some validation logic for embedding into QWizardPage.
*/
-class QWORKBENCH_UTILS_EXPORT FileNameValidatingLineEdit : public BaseValidatingLineEdit
+class QTCREATOR_UTILS_EXPORT FileNameValidatingLineEdit : public BaseValidatingLineEdit
{
Q_OBJECT
Q_DISABLE_COPY(FileNameValidatingLineEdit)
diff --git a/src/libs/utils/filesearch.h b/src/libs/utils/filesearch.h
index 1fbc4d1104852de5afbce88dd3ae42216a567c54..b5d24c7c7eb894144e594fd5a0a1217e846d389c 100644
--- a/src/libs/utils/filesearch.h
+++ b/src/libs/utils/filesearch.h
@@ -39,7 +39,7 @@
namespace Core {
namespace Utils {
-class QWORKBENCH_UTILS_EXPORT FileSearchResult
+class QTCREATOR_UTILS_EXPORT FileSearchResult
{
public:
FileSearchResult() {}
@@ -54,10 +54,10 @@ public:
int matchLength;
};
-QWORKBENCH_UTILS_EXPORT QFuture<FileSearchResult> findInFiles(const QString &searchTerm, const QStringList &files,
+QTCREATOR_UTILS_EXPORT QFuture<FileSearchResult> findInFiles(const QString &searchTerm, const QStringList &files,
QTextDocument::FindFlags flags);
-QWORKBENCH_UTILS_EXPORT QFuture<FileSearchResult> findInFilesRegExp(const QString &searchTerm, const QStringList &files,
+QTCREATOR_UTILS_EXPORT QFuture<FileSearchResult> findInFilesRegExp(const QString &searchTerm, const QStringList &files,
QTextDocument::FindFlags flags);
} // namespace Utils
diff --git a/src/libs/utils/filewizarddialog.h b/src/libs/utils/filewizarddialog.h
index b27e12d587ea2952727a4752e325134acfdec6c1..879c7d9fe3d20d139b33e466e4e803842c88e1ad 100644
--- a/src/libs/utils/filewizarddialog.h
+++ b/src/libs/utils/filewizarddialog.h
@@ -44,7 +44,7 @@ class FileWizardPage;
and path. Custom pages can be added via Core::IWizardExtension.
*/
-class QWORKBENCH_UTILS_EXPORT FileWizardDialog : public QWizard {
+class QTCREATOR_UTILS_EXPORT FileWizardDialog : public QWizard {
Q_OBJECT
Q_DISABLE_COPY(FileWizardDialog)
public:
diff --git a/src/libs/utils/filewizardpage.h b/src/libs/utils/filewizardpage.h
index b41839e0bfc92aaaa5b8818ad91244fd24f9834b..1c5438f43d6ad7314e56acc80c8eb11efe2e2295 100644
--- a/src/libs/utils/filewizardpage.h
+++ b/src/libs/utils/filewizardpage.h
@@ -46,7 +46,7 @@ struct FileWizardPagePrivate;
* The name and path labels can be changed. By default they are simply "Name:"
* and "Path:".
*/
-class QWORKBENCH_UTILS_EXPORT FileWizardPage : public QWizardPage
+class QTCREATOR_UTILS_EXPORT FileWizardPage : public QWizardPage
{
Q_OBJECT
Q_DISABLE_COPY(FileWizardPage)
diff --git a/src/libs/utils/filewizardpage.ui b/src/libs/utils/filewizardpage.ui
index 98d0873128fcbebe53b9152d7edddd958686945d..fea35b9c5b80f7bdad5b5efd140da5e8d4594f40 100644
--- a/src/libs/utils/filewizardpage.ui
+++ b/src/libs/utils/filewizardpage.ui
@@ -10,9 +10,6 @@
<height>68</height>
</rect>
</property>
- <property name="windowTitle">
- <string>WizardPage</string>
- </property>
<property name="title">
<string>Choose the location</string>
</property>
diff --git a/src/libs/utils/linecolumnlabel.h b/src/libs/utils/linecolumnlabel.h
index 01a577a21e612d9cebecc8579d2cb8e9919f2ef9..b5c44d2ae665785972b36f9dafc78546a3c47d7d 100644
--- a/src/libs/utils/linecolumnlabel.h
+++ b/src/libs/utils/linecolumnlabel.h
@@ -39,7 +39,7 @@ namespace Utils {
/* A label suitable for displaying cursor positions, etc. with a fixed
* with derived from a sample text. */
-class QWORKBENCH_UTILS_EXPORT LineColumnLabel : public QLabel
+class QTCREATOR_UTILS_EXPORT LineColumnLabel : public QLabel
{
Q_DISABLE_COPY(LineColumnLabel)
Q_OBJECT
diff --git a/src/libs/utils/newclasswidget.h b/src/libs/utils/newclasswidget.h
index 674adf6c84bbab4a25386cbeb2898c642eb4bcf5..29a5faa166a5c2189b6ddf7757ca804fd9b19611 100644
--- a/src/libs/utils/newclasswidget.h
+++ b/src/libs/utils/newclasswidget.h
@@ -49,7 +49,7 @@ struct NewClassWidgetPrivate;
* names for header, source and form files. Has some smart logic to derive
* the file names from the class name.
*/
-class QWORKBENCH_UTILS_EXPORT NewClassWidget : public QWidget
+class QTCREATOR_UTILS_EXPORT NewClassWidget : public QWidget
{
Q_DISABLE_COPY(NewClassWidget)
Q_OBJECT
diff --git a/src/libs/utils/newclasswidget.ui b/src/libs/utils/newclasswidget.ui
index 14e0a6574b82bd40401558452369fcea11a627e2..4399a850a18e6e3b5ae3d9092b15c8c84d0ab9cc 100644
--- a/src/libs/utils/newclasswidget.ui
+++ b/src/libs/utils/newclasswidget.ui
@@ -2,9 +2,6 @@
<ui version="4.0">
<class>Core::Utils::NewClassWidget</class>
<widget class="QWidget" name="Core::Utils::NewClassWidget">
- <property name="windowTitle">
- <string>Dialog</string>
- </property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h
index 24c33fe62158fefcdf7e62142faf00e62b9ab2af..f5e6b9ea1f767e4d08c0c087f8bad1e6c0c94c29 100644
--- a/src/libs/utils/pathchooser.h
+++ b/src/libs/utils/pathchooser.h
@@ -43,7 +43,7 @@ struct PathChooserPrivate;
* A control that let's the user choose a path, consisting of a QLineEdit and
* a "Browse" button. Has some validation logic for embedding into QWizardPage.
*/
-class QWORKBENCH_UTILS_EXPORT PathChooser : public QWidget
+class QTCREATOR_UTILS_EXPORT PathChooser : public QWidget
{
Q_DISABLE_COPY(PathChooser)
Q_OBJECT
diff --git a/src/libs/utils/pathlisteditor.cpp b/src/libs/utils/pathlisteditor.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..099c1f0597ad45bedd183eda4b11d4b4724dbab8
--- /dev/null
+++ b/src/libs/utils/pathlisteditor.cpp
@@ -0,0 +1,313 @@
+/**************************************************************************
+**
+** 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 "pathlisteditor.h"
+
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QPlainTextEdit>
+#include <QtGui/QToolButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QFileDialog>
+#include <QtGui/QTextCursor>
+#include <QtGui/QTextBlock>
+#include <QtGui/QMenu>
+#include <QtGui/QAction>
+
+#include <QtCore/QSignalMapper>
+#include <QtCore/QMimeData>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QDir>
+#include <QtCore/QDebug>
+
+namespace Core {
+namespace Utils {
+
+// ------------ PathListPlainTextEdit:
+// Replaces the platform separator ';',':' by '\n'
+// when inserting, allowing for pasting in paths
+// from the terminal or such.
+
+class PathListPlainTextEdit : public QPlainTextEdit {
+public:
+ explicit PathListPlainTextEdit(QWidget *parent = 0);
+protected:
+ virtual void insertFromMimeData (const QMimeData *source);
+};
+
+PathListPlainTextEdit::PathListPlainTextEdit(QWidget *parent) :
+ QPlainTextEdit(parent)
+{
+ // No wrapping, scroll at all events
+ setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+ setLineWrapMode(QPlainTextEdit::NoWrap);
+}
+
+void PathListPlainTextEdit::insertFromMimeData(const QMimeData *source)
+{
+ if (source->hasText()) {
+ // replace separator
+ QString text = source->text().trimmed();
+ text.replace(PathListEditor::separator(), QLatin1Char('\n'));
+ QSharedPointer<QMimeData> fixed(new QMimeData);
+ fixed->setText(text);
+ QPlainTextEdit::insertFromMimeData(fixed.data());
+ } else {
+ QPlainTextEdit::insertFromMimeData(source);
+ }
+}
+
+// ------------ PathListEditorPrivate
+struct PathListEditorPrivate {
+ PathListEditorPrivate();
+
+ QHBoxLayout *layout;
+ QVBoxLayout *buttonLayout;
+ QToolButton *toolButton;
+ QMenu *buttonMenu;
+ QPlainTextEdit *edit;
+ QSignalMapper *envVarMapper;
+ QString fileDialogTitle;
+};
+
+PathListEditorPrivate::PathListEditorPrivate() :
+ layout(new QHBoxLayout),
+ buttonLayout(new QVBoxLayout),
+ toolButton(new QToolButton),
+ buttonMenu(new QMenu),
+ edit(new PathListPlainTextEdit),
+ envVarMapper(0)
+{
+ layout->setMargin(0);
+ layout->addWidget(edit);
+ buttonLayout->addWidget(toolButton);
+ buttonLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding));
+ layout->addLayout(buttonLayout);
+}
+
+PathListEditor::PathListEditor(QWidget *parent) :
+ QWidget(parent),
+ m_d(new PathListEditorPrivate)
+{
+ setLayout(m_d->layout);
+ m_d->toolButton->setPopupMode(QToolButton::MenuButtonPopup);
+ m_d->toolButton->setText(tr("Insert..."));
+ m_d->toolButton->setMenu(m_d->buttonMenu);
+ connect(m_d->toolButton, SIGNAL(clicked()), this, SLOT(slotInsert()));
+
+ addAction(tr("Add..."), this, SLOT(slotAdd()));
+ addAction(tr("Delete line"), this, SLOT(deletePathAtCursor()));
+ addAction(tr("Clear"), this, SLOT(clear()));
+}
+
+PathListEditor::~PathListEditor()
+{
+ delete m_d;
+}
+
+static inline QAction *createAction(QObject *parent, const QString &text, QObject * receiver, const char *slotFunc)
+{
+ QAction *rc = new QAction(text, parent);
+ QObject::connect(rc, SIGNAL(triggered()), receiver, slotFunc);
+ return rc;
+}
+
+QAction *PathListEditor::addAction(const QString &text, QObject * receiver, const char *slotFunc)
+{
+ QAction *rc = createAction(this, text, receiver, slotFunc);
+ m_d->buttonMenu->addAction(rc);
+ return rc;
+}
+
+QAction *PathListEditor::insertAction(int index /* -1 */, const QString &text, QObject * receiver, const char *slotFunc)
+{
+ // Find the 'before' action
+ QAction *beforeAction = 0;
+ if (index >= 0) {
+ const QList<QAction*> actions = m_d->buttonMenu->actions();
+ if (index < actions.size())
+ beforeAction = actions.at(index);
+ }
+ QAction *rc = createAction(this, text, receiver, slotFunc);
+ if (beforeAction) {
+ m_d->buttonMenu->insertAction(beforeAction, rc);
+ } else {
+ m_d->buttonMenu->addAction(rc);
+ }
+ return rc;
+}
+
+int PathListEditor::lastAddActionIndex()
+{
+ return 0; // Insert/Add
+}
+
+QString PathListEditor::pathListString() const
+{
+ return pathList().join(separator());
+}
+
+QStringList PathListEditor::pathList() const
+{
+ const QString text = m_d->edit->toPlainText().trimmed();
+ if (text.isEmpty())
+ return QStringList();
+ // trim each line
+ QStringList rc = text.split(QLatin1Char('\n'), QString::SkipEmptyParts);
+ const QStringList::iterator end = rc.end();
+ for (QStringList::iterator it = rc.begin(); it != end; ++it)
+ *it = it->trimmed();
+ return rc;
+}
+
+void PathListEditor::setPathList(const QStringList &l)
+{
+ m_d->edit->setPlainText(l.join(QString(QLatin1Char('\n'))));
+}
+
+void PathListEditor::setPathList(const QString &pathString)
+{
+ if (pathString.isEmpty()) {
+ clear();
+ } else {
+ setPathList(pathString.split(separator(), QString::SkipEmptyParts));
+ }
+}
+
+void PathListEditor::setPathListFromEnvVariable(const QString &var)
+{
+ setPathList(qgetenv(var.toLocal8Bit()));
+}
+
+QString PathListEditor::fileDialogTitle() const
+{
+ return m_d->fileDialogTitle;
+}
+
+void PathListEditor::setFileDialogTitle(const QString &l)
+{
+ m_d->fileDialogTitle = l;
+}
+
+void PathListEditor::clear()
+{
+ m_d->edit->clear();
+}
+
+void PathListEditor::slotAdd()
+{
+ const QString dir = QFileDialog::getExistingDirectory(this, m_d->fileDialogTitle);
+ if (!dir.isEmpty())
+ appendPath(QDir::toNativeSeparators(dir));
+}
+
+void PathListEditor::slotInsert()
+{
+ const QString dir = QFileDialog::getExistingDirectory(this, m_d->fileDialogTitle);
+ if (!dir.isEmpty())
+ insertPathAtCursor(QDir::toNativeSeparators(dir));
+}
+
+QChar PathListEditor::separator()
+{
+#ifdef Q_OS_WIN
+ static const QChar rc(QLatin1Char(';'));
+#else
+ static const QChar rc(QLatin1Char(':'));
+#endif
+ return rc;
+}
+
+// Add a button "Import from 'Path'"
+void PathListEditor::addEnvVariableImportAction(const QString &var)
+{
+ if (!m_d->envVarMapper) {
+ m_d->envVarMapper = new QSignalMapper(this);
+ connect(m_d->envVarMapper, SIGNAL(mapped(QString)), this, SLOT(setPathListFromEnvVariable(QString)));
+ }
+
+ QAction *a = insertAction(lastAddActionIndex() + 1,
+ tr("From \"%1\"").arg(var), m_d->envVarMapper, SLOT(map()));
+ m_d->envVarMapper->setMapping(a, var);
+}
+
+QString PathListEditor::text() const
+{
+ return m_d->edit->toPlainText();
+}
+
+void PathListEditor::setText(const QString &t)
+{
+ m_d->edit->setPlainText(t);
+}
+
+void PathListEditor::insertPathAtCursor(const QString &path)
+{
+ // If the cursor is at an empty line or at end(),
+ // just insert. Else insert line before
+ QTextCursor cursor = m_d->edit->textCursor();
+ QTextBlock block = cursor.block();
+ const bool needNewLine = !block.text().isEmpty();
+ if (needNewLine) {
+ cursor.movePosition(QTextCursor::StartOfLine, QTextCursor::MoveAnchor);
+ cursor.insertBlock();
+ cursor.movePosition(QTextCursor::PreviousBlock, QTextCursor::MoveAnchor);
+ }
+ cursor.insertText(path);
+ if (needNewLine) {
+ cursor.movePosition(QTextCursor::StartOfLine, QTextCursor::MoveAnchor);
+ m_d->edit->setTextCursor(cursor);
+ }
+}
+
+void PathListEditor::appendPath(const QString &path)
+{
+ QString paths = text().trimmed();
+ if (!paths.isEmpty())
+ paths += QLatin1Char('\n');
+ paths += path;
+ setText(paths);
+}
+
+void PathListEditor::deletePathAtCursor()
+{
+ // Delete current line
+ QTextCursor cursor = m_d->edit->textCursor();
+ if (cursor.block().isValid()) {
+ cursor.movePosition(QTextCursor::StartOfLine, QTextCursor::MoveAnchor);
+ // Select down or until end of [last] line
+ if (!cursor.movePosition(QTextCursor::Down, QTextCursor::KeepAnchor))
+ cursor.movePosition(QTextCursor::EndOfLine, QTextCursor::KeepAnchor);
+ cursor.removeSelectedText();
+ m_d->edit->setTextCursor(cursor);
+ }
+}
+
+} // namespace Utils
+} // namespace Core
diff --git a/src/libs/utils/pathlisteditor.h b/src/libs/utils/pathlisteditor.h
new file mode 100644
index 0000000000000000000000000000000000000000..47cb059a70a8f4d2ccbc70e80b4c258643e79d15
--- /dev/null
+++ b/src/libs/utils/pathlisteditor.h
@@ -0,0 +1,110 @@
+/**************************************************************************
+**
+** 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.
+**
+**************************************************************************/
+
+#ifndef PATHLISTEDITOR_H
+#define PATHLISTEDITOR_H
+
+#include "utils_global.h"
+
+#include <QtGui/QWidget>
+#include <QtCore/QStringList>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+QT_END_NAMESPACE
+
+namespace Core {
+namespace Utils {
+
+struct PathListEditorPrivate;
+
+/**
+ * A control that let's the user edit a list of (directory) paths
+ * using the platform separator (';',':'). Typically used for
+ * path lists controlled by environment variables, such as
+ * PATH. It is based on a QPlainTextEdit as it should
+ * allow for convenient editing and non-directory type elements like
+ * "etc/mydir1:$SPECIAL_SYNTAX:/etc/mydir2".
+ * When pasting text into it, the platform separator will be replaced
+ * by new line characters for convenience.
+ */
+
+class QTCREATOR_UTILS_EXPORT PathListEditor : public QWidget
+{
+ Q_DISABLE_COPY(PathListEditor)
+ Q_OBJECT
+ Q_PROPERTY(QStringList pathList READ pathList WRITE setPathList DESIGNABLE true)
+ Q_PROPERTY(QString fileDialogTitle READ fileDialogTitle WRITE setFileDialogTitle DESIGNABLE true)
+
+public:
+ explicit PathListEditor(QWidget *parent = 0);
+ virtual ~PathListEditor();
+
+ QString pathListString() const;
+ QStringList pathList() const;
+ QString fileDialogTitle() const;
+
+ static QChar separator();
+
+ // Add a convenience action "Import from 'Path'" (environment variable)
+ void addEnvVariableImportAction(const QString &var);
+
+public slots:
+ void clear();
+ void setPathList(const QStringList &l);
+ void setPathList(const QString &pathString);
+ void setPathListFromEnvVariable(const QString &var);
+ void setFileDialogTitle(const QString &l);
+
+protected:
+ // Index after which to insert further "Add" actions
+ static int lastAddActionIndex();
+ QAction *insertAction(int index /* -1 */, const QString &text, QObject * receiver, const char *slotFunc);
+ QAction *addAction(const QString &text, QObject * receiver, const char *slotFunc);
+
+ QString text() const;
+ void setText(const QString &);
+
+protected slots:
+ void insertPathAtCursor(const QString &);
+ void deletePathAtCursor();
+ void appendPath(const QString &);
+
+private slots:
+ void slotAdd();
+ void slotInsert();
+
+private:
+ PathListEditorPrivate *m_d;
+};
+
+} // namespace Utils
+} // namespace Core
+
+#endif // PATHLISTEDITOR_H
diff --git a/src/libs/utils/projectintropage.h b/src/libs/utils/projectintropage.h
index e6bc7ebd70ce57763a5d8311bd2327064fea41cf..d0d2ae0ecdb7042ee341aa835dbd8ff69575f9ca 100644
--- a/src/libs/utils/projectintropage.h
+++ b/src/libs/utils/projectintropage.h
@@ -52,7 +52,7 @@ struct ProjectIntroPagePrivate;
* layout, otherwise, QWizard will squeeze it due to its strange expanding
* hacks. */
-class QWORKBENCH_UTILS_EXPORT ProjectIntroPage : public QWizardPage
+class QTCREATOR_UTILS_EXPORT ProjectIntroPage : public QWizardPage
{
Q_OBJECT
Q_DISABLE_COPY(ProjectIntroPage)
diff --git a/src/libs/utils/projectintropage.ui b/src/libs/utils/projectintropage.ui
index 05fe640306af13db8496097a6410da3ee708fa78..62efa2d9fecab62b3083c48aae9ed8570afe3e27 100644
--- a/src/libs/utils/projectintropage.ui
+++ b/src/libs/utils/projectintropage.ui
@@ -10,9 +10,6 @@
<height>143</height>
</rect>
</property>
- <property name="windowTitle">
- <string>WizardPage</string>
- </property>
<property name="title">
<string>Introduction and project location</string>
</property>
@@ -22,9 +19,6 @@
</property>
<item>
<widget class="QLabel" name="descriptionLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
<property name="wordWrap">
<bool>true</bool>
</property>
@@ -97,9 +91,6 @@
</item>
<item>
<widget class="QLabel" name="stateLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
</widget>
</item>
</layout>
diff --git a/src/libs/utils/projectnamevalidatinglineedit.h b/src/libs/utils/projectnamevalidatinglineedit.h
index 7d40a525074f4614283c6b627acd98ec298130cc..10659c865a5df38f6210a406155ad25eadea1131 100644
--- a/src/libs/utils/projectnamevalidatinglineedit.h
+++ b/src/libs/utils/projectnamevalidatinglineedit.h
@@ -35,7 +35,7 @@
namespace Core {
namespace Utils {
-class QWORKBENCH_UTILS_EXPORT ProjectNameValidatingLineEdit : public BaseValidatingLineEdit
+class QTCREATOR_UTILS_EXPORT ProjectNameValidatingLineEdit : public BaseValidatingLineEdit
{
Q_OBJECT
Q_DISABLE_COPY(ProjectNameValidatingLineEdit)
diff --git a/src/libs/utils/qtcassert.h b/src/libs/utils/qtcassert.h
index 3d9090be33eecdb275476311627c5249483989a5..de22d96d9f3f0ff730a40d51a7c32156209eeab5 100644
--- a/src/libs/utils/qtcassert.h
+++ b/src/libs/utils/qtcassert.h
@@ -32,11 +32,14 @@
#include <QtCore/QDebug>
+#define QTC_ASSERT_STRINGIFY_INTERNAL(x) #x
+#define QTC_ASSERT_STRINGIFY(x) QTC_ASSERT_STRINGIFY_INTERNAL(x)
+
// we do not use the 'do {...} while (0)' idiom here to be able to use
// 'break' and 'continue' as 'actions'.
#define QTC_ASSERT(cond, action) \
- if(cond){}else{qDebug()<<"ASSERTION"<<#cond<<"FAILED"<<__FILE__<<__LINE__;action;}
+ if(cond){}else{qDebug()<<"ASSERTION " #cond " FAILED AT " __FILE__ ":" QTC_ASSERT_STRINGIFY(__LINE__);action;}
#endif // QTC_ASSERT_H
diff --git a/src/libs/utils/qtcolorbutton.h b/src/libs/utils/qtcolorbutton.h
index 06c2cadc9ed3ac57cf37497ca9038c8f62ec0cce..22f7e945ef9352952cbacf8313b0abb7b8abb757 100644
--- a/src/libs/utils/qtcolorbutton.h
+++ b/src/libs/utils/qtcolorbutton.h
@@ -37,7 +37,7 @@
namespace Core {
namespace Utils {
-class QWORKBENCH_UTILS_EXPORT QtColorButton : public QToolButton
+class QTCREATOR_UTILS_EXPORT QtColorButton : public QToolButton
{
Q_OBJECT
Q_PROPERTY(bool backgroundCheckered READ isBackgroundCheckered WRITE setBackgroundCheckered)
diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp
index c25dda1bad1f4d7f986d201238ea6171346f2a52..befa54308d51824dab8484d32815a917d5e904c6 100644
--- a/src/libs/utils/reloadpromptutils.cpp
+++ b/src/libs/utils/reloadpromptutils.cpp
@@ -34,7 +34,7 @@
using namespace Core;
using namespace Core::Utils;
-QWORKBENCH_UTILS_EXPORT Core::Utils::ReloadPromptAnswer
+QTCREATOR_UTILS_EXPORT Core::Utils::ReloadPromptAnswer
Core::Utils::reloadPrompt(const QString &fileName, QWidget *parent)
{
return reloadPrompt(QObject::tr("File Changed"),
@@ -42,7 +42,7 @@ QWORKBENCH_UTILS_EXPORT Core::Utils::ReloadPromptAnswer
parent);
}
-QWORKBENCH_UTILS_EXPORT Core::Utils::ReloadPromptAnswer
+QTCREATOR_UTILS_EXPORT Core::Utils::ReloadPromptAnswer
Core::Utils::reloadPrompt(const QString &title, const QString &prompt, QWidget *parent)
{
switch (QMessageBox::question(parent, title, prompt,
diff --git a/src/libs/utils/reloadpromptutils.h b/src/libs/utils/reloadpromptutils.h
index 6741bd09fff5d409280eb0eeac2b89bac4df88de..2a79585c23a695679c80cdf7eeec25de2c317c17 100644
--- a/src/libs/utils/reloadpromptutils.h
+++ b/src/libs/utils/reloadpromptutils.h
@@ -42,8 +42,8 @@ namespace Utils {
enum ReloadPromptAnswer { ReloadCurrent, ReloadAll, ReloadSkipCurrent, ReloadNone };
-QWORKBENCH_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName, QWidget *parent);
-QWORKBENCH_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, const QString &prompt, QWidget *parent);
+QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName, QWidget *parent);
+QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, const QString &prompt, QWidget *parent);
} // namespace Utils
} // namespace Core
diff --git a/src/libs/utils/savedaction.h b/src/libs/utils/savedaction.h
index 53eaa047c811ad54a7a0627243ce5ea8dfd48dbf..b75c269b3e340abb06c26197d7ba744b4c9b3493 100644
--- a/src/libs/utils/savedaction.h
+++ b/src/libs/utils/savedaction.h
@@ -48,7 +48,7 @@ namespace Utils {
enum ApplyMode { ImmediateApply, DeferedApply };
-class QWORKBENCH_UTILS_EXPORT SavedAction : public QAction
+class QTCREATOR_UTILS_EXPORT SavedAction : public QAction
{
Q_OBJECT
@@ -106,7 +106,7 @@ private:
ApplyMode m_applyMode;
};
-class QWORKBENCH_UTILS_EXPORT SavedActionSet
+class QTCREATOR_UTILS_EXPORT SavedActionSet
{
public:
SavedActionSet() {}
diff --git a/src/libs/utils/settingsutils.cpp b/src/libs/utils/settingsutils.cpp
index 49c8c769b8109a6206598937ae9b5691a9a433e8..d753670840ed271492d0444ba1c0ddc392484943 100644
--- a/src/libs/utils/settingsutils.cpp
+++ b/src/libs/utils/settingsutils.cpp
@@ -34,7 +34,7 @@
namespace Core {
namespace Utils {
-QWORKBENCH_UTILS_EXPORT QString settingsKey(const QString &category)
+QTCREATOR_UTILS_EXPORT QString settingsKey(const QString &category)
{
QString rc(category);
const QChar underscore = QLatin1Char('_');
diff --git a/src/libs/utils/settingsutils.h b/src/libs/utils/settingsutils.h
index 728f2588c7c96fb3bd34671265ce70356e8b0768..4e8fd021ffac70c2340935c4505abe9c02f391e2 100644
--- a/src/libs/utils/settingsutils.h
+++ b/src/libs/utils/settingsutils.h
@@ -37,7 +37,7 @@ namespace Utils {
// Create a usable settings key from a category,
// for example Editor|C++ -> Editor_C__
-QWORKBENCH_UTILS_EXPORT QString settingsKey(const QString &category);
+QTCREATOR_UTILS_EXPORT QString settingsKey(const QString &category);
} // namespace Utils
} // namespace Core
diff --git a/src/libs/utils/submiteditorwidget.h b/src/libs/utils/submiteditorwidget.h
index 2cf9c096357861e1586862e7d71350ff701f13d7..a8be66fe1e181dbeed7aa789581280557665bb3d 100644
--- a/src/libs/utils/submiteditorwidget.h
+++ b/src/libs/utils/submiteditorwidget.h
@@ -68,7 +68,7 @@ struct SubmitEditorWidgetPrivate;
* Care should be taken to ensure the widget is deleted properly when the
* editor closes. */
-class QWORKBENCH_UTILS_EXPORT SubmitEditorWidget : public QWidget
+class QTCREATOR_UTILS_EXPORT SubmitEditorWidget : public QWidget
{
Q_OBJECT
Q_DISABLE_COPY(SubmitEditorWidget)
diff --git a/src/libs/utils/submitfieldwidget.h b/src/libs/utils/submitfieldwidget.h
index 34a959c5efa4e813846586208a3cce1dbb333c39..08e834bfb49feebd9de252f8f7f1b2b1177df0c1 100644
--- a/src/libs/utils/submitfieldwidget.h
+++ b/src/libs/utils/submitfieldwidget.h
@@ -20,7 +20,7 @@ struct SubmitFieldWidgetPrivate;
* When choosing a different field in the combo, a new row is opened if text
* has been entered for the current field. Optionally, a "Browse..." button and
* completer can be added. */
-class QWORKBENCH_UTILS_EXPORT SubmitFieldWidget : public QWidget
+class QTCREATOR_UTILS_EXPORT SubmitFieldWidget : public QWidget
{
Q_OBJECT
Q_PROPERTY(QStringList fields READ fields WRITE setFields DESIGNABLE true)
diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp
index 72c324a67fa1bbe4b0b622bdf746f3aeb6a67e28..81b02ca719250e36aa6ee4e201860849c4dd09cd 100644
--- a/src/libs/utils/synchronousprocess.cpp
+++ b/src/libs/utils/synchronousprocess.cpp
@@ -60,7 +60,7 @@ void SynchronousProcessResponse::clear()
stdErr.clear();
}
-QWORKBENCH_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessResponse& r)
+QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessResponse& r)
{
QDebug nsp = str.nospace();
nsp << "SynchronousProcessResponse: result=" << r.result << " ex=" << r.exitCode << '\n'
diff --git a/src/libs/utils/synchronousprocess.h b/src/libs/utils/synchronousprocess.h
index 5f1425befea6917d5db3984beabee360a172b06d..8f1b5e70248a880af9df533fb8a5a60ccb634f0d 100644
--- a/src/libs/utils/synchronousprocess.h
+++ b/src/libs/utils/synchronousprocess.h
@@ -48,7 +48,7 @@ namespace Utils {
struct SynchronousProcessPrivate;
/* Result of SynchronousProcess execution */
-struct QWORKBENCH_UTILS_EXPORT SynchronousProcessResponse
+struct QTCREATOR_UTILS_EXPORT SynchronousProcessResponse
{
enum Result {
// Finished with return code 0
@@ -71,7 +71,7 @@ struct QWORKBENCH_UTILS_EXPORT SynchronousProcessResponse
QString stdErr;
};
-QWORKBENCH_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessResponse &);
+QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessResponse &);
/* SynchronousProcess: Runs a synchronous process in its own event loop
* that blocks only user input events. Thus, it allows for the gui to
@@ -85,7 +85,7 @@ QWORKBENCH_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessRe
* stdOutBufferedSignalsEnabled()/setStdErrBufferedSignalsEnabled().
* They would typically be used for log windows. */
-class QWORKBENCH_UTILS_EXPORT SynchronousProcess : public QObject
+class QTCREATOR_UTILS_EXPORT SynchronousProcess : public QObject
{
Q_OBJECT
public:
diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro
index 6502e40d0354da3281dda1282bed1c21b59fc8dc..345ef4aab3e550269d5b05b953540a73b73aa818 100644
--- a/src/libs/utils/utils.pro
+++ b/src/libs/utils/utils.pro
@@ -2,15 +2,16 @@ TEMPLATE = lib
TARGET = Utils
QT += gui network
-DEFINES += QWORKBENCH_UTILS_LIBRARY
+DEFINES += QTCREATOR_UTILS_LIBRARY
-include(../../qworkbenchlibrary.pri)
+include(../../qtcreatorlibrary.pri)
SOURCES += \
reloadpromptutils.cpp \
settingsutils.cpp \
filesearch.cpp \
pathchooser.cpp \
+ pathlisteditor.cpp \
filewizardpage.cpp \
filewizarddialog.cpp \
projectintropage.cpp \
@@ -45,6 +46,7 @@ HEADERS += \
filesearch.h \
listutils.h \
pathchooser.h \
+ pathlisteditor.h \
filewizardpage.h \
filewizarddialog.h \
projectintropage.h \
diff --git a/src/libs/utils/utils_global.h b/src/libs/utils/utils_global.h
index 17917d043428ce68cf540d7e119fccbfbbb1e980..ff1738c58c9a95ebbea6c0da4bd8af57e2a1c16c 100644
--- a/src/libs/utils/utils_global.h
+++ b/src/libs/utils/utils_global.h
@@ -32,10 +32,10 @@
#include <QtCore/qglobal.h>
-#if defined(QWORKBENCH_UTILS_LIBRARY)
-# define QWORKBENCH_UTILS_EXPORT Q_DECL_EXPORT
+#if defined(QTCREATOR_UTILS_LIBRARY)
+# define QTCREATOR_UTILS_EXPORT Q_DECL_EXPORT
#else
-# define QWORKBENCH_UTILS_EXPORT Q_DECL_IMPORT
+# define QTCREATOR_UTILS_EXPORT Q_DECL_IMPORT
#endif
#endif // UTILS_GLOBAL_H
diff --git a/src/libs/utils/winutils.cpp b/src/libs/utils/winutils.cpp
index 3fd789707e6812e8ee3840b903811e4b44092bd0..c351c8544c8f8df07a4174e907a2cb59a3b84b42 100644
--- a/src/libs/utils/winutils.cpp
+++ b/src/libs/utils/winutils.cpp
@@ -35,7 +35,7 @@
namespace Core {
namespace Utils {
-QWORKBENCH_UTILS_EXPORT QString winErrorMessage(unsigned long error)
+QTCREATOR_UTILS_EXPORT QString winErrorMessage(unsigned long error)
{
QString rc = QString::fromLatin1("#%1: ").arg(error);
ushort *lpMsgBuf;
diff --git a/src/libs/utils/winutils.h b/src/libs/utils/winutils.h
index 112537502998213a2259492ab6d93786d50d4b97..dbd0e1f1dbcf0f9f6dbf80892bfd81960ac1dc4c 100644
--- a/src/libs/utils/winutils.h
+++ b/src/libs/utils/winutils.h
@@ -41,7 +41,7 @@ namespace Utils {
// Helper to format a Windows error message, taking the
// code as returned by the GetLastError()-API.
-QWORKBENCH_UTILS_EXPORT QString winErrorMessage(unsigned long error);
+QTCREATOR_UTILS_EXPORT QString winErrorMessage(unsigned long error);
} // namespace Utils
} // namespace Core
diff --git a/src/plugins/bineditor/bineditor_dependencies.pri b/src/plugins/bineditor/bineditor_dependencies.pri
index 30120bd3f510f26258aab8df2765bf662477b389..5ccafe00072b0e1bf9ffa45a80b771c124ea34c0 100644
--- a/src/plugins/bineditor/bineditor_dependencies.pri
+++ b/src/plugins/bineditor/bineditor_dependencies.pri
@@ -1,4 +1,4 @@
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(../../libs/utils/utils.pri)
include(../../plugins/texteditor/texteditor.pri)
include(../../plugins/coreplugin/coreplugin.pri)
diff --git a/src/plugins/bookmarks/bookmarks.pro b/src/plugins/bookmarks/bookmarks.pro
index d061d5fa76dce072be0a2cf397f53565efd0dd04..9d3ca71865479f444e19c5f164b19bb56ad48b9d 100644
--- a/src/plugins/bookmarks/bookmarks.pro
+++ b/src/plugins/bookmarks/bookmarks.pro
@@ -1,7 +1,7 @@
TEMPLATE = lib
TARGET = Bookmarks
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/texteditor/texteditor.pri)
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
index eae41bbef084e86216f3f0883b291a6597206dde..8595292835669e764ed5aff46516dc72015445b9 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
@@ -184,9 +184,9 @@ InSourceBuildPage::InSourceBuildPage(CMakeOpenProjectWizard *cmakeWizard)
setLayout(new QVBoxLayout);
QLabel *label = new QLabel(this);
label->setWordWrap(true);
- label->setText(tr("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."));
+ label->setText(tr("Qt Creator has detected an in-source-build "
+ "which prevents shadow builds. Qt Creator will not allow you to change the build directory. "
+ "If you want a shadow build, clean your source directory and re-open the project."));
layout()->addWidget(label);
}
@@ -199,7 +199,7 @@ XmlFileUpToDatePage::XmlFileUpToDatePage(CMakeOpenProjectWizard *cmakeWizard)
label->setWordWrap(true);
label->setText(tr("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"));
+ "Click finish to load the project."));
layout()->addWidget(label);
}
@@ -281,15 +281,15 @@ void CMakeRunPage::initializePage()
m_descriptionLabel->setText(tr("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.").arg(m_buildDirectory));
+ "add them below. Note that cmake remembers command "
+ "line arguments from the previous runs.").arg(m_buildDirectory));
} else if(m_mode == CMakeRunPage::Recreate) {
- m_descriptionLabel->setText(tr("The directory %1 specified in a buildconfiguration, "
+ m_descriptionLabel->setText(tr("The directory %1 specified in a build-configuration, "
"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.").arg(m_buildDirectory));
+ "the initial cmake call. Note that cmake remembers command "
+ "line arguments from the previous runs.").arg(m_buildDirectory));
} else if(m_mode == CMakeRunPage::Change) {
m_buildDirectory = m_cmakeWizard->buildDirectory();
m_descriptionLabel->setText(tr("Qt Creator needs to run cmake in the new build directory. "
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
index e2d02bba527d07e0c0ed6fa79115dc2ca38bfa95..c851b79fd1fde423f61386c243c1210b13389d85 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
@@ -1,6 +1,6 @@
TEMPLATE = lib
TARGET = CMakeProjectManager
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(cmakeprojectmanager_dependencies.pri)
HEADERS = cmakeproject.h \
cmakeprojectplugin.h \
diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp
index 7fb0295bb622a25ed27ed16a3417ca4437f05696..f909c064f5dd76178d0b6e4cdb17d8ddceb23c0d 100644
--- a/src/plugins/coreplugin/basefilewizard.cpp
+++ b/src/plugins/coreplugin/basefilewizard.cpp
@@ -578,26 +578,6 @@ BaseFileWizard::OverwriteResult BaseFileWizard::promptOverwrite(const QString &l
return yes ? OverwriteOk : OverwriteCanceled;
}
-QList<IWizard*> BaseFileWizard::allWizards()
-{
- return ExtensionSystem::PluginManager::instance()->getObjects<IWizard>();
-}
-
-// Utility to find all registered wizards of a certain kind
-
-class WizardKindPredicate {
-public:
- WizardKindPredicate(IWizard::Kind kind) : m_kind(kind) {}
- bool operator()(const IWizard &w) const { return w.kind() == m_kind; }
-private:
- const IWizard::Kind m_kind;
-};
-
-QList<IWizard*> BaseFileWizard::findWizardsOfKind(Kind kind)
-{
- return findWizards(WizardKindPredicate(kind));
-}
-
QString BaseFileWizard::buildFileName(const QString &path,
const QString &baseName,
const QString &extension)
diff --git a/src/plugins/coreplugin/basefilewizard.h b/src/plugins/coreplugin/basefilewizard.h
index 708aad23c45024baca38baea83c1cac290e6cf55..c5dac78009c30211720157fe7cec5803939eb57a 100644
--- a/src/plugins/coreplugin/basefilewizard.h
+++ b/src/plugins/coreplugin/basefilewizard.h
@@ -151,11 +151,6 @@ public:
virtual QStringList runWizard(const QString &path, QWidget *parent);
- // Utility to find all registered wizards
- static QList<IWizard*> allWizards();
- // Utility to find all registered wizards of a certain kind
- static QList<IWizard*> findWizardsOfKind(Kind kind);
-
// Build a file name, adding the extension unless baseName already has one
static QString buildFileName(const QString &path, const QString &baseName, const QString &extension);
@@ -222,20 +217,6 @@ protected:
QString *errorMessage) const = 0;
};
-/* A utility to find all wizards supporting a view mode and matching a predicate */
-template <class Predicate>
- QList<IWizard*> findWizards(Predicate predicate)
-{
- // Filter all wizards
- const QList<IWizard*> allWizards = BaseFileWizard::allWizards();
- QList<IWizard*> rc;
- const QList<IWizard*>::const_iterator cend = allWizards.constEnd();
- for (QList<IWizard*>::const_iterator it = allWizards.constBegin(); it != cend; ++it)
- if (predicate(*(*it)))
- rc.push_back(*it);
- return rc;
-}
-
} // namespace Core
#endif // BASEFILEWIZARD_H
diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index a3c77126fa20e82e1b816683a45edaa8a4cf6dfb..d7e63380272cfd75ea465e888d755d7c719f0164 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -57,5 +57,7 @@
<file>images/welcomemode/product_logo.png</file>
<file>images/welcomemode/qt_logo.png</file>
<file>images/welcomemode/rc_combined.png</file>
+ <file>images/welcomemode/background_center_frame.png</file>
+ <file>images/welcomemode/center_frame_header.png</file>
</qresource>
</RCC>
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 235dcd8cd5524bbdd66a50ea6101c45d21454df4..deb160f3a445a45dddeea9ee6ebbcfb55f720fec 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -140,7 +140,7 @@ const char * const GO_FORWARD = "QtCreator.GoForward";
const char * const GOTOPREVIOUSGROUP = "QtCreator.GotoPreviousTabGroup";
const char * const GOTONEXTGROUP = "QtCreator.GotoNextTabGroup";
const char * const WINDOWSLIST = "QtCreator.WindowsList";
-const char * const ABOUT_WORKBENCH = "QtCreator.AboutWorkbench";
+const char * const ABOUT_QTCREATOR = "QtCreator.AboutQtCreator";
const char * const ABOUT_PLUGINS = "QtCreator.AboutPlugins";
const char * const ABOUT_QT = "QtCreator.AboutQt";
const char * const S_RETURNTOEDITOR = "QtCreator.ReturnToEditor";
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index 5eedf3bab85c4ba904ce06e4ece876a01e65ad1b..9faebcc42be5a3dffeabe1632c532567df207718 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -2,9 +2,10 @@ TEMPLATE = lib
TARGET = Core
DEFINES += CORE_LIBRARY
QT += xml \
+ network \
script \
svg
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(../../libs/utils/utils.pri)
include(../../shared/scriptwrapper/scriptwrapper.pri)
include(coreplugin_dependencies.pri)
@@ -19,6 +20,7 @@ DEPENDPATH += dialogs \
scriptmanager
SOURCES += mainwindow.cpp \
welcomemode.cpp \
+ rssfetcher.cpp \
editmode.cpp \
tabpositionindicator.cpp \
fancyactionbar.cpp \
@@ -73,10 +75,12 @@ SOURCES += mainwindow.cpp \
mimedatabase.cpp \
icore.cpp \
editormanager/ieditor.cpp \
- dialogs/ioptionspage.cpp
+ dialogs/ioptionspage.cpp \
+ dialogs/iwizard.cpp
HEADERS += mainwindow.h \
welcomemode.h \
welcomemode_p.h \
+ rssfetcher.h \
editmode.h \
tabpositionindicator.h \
fancyactionbar.h \
diff --git a/src/plugins/coreplugin/dialogs/iwizard.cpp b/src/plugins/coreplugin/dialogs/iwizard.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d1e4067c535691c240f51a947f763e1301c937b7
--- /dev/null
+++ b/src/plugins/coreplugin/dialogs/iwizard.cpp
@@ -0,0 +1,165 @@
+/**************************************************************************
+**
+** 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 "iwizard.h"
+
+#include <extensionsystem/pluginmanager.h>
+
+/*!
+ \class Core::IWizard
+ \mainclass
+
+ \brief The class IWizard is the base class for all wizards
+ (for example shown in \gui {File | New}).
+
+ The wizard interface is a very thin abstraction for the \gui{New...} wizards.
+ Basically it defines what to show to the user in the wizard selection dialogs,
+ and a hook that is called if the user selects the wizard.
+
+ Wizards can then perform any operations they like, including showing dialogs and
+ creating files. Often it is not necessary to create your own wizard from scratch,
+ instead use one of the predefined wizards and adapt it to your needs.
+
+ To make your wizard known to the system, add your IWizard instance to the
+ plugin manager's object pool in your plugin's initialize method:
+ \code
+ bool MyPlugin::initialize(const QStringList &arguments, QString *errorString)
+ {
+ // ... do setup
+ addAutoReleasedObject(new MyWizard);
+ // ... do more setup
+ }
+ \endcode
+ \sa Core::BaseFileWizard
+ \sa Core::StandardFileWizard
+*/
+
+/*!
+ \enum Core::IWizard::Kind
+ Used to specify what kind of objects the wizard creates. This information is used
+ to show e.g. only wizards that create projects when selecting a \gui{New Project}
+ menu item.
+ \value FileWizard
+ The wizard creates one or more files.
+ \value ClassWizard
+ The wizard creates a new class (e.g. source+header files).
+ \value ProjectWizard
+ The wizard creates a new project.
+*/
+
+/*!
+ \fn IWizard::IWizard(QObject *parent)
+ \internal
+*/
+
+/*!
+ \fn IWizard::~IWizard()
+ \internal
+*/
+
+/*!
+ \fn Kind IWizard::kind() const
+ Returns what kind of objects are created by the wizard.
+ \sa Kind
+*/
+
+/*!
+ \fn QIcon IWizard::icon() const
+ Returns an icon to show in the wizard selection dialog.
+*/
+
+/*!
+ \fn QString IWizard::description() const
+ Returns a translated description to show when this wizard is selected
+ in the dialog.
+*/
+
+/*!
+ \fn QString IWizard::name() const
+ Returns the translated name of the wizard, how it should appear in the
+ dialog.
+*/
+
+/*!
+ \fn QString IWizard::category() const
+ Returns a category ID to add the wizard to.
+*/
+
+/*!
+ \fn QString IWizard::trCategory() const
+ Returns the translated string of the category, how it should appear
+ in the dialog.
+*/
+
+/*!
+ \fn QStringList IWizard::runWizard(const QString &path, QWidget *parent)
+ This method is executed when the wizard has been selected by the user
+ for execution. Any dialogs the wizard opens should use the given \a parent.
+ The \a path argument is a suggestion for the location where files should be
+ created. The wizard should fill this in it's path selection elements as a
+ default path.
+ Returns a list of files (absolute paths) that have been created, if any.
+*/
+
+using namespace Core;
+
+/* A utility to find all wizards supporting a view mode and matching a predicate */
+template <class Predicate>
+ QList<IWizard*> findWizards(Predicate predicate)
+{
+ // Filter all wizards
+ const QList<IWizard*> allWizards = IWizard::allWizards();
+ QList<IWizard*> rc;
+ const QList<IWizard*>::const_iterator cend = allWizards.constEnd();
+ for (QList<IWizard*>::const_iterator it = allWizards.constBegin(); it != cend; ++it)
+ if (predicate(*(*it)))
+ rc.push_back(*it);
+ return rc;
+}
+
+QList<IWizard*> IWizard::allWizards()
+{
+ return ExtensionSystem::PluginManager::instance()->getObjects<IWizard>();
+}
+
+// Utility to find all registered wizards of a certain kind
+
+class WizardKindPredicate {
+public:
+ WizardKindPredicate(IWizard::Kind kind) : m_kind(kind) {}
+ bool operator()(const IWizard &w) const { return w.kind() == m_kind; }
+private:
+ const IWizard::Kind m_kind;
+};
+
+QList<IWizard*> IWizard::wizardsOfKind(Kind kind)
+{
+ return findWizards(WizardKindPredicate(kind));
+}
+
diff --git a/src/plugins/coreplugin/dialogs/iwizard.h b/src/plugins/coreplugin/dialogs/iwizard.h
index 4807d52f183c524a1c7b55483a8b74f257f07774..5061382bf6dba57682e12981f8b970cc8651f8d6 100644
--- a/src/plugins/coreplugin/dialogs/iwizard.h
+++ b/src/plugins/coreplugin/dialogs/iwizard.h
@@ -51,6 +51,7 @@ public:
};
IWizard(QObject *parent = 0) : QObject(parent) {}
+ virtual ~IWizard() {}
virtual Kind kind() const = 0;
virtual QIcon icon() const = 0;
@@ -61,6 +62,11 @@ public:
virtual QString trCategory() const = 0;
virtual QStringList runWizard(const QString &path, QWidget *parent) = 0;
+
+ // Utility to find all registered wizards
+ static QList<IWizard*> allWizards();
+ // Utility to find all registered wizards of a certain kind
+ static QList<IWizard*> wizardsOfKind(Kind kind);
};
} // namespace Core
diff --git a/src/plugins/coreplugin/dialogs/newdialog.ui b/src/plugins/coreplugin/dialogs/newdialog.ui
index 394124076873ab8f6d18ad3d2f0dec8eacb4205e..a21b06a8ca9b397332551cabaf713811fd6e8795 100644
--- a/src/plugins/coreplugin/dialogs/newdialog.ui
+++ b/src/plugins/coreplugin/dialogs/newdialog.ui
@@ -45,16 +45,10 @@
</item>
<item row="1" column="1">
<widget class="QLabel" name="descLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="watermark">
- <property name="text">
- <string>TextLabel</string>
- </property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.ui b/src/plugins/coreplugin/dialogs/shortcutsettings.ui
index 867b021f94ea5e882d12e6034dfbe68e32ca122f..2bfd9bcfafc2dfd5ae66e5496175bb009161fa46 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.ui
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.ui
@@ -10,9 +10,6 @@
<height>451</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout">
<item>
<widget class="QGroupBox" name="groupBox">
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 52f1a51195d5384fea48ec4a8ffb900bfb033a21..4c4d91b188d7e2d177f785484892daddf914a32b 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -406,7 +406,6 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
// other setup
m_d->m_splitter = new SplitterOrView(m_d->m_editorModel);
- m_d->m_splitter->setRoot(true);
m_d->m_view = m_d->m_splitter->view();
@@ -699,9 +698,9 @@ bool EditorManager::closeEditors(const QList<IEditor*> editorsToClose, bool askA
if (cancelled)
return false;
if (!list.isEmpty()) {
+ closingFailed = true;
QSet<IEditor*> skipSet = editorsForFiles(list).toSet();
acceptedEditors = acceptedEditors.toSet().subtract(skipSet).toList();
- closingFailed = false;
}
}
if (acceptedEditors.isEmpty())
@@ -1204,23 +1203,35 @@ bool EditorManager::saveFile(IEditor *editor)
file->checkPermissions();
const QString &fileName = file->fileName();
- if (!fileName.isEmpty() && file->isReadOnly()) {
+
+ if (fileName.isEmpty())
+ return saveFileAs(editor);
+
+ bool success = false;
+
+ // try saving, no matter what isReadOnly tells us
+ m_d->m_core->fileManager()->blockFileChange(file);
+ success = file->save(fileName);
+ m_d->m_core->fileManager()->unblockFileChange(file);
+
+ if (!success) {
MakeWritableResult answer =
makeEditorWritable(editor);
if (answer == Failed)
return false;
if (answer == SavedAs)
return true;
- }
- if (file->isReadOnly() || fileName.isEmpty())
- return saveFileAs(editor);
+ file->checkPermissions();
+
+ m_d->m_core->fileManager()->blockFileChange(file);
+ success = file->save(fileName);
+ m_d->m_core->fileManager()->unblockFileChange(file);
+ }
- m_d->m_core->fileManager()->blockFileChange(file);
- const bool success = file->save(fileName);
- m_d->m_core->fileManager()->unblockFileChange(file);
if (success)
m_d->m_core->fileManager()->addToRecentFiles(editor->file()->fileName());
+
return success;
}
@@ -1242,7 +1253,7 @@ EditorManager::ReadOnlyAction
QPushButton *saveAsButton = 0;
if (displaySaveAsButton)
- msgBox.addButton(QObject::tr("Save as ..."), QMessageBox::ActionRole);
+ saveAsButton = msgBox.addButton(QObject::tr("Save as ..."), QMessageBox::ActionRole);
msgBox.setDefaultButton(sccButton ? sccButton : makeWritableButton);
msgBox.exec();
@@ -1269,7 +1280,7 @@ EditorManager::makeEditorWritable(IEditor *editor)
switch (promptReadOnlyFile(fileName, versionControl, m_d->m_core->mainWindow(), true)) {
case RO_OpenVCS:
if (!versionControl->vcsOpen(fileName)) {
- QMessageBox::warning(m_d->m_core->mainWindow(), tr("Failed!"), tr("Could not open the file for edit with SCC."));
+ QMessageBox::warning(m_d->m_core->mainWindow(), tr("Failed!"), tr("Could not open the file for editing with SCC."));
return Failed;
}
file->checkPermissions();
@@ -1311,6 +1322,7 @@ bool EditorManager::saveFileAs(IEditor *editor)
m_d->m_core->fileManager()->blockFileChange(editor->file());
const bool success = editor->file()->save(absoluteFilePath);
m_d->m_core->fileManager()->unblockFileChange(editor->file());
+ editor->file()->checkPermissions();
if (success)
m_d->m_core->fileManager()->addToRecentFiles(editor->file()->fileName());
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index e61f0fa890133abc6e4f1b875d635876812c8855..8fec6a24639399c2c32ed302ca71cfd2f92e4647 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -320,10 +320,49 @@ void EditorModel::itemChanged()
emitDataChanged(qobject_cast<IEditor*>(sender()));
}
+
+class EditorProxyModel : public QSortFilterProxyModel
+{
+ EditorView *m_view;
+ EditorModel *m_model;
+public:
+ EditorProxyModel(EditorModel *source, EditorView *view)
+ : QSortFilterProxyModel(view), m_view(view), m_model(source) {
+ setSourceModel(source);
+
+ }
+
+ QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const
+ {
+ QVariant variant = QSortFilterProxyModel::data(proxyIndex, role);
+ if (role == Qt::FontRole) {
+ if (IEditor *editor = m_model->editorAt(proxyIndex.row()) ) {
+ if (m_view->hasEditor(editor)) {
+ QFont font = m_view->font();
+ font.setBold(true);
+ return font;
+ }
+ foreach (IEditor *duplicate, m_model->duplicatesFor(editor)) {
+ if (duplicate&& m_view->hasEditor(duplicate)) {
+ QFont font = m_view->font();
+ font.setBold(true);
+ return font;
+ }
+ }
+ }
+ }
+ return QSortFilterProxyModel::data(proxyIndex, role);
+ }
+
+};
+
+
+
//================EditorView====================
EditorView::EditorView(EditorModel *model, QWidget *parent) :
QWidget(parent),
+ m_model(model),
m_toolBar(new QWidget),
m_container(new QStackedWidget(this)),
m_editorList(new QComboBox),
@@ -339,9 +378,15 @@ EditorView::EditorView(EditorModel *model, QWidget *parent) :
tl->setSpacing(0);
tl->setMargin(0);
{
+ QAbstractItemModel *itemModel = m_model;
+ if (!itemModel) {
+ m_model = CoreImpl::instance()->editorManager()->openedEditorsModel();
+ itemModel = new EditorProxyModel(m_model, this);
+ }
+
m_editorList->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
m_editorList->setMinimumContentsLength(20);
- m_editorList->setModel(model);
+ m_editorList->setModel(itemModel);
m_editorList->setMaxVisibleItems(40);
QToolBar *editorListToolBar = new QToolBar;
@@ -583,7 +628,7 @@ void EditorView::setCurrentEditor(IEditor *editor)
const int idx = m_container->indexOf(editor->widget());
QTC_ASSERT(idx >= 0, return);
m_container->setCurrentIndex(idx);
- m_editorList->setCurrentIndex(qobject_cast<EditorModel*>(m_editorList->model())->indexOf(editor->file()->fileName()).row());
+ m_editorList->setCurrentIndex(m_model->indexOf(editor->file()->fileName()).row());
updateEditorStatus(editor);
updateToolBar(editor);
@@ -667,9 +712,10 @@ void EditorView::listSelectionActivated(int index)
SplitterOrView::SplitterOrView(Internal::EditorModel *model)
{
- m_isRoot = false;
+ Q_ASSERT(model);
+ m_isRoot = true;
m_layout = new QStackedLayout(this);
- m_view = new EditorView(model ? model : CoreImpl::instance()->editorManager()->openedEditorsModel());
+ m_view = new EditorView(model);
m_splitter = 0;
m_layout->addWidget(m_view);
setFocusPolicy(Qt::ClickFocus);
@@ -679,8 +725,9 @@ SplitterOrView::SplitterOrView(Core::IEditor *editor)
{
m_isRoot = false;
m_layout = new QStackedLayout(this);
- m_view = new EditorView(CoreImpl::instance()->editorManager()->openedEditorsModel());
- m_view->addEditor(editor);
+ m_view = new EditorView();
+ if (editor)
+ m_view->addEditor(editor);
m_splitter = 0;
m_layout->addWidget(m_view);
setFocusPolicy(Qt::ClickFocus);
diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h
index 4c0da55ac3f6fdda99229e3a66a3d88a5bccddac..06773cf535d6c35fc6a9f650c53ac88fbe720665 100644
--- a/src/plugins/coreplugin/editormanager/editorview.h
+++ b/src/plugins/coreplugin/editormanager/editorview.h
@@ -85,6 +85,8 @@ public:
};
QList<Entry> entries() const { return m_editors; }
+ inline IEditor *editorAt(int row) const { return m_editors.at(row).editor; }
+
void removeEditor(IEditor *editor);
void removeEditor(const QModelIndex &index);
@@ -155,6 +157,7 @@ private:
void updateToolBar(IEditor *editor);
void checkProjectLoaded(IEditor *editor);
+ EditorModel *m_model;
QWidget *m_toolBar;
QToolBar *m_activeToolBar;
QStackedWidget *m_container;
@@ -181,15 +184,14 @@ class SplitterOrView : public QWidget
{
Q_OBJECT
public:
- SplitterOrView(Internal::EditorModel *model = 0); // creates a splitter with an empty view
- SplitterOrView(Core::IEditor *editor);
+ SplitterOrView(Internal::EditorModel *model); // creates a root splitter
+ SplitterOrView(Core::IEditor *editor = 0);
~SplitterOrView();
void split(Qt::Orientation orientation);
void unsplit();
inline bool isView() const { return m_view != 0; }
- inline void setRoot(bool b) { m_isRoot = b; }
inline bool isRoot() const { return m_isRoot; }
inline bool isSplitter() const { return m_splitter != 0; }
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.ui b/src/plugins/coreplugin/editormanager/openeditorsview.ui
index 3cfa50e78320f7773ffb09a4977e61b65dfb9fe0..00962bcbec6e247538dbfdf13e21b0faa8362100 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.ui
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.ui
@@ -15,9 +15,6 @@
<height>100</height>
</size>
</property>
- <property name="windowTitle" >
- <string>Form</string>
- </property>
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp
index b42611b2217c28fd829ee6de8dbc4b95949b84f3..a851fa792dfbd7e1a5c8fab378676d7ff941b2d7 100644
--- a/src/plugins/coreplugin/filemanager.cpp
+++ b/src/plugins/coreplugin/filemanager.cpp
@@ -394,6 +394,7 @@ QList<IFile *> FileManager::saveModifiedFiles(const QList<IFile *> &files,
if (!fileName.isEmpty()) {
blockFileChange(file);
ok = file->save(fileName);
+ file->checkPermissions();
unblockFileChange(file);
}
if (!ok)
diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui
index 84cdf1288150e2a92276c2739a09dc7787740b09..a863709ac09b23c692a52cd964868a7236c8fc52 100644
--- a/src/plugins/coreplugin/generalsettings.ui
+++ b/src/plugins/coreplugin/generalsettings.ui
@@ -10,9 +10,6 @@
<height>236</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QGroupBox" name="groupBox">
diff --git a/src/plugins/coreplugin/images/welcomemode/background_center_frame.png b/src/plugins/coreplugin/images/welcomemode/background_center_frame.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1628e22c27b47cc1f75a3ff054c7232f7ac0208
Binary files /dev/null and b/src/plugins/coreplugin/images/welcomemode/background_center_frame.png differ
diff --git a/src/plugins/coreplugin/images/welcomemode/center_frame_header.png b/src/plugins/coreplugin/images/welcomemode/center_frame_header.png
new file mode 100644
index 0000000000000000000000000000000000000000..2021038428b8a5777ebfebb74cc6623637552628
Binary files /dev/null and b/src/plugins/coreplugin/images/welcomemode/center_frame_header.png differ
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index d59b79cb9ee35b221e4298a952334046249e7a5c..f808c63acd21b4ebc5f6bd8e85e9d13296146541 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -354,8 +354,8 @@ void MainWindow::closeEvent(QCloseEvent *event)
// Save opened files
bool cancelled;
- fileManager()->saveModifiedFiles(fileManager()->modifiedFiles(), &cancelled);
- if (cancelled) {
+ QList<IFile*> notSaved = fileManager()->saveModifiedFiles(fileManager()->modifiedFiles(), &cancelled);
+ if (cancelled || !notSaved.isEmpty()) {
event->ignore();
return;
}
@@ -732,7 +732,7 @@ void MainWindow::registerDefaultActions()
#else
tmpaction = new QAction(tr("About &Qt Creator..."), this);
#endif
- cmd = am->registerAction(tmpaction, Constants:: ABOUT_WORKBENCH, m_globalContext);
+ cmd = am->registerAction(tmpaction, Constants::ABOUT_QTCREATOR, m_globalContext);
mhelp->addAction(cmd, Constants::G_HELP_ABOUT);
tmpaction->setEnabled(true);
connect(tmpaction, SIGNAL(triggered()), this, SLOT(aboutQtCreator()));
@@ -760,7 +760,7 @@ void MainWindow::registerDefaultActions()
void MainWindow::newFile()
{
- showNewItemDialog(tr("New", "Title of dialog"),BaseFileWizard::allWizards());
+ showNewItemDialog(tr("New", "Title of dialog"), IWizard::allWizards());
}
void MainWindow::openFile()
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 33361bd4b869eb7dfc151219927c4ac586dc611b..e7315d933e1c6a87ea0e2bc85cc3b9bcd1107bdd 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -134,6 +134,11 @@ ManhattanStyle::~ManhattanStyle()
d = 0;
}
+QStyle *ManhattanStyle::systemStyle() const
+{
+ return d->style;
+}
+
// Draws a CSS-like border image where the defined borders are not stretched
void drawCornerImage(const QImage &img, QPainter *painter, QRect rect,
int left = 0, int top = 0, int right = 0,
diff --git a/src/plugins/coreplugin/manhattanstyle.h b/src/plugins/coreplugin/manhattanstyle.h
index 9a190519830c73ea6effdbac69dd8464cd9537db..ea07803e4644d3e89762af6e1f3d0afe37447525 100644
--- a/src/plugins/coreplugin/manhattanstyle.h
+++ b/src/plugins/coreplugin/manhattanstyle.h
@@ -30,6 +30,8 @@
#ifndef MANHATTANSTYLE_H
#define MANHATTANSTYLE_H
+#include "core_global.h"
+
#include <QStyle>
#include <QWindowsStyle>
@@ -40,15 +42,17 @@ QT_END_NAMESPACE
class ManhattanStylePrivate;
-class ManhattanStyle : public QWindowsStyle
+class CORE_EXPORT ManhattanStyle : public QWindowsStyle
{
- Q_OBJECT;
+ Q_OBJECT
public:
ManhattanStyle(const QString &);
~ManhattanStyle();
+ QStyle *systemStyle() const;
+
void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const;
void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const;
void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget = 0) const;
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index 92adb63e89d0915e85721cd799bc059178360c91..685327c55927f0849072e90d45f89d15d19d1a1c 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -525,16 +525,16 @@ void OutputPaneManager::changePage()
}
int idx = m_widgetComboBox->itemData(m_widgetComboBox->currentIndex()).toInt();
- if (m_lastIndex == idx)
- return;
- m_outputWidgetPane->setCurrentIndex(idx);
- m_opToolBarWidgets->setCurrentIndex(idx);
- m_pageMap.value(idx)->visibilityChanged(true);
- m_pageMap.value(m_lastIndex)->visibilityChanged(false);
-
- bool canNavigate = m_pageMap.value(idx)->canNavigate();
- m_prevAction->setEnabled(canNavigate && m_pageMap.value(idx)->canPrevious());
- m_nextAction->setEnabled(canNavigate && m_pageMap.value(idx)->canNext());
+ if (m_lastIndex != idx) {
+ m_outputWidgetPane->setCurrentIndex(idx);
+ m_opToolBarWidgets->setCurrentIndex(idx);
+ m_pageMap.value(idx)->visibilityChanged(true);
+ m_pageMap.value(m_lastIndex)->visibilityChanged(false);
+
+ bool canNavigate = m_pageMap.value(idx)->canNavigate();
+ m_prevAction->setEnabled(canNavigate && m_pageMap.value(idx)->canPrevious());
+ m_nextAction->setEnabled(canNavigate && m_pageMap.value(idx)->canNext());
+ }
if (m_buttons.value(m_lastIndex))
m_buttons.value(m_lastIndex)->setChecked(false);
diff --git a/src/plugins/coreplugin/rssfetcher.cpp b/src/plugins/coreplugin/rssfetcher.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f9005b9887ddb465dc137a6a15527637c95a6ed3
--- /dev/null
+++ b/src/plugins/coreplugin/rssfetcher.cpp
@@ -0,0 +1,101 @@
+/**************************************************************************
+**
+** 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 <QtCore/QDebug>
+#include <QtGui/QDesktopServices>
+#include <QtGui/QLineEdit>
+#include <QtNetwork/QHttp>
+
+#include "rssfetcher.h"
+
+using namespace Core::Internal;
+
+RSSFetcher::RSSFetcher(int maxItems, QObject *parent)
+ : QObject(parent), m_items(0), m_maxItems(maxItems)
+{
+ connect(&m_http, SIGNAL(readyRead(const QHttpResponseHeader &)),
+ this, SLOT(readData(const QHttpResponseHeader &)));
+
+ connect(&m_http, SIGNAL(requestFinished(int, bool)),
+ this, SLOT(finished(int, bool)));
+}
+
+void RSSFetcher::fetch(const QUrl &url)
+{
+ m_http.setHost(url.host());
+ m_connectionId = m_http.get(url.path());
+}
+
+void RSSFetcher::readData(const QHttpResponseHeader &resp)
+{
+ if (resp.statusCode() != 200)
+ m_http.abort();
+ else {
+ m_xml.addData(m_http.readAll());
+ parseXml();
+ }
+}
+
+void RSSFetcher::finished(int id, bool error)
+{
+ Q_UNUSED(id)
+ m_items = 0;
+ emit finished(error);
+}
+
+void RSSFetcher::parseXml()
+{
+ while (!m_xml.atEnd()) {
+ m_xml.readNext();
+ if (m_xml.isStartElement()) {
+ if (m_xml.name() == "item") {
+ m_titleString.clear();
+ m_linkString.clear();
+ }
+ m_currentTag = m_xml.name().toString();
+ } else if (m_xml.isEndElement()) {
+ if (m_xml.name() == "item") {
+ m_items++;
+ if (m_items > m_maxItems)
+ return;
+ emit newsItemReady(m_titleString, m_linkString);
+ }
+
+ } else if (m_xml.isCharacters() && !m_xml.isWhitespace()) {
+ if (m_currentTag == "title")
+ m_titleString += m_xml.text().toString();
+ else if (m_currentTag == "link")
+ m_linkString += m_xml.text().toString();
+ }
+ }
+ if (m_xml.error() && m_xml.error() != QXmlStreamReader::PrematureEndOfDocumentError) {
+ qWarning() << "XML ERROR:" << m_xml.lineNumber() << ": " << m_xml.errorString();
+ m_http.abort();
+ }
+}
diff --git a/src/plugins/coreplugin/rssfetcher.h b/src/plugins/coreplugin/rssfetcher.h
new file mode 100644
index 0000000000000000000000000000000000000000..7479e0e363cd499a43ba864b3b96774d0d08ff40
--- /dev/null
+++ b/src/plugins/coreplugin/rssfetcher.h
@@ -0,0 +1,75 @@
+/**************************************************************************
+**
+** 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.
+**
+**************************************************************************/
+
+#ifndef RSSFETCHER_H
+#define RSSFETCHER_H
+
+#include <QtCore/QUrl>
+#include <QtCore/QXmlStreamReader>
+#include <QtNetwork/QHttp>
+
+namespace Core {
+namespace Internal {
+
+class RSSFetcher : public QObject
+{
+ Q_OBJECT
+public:
+ RSSFetcher(int maxItems, QObject *parent = 0);
+
+signals:
+ void newsItemReady(const QString& title, const QString& url);
+
+public slots:
+ void fetch(const QUrl &url);
+ void finished(int id, bool error);
+ void readData(const QHttpResponseHeader &);
+
+ signals:
+ void finished(bool error);
+
+private:
+ void parseXml();
+
+ QXmlStreamReader m_xml;
+ QString m_currentTag;
+ QString m_linkString;
+ QString m_titleString;
+
+ QHttp m_http;
+ int m_connectionId;
+ int m_items;
+ int m_maxItems;
+};
+
+} // namespace Internal
+} // namespace Core
+
+#endif // RSSFETCHER_H
+
diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp
index 59bd555e7e92a9d6a9ca615ceb12901b46331a18..a03241d2dbc0414753fa0b99939e9d7881ba2f0e 100644
--- a/src/plugins/coreplugin/welcomemode.cpp
+++ b/src/plugins/coreplugin/welcomemode.cpp
@@ -28,18 +28,24 @@
**************************************************************************/
#include "welcomemode.h"
+#include "icore.h"
#include "coreconstants.h"
#include "uniqueidmanager.h"
#include "modemanager.h"
+#include "rssfetcher.h"
#include <QtGui/QToolBar>
#include <QtGui/QDesktopServices>
#include <QtGui/QMouseEvent>
+#include <QtCore/QDateTime>
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
#include <QtCore/QDebug>
#include <QtCore/QUrl>
+#include <QtCore/QSettings>
+
+#include <cstdlib>
#include "ui_welcomemode.h"
@@ -52,8 +58,9 @@ struct WelcomeModePrivate
QWidget *m_widget;
QWidget *m_welcomePage;
+ QButtonGroup *btnGrp;
Ui::WelcomePage ui;
-
+ RSSFetcher *rssFetcher;
WelcomeMode::WelcomePageData lastData;
};
@@ -97,24 +104,69 @@ WelcomeMode::WelcomeMode() :
l->setMargin(0);
l->setSpacing(0);
l->addWidget(new QToolBar(m_d->m_widget));
-
+ // limit to 7 items to avoid scrollbars
+ m_d->rssFetcher = new RSSFetcher(7, this);
m_d->m_welcomePage = new QWidget(m_d->m_widget);
m_d->ui.setupUi(m_d->m_welcomePage);
m_d->ui.sessTreeWidget->viewport()->setAutoFillBackground(false);
m_d->ui.projTreeWidget->viewport()->setAutoFillBackground(false);
+ m_d->ui.newsTreeWidget->viewport()->setAutoFillBackground(false);
+ m_d->ui.sitesTreeWidget->viewport()->setAutoFillBackground(false);
+ m_d->ui.tutorialTreeWidget->viewport()->setAutoFillBackground(false);
+ m_d->ui.didYouKnowTextBrowser->viewport()->setAutoFillBackground(false);
l->addWidget(m_d->m_welcomePage);
updateWelcomePage(WelcomePageData());
- connect(m_d->ui.gettingStartedButton, SIGNAL(clicked()), SIGNAL(requestHelp()));
+ m_d->btnGrp = new QButtonGroup(this);
+ m_d->btnGrp->addButton(m_d->ui.gettingStartedSectButton, 0);
+ m_d->btnGrp->addButton(m_d->ui.developSectButton, 1);
+ m_d->btnGrp->addButton(m_d->ui.communitySectButton, 2);
+
+ connect(m_d->btnGrp, SIGNAL(buttonClicked(int)), m_d->ui.stackedWidget, SLOT(setCurrentIndex(int)));
+
connect(m_d->ui.feedbackButton, SIGNAL(clicked()), SLOT(slotFeedback()));
connect(m_d->ui.restoreSessionButton, SIGNAL(clicked()), SLOT(slotRestoreLastSession()));
connect(m_d->ui.sessTreeWidget, SIGNAL(activated(QString)), SLOT(slotSessionClicked(QString)));
connect(m_d->ui.projTreeWidget, SIGNAL(activated(QString)), SLOT(slotProjectClicked(QString)));
+ connect(m_d->ui.newsTreeWidget, SIGNAL(activated(QString)), SLOT(slotUrlClicked(QString)));
+ connect(m_d->ui.sitesTreeWidget, SIGNAL(activated(QString)), SLOT(slotUrlClicked(QString)));
+ connect(m_d->ui.tutorialTreeWidget, SIGNAL(activated(QString)), SIGNAL(openHelpPage(const QString&)));
+
+ connect(m_d->rssFetcher, SIGNAL(newsItemReady(QString, QString)),
+ m_d->ui.newsTreeWidget, SLOT(slotAddItem(QString, QString)));
+
+ //: Add localized feed here only if one exists
+ m_d->rssFetcher->fetch(QUrl(tr("http://labs.trolltech.com/blogs/feed")));
+
+ m_d->ui.sitesTreeWidget->addItem(tr("Qt Software"), QLatin1String("http://www.qtsoftware.com"));
+ m_d->ui.sitesTreeWidget->addItem(tr("Qt Labs"), QLatin1String("http://labs.qtsoftware.com"));
+ m_d->ui.sitesTreeWidget->addItem(tr("Qt Git Hosting"), QLatin1String("http://qt.gitorious.org"));
+ m_d->ui.sitesTreeWidget->addItem(tr("Qt Centre"), QLatin1String("http://www.qtcentre.org"));
+ m_d->ui.sitesTreeWidget->addItem(tr("Qt/S60 at Forum Nokia"), QLatin1String("http://discussion.forum.nokia.com/forum/forumdisplay.php?f=196"));
+
+ m_d->ui.tutorialTreeWidget->addItem(tr("Qt Creator - A quick tour"),
+ QString("qthelp://com.nokia.qtcreator.%1%2/doc/index.html").arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR));
+ m_d->ui.tutorialTreeWidget->addItem(tr("Understanding widgets"),
+ QLatin1String("qthelp://com.trolltech.qt/qdoc/widgets-tutorial.html"));
+ m_d->ui.tutorialTreeWidget->addItem(tr("Creating an address book"),
+ QLatin1String("qthelp://com.trolltech.qt/qdoc/tutorials-addressbook.html"));
+ m_d->ui.tutorialTreeWidget->addItem(tr("Building with qmake"),
+ QLatin1String("qthelp://com.trolltech.qmake/qdoc/qmake-tutorial.html"));
+ m_d->ui.tutorialTreeWidget->addItem(tr("Writing test cases"),
+ QLatin1String("qthelp://com.trolltech.qt/qdoc/qtestlib-tutorial.html"));
+
+ m_d->ui.didYouKnowTextBrowser->setText(getTipOfTheDay());
+ QSettings *settings = ICore::instance()->settings();
+ int id = settings->value("General/WelcomeTab", 0).toInt();
+ m_d->btnGrp->button(id)->setChecked(true);
+ m_d->ui.stackedWidget->setCurrentIndex(id);
}
WelcomeMode::~WelcomeMode()
{
+ QSettings *settings = ICore::instance()->settings();
+ settings->setValue("General/WelcomeTab", m_d->btnGrp->checkedId());
delete m_d;
}
@@ -163,7 +215,8 @@ void WelcomeMode::updateWelcomePage(const WelcomePageData &welcomePageData)
m_d->ui.projTreeWidget->clear();
if (welcomePageData.sessionList.count() > 1) {
- foreach (const QString &s, welcomePageData.sessionList) {
+ // limit list to 7 displayed entries to avoid a scrollbar
+ foreach (const QString &s, welcomePageData.sessionList.mid(0, 6)) {
QString str = s;
if (s == welcomePageData.previousSession)
str = tr("%1 (last session)").arg(s);
@@ -176,7 +229,8 @@ void WelcomeMode::updateWelcomePage(const WelcomePageData &welcomePageData)
}
typedef QPair<QString, QString> QStringPair;
- foreach (const QStringPair &it, welcomePageData.projectList) {
+ // limit list to 8 displayed entries to avoid a scrollbar
+ foreach (const QStringPair &it, welcomePageData.projectList.mid(0, 7)) {
QTreeWidgetItem *item = m_d->ui.projTreeWidget->addItem(it.second, it.first);
const QFileInfo fi(it.first);
item->setToolTip(1, QDir::toNativeSeparators(fi.absolutePath()));
@@ -211,6 +265,11 @@ void WelcomeMode::slotProjectClicked(const QString &data)
activateEditMode();
}
+void WelcomeMode::slotUrlClicked(const QString &data)
+{
+ QDesktopServices::openUrl(QUrl(data));
+}
+
void WelcomeMode::slotRestoreLastSession()
{
emit requestSession(m_d->lastData.previousSession);
@@ -223,6 +282,27 @@ void WelcomeMode::slotFeedback()
"http://www.qtsoftware.com/forms/feedback-forms/qt-creator-user-feedback/view")));
}
+QString WelcomeMode::getTipOfTheDay()
+{
+ static QStringList tips;
+ if (tips.isEmpty()) {
+ tips.append(tr("You can switch between Qt Creator's modes using <tt>Ctrl+number</tt>:"
+ "<ol><li> - Welcome</li><li> - Edit</li><li>- Debug</li><li>- Projects</li><li>- Help</li>"
+ "<li></li><li>- Output</li></ol>"));
+ tips.append(tr("You can show and hide the side bar using <tt>Alt+0<tt>."));
+ tips.append(tr("You can fine tune the <tt>Find</tt> function by selecting "Whole Words" "
+ "or "Case Sensitive". Simply click on the icons on the right end of the line edit."));
+ tips.append(tr("If you add a <a href=\"qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html\""
+ ">external libraries</a>, Qt Creator will automatically offer syntax highlighting "
+ "and code completion."));
+ }
+
+ srand(QDateTime::currentDateTime().toTime_t());
+ return tips.at(rand()%tips.count());
+}
+
+
+
// --- WelcomeModeButton
WelcomeModeButton::WelcomeModeButton(QWidget *parent) :
@@ -303,6 +383,11 @@ QTreeWidgetItem *WelcomeModeTreeWidget::addItem(const QString &label, const QStr
return item;
}
+void WelcomeModeTreeWidget::slotAddItem(const QString &label, const QString &data)
+{
+ addTopLevelItem(addItem(label,data));
+}
+
void WelcomeModeTreeWidget::slotItemClicked(QTreeWidgetItem *item)
{
emit activated(item->data(0, Qt::UserRole).toString());
diff --git a/src/plugins/coreplugin/welcomemode.h b/src/plugins/coreplugin/welcomemode.h
index 52e009acca56fed9a7109c956ed11d53d7906c9d..ecdf2cbe50bce9b0200199bc96b689d133a815a9 100644
--- a/src/plugins/coreplugin/welcomemode.h
+++ b/src/plugins/coreplugin/welcomemode.h
@@ -78,16 +78,18 @@ public:
signals:
void requestProject(const QString &project);
void requestSession(const QString &session);
- void requestHelp();
+ void openHelpPage(const QString&);
private slots:
void slotFeedback();
void slotRestoreLastSession();
void slotSessionClicked(const QString &data);
void slotProjectClicked(const QString &data);
+ void slotUrlClicked(const QString &data);
private:
void activateEditMode();
+ QString getTipOfTheDay();
WelcomeModePrivate *m_d;
};
diff --git a/src/plugins/coreplugin/welcomemode.ui b/src/plugins/coreplugin/welcomemode.ui
index 7eca9942d1c5e4d0d0ae1377c74729df14ddd674..f477411bbdedbf9342f4916498ebd398dfa008b5 100644
--- a/src/plugins/coreplugin/welcomemode.ui
+++ b/src/plugins/coreplugin/welcomemode.ui
@@ -6,360 +6,545 @@
<rect>
<x>0</x>
<y>0</y>
- <width>777</width>
- <height>922</height>
+ <width>721</width>
+ <height>637</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="topLayout">
- <property name="spacing">
- <number>0</number>
- </property>
+ <property name="styleSheet">
+ <string>#Core--Internal--WelcomePage {
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255));
+}</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
<property name="margin">
<number>0</number>
</property>
- <item>
+ <item row="0" column="0">
<widget class="QWidget" name="gradientWidget" native="true">
<property name="styleSheet">
- <string notr="true">#gradientWidget {
- background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255));
-}
-
-*, * *, * * *, * * * *, * * * * * {
- font-family: Arial, Trebuchet, Lucida, sans-serif;
- font-size: 12px;
- color: #5e5e5e;
-}
-
-#recentSessionsFrame, #recentProjectsFrame {
- border-image: url(:/core/images/welcomemode/rc_combined.png) 8;
- border-width: 8;
-}
-</string>
+ <string>#gradientWidget {
+ background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255));
+}</string>
</property>
- <layout class="QGridLayout" name="gradientLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <property name="spacing">
- <number>0</number>
- </property>
+ <layout class="QGridLayout" name="gridLayout">
<item row="0" column="1">
- <layout class="QVBoxLayout" name="contentsLayout">
- <property name="spacing">
- <number>0</number>
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <item>
- <spacer name="topSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>50</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QHBoxLayout" name="welcomeLayout">
- <property name="spacing">
- <number>0</number>
- </property>
- <item>
- <widget class="QLabel" name="logoLabel">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="pixmap">
- <pixmap resource="core.qrc">:/core/images/welcomemode/product_logo.png</pixmap>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="logoSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="welcomeLabel">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>360</width>
- <height>0</height>
- </size>
- </property>
- <property name="text">
- <string><style>
-h1 {
- font-size: 24px;
- font-weight: normal;
- color: #4d4d4d;
- margin-top: 0px;
- margin-bottom: 20px;
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="0">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="1">
+ <widget class="QFrame" name="mainFrame">
+ <property name="minimumSize">
+ <size>
+ <width>662</width>
+ <height>515</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>662</width>
+ <height>515</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">#mainFrame {
+ border-image: url(:/core/images/welcomemode/background_center_frame.png) 4;
+ border-width: 4;
}
-
-p {
- margin-top: 0px;
- margin-bottom: 7px;
+</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QFrame" name="headerFrame">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>649</width>
+ <height>89</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>649</width>
+ <height>89</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string>#headerFrame {
+ border-image: url(:/core/images/welcomemode/center_frame_header.png) 0;
+ border-width: 0;
}
-</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"/>
</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="gettingStartedLayout">
- <item>
- <spacer name="gettingStartedSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>1</width>
- <height>1</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="Core::Internal::WelcomeModeButton" name="gettingStartedButton">
- <property name="styleSheet">
- <string>* {
- border-image: url(:/core/images/welcomemode/btn_27.png) 7;
- border-width: 7;
- padding: -2px 0;
- font-size: 12px;
- font-family: lucida sans, dejavu sans, sans serif;
- color: black;
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QFrame" name="navFrame">
+ <property name="autoFillBackground">
+ <bool>false</bool>
+ </property>
+ <property name="styleSheet">
+ <string>#navFrame QToolButton {
+ border: none;
+ font-size: 10pt;
+ color: grey;
}
-*:hover {
- border-image: url(:/core/images/welcomemode/btn_27_hover.png) 7;
- color: white;
+#navFrame QToolButton:hover {
+ color: black;
}
-</string>
+
+#navFrame QToolButton:checked {
+ color: black;
+ border-bottom: 1px solid palette(Text);
+}</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <property name="leftMargin">
+ <number>0</number>
</property>
- <property name="text">
- <string><qt>Getting Started &gt;&gt;</string>
+ <property name="rightMargin">
+ <number>0</number>
</property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="middelSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>1</width>
- <height>50</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QHBoxLayout" name="recentListsLayout">
- <property name="spacing">
- <number>0</number>
- </property>
- <item>
- <layout class="QVBoxLayout" name="recentSessionsLayout" stretch="0,1">
- <item>
- <widget class="QFrame" name="recentSessionsFrame">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QToolButton" name="gettingStartedSectButton">
+ <property name="text">
+ <string>Getting Started</string>
</property>
- <property name="minimumSize">
- <size>
- <width>270</width>
- <height>130</height>
- </size>
+ <property name="checkable">
+ <bool>true</bool>
</property>
- <property name="maximumSize">
- <size>
- <width>270</width>
- <height>16777215</height>
- </size>
+ <property name="autoExclusive">
+ <bool>false</bool>
</property>
- <property name="styleSheet">
- <string>#recentSessionsFrame {
- border-image: url(:/core/images/welcomemode/rc_combined.png) 8;
- border-width: 8;
-}
-</string>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QToolButton" name="developSectButton">
+ <property name="text">
+ <string>Develop</string>
</property>
- <layout class="QGridLayout" name="recentSessionsFrameLayout">
- <property name="leftMargin">
- <number>4</number>
- </property>
- <property name="topMargin">
- <number>4</number>
- </property>
- <property name="rightMargin">
- <number>12</number>
- </property>
- <property name="bottomMargin">
- <number>2</number>
- </property>
- <property name="horizontalSpacing">
- <number>11</number>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="iconLabel">
- <property name="pixmap">
- <pixmap resource="core.qrc">:/core/images/welcomemode/mode_project.png</pixmap>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- </widget>
- </item>
- <item row="0" column="1" colspan="2">
- <widget class="QLabel" name="titleLabel">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="autoExclusive">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QToolButton" name="communitySectButton">
+ <property name="text">
+ <string>Community</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QStackedWidget" name="stackedWidget">
+ <property name="currentIndex">
+ <number>2</number>
+ </property>
+ <widget class="QWidget" name="page">
+ <widget class="QFrame" name="recentProjectsFrame_2">
+ <property name="geometry">
+ <rect>
+ <x>30</x>
+ <y>20</y>
+ <width>270</width>
+ <height>290</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>400</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string/>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_6">
+ <item row="0" column="0">
+ <widget class="QLabel" name="projTitleLabel_2">
+ <property name="text">
+ <string notr="true"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; color:#555555;">Tutorials</span></p>
+<hr /></body></html></string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="Core::Internal::WelcomeModeTreeWidget" name="tutorialTreeWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::NoFocus</enum>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::NoSelection</enum>
+ </property>
+ <property name="verticalScrollMode">
+ <enum>QAbstractItemView::ScrollPerPixel</enum>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="uniformRowHeights">
+ <bool>true</bool>
+ </property>
+ <property name="allColumnsShowFocus">
+ <bool>true</bool>
+ </property>
+ <property name="columnCount">
+ <number>2</number>
+ </property>
+ <attribute name="headerVisible">
+ <bool>false</bool>
+ </attribute>
+ <attribute name="headerDefaultSectionSize">
+ <number>24</number>
+ </attribute>
+ <attribute name="headerMinimumSectionSize">
+ <number>0</number>
+ </attribute>
+ <column>
<property name="text">
- <string notr="true"><style>
-h2 {
- font-size: 18px;
- font-weight: normal;
- color: #7c92a1;
- margin-bottom: 0px;
-}
-</style>
-
-<h2>Recent Sessions</h2>
-<hr/>
-</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2">
- <widget class="Core::Internal::WelcomeModeTreeWidget" name="sessTreeWidget">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="focusPolicy">
- <enum>Qt::NoFocus</enum>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="selectionMode">
- <enum>QAbstractItemView::NoSelection</enum>
- </property>
- <property name="verticalScrollMode">
- <enum>QAbstractItemView::ScrollPerPixel</enum>
+ <string notr="true">1</string>
</property>
- <property name="rootIsDecorated">
- <bool>false</bool>
- </property>
- <property name="uniformRowHeights">
- <bool>true</bool>
- </property>
- <property name="allColumnsShowFocus">
- <bool>true</bool>
- </property>
- <property name="columnCount">
- <number>2</number>
- </property>
- <attribute name="headerVisible">
- <bool>false</bool>
- </attribute>
- <attribute name="headerDefaultSectionSize">
- <number>24</number>
- </attribute>
- <attribute name="headerMinimumSectionSize">
- <number>0</number>
- </attribute>
- <column>
- <property name="text">
- <string notr="true">1</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string notr="true">2</string>
- </property>
- </column>
- </widget>
- </item>
- <item row="2" column="0">
- <spacer name="restoreButtonVerticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>5</width>
- <height>1</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="2">
- <widget class="Core::Internal::WelcomeModeButton" name="restoreSessionButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ </column>
+ <column>
+ <property name="text">
+ <string notr="true">2</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QFrame" name="recentProjectsFrame_3">
+ <property name="geometry">
+ <rect>
+ <x>350</x>
+ <y>119</y>
+ <width>274</width>
+ <height>191</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>400</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string/>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_7">
+ <item row="0" column="0">
+ <widget class="QLabel" name="projTitleLabel_3">
+ <property name="text">
+ <string notr="true"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; color:#555555;">Did you know?</span></p>
+<hr /></body></html></string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QTextBrowser" name="didYouKnowTextBrowser">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="verticalScrollBarPolicy">
+ <enum>Qt::ScrollBarAlwaysOff</enum>
+ </property>
+ <property name="horizontalScrollBarPolicy">
+ <enum>Qt::ScrollBarAlwaysOff</enum>
+ </property>
+ <property name="openExternalLinks">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QFrame" name="recentProjectsFrame_4">
+ <property name="geometry">
+ <rect>
+ <x>350</x>
+ <y>20</y>
+ <width>271</width>
+ <height>83</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>400</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string/>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_8">
+ <item row="0" column="0" colspan="3">
+ <widget class="QLabel" name="projTitleLabel_4">
+ <property name="text">
+ <string notr="true"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; color:#555555;">Explore Demos and Examples</span></p>
+<hr /></body></html></string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QComboBox" name="comboBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QToolButton" name="toolButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Open</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ <widget class="QWidget" name="page_2">
+ <widget class="QFrame" name="recentSessionsFrame">
+ <property name="geometry">
+ <rect>
+ <x>30</x>
+ <y>20</y>
+ <width>270</width>
+ <height>291</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>270</width>
+ <height>130</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>270</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string/>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0" colspan="2">
+ <widget class="QLabel" name="titleLabel">
+ <property name="text">
+ <string notr="true"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; color:#555555;">Sessions</span></p>
+<hr /></body></html></string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <widget class="Core::Internal::WelcomeModeTreeWidget" name="sessTreeWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::NoFocus</enum>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::NoSelection</enum>
+ </property>
+ <property name="verticalScrollMode">
+ <enum>QAbstractItemView::ScrollPerPixel</enum>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="uniformRowHeights">
+ <bool>true</bool>
+ </property>
+ <property name="allColumnsShowFocus">
+ <bool>true</bool>
+ </property>
+ <property name="columnCount">
+ <number>2</number>
+ </property>
+ <attribute name="headerVisible">
+ <bool>false</bool>
+ </attribute>
+ <attribute name="headerDefaultSectionSize">
+ <number>24</number>
+ </attribute>
+ <attribute name="headerMinimumSectionSize">
+ <number>0</number>
+ </attribute>
+ <column>
+ <property name="text">
+ <string notr="true">1</string>
</property>
- <property name="styleSheet">
- <string>* {
+ </column>
+ <column>
+ <property name="text">
+ <string notr="true">2</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="Core::Internal::WelcomeModeButton" name="restoreSessionButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="styleSheet">
+ <string>* {
border-image: url(:/core/images/welcomemode/btn_26.png) 7;
border-width: 7;
padding: -2px 0;
@@ -373,362 +558,359 @@ h2 {
color: white;
}
</string>
- </property>
+ </property>
+ <property name="text">
+ <string><qt>Restore Last Session &gt;&gt;</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>89</width>
+ <height>22</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QFrame" name="recentProjectsFrame">
+ <property name="geometry">
+ <rect>
+ <x>350</x>
+ <y>20</y>
+ <width>270</width>
+ <height>291</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>270</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string/>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_5">
+ <item row="0" column="0">
+ <widget class="QLabel" name="projTitleLabel">
+ <property name="text">
+ <string notr="true"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; color:#555555;">Projects</span></p>
+<hr /></body></html></string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="Core::Internal::WelcomeModeTreeWidget" name="projTreeWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::NoFocus</enum>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::NoSelection</enum>
+ </property>
+ <property name="verticalScrollMode">
+ <enum>QAbstractItemView::ScrollPerPixel</enum>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="uniformRowHeights">
+ <bool>true</bool>
+ </property>
+ <property name="allColumnsShowFocus">
+ <bool>true</bool>
+ </property>
+ <property name="columnCount">
+ <number>2</number>
+ </property>
+ <attribute name="headerVisible">
+ <bool>false</bool>
+ </attribute>
+ <attribute name="headerDefaultSectionSize">
+ <number>24</number>
+ </attribute>
+ <attribute name="headerMinimumSectionSize">
+ <number>0</number>
+ </attribute>
+ <column>
<property name="text">
- <string><qt>Restore Last Session &gt;&gt;</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <spacer name="restoreButtonSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <string notr="true">1</string>
</property>
- <property name="sizeType">
- <enum>QSizePolicy::Ignored</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>1</width>
- <height>1</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer name="sessionsSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="recentListsSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QVBoxLayout" name="recentProjectsLayout">
- <item>
- <widget class="QFrame" name="recentProjectsFrame">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>270</width>
- <height>16777215</height>
- </size>
- </property>
- <layout class="QGridLayout" name="recentProjectsFrameLayout">
- <property name="leftMargin">
- <number>4</number>
- </property>
- <property name="topMargin">
- <number>4</number>
- </property>
- <property name="rightMargin">
- <number>12</number>
- </property>
- <property name="bottomMargin">
- <number>2</number>
- </property>
- <property name="horizontalSpacing">
- <number>11</number>
- </property>
- <property name="verticalSpacing">
- <number>-1</number>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="projIconLabel">
- <property name="pixmap">
- <pixmap resource="core.qrc">:/core/images/welcomemode/mode_project.png</pixmap>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="projTitleLabel">
+ </column>
+ <column>
<property name="text">
- <string notr="true"><style>
-h2 {
- font-size: 18px;
- font-weight: normal;
- color: #7c92a1;
- margin-bottom: 0px;
-}
-</style>
-
-<h2>Recent Projects</h2>
-<hr/>
-</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="Core::Internal::WelcomeModeTreeWidget" name="projTreeWidget">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <string notr="true">2</string>
</property>
- <property name="focusPolicy">
- <enum>Qt::NoFocus</enum>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="selectionMode">
- <enum>QAbstractItemView::NoSelection</enum>
- </property>
- <property name="verticalScrollMode">
- <enum>QAbstractItemView::ScrollPerPixel</enum>
- </property>
- <property name="rootIsDecorated">
- <bool>false</bool>
- </property>
- <property name="uniformRowHeights">
- <bool>true</bool>
+ </column>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ <widget class="QWidget" name="Seite">
+ <widget class="QFrame" name="frame">
+ <property name="geometry">
+ <rect>
+ <x>30</x>
+ <y>20</y>
+ <width>330</width>
+ <height>291</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QLabel" name="titleLabel_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string notr="true"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; color:#555555;">News from the Qt Labs</span></p>
+<hr /></body></html></string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Core::Internal::WelcomeModeTreeWidget" name="newsTreeWidget">
+ <property name="minimumSize">
+ <size>
+ <width>280</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::NoFocus</enum>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::NoSelection</enum>
+ </property>
+ <property name="verticalScrollMode">
+ <enum>QAbstractItemView::ScrollPerPixel</enum>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="uniformRowHeights">
+ <bool>true</bool>
+ </property>
+ <property name="allColumnsShowFocus">
+ <bool>true</bool>
+ </property>
+ <property name="columnCount">
+ <number>2</number>
+ </property>
+ <attribute name="headerVisible">
+ <bool>false</bool>
+ </attribute>
+ <attribute name="headerDefaultSectionSize">
+ <number>24</number>
+ </attribute>
+ <attribute name="headerMinimumSectionSize">
+ <number>0</number>
+ </attribute>
+ <column>
+ <property name="text">
+ <string notr="true">1</string>
</property>
- <property name="allColumnsShowFocus">
- <bool>true</bool>
+ </column>
+ <column>
+ <property name="text">
+ <string notr="true">2</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QFrame" name="frame_2">
+ <property name="geometry">
+ <rect>
+ <x>400</x>
+ <y>20</y>
+ <width>220</width>
+ <height>290</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QLabel" name="titleLabel_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string notr="true"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; color:#555555;">Qt Websites</span></p>
+<hr /></body></html></string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Core::Internal::WelcomeModeTreeWidget" name="sitesTreeWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::NoFocus</enum>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::NoSelection</enum>
+ </property>
+ <property name="verticalScrollMode">
+ <enum>QAbstractItemView::ScrollPerPixel</enum>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="uniformRowHeights">
+ <bool>true</bool>
+ </property>
+ <property name="allColumnsShowFocus">
+ <bool>true</bool>
+ </property>
+ <property name="columnCount">
+ <number>2</number>
+ </property>
+ <attribute name="headerVisible">
+ <bool>false</bool>
+ </attribute>
+ <attribute name="headerDefaultSectionSize">
+ <number>24</number>
+ </attribute>
+ <attribute name="headerMinimumSectionSize">
+ <number>0</number>
+ </attribute>
+ <column>
+ <property name="text">
+ <string notr="true">1</string>
</property>
- <property name="columnCount">
- <number>2</number>
+ </column>
+ <column>
+ <property name="text">
+ <string notr="true">2</string>
</property>
- <attribute name="headerVisible">
- <bool>false</bool>
- </attribute>
- <attribute name="headerDefaultSectionSize">
- <number>24</number>
- </attribute>
- <attribute name="headerMinimumSectionSize">
- <number>0</number>
- </attribute>
- <column>
- <property name="text">
- <string notr="true">1</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string notr="true">2</string>
- </property>
- </column>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer name="projectsSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- <item row="0" column="0">
- <spacer name="leftSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>1</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="2">
- <spacer name="rightSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>1</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="0" colspan="3">
- <layout class="QGridLayout" name="logosLayout">
- <property name="sizeConstraint">
- <enum>QLayout::SetDefaultConstraint</enum>
- </property>
- <property name="leftMargin">
- <number>15</number>
- </property>
- <property name="rightMargin">
- <number>15</number>
- </property>
- <property name="bottomMargin">
- <number>12</number>
- </property>
- <property name="spacing">
- <number>0</number>
- </property>
- <item row="0" column="0" rowspan="2">
- <widget class="QLabel" name="qtLogoLabel">
- <property name="text">
- <string/>
- </property>
- <property name="pixmap">
- <pixmap resource="core.qrc">:/core/images/welcomemode/qt_logo.png</pixmap>
- </property>
- </widget>
- </item>
- <item row="0" column="1" rowspan="2">
- <spacer name="logosSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>100</width>
- <height>1</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="3">
- <widget class="QLabel" name="nokiaLogoLabel">
- <property name="text">
- <string/>
- </property>
- <property name="pixmap">
- <pixmap resource="core.qrc">:/core/images/welcomemode/nokia_logo.png</pixmap>
- </property>
- </widget>
- </item>
- <item row="0" column="3">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Ignored</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>1</width>
- <height>1</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="1" column="1">
- <spacer name="bottomSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>100</width>
- <height>12</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QWidget" name="bottomWidget" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>31</height>
- </size>
- </property>
- <property name="autoFillBackground">
- <bool>false</bool>
- </property>
- <property name="styleSheet">
- <string>#bottomWidget {
- background-image: url(:/core/images/welcomemode/feedback-bar-background.png);
-}
-</string>
- </property>
- <layout class="QGridLayout" name="bottomLayout">
- <property name="leftMargin">
- <number>10</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <property name="horizontalSpacing">
- <number>10</number>
- </property>
- <property name="verticalSpacing">
- <number>0</number>
- </property>
- <item row="1" column="1">
- <widget class="Core::Internal::WelcomeModeButton" name="feedbackButton">
- <property name="styleSheet">
- <string>* {
+ </column>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="rightMargin">
+ <number>15</number>
+ </property>
+ <property name="bottomMargin">
+ <number>17</number>
+ </property>
+ <item>
+ <spacer name="horizontalSpacer_5">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="helpUsLabel">
+ <property name="text">
+ <string>Help us make Qt Creator even better</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_6">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>6</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="Core::Internal::WelcomeModeButton" name="feedbackButton">
+ <property name="styleSheet">
+ <string>* {
border-image: url(:/core/images/welcomemode/btn_26.png) 7;
border-width: 7;
padding: -2px 2px;
@@ -741,64 +923,43 @@ h2 {
color: white;
}
</string>
- </property>
- <property name="text">
- <string><qt>Feedback&nbsp;&nbsp;<img src=":/core/images/welcomemode/feedback_arrow.png" /></string>
- </property>
+ </property>
+ <property name="text">
+ <string><qt>Feedback&nbsp;&nbsp;<img src=":/core/images/welcomemode/feedback_arrow.png" /></string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
</item>
<item row="1" column="2">
- <spacer name="feedbackSpacer">
+ <spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>1</width>
- <height>1</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="1">
- <spacer name="bottomTopSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>1</width>
- <height>1</height>
+ <width>0</width>
+ <height>0</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1">
- <spacer name="bottomBottomSpacer">
+ <spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
<property name="sizeHint" stdset="0">
<size>
- <width>1</width>
- <height>1</height>
+ <width>0</width>
+ <height>0</height>
</size>
</property>
</spacer>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="helpUsLabel">
- <property name="text">
- <string>Help us make Qt Creator even better</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -816,8 +977,6 @@ h2 {
<header>welcomemode_p.h</header>
</customwidget>
</customwidgets>
- <resources>
- <include location="core.qrc"/>
- </resources>
+ <resources/>
<connections/>
</ui>
diff --git a/src/plugins/coreplugin/welcomemode_p.h b/src/plugins/coreplugin/welcomemode_p.h
index 49e4642da23978be882e5458789f8ce22de660ba..929f9bd8212126a1b280d336c04dc235c726a284 100644
--- a/src/plugins/coreplugin/welcomemode_p.h
+++ b/src/plugins/coreplugin/welcomemode_p.h
@@ -68,6 +68,9 @@ public:
WelcomeModeTreeWidget(QWidget *parent = 0);
QTreeWidgetItem *addItem(const QString &label, const QString &data);
+public slots:
+ void slotAddItem(const QString &label, const QString &data);
+
signals:
void activated(const QString &data);
diff --git a/src/plugins/cpaster/cpaster.pro b/src/plugins/cpaster/cpaster.pro
index d75a91de5a16da9099b68c3d18bd47d1f869e240..e12ba9845fe540d496059b1b659f5ad6dfe2c889 100644
--- a/src/plugins/cpaster/cpaster.pro
+++ b/src/plugins/cpaster/cpaster.pro
@@ -2,7 +2,7 @@ QT += network
TEMPLATE = lib
TARGET = CodePaster
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(cpaster_dependencies.pri)
HEADERS += cpasterplugin.h \
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index a752a04de3d19d4884254eb331bcfdbfbc0cc805..6af357ca8057c24a39b3f384969fe4e3728a9ae0 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -204,7 +204,7 @@ void CodepasterPlugin::fetch()
}
m_fetcher = new CustomFetcher(serverUrl());
- QDialog dialog;
+ QDialog dialog(ICore::instance()->mainWindow());
Ui_PasteSelectDialog ui;
ui.setupUi(&dialog);
diff --git a/src/plugins/cpaster/pasteselect.ui b/src/plugins/cpaster/pasteselect.ui
index 6906f135b77bb47bb852383a13747dbb10e0a9f6..6c5f99ceeec4b737f7e5c4943c12e8a9c44f0b0a 100644
--- a/src/plugins/cpaster/pasteselect.ui
+++ b/src/plugins/cpaster/pasteselect.ui
@@ -16,9 +16,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="windowTitle">
- <string>Dialog</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
diff --git a/src/plugins/cpaster/settingspage.ui b/src/plugins/cpaster/settingspage.ui
index 0a085c75bcd58dc0719eaa402ae2d5c508505cad..dc0708205c5754a91e9e1f4b39ffc41cb79b925e 100644
--- a/src/plugins/cpaster/settingspage.ui
+++ b/src/plugins/cpaster/settingspage.ui
@@ -10,9 +10,6 @@
<height>258</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
diff --git a/src/plugins/cppeditor/CppEditor.qwp b/src/plugins/cppeditor/CppEditor.qwp
index 6b921e9d07bdf1c3bb6f9b77461089625e8a922e..15822123dc015409d2580203963e75bd1f196f25 100644
--- a/src/plugins/cppeditor/CppEditor.qwp
+++ b/src/plugins/cppeditor/CppEditor.qwp
@@ -1,4 +1,4 @@
-<!DOCTYPE QtWorkbenchManifest>
+<!DOCTYPE QtCreatorManifest>
<qwp>
<pluginName>CppEditor</pluginName>
<author>Trolltech</author>
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index cc28c720e91478e3b0ce644e3620970717400e4d..c746aead41158f503b5f62a77ee34ddaf1767106 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -33,6 +33,7 @@
#include "cpphighlighter.h"
#include <AST.h>
+#include <Control.h>
#include <Token.h>
#include <Scope.h>
#include <Symbols.h>
@@ -40,8 +41,10 @@
#include <Control.h>
#include <CoreTypes.h>
#include <Literals.h>
+#include <PrettyPrinter.h>
#include <Semantic.h>
#include <SymbolVisitor.h>
+#include <TranslationUnit.h>
#include <cplusplus/ExpressionUnderCursor.h>
#include <cplusplus/LookupContext.h>
#include <cplusplus/Overview.h>
@@ -77,6 +80,8 @@
#include <QtGui/QTreeView>
#include <QtGui/QSortFilterProxyModel>
+#include <sstream>
+
using namespace CPlusPlus;
using namespace CppEditor::Internal;
@@ -377,6 +382,34 @@ void CPPEditor::onDocumentUpdated(Document::Ptr doc)
updateMethodBoxIndex();
}
+void CPPEditor::reformatDocument()
+{
+ using namespace CPlusPlus;
+
+ QByteArray source = toPlainText().toUtf8();
+
+ Control control;
+ StringLiteral *fileId = control.findOrInsertFileName("<file>");
+ TranslationUnit unit(&control, fileId);
+ unit.setQtMocRunEnabled(true);
+ unit.setSource(source.constData(), source.length());
+ unit.parse();
+ if (! unit.ast())
+ return;
+
+ std::ostringstream s;
+
+ TranslationUnitAST *ast = unit.ast()->asTranslationUnit();
+ PrettyPrinter pp(&control, s);
+ pp(ast, source);
+
+ const std::string str = s.str();
+ QTextCursor c = textCursor();
+ c.setPosition(0);
+ c.movePosition(QTextCursor::End, QTextCursor::KeepAnchor);
+ c.insertText(QString::fromUtf8(str.c_str(), str.length()));
+}
+
void CPPEditor::updateFileName()
{ }
@@ -856,6 +889,10 @@ void CPPEditor::contextMenuEvent(QContextMenuEvent *e)
foreach (QAction *action, contextMenu->actions())
menu->addAction(action);
+ QAction *reformatDocument = new QAction(tr("Reformat Document"), menu);
+ connect(reformatDocument, SIGNAL(triggered()), this, SLOT(reformatDocument()));
+ menu->addAction(reformatDocument);
+
menu->exec(e->globalPos());
delete menu;
}
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index efae361e0e62b79070839d2c59e34f42a7516c51..bd76281894f4b25d2cc1bdbf29595170b0aff3cb 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -96,6 +96,7 @@ public slots:
void deleteStartOfToken();
void deleteEndOfToken();
+
protected:
void contextMenuEvent(QContextMenuEvent *);
void mouseMoveEvent(QMouseEvent *);
@@ -114,6 +115,7 @@ private slots:
void updateMethodBoxIndex();
void updateMethodBoxToolTip();
void onDocumentUpdated(CPlusPlus::Document::Ptr doc);
+ void reformatDocument();
private:
bool sortedMethodOverview() const;
diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro
index 64ee6631957b7fad38bde663305a48c8962e74f1..7f3a043ea03fc3a1273f98fde6e19be6d29e2cbc 100644
--- a/src/plugins/cppeditor/cppeditor.pro
+++ b/src/plugins/cppeditor/cppeditor.pro
@@ -4,7 +4,7 @@ DEFINES += CPPEDITOR_LIBRARY
CONFIG += help
include(../../libs/utils/utils.pri)
include(../../shared/indenter/indenter.pri)
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(cppeditor_dependencies.pri)
HEADERS += cppplugin.h \
cppeditor.h \
diff --git a/src/plugins/cpptools/completionsettingspage.ui b/src/plugins/cpptools/completionsettingspage.ui
index a044376bc74ed7034b3bbfdf94492c1fd905f9b8..8a0d8315f824ea2f3e2cfba672fe2fedeafbe588 100644
--- a/src/plugins/cpptools/completionsettingspage.ui
+++ b/src/plugins/cpptools/completionsettingspage.ui
@@ -10,9 +10,6 @@
<height>300</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox">
diff --git a/src/plugins/cpptools/cppfilesettingspage.ui b/src/plugins/cpptools/cppfilesettingspage.ui
index f5005ecacb03f2c8c807bef6afca55ef8359f0c3..f4cf62506f042896cb45084ad9a6dd66a787d09e 100644
--- a/src/plugins/cpptools/cppfilesettingspage.ui
+++ b/src/plugins/cpptools/cppfilesettingspage.ui
@@ -10,9 +10,6 @@
<height>503</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index a91864370bf1cbd43c4a311a4c615ed14b307e6f..0967cfdd0926140339acde34b0e5a1ffaf2c052b 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -528,7 +528,7 @@ Document::Ptr CppPreprocessor::switchDocument(Document::Ptr doc)
for each project and all related CppCodeModelPart instances.
It also takes care of updating the code models when C++ files are
- modified within Workbench.
+ modified within Qt Creator.
*/
CppModelManager::CppModelManager(QObject *parent)
@@ -648,6 +648,16 @@ QByteArray CppModelManager::internalDefinedMacros() const
return macros;
}
+void CppModelManager::addEditorSupport(AbstractEditorSupport *editorSupport)
+{
+ m_addtionalEditorSupport.insert(editorSupport);
+}
+
+void CppModelManager::removeEditorSupport(AbstractEditorSupport *editorSupport)
+{
+ m_addtionalEditorSupport.remove(editorSupport);
+}
+
QMap<QString, QByteArray> CppModelManager::buildWorkingCopyList()
{
QMap<QString, QByteArray> workingCopy;
@@ -660,6 +670,12 @@ QMap<QString, QByteArray> CppModelManager::buildWorkingCopyList()
workingCopy[fileName] = editorSupport->contents();
}
+ QSetIterator<AbstractEditorSupport *> jt(m_addtionalEditorSupport);
+ while (jt.hasNext()) {
+ AbstractEditorSupport *es = jt.next();
+ workingCopy[es->fileName()] = es->contents();
+ }
+
// add the project configuration file
QByteArray conf(pp_configuration);
conf += definedMacros();
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h
index 9f2c2f221e21d1d9db66eca904f68866d4da521a..30569890e2ebdf4ff8fbed0126509c172d470465 100644
--- a/src/plugins/cpptools/cppmodelmanager.h
+++ b/src/plugins/cpptools/cppmodelmanager.h
@@ -91,6 +91,9 @@ public:
void stopEditorSelectionsUpdate()
{ m_updateEditorSelectionsTimer->stop(); }
+ virtual void addEditorSupport(AbstractEditorSupport *editorSupport);
+ virtual void removeEditorSupport(AbstractEditorSupport *editorSupport);
+
Q_SIGNALS:
void projectPathChanged(const QString &projectPath);
@@ -161,6 +164,8 @@ private:
// editor integration
QMap<TextEditor::ITextEditor *, CppEditorSupport *> m_editorSupport;
+ QSet<AbstractEditorSupport *> m_addtionalEditorSupport;
+
// project integration
QMap<ProjectExplorer::Project *, ProjectInfo> m_projects;
diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.h b/src/plugins/cpptools/cppmodelmanagerinterface.h
index b3da1aa03c70a6268959f413f59a43539947a725..bb926905d09351455c5f17172220bf70af629970 100644
--- a/src/plugins/cpptools/cppmodelmanagerinterface.h
+++ b/src/plugins/cpptools/cppmodelmanagerinterface.h
@@ -41,6 +41,8 @@ namespace ProjectExplorer {
}
namespace CppTools {
+
+class AbstractEditorSupport;
class CPPTOOLS_EXPORT CppModelManagerInterface : public QObject
{
@@ -87,6 +89,25 @@ public:
virtual QList<ProjectInfo> projectInfos() const = 0;
virtual ProjectInfo projectInfo(ProjectExplorer::Project *project) const = 0;
virtual void updateProjectInfo(const ProjectInfo &pinfo) = 0;
+
+ virtual void addEditorSupport(AbstractEditorSupport *editorSupport) = 0;
+ virtual void removeEditorSupport(AbstractEditorSupport *editorSupport) = 0;
+};
+
+class CPPTOOLS_EXPORT AbstractEditorSupport
+{
+public:
+ AbstractEditorSupport(CppModelManagerInterface *modelmanager)
+ : m_modelmanager(modelmanager) {}
+ virtual ~AbstractEditorSupport() {}
+ virtual QByteArray contents() const = 0;
+ virtual QString fileName() const = 0;
+
+ void updateDocument()
+ { m_modelmanager->updateSourceFiles(QStringList() << fileName()); }
+
+private:
+ CppModelManagerInterface *m_modelmanager;
};
} // namespace CppTools
diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro
index 5a5763f6af4f3ac43836dcfcd24bbcaa198823d9..d6d24e0f8389d8ebc5676f5f2dc63f80419f5bbc 100644
--- a/src/plugins/cpptools/cpptools.pro
+++ b/src/plugins/cpptools/cpptools.pro
@@ -1,6 +1,6 @@
TEMPLATE = lib
TARGET = CppTools
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(../../plugins/quickopen/quickopen.pri)
include(cpptools_dependencies.pri)
diff --git a/src/plugins/debugger/attachtcfdialog.ui b/src/plugins/debugger/attachtcfdialog.ui
new file mode 100644
index 0000000000000000000000000000000000000000..a7ccaf03b4d012ba41385c5c16b7f1b955696700
--- /dev/null
+++ b/src/plugins/debugger/attachtcfdialog.ui
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AttachTcfDialog</class>
+ <widget class="QDialog" name="AttachTcfDialog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>310</width>
+ <height>224</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Start Debugger</string>
+ </property>
+ <layout class="QVBoxLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>9</number>
+ </property>
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::ExpandingFieldsGrow</enum>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="channelLabel">
+ <property name="text">
+ <string>Host and port:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="channelLineEdit">
+ <property name="text">
+ <string notr="true">localhost:5115</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="architectureLabel">
+ <property name="text">
+ <string>Architecture:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="architectureComboBox"/>
+ </item>
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="useServerStartScriptCheckBox"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="useServerStartScriptLabel">
+ <property name="text">
+ <string>Use server start script:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="Core::Utils::PathChooser" name="serverStartScript" native="true"/>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="serverStartScriptLabel">
+ <property name="text">
+ <string>Server start script:</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>Core::Utils::PathChooser</class>
+ <extends>QWidget</extends>
+ <header location="global">utils/pathchooser.h</header>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/plugins/debugger/breakcondition.ui b/src/plugins/debugger/breakcondition.ui
index 4de45fd29dac84e3176cee59fa9de02b08193795..f5b5b0819d3c15ece4bc8aa8e04936d8a9f1475c 100644
--- a/src/plugins/debugger/breakcondition.ui
+++ b/src/plugins/debugger/breakcondition.ui
@@ -10,9 +10,6 @@
<height>142</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Dialog</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 7629b0ff087ccadcc4d65c7d5ebc616b20c57512..ac7d5303925ac50df1ef4cbe697f2ccc10c36472 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -34,6 +34,7 @@
#include <utils/qtcassert.h>
#include <QtCore/QDebug>
+#include <QtCore/QTextStream>
#include <QtCore/QFileInfo>
using namespace Debugger;
@@ -154,6 +155,13 @@ BreakpointData::BreakpointData(BreakHandler *handler)
marker = 0;
markerLineNumber = 0;
bpMultiple = false;
+//#if defined(Q_OS_MAC)
+// // full names do not work on Mac/MI
+ useFullPath = false;
+//#else
+// //where = m_manager->shortName(data->fileName);
+// useFullPath = true;
+//#endif
}
BreakpointData::~BreakpointData()
@@ -184,23 +192,25 @@ void BreakpointData::updateMarker()
QString BreakpointData::toToolTip() const
{
- QString str;
- str += "<table>";
- str += "<tr><td>Marker File:</td><td>" + markerFileName + "</td></tr>";
- str += "<tr><td>Marker Line:</td><td>" + QString::number(markerLineNumber) + "</td></tr>";
- str += "<tr><td>BP Number:</td><td>" + bpNumber + "</td></tr>";
- str += "<tr><td>BP Address:</td><td>" + bpAddress + "</td></tr>";
- str += "<tr><td>----------</td><td></td><td></td></tr>";
- str += "<tr><td>Property:</td><td>Wanted:</td><td>Actual:</td></tr>";
- str += "<tr><td></td><td></td><td></td></tr>";
- str += "<tr><td>Internal Number:</td><td>-</td><td>" + bpNumber + "</td></tr>";
- str += "<tr><td>File Name:</td><td>" + fileName + "</td><td>" + bpFileName + "</td></tr>";
- str += "<tr><td>Function Name:</td><td>" + funcName + "</td><td>" + bpFuncName + "</td></tr>";
- str += "<tr><td>Line Number:</td><td>" + lineNumber + "</td><td>" + bpLineNumber + "</td></tr>";
- str += "<tr><td>Condition:</td><td>" + condition + "</td><td>" + bpCondition + "</td></tr>";
- str += "<tr><td>Ignore count:</td><td>" + ignoreCount + "</td><td>" + bpIgnoreCount + "</td></tr>";
- str += "</table>";
- return str;
+ QString rc;
+ QTextStream str(&rc);
+ str << "<html><body><table>";
+ str << "<tr><td>" << BreakHandler::tr("Marker File:") << "</td><td>" << markerFileName << "</td></tr>";
+ str << "<tr><td>" << BreakHandler::tr("Marker Line:") << "</td><td>" << markerLineNumber << "</td></tr>";
+ str << "<tr><td>" << BreakHandler::tr("Breakpoint Number:") << "</td><td>" << bpNumber << "</td></tr>";
+ str << "<tr><td>" << BreakHandler::tr("Breakpoint Address:") << "</td><td>" << bpAddress << "</td></tr>";
+ str << "</table><br><hr><table>";
+ str << "<tr><th>" << BreakHandler::tr("Property")
+ << "</th><th>" << BreakHandler::tr("Requested")
+ << "</th><th>" << BreakHandler::tr("Obtained") << "</th></tr>";
+ str << "<tr><td>" << BreakHandler::tr("Internal Number:") << "</td><td>—</td><td>" << bpNumber << "</td></tr>";
+ str << "<tr><td>" << BreakHandler::tr("File Name:") << "</td><td>" << fileName << "</td><td>" << bpFileName << "</td></tr>";
+ str << "<tr><td>" << BreakHandler::tr("Function Name:") << "</td><td>" << funcName << "</td><td>" << bpFuncName << "</td></tr>";
+ str << "<tr><td>" << BreakHandler::tr("Line Number:") << "</td><td>" << lineNumber << "</td><td>" << bpLineNumber << "</td></tr>";
+ str << "<tr><td>" << BreakHandler::tr("Condition:") << "</td><td>" << condition << "</td><td>" << bpCondition << "</td></tr>";
+ str << "<tr><td>" << BreakHandler::tr("Ignore Count:") << "</td><td>" << ignoreCount << "</td><td>" << bpIgnoreCount << "</td></tr>";
+ str << "</table></body></html>";
+ return rc;
}
bool BreakpointData::isLocatedAt(const QString &fileName_, int lineNumber_) const
@@ -326,6 +336,8 @@ void BreakHandler::saveBreakpoints()
map["ignorecount"] = data->ignoreCount;
if (!data->enabled)
map["disabled"] = "1";
+ if (data->useFullPath)
+ map["usefullpath"] = "1";
list.append(map);
}
setSessionValueRequested("Breakpoints", list);
@@ -347,6 +359,7 @@ void BreakHandler::loadBreakpoints()
data->ignoreCount = map["ignorecount"].toString();
data->funcName = map["funcname"].toString();
data->enabled = !map["disabled"].toInt();
+ data->useFullPath = bool(map["usefullpath"].toInt());
data->markerFileName = data->fileName;
data->markerLineNumber = data->lineNumber.toInt();
append(data);
@@ -427,8 +440,13 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const
str = QFileInfo(str).fileName();
//if (data->bpMultiple && str.isEmpty() && !data->markerFileName.isEmpty())
// str = data->markerFileName;
- return str.isEmpty() ? empty : str;
+ str = str.isEmpty() ? empty : str;
+ if (data->useFullPath)
+ str = "/.../" + str;
+ return str;
}
+ if (role == Qt::UserRole)
+ return data->useFullPath;
break;
case 3:
if (role == Qt::DisplayRole) {
@@ -480,6 +498,13 @@ bool BreakHandler::setData(const QModelIndex &mi, const QVariant &value, int rol
}
return true;
}
+ case 2: {
+ if (data->useFullPath != value.toBool()) {
+ data->useFullPath = value.toBool();
+ dataChanged(mi, mi);
+ }
+ return true;
+ }
case 4: {
QString val = value.toString();
if (val != data->condition) {
@@ -502,6 +527,22 @@ bool BreakHandler::setData(const QModelIndex &mi, const QVariant &value, int rol
}
}
+void BreakHandler::append(BreakpointData *data)
+{
+ m_bp.append(data);
+ m_inserted.append(data);
+}
+
+QList<BreakpointData *> BreakHandler::insertedBreakpoints() const
+{
+ return m_inserted;
+}
+
+void BreakHandler::takeInsertedBreakPoint(BreakpointData *d)
+{
+ m_inserted.removeAll(d);
+}
+
QList<BreakpointData *> BreakHandler::takeRemovedBreakpoints()
{
QList<BreakpointData *> result = m_removed;
diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h
index f4f7470ef580552240eee7bc2d9b27265c6cafc1..0f2cef63b26144fad5b172503a11d17f339f58fa 100644
--- a/src/plugins/debugger/breakhandler.h
+++ b/src/plugins/debugger/breakhandler.h
@@ -78,6 +78,7 @@ public:
QString ignoreCount; // ignore count associated with breakpoint
QString lineNumber; // line in source file
QString funcName; // name of containing function
+ bool useFullPath; // should we use the full path when setting the bp?
// this is what gdb produced in response
QString bpNumber; // breakpoint number assigned by the debugger engine
@@ -122,7 +123,7 @@ public:
BreakpointData *at(int index) const { return index < size() ? m_bp.at(index) : 0; }
int size() const { return m_bp.size(); }
bool hasPendingBreakpoints() const;
- void append(BreakpointData *data) { m_bp.append(data); }
+ void append(BreakpointData *data);
void removeAt(int index); // also deletes the marker
void clear(); // also deletes all the marker
int indexOf(BreakpointData *data) { return m_bp.indexOf(data); }
@@ -131,6 +132,8 @@ public:
int findBreakpoint(int bpNumber); // returns index
void updateMarkers();
+ QList<BreakpointData *> insertedBreakpoints() const;
+ void takeInsertedBreakPoint(BreakpointData *);
QList<BreakpointData *> takeRemovedBreakpoints(); // owned
QList<BreakpointData *> takeEnabledBreakpoints(); // not owned
QList<BreakpointData *> takeDisabledBreakpoints(); // not owned
@@ -170,6 +173,7 @@ private:
void removeBreakpointHelper(int index);
QList<BreakpointData *> m_bp;
+ QList<BreakpointData *> m_inserted; // lately inserted breakpoints
QList<BreakpointData *> m_removed; // lately removed breakpoints
QList<BreakpointData *> m_enabled; // lately enabled breakpoints
QList<BreakpointData *> m_disabled; // lately disabled breakpoints
diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp
index 0f4fe90d6d2ac5c70ba0c8bb5448cc44d155ecd0..6e5f3a6226db5fd84f80a551ba938d3bc3588511 100644
--- a/src/plugins/debugger/breakwindow.cpp
+++ b/src/plugins/debugger/breakwindow.cpp
@@ -82,6 +82,7 @@ void BreakWindow::contextMenuEvent(QContextMenuEvent *ev)
const QModelIndex index = indexAt(ev->pos());
const bool indexIsValid = index.isValid();
const QModelIndex index0 = index.sibling(index.row(), 0);
+ const QModelIndex index2 = index.sibling(index.row(), 2);
QAction *act0 = new QAction(tr("Delete breakpoint"), &menu);
act0->setEnabled(indexIsValid);
QAction *act1 = new QAction(tr("Adjust column widths to contents"), &menu);
@@ -94,10 +95,14 @@ void BreakWindow::contextMenuEvent(QContextMenuEvent *ev)
bool enabled = indexIsValid && model()->data(index0, Qt::UserRole).toBool();
QString str = enabled ? tr("Disable breakpoint") : tr("Enable breakpoint");
QAction *act5 = new QAction(str, &menu);
+ bool fullpath = indexIsValid && model()->data(index2, Qt::UserRole).toBool();
+ QString str1 = fullpath ? tr("Use short path") : tr("Use full path");
+ QAction *act6 = new QAction(str1, &menu);
menu.addAction(act0);
menu.addAction(act3);
menu.addAction(act5);
+ menu.addAction(act6);
menu.addSeparator();
menu.addAction(act1);
menu.addAction(act2);
@@ -120,6 +125,9 @@ void BreakWindow::contextMenuEvent(QContextMenuEvent *ev)
else if (act == act5) {
model()->setData(index0, !enabled);
emit breakpointSynchronizationRequested();
+ } else if (act == act6) {
+ model()->setData(index2, !fullpath);
+ emit breakpointSynchronizationRequested();
}
}
diff --git a/src/plugins/debugger/cdb/cdb.pri b/src/plugins/debugger/cdb/cdb.pri
index b602ef639a3619f6c45fde00a9d799aae8bf190b..d0d43a6f6d15a31bfc3caafa58bd894e75e83d00 100644
--- a/src/plugins/debugger/cdb/cdb.pri
+++ b/src/plugins/debugger/cdb/cdb.pri
@@ -40,7 +40,8 @@ HEADERS += \
$$PWD/cdbassembler.h \
$$PWD/cdboptions.h \
$$PWD/cdboptionspage.h \
- $$PWD/cdbdumperhelper.h
+ $$PWD/cdbdumperhelper.h \
+ $$PWD/cdbsymbolpathlisteditor.h
SOURCES += \
$$PWD/cdbdebugengine.cpp \
@@ -54,7 +55,8 @@ SOURCES += \
$$PWD/cdbassembler.cpp \
$$PWD/cdboptions.cpp \
$$PWD/cdboptionspage.cpp \
- $$PWD/cdbdumperhelper.cpp
+ $$PWD/cdbdumperhelper.cpp \
+ $$PWD/cdbsymbolpathlisteditor.cpp
FORMS += $$PWD/cdboptionspagewidget.ui
diff --git a/src/plugins/debugger/cdb/cdbbreakpoint.cpp b/src/plugins/debugger/cdb/cdbbreakpoint.cpp
index 2824a57e5c40ab35c060955fb098b56b22c61a3e..4418fad1e204d63d7f78dbb36c7a4f3dcd8da0cc 100644
--- a/src/plugins/debugger/cdb/cdbbreakpoint.cpp
+++ b/src/plugins/debugger/cdb/cdbbreakpoint.cpp
@@ -37,6 +37,8 @@
#include <QtCore/QDebug>
#include <QtCore/QMap>
+enum { debugBP = 0 };
+
namespace Debugger {
namespace Internal {
@@ -49,17 +51,19 @@ static const char sourceFileQuoteC = '`';
CDBBreakPoint::CDBBreakPoint() :
ignoreCount(0),
lineNumber(-1),
- oneShot(false)
+ oneShot(false),
+ enabled(true)
{
}
CDBBreakPoint::CDBBreakPoint(const BreakpointData &bpd) :
- fileName(bpd.fileName),
+ fileName(QDir::toNativeSeparators(bpd.fileName)),
condition(bpd.condition),
ignoreCount(0),
funcName(bpd.funcName),
lineNumber(-1),
- oneShot(false)
+ oneShot(false),
+ enabled(bpd.enabled)
{
if (!bpd.ignoreCount.isEmpty())
ignoreCount = bpd.ignoreCount.toInt();
@@ -81,6 +85,10 @@ int CDBBreakPoint::compare(const CDBBreakPoint& rhs) const
return 1;
if (!oneShot && rhs.oneShot)
return -1;
+ if (enabled && !rhs.enabled)
+ return 1;
+ if (!enabled && rhs.enabled)
+ return -1;
if (const int fileCmp = fileName.compare(rhs.fileName))
return fileCmp;
if (const int funcCmp = funcName.compare(rhs.funcName))
@@ -94,6 +102,7 @@ void CDBBreakPoint::clear()
{
ignoreCount = 0;
oneShot = false;
+ enabled = true;
clearExpressionData();
}
@@ -117,6 +126,8 @@ QDebug operator<<(QDebug dbg, const CDBBreakPoint &bp)
nsp << " condition='" << bp.condition << '\'';
if (bp.ignoreCount)
nsp << " ignoreCount=" << bp.ignoreCount;
+ if (bp.enabled)
+ nsp << " enabled";
if (bp.oneShot)
nsp << " oneShot";
return dbg;
@@ -153,27 +164,48 @@ bool CDBBreakPoint::apply(CIDebugBreakpoint *ibp, QString *errorMessage) const
}
// Pass Count is ignoreCount + 1
ibp->SetPassCount(ignoreCount + 1u);
- ULONG flags = DEBUG_BREAKPOINT_ENABLED;
+ ULONG flags = 0;
+ if (enabled)
+ flags |= DEBUG_BREAKPOINT_ENABLED;
if (oneShot)
flags |= DEBUG_BREAKPOINT_ONE_SHOT;
ibp->AddFlags(flags);
return true;
}
-bool CDBBreakPoint::add(CIDebugControl* debugControl, QString *errorMessage) const
+static inline QString msgCannotAddBreakPoint(const QString &why)
+{
+ return QString::fromLatin1("Unable to add breakpoint: %1").arg(why);
+}
+
+bool CDBBreakPoint::add(CIDebugControl* debugControl,
+ quint64 *address, unsigned long *id,
+ QString *errorMessage) const
{
IDebugBreakpoint2* ibp = 0;
- const HRESULT hr = debugControl->AddBreakpoint2(DEBUG_BREAKPOINT_CODE, DEBUG_ANY_ID, &ibp);
+ *address = 0;
+ *id = 0;
+ HRESULT hr = debugControl->AddBreakpoint2(DEBUG_BREAKPOINT_CODE, DEBUG_ANY_ID, &ibp);
if (FAILED(hr)) {
- *errorMessage = QString::fromLatin1("Unable to add breakpoint: %1").
- arg(msgComFailed("AddBreakpoint2", hr));
+ *errorMessage = msgCannotAddBreakPoint(msgComFailed("AddBreakpoint2", hr));
return false;
}
if (!ibp) {
- *errorMessage = QString::fromLatin1("Unable to add breakpoint: <Unknown error>");
+ *errorMessage = msgCannotAddBreakPoint(QLatin1String("<Unknown error>"));
+ return false;
+ }
+ if (!apply(ibp, errorMessage))
+ return false;
+ // GetOffset can fail when attaching to remote processes.
+ hr = ibp->GetOffset(address);
+ if (FAILED(hr))
+ *address = 0;
+ hr = ibp->GetId(id);
+ if (FAILED(hr)) {
+ *errorMessage = msgCannotAddBreakPoint(msgComFailed("GetId", hr));
return false;
}
- return apply(ibp, errorMessage);
+ return true;
}
// Make sure file can be found in editor manager and text markers
@@ -204,8 +236,8 @@ bool CDBBreakPoint::retrieve(CIDebugBreakpoint *ibp, QString *errorMessage)
ignoreCount--;
ULONG flags = 0;
ibp->GetFlags(&flags);
- if (flags & DEBUG_BREAKPOINT_ONE_SHOT)
- oneShot = true;
+ oneShot = (flags & DEBUG_BREAKPOINT_ONE_SHOT);
+ enabled = (flags & DEBUG_BREAKPOINT_ENABLED);
const QString expr = QString::fromUtf16(wszBuf);
if (!parseExpression(expr)) {
*errorMessage = QString::fromLatin1("Parsing of '%1' failed.").arg(expr);
@@ -296,31 +328,107 @@ bool CDBBreakPoint::getBreakPoints(CIDebugControl* debugControl, QList<CDBBreakP
return true;
}
+// Find a breakpoint by id
+static inline QString msgNoBreakPointWithId(unsigned long id, const QString &why)
+{
+ return QString::fromLatin1("Unable to find breakpoint with id %1: %2").arg(id).arg(why);
+}
+
+static IDebugBreakpoint2 *breakPointById(CIDebugControl *ctl, unsigned long id, QString *errorMessage)
+{
+ CIDebugBreakpoint *ibp = 0;
+ const HRESULT hr = ctl->GetBreakpointById2(id, &ibp);
+ if (FAILED(hr)) {
+ *errorMessage = msgNoBreakPointWithId(id, msgComFailed("GetBreakpointById2", hr));
+ return 0;
+ }
+ if (!ibp) {
+ *errorMessage = msgNoBreakPointWithId(id, QLatin1String("<not found>"));
+ return 0;
+ }
+ return ibp;
+}
+
+// Remove breakpoint by id
+static bool removeBreakPointById(CIDebugControl *ctl, unsigned long id, QString *errorMessage)
+{
+ if (debugBP)
+ qDebug() << Q_FUNC_INFO << id;
+ CIDebugBreakpoint *ibp = breakPointById(ctl, id, errorMessage);
+ if (!ibp)
+ return false;
+ const HRESULT hr = ctl->RemoveBreakpoint2(ibp);
+ if (FAILED(hr)) {
+ *errorMessage = QString::fromLatin1("Cannot remove breakpoint %1: %2").arg(id).arg(msgComFailed("RemoveBreakpointById2", hr));
+ return false;
+ }
+ return true;
+}
+
+// Set enabled by id
+
+// Change enabled state of a breakpoint by id
+static inline QString msgCannotSetBreakPointEnabled(unsigned long id, bool enabled, const QString &why)
+{
+ return QString::fromLatin1("Cannot %1 breakpoint %2: %3").
+ arg(QLatin1String(enabled ? "enable" : "disable")).arg(id).arg(why);
+}
+
+static bool setBreakPointEnabledById(CIDebugControl *ctl, unsigned long id, bool enabled, QString *errorMessage)
+{
+ if (debugBP)
+ qDebug() << Q_FUNC_INFO << id << enabled;
+ CIDebugBreakpoint *ibp = breakPointById(ctl, id, errorMessage);
+ if (!ibp) {
+ *errorMessage = msgCannotSetBreakPointEnabled(id, enabled, *errorMessage);
+ return false;
+ }
+ // Compare flags
+ ULONG flags;
+ HRESULT hr = ibp->GetFlags(&flags);
+ if (FAILED(hr)) {
+ *errorMessage = msgCannotSetBreakPointEnabled(id, enabled, msgComFailed("GetFlags", hr));
+ return false;
+ }
+ const bool wasEnabled = (flags & DEBUG_BREAKPOINT_ENABLED);
+ if (wasEnabled == enabled)
+ return true;
+ // Set new value
+ if (enabled) {
+ flags |= DEBUG_BREAKPOINT_ENABLED;
+ } else {
+ flags &= ~DEBUG_BREAKPOINT_ENABLED;
+ }
+ hr = ibp->SetFlags(flags);
+ if (FAILED(hr)) {
+ *errorMessage = msgCannotSetBreakPointEnabled(id, enabled, msgComFailed("SetFlags", hr));
+ return false;
+ }
+ return true;
+}
// Synchronize (halted) engine breakpoints with those of the BreakHandler.
-bool CDBBreakPoint::synchronizeBreakPoints(IDebugControl4* debugControl,
- IDebugSymbols3 *syms,
+bool CDBBreakPoint::synchronizeBreakPoints(CIDebugControl* debugControl,
+ CIDebugSymbols *syms,
BreakHandler *handler,
QString *errorMessage)
{
- typedef QMap<CDBBreakPoint, int> BreakPointIndexMap;
- if (debugCDB)
- qDebug() << Q_FUNC_INFO;
-
- BreakPointIndexMap breakPointIndexMap;
- // convert BreakHandler's bps into a map of BreakPoint->BreakHandler->Index
- // Ignore invalid functions (that could not be found) as they make
- // the debugger hang.
- const int handlerCount = handler->size();
- const QChar moduleDelimiter = QLatin1Char('!');
- for (int i=0; i < handlerCount; ++i) {
- BreakpointData *bd = handler->at(i);
+ // Do an initial check whether we are in a state that allows
+ // for modifying breakPoints
+ ULONG engineCount;
+ if (!getBreakPointCount(debugControl, &engineCount, errorMessage)) {
+ *errorMessage = QString::fromLatin1("Cannot modify breakpoints: %1").arg(*errorMessage);
+ return false;
+ }
+ // Insert new ones
+ bool updateMarkers = false;
+ foreach (BreakpointData *nbd, handler->insertedBreakpoints()) {
// Function breakpoints: Are the module names specified?
bool breakPointOk = false;
- if (bd->funcName.isEmpty()) {
+ if (nbd->funcName.isEmpty()) {
breakPointOk = true;
} else {
- switch (resolveSymbol(syms, &bd->funcName, errorMessage)) {
+ switch (resolveSymbol(syms, &nbd->funcName, errorMessage)) {
case ResolveSymbolOk:
breakPointOk = true;
break;
@@ -334,66 +442,49 @@ bool CDBBreakPoint::synchronizeBreakPoints(IDebugControl4* debugControl,
break;
};
} // function breakpoint
- if (breakPointOk)
- breakPointIndexMap.insert(CDBBreakPoint(*bd), i);
- }
- errorMessage->clear();
- // get number of engine breakpoints
- ULONG engineCount;
- if (!getBreakPointCount(debugControl, &engineCount, errorMessage))
- return false;
-
- // Starting from end, check if engine breakpoints are still in handler.
- // If not->remove
- if (engineCount) {
- for (ULONG eb = engineCount - 1u; ; eb--) {
- // get engine breakpoint.
- IDebugBreakpoint2 *ibp = 0;
- HRESULT hr = debugControl->GetBreakpointByIndex2(eb, &ibp);
- if (FAILED(hr)) {
- *errorMessage = QString::fromLatin1("Cannot retrieve breakpoint %1: %2").
- arg(eb).arg(msgComFailed("GetBreakpointByIndex2", hr));
- return false;
+ // Now add...
+ if (breakPointOk) {
+ quint64 address;
+ unsigned long id;
+ CDBBreakPoint ncdbbp(*nbd);
+ breakPointOk = ncdbbp.add(debugControl, &address, &id, errorMessage);
+ if (breakPointOk) {
+ if (debugBP)
+ qDebug() << "Added " << id << " at " << address << ncdbbp;
+ handler->takeInsertedBreakPoint(nbd);
+ updateMarkers = true;
+ nbd->pending = false;
+ nbd->bpNumber = QString::number(id);
+ nbd->bpAddress = QLatin1String("0x") + QString::number(address, 16);
+ // Take over rest as is
+ nbd->bpCondition = nbd->condition;
+ nbd->bpIgnoreCount = nbd->ignoreCount;
+ nbd->bpFileName = nbd->fileName;
+ nbd->bpLineNumber = nbd->lineNumber;
+ nbd->bpFuncName = nbd->funcName;
}
- // Ignore one shot break points set by "Step out"
- ULONG flags = 0;
- hr = ibp->GetFlags(&flags);
- if (!(flags & DEBUG_BREAKPOINT_ONE_SHOT)) {
- CDBBreakPoint engineBreakPoint;
- if (!engineBreakPoint.retrieve(ibp, errorMessage))
- return false;
- // Still in handler?
- if (!breakPointIndexMap.contains(engineBreakPoint)) {
- if (debugCDB)
- qDebug() << " Removing" << engineBreakPoint;
- hr = debugControl->RemoveBreakpoint2(ibp);
- if (FAILED(hr)) {
- *errorMessage = QString::fromLatin1("Cannot remove breakpoint %1: %2").
- arg(engineBreakPoint.expression(), msgComFailed("RemoveBreakpoint2", hr));
- return false;
- }
- } // not in handler
- } // one shot
- if (!eb)
- break;
- }
+ } // had symbol
+ if (!breakPointOk)
+ qWarning("%s\n", qPrintable(*errorMessage));
}
- // Add pending breakpoints
- const BreakPointIndexMap::const_iterator pcend = breakPointIndexMap.constEnd();
- for (BreakPointIndexMap::const_iterator it = breakPointIndexMap.constBegin(); it != pcend; ++it) {
- const int index = it.value();
- if (handler->at(index)->pending) {
- if (debugCDB)
- qDebug() << " Adding " << it.key();
- if (it.key().add(debugControl, errorMessage)) {
- handler->at(index)->pending = false;
- } else {
- const QString msg = QString::fromLatin1("Failed to add breakpoint '%1': %2").arg(it.key().expression(), *errorMessage);
- qWarning("%s\n", qPrintable(msg));
- }
- }
+ // Delete
+ foreach (BreakpointData *rbd, handler->takeRemovedBreakpoints()) {
+ if (!removeBreakPointById(debugControl, rbd->bpNumber.toUInt(), errorMessage))
+ qWarning("%s\n", qPrintable(*errorMessage));
+ delete rbd;
}
- if (debugCDB > 1) {
+ // Enable/Disable
+ foreach (BreakpointData *ebd, handler->takeEnabledBreakpoints())
+ if (!setBreakPointEnabledById(debugControl, ebd->bpNumber.toUInt(), true, errorMessage))
+ qWarning("%s\n", qPrintable(*errorMessage));
+ foreach (BreakpointData *dbd, handler->takeDisabledBreakpoints())
+ if (!setBreakPointEnabledById(debugControl, dbd->bpNumber.toUInt(), false, errorMessage))
+ qWarning("%s\n", qPrintable(*errorMessage));
+
+ if (updateMarkers)
+ handler->updateMarkers();
+
+ if (debugBP > 1) {
QList<CDBBreakPoint> bps;
CDBBreakPoint::getBreakPoints(debugControl, &bps, errorMessage);
qDebug().nospace() << "### Breakpoints in engine: " << bps;
diff --git a/src/plugins/debugger/cdb/cdbbreakpoint.h b/src/plugins/debugger/cdb/cdbbreakpoint.h
index 9ee7ef8d860df2aa1c0cb2f191fb1b7103b57d00..7ef4ebe67e699cc5e567cc5cea96323b96538acf 100644
--- a/src/plugins/debugger/cdb/cdbbreakpoint.h
+++ b/src/plugins/debugger/cdb/cdbbreakpoint.h
@@ -63,7 +63,7 @@ struct CDBBreakPoint
// Apply parameters
bool apply(IDebugBreakpoint2 *ibp, QString *errorMessage) const;
// Convenience to add to a IDebugControl4
- bool add(CIDebugControl* debugControl, QString *errorMessage) const;
+ bool add(CIDebugControl* debugControl, quint64 *address, unsigned long *id, QString *errorMessage) const;
// Retrieve/parse breakpoints from the interfaces
bool retrieve(IDebugBreakpoint2 *ibp, QString *errorMessage);
@@ -84,6 +84,7 @@ struct CDBBreakPoint
int lineNumber; // line in source file
QString funcName; // name of containing function
bool oneShot;
+ bool enabled;
};
QDebug operator<<(QDebug, const CDBBreakPoint &bp);
@@ -92,9 +93,6 @@ inline bool operator==(const CDBBreakPoint& b1, const CDBBreakPoint& b2)
{ return b1.compare(b2) == 0; }
inline bool operator!=(const CDBBreakPoint& b1, const CDBBreakPoint& b2)
{ return b1.compare(b2) != 0; }
-inline bool operator<(const CDBBreakPoint& b1, const CDBBreakPoint& b2)
- { return b1.compare(b2) < 0; }
-
} // namespace Internal
} // namespace Debugger
diff --git a/src/plugins/debugger/cdb/cdbdebugengine.cpp b/src/plugins/debugger/cdb/cdbdebugengine.cpp
index 39c52525b64f7ff5134585ce6520fae236a17726..789936f3ea697b950289721ff3ebe8afb8645d02 100644
--- a/src/plugins/debugger/cdb/cdbdebugengine.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugengine.cpp
@@ -347,8 +347,10 @@ IDebuggerEngine *CdbDebugEngine::create(DebuggerManager *parent,
QString *errorMessage)
{
CdbDebugEngine *rc = new CdbDebugEngine(parent, options);
- if (rc->m_d->init(errorMessage))
+ if (rc->m_d->init(errorMessage)) {
+ rc->syncDebuggerPaths();
return rc;
+ }
delete rc;
return 0;
}
@@ -452,6 +454,7 @@ void CdbDebugEnginePrivate::clearDisplay()
bool CdbDebugEngine::startDebugger()
{
m_d->clearDisplay();
+
const DebuggerStartMode mode = m_d->m_debuggerManager->startMode();
// Figure out dumper. @TODO: same in gdb...
const QString dumperLibName = QDir::toNativeSeparators(m_d->m_debuggerManagerAccess->qtDumperLibraryName());
@@ -493,11 +496,11 @@ bool CdbDebugEngine::startDebugger()
}
break;
case AttachCore:
- errorMessage = tr("CdbDebugEngine: Attach to core not supported!");
+ errorMessage = tr("Attaching to core files is not supported!");
break;
}
if (rc) {
- m_d->m_debuggerManager->showStatusMessage(tr("Debugger Running"), -1);
+ m_d->m_debuggerManager->showStatusMessage(tr("Debugger running"), -1);
if (needWatchTimer)
startWatchTimer();
} else {
@@ -515,7 +518,7 @@ bool CdbDebugEngine::startAttachDebugger(qint64 pid, QString *errorMessage)
if (debugCDB)
qDebug() << "Attaching to " << pid << " returns " << hr << executionStatusString(m_d->m_cif.debugControl);
if (FAILED(hr)) {
- *errorMessage = tr("AttachProcess failed for pid %1: %2").arg(pid).arg(msgDebugEngineComResult(hr));
+ *errorMessage = tr("Attaching to a process failed for process id %1: %2").arg(pid).arg(msgDebugEngineComResult(hr));
return false;
} else {
m_d->m_mode = AttachExternal;
@@ -558,7 +561,7 @@ bool CdbDebugEngine::startDebuggerWithExecutable(DebuggerStartMode sm, QString *
m_d->m_debuggerManager->m_workingDir.utf16(),
env);
if (FAILED(hr)) {
- *errorMessage = tr("CreateProcess2Wide failed for '%1': %2").arg(cmd, msgDebugEngineComResult(hr));
+ *errorMessage = tr("Unable to create a process '%1': %2").arg(cmd, msgDebugEngineComResult(hr));
m_d->m_debuggerManagerAccess->notifyInferiorExited();
return false;
} else {
@@ -612,59 +615,73 @@ void CdbDebugEngine::processTerminated(unsigned long exitCode)
m_d->m_debuggerManager->exitDebugger();
}
-void CdbDebugEngine::exitDebugger()
+// End debugging using
+void CdbDebugEnginePrivate::endDebugging(EndDebuggingMode em)
{
+ enum Action { Detach, Terminate };
if (debugCDB)
- qDebug() << Q_FUNC_INFO;
+ qDebug() << Q_FUNC_INFO << em;
- if (m_d->m_hDebuggeeProcess) {
- QString errorMessage;
- m_d->clearForRun();
- bool wasRunning = false;
- // Terminate or detach if we are running
- HRESULT hr;
- switch (m_d->m_mode) {
- case AttachExternal:
- wasRunning = m_d->isDebuggeeRunning();
- if (wasRunning) { // Process must be stopped in order to detach
- m_d->interruptInterferiorProcess(&errorMessage);
- QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
- }
- hr = m_d->m_cif.debugClient->DetachCurrentProcess();
- if (FAILED(hr))
- errorMessage += msgComFailed("DetachCurrentProcess", hr);
- if (debugCDB)
- qDebug() << Q_FUNC_INFO << "detached" << msgDebugEngineComResult(hr);
- break;
- case StartExternal:
- case StartInternal:
- wasRunning = m_d->isDebuggeeRunning();
- if (wasRunning) { // Process must be stopped in order to terminate
- m_d->interruptInterferiorProcess(&errorMessage);
- QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
- }
- // Terminate and wait for stop events.
- hr = m_d->m_cif.debugClient->TerminateCurrentProcess();
+ if (m_mode == AttachCore || !m_hDebuggeeProcess)
+ return;
+ // Figure out action
+ Action action;
+ switch (em) {
+ case EndDebuggingAuto:
+ action = m_mode == AttachExternal ? Detach : Terminate;
+ break;
+ case EndDebuggingDetach:
+ action = Detach;
+ break;
+ case EndDebuggingTerminate:
+ action = Terminate;
+ break;
+ }
+ if (debugCDB)
+ qDebug() << Q_FUNC_INFO << action;
+ // Need a stopped debuggee to act
+ QString errorMessage;
+ const bool wasRunning = isDebuggeeRunning();
+ if (wasRunning) { // Process must be stopped in order to terminate
+ interruptInterferiorProcess(&errorMessage);
+ QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+ }
+ HRESULT hr;
+ switch (action) {
+ case Detach:
+ hr = m_cif.debugClient->DetachCurrentProcess();
+ if (FAILED(hr))
+ errorMessage += msgComFailed("DetachCurrentProcess", hr);
+ break;
+ case Terminate:
+ hr = m_cif.debugClient->TerminateCurrentProcess();
+ if (FAILED(hr))
+ errorMessage += msgComFailed("TerminateCurrentProcess", hr);
+ if (!wasRunning) {
+ hr = m_cif.debugClient->TerminateProcesses();
if (FAILED(hr))
- errorMessage += msgComFailed("TerminateCurrentProcess", hr);
- if (!wasRunning) {
- hr = m_d->m_cif.debugClient->TerminateProcesses();
- if (FAILED(hr))
- errorMessage += msgComFailed("TerminateProcesses", hr);
- }
- QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
- if (debugCDB)
- qDebug() << Q_FUNC_INFO << "terminated" << msgDebugEngineComResult(hr);
-
- break;
- case AttachCore:
- break;
+ errorMessage += msgComFailed("TerminateProcesses", hr);
}
- m_d->setDebuggeeHandles(0, 0);
- if (!errorMessage.isEmpty())
- qWarning("exitDebugger: %s\n", qPrintable(errorMessage));
+ QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+ break;
}
- killWatchTimer();
+ setDebuggeeHandles(0, 0);
+ m_engine->killWatchTimer();
+ if (!errorMessage.isEmpty()) {
+ errorMessage = QString::fromLatin1("There were errors trying to end debugging: %1").arg(errorMessage);
+ m_debuggerManagerAccess->showDebuggerOutput(QLatin1String("error"), errorMessage);
+ qWarning("%s\n", qPrintable(errorMessage));
+ }
+}
+
+void CdbDebugEngine::exitDebugger()
+{
+ m_d->endDebugging();
+}
+
+void CdbDebugEngine::detachDebugger()
+{
+ m_d->endDebugging(CdbDebugEnginePrivate::EndDebuggingDetach);
}
CdbStackFrameContext *CdbDebugEnginePrivate::getStackFrameContext(int frameIndex, QString *errorMessage) const
@@ -1489,6 +1506,59 @@ void CdbDebugEngine::reloadSourceFiles()
{
}
+QStringList CdbDebugEnginePrivate::sourcePaths() const
+{
+ WCHAR wszBuf[MAX_PATH];
+ if (SUCCEEDED(m_cif.debugSymbols->GetSourcePathWide(wszBuf, MAX_PATH, 0)))
+ return QString::fromUtf16(wszBuf).split(QLatin1Char(';'));
+ return QStringList();
+}
+
+void CdbDebugEngine::syncDebuggerPaths()
+{
+ if (debugCDB)
+ qDebug() << Q_FUNC_INFO << m_d->m_options->symbolPaths << m_d->m_options->sourcePaths;
+ QString errorMessage;
+ if (!m_d->setSourcePaths(m_d->m_options->sourcePaths, &errorMessage)
+ || !m_d->setSymbolPaths(m_d->m_options->symbolPaths, &errorMessage)) {
+ errorMessage = QString::fromLatin1("Unable to set the debugger paths: %1").arg(errorMessage);
+ qWarning("%s\n", qPrintable(errorMessage));
+ }
+}
+
+static inline QString pathString(const QStringList &s)
+{ return s.join(QString(QLatin1Char(';'))); }
+
+bool CdbDebugEnginePrivate::setSourcePaths(const QStringList &s, QString *errorMessage)
+{
+ const HRESULT hr = m_cif.debugSymbols->SetSourcePathWide(pathString(s).utf16());
+ if (FAILED(hr)) {
+ if (errorMessage)
+ *errorMessage = msgComFailed("SetSourcePathWide", hr);
+ return false;
+ }
+ return true;
+}
+
+QStringList CdbDebugEnginePrivate::symbolPaths() const
+{
+ WCHAR wszBuf[MAX_PATH];
+ if (SUCCEEDED(m_cif.debugSymbols->GetSymbolPathWide(wszBuf, MAX_PATH, 0)))
+ return QString::fromUtf16(wszBuf).split(QLatin1Char(';'));
+ return QStringList();
+}
+
+bool CdbDebugEnginePrivate::setSymbolPaths(const QStringList &s, QString *errorMessage)
+{
+ const HRESULT hr = m_cif.debugSymbols->SetSymbolPathWide(pathString(s).utf16());
+ if (FAILED(hr)) {
+ if (errorMessage)
+ *errorMessage = msgComFailed("SetSymbolPathWide", hr);
+ return false;
+ }
+ return true;
+}
+
} // namespace Internal
} // namespace Debugger
@@ -1512,5 +1582,6 @@ Debugger::Internal::IDebuggerEngine *createWinEngine(Debugger::Internal::Debugge
optionsPage->setFailureMessage(errorMessage);
qWarning("%s", qPrintable(errorMessage));
}
+ QObject::connect(optionsPage, SIGNAL(debuggerPathsChanged()), engine, SLOT(syncDebuggerPaths()));
return engine;
}
diff --git a/src/plugins/debugger/cdb/cdbdebugengine.h b/src/plugins/debugger/cdb/cdbdebugengine.h
index 74547ab33adb43f5700e6aff18f62d080b3fc3f2..33640b99926d560b27a2d424c37539ac396011e1 100644
--- a/src/plugins/debugger/cdb/cdbdebugengine.h
+++ b/src/plugins/debugger/cdb/cdbdebugengine.h
@@ -63,6 +63,7 @@ public:
virtual void setToolTipExpression(const QPoint &pos, const QString &exp);
virtual bool startDebugger();
virtual void exitDebugger();
+ virtual void detachDebugger();
virtual void updateWatchModel();
virtual void stepExec();
@@ -96,13 +97,16 @@ public:
virtual void reloadSourceFiles();
virtual void reloadFullStack() {}
+public slots:
+ void syncDebuggerPaths();
+
protected:
void timerEvent(QTimerEvent*);
private slots:
void slotConsoleStubStarted();
void slotConsoleStubError(const QString &msg);
- void slotConsoleStubTerminated();
+ void slotConsoleStubTerminated();
private:
bool startAttachDebugger(qint64 pid, QString *errorMessage);
diff --git a/src/plugins/debugger/cdb/cdbdebugengine_p.h b/src/plugins/debugger/cdb/cdbdebugengine_p.h
index 373257bd8f411ea28c6b6c0bd264173fd471027a..746d1993f6b14d12f8558675bb7fe6cc824e9eca 100644
--- a/src/plugins/debugger/cdb/cdbdebugengine_p.h
+++ b/src/plugins/debugger/cdb/cdbdebugengine_p.h
@@ -132,9 +132,18 @@ struct CdbDebugEnginePrivate
bool attemptBreakpointSynchronization(QString *errorMessage);
void notifyCrashed();
+ enum EndDebuggingMode { EndDebuggingDetach, EndDebuggingTerminate, EndDebuggingAuto };
+ void endDebugging(EndDebuggingMode em = EndDebuggingAuto);
+
static bool executeDebuggerCommand(CIDebugControl *ctrl, const QString &command, QString *errorMessage);
static bool evaluateExpression(CIDebugControl *ctrl, const QString &expression, DEBUG_VALUE *v, QString *errorMessage);
+ QStringList sourcePaths() const;
+ bool setSourcePaths(const QStringList &s, QString *errorMessage);
+
+ QStringList symbolPaths() const;
+ bool setSymbolPaths(const QStringList &s, QString *errorMessage);
+
const QSharedPointer<CdbOptions> m_options;
HANDLE m_hDebuggeeProcess;
HANDLE m_hDebuggeeThread;
diff --git a/src/plugins/debugger/cdb/cdbdumperhelper.cpp b/src/plugins/debugger/cdb/cdbdumperhelper.cpp
index c6d2337d0deb4c7f9df3d7a3bf4ac586503380a6..7a9c2efd7b50cf9693ce1571f62e47302b4299b3 100644
--- a/src/plugins/debugger/cdb/cdbdumperhelper.cpp
+++ b/src/plugins/debugger/cdb/cdbdumperhelper.cpp
@@ -188,27 +188,27 @@ static bool debuggeeLoadLibrary(IDebuggerManagerAccessForEngines *access,
static inline QString msgMethod(bool injectOrCall)
{
return injectOrCall ?
- QCoreApplication::translate("CdbDumperHelper", "injection") :
- QCoreApplication::translate("CdbDumperHelper", "debugger call");
+ QCoreApplication::translate("Debugger::Internal::CdbDumperHelper", "injection") :
+ QCoreApplication::translate("Debugger::Internal::CdbDumperHelper", "debugger call");
}
static QString msgLoading(const QString &library, bool injectOrCall)
{
- return QCoreApplication::translate("CdbDumperHelper",
+ return QCoreApplication::translate("Debugger::Internal::CdbDumperHelper",
"Loading the custom dumper library '%1' (%2) ...").
arg(library, msgMethod(injectOrCall));
}
static QString msgLoadFailed(const QString &library, bool injectOrCall, const QString &why)
{
- return QCoreApplication::translate("CdbDumperHelper",
+ return QCoreApplication::translate("Debugger::Internal::CdbDumperHelper",
"Loading of the custom dumper library '%1' (%2) failed: %3").
arg(library, msgMethod(injectOrCall), why);
}
static QString msgLoadSucceeded(const QString &library, bool injectOrCall)
{
- return QCoreApplication::translate("CdbDumperHelper",
+ return QCoreApplication::translate("Debugger::Internal::CdbDumperHelper",
"Loaded the custom dumper library '%1' (%2).").
arg(library, msgMethod(injectOrCall));
}
@@ -240,7 +240,7 @@ void CdbDumperHelper::disable()
{
if (loadDebug)
qDebug() << Q_FUNC_INFO;
- m_access->showDebuggerOutput(m_messagePrefix, QCoreApplication::translate("CdbDumperHelper", "Disabling dumpers due to debuggee crash..."));
+ m_access->showDebuggerOutput(m_messagePrefix, QCoreApplication::translate("Debugger::Internal::CdbDumperHelper", "Disabling dumpers due to debuggee crash..."));
m_state = Disabled;
}
@@ -351,7 +351,7 @@ bool CdbDumperHelper::ensureInitialized(QString *errorMessage)
m_access->showQtDumperLibraryWarning(*errorMessage);
return false;
case CallLoadNoQtApp:
- m_access->showDebuggerOutput(m_messagePrefix, QCoreApplication::translate("CdbDumperHelper", "The debuggee does not appear to be Qt application."));
+ m_access->showDebuggerOutput(m_messagePrefix, QCoreApplication::translate("Debugger::Internal::CdbDumperHelper", "The debuggee does not appear to be Qt application."));
m_state = Disabled; // No message here
return true;
}
@@ -360,15 +360,15 @@ bool CdbDumperHelper::ensureInitialized(QString *errorMessage)
break;
}
// Perform remaining initialization
- m_manager->showStatusMessage(QCoreApplication::translate("CdbDumperHelper", "Initializing dumpers..."), 10000);
+ m_manager->showStatusMessage(QCoreApplication::translate("Debugger::Internal::CdbDumperHelper", "Initializing dumpers..."), 10000);
const bool ok = initResolveSymbols(errorMessage) && initKnownTypes(errorMessage);
if (ok) {
- m_access->showDebuggerOutput(m_messagePrefix, QCoreApplication::translate("CdbDumperHelper", "Custom dumper library initialized."));
+ m_access->showDebuggerOutput(m_messagePrefix, QCoreApplication::translate("Debugger::Internal::CdbDumperHelper", "Custom dumper library initialized."));
m_access->showDebuggerOutput(m_messagePrefix, m_helper.toString());
m_state = Initialized;
} else {
m_state = Disabled; // No message here
- *errorMessage = QCoreApplication::translate("CdbDumperHelper", "The custom dumper library could not be initialized: %1").arg(*errorMessage);
+ *errorMessage = QCoreApplication::translate("Debugger::Internal::CdbDumperHelper", "The custom dumper library could not be initialized: %1").arg(*errorMessage);
m_access->showDebuggerOutput(m_messagePrefix, *errorMessage);
m_access->showQtDumperLibraryWarning(*errorMessage);
}
@@ -557,7 +557,7 @@ CdbDumperHelper::DumpResult CdbDumperHelper::dumpType(const WatchData &wd, bool
return DumpNotHandled;
// Now evaluate
- const QString message = QCoreApplication::translate("CdbDumperHelper",
+ const QString message = QCoreApplication::translate("Debugger::Internal::CdbDumperHelper",
"Querying dumpers for '%1'/'%2' (%3)").
arg(wd.name, wd.exp, wd.type);
m_access->showDebuggerOutput(m_messagePrefix, message);
diff --git a/src/plugins/debugger/cdb/cdboptions.cpp b/src/plugins/debugger/cdb/cdboptions.cpp
index 1740c3a6d7b91ef077d4eed83713e95c63a062e0..999c49ea4cda158a5ddc7d981bbb07ef530627f0 100644
--- a/src/plugins/debugger/cdb/cdboptions.cpp
+++ b/src/plugins/debugger/cdb/cdboptions.cpp
@@ -34,8 +34,10 @@
#include <QtCore/QFileInfo>
static const char *settingsGroupC = "CDB";
-static const char *enabledKeyC = "enabled";
-static const char *pathKeyC = "path";
+static const char *enabledKeyC = "Enabled";
+static const char *pathKeyC = "Path";
+static const char *symbolPathsKeyC = "SymbolPaths";
+static const char *sourcePathsKeyC = "SourcePaths";
namespace Debugger {
namespace Internal {
@@ -65,6 +67,8 @@ void CdbOptions::fromSettings(const QSettings *s)
}
enabled = s->value(enabledKey, false).toBool();
path = s->value(keyRoot + QLatin1String(pathKeyC), QString()).toString();
+ symbolPaths = s->value(keyRoot + QLatin1String(symbolPathsKeyC), QStringList()).toStringList();
+ sourcePaths = s->value(keyRoot + QLatin1String(sourcePathsKeyC), QStringList()).toStringList();
}
void CdbOptions::toSettings(QSettings *s) const
@@ -72,6 +76,8 @@ void CdbOptions::toSettings(QSettings *s) const
s->beginGroup(QLatin1String(settingsGroupC));
s->setValue(QLatin1String(enabledKeyC), enabled);
s->setValue(QLatin1String(pathKeyC), path);
+ s->setValue(QLatin1String(symbolPathsKeyC), symbolPaths);
+ s->setValue(QLatin1String(sourcePathsKeyC), sourcePaths);
s->endGroup();
}
@@ -105,9 +111,14 @@ bool CdbOptions::autoDetectPath(QString *outPath)
return false;
}
-bool CdbOptions::equals(const CdbOptions &rhs) const
+unsigned CdbOptions::compare(const CdbOptions &rhs) const
{
- return enabled == rhs.enabled && path == rhs.path;
+ unsigned rc = 0;
+ if (enabled != rhs.enabled || path != rhs.path)
+ rc |= InitializationOptionsChanged;
+ if (symbolPaths != rhs.symbolPaths || sourcePaths != rhs.sourcePaths)
+ rc |= DebuggerPathsChanged;
+ return rc;
}
} // namespace Internal
diff --git a/src/plugins/debugger/cdb/cdboptions.h b/src/plugins/debugger/cdb/cdboptions.h
index f9853008e86ab7578f5758c1e1788ffdad1bb953..f783de6696520c3442a7c3b2970440ae99e3fea5 100644
--- a/src/plugins/debugger/cdb/cdboptions.h
+++ b/src/plugins/debugger/cdb/cdboptions.h
@@ -30,7 +30,7 @@
#ifndef CDBSETTINGS_H
#define CDBSETTINGS_H
-#include <QtCore/QString>
+#include <QtCore/QStringList>
QT_BEGIN_NAMESPACE
class QSettings;
@@ -48,19 +48,23 @@ public:
void fromSettings(const QSettings *s);
void toSettings(QSettings *s) const;
- bool equals(const CdbOptions &s) const;
+ // A set of flags for comparison function.
+ enum ChangeFlags { InitializationOptionsChanged = 0x1, DebuggerPathsChanged = 0x2 };
+ unsigned compare(const CdbOptions &s) const;
// Locate the debugging tools
static bool autoDetectPath(QString *path);
bool enabled;
QString path;
+ QStringList symbolPaths;
+ QStringList sourcePaths;
};
inline bool operator==(const CdbOptions &s1, const CdbOptions &s2)
-{ return s1.equals(s2); }
+{ return s1.compare(s2) == 0u; }
inline bool operator!=(const CdbOptions &s1, const CdbOptions &s2)
-{ return !s1.equals(s2); }
+{ return s1.compare(s2) != 0u; }
} // namespace Internal
} // namespace Debugger
diff --git a/src/plugins/debugger/cdb/cdboptionspage.cpp b/src/plugins/debugger/cdb/cdboptionspage.cpp
index 7ae8f765acc828445fcd80c54d1b55426bdd9a40..878d3f846eda91dfd27e7800f4abda6b300dc8a2 100644
--- a/src/plugins/debugger/cdb/cdboptionspage.cpp
+++ b/src/plugins/debugger/cdb/cdboptionspage.cpp
@@ -53,6 +53,8 @@ void CdbOptionsPageWidget::setOptions(CdbOptions &o)
{
m_ui.pathChooser->setPath(o.path);
m_ui.cdbOptionsGroupBox->setChecked(o.enabled);
+ m_ui.symbolPathListEditor->setPathList(o.symbolPaths);
+ m_ui.sourcePathListEditor->setPathList(o.sourcePaths);
}
CdbOptions CdbOptionsPageWidget::options() const
@@ -60,6 +62,8 @@ CdbOptions CdbOptionsPageWidget::options() const
CdbOptions rc;
rc.path = m_ui.pathChooser->path();
rc.enabled = m_ui.cdbOptionsGroupBox->isChecked();
+ rc.symbolPaths = m_ui.symbolPathListEditor->pathList();
+ rc.sourcePaths = m_ui.sourcePathListEditor->pathList();
return rc;
}
@@ -121,9 +125,11 @@ void CdbOptionsPage::apply()
if (!m_widget)
return;
const CdbOptions newOptions = m_widget->options();
- if (newOptions != *m_options) {
+ if (const unsigned changedMask = m_options->compare(newOptions)) {
*m_options = newOptions;
m_options->toSettings(Core::ICore::instance()->settings());
+ if (changedMask & CdbOptions::DebuggerPathsChanged)
+ emit debuggerPathsChanged();
}
}
diff --git a/src/plugins/debugger/cdb/cdboptionspage.h b/src/plugins/debugger/cdb/cdboptionspage.h
index ed92ced6c23469f980e55637117348effe1ab16a..a1778cde9a6073e234f01e53001731ebbfb293fb 100644
--- a/src/plugins/debugger/cdb/cdboptionspage.h
+++ b/src/plugins/debugger/cdb/cdboptionspage.h
@@ -83,6 +83,9 @@ public:
// Load failure messages can be displayed here
void setFailureMessage(const QString &msg) { m_failureMessage = msg; }
+signals:
+ void debuggerPathsChanged();
+
private:
const QSharedPointer<CdbOptions> m_options;
QPointer<CdbOptionsPageWidget> m_widget;
diff --git a/src/plugins/debugger/cdb/cdboptionspagewidget.ui b/src/plugins/debugger/cdb/cdboptionspagewidget.ui
index 9840aef3c07e071dcd8ecc9cee0e1dead1ab4cb5..e14fe0a969236f2e85d390fdb59033389e6ade4f 100644
--- a/src/plugins/debugger/cdb/cdboptionspagewidget.ui
+++ b/src/plugins/debugger/cdb/cdboptionspagewidget.ui
@@ -6,13 +6,10 @@
<rect>
<x>0</x>
<y>0</y>
- <width>369</width>
- <height>281</height>
+ <width>522</width>
+ <height>512</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
@@ -48,7 +45,7 @@
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
+ <width>0</width>
<height>20</height>
</size>
</property>
@@ -56,6 +53,38 @@
</item>
</layout>
</item>
+ <item>
+ <widget class="QGroupBox" name="pathGroupBox">
+ <property name="title">
+ <string>Debugger Paths</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout_2">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="symbolPathLabel">
+ <property name="text">
+ <string>Symbol paths:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="Debugger::Internal::CdbSymbolPathListEditor" name="symbolPathListEditor" native="true"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="sourcePathLabel">
+ <property name="text">
+ <string>Source paths:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="Core::Utils::PathListEditor" name="sourcePathListEditor" native="true"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
@@ -64,7 +93,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>223</height>
+ <height>203</height>
</size>
</property>
</spacer>
@@ -74,9 +103,6 @@
<property name="styleSheet">
<string notr="true">background-color: 'red';</string>
</property>
- <property name="text">
- <string>TextLabel</string>
- </property>
<property name="wordWrap">
<bool>true</bool>
</property>
@@ -91,6 +117,18 @@
<header location="global">utils/pathchooser.h</header>
<container>1</container>
</customwidget>
+ <customwidget>
+ <class>Core::Utils::PathListEditor</class>
+ <extends>QWidget</extends>
+ <header location="global">utils/pathlisteditor.h</header>
+ <container>1</container>
+ </customwidget>
+ <customwidget>
+ <class>Debugger::Internal::CdbSymbolPathListEditor</class>
+ <extends>QWidget</extends>
+ <header>cdbsymbolpathlisteditor.h</header>
+ <container>1</container>
+ </customwidget>
</customwidgets>
<resources/>
<connections/>
diff --git a/src/plugins/debugger/cdb/cdbstackframecontext.cpp b/src/plugins/debugger/cdb/cdbstackframecontext.cpp
index fd59bd0fa6be95d4ca2d4d2a2b787783f8c1168a..48072bf2c2d3321027e8c0ce321ce2aead88fbdb 100644
--- a/src/plugins/debugger/cdb/cdbstackframecontext.cpp
+++ b/src/plugins/debugger/cdb/cdbstackframecontext.cpp
@@ -135,9 +135,11 @@ bool CdbStackFrameContext::populateModelInitially(WatchHandler *wh, QString *err
qDebug() << "populateModelInitially";
const bool rc = m_useDumpers ?
CdbSymbolGroupContext::populateModelInitially(m_symbolContext,
- WatchHandlerSorterInserter(wh, m_dumper),
+ wh->expandedINames(),
+ WatchHandlerSorterInserter(wh, m_dumper),
errorMessage) :
CdbSymbolGroupContext::populateModelInitially(m_symbolContext,
+ wh->expandedINames(),
WatchHandlerModelInserter(wh),
errorMessage);
return rc;
diff --git a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
index 47035c5ec4df3d6d2d6834d854017b6ce8f80bdd..25931005ddd43c4a3437cd2ca0ea94cc463469d5 100644
--- a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
+++ b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
@@ -97,7 +97,7 @@ static inline QString getSymbolString(IDebugSymbolGroup2 *sg,
}
namespace Debugger {
- namespace Internal {
+namespace Internal {
static inline CdbSymbolGroupContext::SymbolState getSymbolState(const DEBUG_SYMBOL_PARAMETERS &p)
{
@@ -125,7 +125,7 @@ CdbSymbolGroupContext *CdbSymbolGroupContext::create(const QString &prefix,
CIDebugSymbolGroup *symbolGroup,
QString *errorMessage)
{
- CdbSymbolGroupContext *rc= new CdbSymbolGroupContext(prefix, symbolGroup);
+ CdbSymbolGroupContext *rc = new CdbSymbolGroupContext(prefix, symbolGroup);
if (!rc->init(errorMessage)) {
delete rc;
return 0;
@@ -213,11 +213,23 @@ CdbSymbolGroupContext::SymbolState CdbSymbolGroupContext::symbolState(const QStr
{
if (prefix == m_prefix) // root
return ExpandedSymbol;
+ unsigned long index;
+ if (!lookupPrefix(prefix, &index)) {
+ qWarning("WARNING %s: %s\n", Q_FUNC_INFO, msgSymbolNotFound(prefix));
+ return LeafSymbol;
+ }
+ return symbolState(index);
+}
+
+// Find index of a prefix
+bool CdbSymbolGroupContext::lookupPrefix(const QString &prefix, unsigned long *index) const
+{
+ *index = 0;
const NameIndexMap::const_iterator it = m_inameIndexMap.constFind(prefix);
- if (it != m_inameIndexMap.constEnd())
- return symbolState(it.value());
- qWarning("WARNING %s: %s\n", Q_FUNC_INFO, msgSymbolNotFound(prefix));
- return LeafSymbol;
+ if (it == m_inameIndexMap.constEnd())
+ return false;
+ *index = it.value();
+ return true;
}
/* Retrieve children and get the position. */
@@ -401,7 +413,7 @@ static QString formatArrayHelper(const Integer *array, int size, int base = 10)
{
QString rc;
const QString hexPrefix = QLatin1String("0x");
- const QString separator= QLatin1String(", ");
+ const QString separator = QLatin1String(", ");
const bool hex = base == 16;
for (int i = 0; i < size; i++) {
if (i)
diff --git a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.h b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.h
index ea992e546cfa898093eec84bd3563f0cd5f1d27f..bfd5ecd3b98aae91b563148c94b8fe737d169e9a 100644
--- a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.h
+++ b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.h
@@ -39,6 +39,7 @@
#include <QtCore/QStringList>
#include <QtCore/QPair>
#include <QtCore/QMap>
+#include <QtCore/QSet>
namespace Debugger {
namespace Internal {
@@ -74,7 +75,9 @@ public:
QString *newValue /* = 0 */, QString *errorMessage);
template <class OutputIterator>
- static bool populateModelInitially(CdbSymbolGroupContext *sg, OutputIterator it, QString *errorMessage);
+ static bool populateModelInitially(CdbSymbolGroupContext *sg,
+ QSet<QString> expandedINames,
+ OutputIterator it, QString *errorMessage);
template <class OutputIterator>
static bool completeModel(CdbSymbolGroupContext *sg,
@@ -116,6 +119,7 @@ private:
void populateINameIndexMap(const QString &prefix, unsigned long parentId, unsigned long start, unsigned long count);
WatchData symbolAt(unsigned long index) const;
QString symbolINameAt(unsigned long index) const;
+ bool lookupPrefix(const QString &prefix, unsigned long *index) const;
int getDisplayableChildCount(unsigned long index) const;
inline DEBUG_SYMBOL_PARAMETERS *symbolParameters() { return &(*m_symbolParameters.begin()); }
diff --git a/src/plugins/debugger/cdb/cdbsymbolgroupcontext_tpl.h b/src/plugins/debugger/cdb/cdbsymbolgroupcontext_tpl.h
index 9a2f992bf47b46ba5a7695d560126ffac88db04f..52777a2f6b956c58bdcace83192f856add6dc079 100644
--- a/src/plugins/debugger/cdb/cdbsymbolgroupcontext_tpl.h
+++ b/src/plugins/debugger/cdb/cdbsymbolgroupcontext_tpl.h
@@ -154,6 +154,7 @@ template <class OutputIterator>
template <class OutputIterator>
bool CdbSymbolGroupContext::populateModelInitially(CdbSymbolGroupContext *sg,
+ QSet<QString> expandedINames,
OutputIterator it,
QString *errorMessage)
{
@@ -164,7 +165,26 @@ bool CdbSymbolGroupContext::populateModelInitially(CdbSymbolGroupContext *sg,
QList<WatchData> watchList;
if (!sg->getChildSymbols(sg->prefix(), WatchDataBackInserter(watchList), errorMessage))
return false;
-
+ // (Recursively) expand symbols stored as expanded in the history until no more matches
+ // are found.
+ while (!expandedINames.empty()) {
+ unsigned matchCount = 0;
+ for (QSet<QString>::iterator it = expandedINames.begin(); it != expandedINames.end(); ) {
+ // Try to expand. We might hit on a leaf due to name mismatches, ignore errors.
+ unsigned long index;
+ if (sg->lookupPrefix(*it, &index)) {
+ if (!sg->expandSymbol(*it, index, errorMessage))
+ qWarning("%s\n", qPrintable(*errorMessage));
+ matchCount++;
+ it = expandedINames.erase(it);
+ } else {
+ ++it;
+ }
+ } // loop set
+ if (matchCount == 0)
+ break;
+ }
+ // Insert data
foreach(const WatchData &wd, watchList)
if (!insertSymbolRecursion(wd, sg, it, 0, 0, errorMessage))
return false;
diff --git a/src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp b/src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c36531896f36b96e77f914c9cbca7f14c6ad52cd
--- /dev/null
+++ b/src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
@@ -0,0 +1,59 @@
+/**************************************************************************
+**
+** 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 "cdbsymbolpathlisteditor.h"
+
+#include <QtGui/QFileDialog>
+#include <QtGui/QAction>
+
+namespace Debugger {
+namespace Internal {
+
+CdbSymbolPathListEditor::CdbSymbolPathListEditor(QWidget *parent) :
+ Core::Utils::PathListEditor(parent)
+{
+ //! Add Microsoft Symbol server connection
+ QAction *action = insertAction(lastAddActionIndex() + 1, tr("Symbol Server..."), this, SLOT(addSymbolServer()));
+ action->setToolTip(tr("Adds the Microsoft symbol server providing symbols for operating system libraries."
+ "Requires specifying a local cache directory."));
+}
+
+void CdbSymbolPathListEditor::addSymbolServer()
+{
+ const QString title = tr("Pick a local cache directory");
+ const QString cacheDir = QFileDialog::getExistingDirectory(this, title);
+ if (!cacheDir.isEmpty()) {
+ const QString path = QString::fromLatin1("symsrv*symsrv.dll*%1*http://msdl.microsoft.com/download/symbols").
+ arg(QDir::toNativeSeparators(cacheDir));
+ insertPathAtCursor(path);
+ }
+}
+
+} // namespace Internal
+} // namespace Debugger
diff --git a/src/plugins/debugger/cdb/cdbsymbolpathlisteditor.h b/src/plugins/debugger/cdb/cdbsymbolpathlisteditor.h
new file mode 100644
index 0000000000000000000000000000000000000000..73b45d7db63a3fe70953efd704ab58a29bf088d4
--- /dev/null
+++ b/src/plugins/debugger/cdb/cdbsymbolpathlisteditor.h
@@ -0,0 +1,51 @@
+/**************************************************************************
+**
+** 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.
+**
+**************************************************************************/
+
+#ifndef SYMBOLPATHLISTEDITOR_H
+#define SYMBOLPATHLISTEDITOR_H
+
+#include <utils/pathlisteditor.h>
+
+namespace Debugger {
+namespace Internal {
+
+class CdbSymbolPathListEditor : public Core::Utils::PathListEditor
+{
+ Q_OBJECT
+public:
+ explicit CdbSymbolPathListEditor(QWidget *parent = 0);
+
+private slots:
+ void addSymbolServer();
+};
+
+} // namespace Internal
+} // namespace Debugger
+
+#endif // SYMBOLPATHLISTEDITOR_H
diff --git a/src/plugins/debugger/commonoptionspage.ui b/src/plugins/debugger/commonoptionspage.ui
index 8804fa8dbd309d632e87ef3d621208bbc72523b3..f012accca93dca1e7dd3b071c93a1e07f2f7c089 100644
--- a/src/plugins/debugger/commonoptionspage.ui
+++ b/src/plugins/debugger/commonoptionspage.ui
@@ -10,9 +10,6 @@
<height>452</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QGroupBox" name="groupBox">
@@ -51,7 +48,7 @@
<item>
<widget class="QCheckBox" name="checkBoxUseToolTips">
<property name="toolTip">
- <string>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.</string>
+ <string>Checking this will 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.</string>
</property>
<property name="text">
<string>Use tooltips while debugging</string>
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index 9db3871314dbe690297377feb1d11ce09c634e1e..f708ba1b42ee7c670aceef61de96db1417243a85 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
TARGET = Debugger
# CONFIG += single
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../plugins/find/find.pri)
include(../../plugins/coreplugin/coreplugin.pri)
@@ -41,6 +41,7 @@ HEADERS += \
stackhandler.h \
stackwindow.h \
sourcefileswindow.h \
+ tcfengine.h \
threadswindow.h \
watchhandler.h \
watchwindow.h \
@@ -72,12 +73,14 @@ SOURCES += \
stackwindow.cpp \
sourcefileswindow.cpp \
threadswindow.cpp \
+ tcfengine.cpp \
watchhandler.cpp \
watchwindow.cpp \
gdboptionspage.cpp
FORMS += attachexternaldialog.ui \
attachcoredialog.ui \
+ attachtcfdialog.ui \
breakbyfunction.ui \
breakcondition.ui \
dumperoptionpage.ui \
diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc
index c00d8b24e15ea0f4b5fed9a3893a6a95285a21d3..608626d970005abb7ed8f6a973559c445fb0d463 100644
--- a/src/plugins/debugger/debugger.qrc
+++ b/src/plugins/debugger/debugger.qrc
@@ -1,5 +1,6 @@
<RCC>
<qresource prefix="/gdbdebugger" >
+ <file>gdbmacros.txt</file>
<file>images/breakpoint.svg</file>
<file>images/breakpoint_pending.svg</file>
<file>images/breakpoint_disabled.svg</file>
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index b96e059a6662dea87bf17f491b5871bbfae59b55..e6358718bde2c2a7a9461d5b44481893b1c631e2 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -194,7 +194,7 @@ DebuggerSettings *DebuggerSettings::instance()
// Breakpoints
//
item = new SavedAction(instance);
- item->setText(tr("Syncronize breakpoints"));
+ item->setText(tr("Synchronize breakpoints"));
instance->insertItem(SynchronizeBreakpoints, item);
diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index f30ee2c417297fb9740cac61d004f94043fbe1ae..6b43214def22339fcbf891bb221269be7a9d34ab 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -31,6 +31,7 @@
#include "ui_attachcoredialog.h"
#include "ui_attachexternaldialog.h"
+#include "ui_attachtcfdialog.h"
#include "ui_startexternaldialog.h"
#include "ui_startremotedialog.h"
@@ -302,39 +303,44 @@ void AttachExternalDialog::pidChanged(const QString &pid)
///////////////////////////////////////////////////////////////////////
//
-// StartRemoteDialog
+// AttachTcfDialog
//
///////////////////////////////////////////////////////////////////////
-StartRemoteDialog::StartRemoteDialog(QWidget *parent)
+AttachTcfDialog::AttachTcfDialog(QWidget *parent)
: QDialog(parent),
- m_ui(new Ui::StartRemoteDialog)
+ m_ui(new Ui::AttachTcfDialog)
{
m_ui->setupUi(this);
m_ui->buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
m_ui->serverStartScript->setExpectedKind(Core::Utils::PathChooser::File);
m_ui->serverStartScript->setPromptDialogTitle(tr("Select Executable"));
+
+ connect(m_ui->useServerStartScriptCheckBox, SIGNAL(toggled(bool)),
+ this, SLOT(updateState()));
connect(m_ui->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(m_ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+
+ updateState();
}
-StartRemoteDialog::~StartRemoteDialog()
+AttachTcfDialog::~AttachTcfDialog()
{
delete m_ui;
}
-void StartRemoteDialog::setRemoteChannel(const QString &channel)
+void AttachTcfDialog::setRemoteChannel(const QString &channel)
{
m_ui->channelLineEdit->setText(channel);
}
-QString StartRemoteDialog::remoteChannel() const
+QString AttachTcfDialog::remoteChannel() const
{
return m_ui->channelLineEdit->text();
}
-void StartRemoteDialog::setRemoteArchitectures(const QStringList &list)
+void AttachTcfDialog::setRemoteArchitectures(const QStringList &list)
{
m_ui->architectureComboBox->clear();
if (!list.isEmpty()) {
@@ -343,29 +349,46 @@ void StartRemoteDialog::setRemoteArchitectures(const QStringList &list)
}
}
-void StartRemoteDialog::setRemoteArchitecture(const QString &arch)
+void AttachTcfDialog::setRemoteArchitecture(const QString &arch)
{
int index = m_ui->architectureComboBox->findText(arch);
if (index != -1)
m_ui->architectureComboBox->setCurrentIndex(index);
}
-QString StartRemoteDialog::remoteArchitecture() const
+QString AttachTcfDialog::remoteArchitecture() const
{
int index = m_ui->architectureComboBox->currentIndex();
return m_ui->architectureComboBox->itemText(index);
}
-void StartRemoteDialog::setServerStartScript(const QString &scriptName)
+void AttachTcfDialog::setServerStartScript(const QString &scriptName)
{
m_ui->serverStartScript->setPath(scriptName);
}
-QString StartRemoteDialog::serverStartScript() const
+QString AttachTcfDialog::serverStartScript() const
{
return m_ui->serverStartScript->path();
}
+void AttachTcfDialog::setUseServerStartScript(bool on)
+{
+ m_ui->useServerStartScriptCheckBox->setChecked(on);
+}
+
+bool AttachTcfDialog::useServerStartScript() const
+{
+ return m_ui->useServerStartScriptCheckBox->isChecked();
+}
+
+void AttachTcfDialog::updateState()
+{
+ bool enabled = m_ui->useServerStartScriptCheckBox->isChecked();
+ m_ui->serverStartScriptLabel->setEnabled(enabled);
+ m_ui->serverStartScript->setEnabled(enabled);
+}
+
///////////////////////////////////////////////////////////////////////
//
// StartExternalDialog
@@ -402,14 +425,14 @@ void StartExternalDialog::setExecutableFile(const QString &str)
m_ui->execFile->setPath(str);
}
-void StartExternalDialog::setExecutableArguments(const QString &str)
+QString StartExternalDialog::executableFile() const
{
- m_ui->argsEdit->setText(str);
+ return m_ui->execFile->path();
}
-QString StartExternalDialog::executableFile() const
+void StartExternalDialog::setExecutableArguments(const QString &str)
{
- return m_ui->execFile->path();
+ m_ui->argsEdit->setText(str);
}
QString StartExternalDialog::executableArguments() const
@@ -417,5 +440,94 @@ QString StartExternalDialog::executableArguments() const
return m_ui->argsEdit->text();
}
+
+///////////////////////////////////////////////////////////////////////
+//
+// StartRemoteDialog
+//
+///////////////////////////////////////////////////////////////////////
+
+StartRemoteDialog::StartRemoteDialog(QWidget *parent)
+ : QDialog(parent),
+ m_ui(new Ui::StartRemoteDialog)
+{
+ m_ui->setupUi(this);
+ m_ui->buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
+ m_ui->serverStartScript->setExpectedKind(Core::Utils::PathChooser::File);
+ m_ui->serverStartScript->setPromptDialogTitle(tr("Select Executable"));
+
+ connect(m_ui->useServerStartScriptCheckBox, SIGNAL(toggled(bool)),
+ this, SLOT(updateState()));
+
+ connect(m_ui->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+ connect(m_ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+
+ updateState();
+}
+
+StartRemoteDialog::~StartRemoteDialog()
+{
+ delete m_ui;
+}
+
+void StartRemoteDialog::setRemoteChannel(const QString &channel)
+{
+ m_ui->channelLineEdit->setText(channel);
+}
+
+QString StartRemoteDialog::remoteChannel() const
+{
+ return m_ui->channelLineEdit->text();
+}
+
+void StartRemoteDialog::setRemoteArchitectures(const QStringList &list)
+{
+ m_ui->architectureComboBox->clear();
+ if (!list.isEmpty()) {
+ m_ui->architectureComboBox->insertItems(0, list);
+ m_ui->architectureComboBox->setCurrentIndex(0);
+ }
+}
+
+void StartRemoteDialog::setRemoteArchitecture(const QString &arch)
+{
+ int index = m_ui->architectureComboBox->findText(arch);
+ if (index != -1)
+ m_ui->architectureComboBox->setCurrentIndex(index);
+}
+
+QString StartRemoteDialog::remoteArchitecture() const
+{
+ int index = m_ui->architectureComboBox->currentIndex();
+ return m_ui->architectureComboBox->itemText(index);
+}
+
+void StartRemoteDialog::setServerStartScript(const QString &scriptName)
+{
+ m_ui->serverStartScript->setPath(scriptName);
+}
+
+QString StartRemoteDialog::serverStartScript() const
+{
+ return m_ui->serverStartScript->path();
+}
+
+void StartRemoteDialog::setUseServerStartScript(bool on)
+{
+ m_ui->useServerStartScriptCheckBox->setChecked(on);
+}
+
+bool StartRemoteDialog::useServerStartScript() const
+{
+ return m_ui->useServerStartScriptCheckBox->isChecked();
+}
+
+void StartRemoteDialog::updateState()
+{
+ bool enabled = m_ui->useServerStartScriptCheckBox->isChecked();
+ m_ui->serverStartScriptLabel->setEnabled(enabled);
+ m_ui->serverStartScript->setEnabled(enabled);
+}
+
} // namespace Internal
} // namespace Debugger
diff --git a/src/plugins/debugger/debuggerdialogs.h b/src/plugins/debugger/debuggerdialogs.h
index 403e094d4cc6c80236fca844cc772a3145ce0aa0..98008e7612cbb1ce4a3d700cf3e0fe52a54b3e00 100644
--- a/src/plugins/debugger/debuggerdialogs.h
+++ b/src/plugins/debugger/debuggerdialogs.h
@@ -40,6 +40,7 @@ class QPushButton;
namespace Ui {
class AttachCoreDialog;
class AttachExternalDialog;
+class AttachTcfDialog;
class StartExternalDialog;
class StartRemoteDialog;
} // namespace Ui
@@ -101,13 +102,13 @@ private:
ProcessListFilterModel *m_model;
};
-class StartRemoteDialog : public QDialog
+class AttachTcfDialog : public QDialog
{
Q_OBJECT
public:
- explicit StartRemoteDialog(QWidget *parent);
- ~StartRemoteDialog();
+ explicit AttachTcfDialog(QWidget *parent);
+ ~AttachTcfDialog();
void setRemoteChannel(const QString &host);
void setRemoteArchitecture(const QString &arch);
@@ -116,9 +117,14 @@ public:
QString remoteArchitecture() const;
void setServerStartScript(const QString &scriptName);
QString serverStartScript() const;
+ void setUseServerStartScript(bool on);
+ bool useServerStartScript() const;
+
+private slots:
+ void updateState();
private:
- Ui::StartRemoteDialog *m_ui;
+ Ui::AttachTcfDialog *m_ui;
};
class StartExternalDialog : public QDialog
@@ -139,6 +145,31 @@ private:
Ui::StartExternalDialog *m_ui;
};
+class StartRemoteDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ explicit StartRemoteDialog(QWidget *parent);
+ ~StartRemoteDialog();
+
+ void setRemoteChannel(const QString &host);
+ void setRemoteArchitecture(const QString &arch);
+ void setRemoteArchitectures(const QStringList &arches);
+ QString remoteChannel() const;
+ QString remoteArchitecture() const;
+ void setServerStartScript(const QString &scriptName);
+ QString serverStartScript() const;
+ void setUseServerStartScript(bool on);
+ bool useServerStartScript() const;
+
+private slots:
+ void updateState();
+
+private:
+ Ui::StartRemoteDialog *m_ui;
+};
+
} // namespace Debugger
} // namespace Internal
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index cbcd0f76f3e954eb318d82a0eb5b47c59cbf6dfe..9f29c1c83c0045da7eb1aa0d926cf03db2eda25f 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -142,6 +142,7 @@ public:
static IDebuggerEngine *gdbEngine = 0;
static IDebuggerEngine *winEngine = 0;
static IDebuggerEngine *scriptEngine = 0;
+static IDebuggerEngine *tcfEngine = 0;
// The creation functions take a list of options pages they can add to.
// This allows for having a "enabled" toggle on the page indepently
@@ -154,6 +155,7 @@ IDebuggerEngine *createWinEngine(DebuggerManager *, bool /* cmdLineDisabled */,
{ return 0; }
#endif
IDebuggerEngine *createScriptEngine(DebuggerManager *parent, QList<Core::IOptionsPage*> *);
+IDebuggerEngine *createTcfEngine(DebuggerManager *parent, QList<Core::IOptionsPage*> *);
DebuggerManager::DebuggerManager()
{
@@ -162,9 +164,12 @@ DebuggerManager::DebuggerManager()
DebuggerManager::~DebuggerManager()
{
- delete gdbEngine;
- delete winEngine;
- delete scriptEngine;
+ #define doDelete(ptr) delete ptr; ptr = 0
+ doDelete(gdbEngine);
+ doDelete(winEngine);
+ doDelete(scriptEngine);
+ doDelete(tcfEngine);
+ #undef doDelete
}
void DebuggerManager::init()
@@ -180,6 +185,11 @@ void DebuggerManager::init()
m_registerHandler = 0;
m_statusLabel = new QLabel;
+ // FIXME: Do something to show overly long messages at least partially
+ //QSizePolicy policy = m_statusLabel->sizePolicy();
+ //policy.setHorizontalPolicy(QSizePolicy::MinimumExpanding);
+ //m_statusLabel->setSizePolicy(policy);
+ //m_statusLabel->setWordWrap(true);
m_breakWindow = new BreakWindow;
m_disassemblerWindow = new DisassemblerWindow;
m_modulesWindow = new ModulesWindow(this);
@@ -430,29 +440,13 @@ QList<Core::IOptionsPage*> DebuggerManager::initializeEngines(const QStringList
const bool cdbDisabled = arguments.contains(_("-disable-cdb"));
winEngine = createWinEngine(this, cdbDisabled, &rc);
scriptEngine = createScriptEngine(this, &rc);
- setDebuggerType(NoDebugger);
+ tcfEngine = createTcfEngine(this, &rc);
+ m_engine = 0;
if (Debugger::Constants::Internal::debug)
qDebug() << Q_FUNC_INFO << gdbEngine << winEngine << scriptEngine << rc.size();
return rc;
}
-void DebuggerManager::setDebuggerType(DebuggerType type)
-{
- switch (type) {
- case GdbDebugger:
- m_engine = gdbEngine;
- break;
- case ScriptDebugger:
- m_engine = scriptEngine;
- break;
- case WinDebugger:
- m_engine = winEngine;
- break;
- case NoDebugger:
- m_engine = 0;
- }
-}
-
IDebuggerEngine *DebuggerManager::engine()
{
return m_engine;
@@ -515,8 +509,8 @@ void DebuggerManager::setSimpleDockWidgetArrangement()
m_mainWindow->tabifyDockWidget(m_watchDock, m_threadsDock);
m_mainWindow->tabifyDockWidget(m_watchDock, m_sourceFilesDock);
- // They are rarely used even in ordinary debugging. Hiding them also saves
- // cycles since the corresponding information won't be retrieved.
+ // They following views are rarely used in ordinary debugging. Hiding them
+ // saves cycles since the corresponding information won't be retrieved.
m_sourceFilesDock->hide();
m_registerDock->hide();
m_disassemblerDock->hide();
@@ -629,54 +623,34 @@ void DebuggerManager::shutdown()
m_engine->shutdown();
m_engine = 0;
- delete scriptEngine;
- scriptEngine = 0;
- delete gdbEngine;
- gdbEngine = 0;
- delete winEngine;
- winEngine = 0;
+ #define doDelete(ptr) delete ptr; ptr = 0
+ doDelete(scriptEngine);
+ doDelete(gdbEngine);
+ doDelete(winEngine);
+ doDelete(tcfEngine);
// Delete these manually before deleting the manager
// (who will delete the models for most views)
- delete m_breakWindow;
- delete m_disassemblerWindow;
- delete m_modulesWindow;
- delete m_outputWindow;
- delete m_registerWindow;
- delete m_stackWindow;
- delete m_sourceFilesWindow;
- delete m_threadsWindow;
- delete m_tooltipWindow;
- delete m_watchersWindow;
- delete m_localsWindow;
- // These widgets are all in some layout which will take care of deletion.
- m_breakWindow = 0;
- m_disassemblerWindow = 0;
- m_modulesWindow = 0;
- m_outputWindow = 0;
- m_registerWindow = 0;
- m_stackWindow = 0;
- m_sourceFilesWindow = 0;
- m_threadsWindow = 0;
- m_tooltipWindow = 0;
- m_watchersWindow = 0;
- m_localsWindow = 0;
-
- delete m_breakHandler;
- delete m_disassemblerHandler;
- delete m_threadsHandler;
- delete m_modulesHandler;
- delete m_registerHandler;
- delete m_stackHandler;
- delete m_watchHandler;
- m_breakHandler = 0;
- m_disassemblerHandler = 0;
- m_threadsHandler = 0;
- m_modulesHandler = 0;
- m_registerHandler = 0;
- m_stackHandler = 0;
- m_watchHandler = 0;
- //qDebug() << "DEBUGGER_MANAGER SHUTDOWN END";
+ doDelete(m_breakWindow);
+ doDelete(m_disassemblerWindow);
+ doDelete(m_modulesWindow);
+ doDelete(m_outputWindow);
+ doDelete(m_registerWindow);
+ doDelete(m_stackWindow);
+ doDelete(m_sourceFilesWindow);
+ doDelete(m_threadsWindow);
+ doDelete(m_tooltipWindow);
+ doDelete(m_watchersWindow);
+ doDelete(m_localsWindow);
+
+ doDelete(m_breakHandler);
+ doDelete(m_disassemblerHandler);
+ doDelete(m_threadsHandler);
+ doDelete(m_modulesHandler);
+ doDelete(m_registerHandler);
+ doDelete(m_stackHandler);
+ doDelete(m_watchHandler);
+ #undef doDelete
}
BreakpointData *DebuggerManager::findBreakpoint(const QString &fileName, int lineNumber)
@@ -786,50 +760,43 @@ void DebuggerManager::setConfigValue(const QString &name, const QVariant &value)
}
// Figure out the debugger type of an executable
-static bool determineDebuggerType(const QString &executable,
- DebuggerManager::DebuggerType *dt,
+static IDebuggerEngine *determineDebuggerEngine(const QString &executable,
QString *errorMessage)
{
- if (executable.endsWith(_(".js"))) {
- *dt = DebuggerManager::ScriptDebugger;
- return true;
- }
+ if (executable.endsWith(_(".js")))
+ return scriptEngine;
+
#ifndef Q_OS_WIN
- *dt = DebuggerManager::GdbDebugger;
Q_UNUSED(errorMessage)
- return true;
+ return gdbEngine;
#else
// If a file has PDB files, it has been compiled by VS.
QStringList pdbFiles;
if (!getPDBFiles(executable, &pdbFiles, errorMessage))
- return false;
- if (pdbFiles.empty()) {
- *dt = DebuggerManager::GdbDebugger;
- return true;
- }
+ return 0;
+ if (pdbFiles.empty())
+ return gdbEngine;
+
// We need the CDB debugger in order to be able to debug VS
// executables
if (!winEngine) {
*errorMessage = DebuggerManager::tr("Debugging VS executables is not supported.");
- return false;
+ return 0;
}
- *dt = DebuggerManager::WinDebugger;
- return true;
+ return winEngine;
#endif
}
// Figure out the debugger type of a PID
-static bool determineDebuggerType(int /* pid */,
- DebuggerManager::DebuggerType *dt,
+static IDebuggerEngine *determineDebuggerEngine(int /* pid */,
QString * /*errorMessage*/)
{
#ifdef Q_OS_WIN
// Preferably Windows debugger
- *dt = winEngine ? DebuggerManager::WinDebugger : DebuggerManager::GdbDebugger;
+ return winEngine ? winEngine : gdbEngine;
#else
- *dt = DebuggerManager::GdbDebugger;
+ return gdbEngine;
#endif
- return true;
}
void DebuggerManager::startNewDebugger(DebuggerRunControl *runControl)
@@ -934,9 +901,14 @@ void DebuggerManager::startNewDebugger(DebuggerRunControl *runControl)
QStringList arches;
arches.append(_("i386:x86-64:intel"));
dlg.setRemoteArchitectures(arches);
- dlg.setRemoteChannel(configValue(_("LastRemoteChannel")).toString());
- dlg.setRemoteArchitecture(configValue(_("LastRemoteArchtecture")).toString());
- dlg.setServerStartScript(configValue(_("LastServerStartScript")).toString());
+ dlg.setRemoteChannel(
+ configValue(_("LastRemoteChannel")).toString());
+ dlg.setRemoteArchitecture(
+ configValue(_("LastRemoteArchitecture")).toString());
+ dlg.setServerStartScript(
+ configValue(_("LastServerStartScript")).toString());
+ dlg.setUseServerStartScript(
+ configValue(_("LastUseServerStartScript")).toBool());
if (dlg.exec() != QDialog::Accepted) {
runControl->debuggingFinished();
return;
@@ -944,30 +916,63 @@ void DebuggerManager::startNewDebugger(DebuggerRunControl *runControl)
setConfigValue(_("LastRemoteChannel"), dlg.remoteChannel());
setConfigValue(_("LastRemoteArchitecture"), dlg.remoteArchitecture());
setConfigValue(_("LastServerStartScript"), dlg.serverStartScript());
+ setConfigValue(_("LastUseServerStartScript"), dlg.useServerStartScript());
m_remoteChannel = dlg.remoteChannel();
m_remoteArchitecture = dlg.remoteArchitecture();
m_serverStartScript = dlg.serverStartScript();
+ if (!dlg.useServerStartScript())
+ m_serverStartScript.clear();
+ break;
+ }
+ case AttachTcf: {
+ AttachTcfDialog dlg(mainWindow());
+ QStringList arches;
+ arches.append(_("i386:x86-64:intel"));
+ dlg.setRemoteArchitectures(arches);
+ dlg.setRemoteChannel(
+ configValue(_("LastTcfRemoteChannel")).toString());
+ dlg.setRemoteArchitecture(
+ configValue(_("LastTcfRemoteArchitecture")).toString());
+ dlg.setServerStartScript(
+ configValue(_("LastTcfServerStartScript")).toString());
+ dlg.setUseServerStartScript(
+ configValue(_("LastTcfUseServerStartScript")).toBool());
+ if (dlg.exec() != QDialog::Accepted) {
+ runControl->debuggingFinished();
+ return;
+ }
+ setConfigValue(_("LastTcfRemoteChannel"), dlg.remoteChannel());
+ setConfigValue(_("LastTcfRemoteArchitecture"), dlg.remoteArchitecture());
+ setConfigValue(_("LastTcfServerStartScript"), dlg.serverStartScript());
+ setConfigValue(_("LastTcfUseServerStartScript"), dlg.useServerStartScript());
+ m_remoteChannel = dlg.remoteChannel();
+ m_remoteArchitecture = dlg.remoteArchitecture();
+ m_serverStartScript = dlg.serverStartScript();
+ if (!dlg.useServerStartScript())
+ m_serverStartScript.clear();
break;
}
}
emit debugModeRequested();
- DebuggerType type;
QString errorMessage;
- const bool hasDebugger = startMode() == AttachExternal
- ? determineDebuggerType(m_attachedPID, &type, &errorMessage)
- : determineDebuggerType(m_executable, &type, &errorMessage);
- if (!hasDebugger) {
+ if (startMode() == AttachExternal)
+ m_engine = determineDebuggerEngine(m_attachedPID, &errorMessage);
+ else if (startMode() == AttachTcf)
+ m_engine = tcfEngine;
+ else
+ m_engine = determineDebuggerEngine(m_executable, &errorMessage);
+
+ if (!m_engine) {
QMessageBox::warning(mainWindow(), tr("Warning"),
tr("Cannot debug '%1': %2").arg(m_executable, errorMessage));
debuggingFinished();
return;
}
if (Debugger::Constants::Internal::debug)
- qDebug() << m_executable << type;
+ qDebug() << m_executable << m_engine;
- setDebuggerType(type);
setBusyCursor(false);
setStatus(DebuggerProcessStartingUp);
if (!m_engine->startDebugger()) {
@@ -1236,15 +1241,6 @@ void DebuggerManager::setStatus(int status)
const bool ready = status == DebuggerInferiorStopped
&& startMode() != AttachCore;
-// FIXME
-// m_startExternalAction->setEnabled(!started && !starting);
-// m_attachExternalAction->setEnabled(!started && !starting);
-//#ifdef Q_OS_WIN
-// m_attachCoreAction->setEnabled(false);
-//#else
-// m_attachCoreAction->setEnabled(!started && !starting);
-//#endif
-// m_attachRemoteAction->setEnabled(!started && !starting);
m_watchAction->setEnabled(ready);
m_breakAction->setEnabled(true);
@@ -1307,6 +1303,12 @@ void DebuggerManager::continueExec()
m_engine->continueInferior();
}
+void DebuggerManager::detachDebugger()
+{
+ if (m_engine)
+ m_engine->detachDebugger();
+}
+
void DebuggerManager::interruptDebuggingRequest()
{
if (Debugger::Constants::Internal::debug)
@@ -1526,8 +1528,8 @@ void DebuggerManager::showQtDumperLibraryWarning(const QString &details)
dialog.setText(tr("The debugger did not find the debugging helper library."));
dialog.setInformativeText(tr("The debugging helper is used to nicely format the values of Qt "
"data types and some STL data types. "
- "It must be compiled for each Qt version, "
- "you can do this in the Qt preferences page by selecting "
+ "It must be compiled for each Qt version which "
+ "you can do in the Qt preferences page by selecting "
"a Qt installation and clicking on 'Rebuild' for the debugging "
"helper."));
if (!details.isEmpty())
diff --git a/src/plugins/debugger/debuggermanager.h b/src/plugins/debugger/debuggermanager.h
index 78d73c2db2b998102ed5ba354995fb360233dc75..53b252e6c99dca1e52e105c82cc53ade7566e88b 100644
--- a/src/plugins/debugger/debuggermanager.h
+++ b/src/plugins/debugger/debuggermanager.h
@@ -32,7 +32,6 @@
#include <QtCore/QByteArray>
#include <QtCore/QObject>
-#include <QtCore/QPoint>
#include <QtCore/QStringList>
#include <QtCore/QVariant>
@@ -42,19 +41,23 @@ class QAbstractItemModel;
class QDockWidget;
class QLabel;
class QMainWindow;
-class QModelIndex;
-class QSplitter;
+class QPoint;
class QTimer;
class QWidget;
QT_END_NAMESPACE
namespace Core {
- class IOptionsPage;
-}
+class IOptionsPage;
+} // namespace Core
namespace Debugger {
namespace Internal {
+typedef QLatin1Char _c;
+typedef QLatin1String __;
+inline QString _(const char *s) { return QString::fromLatin1(s); }
+inline QString _(const QByteArray &ba) { return QString::fromLatin1(ba, ba.size()); }
+
class DebuggerOutputWindow;
class DebuggerRunControl;
class DebuggerPlugin;
@@ -109,11 +112,12 @@ enum DebuggerStatus
enum DebuggerStartMode
{
- StartInternal, // Start current start project's binary
- StartExternal, // Start binary found in file system
- AttachExternal, // Attach to running process
- AttachCore, // Attach to a core file
- StartRemote // Start and attach to a remote process
+ StartInternal, // Start current start project's binary
+ StartExternal, // Start binary found in file system
+ AttachExternal, // Attach to running process
+ AttachTcf, // Attach to a running Target Communication Framework agent
+ AttachCore, // Attach to a core file
+ StartRemote // Start and attach to a remote process
};
class IDebuggerEngine;
@@ -142,13 +146,14 @@ public:
private:
// This is the part of the interface that's exclusively seen by the
// debugger engines
- friend class GdbEngine;
friend class CdbDebugEngine;
friend class CdbDebugEventCallback;
- friend class ScriptEngine;
- friend struct CdbDebugEnginePrivate;
friend class CdbDumperHelper;
friend class CdbExceptionLoggerEventCallback;
+ friend class GdbEngine;
+ friend class ScriptEngine;
+ friend class TcfEngine;
+ friend struct CdbDebugEnginePrivate;
// called from the engines after successful startup
virtual void notifyInferiorStopRequested() = 0;
@@ -202,8 +207,6 @@ public:
QMainWindow *mainWindow() const { return m_mainWindow; }
QLabel *statusLabel() const { return m_statusLabel; }
- enum DebuggerType { NoDebugger, GdbDebugger, ScriptDebugger, WinDebugger };
-
public slots:
void startNewDebugger(DebuggerRunControl *runControl);
void exitDebugger();
@@ -242,6 +245,7 @@ public slots:
void stepIExec();
void nextIExec();
void continueExec();
+ void detachDebugger();
void addToWatchWindow();
void updateWatchModel();
@@ -366,7 +370,6 @@ public:
private:
void init();
- void setDebuggerType(DebuggerType type);
void runTest(const QString &fileName);
QDockWidget *createDockForWidget(QWidget *widget);
Q_SLOT void createNewDock(QWidget *widget);
@@ -379,7 +382,6 @@ private:
void setToolTipExpression(const QPoint &pos, const QString &exp0);
DebuggerRunControl *m_runControl;
- DebuggerType m_debuggerType;
/// Views
QMainWindow *m_mainWindow;
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index d8ac64217ad2e9a78b6d4b82cede095838b5ebc3..262fd38912bd2aa6cd98b0badb4e17cc082a0a10 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -99,7 +99,9 @@ namespace Constants {
const char * const STARTEXTERNAL = "Debugger.StartExternal";
const char * const ATTACHEXTERNAL = "Debugger.AttachExternal";
const char * const ATTACHCORE = "Debugger.AttachCore";
+const char * const ATTACHTCF = "Debugger.AttachTcf";
const char * const ATTACHREMOTE = "Debugger.AttachRemote";
+const char * const DETACH = "Debugger.Detach";
const char * const RUN_TO_LINE = "Debugger.RunToLine";
const char * const RUN_TO_FUNCTION = "Debugger.RunToFunction";
@@ -346,8 +348,10 @@ QWidget *DebuggingHelperOptionPage::createPage(QWidget *parent)
this, SLOT(updateState()));
m_group.clear();
+#ifdef QT_DEBUG
m_group.insert(theDebuggerAction(UseDebuggingHelpers),
m_ui.checkBoxUseDebuggingHelpers);
+#endif
m_group.insert(theDebuggerAction(UseCustomDebuggingHelperLocation),
m_ui.checkBoxUseCustomDebuggingHelperLocation);
m_group.insert(theDebuggerAction(CustomDebuggingHelperLocation),
@@ -480,12 +484,25 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
m_attachCoreAction->setText(tr("Attach to Core..."));
connect(m_attachCoreAction, SIGNAL(triggered()), this, SLOT(attachCore()));
+ m_attachTcfAction = new QAction(this);
+ m_attachTcfAction->setText(tr("Attach to Running Tcf Agent..."));
+ m_attachTcfAction->setToolTip(tr("This attaches to a running "
+ "'Target Communication Framework' agent."));
+ connect(m_attachTcfAction, SIGNAL(triggered()),
+ this, SLOT(attachRemoteTcf()));
+
+
m_startRemoteAction = new QAction(this);
m_startRemoteAction->setText(tr("Start and Attach to Remote Application..."));
connect(m_startRemoteAction, SIGNAL(triggered()),
this, SLOT(startRemoteApplication()));
+ m_detachAction = new QAction(this);
+ m_detachAction->setText(tr("Detach debugger"));
+ connect(m_detachAction, SIGNAL(triggered()),
+ m_manager, SLOT(detachDebugger()));
+
Core::ActionContainer *mdebug =
am->actionContainer(ProjectExplorer::Constants::M_DEBUG);
@@ -502,12 +519,21 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
Constants::ATTACHCORE, globalcontext);
mdebug->addAction(cmd, Core::Constants::G_DEFAULT_ONE);
+ cmd = am->registerAction(m_attachTcfAction,
+ Constants::ATTACHTCF, globalcontext);
+ mdebug->addAction(cmd, Core::Constants::G_DEFAULT_ONE);
+
cmd = am->registerAction(m_startRemoteAction,
Constants::ATTACHREMOTE, globalcontext);
mdebug->addAction(cmd, Core::Constants::G_DEFAULT_ONE);
cmd = am->registerAction(m_manager->m_continueAction,
ProjectExplorer::Constants::DEBUG, QList<int>() << m_gdbRunningContext);
+ mdebug->addAction(cmd, Core::Constants::G_DEFAULT_ONE);
+
+ cmd = am->registerAction(m_detachAction,
+ Constants::DETACH, globalcontext);
+ mdebug->addAction(cmd, Core::Constants::G_DEFAULT_ONE);
cmd = am->registerAction(m_manager->m_stopAction,
Constants::INTERRUPT, globalcontext);
@@ -783,6 +809,9 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
this, SLOT(activatePreviousMode()));
connect(m_manager, SIGNAL(debugModeRequested()),
this, SLOT(activateDebugMode()));
+ connect(m_manager, SIGNAL(statusChanged(int)),
+ this, SLOT(updateActions(int)));
+
connect(theDebuggerAction(SettingsDialog), SIGNAL(triggered()),
this, SLOT(showSettingsDialog()));
@@ -1095,6 +1124,36 @@ void DebuggerPlugin::startRemoteApplication()
runControl->start();
}
+void DebuggerPlugin::attachRemoteTcf()
+{
+ QSharedPointer<RunConfiguration> rc = activeRunConfiguration();
+ if (RunControl *runControl = m_debuggerRunner
+ ->run(rc, ProjectExplorer::Constants::DEBUGMODE, AttachTcf))
+ runControl->start();
+}
+
+void DebuggerPlugin::updateActions(int status)
+{
+ const bool started = status == DebuggerInferiorRunning
+ || status == DebuggerInferiorRunningRequested
+ || status == DebuggerInferiorStopRequested
+ || status == DebuggerInferiorStopped;
+
+ const bool starting = status == DebuggerProcessStartingUp;
+ //const bool running = status == DebuggerInferiorRunning;
+
+ const bool ready = status == DebuggerInferiorStopped
+ && m_manager->startMode() != AttachCore;
+ m_startExternalAction->setEnabled(!started && !starting);
+ m_attachExternalAction->setEnabled(!started && !starting);
+#ifdef Q_OS_WIN
+ m_attachCoreAction->setEnabled(false);
+#else
+ m_attachCoreAction->setEnabled(!started && !starting);
+#endif
+ m_startRemoteAction->setEnabled(!started && !starting);
+ m_detachAction->setEnabled(ready);
+}
#include "debuggerplugin.moc"
diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h
index 78d228dc8e358e3b539bf42ad85b2009497de0e7..116454ba291d4f80b7699050bbf630752c566029 100644
--- a/src/plugins/debugger/debuggerplugin.h
+++ b/src/plugins/debugger/debuggerplugin.h
@@ -88,6 +88,8 @@ private slots:
void setConfigValue(const QString &name, const QVariant &value);
void requestContextMenu(TextEditor::ITextEditor *editor,
int lineNumber, QMenu *menu);
+ void updateActions(int status);
+
void resetLocation();
void gotoLocation(const QString &fileName, int line, bool setMarker);
@@ -101,6 +103,7 @@ private slots:
void startRemoteApplication();
void attachExternalApplication();
void attachCore();
+ void attachRemoteTcf();
private:
void readSettings();
@@ -125,6 +128,8 @@ private:
QAction *m_startRemoteAction;
QAction *m_attachExternalAction;
QAction *m_attachCoreAction;
+ QAction *m_attachTcfAction;
+ QAction *m_detachAction;
};
} // namespace Internal
diff --git a/src/plugins/debugger/dumper.pro b/src/plugins/debugger/dumper.pro
index 896203a17c4083f609a879e045fdfc7a7041a7f0..5d373abdd2db43b0cc5d9dde4e7b005646ea1c4a 100644
--- a/src/plugins/debugger/dumper.pro
+++ b/src/plugins/debugger/dumper.pro
@@ -1,6 +1,6 @@
# This is a compile check for the dumpers only. Don't install the library!
-include(../../qworkbenchlibrary.pri)
+include(../../qtcreatorlibrary.pri)
TEMPLATE = lib
TARGET = DebuggingHelper
diff --git a/src/plugins/debugger/dumperoptionpage.ui b/src/plugins/debugger/dumperoptionpage.ui
index 0ff6ddc6c2d3c23e8339775ec504dfb26811533d..fc4933b1d6c9fc87e1e21f8d728b12021b57f1b1 100644
--- a/src/plugins/debugger/dumperoptionpage.ui
+++ b/src/plugins/debugger/dumperoptionpage.ui
@@ -10,9 +10,6 @@
<height>434</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QCheckBox" name="checkBoxUseDebuggingHelpers">
diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp
index e2239c878e02bb761e5df576a376303f62989cc0..6cd9d9bc20bd0a6aafec4e8a3334fa698313a1db 100644
--- a/src/plugins/debugger/gdbengine.cpp
+++ b/src/plugins/debugger/gdbengine.cpp
@@ -91,21 +91,15 @@ Q_DECLARE_METATYPE(Debugger::Internal::GdbMi);
#define STRINGIFY_INTERNAL(x) #x
#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
-
#define CB(callback) &GdbEngine::callback, STRINGIFY(callback)
-typedef QLatin1Char _c;
-typedef QLatin1String __;
-static inline QString _(const char *s) { return QString::fromLatin1(s); }
-
-static const QString tooltipIName = _("tooltip");
-
static int ¤tToken()
{
static int token = 0;
return token;
}
+static const QString tooltipIName = _("tooltip");
///////////////////////////////////////////////////////////////////////
//
@@ -149,6 +143,10 @@ void GdbEngine::initializeConnections()
connect(&m_uploadProc, SIGNAL(error(QProcess::ProcessError)),
this, SLOT(uploadProcError(QProcess::ProcessError)));
+ connect(&m_uploadProc, SIGNAL(readyReadStandardOutput()),
+ this, SLOT(readUploadStandardOutput()));
+ connect(&m_uploadProc, SIGNAL(readyReadStandardError()),
+ this, SLOT(readUploadStandardError()));
// Output
connect(&m_outputCollector, SIGNAL(byteDelivery(QByteArray)),
@@ -187,7 +185,7 @@ void GdbEngine::initializeVariables()
m_oldestAcceptableToken = -1;
m_outputCodec = QTextCodec::codecForLocale();
m_pendingRequests = 0;
- m_waitingForBreakpointSynchronizationToContinue = false;
+ m_autoContinue = false;
m_waitingForFirstBreakpointToBeHit = false;
m_commandsToRunOnTemporaryBreak.clear();
}
@@ -268,6 +266,18 @@ void GdbEngine::uploadProcError(QProcess::ProcessError error)
QMessageBox::critical(q->mainWindow(), tr("Error"), msg);
}
+void GdbEngine::readUploadStandardOutput()
+{
+ QByteArray ba = m_uploadProc.readAllStandardOutput();
+ gdbOutputAvailable(_("upload-out:"), QString::fromLocal8Bit(ba, ba.length()));
+}
+
+void GdbEngine::readUploadStandardError()
+{
+ QByteArray ba = m_uploadProc.readAllStandardError();
+ gdbOutputAvailable(_("upload-err:"), QString::fromLocal8Bit(ba, ba.length()));
+}
+
#if 0
static void dump(const char *first, const char *middle, const QString & to)
{
@@ -306,11 +316,11 @@ void GdbEngine::handleResponse(const QByteArray &buff)
qDebug() // << "#### start response handling #### "
<< currentTime()
<< lastTime.msecsTo(QTime::currentTime()) << "ms,"
- << "buf: " << buff.left(1500) << "..."
- //<< "buf: " << buff
+ << "buf:" << buff.left(1500) << "..."
+ //<< "buf:" << buff
<< "size:" << buff.size();
#else
- //qDebug() << "buf: " << buff;
+ //qDebug() << "buf:" << buff;
#endif
lastTime = QTime::currentTime();
@@ -330,7 +340,7 @@ void GdbEngine::handleResponse(const QByteArray &buff)
if (from != inner) {
token = QByteArray(from, inner - from).toInt();
from = inner;
- //qDebug() << "found token " << token;
+ //qDebug() << "found token" << token;
}
// next char decides kind of record
@@ -361,7 +371,7 @@ void GdbEngine::handleResponse(const QByteArray &buff)
++from; // skip ','
data.parseResultOrValue(from, to);
if (data.isValid()) {
- //qDebug() << "parsed response: " << data.toString();
+ //qDebug() << "parsed response:" << data.toString();
record.m_children += data;
record.m_type = GdbMi::Tuple;
}
@@ -406,7 +416,7 @@ void GdbEngine::handleResponse(const QByteArray &buff)
QByteArray id = record.findChild("id").data();
q->showStatusMessage(tr("Thread %1 selected.").arg(_(id)));
//"{id="2"}"
- #ifdef Q_OS_MAC
+ #if defined(Q_OS_MAC)
} else if (asyncClass == "shlibs-updated") {
// MAC announces updated libs
} else if (asyncClass == "shlibs-added") {
@@ -418,7 +428,7 @@ void GdbEngine::handleResponse(const QByteArray &buff)
// loaded_addr="0x7f000", slide="0x7f000", prefix=""}}
#endif
} else {
- qDebug() << "IGNORED ASYNC OUTPUT "
+ qDebug() << "IGNORED ASYNC OUTPUT"
<< asyncClass << record.toString();
}
break;
@@ -517,15 +527,15 @@ void GdbEngine::handleResponse(const QByteArray &buff)
void GdbEngine::handleStubAttached(const GdbResultRecord &, const QVariant &)
{
qq->notifyInferiorStopped();
- m_waitingForBreakpointSynchronizationToContinue = true;
handleAqcuiredInferior();
+ m_autoContinue = true;
}
void GdbEngine::stubStarted()
{
q->m_attachedPID = m_stubProc.applicationPID();
qq->notifyInferiorPidChanged(q->m_attachedPID);
- execCommand(_("attach %1").arg(q->m_attachedPID), CB(handleStubAttached));
+ postCommand(_("attach %1").arg(q->m_attachedPID), CB(handleStubAttached));
}
void GdbEngine::stubError(const QString &msg)
@@ -556,7 +566,7 @@ void GdbEngine::readGdbStandardOutput()
scan = newstart;
if (end == start)
continue;
- #ifdef Q_OS_WIN
+ #if defined(Q_OS_WIN)
if (m_inbuffer.at(end - 1) == '\r') {
--end;
if (end == start)
@@ -579,7 +589,7 @@ void GdbEngine::interruptInferior()
}
if (q->startMode() == StartRemote) {
- execCommand(_("-exec-interrupt"));
+ postCommand(_("-exec-interrupt"));
return;
}
@@ -606,13 +616,13 @@ void GdbEngine::maybeHandleInferiorPidChanged(const QString &pid0)
qq->notifyInferiorPidChanged(pid);
}
-void GdbEngine::execCommand(const QString &command, GdbCommandCallback callback,
+void GdbEngine::postCommand(const QString &command, GdbCommandCallback callback,
const char *callbackName, const QVariant &cookie)
{
- execCommand(command, NoFlags, callback, callbackName, cookie);
+ postCommand(command, NoFlags, callback, callbackName, cookie);
}
-void GdbEngine::execCommand(const QString &command, GdbCommandFlags flags,
+void GdbEngine::postCommand(const QString &command, GdbCommandFlags flags,
GdbCommandCallback callback, const char *callbackName,
const QVariant &cookie)
{
@@ -623,10 +633,10 @@ void GdbEngine::execCommand(const QString &command, GdbCommandFlags flags,
if (flags & RebuildModel) {
++m_pendingRequests;
- PENDING_DEBUG(" CALLBACK " << callbackName << " INCREMENTS PENDING TO: "
+ PENDING_DEBUG(" CALLBACK" << callbackName << "INCREMENTS PENDING TO:"
<< m_pendingRequests << command);
} else {
- PENDING_DEBUG(" UNKNOWN CALLBACK " << callbackName << " LEAVES PENDING AT: "
+ PENDING_DEBUG(" UNKNOWN CALLBACK" << callbackName << "LEAVES PENDING AT:"
<< m_pendingRequests << command);
}
@@ -641,7 +651,7 @@ void GdbEngine::execCommand(const QString &command, GdbCommandFlags flags,
&& q->status() != DebuggerProcessStartingUp) {
// queue the commands that we cannot send at once
QTC_ASSERT(q->status() == DebuggerInferiorRunning,
- qDebug() << "STATUS: " << q->status());
+ qDebug() << "STATUS:" << q->status());
q->showStatusMessage(tr("Stopping temporarily."));
debugMessage(_("QUEUING COMMAND ") + cmd.command);
m_commandsToRunOnTemporaryBreak.append(cmd);
@@ -667,8 +677,8 @@ void GdbEngine::flushCommand(GdbCommand &cmd)
void GdbEngine::handleResultRecord(const GdbResultRecord &record)
{
- //qDebug() << "TOKEN: " << record.token
- // << " ACCEPTABLE: " << m_oldestAcceptableToken;
+ //qDebug() << "TOKEN:" << record.token
+ // << " ACCEPTABLE:" << m_oldestAcceptableToken;
//qDebug() << "";
//qDebug() << "\nRESULT" << record.token << record.toString();
@@ -679,15 +689,15 @@ void GdbEngine::handleResultRecord(const GdbResultRecord &record)
GdbCommand cmd = m_cookieForToken.take(token);
if (record.token < m_oldestAcceptableToken && (cmd.flags & Discardable)) {
- //qDebug() << "### SKIPPING OLD RESULT " << record.toString();
+ //qDebug() << "### SKIPPING OLD RESULT" << record.toString();
//QMessageBox::information(m_mainWindow, tr("Skipped"), "xxx");
return;
}
#if 0
- qDebug() << "# handleOutput, "
- << "cmd type: " << cmd.type
- << "cmd synchronized: " << cmd.synchronized
+ qDebug() << "# handleOutput,"
+ << "cmd type:" << cmd.type
+ << " cmd synchronized:" << cmd.synchronized
<< "\n record: " << record.toString();
#endif
@@ -708,6 +718,16 @@ void GdbEngine::handleResultRecord(const GdbResultRecord &record)
PENDING_DEBUG(" UNKNOWN TYPE " << cmd.type << " LEAVES PENDING AT: "
<< m_pendingRequests << cmd.command);
}
+
+ // This is somewhat inefficient, as it makes the last command synchronous.
+ // An optimization would be requesting the continue immediately when the
+ // event loop is entered, and let individual commands have a flag to suppress
+ // that behavior.
+ if (m_cookieForToken.isEmpty() && m_autoContinue) {
+ m_autoContinue = false;
+ continueInferior();
+ q->showStatusMessage(tr("Continuing after temporary stop."));
+ }
}
void GdbEngine::executeDebuggerCommand(const QString &command)
@@ -724,85 +744,16 @@ void GdbEngine::handleTargetCore(const GdbResultRecord &, const QVariant &)
{
qq->notifyInferiorStopped();
q->showStatusMessage(tr("Core file loaded."));
-
q->resetLocation();
-
- //
- // Stack
- //
+ tryLoadDebuggingHelpers();
qq->stackHandler()->setCurrentIndex(0);
updateLocals(); // Quick shot
-
reloadStack();
if (supportsThreads())
- execCommand(_("-thread-list-ids"), WatchUpdate, CB(handleStackListThreads), 0);
-
- //
- // Disassembler
- //
- // XXX we have no data here ...
- //m_address = data.findChild("frame").findChild("addr").data();
- //qq->reloadDisassembler();
-
- //
- // Registers
- //
+ postCommand(_("-thread-list-ids"), WatchUpdate, CB(handleStackListThreads), 0);
qq->reloadRegisters();
-
- // Gdb-Macro based DebuggingHelpers
- execCommand(_(
- "define qdumpqstring\n"
- "set $i = 0\n"
- "set $l = $arg0->d->size\n"
- "set $p = $arg0->d->data\n"
- "while $i < $l\n"
- "printf \"%d \",$p[$i++]\n"
- "end\n"
- "printf \"\\n\"\n"
- "end\n"
- ));
-
- execCommand(_(
- "define qdumpqstringlist\n"
- "set $i = $arg0->d->begin\n"
- "set $e = $arg0->d->end\n"
- "while $i < $e\n"
- "printf \"%d \",$arg0->d->array + $i++\n"
- "end\n"
- "printf \"\\n\"\n"
- "end\n"
- ));
}
-#if 0
-void GdbEngine::handleQueryPwd(const GdbResultRecord &record)
-{
- // FIXME: remove this special case as soon as 'pwd'
- // is supported by MI
- //qDebug() << "PWD OUTPUT:" << record.toString();
- // Gdb responses _unless_ we get an error first.
- if (record.resultClass == GdbResultDone) {
- QByteArray pwd = record.data.findChild("consolestreamoutput").data();
-#ifdef Q_OS_LINUX
- // "5^done,{logstreamoutput="pwd ",consolestreamoutput
- // ="Working directory /home/apoenitz/dev/work/test1. "}
- int pos = pwd.indexOf("Working directory");
- pwd = pwd.mid(pos + 18);
- pwd = pwd.trimmed();
- if (pwd.endsWith('.'))
- pwd.chop(1);
-#endif
-#ifdef Q_OS_WIN
- FIXME: this is broken
- // ~"Working directory C:\\Users\\Thomas\\Documents\\WBTest3\\debug.\n"
- pwd = pwd.trimmed();
-#endif
- m_pwd = QString::fromLocal8Bit(pwd);
- debugMessage("PWD RESULT: " + m_pwd);
- }
-}
-#endif
-
void GdbEngine::handleQuerySources(const GdbResultRecord &record, const QVariant &)
{
if (record.resultClass == GdbResultDone) {
@@ -820,7 +771,7 @@ void GdbEngine::handleQuerySources(const GdbResultRecord &record, const QVariant
full = QDir::cleanPath(full);
#endif
if (fullName.isValid() && QFileInfo(full).isReadable()) {
- //qDebug() << "STORING 2: " << fileName << full;
+ //qDebug() << "STORING 2:" << fileName << full;
m_shortToFullName[fileName] = full;
m_fullToShortName[full] = fileName;
}
@@ -909,8 +860,8 @@ void GdbEngine::handleExecRunToFunction(const GdbResultRecord &record, const QVa
GdbMi frame = record.data.findChild("frame");
QString file = QString::fromLocal8Bit(frame.findChild("fullname").data());
int line = frame.findChild("line").data().toInt();
- qDebug() << "HIT: " << file << line << " IN " << frame.toString()
- << " -- " << record.toString();
+ qDebug() << "HIT:" << file << line << "IN" << frame.toString()
+ << "--" << record.toString();
q->gotoLocation(file, line, true);
}
@@ -940,13 +891,13 @@ static bool isStoppedReason(const QByteArray &reason)
void GdbEngine::handleAqcuiredInferior()
{
#if defined(Q_OS_WIN)
- execCommand(_("info thread"), CB(handleInfoThreads));
+ postCommand(_("info thread"), CB(handleInfoThreads));
#endif
#if defined(Q_OS_LINUX)
- execCommand(_("info proc"), CB(handleInfoProc));
+ postCommand(_("info proc"), CB(handleInfoProc));
#endif
#if defined(Q_OS_MAC)
- execCommand(_("info pid"), NeedsStop, CB(handleInfoProc));
+ postCommand(_("info pid"), NeedsStop, CB(handleInfoProc));
#endif
if (theDebuggerBoolSetting(ListSourceFiles))
reloadSourceFiles();
@@ -957,18 +908,18 @@ void GdbEngine::handleAqcuiredInferior()
// intentionally after tryLoadDebuggingHelpers(),
// otherwise we'd interupt solib loading.
if (theDebuggerBoolSetting(AllPluginBreakpoints)) {
- execCommand(_("set auto-solib-add on"));
- execCommand(_("set stop-on-solib-events 0"));
- execCommand(_("sharedlibrary .*"));
+ postCommand(_("set auto-solib-add on"));
+ postCommand(_("set stop-on-solib-events 0"));
+ postCommand(_("sharedlibrary .*"));
} else if (theDebuggerBoolSetting(SelectedPluginBreakpoints)) {
- execCommand(_("set auto-solib-add on"));
- execCommand(_("set stop-on-solib-events 1"));
- execCommand(_("sharedlibrary ")
+ postCommand(_("set auto-solib-add on"));
+ postCommand(_("set stop-on-solib-events 1"));
+ postCommand(_("sharedlibrary ")
+ theDebuggerStringSetting(SelectedPluginBreakpointsPattern));
} else if (theDebuggerBoolSetting(NoPluginBreakpoints)) {
// should be like that already
- execCommand(_("set auto-solib-add off"));
- execCommand(_("set stop-on-solib-events 0"));
+ postCommand(_("set auto-solib-add off"));
+ postCommand(_("set stop-on-solib-events 0"));
}
#endif
@@ -977,12 +928,6 @@ void GdbEngine::handleAqcuiredInferior()
attemptBreakpointSynchronization();
}
-void GdbEngine::handleAutoContinue(const GdbResultRecord &, const QVariant &)
-{
- continueInferior();
- q->showStatusMessage(tr("Continuing after temporary stop."));
-}
-
void GdbEngine::handleAsyncOutput(const GdbMi &data)
{
const QByteArray &reason = data.findChild("reason").data();
@@ -1000,7 +945,7 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
msg = tr("Program exited normally");
}
q->showStatusMessage(msg);
- execCommand(_("-gdb-exit"), CB(handleExit));
+ postCommand(_("-gdb-exit"), CB(handleExit));
return;
}
@@ -1008,26 +953,22 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
//MAC: bool isFirstStop = data.findChild("bkptno").data() == "1";
//!MAC: startSymbolName == data.findChild("frame").findChild("func")
if (m_waitingForFirstBreakpointToBeHit) {
+ m_waitingForFirstBreakpointToBeHit = false;
+
// If the executable dies already that early we might get something
// like stdout:49*stopped,reason="exited",exit-code="0177"
// This is handled now above.
qq->notifyInferiorStopped();
- m_waitingForFirstBreakpointToBeHit = false;
- //
- // this will "continue" if done
- m_waitingForBreakpointSynchronizationToContinue = true;
- //
- // that's the "early stop"
handleAqcuiredInferior();
+ m_autoContinue = true;
return;
}
if (!m_commandsToRunOnTemporaryBreak.isEmpty()) {
QTC_ASSERT(q->status() == DebuggerInferiorStopRequested,
- qDebug() << "STATUS: " << q->status())
+ qDebug() << "STATUS:" << q->status())
qq->notifyInferiorStopped();
- q->showStatusMessage(tr("Temporarily stopped."));
// FIXME: racy
while (!m_commandsToRunOnTemporaryBreak.isEmpty()) {
GdbCommand cmd = m_commandsToRunOnTemporaryBreak.takeFirst();
@@ -1035,8 +976,8 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
.arg(cmd.command).arg(_(cmd.callbackName)));
flushCommand(cmd);
}
- execCommand(_("p temporaryStop"), CB(handleAutoContinue));
- q->showStatusMessage(tr("Handling queued commands."));
+ q->showStatusMessage(tr("Processing queued commands."));
+ m_autoContinue = true;
return;
}
@@ -1047,7 +988,7 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
debugMessage(_("SHARED LIBRARY EVENT: ") + dataStr);
QString pat = theDebuggerStringSetting(SelectedPluginBreakpointsPattern);
debugMessage(_("PATTERN: ") + pat);
- execCommand(_("sharedlibrary ") + pat);
+ postCommand(_("sharedlibrary ") + pat);
continueInferior();
q->showStatusMessage(tr("Loading %1...").arg(dataStr));
return;
@@ -1079,14 +1020,14 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
QString funcName = _(frame.findChild("func").data());
QString fileName = QString::fromLocal8Bit(frame.findChild("file").data());
if (isLeavableFunction(funcName, fileName)) {
- //debugMessage("LEAVING" + funcName);
+ //debugMessage(_("LEAVING ") + funcName);
++stepCounter;
q->stepOutExec();
//stepExec();
return;
}
if (isSkippableFunction(funcName, fileName)) {
- //debugMessage("SKIPPING" + funcName);
+ //debugMessage(_("SKIPPING ") + funcName);
++stepCounter;
q->stepExec();
return;
@@ -1106,16 +1047,16 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
if (reason == "breakpoint-hit") {
q->showStatusMessage(tr("Stopped at breakpoint."));
GdbMi frame = data.findChild("frame");
- //debugMessage("HIT BREAKPOINT: " + frame.toString());
+ //debugMessage(_("HIT BREAKPOINT: " + frame.toString()));
m_currentFrame = _(frame.findChild("addr").data() + '%' +
frame.findChild("func").data() + '%');
QApplication::alert(q->mainWindow(), 3000);
if (theDebuggerAction(ListSourceFiles)->value().toBool())
reloadSourceFiles();
- execCommand(_("-break-list"), CB(handleBreakList));
+ postCommand(_("-break-list"), CB(handleBreakList));
QVariant var = QVariant::fromValue<GdbMi>(data);
- execCommand(_("p 0"), CB(handleAsyncOutput2), var); // dummy
+ postCommand(_("p 0"), CB(handleAsyncOutput2), var); // dummy
} else {
#ifdef Q_OS_LINUX
// For some reason, attaching to a stopped process causes *two* stops
@@ -1126,12 +1067,15 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
GdbMi frameData = data.findChild("frame");
if (frameData.findChild("func").data() == "_start"
&& frameData.findChild("from").data() == "/lib/ld-linux.so.2") {
- execCommand(_("-exec-continue"));
+ postCommand(_("-exec-continue"));
return;
}
}
#endif
- q->showStatusMessage(tr("Stopped: \"%1\"").arg(_(reason)));
+ if (reason.isEmpty())
+ q->showStatusMessage(tr("Stopped."));
+ else
+ q->showStatusMessage(tr("Stopped: \"%1\"").arg(_(reason)));
handleAsyncOutput2(data);
}
return;
@@ -1157,8 +1101,8 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
GdbMi frame = data.findChild("frame");
QString file = QString::fromLocal8Bit(frame.findChild("fullname").data());
int line = frame.findChild("line").data().toInt();
- qDebug() << "HIT: " << file << line << " IN " << frame.toString()
- << " -- " << data.toString();
+ qDebug() << "HIT:" << file << line << "IN" << frame.toString()
+ << "--" << data.toString();
q->gotoLocation(file, line, true);
#endif
}
@@ -1166,7 +1110,7 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
void GdbEngine::reloadFullStack()
{
QString cmd = _("-stack-list-frames");
- execCommand(cmd, WatchUpdate, CB(handleStackListFrames), true);
+ postCommand(cmd, WatchUpdate, CB(handleStackListFrames), true);
}
void GdbEngine::reloadStack()
@@ -1174,7 +1118,7 @@ void GdbEngine::reloadStack()
QString cmd = _("-stack-list-frames");
if (int stackDepth = theDebuggerAction(MaximalStackDepth)->value().toInt())
cmd += _(" 0 ") + QString::number(stackDepth);
- execCommand(cmd, WatchUpdate, CB(handleStackListFrames), false);
+ postCommand(cmd, WatchUpdate, CB(handleStackListFrames), false);
}
void GdbEngine::handleAsyncOutput2(const GdbResultRecord &, const QVariant &cookie)
@@ -1195,7 +1139,7 @@ void GdbEngine::handleAsyncOutput2(const GdbMi &data)
int currentId = data.findChild("thread-id").data().toInt();
reloadStack();
if (supportsThreads())
- execCommand(_("-thread-list-ids"), WatchUpdate, CB(handleStackListThreads), currentId);
+ postCommand(_("-thread-list-ids"), WatchUpdate, CB(handleStackListThreads), currentId);
//
// Disassembler
@@ -1219,7 +1163,7 @@ void GdbEngine::handleShowVersion(const GdbResultRecord &response, const QVarian
{
//qDebug () << "VERSION 2:" << response.data.findChild("consolestreamoutput").data();
//qDebug () << "VERSION:" << response.toString();
- debugMessage(_("VERSION:" + response.toString()));
+ debugMessage(_("VERSION: " + response.toString()));
if (response.resultClass == GdbResultDone) {
m_gdbVersion = 100;
m_gdbBuildVersion = -1;
@@ -1271,7 +1215,6 @@ void GdbEngine::handleExecRun(const GdbResultRecord &response, const QVariant &)
{
if (response.resultClass == GdbResultRunning) {
qq->notifyInferiorRunning();
- q->showStatusMessage(tr("Running..."));
} else if (response.resultClass == GdbResultError) {
const QByteArray &msg = response.data.findChild("msg").data();
if (msg == "Cannot find bounds of current function") {
@@ -1288,23 +1231,13 @@ void GdbEngine::handleExecRun(const GdbResultRecord &response, const QVariant &)
}
}
-void GdbEngine::queryFullName(const QString &fileName, QString *full)
-{
- *full = fullName(fileName);
-}
-
-QString GdbEngine::shortName(const QString &fullName)
-{
- return m_fullToShortName.value(fullName, QString());
-}
-
QString GdbEngine::fullName(const QString &fileName)
{
//QString absName = m_manager->currentWorkingDirectory() + "/" + file; ??
if (fileName.isEmpty())
return QString();
QString full = m_shortToFullName.value(fileName, QString());
- //debugMessage("RESOLVING: " + fileName + " " + full);
+ //debugMessage(_("RESOLVING: ") + fileName + " " + full);
if (!full.isEmpty())
return full;
QFileInfo fi(fileName);
@@ -1314,7 +1247,7 @@ QString GdbEngine::fullName(const QString &fileName)
#ifdef Q_OS_WIN
full = QDir::cleanPath(full);
#endif
- //debugMessage("STORING: " + fileName + " " + full);
+ //debugMessage(_("STORING: ") + fileName + " " + full);
m_shortToFullName[fileName] = full;
m_fullToShortName[full] = fileName;
return full;
@@ -1340,6 +1273,12 @@ void GdbEngine::shutdown()
exitDebugger();
}
+void GdbEngine::detachDebugger()
+{
+ postCommand(_("detach"));
+ postCommand(_("-gdb-exit"), CB(handleExit));
+}
+
void GdbEngine::exitDebugger()
{
debugMessage(_("GDBENGINE EXITDEBUFFER: %1").arg(m_gdbProc.state()));
@@ -1354,14 +1293,14 @@ void GdbEngine::exitDebugger()
if (q->status() != DebuggerInferiorStopped
&& q->status() != DebuggerProcessStartingUp) {
QTC_ASSERT(q->status() == DebuggerInferiorRunning,
- qDebug() << "STATUS ON EXITDEBUGGER: " << q->status());
+ qDebug() << "STATUS ON EXITDEBUGGER:" << q->status());
interruptInferior();
}
- if (q->startMode() == AttachExternal || q->startMode() == StartRemote)
- execCommand(_("detach"));
+ if (q->startMode() == AttachExternal)
+ postCommand(_("detach"));
else
- execCommand(_("kill"));
- execCommand(_("-gdb-exit"), CB(handleExit));
+ postCommand(_("kill"));
+ postCommand(_("-gdb-exit"), CB(handleExit));
// 20s can easily happen when loading webkit debug information
m_gdbProc.waitForFinished(20000);
if (m_gdbProc.state() != QProcess::Running) {
@@ -1437,13 +1376,13 @@ bool GdbEngine::startDebugger()
}
#if 0
- qDebug() << "Command: " << q->settings()->m_gdbCmd;
- qDebug() << "WorkingDirectory: " << m_gdbProc.workingDirectory();
- qDebug() << "ScriptFile: " << q->settings()->m_scriptFile;
- qDebug() << "Environment: " << m_gdbProc.environment();
- qDebug() << "Arguments: " << gdbArgs;
- qDebug() << "BuildDir: " << q->m_buildDir;
- qDebug() << "ExeFile: " << q->m_executable;
+ qDebug() << "Command:" << q->settings()->m_gdbCmd;
+ qDebug() << "WorkingDirectory:" << m_gdbProc.workingDirectory();
+ qDebug() << "ScriptFile:" << q->settings()->m_scriptFile;
+ qDebug() << "Environment:" << m_gdbProc.environment();
+ qDebug() << "Arguments:" << gdbArgs;
+ qDebug() << "BuildDir:" << q->m_buildDir;
+ qDebug() << "ExeFile:" << q->m_executable;
#endif
QString loc = theDebuggerStringSetting(GdbLocation);
@@ -1461,26 +1400,26 @@ bool GdbEngine::startDebugger()
q->showStatusMessage(tr("Gdb Running..."));
- execCommand(_("show version"), CB(handleShowVersion));
- //execCommand(_("-enable-timings");
- execCommand(_("set print static-members off")); // Seemingly doesn't work.
- //execCommand(_("define hook-stop\n-thread-list-ids\n-stack-list-frames\nend"));
- //execCommand(_("define hook-stop\nprint 4\nend"));
- //execCommand(_("define hookpost-stop\nprint 5\nend"));
- //execCommand(_("define hook-call\nprint 6\nend"));
- //execCommand(_("define hookpost-call\nprint 7\nend"));
- //execCommand(_("set print object on")); // works with CLI, but not MI
- //execCommand(_("set step-mode on")); // we can't work with that yes
- //execCommand(_("set exec-done-display on"));
- //execCommand(_("set print pretty on"));
- //execCommand(_("set confirm off"));
- //execCommand(_("set pagination off"));
- execCommand(_("set print inferior-events 1"));
- execCommand(_("set breakpoint pending on"));
- execCommand(_("set print elements 10000"));
- execCommand(_("-data-list-register-names"), CB(handleRegisterListNames));
-
- //execCommand(_("set substitute-path /var/tmp/qt-x11-src-4.5.0 "
+ postCommand(_("show version"), CB(handleShowVersion));
+ //postCommand(_("-enable-timings");
+ postCommand(_("set print static-members off")); // Seemingly doesn't work.
+ //postCommand(_("define hook-stop\n-thread-list-ids\n-stack-list-frames\nend"));
+ //postCommand(_("define hook-stop\nprint 4\nend"));
+ //postCommand(_("define hookpost-stop\nprint 5\nend"));
+ //postCommand(_("define hook-call\nprint 6\nend"));
+ //postCommand(_("define hookpost-call\nprint 7\nend"));
+ //postCommand(_("set print object on")); // works with CLI, but not MI
+ //postCommand(_("set step-mode on")); // we can't work with that yes
+ //postCommand(_("set exec-done-display on"));
+ //postCommand(_("set print pretty on"));
+ //postCommand(_("set confirm off"));
+ //postCommand(_("set pagination off"));
+ postCommand(_("set print inferior-events 1"));
+ postCommand(_("set breakpoint pending on"));
+ postCommand(_("set print elements 10000"));
+ postCommand(_("-data-list-register-names"), CB(handleRegisterListNames));
+
+ //postCommand(_("set substitute-path /var/tmp/qt-x11-src-4.5.0 "
// "/home/sandbox/qtsdk-2009.01/qt"));
// one of the following is needed to prevent crashes in gdb on code like:
@@ -1488,8 +1427,8 @@ bool GdbEngine::startDebugger()
// int main() { return foo<int>(); }
// (gdb) call 'int foo<int>'()
// /build/buildd/gdb-6.8/gdb/valops.c:2069: internal-error:
- execCommand(_("set overload-resolution off"));
- //execCommand(_("set demangle-style none"));
+ postCommand(_("set overload-resolution off"));
+ //postCommand(_("set demangle-style none"));
// From the docs:
// Stop means reenter debugger if this signal happens (implies print).
@@ -1500,19 +1439,19 @@ bool GdbEngine::startDebugger()
// We need "print" as otherwise we would get no feedback whatsoever
// Custom DebuggingHelper crashs which happen regularily for when accessing
// uninitialized variables.
- execCommand(_("handle SIGSEGV nopass stop print"));
+ postCommand(_("handle SIGSEGV nopass stop print"));
// This is useful to kill the inferior whenever gdb dies.
- //execCommand(_("handle SIGTERM pass nostop print"));
+ //postCommand(_("handle SIGTERM pass nostop print"));
- execCommand(_("set unwindonsignal on"));
- //execCommand(_("pwd", handleQueryPwd));
- execCommand(_("set width 0"));
- execCommand(_("set height 0"));
+ postCommand(_("set unwindonsignal on"));
+ //postCommand(_("pwd"));
+ postCommand(_("set width 0"));
+ postCommand(_("set height 0"));
#ifdef Q_OS_MAC
- execCommand(_("-gdb-set inferior-auto-start-cfm off"));
- execCommand(_("-gdb-set sharedLibrary load-rules "
+ postCommand(_("-gdb-set inferior-auto-start-cfm off"));
+ postCommand(_("-gdb-set sharedLibrary load-rules "
"dyld \".*libSystem.*\" all "
"dyld \".*libauto.*\" all "
"dyld \".*AppKit.*\" all "
@@ -1527,7 +1466,7 @@ bool GdbEngine::startDebugger()
if (!scriptFileName.isEmpty()) {
QFile scriptFile(scriptFileName);
if (scriptFile.open(QIODevice::ReadOnly)) {
- execCommand(_("source ") + scriptFileName);
+ postCommand(_("source ") + scriptFileName);
} else {
QMessageBox::warning(q->mainWindow(),
tr("Cannot find debugger initialization script"),
@@ -1539,7 +1478,7 @@ bool GdbEngine::startDebugger()
}
if (q->startMode() == AttachExternal) {
- execCommand(_("attach %1").arg(q->m_attachedPID), CB(handleAttach));
+ postCommand(_("attach %1").arg(q->m_attachedPID), CB(handleAttach));
qq->breakHandler()->removeAllBreakpoints();
} else if (q->startMode() == AttachCore) {
QFileInfo fi(q->m_executable);
@@ -1547,39 +1486,39 @@ bool GdbEngine::startDebugger()
QFileInfo fi2(q->m_coreFile);
// quoting core name below fails in gdb 6.8-debian
QString coreName = fi2.absoluteFilePath();
- execCommand(_("-file-exec-and-symbols ") + fileName);
- execCommand(_("target core ") + coreName, CB(handleTargetCore));
+ postCommand(_("-file-exec-and-symbols ") + fileName);
+ postCommand(_("target core ") + coreName, CB(handleTargetCore));
qq->breakHandler()->removeAllBreakpoints();
} else if (q->startMode() == StartRemote) {
- execCommand(_("set architecture %1").arg(q->m_remoteArchitecture));
+ postCommand(_("set architecture %1").arg(q->m_remoteArchitecture));
qq->breakHandler()->setAllPending();
//QFileInfo fi(q->m_executable);
//QString fileName = fi.absoluteFileName();
QString fileName = q->m_executable;
- execCommand(_("-file-exec-and-symbols \"%1\"").arg(fileName));
+ postCommand(_("-file-exec-and-symbols \"%1\"").arg(fileName));
// works only for > 6.8
- execCommand(_("set target-async on"), CB(handleTargetAsync));
+ postCommand(_("set target-async on"), CB(handleSetTargetAsync));
} else if (q->m_useTerminal) {
qq->breakHandler()->setAllPending();
} else if (q->startMode() == StartInternal || q->startMode() == StartExternal) {
QFileInfo fi(q->m_executable);
QString fileName = _c('"') + fi.absoluteFilePath() + _c('"');
- execCommand(_("-file-exec-and-symbols ") + fileName, CB(handleFileExecAndSymbols));
- //execCommand(_("file ") + fileName, handleFileExecAndSymbols);
+ postCommand(_("-file-exec-and-symbols ") + fileName, CB(handleFileExecAndSymbols));
+ //postCommand(_("file ") + fileName, handleFileExecAndSymbols);
#ifdef Q_OS_MAC
- execCommand(_("sharedlibrary apply-load-rules all"));
+ postCommand(_("sharedlibrary apply-load-rules all"));
#endif
if (!q->m_processArgs.isEmpty())
- execCommand(_("-exec-arguments ") + q->m_processArgs.join(_(" ")));
+ postCommand(_("-exec-arguments ") + q->m_processArgs.join(_(" ")));
#ifndef Q_OS_MAC
- execCommand(_("set auto-solib-add off"));
- execCommand(_("info target"), CB(handleStart));
+ postCommand(_("set auto-solib-add off"));
+ postCommand(_("info target"), CB(handleStart));
#else
// On MacOS, breaking in at the entry point wreaks havoc.
- execCommand(_("tbreak main"));
+ postCommand(_("tbreak main"));
m_waitingForFirstBreakpointToBeHit = true;
qq->notifyInferiorRunningRequested();
- execCommand(_("-exec-run"));
+ postCommand(_("-exec-run"));
#endif
qq->breakHandler()->setAllPending();
}
@@ -1592,12 +1531,12 @@ void GdbEngine::continueInferior()
q->resetLocation();
setTokenBarrier();
qq->notifyInferiorRunningRequested();
- execCommand(_("-exec-continue"), CB(handleExecRun));
+ postCommand(_("-exec-continue"), CB(handleExecRun));
}
void GdbEngine::handleStart(const GdbResultRecord &response, const QVariant &)
{
-#ifdef Q_OS_MAC
+#if defined(Q_OS_MAC)
Q_UNUSED(response);
#else
if (response.resultClass == GdbResultDone) {
@@ -1607,11 +1546,11 @@ void GdbEngine::handleStart(const GdbResultRecord &response, const QVariant &)
QString msg = _(response.data.findChild("consolestreamoutput").data());
QRegExp needle(_("\\bEntry point: (0x[0-9a-f]+)\\b"));
if (needle.indexIn(msg) != -1) {
- //debugMessage("STREAM: " + msg + " " + needle.cap(1));
- execCommand(_("tbreak *") + needle.cap(1));
+ //debugMessage(_("STREAM: ") + msg + " " + needle.cap(1));
+ postCommand(_("tbreak *") + needle.cap(1));
m_waitingForFirstBreakpointToBeHit = true;
qq->notifyInferiorRunningRequested();
- execCommand(_("-exec-run"));
+ postCommand(_("-exec-run"));
} else {
debugMessage(_("PARSING START ADDRESS FAILED: ") + msg);
}
@@ -1638,7 +1577,7 @@ void GdbEngine::handleAttach(const GdbResultRecord &, const QVariant &)
reloadStack();
if (supportsThreads())
- execCommand(_("-thread-list-ids"), WatchUpdate, CB(handleStackListThreads), 0);
+ postCommand(_("-thread-list-ids"), WatchUpdate, CB(handleStackListThreads), 0);
//
// Disassembler
@@ -1653,24 +1592,39 @@ void GdbEngine::handleAttach(const GdbResultRecord &, const QVariant &)
qq->reloadRegisters();
}
-void GdbEngine::handleTargetAsync(const GdbResultRecord &record, const QVariant &)
+void GdbEngine::handleSetTargetAsync(const GdbResultRecord &record, const QVariant &)
{
if (record.resultClass == GdbResultDone) {
- //execCommand(_("info target"), handleStart);
+ //postCommand(_("info target"), handleStart);
qq->notifyInferiorRunningRequested();
- execCommand(_("target remote %1").arg(q->m_remoteChannel),
- CB(handleAttach));
- //execCommand(_("-exec-continue"), CB(handleExecRun));
- handleAqcuiredInferior();
+ postCommand(_("target remote %1").arg(q->m_remoteChannel),
+ CB(handleTargetRemote));
} else if (record.resultClass == GdbResultError) {
// a typical response on "old" gdb is:
// &"set target-async on\n"
//&"No symbol table is loaded. Use the \"file\" command.\n"
//^error,msg="No symbol table is loaded. Use the \"file\" command."
- execCommand(_("detach"));
- execCommand(_("-gdb-exit"), CB(handleExit));
+ postCommand(_("detach"));
+ postCommand(_("-gdb-exit"), CB(handleExit));
+ }
+}
+
+void GdbEngine::handleTargetRemote(const GdbResultRecord &record, const QVariant &)
+{
+ if (record.resultClass == GdbResultDone) {
+ //postCommand(_("-exec-continue"), CB(handleExecRun));
+ handleAqcuiredInferior();
+ m_autoContinue = true;
+ } else if (record.resultClass == GdbResultError) {
+ // 16^error,msg="hd:5555: Connection timed out."
+ QString msg = __(record.data.findChild("msg").data());
+ QString msg1 = tr("Connecting to remote server failed:");
+ q->showStatusMessage(msg1 + _c(' ') + msg);
+ QMessageBox::critical(q->mainWindow(), tr("Error"), msg1 + _c('\n') + msg);
+ postCommand(_("-gdb-exit"), CB(handleExit));
}
}
+
void GdbEngine::handleExit(const GdbResultRecord &, const QVariant &)
{
q->showStatusMessage(tr("Debugger exited."));
@@ -1680,53 +1634,53 @@ void GdbEngine::stepExec()
{
setTokenBarrier();
qq->notifyInferiorRunningRequested();
- execCommand(_("-exec-step"), CB(handleExecRun));
+ postCommand(_("-exec-step"), CB(handleExecRun));
}
void GdbEngine::stepIExec()
{
setTokenBarrier();
qq->notifyInferiorRunningRequested();
- execCommand(_("-exec-step-instruction"), CB(handleExecRun));
+ postCommand(_("-exec-step-instruction"), CB(handleExecRun));
}
void GdbEngine::stepOutExec()
{
setTokenBarrier();
qq->notifyInferiorRunningRequested();
- execCommand(_("-exec-finish"), CB(handleExecRun));
+ postCommand(_("-exec-finish"), CB(handleExecRun));
}
void GdbEngine::nextExec()
{
setTokenBarrier();
qq->notifyInferiorRunningRequested();
- execCommand(_("-exec-next"), CB(handleExecRun));
+ postCommand(_("-exec-next"), CB(handleExecRun));
}
void GdbEngine::nextIExec()
{
setTokenBarrier();
qq->notifyInferiorRunningRequested();
- execCommand(_("-exec-next-instruction"), CB(handleExecRun));
+ postCommand(_("-exec-next-instruction"), CB(handleExecRun));
}
void GdbEngine::runToLineExec(const QString &fileName, int lineNumber)
{
setTokenBarrier();
qq->notifyInferiorRunningRequested();
- execCommand(_("-exec-until %1:%2").arg(fileName).arg(lineNumber));
+ postCommand(_("-exec-until %1:%2").arg(fileName).arg(lineNumber));
}
void GdbEngine::runToFunctionExec(const QString &functionName)
{
setTokenBarrier();
- execCommand(_("-break-insert -t ") + functionName);
+ postCommand(_("-break-insert -t ") + functionName);
qq->notifyInferiorRunningRequested();
// that should be "^running". We need to handle the resulting
// "Stopped"
- execCommand(_("-exec-continue"));
- //execCommand(_("-exec-continue"), handleExecRunToFunction);
+ postCommand(_("-exec-continue"));
+ //postCommand(_("-exec-continue"), handleExecRunToFunction);
}
void GdbEngine::jumpToLineExec(const QString &fileName, int lineNumber)
@@ -1734,8 +1688,8 @@ void GdbEngine::jumpToLineExec(const QString &fileName, int lineNumber)
#if 1
// not available everywhere?
//sendCliCommand(_("tbreak ") + fileName + ':' + QString::number(lineNumber));
- execCommand(_("-break-insert -t ") + fileName + _c(':') + QString::number(lineNumber));
- execCommand(_("jump ") + fileName + _c(':') + QString::number(lineNumber));
+ postCommand(_("-break-insert -t ") + fileName + _c(':') + QString::number(lineNumber));
+ postCommand(_("jump ") + fileName + _c(':') + QString::number(lineNumber));
// will produce something like
// &"jump /home/apoenitz/dev/work/test1/test1.cpp:242"
// ~"Continuing at 0x4058f3."
@@ -1744,11 +1698,11 @@ void GdbEngine::jumpToLineExec(const QString &fileName, int lineNumber)
// 23^done"
q->gotoLocation(fileName, lineNumber, true);
//setBreakpoint();
- //execCommand(_("jump ") + fileName + ':' + QString::number(lineNumber));
+ //postCommand(_("jump ") + fileName + ':' + QString::number(lineNumber));
#else
q->gotoLocation(fileName, lineNumber, true);
setBreakpoint(fileName, lineNumber);
- execCommand(_("jump ") + fileName + ':' + QString::number(lineNumber));
+ postCommand(_("jump ") + fileName + ':' + QString::number(lineNumber));
#endif
}
@@ -1766,7 +1720,7 @@ void GdbEngine::setTokenBarrier()
{
foreach (const GdbCommand &cookie, m_cookieForToken) {
QTC_ASSERT(!cookie.callback || (cookie.flags & Discardable),
- qDebug() << "CMD: " << cookie.command << "CALLBACK: " << cookie.callbackName;
+ qDebug() << "CMD:" << cookie.command << " CALLBACK:" << cookie.callbackName;
return
);
}
@@ -1779,12 +1733,12 @@ void GdbEngine::setDebugDebuggingHelpers(const QVariant &on)
{
if (on.toBool()) {
debugMessage(_("SWITCHING ON DUMPER DEBUGGING"));
- execCommand(_("set unwindonsignal off"));
+ postCommand(_("set unwindonsignal off"));
q->breakByFunction(_("qDumpObjectData440"));
//updateLocals();
} else {
debugMessage(_("SWITCHING OFF DUMPER DEBUGGING"));
- execCommand(_("set unwindonsignal on"));
+ postCommand(_("set unwindonsignal on"));
}
}
@@ -1867,21 +1821,12 @@ void GdbEngine::sendInsertBreakpoint(int index)
const BreakpointData *data = qq->breakHandler()->at(index);
QString where;
if (data->funcName.isEmpty()) {
- where = data->fileName;
-#ifdef Q_OS_MAC
- // full names do not work on Mac/MI
- QFileInfo fi(data->fileName);
- where = fi.fileName();
- //where = fi.absoluteFilePath();
-#endif
-#ifdef Q_OS_WIN
- // full names do not work on Mac/MI
- QFileInfo fi(data->fileName);
- where = fi.fileName();
- //where = m_manager->shortName(data->fileName);
- //if (where.isEmpty())
- // where = data->fileName;
-#endif
+ if (data->useFullPath) {
+ where = data->fileName;
+ } else {
+ QFileInfo fi(data->fileName);
+ where = fi.fileName();
+ }
// The argument is simply a C-quoted version of the argument to the
// non-MI "break" command, including the "original" quoting it wants.
where = _("\"\\\"") + GdbMi::escapeCString(where) + _("\\\":") + data->lineNumber + _c('"');
@@ -1891,26 +1836,26 @@ void GdbEngine::sendInsertBreakpoint(int index)
// set up fallback in case of pending breakpoints which aren't handled
// by the MI interface
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
QString cmd = _("-break-insert -f ");
//if (!data->condition.isEmpty())
// cmd += _("-c ") + data->condition + ' ';
cmd += where;
#endif
-#ifdef Q_OS_MAC
+#if defined(Q_OS_MAC)
QString cmd = _("-break-insert -l -1 ");
//if (!data->condition.isEmpty())
// cmd += "-c " + data->condition + " ";
cmd += where;
#endif
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN)
QString cmd = _("-break-insert ");
//if (!data->condition.isEmpty())
// cmd += "-c " + data->condition + " ";
cmd += where;
#endif
debugMessage(_("Current state: %1").arg(q->status()));
- execCommand(cmd, NeedsStop, CB(handleBreakInsert), index);
+ postCommand(cmd, NeedsStop, CB(handleBreakInsert), index);
}
void GdbEngine::handleBreakList(const GdbResultRecord &record, const QVariant &)
@@ -1933,10 +1878,10 @@ void GdbEngine::handleBreakList(const GdbResultRecord &record, const QVariant &)
void GdbEngine::handleBreakList(const GdbMi &table)
{
- //qDebug() << "GdbEngine::handleOutput: table: "
+ //qDebug() << "GdbEngine::handleOutput: table:"
// << table.toString();
GdbMi body = table.findChild("body");
- //qDebug() << "GdbEngine::handleOutput: body: "
+ //qDebug() << "GdbEngine::handleOutput: body:"
// << body.toString();
QList<GdbMi> bkpts;
if (body.isValid()) {
@@ -1946,15 +1891,15 @@ void GdbEngine::handleBreakList(const GdbMi &table)
// Mac
bkpts = table.children();
// remove the 'hdr' and artificial items
- //qDebug() << "FOUND " << bkpts.size() << " BREAKPOINTS";
+ //qDebug() << "FOUND" << bkpts.size() << "BREAKPOINTS";
for (int i = bkpts.size(); --i >= 0; ) {
int num = bkpts.at(i).findChild("number").data().toInt();
if (num <= 0) {
- //qDebug() << "REMOVING " << i << bkpts.at(i).toString();
+ //qDebug() << "REMOVING" << i << bkpts.at(i).toString();
bkpts.removeAt(i);
}
}
- //qDebug() << "LEFT " << bkpts.size() << " BREAKPOINTS";
+ //qDebug() << "LEFT" << bkpts.size() << "BREAKPOINTS";
}
BreakHandler *handler = qq->breakHandler();
@@ -1965,7 +1910,7 @@ void GdbEngine::handleBreakList(const GdbMi &table)
if (found != -1)
breakpointDataFromOutput(handler->at(found), bkpts.at(index));
//else
- //qDebug() << "CANNOT HANDLE RESPONSE " << bkpts.at(index).toString();
+ //qDebug() << "CANNOT HANDLE RESPONSE" << bkpts.at(index).toString();
}
attemptBreakpointSynchronization();
@@ -2010,7 +1955,7 @@ void GdbEngine::handleBreakCondition(const GdbResultRecord &record, const QVaria
// we just assume it was successful. otherwise we had to parse
// the output stream data
BreakpointData *data = handler->at(index);
- //qDebug() << "HANDLE BREAK CONDITION " << index << data->condition;
+ //qDebug() << "HANDLE BREAK CONDITION" << index << data->condition;
data->bpCondition = data->condition;
attemptBreakpointSynchronization();
handler->updateMarkers();
@@ -2020,7 +1965,7 @@ void GdbEngine::handleBreakCondition(const GdbResultRecord &record, const QVaria
if (1 || msg.startsWith("Error parsing breakpoint condition. "
" Will try again when we hit the breakpoint.")) {
BreakpointData *data = handler->at(index);
- //qDebug() << "ERROR BREAK CONDITION " << index << data->condition;
+ //qDebug() << "ERROR BREAK CONDITION" << index << data->condition;
data->bpCondition = data->condition;
attemptBreakpointSynchronization();
handler->updateMarkers();
@@ -2033,12 +1978,12 @@ void GdbEngine::handleBreakInsert(const GdbResultRecord &record, const QVariant
int index = cookie.toInt();
BreakHandler *handler = qq->breakHandler();
if (record.resultClass == GdbResultDone) {
- //qDebug() << "HANDLE BREAK INSERT " << index;
-//#ifdef Q_OS_MAC
+ //qDebug() << "HANDLE BREAK INSERT" << index;
+//#if defined(Q_OS_MAC)
// interesting only on Mac?
BreakpointData *data = handler->at(index);
GdbMi bkpt = record.data.findChild("bkpt");
- //qDebug() << "BKPT: " << bkpt.toString() << " DATA" << data->toToolTip();
+ //qDebug() << "BKPT:" << bkpt.toString() << " DATA:" << data->toToolTip();
breakpointDataFromOutput(data, bkpt);
//#endif
attemptBreakpointSynchronization();
@@ -2047,7 +1992,7 @@ void GdbEngine::handleBreakInsert(const GdbResultRecord &record, const QVariant
const BreakpointData *data = handler->at(index);
// Note that it is perfectly correct that the file name is put
// in quotes but not escaped. GDB simply is like that.
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
//QString where = "\"\\\"" + data->fileName + "\\\":"
// + data->lineNumber + "\"";
QString where = _c('"') + data->fileName + _("\":")
@@ -2055,18 +2000,18 @@ void GdbEngine::handleBreakInsert(const GdbResultRecord &record, const QVariant
// Should not happen with -break-insert -f. gdb older than 6.8?
QTC_ASSERT(false, /**/);
#endif
-#ifdef Q_OS_MAC
+#if defined(Q_OS_MAC)
QFileInfo fi(data->fileName);
QString where = _c('"') + fi.fileName() + _("\":")
+ data->lineNumber;
#endif
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN)
QFileInfo fi(data->fileName);
QString where = _c('"') + fi.fileName() + _("\":")
+ data->lineNumber;
//QString where = m_data->fileName + _c(':') + data->lineNumber;
#endif
- execCommand(_("break ") + where, CB(handleBreakInsert1), index);
+ postCommand(_("break ") + where, CB(handleBreakInsert1), index);
}
}
@@ -2164,13 +2109,13 @@ void GdbEngine::attemptBreakpointSynchronization()
foreach (BreakpointData *data, handler->takeDisabledBreakpoints()) {
QString bpNumber = data->bpNumber;
if (!bpNumber.trimmed().isEmpty())
- execCommand(_("-break-disable ") + bpNumber, NeedsStop);
+ postCommand(_("-break-disable ") + bpNumber, NeedsStop);
}
foreach (BreakpointData *data, handler->takeEnabledBreakpoints()) {
QString bpNumber = data->bpNumber;
if (!bpNumber.trimmed().isEmpty())
- execCommand(_("-break-enable ") + bpNumber, NeedsStop);
+ postCommand(_("-break-enable ") + bpNumber, NeedsStop);
}
foreach (BreakpointData *data, handler->takeRemovedBreakpoints()) {
@@ -2178,7 +2123,7 @@ void GdbEngine::attemptBreakpointSynchronization()
debugMessage(_("DELETING BP %1 IN %2").arg(bpNumber)
.arg(data->markerFileName));
if (!bpNumber.trimmed().isEmpty())
- execCommand(_("-break-delete ") + bpNumber, NeedsStop);
+ postCommand(_("-break-delete ") + bpNumber, NeedsStop);
delete data;
}
@@ -2188,7 +2133,7 @@ void GdbEngine::attemptBreakpointSynchronization()
BreakpointData *data = handler->at(index);
// multiple breakpoints?
if (data->bpMultiple && data->bpFileName.isEmpty()) {
- execCommand(_("info break %1").arg(data->bpNumber),
+ postCommand(_("info break %1").arg(data->bpNumber),
CB(handleBreakInfo), data->bpNumber.toInt());
updateNeeded = true;
break;
@@ -2213,7 +2158,7 @@ void GdbEngine::attemptBreakpointSynchronization()
// update conditions if needed
if (data->bpNumber.toInt() && data->condition != data->bpCondition
&& !data->conditionsMatch()) {
- execCommand(_("condition %1 %2").arg(data->bpNumber).arg(data->condition),
+ postCommand(_("condition %1 %2").arg(data->bpNumber).arg(data->condition),
CB(handleBreakCondition), index);
//qDebug() << "UPDATE NEEDED BECAUSE OF CONDITION"
// << data->condition << data->bpCondition;
@@ -2222,7 +2167,7 @@ void GdbEngine::attemptBreakpointSynchronization()
}
// update ignorecount if needed
if (data->bpNumber.toInt() && data->ignoreCount != data->bpIgnoreCount) {
- execCommand(_("ignore %1 %2").arg(data->bpNumber).arg(data->ignoreCount),
+ postCommand(_("ignore %1 %2").arg(data->bpNumber).arg(data->ignoreCount),
CB(handleBreakIgnore), index);
updateNeeded = true;
break;
@@ -2239,12 +2184,6 @@ void GdbEngine::attemptBreakpointSynchronization()
}
}
- if (!updateNeeded && m_waitingForBreakpointSynchronizationToContinue) {
- m_waitingForBreakpointSynchronizationToContinue = false;
- // we continue the execution
- continueInferior();
- }
-
inBreakpointSychronization = false;
}
@@ -2257,7 +2196,7 @@ void GdbEngine::attemptBreakpointSynchronization()
void GdbEngine::reloadDisassembler()
{
- emit execCommand(_("disassemble"), CB(handleDisassemblerList), m_address);
+ emit postCommand(_("disassemble"), CB(handleDisassemblerList), m_address);
}
void GdbEngine::handleDisassemblerList(const GdbResultRecord &record,
@@ -2321,13 +2260,13 @@ void GdbEngine::handleDisassemblerList(const GdbResultRecord &record,
void GdbEngine::loadSymbols(const QString &moduleName)
{
// FIXME: gdb does not understand quoted names here (tested with 6.8)
- execCommand(_("sharedlibrary ") + dotEscape(moduleName));
+ postCommand(_("sharedlibrary ") + dotEscape(moduleName));
reloadModules();
}
void GdbEngine::loadAllSymbols()
{
- execCommand(_("sharedlibrary .*"));
+ postCommand(_("sharedlibrary .*"));
reloadModules();
}
@@ -2367,7 +2306,7 @@ QList<Symbol> GdbEngine::moduleSymbols(const QString &moduleName)
void GdbEngine::reloadModules()
{
- execCommand(_("info shared"), CB(handleModulesList));
+ postCommand(_("info shared"), CB(handleModulesList));
}
void GdbEngine::handleModulesList(const GdbResultRecord &record, const QVariant &)
@@ -2419,7 +2358,7 @@ void GdbEngine::handleModulesList(const GdbResultRecord &record, const QVariant
void GdbEngine::reloadSourceFiles()
{
- execCommand(_("-file-list-exec-source-files"), CB(handleQuerySources));
+ postCommand(_("-file-list-exec-source-files"), CB(handleQuerySources));
}
@@ -2445,7 +2384,7 @@ void GdbEngine::handleStackListFrames(const GdbResultRecord &record, const QVari
const GdbMi stack = record.data.findChild("stack");
stack.toString();
if (!stack.isValid()) {
- qDebug() << "FIXME: stack: " << stack.toString();
+ qDebug() << "FIXME: stack:" << stack.toString();
return;
}
@@ -2453,7 +2392,7 @@ void GdbEngine::handleStackListFrames(const GdbResultRecord &record, const QVari
int n = stack.childCount();
for (int i = 0; i != n; ++i) {
- //qDebug() << "HANDLING FRAME: " << stack.childAt(i).toString();
+ //qDebug() << "HANDLING FRAME:" << stack.childAt(i).toString();
const GdbMi frameMi = stack.childAt(i);
StackFrame frame(i);
QStringList files;
@@ -2467,7 +2406,7 @@ void GdbEngine::handleStackListFrames(const GdbResultRecord &record, const QVari
stackFrames.append(frame);
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN)
const bool isBogus =
// Assume this is wrong and points to some strange stl_algobase
// implementation. Happens on Karsten's XP system with Gdb 5.50
@@ -2477,7 +2416,7 @@ void GdbEngine::handleStackListFrames(const GdbResultRecord &record, const QVari
// immediately leave bogus frames
if (topFrame == -1 && isBogus) {
- execCommand(_("-exec-finish"));
+ postCommand(_("-exec-finish"));
return;
}
@@ -2500,7 +2439,7 @@ void GdbEngine::handleStackListFrames(const GdbResultRecord &record, const QVari
if (frame.isUsable())
q->gotoLocation(frame.file, frame.line, true);
else
- qDebug() << "FULL NAME NOT USABLE 0: " << frame.file << topFrame;
+ qDebug() << "FULL NAME NOT USABLE 0:" << frame.file << topFrame;
}
}
@@ -2516,7 +2455,7 @@ void GdbEngine::selectThread(int index)
QTC_ASSERT(index < threads.size(), return);
int id = threads.at(index).id;
q->showStatusMessage(tr("Retrieving data for stack view..."), 10000);
- execCommand(_("-thread-select %1").arg(id), CB(handleStackSelectThread));
+ postCommand(_("-thread-select %1").arg(id), CB(handleStackSelectThread));
}
void GdbEngine::activateFrame(int frameIndex)
@@ -2526,7 +2465,7 @@ void GdbEngine::activateFrame(int frameIndex)
StackHandler *stackHandler = qq->stackHandler();
int oldIndex = stackHandler->currentIndex();
- //qDebug() << "ACTIVATE FRAME: " << frameIndex << oldIndex
+ //qDebug() << "ACTIVATE FRAME:" << frameIndex << oldIndex
// << stackHandler->currentIndex();
if (frameIndex == stackHandler->stackSize()) {
@@ -2541,7 +2480,7 @@ void GdbEngine::activateFrame(int frameIndex)
// Assuming this always succeeds saves a roundtrip.
// Otherwise the lines below would need to get triggered
// after a response to this -stack-select-frame here.
- execCommand(_("-stack-select-frame ") + QString::number(frameIndex));
+ postCommand(_("-stack-select-frame ") + QString::number(frameIndex));
stackHandler->setCurrentIndex(frameIndex);
updateLocals();
@@ -2552,7 +2491,7 @@ void GdbEngine::activateFrame(int frameIndex)
if (frame.isUsable())
q->gotoLocation(frame.file, frame.line, true);
else
- qDebug() << "FULL NAME NOT USABLE: " << frame.file;
+ qDebug() << "FULL NAME NOT USABLE:" << frame.file;
}
void GdbEngine::handleStackListThreads(const GdbResultRecord &record, const QVariant &cookie)
@@ -2567,7 +2506,7 @@ void GdbEngine::handleStackListThreads(const GdbResultRecord &record, const QVar
thread.id = items.at(index).data().toInt();
threads.append(thread);
if (thread.id == id) {
- //qDebug() << "SETTING INDEX TO: " << index << " ID: "<< id << "RECOD: "<< record.toString();
+ //qDebug() << "SETTING INDEX TO:" << index << " ID:" << id << " RECOD:" << record.toString();
currentIndex = index;
}
}
@@ -2604,7 +2543,7 @@ static inline char registerFormatChar()
void GdbEngine::reloadRegisters()
{
- execCommand(_("-data-list-register-values ") + _c(registerFormatChar()),
+ postCommand(_("-data-list-register-values ") + _c(registerFormatChar()),
Discardable, CB(handleRegisterListValues));
}
@@ -2736,7 +2675,7 @@ void GdbEngine::setToolTipExpression(const QPoint &pos, const QString &exp0)
/*
for (int i = 0; i != m_currentLocals.childCount(); ++i) {
if (m_currentLocals.childAt(i).exp == "this") {
- qDebug() << "THIS IN ROW " << i;
+ qDebug() << "THIS IN ROW" << i;
if (m_currentLocals.childAt(i).type.startsWith(exp)) {
QToolTip::showText(m_toolTipPos,
tr("%1: type of current 'this'").arg(exp));
@@ -2774,6 +2713,7 @@ void GdbEngine::setToolTipExpression(const QPoint &pos, const QString &exp0)
static const QString strNotInScope =
QApplication::translate("Debugger::Internal::GdbEngine", "<not in scope>");
+
static void setWatchDataValue(WatchData &data, const GdbMi &mi,
int encoding = 0)
{
@@ -2880,7 +2820,7 @@ void GdbEngine::runDirectDebuggingHelper(const WatchData &data, bool dumpChildre
QVariant var;
var.setValue(data);
- execCommand(cmd, WatchUpdate, CB(handleDebuggingHelperValue3), var);
+ postCommand(cmd, WatchUpdate, CB(handleDebuggingHelperValue3), var);
q->showStatusMessage(
tr("Retrieving data for watch view (%1 requests pending)...")
@@ -2922,25 +2862,25 @@ void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren)
QVariant var;
var.setValue(data);
- execCommand(cmd, WatchUpdate | EmbedToken, CB(handleDebuggingHelperValue1), var);
+ postCommand(cmd, WatchUpdate | EmbedToken, CB(handleDebuggingHelperValue1), var);
q->showStatusMessage(
tr("Retrieving data for watch view (%1 requests pending)...")
.arg(m_pendingRequests + 1), 10000);
// retrieve response
- execCommand(_("p (char*)&qDumpOutBuffer"), WatchUpdate,
+ postCommand(_("p (char*)&qDumpOutBuffer"), WatchUpdate,
CB(handleDebuggingHelperValue2), var);
}
void GdbEngine::createGdbVariable(const WatchData &data)
{
- execCommand(_("-var-delete \"%1\"").arg(data.iname), WatchUpdate);
+ postCommand(_("-var-delete \"%1\"").arg(data.iname), WatchUpdate);
QString exp = data.exp;
if (exp.isEmpty() && data.addr.startsWith(__("0x")))
exp = _("*(") + gdbQuoteTypes(data.type) + _("*)") + data.addr;
QVariant val = QVariant::fromValue<WatchData>(data);
- execCommand(_("-var-create \"%1\" * \"%2\"").arg(data.iname).arg(exp),
+ postCommand(_("-var-create \"%1\" * \"%2\"").arg(data.iname).arg(exp),
WatchUpdate, CB(handleVarCreate), val);
}
@@ -2948,7 +2888,7 @@ void GdbEngine::updateSubItem(const WatchData &data0)
{
WatchData data = data0;
#if DEBUG_SUBITEM
- qDebug() << "UPDATE SUBITEM: " << data.toString();
+ qDebug() << "UPDATE SUBITEM:" << data.toString();
#endif
QTC_ASSERT(data.isValid(), return);
@@ -2959,11 +2899,11 @@ void GdbEngine::updateSubItem(const WatchData &data0)
if (!data.variable.isEmpty()) {
// Update: It does so for out-of-scope watchers.
#if 1
- qDebug() << "FIXME: GdbEngine::updateSubItem: "
+ qDebug() << "FIXME: GdbEngine::updateSubItem:"
<< data.toString() << "should not happen";
#else
- data.setType("<out of scope>");
- data.setValue("<out of scope>");
+ data.setType(strNotInScope);
+ data.setValue(strNotInScope);
data.setChildCount(0);
insertData(data);
return;
@@ -3035,7 +2975,7 @@ void GdbEngine::updateSubItem(const WatchData &data0)
qDebug() << "UPDATE SUBITEM: VALUE";
#endif
QString cmd = _("-var-evaluate-expression \"") + data.iname + _c('"');
- execCommand(cmd, WatchUpdate, CB(handleEvaluateExpression),
+ postCommand(cmd, WatchUpdate, CB(handleEvaluateExpression),
QVariant::fromValue(data));
return;
}
@@ -3061,7 +3001,7 @@ void GdbEngine::updateSubItem(const WatchData &data0)
if (data.isChildrenNeeded()) {
QTC_ASSERT(!data.variable.isEmpty(), return); // tested above
QString cmd = _("-var-list-children --all-values \"") + data.variable + _c('"');
- execCommand(cmd, WatchUpdate, CB(handleVarListChildren), QVariant::fromValue(data));
+ postCommand(cmd, WatchUpdate, CB(handleVarListChildren), QVariant::fromValue(data));
return;
}
@@ -3086,11 +3026,11 @@ void GdbEngine::updateSubItem(const WatchData &data0)
if (data.isChildCountNeeded()) {
QTC_ASSERT(!data.variable.isEmpty(), return); // tested above
QString cmd = _("-var-list-children --all-values \"") + data.variable + _c('"');
- execCommand(cmd, Discardable, CB(handleVarListChildren), QVariant::fromValue(data));
+ postCommand(cmd, Discardable, CB(handleVarListChildren), QVariant::fromValue(data));
return;
}
- qDebug() << "FIXME: UPDATE SUBITEM: " << data.toString();
+ qDebug() << "FIXME: UPDATE SUBITEM:" << data.toString();
QTC_ASSERT(false, return);
}
@@ -3160,7 +3100,7 @@ void GdbEngine::handleQueryDebuggingHelper(const GdbResultRecord &record, const
out = out.left(out.lastIndexOf('"'));
out.replace('\\', ""); // optimization: dumper output never needs real C unquoting
out = "dummy={" + out + "}";
- //qDebug() << "OUTPUT: " << out;
+ //qDebug() << "OUTPUT:" << out;
GdbMi contents;
contents.fromString(out);
@@ -3173,12 +3113,12 @@ void GdbEngine::handleQueryDebuggingHelper(const GdbResultRecord &record, const
qtv = (qtversion.childAt(0).data().toInt() << 16)
+ (qtversion.childAt(1).data().toInt() << 8)
+ qtversion.childAt(2).data().toInt();
- //qDebug() << "FOUND QT VERSION: " << qtversion.toString() << m_qtVersion;
+ //qDebug() << "FOUND QT VERSION:" << qtversion.toString() << m_qtVersion;
}
m_dumperHelper.setQtVersion(qtv);
- //qDebug() << "CONTENTS: " << contents.toString();
- //qDebug() << "SIMPLE DUMPERS: " << simple.toString();
+ //qDebug() << "CONTENTS:" << contents.toString();
+ //qDebug() << "SIMPLE DUMPERS:" << simple.toString();
QStringList availableSimpleDebuggingHelpers;
foreach (const GdbMi &item, simple.children())
@@ -3202,7 +3142,7 @@ void GdbEngine::handleQueryDebuggingHelper(const GdbResultRecord &record, const
.arg(m_dumperHelper.typeCount()));
}
//qDebug() << m_dumperHelper.toString(true);
- //qDebug() << "DATA DUMPERS AVAILABLE" << m_availableSimpleDebuggingHelpers;
+ //qDebug() << m_availableSimpleDebuggingHelpers << "DATA DUMPERS AVAILABLE";
}
void GdbEngine::sendWatchParameters(const QByteArray ¶ms0)
@@ -3219,7 +3159,7 @@ void GdbEngine::sendWatchParameters(const QByteArray ¶ms0)
}
encoded[encoded.size() - 1] = '}';
- execCommand(_(encoded));
+ postCommand(_(encoded));
}
void GdbEngine::handleVarAssign(const GdbResultRecord &, const QVariant &)
@@ -3250,7 +3190,7 @@ void GdbEngine::handleVarCreate(const GdbResultRecord &record,
// happens e.g. when we already issued a var-evaluate command
if (!data.isValid())
return;
- //qDebug() << "HANDLE VARIABLE CREATION: " << data.toString();
+ //qDebug() << "HANDLE VARIABLE CREATION:" << data.toString();
if (record.resultClass == GdbResultDone) {
data.variable = data.iname;
setWatchDataType(data, record.data.findChild("type"));
@@ -3297,18 +3237,18 @@ void GdbEngine::handleEvaluateExpression(const GdbResultRecord &record,
} else if (record.resultClass == GdbResultError) {
data.setError(QString::fromLocal8Bit(record.data.findChild("msg").data()));
}
- //qDebug() << "HANDLE EVALUATE EXPRESSION: " << data.toString();
+ //qDebug() << "HANDLE EVALUATE EXPRESSION:" << data.toString();
insertData(data);
//updateWatchModel2();
}
void GdbEngine::handleDebuggingHelperSetup(const GdbResultRecord &record, const QVariant &)
{
- //qDebug() << "CUSTOM SETUP RESULT: " << record.toString();
+ //qDebug() << "CUSTOM SETUP RESULT:" << record.toString();
if (record.resultClass == GdbResultDone) {
} else if (record.resultClass == GdbResultError) {
QString msg = QString::fromLocal8Bit(record.data.findChild("msg").data());
- //qDebug() << "CUSTOM DUMPER SETUP ERROR MESSAGE: " << msg;
+ //qDebug() << "CUSTOM DUMPER SETUP ERROR MESSAGE:" << msg;
q->showStatusMessage(tr("Custom dumper setup: %1").arg(msg), 10000);
}
}
@@ -3325,14 +3265,14 @@ void GdbEngine::handleDebuggingHelperValue1(const GdbResultRecord &record,
// in transmission
//--m_pendingRequests;
QString msg = QString::fromLocal8Bit(record.data.findChild("msg").data());
- //qDebug() << "CUSTOM DUMPER ERROR MESSAGE: " << msg;
+ //qDebug() << "CUSTOM DUMPER ERROR MESSAGE:" << msg;
#ifdef QT_DEBUG
// Make debugging of dumpers easier
if (theDebuggerBoolSetting(DebugDebuggingHelpers)
&& msg.startsWith(__("The program being debugged stopped while"))
&& msg.contains(__("qDumpObjectData440"))) {
// Fake full stop
- execCommand(_("p 0"), CB(handleAsyncOutput2)); // dummy
+ postCommand(_("p 0"), CB(handleAsyncOutput2)); // dummy
return;
}
#endif
@@ -3350,10 +3290,10 @@ void GdbEngine::handleDebuggingHelperValue2(const GdbResultRecord &record,
{
WatchData data = cookie.value<WatchData>();
QTC_ASSERT(data.isValid(), return);
- //qDebug() << "CUSTOM VALUE RESULT: " << record.toString();
- //qDebug() << "FOR DATA: " << data.toString() << record.resultClass;
+ //qDebug() << "CUSTOM VALUE RESULT:" << record.toString();
+ //qDebug() << "FOR DATA:" << data.toString() << record.resultClass;
if (record.resultClass != GdbResultDone) {
- qDebug() << "STRANGE CUSTOM DUMPER RESULT DATA: " << data.toString();
+ qDebug() << "STRANGE CUSTOM DUMPER RESULT DATA:" << data.toString();
return;
}
@@ -3409,7 +3349,7 @@ void GdbEngine::handleDebuggingHelperValue2(const GdbResultRecord &record,
WatchData childtemplate;
setWatchDataType(childtemplate, contents.findChild("childtype"));
setWatchDataChildCount(childtemplate, contents.findChild("childnumchild"));
- //qDebug() << "DATA: " << data.toString();
+ //qDebug() << "DATA:" << data.toString();
insertData(data);
foreach (GdbMi item, children.children()) {
WatchData data1 = childtemplate;
@@ -3447,51 +3387,68 @@ void GdbEngine::handleDebuggingHelperValue2(const GdbResultRecord &record,
void GdbEngine::handleDebuggingHelperValue3(const GdbResultRecord &record,
const QVariant &cookie)
{
- WatchData data = cookie.value<WatchData>();
- QByteArray out = record.data.findChild("consolestreamoutput").data();
- while (out.endsWith(' ') || out.endsWith('\n'))
- out.chop(1);
- QList<QByteArray> list = out.split(' ');
- //qDebug() << "RECEIVED" << record.toString() << " FOR " << data0.toString()
- // << " STREAM: " << out;
- if (list.isEmpty()) {
- //: Value for variable
- data.setValue(tr("<unavailable>"));
- data.setAllUnneeded();
- insertData(data);
- } else if (data.type == __("QString") || data.type.endsWith(__("::QString"))) {
+ if (record.resultClass == GdbResultDone) {
+ WatchData data = cookie.value<WatchData>();
+ QByteArray out = record.data.findChild("consolestreamoutput").data();
+ while (out.endsWith(' ') || out.endsWith('\n'))
+ out.chop(1);
QList<QByteArray> list = out.split(' ');
- QString str;
- for (int i = 0; i < list.size(); ++i)
- str.append(list.at(i).toInt());
- data.setValue(_c('"') + str + _c('"'));
- data.setChildCount(0);
- data.setAllUnneeded();
- insertData(data);
- } else if (data.type == __("QStringList") || data.type.endsWith(__("::QStringList"))) {
- int l = list.size();
- //: In string list
- data.setValue(tr("<%1 items>").arg(l));
- data.setChildCount(list.size());
- data.setAllUnneeded();
- insertData(data);
- for (int i = 0; i < l; ++i) {
- WatchData data1;
- data1.name = _("[%1]").arg(i);
- data1.type = data.type.left(data.type.size() - 4);
- data1.iname = data.iname + _(".%1").arg(i);
- data1.addr = _(list.at(i));
- data1.exp = _("((") + gdbQuoteTypes(data1.type) + _("*)") + data1.addr + _c(')');
- data1.setChildCount(0);
- data1.setValueNeeded();
- QString cmd = _("qdumpqstring (") + data1.exp + _c(')');
- QVariant var;
- var.setValue(data1);
- execCommand(cmd, WatchUpdate, CB(handleDebuggingHelperValue3), var);
+ //qDebug() << "RECEIVED" << record.toString() << "FOR" << data0.toString()
+ // << " STREAM:" << out;
+ if (list.isEmpty()) {
+ //: Value for variable
+ data.setValue(strNotInScope);
+ data.setAllUnneeded();
+ insertData(data);
+ } else if (data.type == __("QString")
+ || data.type.endsWith(__("::QString"))) {
+ QList<QByteArray> list = out.split(' ');
+ QString str;
+ int l = out.isEmpty() ? 0 : list.size();
+ for (int i = 0; i < l; ++i)
+ str.append(list.at(i).toInt());
+ data.setValue(_c('"') + str + _c('"'));
+ data.setChildCount(0);
+ data.setAllUnneeded();
+ insertData(data);
+ } else if (data.type == __("QStringList")
+ || data.type.endsWith(__("::QStringList"))) {
+ if (out.isEmpty()) {
+ data.setValue(tr("<0 items>"));
+ data.setChildCount(0);
+ data.setAllUnneeded();
+ insertData(data);
+ } else {
+ int l = list.size();
+ //: In string list
+ data.setValue(tr("<%1 items>").arg(l));
+ data.setChildCount(list.size());
+ data.setAllUnneeded();
+ insertData(data);
+ for (int i = 0; i < l; ++i) {
+ WatchData data1;
+ data1.name = _("[%1]").arg(i);
+ data1.type = data.type.left(data.type.size() - 4);
+ data1.iname = data.iname + _(".%1").arg(i);
+ data1.addr = _(list.at(i));
+ data1.exp = _("((") + gdbQuoteTypes(data1.type) + _("*)") + data1.addr + _c(')');
+ data1.setChildCount(0);
+ data1.setValueNeeded();
+ QString cmd = _("qdumpqstring (") + data1.exp + _c(')');
+ QVariant var;
+ var.setValue(data1);
+ postCommand(cmd, WatchUpdate, CB(handleDebuggingHelperValue3), var);
+ }
+ }
+ } else {
+ //: Value for variable
+ data.setValue(strNotInScope);
+ data.setAllUnneeded();
+ insertData(data);
}
- } else {
- //: Value for variable
- data.setValue(tr("<unavailable>"));
+ } else if (record.resultClass == GdbResultError) {
+ WatchData data = cookie.value<WatchData>();
+ data.setValue(strNotInScope);
data.setAllUnneeded();
insertData(data);
}
@@ -3509,9 +3466,9 @@ void GdbEngine::updateLocals()
QString level = QString::number(currentFrame());
// '2' is 'list with type and value'
QString cmd = _("-stack-list-arguments 2 ") + level + _c(' ') + level;
- execCommand(cmd, WatchUpdate, CB(handleStackListArguments));
+ postCommand(cmd, WatchUpdate, CB(handleStackListArguments));
// '2' is 'list with type and value'
- execCommand(_("-stack-list-locals 2"), WatchUpdate,
+ postCommand(_("-stack-list-locals 2"), WatchUpdate,
CB(handleStackListLocals)); // stage 2/2
}
@@ -3613,7 +3570,7 @@ void GdbEngine::setLocals(const QList<GdbMi> &locals)
if (isPointerType(data.type) || data.name == __("this"))
data.setChildCount(1);
if (0 && m_varToType.contains(data.framekey)) {
- qDebug() << "RE-USING " << m_varToType.value(data.framekey);
+ qDebug() << "RE-USING" << m_varToType.value(data.framekey);
data.setType(m_varToType.value(data.framekey));
}
insertData(data);
@@ -3626,7 +3583,7 @@ void GdbEngine::insertData(const WatchData &data0)
//qDebug() << "INSERT DATA" << data0.toString();
WatchData data = data0;
if (data.value.startsWith(__("mi_cmd_var_create:"))) {
- qDebug() << "BOGUS VALUE: " << data.toString();
+ qDebug() << "BOGUS VALUE:" << data.toString();
return;
}
qq->watchHandler()->insertData(data);
@@ -3655,16 +3612,16 @@ void GdbEngine::handleTypeContents(const QString &output)
className = head.left(posColon - 1);
tip = _("class ") + head + _(" { ... }");
}
- //qDebug() << "posColon: " << posColon;
- //qDebug() << "posBrace: " << posBrace;
- //qDebug() << "head: " << head;
+ //qDebug() << "posColon:" << posColon;
+ //qDebug() << "posBrace:" << posBrace;
+ //qDebug() << "head:" << head;
} else {
className = output.mid(7);
tip = className;
}
- //qDebug() << "output: " << output.left(100) + "...";
- //qDebug() << "className: " << className;
- //qDebug() << "tip: " << tip;
+ //qDebug() << "output:" << output.left(100) + "...";
+ //qDebug() << "className:" << className;
+ //qDebug() << "tip:" << tip;
//m_toolTip.type = className;
m_toolTip.type.clear();
m_toolTip.value = tip;
@@ -3674,7 +3631,7 @@ void GdbEngine::handleVarListChildrenHelper(const GdbMi &item,
const WatchData &parent)
{
//qDebug() << "VAR_LIST_CHILDREN: PARENT 2" << parent.toString();
- //qDebug() << "VAR_LIST_CHILDREN: APPENDEE " << data.toString();
+ //qDebug() << "VAR_LIST_CHILDREN: APPENDEE" << data.toString();
QByteArray exp = item.findChild("exp").data();
QByteArray name = item.findChild("name").data();
if (isAccessSpecifier(_(exp))) {
@@ -3691,7 +3648,7 @@ void GdbEngine::handleVarListChildrenHelper(const GdbMi &item,
//qDebug() << "DATA" << data.toString();
QString cmd = _("-var-list-children --all-values \"") + data.variable + _c('"');
//iname += '.' + exp;
- execCommand(cmd, WatchUpdate, CB(handleVarListChildren), QVariant::fromValue(data));
+ postCommand(cmd, WatchUpdate, CB(handleVarListChildren), QVariant::fromValue(data));
} else if (item.findChild("numchild").data() == "0") {
// happens for structs without data, e.g. interfaces.
WatchData data;
@@ -3709,7 +3666,7 @@ void GdbEngine::handleVarListChildrenHelper(const GdbMi &item,
WatchData data;
data.iname = _(name);
QString cmd = _("-var-list-children --all-values \"") + data.variable + _c('"');
- execCommand(cmd, WatchUpdate, CB(handleVarListChildren), QVariant::fromValue(data));
+ postCommand(cmd, WatchUpdate, CB(handleVarListChildren), QVariant::fromValue(data));
} else if (exp == "staticMetaObject") {
// && item.findChild("type").data() == "const QMetaObject")
// FIXME: Namespaces?
@@ -3766,7 +3723,7 @@ void GdbEngine::handleVarListChildrenHelper(const GdbMi &item,
}
//qDebug() << "VAR_LIST_CHILDREN: PARENT 3" << parent.toString();
- //qDebug() << "VAR_LIST_CHILDREN: APPENDEE " << data.toString();
+ //qDebug() << "VAR_LIST_CHILDREN: APPENDEE" << data.toString();
insertData(data);
}
}
@@ -3779,7 +3736,7 @@ void GdbEngine::handleVarListChildren(const GdbResultRecord &record,
if (!data.isValid())
return;
if (record.resultClass == GdbResultDone) {
- //qDebug() << "VAR_LIST_CHILDREN: PARENT " << data.toString();
+ //qDebug() << "VAR_LIST_CHILDREN: PARENT" << data.toString();
GdbMi children = record.data.findChild("children");
foreach (const GdbMi &child, children.children())
@@ -3815,11 +3772,11 @@ void GdbEngine::handleToolTip(const GdbResultRecord &record,
const QVariant &cookie)
{
const QByteArray &what = cookie.toByteArray();
- //qDebug() << "HANDLE TOOLTIP: " << what << m_toolTip.toString();
+ //qDebug() << "HANDLE TOOLTIP:" << what << m_toolTip.toString();
// << "record: " << record.toString();
if (record.resultClass == GdbResultError) {
if (what == "create") {
- execCommand(_("ptype ") + m_toolTip.exp,
+ postCommand(_("ptype ") + m_toolTip.exp,
Discardable, CB(handleToolTip), QByteArray("ptype"));
return;
}
@@ -3838,7 +3795,7 @@ void GdbEngine::handleToolTip(const GdbResultRecord &record,
runDebuggingHelper(m_toolTip, false);
else
q->showStatusMessage(tr("Retrieving data for tooltip..."), 10000);
- execCommand(_("-data-evaluate-expression ") + m_toolTip.exp,
+ postCommand(_("-data-evaluate-expression ") + m_toolTip.exp,
Discardable, CB(handleToolTip), QByteArray("evaluate"));
return;
}
@@ -3871,15 +3828,15 @@ void GdbEngine::handleChangedItem(QStandardItem *item)
QModelIndex index = item->index().sibling(item->index().row(), 0);
//WatchData data = m_currentSet.takeData(iname);
//m_editedData = inameFromItem(m_model.itemFromIndex(index)).exp;
- //qDebug() << "HANDLE CHANGED EXPRESSION: " << m_editedData;
+ //qDebug() << "HANDLE CHANGED EXPRESSION:" << m_editedData;
}
#endif
void GdbEngine::assignValueInDebugger(const QString &expression, const QString &value)
{
- execCommand(_("-var-delete assign"));
- execCommand(_("-var-create assign * ") + expression);
- execCommand(_("-var-assign assign ") + value, Discardable, CB(handleVarAssign));
+ postCommand(_("-var-delete assign"));
+ postCommand(_("-var-create assign * ") + expression);
+ postCommand(_("-var-assign assign ") + value, Discardable, CB(handleVarAssign));
}
void GdbEngine::tryLoadDebuggingHelpers()
@@ -3887,15 +3844,22 @@ void GdbEngine::tryLoadDebuggingHelpers()
if (m_debuggingHelperState != DebuggingHelperUninitialized)
return;
- if (!startModeAllowsDumpers())
+ if (!startModeAllowsDumpers()) {
+ // load gdb macro based dumpers at least
+ QFile file(_(":/gdbdebugger/gdbmacros.txt"));
+ file.open(QIODevice::ReadOnly);
+ QByteArray contents = file.readAll();
+ //qDebug() << "CONTENTS: " << contents;
+ postCommand(_(contents));
return;
+ }
PENDING_DEBUG("TRY LOAD CUSTOM DUMPERS");
m_debuggingHelperState = DebuggingHelperUnavailable;
if (!qq->qtDumperLibraryEnabled())
return;
const QString lib = qq->qtDumperLibraryName();
- //qDebug() << "DUMPERLIB: " << lib;
+ //qDebug() << "DUMPERLIB:" << lib;
// @TODO: same in CDB engine...
const QFileInfo fi(lib);
if (!fi.exists()) {
@@ -3907,42 +3871,42 @@ void GdbEngine::tryLoadDebuggingHelpers()
m_debuggingHelperState = DebuggingHelperLoadTried;
#if defined(Q_OS_WIN)
- execCommand(_("sharedlibrary .*")); // for LoadLibraryA
- //execCommand(_("handle SIGSEGV pass stop print"));
- //execCommand(_("set unwindonsignal off"));
- execCommand(_("call LoadLibraryA(\"") + GdbMi::escapeCString(lib) + _("\")"),
+ postCommand(_("sharedlibrary .*")); // for LoadLibraryA
+ //postCommand(_("handle SIGSEGV pass stop print"));
+ //postCommand(_("set unwindonsignal off"));
+ postCommand(_("call LoadLibraryA(\"") + GdbMi::escapeCString(lib) + _("\")"),
CB(handleDebuggingHelperSetup));
- execCommand(_("sharedlibrary ") + dotEscape(lib));
+ postCommand(_("sharedlibrary ") + dotEscape(lib));
#elif defined(Q_OS_MAC)
- //execCommand(_("sharedlibrary libc")); // for malloc
- //execCommand(_("sharedlibrary libdl")); // for dlopen
- execCommand(_("call (void)dlopen(\"") + GdbMi::escapeCString(lib) + _("\", " STRINGIFY(RTLD_NOW) ")"),
+ //postCommand(_("sharedlibrary libc")); // for malloc
+ //postCommand(_("sharedlibrary libdl")); // for dlopen
+ postCommand(_("call (void)dlopen(\"") + GdbMi::escapeCString(lib) + _("\", " STRINGIFY(RTLD_NOW) ")"),
CB(handleDebuggingHelperSetup));
- //execCommand(_("sharedlibrary ") + dotEscape(lib));
+ //postCommand(_("sharedlibrary ") + dotEscape(lib));
m_debuggingHelperState = DebuggingHelperLoadTried;
#else
- //execCommand(_("p dlopen"));
+ //postCommand(_("p dlopen"));
QString flag = QString::number(RTLD_NOW);
- execCommand(_("sharedlibrary libc")); // for malloc
- execCommand(_("sharedlibrary libdl")); // for dlopen
- execCommand(_("call (void*)dlopen(\"") + GdbMi::escapeCString(lib) + _("\", " STRINGIFY(RTLD_NOW) ")"),
+ postCommand(_("sharedlibrary libc")); // for malloc
+ postCommand(_("sharedlibrary libdl")); // for dlopen
+ postCommand(_("call (void*)dlopen(\"") + GdbMi::escapeCString(lib) + _("\", " STRINGIFY(RTLD_NOW) ")"),
CB(handleDebuggingHelperSetup));
// some older systems like CentOS 4.6 prefer this:
- execCommand(_("call (void*)__dlopen(\"") + GdbMi::escapeCString(lib) + _("\", " STRINGIFY(RTLD_NOW) ")"),
+ postCommand(_("call (void*)__dlopen(\"") + GdbMi::escapeCString(lib) + _("\", " STRINGIFY(RTLD_NOW) ")"),
CB(handleDebuggingHelperSetup));
- execCommand(_("sharedlibrary ") + dotEscape(lib));
+ postCommand(_("sharedlibrary ") + dotEscape(lib));
#endif
// retreive list of dumpable classes
- execCommand(_("call (void*)qDumpObjectData440(1,%1+1,0,0,0,0,0,0)"), EmbedToken);
- execCommand(_("p (char*)&qDumpOutBuffer"), CB(handleQueryDebuggingHelper));
+ postCommand(_("call (void*)qDumpObjectData440(1,%1+1,0,0,0,0,0,0)"), EmbedToken);
+ postCommand(_("p (char*)&qDumpOutBuffer"), CB(handleQueryDebuggingHelper));
}
void GdbEngine::recheckDebuggingHelperAvailability()
{
if (startModeAllowsDumpers()) {
// retreive list of dumpable classes
- execCommand(_("call (void*)qDumpObjectData440(1,%1+1,0,0,0,0,0,0)"), EmbedToken);
- execCommand(_("p (char*)&qDumpOutBuffer"), CB(handleQueryDebuggingHelper));
+ postCommand(_("call (void*)qDumpObjectData440(1,%1+1,0,0,0,0,0,0)"), EmbedToken);
+ postCommand(_("p (char*)&qDumpOutBuffer"), CB(handleQueryDebuggingHelper));
}
}
diff --git a/src/plugins/debugger/gdbengine.h b/src/plugins/debugger/gdbengine.h
index d749e75190ab0056c963ef3a6f94d8f686ff1e7f..8feef5dc32d9250902e016c5355c74c96125ae05 100644
--- a/src/plugins/debugger/gdbengine.h
+++ b/src/plugins/debugger/gdbengine.h
@@ -99,6 +99,7 @@ private:
void setToolTipExpression(const QPoint &pos, const QString &exp);
bool startDebugger();
void exitDebugger();
+ void detachDebugger();
void continueInferior();
void interruptInferior();
@@ -133,9 +134,7 @@ private:
void initializeConnections();
void initializeVariables();
- void queryFullName(const QString &fileName, QString *fullName);
QString fullName(const QString &fileName);
- QString shortName(const QString &fullName);
// get one usable name out of these, try full names first
QString fullName(const QStringList &candidates);
@@ -171,12 +170,12 @@ private:
// send and decrements on receipt, effectively preventing
// watch model updates before everything is finished.
void flushCommand(GdbCommand &cmd);
- void execCommand(const QString &command,
+ void postCommand(const QString &command,
GdbCommandFlags flags,
GdbCommandCallback callback = 0,
const char *callbackName = 0,
const QVariant &cookie = QVariant());
- void execCommand(const QString &command,
+ void postCommand(const QString &command,
GdbCommandCallback callback = 0,
const char *callbackName = 0,
const QVariant &cookie = QVariant());
@@ -189,6 +188,8 @@ private slots:
void gdbProcError(QProcess::ProcessError error);
void readGdbStandardOutput();
void readGdbStandardError();
+ void readUploadStandardOutput();
+ void readUploadStandardError();
void readDebugeeOutput(const QByteArray &data);
void stubStarted();
void stubError(const QString &msg);
@@ -205,7 +206,6 @@ private:
void handleAsyncOutput2(const GdbMi &data);
void handleAsyncOutput(const GdbMi &data);
void handleResultRecord(const GdbResultRecord &response);
- void handleAutoContinue(const GdbResultRecord &, const QVariant &);
void handleFileExecAndSymbols(const GdbResultRecord &response, const QVariant &);
void handleExecRun(const GdbResultRecord &response, const QVariant &);
void handleExecJumpToLine(const GdbResultRecord &response, const QVariant &);
@@ -218,7 +218,8 @@ private:
void handleQuerySources(const GdbResultRecord &response, const QVariant &);
void handleTargetCore(const GdbResultRecord &, const QVariant &);
void handleExit(const GdbResultRecord &, const QVariant &);
- void handleTargetAsync(const GdbResultRecord &, const QVariant &);
+ void handleSetTargetAsync(const GdbResultRecord &, const QVariant &);
+ void handleTargetRemote(const GdbResultRecord &, const QVariant &);
void debugMessage(const QString &msg);
OutputCollector m_outputCollector;
@@ -370,7 +371,7 @@ private:
QString m_currentFrame;
QMap<QString, QString> m_varToType;
- bool m_waitingForBreakpointSynchronizationToContinue;
+ bool m_autoContinue;
bool m_waitingForFirstBreakpointToBeHit;
bool m_modulesListOutdated;
diff --git a/src/plugins/debugger/gdbmacros.txt b/src/plugins/debugger/gdbmacros.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cc8a9a6c1d1cd6cba0850218c284dcc3618ad2df
--- /dev/null
+++ b/src/plugins/debugger/gdbmacros.txt
@@ -0,0 +1,18 @@
+define qdumpqstring
+set $i = 0
+set $l = $arg0->d->size
+set $p = $arg0->d->data
+while $i < $l
+printf "%d ",$p[$i++]
+end
+printf "\n"
+end
+
+define qdumpqstringlist
+set $i = $arg0->d->begin
+set $e = $arg0->d->end
+while $i < $e
+printf "%d ",$arg0->d->array + $i++
+end
+printf "\n"
+end
diff --git a/src/plugins/debugger/gdboptionspage.ui b/src/plugins/debugger/gdboptionspage.ui
index 5abd9866daf0694fe9aa1e2b77b6ceb68657c25f..922ed4d4c3afc90ad7de368c4037ac7ce6f86d78 100644
--- a/src/plugins/debugger/gdboptionspage.ui
+++ b/src/plugins/debugger/gdboptionspage.ui
@@ -10,9 +10,6 @@
<height>452</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBoxLocations">
@@ -32,7 +29,7 @@
<item row="0" column="0">
<widget class="QLabel" name="labelGdbLocation">
<property name="toolTip">
- <string>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.</string>
+ <string>This is either a full absolute path leading to the gdb binary you intend to use or the name of a gdb binary that will be searched in your PATH.</string>
</property>
<property name="text">
<string>Gdb location:</string>
diff --git a/src/plugins/debugger/idebuggerengine.h b/src/plugins/debugger/idebuggerengine.h
index ececbe9aa7a74c65a91481c072677f878998b0e9..9d85ebace1055744754d0afc015ee3dcb2d6da85 100644
--- a/src/plugins/debugger/idebuggerengine.h
+++ b/src/plugins/debugger/idebuggerengine.h
@@ -52,6 +52,7 @@ public:
virtual void setToolTipExpression(const QPoint &pos, const QString &exp) = 0;
virtual bool startDebugger() = 0;
virtual void exitDebugger() = 0;
+ virtual void detachDebugger() {}
virtual void updateWatchModel() = 0;
virtual void stepExec() = 0;
diff --git a/src/plugins/debugger/moduleshandler.cpp b/src/plugins/debugger/moduleshandler.cpp
index 19e7058c1e33f7532720e56a573323c56c584e14..ee1dc1f94e259b0aba8e04cd8e4958f3afe646ed 100644
--- a/src/plugins/debugger/moduleshandler.cpp
+++ b/src/plugins/debugger/moduleshandler.cpp
@@ -87,7 +87,7 @@ QVariant ModulesModel::headerData(int section,
tr("Module name") + " ",
tr("Symbols read") + " ",
tr("Start address") + " ",
- tr("End addAress") + " "
+ tr("End address") + " "
};
return headers[section];
}
diff --git a/src/plugins/debugger/scriptengine.h b/src/plugins/debugger/scriptengine.h
index 1e116b390150ff2cd180c816333ed65b908676fe..5c55b04d0db77aaf9631aff0491177faede23816 100644
--- a/src/plugins/debugger/scriptengine.h
+++ b/src/plugins/debugger/scriptengine.h
@@ -39,8 +39,6 @@
#include <QtCore/QSet>
#include <QtCore/QVariant>
-#include <QtNetwork/QLocalSocket>
-
QT_BEGIN_NAMESPACE
class QAction;
class QAbstractItemModel;
diff --git a/src/plugins/debugger/startremotedialog.ui b/src/plugins/debugger/startremotedialog.ui
index af0bc703237904f7cc6f1ba2793e766cc2572dea..242589276dc75164d36b96cb2029ce50012b2927 100644
--- a/src/plugins/debugger/startremotedialog.ui
+++ b/src/plugins/debugger/startremotedialog.ui
@@ -28,14 +28,14 @@
<item row="0" column="0">
<widget class="QLabel" name="channelLabel">
<property name="text">
- <string>Host and Port:</string>
+ <string>Host and port:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="channelLineEdit">
<property name="text">
- <string>localhost:5115</string>
+ <string notr="true">localhost:5115</string>
</property>
</widget>
</item>
@@ -49,15 +49,25 @@
<item row="1" column="1">
<widget class="QComboBox" name="architectureComboBox"/>
</item>
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="useServerStartScriptCheckBox"/>
+ </item>
<item row="2" column="0">
- <widget class="QLabel" name="serverStartScriptLabel">
+ <widget class="QLabel" name="useServerStartScriptLabel">
<property name="text">
- <string>Server start script</string>
+ <string>Use server start script:</string>
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="Core::Utils::PathChooser" name="serverStartScript" native="true"/>
+ <item row="3" column="1">
+ <widget class="Core::Utils::PathChooser" name="serverStartScript" native="true"/>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="serverStartScriptLabel">
+ <property name="text">
+ <string>Server start script:</string>
+ </property>
+ </widget>
</item>
</layout>
</item>
@@ -73,6 +83,13 @@
</item>
</layout>
</widget>
+ <customwidgets>
+ <customwidget>
+ <class>Core::Utils::PathChooser</class>
+ <extends>QWidget</extends>
+ <header location="global">utils/pathchooser.h</header>
+ </customwidget>
+ </customwidgets>
<resources/>
<connections/>
</ui>
diff --git a/src/plugins/debugger/tcfengine.cpp b/src/plugins/debugger/tcfengine.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..20d2e98b0978e863f0c73aa66fe5b619164e89ed
--- /dev/null
+++ b/src/plugins/debugger/tcfengine.cpp
@@ -0,0 +1,418 @@
+/**************************************************************************
+**
+** 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 "tcfengine.h"
+
+#include "debuggerdialogs.h"
+#include "breakhandler.h"
+#include "debuggerconstants.h"
+#include "debuggermanager.h"
+#include "disassemblerhandler.h"
+#include "moduleshandler.h"
+#include "registerhandler.h"
+#include "stackhandler.h"
+#include "watchhandler.h"
+#include "watchutils.h"
+#include "moduleshandler.h"
+
+#include <utils/qtcassert.h>
+
+#include <QtCore/QDateTime>
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QTimer>
+
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QMainWindow>
+#include <QtGui/QMessageBox>
+#include <QtGui/QToolTip>
+
+#include <QtNetwork/QTcpSocket>
+
+
+using namespace Debugger;
+using namespace Debugger::Internal;
+using namespace Debugger::Constants;
+
+#define DEBUG_TCF 1
+#if DEBUG_TCF
+# define SDEBUG(s) qDebug() << s
+#else
+# define SDEBUG(s)
+#endif
+# define XSDEBUG(s) qDebug() << s
+
+#define STRINGIFY_INTERNAL(x) #x
+#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
+#define CB(callback) &TcfEngine::callback, STRINGIFY(callback)
+
+///////////////////////////////////////////////////////////////////////
+//
+// TcfEngine
+//
+///////////////////////////////////////////////////////////////////////
+
+TcfEngine::TcfEngine(DebuggerManager *parent)
+{
+ q = parent;
+ qq = parent->engineInterface();
+ m_socket = new QTcpSocket(this);
+ connect(m_socket, SIGNAL(connected()), this, SLOT(socketConnected()));
+ connect(m_socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
+ connect(m_socket, SIGNAL(error(QAbstractSocket::SocketError)),
+ this, SLOT(socketError(QAbstractSocket::SocketError)));
+
+ //void aboutToClose ()
+ //void bytesWritten ( qint64 bytes )
+ //void readChannelFinished ()
+ connect(m_socket, SIGNAL(readyRead()), this, SLOT(socketReadyRead()));
+
+ //connect(m_socket, SIGNAL(hostFound())
+ //connect(m_socket, SIGNAL(proxyAuthenticationRequired(QNetworkProxy, QAuthenticator *)))
+ //connect(m_socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
+ // thism SLOT(socketStateChanged(QAbstractSocket::SocketState)));
+
+ connect(this, SIGNAL(tcfOutputAvailable(QString,QString)),
+ q, SLOT(showDebuggerOutput(QString,QString)),
+ Qt::QueuedConnection);
+ connect(this, SIGNAL(tcfInputAvailable(QString,QString)),
+ q, SLOT(showDebuggerInput(QString,QString)),
+ Qt::QueuedConnection);
+ connect(this, SIGNAL(applicationOutputAvailable(QString)),
+ q, SLOT(showApplicationOutput(QString)),
+ Qt::QueuedConnection);
+}
+
+TcfEngine::~TcfEngine()
+{
+}
+
+void TcfEngine::socketReadyRead()
+{
+ //XSDEBUG("TcfEngine::socketReadyRead()");
+ m_inbuffer.append(m_socket->readAll());
+ //handleResponse(QByteArray::fromRawData(m_inbuffer.constData() + start, end - start));
+ handleResponse(m_inbuffer);
+ m_inbuffer.clear();
+}
+
+void TcfEngine::socketConnected()
+{
+ q->showStatusMessage("Socket connected.");
+ m_socket->waitForConnected(2000);
+ //sendCommand("Locator", "redirect", "ID");
+}
+
+void TcfEngine::socketDisconnected()
+{
+ XSDEBUG("FIXME: TcfEngine::socketDisconnected()");
+}
+
+void TcfEngine::socketError(QAbstractSocket::SocketError)
+{
+ QString msg = tr("%1.").arg(m_socket->errorString());
+ //QMessageBox::critical(q->mainWindow(), tr("Error"), msg);
+ q->showStatusMessage(msg);
+ qq->notifyInferiorExited();
+}
+
+void TcfEngine::executeDebuggerCommand(const QString &command)
+{
+ Q_UNUSED(command);
+ XSDEBUG("FIXME: TcfEngine::executeDebuggerCommand()");
+}
+
+void TcfEngine::shutdown()
+{
+ exitDebugger();
+}
+
+void TcfEngine::exitDebugger()
+{
+ SDEBUG("TcfEngine::exitDebugger()");
+ qq->notifyInferiorExited();
+}
+
+bool TcfEngine::startDebugger()
+{
+ qq->notifyInferiorRunningRequested();
+ int pos = q->m_remoteChannel.indexOf(':');
+ QString host = q->m_remoteChannel.left(pos);
+ quint16 port = q->m_remoteChannel.mid(pos + 1).toInt();
+ //QTimer::singleShot(0, this, SLOT(runInferior()));
+ m_socket->connectToHost(host, port);
+ return true;
+}
+
+void TcfEngine::continueInferior()
+{
+ SDEBUG("TcfEngine::continueInferior()");
+}
+
+void TcfEngine::runInferior()
+{
+}
+
+void TcfEngine::interruptInferior()
+{
+ XSDEBUG("TcfEngine::interruptInferior()");
+}
+
+void TcfEngine::stepExec()
+{
+ //SDEBUG("TcfEngine::stepExec()");
+}
+
+void TcfEngine::stepIExec()
+{
+ //SDEBUG("TcfEngine::stepIExec()");
+}
+
+void TcfEngine::stepOutExec()
+{
+ //SDEBUG("TcfEngine::stepOutExec()");
+}
+
+void TcfEngine::nextExec()
+{
+ //SDEBUG("TcfEngine::nextExec()");
+}
+
+void TcfEngine::nextIExec()
+{
+ //SDEBUG("TcfEngine::nextIExec()");
+}
+
+void TcfEngine::runToLineExec(const QString &fileName, int lineNumber)
+{
+ Q_UNUSED(fileName);
+ Q_UNUSED(lineNumber);
+ SDEBUG("FIXME: TcfEngine::runToLineExec()");
+}
+
+void TcfEngine::runToFunctionExec(const QString &functionName)
+{
+ Q_UNUSED(functionName);
+ XSDEBUG("FIXME: TcfEngine::runToFunctionExec()");
+}
+
+void TcfEngine::jumpToLineExec(const QString &fileName, int lineNumber)
+{
+ Q_UNUSED(fileName);
+ Q_UNUSED(lineNumber);
+ XSDEBUG("FIXME: TcfEngine::jumpToLineExec()");
+}
+
+void TcfEngine::activateFrame(int index)
+{
+ Q_UNUSED(index);
+}
+
+void TcfEngine::selectThread(int index)
+{
+ Q_UNUSED(index);
+}
+
+void TcfEngine::attemptBreakpointSynchronization()
+{
+}
+
+void TcfEngine::reloadDisassembler()
+{
+}
+
+void TcfEngine::loadSymbols(const QString &moduleName)
+{
+ Q_UNUSED(moduleName);
+}
+
+void TcfEngine::loadAllSymbols()
+{
+}
+
+void TcfEngine::reloadModules()
+{
+}
+
+QList<Symbol> TcfEngine::moduleSymbols(const QString & /*moduleName*/)
+{
+ return QList<Symbol>();
+}
+
+
+void TcfEngine::handleResponse(const QByteArray &buf)
+{
+ static QTime lastTime;
+
+ //emit tcfOutputAvailable(_(" "), currentTime());
+ TcfResponse response;
+ QList<QByteArray> parts = buf.split('\0');
+ int n = parts.size();
+ if (n >= 1)
+ response.tag = parts.at(0);
+ if (n >= 2)
+ response.service = parts.at(1);
+ if (n >= 3)
+ response.cmd = parts.at(2);
+ if (n >= 4)
+ response.data = parts.at(3);
+ if (response.cmd != "peerHeartBeat")
+ emit tcfOutputAvailable(_("\ntcf:"), quoteUnprintableLatin1(buf));
+ //emit tcfOutputAvailable(_("\ntcf:"), response.toString());
+ qDebug() << response.toString();
+
+ if (response.service == "Locator" && response.cmd == "Hello") {
+ //postCommand('C', CB(handleRunControlSuspend),
+ // "RunControl", "suspend", "\"Thread1\"");
+ //postCommand('C', CB(handleRunControlSuspend),
+ // "RunControl", "getContext", "\"P12318\"");
+ postCommand('C', CB(handleRunControlGetChildren),
+ "RunControl", "getChildren", "\"\"");
+
+ postCommand('C', CB(handleSysMonitorGetChildren),
+ "SysMonitor", "getChildren", "\"\"");
+
+ //postCommand('F', "0", "", "");
+ //postCommand('E', "Locator", "Hello", "");
+ //postCommand('C', "Locator", "sync", "");
+ //postCommand("Locator", "redirect", "ID");
+ return;
+ }
+
+ TcfCommand tcf = m_cookieForToken[1];
+ if (tcf.callback)
+ (this->*(tcf.callback))(response, tcf.cookie);
+}
+
+void TcfEngine::postCommand(char tag,
+ TcfCommandCallback callback,
+ const char *callbackName,
+ const QByteArray &service,
+ const QByteArray &cmd,
+ const QByteArray &args)
+{
+ static int token;
+ ++token;
+
+ const char delim = 0;
+ const char marker_eom = -1;
+ const char marker_eos = -2;
+ const char marker_null = -3;
+
+ QByteArray ba;
+ ba.append(tag);
+ ba.append(delim);
+ ba.append(QString::number(token).toLatin1());
+ ba.append(delim);
+ ba.append(service);
+ ba.append(delim);
+ ba.append(cmd);
+ ba.append(delim);
+ ba.append(args);
+ ba.append(delim);
+ ba.append(3);
+ ba.append(1);
+
+ TcfCommand tcf;
+ tcf.command = ba;
+ tcf.callback = callback;
+
+ m_cookieForToken[token] = tcf;
+
+ emit tcfInputAvailable("send", quoteUnprintableLatin1(ba));
+ int result = m_socket->write(tcf.command);
+ m_socket->flush();
+ emit tcfInputAvailable("send", QString::number(result));
+}
+
+void TcfEngine::handleRunControlSuspend(const TcfResponse &response, const QVariant &)
+{
+ qDebug() << "HANDLE RESULT";
+}
+
+void TcfEngine::handleRunControlGetChildren(const TcfResponse &response, const QVariant &)
+{
+ qDebug() << "HANDLE RESULT" << response.toString();
+}
+
+void TcfEngine::handleSysMonitorGetChildren(const TcfResponse &response, const QVariant &)
+{
+ qDebug() << "HANDLE RESULT" << response.toString();
+}
+
+//////////////////////////////////////////////////////////////////////
+//
+// Tooltip specific stuff
+//
+//////////////////////////////////////////////////////////////////////
+
+static WatchData m_toolTip;
+static QPoint m_toolTipPos;
+static QHash<QString, WatchData> m_toolTipCache;
+
+void TcfEngine::setToolTipExpression(const QPoint &pos, const QString &exp0)
+{
+}
+
+
+//////////////////////////////////////////////////////////////////////
+//
+// Watch specific stuff
+//
+//////////////////////////////////////////////////////////////////////
+
+void TcfEngine::assignValueInDebugger(const QString &expression,
+ const QString &value)
+{
+ XSDEBUG("ASSIGNING: " << expression + '=' + value);
+ updateLocals();
+}
+
+void TcfEngine::updateLocals()
+{
+}
+
+void TcfEngine::updateWatchModel()
+{
+ qq->watchHandler()->rebuildModel();
+ q->showStatusMessage(tr("Stopped."), 5000);
+}
+
+void TcfEngine::updateSubItem(const WatchData &data0)
+{
+ QTC_ASSERT(false, return);
+}
+
+IDebuggerEngine *createTcfEngine(DebuggerManager *parent, QList<Core::IOptionsPage*> *)
+{
+ return new TcfEngine(parent);
+}
+
diff --git a/src/plugins/debugger/tcfengine.h b/src/plugins/debugger/tcfengine.h
new file mode 100644
index 0000000000000000000000000000000000000000..c80411f14350a9fb2110dd9064fa69a9f862247d
--- /dev/null
+++ b/src/plugins/debugger/tcfengine.h
@@ -0,0 +1,179 @@
+/**************************************************************************
+**
+** 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.
+**
+**************************************************************************/
+
+#ifndef DEBUGGER_TCFENGINE_H
+#define DEBUGGER_TCFENGINE_H
+
+#include <QtCore/QByteArray>
+#include <QtCore/QHash>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QProcess>
+#include <QtCore/QPoint>
+#include <QtCore/QSet>
+#include <QtCore/QVariant>
+
+#include <QtNetwork/QAbstractSocket>
+
+QT_BEGIN_NAMESPACE
+class QTcpSocket;
+QT_END_NAMESPACE
+
+#include "idebuggerengine.h"
+#include "debuggermanager.h"
+
+namespace Debugger {
+namespace Internal {
+
+class DebuggerManager;
+class IDebuggerManagerAccessForEngines;
+class ScriptAgent;
+class WatchData;
+
+class TcfResponse
+{
+public:
+ enum ResponseType
+ {
+ HelloResponse,
+ HeartBeatResponse
+ };
+
+ QString toString() const
+ {
+ return _("TAG: " + tag + " SERVICE: " + service
+ + " CMD: " + cmd + " DATA: " + data);
+ }
+
+ QByteArray tag;
+ QByteArray service;
+ QByteArray cmd;
+ QByteArray data;
+};
+
+class TcfEngine : public IDebuggerEngine
+{
+ Q_OBJECT
+
+public:
+ explicit TcfEngine(DebuggerManager *parent);
+ ~TcfEngine();
+
+signals:
+ void tcfInputAvailable(const QString &prefix, const QString &msg);
+ void tcfOutputAvailable(const QString &prefix, const QString &msg);
+ void applicationOutputAvailable(const QString &output);
+
+private:
+ // IDebuggerEngine implementation
+ void stepExec();
+ void stepOutExec();
+ void nextExec();
+ void stepIExec();
+ void nextIExec();
+
+ void shutdown();
+ void setToolTipExpression(const QPoint &pos, const QString &exp);
+ bool startDebugger();
+ void exitDebugger();
+
+ void continueInferior();
+ Q_SLOT void runInferior();
+ void interruptInferior();
+
+ void runToLineExec(const QString &fileName, int lineNumber);
+ void runToFunctionExec(const QString &functionName);
+ void jumpToLineExec(const QString &fileName, int lineNumber);
+
+ void activateFrame(int index);
+ void selectThread(int index);
+
+ void attemptBreakpointSynchronization();
+
+ void assignValueInDebugger(const QString &expr, const QString &value);
+ void executeDebuggerCommand(const QString & command);
+
+ void loadSymbols(const QString &moduleName);
+ void loadAllSymbols();
+ virtual QList<Symbol> moduleSymbols(const QString &moduleName);
+ void reloadDisassembler();
+ void reloadModules();
+ void reloadRegisters() {}
+ void reloadSourceFiles() {}
+ void reloadFullStack() {}
+
+ bool supportsThreads() const { return true; }
+ void maybeBreakNow(bool byFunction);
+ void updateWatchModel();
+ void updateLocals();
+ void updateSubItem(const WatchData &data0);
+
+ Q_SLOT void socketConnected();
+ Q_SLOT void socketDisconnected();
+ Q_SLOT void socketError(QAbstractSocket::SocketError);
+ Q_SLOT void socketReadyRead();
+
+ void handleResponse(const QByteArray &ba);
+ void handleRunControlSuspend(const TcfResponse &response, const QVariant &);
+ void handleRunControlGetChildren(const TcfResponse &response, const QVariant &);
+ void handleSysMonitorGetChildren(const TcfResponse &response, const QVariant &);
+
+private:
+ typedef void (TcfEngine::*TcfCommandCallback)
+ (const TcfResponse &record, const QVariant &cookie);
+
+ struct TcfCommand
+ {
+ TcfCommand() : flags(0), callback(0), callbackName(0) {}
+
+ int flags;
+ TcfCommandCallback callback;
+ const char *callbackName;
+ QByteArray command;
+ QVariant cookie;
+ };
+
+ void postCommand(char tag,
+ TcfCommandCallback callback,
+ const char *callbackName,
+ const QByteArray &service,
+ const QByteArray &cmd, const QByteArray &args);
+
+ QHash<int, TcfCommand> m_cookieForToken;
+
+ DebuggerManager *q;
+ IDebuggerManagerAccessForEngines *qq;
+ QTcpSocket *m_socket;
+ QByteArray m_inbuffer;
+};
+
+} // namespace Internal
+} // namespace Debugger
+
+#endif // DEBUGGER_TCFENGINE_H
diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h
index ed565044b29f847507bdf5305dd822b08727020c..aaefbe6f8cc70925844bc6230b30b5d669ad3f48 100644
--- a/src/plugins/debugger/watchhandler.h
+++ b/src/plugins/debugger/watchhandler.h
@@ -181,6 +181,8 @@ public:
{ return m_displayedINames.contains(iname); }
bool isExpandedIName(const QString &iname) const
{ return m_expandedINames.contains(iname); }
+ QSet<QString> expandedINames() const
+ { return m_expandedINames; }
void insertData(const WatchData &data);
QList<WatchData> takeCurrentIncompletes();
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index 812442a323896035a84c03c235772bf6143e3680..a665bd774eef650b3ebc311533fc3def9a250ae4 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -313,7 +313,7 @@ QString sizeofTypeExpression(const QString &type)
// Utilities to decode string data returned by the dumper helpers.
-static QString quoteUnprintableLatin1(const QByteArray &ba)
+QString quoteUnprintableLatin1(const QByteArray &ba)
{
QString res;
char buf[10];
diff --git a/src/plugins/debugger/watchutils.h b/src/plugins/debugger/watchutils.h
index af0a20c3b7c66299f5eba4112996b6fa883517c7..e9d8ab79105ec30d891260eb0f4aaf3deaa14d56 100644
--- a/src/plugins/debugger/watchutils.h
+++ b/src/plugins/debugger/watchutils.h
@@ -65,6 +65,7 @@ bool extractTemplate(const QString &type, QString *tmplate, QString *inner);
QString extractTypeFromPTypeOutput(const QString &str);
bool isIntOrFloatType(const QString &type);
QString sizeofTypeExpression(const QString &type);
+QString quoteUnprintableLatin1(const QByteArray &ba);
// Decode string data as returned by the dumper helpers.
QString decodeData(const QByteArray &baIn, int encoding);
diff --git a/src/plugins/designer/cpp/formclasswizardpage.ui b/src/plugins/designer/cpp/formclasswizardpage.ui
index 5b739be4f8778e3c34c88226177f2f6fed8fa306..9a2849ad0a0097f870a0d24ae9d7199e0dcf3242 100644
--- a/src/plugins/designer/cpp/formclasswizardpage.ui
+++ b/src/plugins/designer/cpp/formclasswizardpage.ui
@@ -81,7 +81,7 @@
<string>Aggregation as a pointer member</string>
</property>
<attribute name="buttonGroup">
- <string>buttonGroup</string>
+ <string notr="true">buttonGroup</string>
</attribute>
</widget>
</item>
@@ -91,7 +91,7 @@
<string>Aggregation</string>
</property>
<attribute name="buttonGroup">
- <string>buttonGroup</string>
+ <string notr="true">buttonGroup</string>
</attribute>
</widget>
</item>
@@ -101,7 +101,7 @@
<string>Multiple Inheritance</string>
</property>
<attribute name="buttonGroup">
- <string>buttonGroup</string>
+ <string notr="true">buttonGroup</string>
</attribute>
</widget>
</item>
diff --git a/src/plugins/designer/designer.pri b/src/plugins/designer/designer.pri
new file mode 100644
index 0000000000000000000000000000000000000000..d8af4897b388b64c9fbbd93b6a609678c9a4c9b9
--- /dev/null
+++ b/src/plugins/designer/designer.pri
@@ -0,0 +1,3 @@
+include(designer_dependencies.pri)
+
+LIBS *= -l$$qtLibraryTarget(Designer)
diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro
index 7fc739875661192299614a88ad82d5995a0aeb9a..c7e5936b38679f59c71805388844b421b82c41a2 100644
--- a/src/plugins/designer/designer.pro
+++ b/src/plugins/designer/designer.pro
@@ -1,7 +1,8 @@
TEMPLATE = lib
TARGET = Designer
+DEFINES += DESIGNER_LIBRARY
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(../../shared/designerintegrationv2/designerintegration.pri)
include(cpp/cpp.pri)
include(designer_dependencies.pri)
@@ -26,14 +27,15 @@ HEADERS += formeditorplugin.h \
formwindowfile.h \
formwindowhost.h \
formwizard.h \
- workbenchintegration.h \
+ qtcreatorintegration.h \
designerconstants.h \
settingspage.h \
editorwidget.h \
formeditorw.h \
settingsmanager.h \
formtemplatewizardpage.h \
- formwizarddialog.h
+ formwizarddialog.h \
+ designer_export.h
SOURCES += formeditorplugin.cpp \
formeditorfactory.cpp \
@@ -41,7 +43,7 @@ SOURCES += formeditorplugin.cpp \
formwindowfile.cpp \
formwindowhost.cpp \
formwizard.cpp \
- workbenchintegration.cpp \
+ qtcreatorintegration.cpp \
settingspage.cpp \
editorwidget.cpp \
formeditorw.cpp \
diff --git a/src/plugins/perforce/p4.h b/src/plugins/designer/designer_export.h
similarity index 84%
rename from src/plugins/perforce/p4.h
rename to src/plugins/designer/designer_export.h
index 107cf41da8490c7afdd44815f5acbabb4e1a9c07..da3e02ba6250816313cd7699476a40adf94c6434 100644
--- a/src/plugins/perforce/p4.h
+++ b/src/plugins/designer/designer_export.h
@@ -27,19 +27,15 @@
**
**************************************************************************/
-#ifndef P4_API_INCL
-#define P4_API_INCL
+#ifndef DESIGNER_EXPORT_H
+#define DESIGNER_EXPORT_H
-#include <qconfig.h>
+#include <QtCore/qglobal.h>
-#ifdef USE_P4_API
-#
-# if defined(Q_OS_WIN) && defined(SetPort)
-# undef SetPort
-# endif
-#
-# include <clientapi.h>
-# include <diff.h>
+#if defined(DESIGNER_LIBRARY)
+# define DESIGNER_EXPORT Q_DECL_EXPORT
+#else
+# define DESIGNER_EXPORT Q_DECL_IMPORT
#endif
-#endif // P4_API_INCL
+#endif // DESIGNER_EXPORT_H
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 9ed27b57e13cb237bbb13ac86cf32dd5664d34ec..650f549e777074d60e72de6fc66a052e492f6e5c 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -33,7 +33,7 @@
#include "settingsmanager.h"
#include "settingspage.h"
#include "editorwidget.h"
-#include "workbenchintegration.h"
+#include "qtcreatorintegration.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
@@ -238,7 +238,7 @@ void FormEditorW::fullInit()
QDesignerComponents::initializePlugins(designerEditor());
QDesignerComponents::initializeResources();
initDesignerSubWindows();
- m_integration = new WorkbenchIntegration(m_formeditor, this);
+ m_integration = new QtCreatorIntegration(m_formeditor, this);
m_formeditor->setIntegration(m_integration);
/**
@@ -667,7 +667,7 @@ void FormEditorW::print()
QString errorMessage;
const QPixmap pixmap = m_fwm->createPreviewPixmap(&errorMessage);
if (pixmap.isNull()) {
- critical(tr("The image could not be create: %1").arg(errorMessage));
+ critical(tr("The image could not be created: %1").arg(errorMessage));
break;
}
diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp
index 513513361c273d1367b63fbc5f2046976dd7f989..e3d623c2660a5a69da0a197ef55069fc2299836f 100644
--- a/src/plugins/designer/formwindoweditor.cpp
+++ b/src/plugins/designer/formwindoweditor.cpp
@@ -356,3 +356,10 @@ QString FormWindowEditor::contextHelpId() const
return className;
#endif
}
+
+QString FormWindowEditor::contents() const
+{
+ if (m_host && m_host->formWindow())
+ return m_host->formWindow()->contents();
+ return QString::null;
+}
diff --git a/src/plugins/designer/formwindoweditor.h b/src/plugins/designer/formwindoweditor.h
index b2b64d584cfd075e344cfd11b1838610ef7e311d..d5727c9f8deb538093aaea7de370bd8e726b51b8 100644
--- a/src/plugins/designer/formwindoweditor.h
+++ b/src/plugins/designer/formwindoweditor.h
@@ -35,6 +35,8 @@
#include <QtCore/QByteArray>
#include <QtCore/QStringList>
+#include "designer_export.h"
+
QT_BEGIN_NAMESPACE
class QDesignerFormWindowInterface;
class QDesignerFormWindowManagerInterface;
@@ -56,7 +58,7 @@ class EditorWidget;
// Master class maintaining a form window editor,
// containing file and widget host
-class FormWindowEditor : public Core::IEditor
+class DESIGNER_EXPORT FormWindowEditor : public Core::IEditor
{
Q_OBJECT
public:
@@ -88,6 +90,8 @@ public:
void updateFormWindowSelectionHandles(bool state);
void setSuggestedFileName(const QString &fileName);
+ QString contents() const;
+
signals:
// Internal
void opened(const QString &fileName);
diff --git a/src/plugins/designer/workbenchintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
similarity index 98%
rename from src/plugins/designer/workbenchintegration.cpp
rename to src/plugins/designer/qtcreatorintegration.cpp
index 8768e4709242fc94693ad2248f66e6222331a265..b5450584c1bcc20848b6d8a12152b0d540f9f005 100644
--- a/src/plugins/designer/workbenchintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -28,7 +28,7 @@
**************************************************************************/
#include "formeditorplugin.h"
-#include "workbenchintegration.h"
+#include "qtcreatorintegration.h"
#include "formeditorw.h"
#include "formwindoweditor.h"
@@ -69,7 +69,7 @@ static QString msgClassNotFound(const QString &uiClassName, const QList<Document
files += QLatin1String(", ");
files += doc->fileName();
}
- return WorkbenchIntegration::tr("The class definition of '%1' could not be found in %2.").arg(uiClassName, files);
+ return QtCreatorIntegration::tr("The class definition of '%1' could not be found in %2.").arg(uiClassName, files);
}
static inline CppTools::CppModelManagerInterface *cppModelManagerInstance()
@@ -78,7 +78,7 @@ static inline CppTools::CppModelManagerInterface *cppModelManagerInstance()
->getObject<CppTools::CppModelManagerInterface>();
}
-WorkbenchIntegration::WorkbenchIntegration(QDesignerFormEditorInterface *core, FormEditorW *parent) :
+QtCreatorIntegration::QtCreatorIntegration(QDesignerFormEditorInterface *core, FormEditorW *parent) :
qdesigner_internal::QDesignerIntegration(core, ::qobject_cast<QObject*>(parent)),
m_few(parent)
{
@@ -89,14 +89,14 @@ WorkbenchIntegration::WorkbenchIntegration(QDesignerFormEditorInterface *core, F
this, SLOT(slotNavigateToSlot(QString, QString, QStringList)));
}
-void WorkbenchIntegration::updateSelection()
+void QtCreatorIntegration::updateSelection()
{
if (FormWindowEditor *afww = m_few->activeFormWindow())
afww->updateFormWindowSelectionHandles(true);
qdesigner_internal::QDesignerIntegration::updateSelection();
}
-QWidget *WorkbenchIntegration::containerWindow(QWidget * /*widget*/) const
+QWidget *QtCreatorIntegration::containerWindow(QWidget * /*widget*/) const
{
FormWindowEditor *fw = m_few->activeFormWindow();
if (!fw)
@@ -526,7 +526,7 @@ static ClassDocumentPtrPair
return ClassDocumentPtrPair(0, Document::Ptr());
}
-void WorkbenchIntegration::slotNavigateToSlot(const QString &objectName, const QString &signalSignature,
+void QtCreatorIntegration::slotNavigateToSlot(const QString &objectName, const QString &signalSignature,
const QStringList ¶meterNames)
{
QString errorMessage;
@@ -549,7 +549,7 @@ static inline QString uiClassName(QString formObjectName)
// Goto slot invoked by the designer context menu. Either navigates
// to an existing slot function or create a new one.
-bool WorkbenchIntegration::navigateToSlot(const QString &objectName,
+bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
const QString &signalSignature,
const QStringList ¶meterNames,
QString *errorMessage)
diff --git a/src/plugins/designer/workbenchintegration.h b/src/plugins/designer/qtcreatorintegration.h
similarity index 90%
rename from src/plugins/designer/workbenchintegration.h
rename to src/plugins/designer/qtcreatorintegration.h
index 92707d664a098db710acd7bd4ee3e6e1f3e3fd8b..52782508177089d2d1aa948c4927ed9953294cb6 100644
--- a/src/plugins/designer/workbenchintegration.h
+++ b/src/plugins/designer/qtcreatorintegration.h
@@ -27,8 +27,8 @@
**
**************************************************************************/
-#ifndef WORKBENCHINTEGRATION_H
-#define WORKBENCHINTEGRATION_H
+#ifndef QTCREATORINTEGRATION_H
+#define QTCREATORINTEGRATION_H
#include <cpptools/cppmodelmanagerinterface.h>
@@ -39,10 +39,10 @@ namespace Internal {
class FormEditorW;
-class WorkbenchIntegration : public qdesigner_internal::QDesignerIntegration {
+class QtCreatorIntegration : public qdesigner_internal::QDesignerIntegration {
Q_OBJECT
public:
- WorkbenchIntegration(QDesignerFormEditorInterface *core, FormEditorW *parent = 0);
+ QtCreatorIntegration(QDesignerFormEditorInterface *core, FormEditorW *parent = 0);
QWidget *containerWindow(QWidget *widget) const;
@@ -63,4 +63,4 @@ private:
} // namespace Internal
} // namespace Designer
-#endif // WORKBENCHINTEGRATION_H
+#endif // QTCREATORINTEGRATION_H
diff --git a/src/plugins/fakevim/fakevim.pro b/src/plugins/fakevim/fakevim.pro
index 890f047cfa46ba08d42f2995b9c91ed6621966f7..372077baa3e78755578ed388d42ae52ea7a6e701 100644
--- a/src/plugins/fakevim/fakevim.pro
+++ b/src/plugins/fakevim/fakevim.pro
@@ -3,7 +3,7 @@ TARGET = FakeVim
# CONFIG += single
include(../../libs/cplusplus/cplusplus.pri)
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/texteditor/texteditor.pri)
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index 6c61fe38e47df2ef8ab84143bc7d41ae6e7e7363..b1166456411aa15a1623fdb0b0fa7695e5c076c0 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -1125,6 +1125,8 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
m_registers[m_register] = removeSelectedText();
m_mode = InsertMode;
finishMovement();
+ } else if (key == control('c')) {
+ showBlackMessage("Type Alt-v,Alt-v to quit FakeVim mode");
} else if (key == 'd' && m_visualMode == NoVisualMode) {
if (atEndOfLine())
moveLeft();
@@ -1475,7 +1477,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
EventResult FakeVimHandler::Private::handleInsertMode(int key, int,
const QString &text)
{
- if (key == Key_Escape || key == 27) {
+ if (key == Key_Escape || key == 27 || key == control('c')) {
// start with '1', as one instance was already physically inserted
// while typing
QString data = m_lastInsertion;
@@ -1573,7 +1575,7 @@ EventResult FakeVimHandler::Private::handleMiniBufferModes(int key, int unmodifi
{
Q_UNUSED(text)
- if (key == Key_Escape) {
+ if (key == Key_Escape || key == control('c')) {
m_commandBuffer.clear();
enterCommandMode();
updateMiniBuffer();
diff --git a/src/plugins/fakevim/fakevimoptions.ui b/src/plugins/fakevim/fakevimoptions.ui
index 4e3e8465993e7dfbcc2543cc7e87443ad03d698d..8909fd08c0ce22bb8e86dadc9b61a1c85366900e 100644
--- a/src/plugins/fakevim/fakevimoptions.ui
+++ b/src/plugins/fakevim/fakevimoptions.ui
@@ -10,9 +10,6 @@
<height>322</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QCheckBox" name="checkBoxUseFakeVim">
diff --git a/src/plugins/find/find.pro b/src/plugins/find/find.pro
index 52c93f3023361b4df44f756386573b40b19695be..bfdb979332a06cab9a1db6e9809b52d23b87c5a1 100644
--- a/src/plugins/find/find.pro
+++ b/src/plugins/find/find.pro
@@ -1,6 +1,6 @@
TEMPLATE = lib
TARGET = Find
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(find_dependencies.pri)
DEFINES += FIND_LIBRARY
HEADERS += findtoolwindow.h \
diff --git a/src/plugins/genericprojectmanager/genericmakestep.ui b/src/plugins/genericprojectmanager/genericmakestep.ui
index 6a4b2796b5dab42bb2039ead9c95137064ca5644..cf7420d03cf45c459e848e0c3ce1b01217b863b8 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.ui
+++ b/src/plugins/genericprojectmanager/genericmakestep.ui
@@ -10,9 +10,6 @@
<height>392</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="makeLabel">
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.pro b/src/plugins/genericprojectmanager/genericprojectmanager.pro
index eb00ccc16e413afd36d0f436ec266a1ae323a4a1..a58404176a9c2a66c2eac82bf657cb0ec5001fa5 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.pro
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.pro
@@ -1,6 +1,6 @@
TEMPLATE = lib
TARGET = GenericProjectManager
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(genericprojectmanager_dependencies.pri)
HEADERS = genericproject.h \
genericprojectplugin.h \
diff --git a/src/plugins/git/branchdialog.ui b/src/plugins/git/branchdialog.ui
index 07f7ff656b135726c239486e09596c6f4d591c45..d88914fca5f3041aea60df70fb8ee648a0799044 100644
--- a/src/plugins/git/branchdialog.ui
+++ b/src/plugins/git/branchdialog.ui
@@ -29,9 +29,6 @@
</item>
<item row="0" column="1">
<widget class="QLabel" name="repositoryFieldLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
</widget>
</item>
</layout>
diff --git a/src/plugins/git/changeselectiondialog.ui b/src/plugins/git/changeselectiondialog.ui
index 34f2718ec8f433e25062785c4b923eb4b082a235..e8e2250a726e5ce01e082c472bdabfbb3b5b2006 100644
--- a/src/plugins/git/changeselectiondialog.ui
+++ b/src/plugins/git/changeselectiondialog.ui
@@ -10,9 +10,6 @@
<height>142</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Dialog</string>
- </property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
diff --git a/src/plugins/git/git.pro b/src/plugins/git/git.pro
index c038852a2dc1bfc346afd649ec15d3c532bc1a1d..8b9a6171e8865d2c75e45903bd4248efe9b4ce5b 100644
--- a/src/plugins/git/git.pro
+++ b/src/plugins/git/git.pro
@@ -1,6 +1,6 @@
TEMPLATE = lib
TARGET = ScmGit
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../plugins/texteditor/texteditor.pri)
include(../../plugins/coreplugin/coreplugin.pri)
diff --git a/src/plugins/git/settingspage.ui b/src/plugins/git/settingspage.ui
index 1a594bf4313fc8354d13d125bbae783e6593fa2e..02f3671a1df30d2bf4651b0ef595ce1cb78ea7b9 100644
--- a/src/plugins/git/settingspage.ui
+++ b/src/plugins/git/settingspage.ui
@@ -10,9 +10,6 @@
<height>251</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="environmentGroupBox">
diff --git a/src/plugins/helloworld/helloworld.pro b/src/plugins/helloworld/helloworld.pro
index 19be467b0f6ecda573ea0996d500f880f5622287..82313b6dd17e70c8118cb1e50cabc23c33f67a6d 100644
--- a/src/plugins/helloworld/helloworld.pro
+++ b/src/plugins/helloworld/helloworld.pro
@@ -1,7 +1,7 @@
TEMPLATE = lib
TARGET = HelloWorld
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
HEADERS += helloworldplugin.h \
diff --git a/src/plugins/help/centralwidget.cpp b/src/plugins/help/centralwidget.cpp
index c1ad95d4832a466f7b699be39550db7eb2140512..7904da10079e0ec1bd1f4bea3a57345f5196ea76 100644
--- a/src/plugins/help/centralwidget.cpp
+++ b/src/plugins/help/centralwidget.cpp
@@ -71,7 +71,7 @@ namespace {
}
return 0;
}
- CentralWidget *staticCentralWidget = 0;
+ Help::Internal::CentralWidget *staticCentralWidget = 0;
}
CentralWidget::CentralWidget(QHelpEngine *engine, QWidget *parent)
diff --git a/src/plugins/help/centralwidget.h b/src/plugins/help/centralwidget.h
index c12272da13a08757f6a91d13a1a892db30a1dc7a..ae77a3832cdcc915b03554ca93133918e8c0779a 100644
--- a/src/plugins/help/centralwidget.h
+++ b/src/plugins/help/centralwidget.h
@@ -48,18 +48,13 @@ class QToolButton;
class QTabWidget;
class QHelpEngine;
class QFocusEvent;
-class CentralWidget;
-class HelpViewer;
-
QT_END_NAMESPACE
+class HelpViewer;
+
namespace Help {
namespace Internal {
class PrintHelper;
-} // namespace Internal
-} // namespace Help
-
-QT_BEGIN_NAMESPACE
class CentralWidget : public QWidget
{
@@ -143,8 +138,7 @@ private:
QPrinter *printer;
};
-QT_END_NAMESPACE
-//} // namespace Internal
-//} // namespace Help
+} // namespace Internal
+} // namespace Help
#endif // CENTRALWIDGET_H
diff --git a/src/plugins/help/contentstoolwindow.h b/src/plugins/help/contentstoolwindow.h
index 993ab390827e5d40cca80613e8d9bf8cead36dad..d62eb27097d4567c19e8ce53512583ce61ac859e 100644
--- a/src/plugins/help/contentstoolwindow.h
+++ b/src/plugins/help/contentstoolwindow.h
@@ -43,6 +43,7 @@ class ContentsToolWindow;
class ContentsToolWidget : public QTreeWidget
{
Q_OBJECT
+
public:
ContentsToolWidget();
diff --git a/src/plugins/help/docsettingspage.ui b/src/plugins/help/docsettingspage.ui
index 311be060c76d9cfc26395cef699755c8ee7d8823..93c1124bf7d0756231394ceebb0c9bad8c9bd3ac 100644
--- a/src/plugins/help/docsettingspage.ui
+++ b/src/plugins/help/docsettingspage.ui
@@ -9,9 +9,6 @@
<height>240</height>
</rect>
</property>
- <property name="windowTitle" >
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout" >
<item>
<widget class="QLabel" name="label" >
diff --git a/src/plugins/help/filtersettingspage.ui b/src/plugins/help/filtersettingspage.ui
index 367e7ce0a9e3391f0b5d16dfe73e4b5dcd22b730..8a208e63c702405920fe1178566019c09b1bb56c 100644
--- a/src/plugins/help/filtersettingspage.ui
+++ b/src/plugins/help/filtersettingspage.ui
@@ -9,9 +9,6 @@
<height>300</height>
</rect>
</property>
- <property name="windowTitle" >
- <string>Form</string>
- </property>
<layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" colspan="2" >
<widget class="QLabel" name="label" >
diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro
index 750afe0e445a6253cd299884eacbee75b4d206f1..d2d64ccee86007c6dac952aa6441df876169d735 100644
--- a/src/plugins/help/help.pro
+++ b/src/plugins/help/help.pro
@@ -1,6 +1,6 @@
TEMPLATE = lib
TARGET = Help
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/find/find.pri)
include(../../plugins/quickopen/quickopen.pri)
diff --git a/src/plugins/help/helpfindsupport.h b/src/plugins/help/helpfindsupport.h
index e7aedeb8bf7ae36f25bb78311e072fdcf96b77d7..1a5da5490cb40c0778e985d92c888fcfb35025db 100644
--- a/src/plugins/help/helpfindsupport.h
+++ b/src/plugins/help/helpfindsupport.h
@@ -34,9 +34,8 @@
#include <find/ifindsupport.h>
-QT_BEGIN_NAMESPACE
+
class HelpViewer;
-QT_END_NAMESPACE
namespace Help {
namespace Internal {
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 9250e2ebd0a6b850a0a39ee6258792972f58ee47..6440d4834220a81584c3a0dd801d2ffc4cbec266 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -66,6 +66,7 @@
#include <QtGui/QStyle>
#include <QtGui/QToolBar>
#include <QtGui/QComboBox>
+#include <QtGui/QDesktopServices>
#include <QtHelp/QHelpEngine>
#ifndef QT_NO_WEBKIT
@@ -230,7 +231,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
am->actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
#endif
- m_centralWidget = new CentralWidget(m_helpEngine);
+ m_centralWidget = new Help::Internal::CentralWidget(m_helpEngine);
Aggregation::Aggregate *agg = new Aggregation::Aggregate;
agg->add(m_centralWidget);
agg->add(new HelpFindSupport(m_centralWidget));
@@ -355,6 +356,8 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
createRightPaneSideBar();
+ QDesktopServices::setUrlHandler("qthelp", this, "openHelpPage");
+
return true;
}
@@ -522,7 +525,7 @@ void HelpPlugin::extensionsInitialized()
m_bookmarkManager->setupBookmarkModels();
if (Core::Internal::WelcomeMode *welcomeMode = qobject_cast<Core::Internal::WelcomeMode*>(m_core->modeManager()->mode(Core::Constants::MODE_WELCOME))) {
- connect(welcomeMode, SIGNAL(requestHelp()), this, SLOT(openGettingStarted()));
+ connect(welcomeMode, SIGNAL(openHelpPage(const QString&)), this, SLOT(openHelpPage(const QString&)));
}
}
@@ -720,13 +723,21 @@ void HelpPlugin::addNewBookmark(const QString &title, const QString &url)
m_bookmarkManager->showBookmarkDialog(m_centralWidget, title, url);
}
-void HelpPlugin::openGettingStarted()
+void HelpPlugin::openHelpPage(const QUrl& url)
{
- activateHelpMode();
- m_centralWidget->setSource(
- QString("qthelp://com.nokia.qtcreator.%1%2/doc/index.html")
- .arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR));
+ openHelpPage(url.toString());
}
+void HelpPlugin::openHelpPage(const QString& url)
+{
+ activateHelpMode();
+ if (m_helpEngine->findFile(url).isValid())
+ m_centralWidget->setSource(url);
+ else {
+ QString page = url.mid(url.lastIndexOf('/')+1);
+ qDebug() << url << page << url.lastIndexOf('/');
+ QDesktopServices::openUrl(QLatin1String("http://doc.qtsoftware.com/latest/")+page);
+ }
+}
Q_EXPORT_PLUGIN(HelpPlugin)
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index d5a5dd9821b9fbfad62872768ee35f027ee0df61..316d3742c2db770ac06569027954e34f642fe815 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -44,14 +44,13 @@ class QHelpEngine;
class QShortcut;
class QToolBar;
class QUrl;
+QT_END_NAMESPACE
class IndexWindow;
class ContentWindow;
class BookmarkManager;
class BookmarkWidget;
-class CentralWidget;
class HelpViewer;
-QT_END_NAMESPACE
namespace Core {
@@ -62,6 +61,9 @@ class SideBarItem;
}
namespace Help {
+namespace Internal {
+ class CentralWidget;
+}
namespace Constants {
const char * const C_MODE_HELP = "Help Mode";
@@ -126,7 +128,8 @@ private slots:
void slotHideRightPane();
void copyFromSideBar();
- void openGettingStarted();
+ void openHelpPage(const QUrl& url);
+ void openHelpPage(const QString& url);
private:
QToolBar *createToolBar();
@@ -141,7 +144,7 @@ private:
BookmarkWidget *m_bookmarkWidget;
BookmarkManager *m_bookmarkManager;
SearchWidget *m_searchWidget;
- CentralWidget *m_centralWidget;
+ Help::Internal::CentralWidget *m_centralWidget;
HelpViewer *m_helpViewerForSideBar;
HelpMode *m_mode;
bool m_shownLastPages;
diff --git a/src/plugins/perforce/perforce.pro b/src/plugins/perforce/perforce.pro
index e386aba34c17cb8000aeacfce7281c744848bc64..017dda298193c2111bb49d8126ad61580824ecdd 100644
--- a/src/plugins/perforce/perforce.pro
+++ b/src/plugins/perforce/perforce.pro
@@ -1,10 +1,10 @@
TEMPLATE = lib
TARGET = Perforce
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(perforce_dependencies.pri)
-HEADERS += p4.h \
+HEADERS += \
perforceplugin.h \
perforceoutputwindow.h \
settingspage.h \
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index a3112da078bfbfc6f477c4928ddfa39a62eacc73..1cb25746d2a1e57068e311a4c8be544fc2417d6b 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -30,7 +30,6 @@
#include "perforceplugin.h"
#include "changenumberdialog.h"
-#include "p4.h"
#include "pendingchangesdialog.h"
#include "perforceconstants.h"
#include "perforceeditor.h"
@@ -188,9 +187,6 @@ PerforcePlugin::PerforcePlugin() :
m_undoAction(0),
m_redoAction(0),
m_changeTmpFile(0),
-#ifdef USE_P4_API
- m_workbenchClientUser(0),
-#endif
m_coreListener(0),
m_submitEditorFactory(0),
m_versionControl(0)
@@ -334,13 +330,6 @@ bool PerforcePlugin::initialize(const QStringList &arguments, QString *errorMess
connect(m_openedAction, SIGNAL(triggered()), this, SLOT(printOpenedFileList()));
mperforce->addAction(command);
-#ifdef USE_P4_API
- m_resolveAction = new QAction(tr("Resolve"), this);
- command = am->registerAction(m_resolveAction, PerforcePlugin::RESOLVE, globalcontext);
- connect(m_resolveAction, SIGNAL(triggered()), this, SLOT(resolve()));
- mperforce->addAction(command);
-#endif
-
m_submitAction = new QAction(tr("Submit Project"), this);
command = am->registerAction(m_submitAction, PerforcePlugin::SUBMIT, globalcontext);
command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+S")));
@@ -493,14 +482,6 @@ void PerforcePlugin::printOpenedFileList()
PerforceResponse result = runP4Cmd(QStringList() << QLatin1String("opened"), QStringList(), CommandToWindow|StdOutToWindow|StdErrToWindow|ErrorToWindow);
}
-#ifdef USE_P4_API
-void PerforcePlugin::resolve()
-{
- m_workbenchClientUser->setMode(WorkbenchClientUser::Resolve);
- runP4APICmd(QLatin1String("resolve"));
-}
-#endif
-
void PerforcePlugin::submit()
{
if (!checkP4Command()) {
@@ -680,7 +661,7 @@ void PerforcePlugin::updateActions()
m_submitAction->setEnabled(true);
} else {
m_diffProjectAction->setEnabled(false);
- m_diffProjectAction->setText(tr("Diff Current Project/Soluion"));
+ m_diffProjectAction->setText(tr("Diff Current Project/Solution"));
m_submitAction->setEnabled(false);
}
m_diffAllAction->setEnabled(true);
@@ -689,11 +670,6 @@ void PerforcePlugin::updateActions()
m_annotateAction->setEnabled(true);
m_filelogAction->setEnabled(true);
m_pendingAction->setEnabled(true);
-
-
-#ifdef USE_P4_API
- m_resolveAction->setEnabled(m_enableP4APIActions);
-#endif
}
bool PerforcePlugin::managesDirectory(const QString &directory) const
diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h
index 4191d30e8b2b8f704fa96966d3b11c1c5ab9e928..733b514dd2349185744cde9324a366d10fbf9364 100644
--- a/src/plugins/perforce/perforceplugin.h
+++ b/src/plugins/perforce/perforceplugin.h
@@ -138,10 +138,6 @@ private slots:;
void printPendingChanges();
void slotDiff(const QStringList &files);
-#ifdef USE_P4_API
- void resolve();
-#endif
-
private:
QStringList environment() const;
@@ -223,12 +219,6 @@ private:
static PerforcePlugin *m_perforcePluginInstance;
QString pendingChangesData();
-#ifdef USE_P4_API
- void runP4APICmd(const QString &cmd, const QStringList &args = QStringList());
- WorkbenchClientUser *m_workbenchClientUser;
- bool m_enableP4APIActions;
-#endif
-
CoreListener *m_coreListener;
Core::IEditorFactory *m_submitEditorFactory;
PerforceVersionControl *m_versionControl;
diff --git a/src/plugins/perforce/settingspage.ui b/src/plugins/perforce/settingspage.ui
index b2d6bf10e354968de9496a1de57e628aadb22733..5af25e5f81fbbc5c0c7acbdca1baf3f699a560fe 100644
--- a/src/plugins/perforce/settingspage.ui
+++ b/src/plugins/perforce/settingspage.ui
@@ -10,9 +10,6 @@
<height>198</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout">
<property name="spacing">
<number>6</number>
diff --git a/src/plugins/perforce/workbenchclientuser.cpp b/src/plugins/perforce/workbenchclientuser.cpp
deleted file mode 100644
index 097fe214904328134075a84fa8f6445ef5e4bf4c..0000000000000000000000000000000000000000
--- a/src/plugins/perforce/workbenchclientuser.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-/**************************************************************************
-**
-** 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 "workbenchclientuser.h"
-#include "perforceoutputwindow.h"
-#include "perforceplugin.h"
-
-#include <coreplugin/filemanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
-#include <coreplugin/editormanager/editormanager.h>
-
-#include <QtCore/QEventLoop>
-#include <QtCore/QTemporaryFile>
-#include <QtGui/QMessageBox>
-#include <QtGui/QRadioButton>
-#include <QtGui/QMessageBox>
-#include <QtGui/QMainWindow>
-
-using namespace Perforce::Internal;
-
-PromptDialog::PromptDialog(const QString &choice, const QString &text,
- QWidget *parent)
- : QDialog(parent)
-{
- m_ui.setupUi(this);
- m_ui.msgLabel->setText(text);
-
- const QChar closingParenthesis = QLatin1Char(')');
- const QStringList opts = choice.split(QString(closingParenthesis));
- int row = 0;
- int column = 0;
- QString opt;
- QRadioButton *rb = 0;
- for (int i=0; i<opts.count(); ++i) {
- opt = opts.at(i).trimmed();
- if (opt.isEmpty() || opt.startsWith(QLatin1String("Help")))
- continue;
- if (i == opts.count()-1)
- opt = QLatin1String("Default(") + opt.left(opt.length()-1);
- opt.append(QLatin1String(")"));
- rb = new QRadioButton(opt, this);
- rb->setChecked(true);
- if (column>0 && column%3==0)
- ++row;
- m_ui.gridLayout->addWidget(rb, row, column%3, 1, 1);
- ++column;
-
- const int j = opt.lastIndexOf(QLatin1Char('('));
- opt = opt.mid(j+1, opt.lastIndexOf(closingParenthesis)-j-1);
- m_optionsMap.insert(rb, opt);
- }
-}
-
-QString PromptDialog::input() const
-{
- QMapIterator<QRadioButton*, QString> it(m_optionsMap);
- while (it.hasNext()) {
- it.next();
- if (it.key()->isChecked())
- return it.value();
- }
- return QString();
-}
-
-WorkbenchClientUser::WorkbenchClientUser(PerforceOutputWindow *out, PerforcePlugin *plugin) :
- QObject(out),
- m_plugin(plugin),
- m_core(Core::ICore::instance()),
- m_currentEditorIface(0),
- m_userCancelled(false),
- m_mode(Submit),
- m_perforceOutputWindow(out),
- m_skipNextMsg(false),
- m_eventLoop(new QEventLoop(this))
-{
- connect(m_core, SIGNAL(coreAboutToClose()),
- this, SLOT(cancelP4Command()));
-}
-
-WorkbenchClientUser::~WorkbenchClientUser()
-{
-}
-
-void WorkbenchClientUser::setMode(WorkbenchClientUser::Mode mode)
-{
- m_mode = mode;
-}
-
-void WorkbenchClientUser::cancelP4Command()
-{
- m_userCancelled = true;
- m_eventLoop->quit();
-}
-
-void WorkbenchClientUser::Message(Error* err)
-{
- StrBuf buf;
- err->Fmt(&buf);
- QString s = buf.Text();
- m_perforceOutputWindow->append(s);
- if (!m_skipNextMsg) {
- if (err->GetSeverity() == E_FAILED || err->GetSeverity() == E_FATAL) {
- if (!s.startsWith("Client side operation(s) failed."))
- m_errMsg.append(s);
- } else {
- m_msg.append(s);
- }
- }
- m_skipNextMsg = false;
-}
-
-void WorkbenchClientUser::displayErrorMsg(const QString &msg)
-{
- if (msg.isEmpty())
- return;
-
- const QString title = tr("Perforce Error");
- switch (m_mode) {
- case Submit: {
- QMessageBox msgBox(QMessageBox::Critical, title, msg, QMessageBox::Ok, m_core->mainWindow());
- msgBox.setDetailedText(m_msg);
- msgBox.exec();
- }
- break;
- default:
- QMessageBox::critical(m_core->mainWindow(), title, msg);
- break;
- }
- m_errMsg.clear();
-}
-
-void WorkbenchClientUser::OutputError(const char *errBuf)
-{
- QString s(errBuf);
- s = s.trimmed();
- m_perforceOutputWindow->append(s);
- displayErrorMsg(s);
-}
-
-void WorkbenchClientUser::Finished()
-{
- m_errMsg = m_errMsg.trimmed();
- displayErrorMsg(m_errMsg);
- m_msg.clear();
- m_currentEditorIface = 0;
- m_userCancelled = false;
- m_skipNextMsg = false;
-}
-
-bool WorkbenchClientUser::editorAboutToClose(Core::IEditor *editor)
-{
- if (editor && editor == m_currentEditorIface) {
- if (m_mode == WorkbenchClientUser::Submit) {
- const QMessageBox::StandardButton answer =
- QMessageBox::question(m_core->mainWindow(),
- tr("Closing p4 Editor"),
- tr("Do you want to submit this change list?"),
- QMessageBox::Yes|QMessageBox::No|QMessageBox::Cancel, QMessageBox::Yes);
- if (answer == QMessageBox::Cancel)
- return false;
- if (answer == QMessageBox::No)
- m_userCancelled = true;
- m_core->fileManager()->blockFileChange(m_currentEditorIface->file());
- m_currentEditorIface->file()->save();
- m_core->fileManager()->unblockFileChange(m_currentEditorIface->file());
- }
- m_eventLoop->quit();
- m_currentEditorIface = 0;
- }
- return true;
-}
-
-void WorkbenchClientUser::Diff(FileSys *f1, FileSys *f2, int, char *, Error *err)
-{
- if (!f1->IsTextual() || !f2->IsTextual())
- return;
-
- FileSys *file1 = File(FST_BINARY);
- file1->Set(f1->Name());
-
- FileSys *file2 = File(FST_BINARY);
- file2->Set(f2->Name());
-
- QTemporaryFile tmp;
- tmp.open();
- QString fileName = tmp.fileName();
-
- {
- ::Diff d;
- d.SetInput(file1, file2, DiffFlags(), err);
- if (!err->Test())
- d.SetOutput(fileName.toLatin1().constData(), err);
- if (!err->Test())
- d.DiffUnified();
- d.CloseOutput(err);
- }
- delete file1;
- delete file2;
-
- QString title = QString("diff %1").arg(f1->Name());
- m_currentEditorIface = m_core->editorManager()->newFile("Perforce Editor", &title, tmp.readAll());
- if (!m_currentEditorIface) {
- err->Set(E_FAILED, "p4 data could not be opened!");
- return;
- }
- m_userCancelled = false;
- m_eventLoop->exec();
- if (m_userCancelled)
- err->Set(E_FAILED, "");
-}
-
-void WorkbenchClientUser::Edit(FileSys *f, Error *err)
-{
- QString fileName(f->Name());
- if (m_mode == Submit) {
- m_currentEditorIface = m_plugin->openPerforceSubmitEditor(fileName, QStringList());
- }
- else {
- m_currentEditorIface = m_core->editorManager()->openEditor(fileName);
- m_core->editorManager()->ensureEditorManagerVisible();
- }
- if (!m_currentEditorIface) {
- err->Set(E_FAILED, "p4 data could not be opened!");
- return;
- }
- m_userCancelled = false;
- m_eventLoop->exec();
- if (m_userCancelled)
- err->Set(E_FAILED, "");
-}
-
-void WorkbenchClientUser::Prompt(const StrPtr &msg, StrBuf &answer, int , Error *err)
-{
- if (m_userCancelled) {
- err->Set(E_FATAL, "");
- return;
- }
- PromptDialog dia(msg.Text(), m_msg, qobject_cast<QWidget*>(m_core));
- dia.exec();
- answer = qstrdup(dia.input().toLatin1().constData());
- if (m_mode == WorkbenchClientUser::Resolve) {
- if (strcmp(answer.Text(), "e") == 0) {
- ;
- } else if (strcmp(answer.Text(), "d") == 0) {
- ;
- } else {
- m_msg.clear();
- m_skipNextMsg = true;
- }
- }
-}
-
-void WorkbenchClientUser::ErrorPause(char *msg, Error *)
-{
- QMessageBox::warning(m_core->mainWindow(), tr("Perforce Error"), QString::fromUtf8(msg));
-}
diff --git a/src/plugins/perforce/workbenchclientuser.h b/src/plugins/perforce/workbenchclientuser.h
deleted file mode 100644
index 359bc1da29b633eed38876296f329be000e0e557..0000000000000000000000000000000000000000
--- a/src/plugins/perforce/workbenchclientuser.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/**************************************************************************
-**
-** 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.
-**
-**************************************************************************/
-
-#ifndef WORKBENCHCLIENTUSER_H
-#define WORKBENCHCLIENTUSER_H
-
-#include "p4.h"
-#include "ui_promptdialog.h"
-
-#include <coreplugin/icorelistener.h>
-
-#include <QtCore/QObject>
-#include <QtCore/QMap>
-
-QT_BEGIN_NAMESPACE
-class QRadioButton;
-class QEventLoop;
-QT_END_NAMESPACE
-
-namespace Core {
-class ICore;
-class IEditor;
-}
-
-namespace Perforce {
-namespace Internal {
-
-class PerforceOutputWindow;
-class PerforcePlugin;
-
-class PromptDialog : public QDialog
-{
-public:
- PromptDialog(const QString &choice, const QString &text, QWidget *parent = 0);
- QString input() const;
-
-private:
- Ui::PromptDialog m_ui;
- QMap<QRadioButton*, QString> m_optionsMap;
-};
-
-class WorkbenchClientUser : public QObject, public ClientUser
-{
- Q_OBJECT
-
-public:
- enum Mode {Submit, Resolve};
- WorkbenchClientUser(PerforceOutputWindow *out, PerforcePlugin *plugin);
- ~WorkbenchClientUser();
- void setMode(WorkbenchClientUser::Mode mode);
-
- void Message(Error* err);
- void OutputError(const char *errBuf);
- void Finished();
- void Diff(FileSys *f1, FileSys *f2, int, char *, Error *err);
- void Edit( FileSys *f, Error *err);
- void Prompt(const StrPtr &msg, StrBuf &answer, int , Error *err);
- void ErrorPause(char *msg, Error *);
- bool editorAboutToClose(Core::IEditor *editor);
-
-private slots:
- void cancelP4Command();
-
-private:
- void displayErrorMsg(const QString &msg);
-
- PerforcePlugin *m_plugin;
- Core::ICore *m_core;
- Core::IEditor *m_currentEditorIface;
- bool m_userCancelled;
- Mode m_mode;
- PerforceOutputWindow *m_perforceOutputWindow;
- QString m_msg;
- QString m_errMsg;
- bool m_skipNextMsg;
- QEventLoop *m_eventLoop;
-};
-
-} // namespace Perforce
-} // namespace Internal
-
-#endif // WORKBENCHCLIENTUSER_H
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index fd5fa4dbdbbedecd8d01fbe7694502e916fecf37..84a5fa9b914936fae2309f8f8c88d662be960c8d 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -105,6 +105,7 @@ plugin_qt4projectmanager.depends += plugin_projectexplorer
plugin_qt4projectmanager.depends += plugin_cpptools
plugin_qt4projectmanager.depends += plugin_cppeditor
plugin_qt4projectmanager.depends += plugin_help
+plugin_qt4projectmanager.depends += plugin_designer
plugin_quickopen.subdir = quickopen
plugin_quickopen.depends = plugin_coreplugin
diff --git a/src/plugins/projectexplorer/applicationrunconfiguration.cpp b/src/plugins/projectexplorer/applicationrunconfiguration.cpp
index 755fa998fb8a3d3a111bc6a1439993f4b26e101c..fa2e806c6b9ae5e1ff37124626c596582609738c 100644
--- a/src/plugins/projectexplorer/applicationrunconfiguration.cpp
+++ b/src/plugins/projectexplorer/applicationrunconfiguration.cpp
@@ -89,7 +89,7 @@ QString ApplicationRunConfigurationRunner::displayName() const
return tr("Run");
}
-RunControl* ApplicationRunConfigurationRunner::run(QSharedPointer<RunConfiguration> runConfiguration, const QString &mode)
+RunControl *ApplicationRunConfigurationRunner::run(QSharedPointer<RunConfiguration> runConfiguration, const QString &mode)
{
QSharedPointer<ApplicationRunConfiguration> rc = qSharedPointerCast<ApplicationRunConfiguration>(runConfiguration);
Q_ASSERT(rc);
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 285214728c0633bee66d60f77bf78ab1f614d9e7..442825958124c041c6dbcae6edf9027bfd4fbe2f 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -51,6 +51,11 @@
using namespace ProjectExplorer;
using namespace ProjectExplorer::Internal;
+static inline QString msgProgress(int n, int total)
+{
+ return BuildManager::tr("Finished %n of %1 build steps", 0, n).arg(total);
+}
+
BuildManager::BuildManager(ProjectExplorerPlugin *parent)
: QObject(parent)
, m_running(false)
@@ -200,8 +205,7 @@ void BuildManager::startBuildQueue()
} else {
// Already running
m_progressFutureInterface->setProgressRange(0, m_maxProgress * 100);
- const QString &progressText = tr("Finished %1 of %2 build steps").arg(m_progress).arg(m_maxProgress);
- m_progressFutureInterface->setProgressValueAndText(m_progress*100, progressText);
+ m_progressFutureInterface->setProgressValueAndText(m_progress*100, msgProgress(m_progress, m_maxProgress));
}
}
@@ -235,8 +239,7 @@ void BuildManager::nextBuildQueue()
this, SLOT(addToOutputWindow(QString)));
++m_progress;
- const QString &progressText = tr("Finished %1 of %2 build steps").arg(m_progress).arg(m_maxProgress);
- m_progressFutureInterface->setProgressValueAndText(m_progress*100, progressText);
+ m_progressFutureInterface->setProgressValueAndText(m_progress*100, msgProgress(m_progress, m_maxProgress));
bool result = m_watcher.result();
if (!result) {
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.ui b/src/plugins/projectexplorer/buildsettingspropertiespage.ui
index 819f17da58e1a9efd276a70358e08e7956e11c34..3fabbcea90e0830eb69b4e23fc353b883a43c153 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.ui
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.ui
@@ -10,9 +10,6 @@
<height>525</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QSplitter" name="splitter">
@@ -125,9 +122,6 @@
<bold>false</bold>
</font>
</property>
- <property name="text">
- <string>TextLabel</string>
- </property>
</widget>
</item>
<item>
diff --git a/src/plugins/projectexplorer/buildstepspage.ui b/src/plugins/projectexplorer/buildstepspage.ui
index 85267824b0a067b1c538bd4039c600917070584e..fcaec1069f383cb27b714ccc285b4a553ee1f425 100644
--- a/src/plugins/projectexplorer/buildstepspage.ui
+++ b/src/plugins/projectexplorer/buildstepspage.ui
@@ -10,9 +10,6 @@
<height>300</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_3">
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index e25718033c77a5b0738a5ffe9373aa78539411dc..1953e9635500d9c4359109a16d53b80e515cfb8e 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -31,12 +31,14 @@
#include "environment.h"
#include "project.h"
+#include <coreplugin/icore.h>
#include <projectexplorer/debugginghelper.h>
#include <QtGui/QCheckBox>
#include <QtGui/QFormLayout>
#include <QtGui/QLineEdit>
#include <QtGui/QLabel>
+#include <QtGui/QMainWindow>
#include <QtGui/QHBoxLayout>
#include <QtGui/QToolButton>
#include <QtGui/QFileDialog>
@@ -190,7 +192,7 @@ QString CustomExecutableRunConfiguration::executable() const
if (!QFileInfo(exec).exists()) {
// Oh the executable doesn't exists, ask the user.
QWidget *confWidget = const_cast<CustomExecutableRunConfiguration *>(this)->configurationWidget();
- QDialog dialog;
+ QDialog dialog(Core::ICore::instance()->mainWindow());
dialog.setLayout(new QVBoxLayout());
dialog.layout()->addWidget(new QLabel(tr("Could not find the executable, please specify one.")));
dialog.layout()->addWidget(confWidget);
diff --git a/src/plugins/projectexplorer/debugginghelper.cpp b/src/plugins/projectexplorer/debugginghelper.cpp
index 64a1f3e8cb931dfb68a3fe51d8182074934216ce..da5fefc5125bc9e210e8145645b517015699dc42 100644
--- a/src/plugins/projectexplorer/debugginghelper.cpp
+++ b/src/plugins/projectexplorer/debugginghelper.cpp
@@ -114,8 +114,9 @@ QString DebuggingHelperLibrary::debuggingHelperLibrary(const QString &qtInstallD
QString DebuggingHelperLibrary::buildDebuggingHelperLibrary(const QString &qmakePath, const QString &make, const Environment &env)
{
QString directory = copyDebuggingHelperLibrary(qtInstallDataDir(qmakePath), qtDir(qmakePath));
+ if (directory.isEmpty())
+ return QString::null;
return buildDebuggingHelperLibrary(directory, make, qmakePath, QString::null, env);
- return QString::null;
}
QString DebuggingHelperLibrary::copyDebuggingHelperLibrary(const QString &qtInstallData, const QString &qtdir)
diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.ui b/src/plugins/projectexplorer/editorsettingspropertiespage.ui
index 704f5cd0b3d550623004fbbf6b3e93223fdc148c..640134cfcfbe3e2d1352720f3e31dfd5007b6eff 100644
--- a/src/plugins/projectexplorer/editorsettingspropertiespage.ui
+++ b/src/plugins/projectexplorer/editorsettingspropertiespage.ui
@@ -10,9 +10,6 @@
<height>300</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="encodingLabel">
diff --git a/src/plugins/projectexplorer/outputwindow.cpp b/src/plugins/projectexplorer/outputwindow.cpp
index 74adafc2feeaf1a7a12f9867ce3c9925bfd9d881..2df5b00e294e879be9bfe2e65bc2291a9271e4a2 100644
--- a/src/plugins/projectexplorer/outputwindow.cpp
+++ b/src/plugins/projectexplorer/outputwindow.cpp
@@ -67,7 +67,7 @@ OutputPane::OutputPane()
// Rerun
m_reRunButton = new QToolButton;
m_reRunButton->setIcon(runIcon);
- m_reRunButton->setToolTip(tr("Rerun this runconfiguration"));
+ m_reRunButton->setToolTip(tr("Re-run this run-configuration"));
m_reRunButton->setAutoRaise(true);
m_reRunButton->setEnabled(false);
connect(m_reRunButton, SIGNAL(clicked()),
diff --git a/src/plugins/projectexplorer/processstep.ui b/src/plugins/projectexplorer/processstep.ui
index 01255ab891ae79df2fb58b6e5e101222729974db..6e52c4c88931aeb4eb9fe069ad5a3c418431b932 100644
--- a/src/plugins/projectexplorer/processstep.ui
+++ b/src/plugins/projectexplorer/processstep.ui
@@ -10,9 +10,6 @@
<height>271</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="enabledGroupBox">
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index eae61dd93b120be2310b7d8377ae0459822a5834..037a6fef08368bbcd3c94dd9680669402f7f4459 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -438,7 +438,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
this, SLOT(updateRecentProjectMenu()));
// unload action
- m_unloadAction = new QAction(tr("Unload Project"), this);
+ m_unloadAction = new QAction(tr("Close Project"), this);
cmd = am->registerAction(m_unloadAction, Constants::UNLOAD, globalcontext);
cmd->setAttribute(Core::Command::CA_UpdateText);
cmd->setDefaultText(m_unloadAction->text());
@@ -446,7 +446,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
mproject->addAction(cmd, Constants::G_PROJECT_FILES);
// unload session action
- m_clearSession = new QAction(tr("Unload All Projects"), this);
+ m_clearSession = new QAction(tr("Close All Projects"), this);
cmd = am->registerAction(m_clearSession, Constants::CLEARSESSION, globalcontext);
mfile->addAction(cmd, Core::Constants::G_FILE_PROJECT);
msessionContextMenu->addAction(cmd, Constants::G_SESSION_FILES);
@@ -797,7 +797,7 @@ void ProjectExplorerPlugin::newProject()
}
Core::ICore::instance()->showNewItemDialog(tr("New Project", "Title of dialog"),
- Core::BaseFileWizard::findWizardsOfKind(Core::IWizard::ProjectWizard),
+ Core::IWizard::wizardsOfKind(Core::IWizard::ProjectWizard),
defaultLocation);
updateActions();
}
@@ -1028,7 +1028,7 @@ void ProjectExplorerPlugin::restoreSession()
sessionToLoad = arg;
arguments.removeOne(arg);
if (debug)
- qDebug()<< "Found session argument, loading session"<<sessionToLoad;
+ qDebug() << "Found session argument, restoring session" << sessionToLoad;
break;
}
}
@@ -1246,10 +1246,10 @@ void ProjectExplorerPlugin::updateActions()
m_unloadAction->setEnabled(m_currentProject != 0);
if (m_currentProject == 0) {
- m_unloadAction->setText(tr("Unload Project"));
+ m_unloadAction->setText(tr("Close Project"));
m_buildAction->setText(tr("Build Project"));
} else {
- m_unloadAction->setText(tr("Unload Project \"%1\"").arg(m_currentProject->name()));
+ m_unloadAction->setText(tr("Close Project \"%1\"").arg(m_currentProject->name()));
m_buildAction->setText(tr("Build Project \"%1\"").arg(m_currentProject->name()));
}
@@ -1290,35 +1290,7 @@ bool ProjectExplorerPlugin::saveModifiedFiles(const QList<Project *> & projects)
if (debug)
qDebug() << "ProjectExplorerPlugin::saveModifiedFiles";
- QList<Core::IFile *> modifiedFi = Core::ICore::instance()->fileManager()->modifiedFiles();
- QMap<QString, Core::IFile *> modified;
-
- QStringList allFiles;
- foreach (Project *pro, projects)
- allFiles << allFilesWithDependencies(pro);
-
- foreach (Core::IFile * fi, modifiedFi)
- modified.insert(fi->fileName(), fi);
-
- QList<Core::IFile *> filesToSave;
-
- QMap<QString, Core::IFile *>::const_iterator mit = modified.constBegin();
- QStringList::const_iterator ait = allFiles.constBegin();
- QMap<QString, Core::IFile *>::const_iterator mend = modified.constEnd();
- QStringList::const_iterator aend = allFiles.constEnd();
-
- while (mit != mend && ait != aend) {
- if (mit.key() < *ait)
- ++mit;
- else if (*ait < mit.key())
- ++ait;
- else {
- filesToSave.append(mit.value());
- ++ait;
- ++mit;
- }
- }
-
+ QList<Core::IFile *> filesToSave = Core::ICore::instance()->fileManager()->modifiedFiles();
if (!filesToSave.isEmpty()) {
if (m_projectExplorerSettings.saveBeforeBuild) {
Core::ICore::instance()->fileManager()->saveModifiedFilesSilently(filesToSave);
@@ -1449,12 +1421,16 @@ void ProjectExplorerPlugin::debugProject()
if (!pro || m_debuggingRunControl )
return;
- if (saveModifiedFiles(QList<Project *>() << pro)) {
- m_runMode = ProjectExplorer::Constants::DEBUGMODE;
- m_delayedRunConfiguration = pro->activeRunConfiguration();
- //NBS TODO make the build project step take into account project dependencies
- m_buildManager->buildProject(pro, pro->activeBuildConfiguration());
- updateRunAction();
+ if (m_projectExplorerSettings.buildBeforeRun) {
+ if (saveModifiedFiles(QList<Project *>() << pro)) {
+ m_runMode = ProjectExplorer::Constants::DEBUGMODE;
+ m_delayedRunConfiguration = pro->activeRunConfiguration();
+ //NBS TODO make the build project step take into account project dependencies
+ m_buildManager->buildProject(pro, pro->activeBuildConfiguration());
+ updateRunAction();
+ }
+ } else {
+ executeRunConfiguration(pro->activeRunConfiguration(), ProjectExplorer::Constants::DEBUGMODE);
}
}
@@ -1638,8 +1614,8 @@ void ProjectExplorerPlugin::addNewFile()
return;
const QString location = QFileInfo(m_currentNode->path()).dir().absolutePath();
Core::ICore::instance()->showNewItemDialog(tr("New File", "Title of dialog"),
- Core::BaseFileWizard::findWizardsOfKind(Core::IWizard::FileWizard)
- + Core::BaseFileWizard::findWizardsOfKind(Core::IWizard::ClassWizard),
+ Core::IWizard::wizardsOfKind(Core::IWizard::FileWizard)
+ + Core::IWizard::wizardsOfKind(Core::IWizard::ClassWizard),
location);
}
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index 170a54387ea16f8408c1ff67247501469b770e84..a246d2d52e370ea54c708173f42ea234f6dd8e1c 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
TARGET = ProjectExplorer
QT += xml \
script
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(projectexplorer_dependencies.pri)
include(../../shared/scriptwrapper/scriptwrapper.pri)
include(../../libs/utils/utils.pri)
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.h b/src/plugins/projectexplorer/projectexplorersettingspage.h
index 378bfc54c7d06b2d8f1f9753e75c4e18ae1a87ac..a10048f07c97e0fe8d40af972b531d330f4c4874 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.h
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.h
@@ -38,6 +38,7 @@ namespace Internal {
class ProjectExplorerSettingsPage : public Core::IOptionsPage
{
+ Q_OBJECT
public:
ProjectExplorerSettingsPage();
~ProjectExplorerSettingsPage();
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.ui b/src/plugins/projectexplorer/projectexplorersettingspage.ui
index 6f48641355e7193409fe81ea106ccbb3fd65a4cc..1a1b37e16ac1d8f3009e0ccd5294de198ab226d3 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.ui
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.ui
@@ -10,9 +10,6 @@
<height>358</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="margin">
<number>0</number>
diff --git a/src/plugins/projectexplorer/projectwizardpage.ui b/src/plugins/projectexplorer/projectwizardpage.ui
index 883799224d22d0abbaf6884d8f7c84b10f7698e4..6773a3da3a7373f6938900a8f4ad3598811b2be8 100644
--- a/src/plugins/projectexplorer/projectwizardpage.ui
+++ b/src/plugins/projectexplorer/projectwizardpage.ui
@@ -10,9 +10,6 @@
<height>414</height>
</rect>
</property>
- <property name="windowTitle">
- <string>WizardPage</string>
- </property>
<property name="title">
<string>Project management</string>
</property>
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.ui b/src/plugins/projectexplorer/runsettingspropertiespage.ui
index d96e20602bc2e930255012905517d35741d40149..4959cb93249bd9f8efc7b60c913309a36b3ed403 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.ui
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.ui
@@ -10,9 +10,6 @@
<height>300</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="layout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index ad09041e9cf52ff5eea8a8cd68eb26605638e535..e73fe6e6e404e22f8346b659434ab9424c9d53ed 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -615,7 +615,7 @@ bool SessionManager::loadImpl(const QString &fileName)
Q_ASSERT(!fileName.isEmpty());
if (debug)
- qDebug() << "SessionManager - loading session " << fileName << " ...";
+ qDebug() << "SessionManager - restoring session " << fileName << " ...";
bool success = true;
@@ -634,8 +634,8 @@ bool SessionManager::loadImpl(const QString &fileName)
emit sessionUnloaded();
m_file = new SessionFile;
if (!m_file->load(fileName)) {
- QMessageBox::warning(0, tr("Error while loading session"),
- tr("Could not load session %1").arg(fileName));
+ QMessageBox::warning(0, tr("Error while restoring session"),
+ tr("Could not restore session %1").arg(fileName));
success = false;
}
// m_file->load() sets the m_file->startupProject
@@ -653,7 +653,7 @@ bool SessionManager::loadImpl(const QString &fileName)
}
if (debug)
- qDebug() << "SessionManager - loading session returned " << success;
+ qDebug() << "SessionManager - restoring session returned " << success;
if (success)
emit sessionLoaded();
diff --git a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
index 1ef971b06aed1d19cfa63ec757a67ec19fe8eadb..4fcf00b62f85e80c5cef145d5c57b310d11526b4 100644
--- a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
+++ b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
@@ -24,5 +24,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<dependency name="CppTools" version="1.1.80"/>
<dependency name="CppEditor" version="1.1.80"/>
<dependency name="Help" version="1.1.80"/>
+ <dependency name="Designer" version="1.1.80"/>
</dependencyList>
</plugin>
diff --git a/src/plugins/qt4projectmanager/deployhelper.cpp b/src/plugins/qt4projectmanager/deployhelper.cpp
index fc9fae261f09f23202812fe7811a4ea38a685665..1fd9ff6da7968126456d8cfe21f139bbcd738c34 100644
--- a/src/plugins/qt4projectmanager/deployhelper.cpp
+++ b/src/plugins/qt4projectmanager/deployhelper.cpp
@@ -41,9 +41,9 @@ using namespace Qt4ProjectManager::Internal;
DeployHelperRunStep::DeployHelperRunStep(Qt4Project *pro)
: BuildStep(pro), m_started(false), m_pro(pro)
{
- QDir workbenchDir = QCoreApplication::applicationDirPath();
- workbenchDir.cdUp();
- m_binary = QDir::convertSeparators(workbenchDir.absolutePath() + QLatin1String("/qtembeddedtools/qemudeployer"));
+ QDir qtCreatorDir = QCoreApplication::applicationDirPath();
+ qtCreatorDir.cdUp();
+ m_binary = QDir::convertSeparators(qtCreatorDir.absolutePath() + QLatin1String("/qtembeddedtools/qemudeployer"));
m_id = "id";
};
diff --git a/src/plugins/qt4projectmanager/embeddedpropertiespage.ui b/src/plugins/qt4projectmanager/embeddedpropertiespage.ui
index 5f521ed1a3a55636b066ede11e6600acd52d2cca..6185473212d3342191da9b9fb8a0c7f82021bee8 100644
--- a/src/plugins/qt4projectmanager/embeddedpropertiespage.ui
+++ b/src/plugins/qt4projectmanager/embeddedpropertiespage.ui
@@ -9,9 +9,6 @@
<height>302</height>
</rect>
</property>
- <property name="windowTitle" >
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout" >
<item>
<layout class="QFormLayout" name="formLayout" >
diff --git a/src/plugins/qt4projectmanager/envvariablespage.ui b/src/plugins/qt4projectmanager/envvariablespage.ui
index 7d5262b21c52f3d4060e5d8d73d360a27cdd41d2..c4f6f558f2d5ddd692fc98ecd437f5eac0e42671 100644
--- a/src/plugins/qt4projectmanager/envvariablespage.ui
+++ b/src/plugins/qt4projectmanager/envvariablespage.ui
@@ -9,9 +9,6 @@
<height>336</height>
</rect>
</property>
- <property name="windowTitle" >
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
diff --git a/src/plugins/qt4projectmanager/makestep.ui b/src/plugins/qt4projectmanager/makestep.ui
index 7ce4a4034b0f3ea17a34cf2f0eeb1de2a2ecc831..1a7189300be4644cf8f176aeb240e5559712d2cc 100644
--- a/src/plugins/qt4projectmanager/makestep.ui
+++ b/src/plugins/qt4projectmanager/makestep.ui
@@ -10,9 +10,6 @@
<height>384</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
diff --git a/src/plugins/qt4projectmanager/proeditorcontainer.ui b/src/plugins/qt4projectmanager/proeditorcontainer.ui
index ba9c371e6d60d916b1a09545b15eca00ff53e665..0edbfa3ff84449c76e7a012c020cc7716b9bb321 100644
--- a/src/plugins/qt4projectmanager/proeditorcontainer.ui
+++ b/src/plugins/qt4projectmanager/proeditorcontainer.ui
@@ -9,9 +9,6 @@
<height>372</height>
</rect>
</property>
- <property name="windowTitle" >
- <string>Form</string>
- </property>
<layout class="QHBoxLayout" >
<item>
<layout class="QVBoxLayout" >
diff --git a/src/plugins/qt4projectmanager/qmakestep.ui b/src/plugins/qt4projectmanager/qmakestep.ui
index 5d2871a90cc9aa922f3d4d073bba5fb91a765e3d..a28baf6448ff561c11110e7f9649a311d587a686 100644
--- a/src/plugins/qt4projectmanager/qmakestep.ui
+++ b/src/plugins/qt4projectmanager/qmakestep.ui
@@ -10,9 +10,6 @@
<height>442</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
diff --git a/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.ui b/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.ui
index 354ac61e89b3c16fef9de467bbeae159dd37aad0..45c4c906a245f89b7398b99425bd425583f74f87 100644
--- a/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.ui
+++ b/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.ui
@@ -10,9 +10,6 @@
<height>300</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QCheckBox" name="clearSystemEnvironmentCheckBox">
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 985b60aba73426dffe40671d9b1bb967f80b7903..3693b5abe841d3b98c7b3bdd7c35cbedfae20e33 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -34,6 +34,7 @@
#include "qt4nodes.h"
#include "qt4project.h"
#include "qt4projectmanager.h"
+#include "qtuicodemodelsupport.h"
#include <projectexplorer/nodesvisitor.h>
#include <projectexplorer/filewatcher.h>
@@ -540,13 +541,22 @@ Qt4ProFileNode::Qt4ProFileNode(Qt4Project *project,
Qt4ProFileNode::~Qt4ProFileNode()
{
-
+ CppTools::CppModelManagerInterface *modelManager
+ = ExtensionSystem::PluginManager::instance()->getObject<CppTools::CppModelManagerInterface>();
+ QMap<QString, Qt4UiCodeModelSupport *>::const_iterator it, end;
+ end = m_uiCodeModelSupport.constEnd();
+ for (it = m_uiCodeModelSupport.constBegin(); it != end; ++it) {
+ modelManager->removeEditorSupport(it.value());
+ delete it.value();
+ }
}
void Qt4ProFileNode::buildStateChanged(ProjectExplorer::Project *project)
{
- if (project == m_project && !ProjectExplorer::ProjectExplorerPlugin::instance()->buildManager()->isBuilding(m_project))
- updateUiFiles();
+ if (project == m_project && !ProjectExplorer::ProjectExplorerPlugin::instance()->buildManager()->isBuilding(m_project)) {
+ QStringList filesToUpdate = updateUiFiles();
+ updateCodeModelSupportFromBuild(filesToUpdate);
+ }
}
bool Qt4ProFileNode::hasTargets() const
@@ -717,6 +727,7 @@ void Qt4ProFileNode::update()
emit qt4Watcher->variablesChanged(this, m_varValues, newVarValues);
}
+ createUiCodeModelSupport();
updateUiFiles();
foreach (NodesWatcher *watcher, watchers())
@@ -746,17 +757,16 @@ namespace {
}
// This function is triggered after a build, and updates the state ui files
-// That is it adds files that didn't exist yet to the project tree, and calls
-// updateSourceFiles() for files that changed
// It does so by storing a modification time for each ui file we know about.
// TODO this function should also be called if the build directory is changed
-void Qt4ProFileNode::updateUiFiles()
+QStringList Qt4ProFileNode::updateUiFiles()
{
+ qDebug()<<"Qt4ProFileNode::updateUiFiles()";
// Only those two project types can have ui files for us
if (m_projectType != ApplicationTemplate
&& m_projectType != LibraryTemplate)
- return;
+ return QStringList();
// Find all ui files
FindUiFileNodesVisitor uiFilesVisitor;
@@ -841,7 +851,8 @@ void Qt4ProFileNode::updateUiFiles()
m_uitimestamps.insert(file->path(), QFileInfo(file->path()).lastModified());
toUpdate << file->path();
- // Also adding files depending on that.
+ // Also adding files depending on that
+ // We only need to do that for files that were newly created
QString fileName = QFileInfo(file->path()).fileName();
foreach (CPlusPlus::Document::Ptr doc, modelManager->snapshot()) {
if (doc->includedFiles().contains(fileName)) {
@@ -852,7 +863,7 @@ void Qt4ProFileNode::updateUiFiles()
}
addFileNodes(toAdd, this);
}
- m_project->addUiFilesToCodeModel(toUpdate);
+ return toUpdate;
}
ProFileReader *Qt4PriFileNode::createProFileReader() const
@@ -1012,6 +1023,83 @@ void Qt4ProFileNode::invalidate()
emit qt4Watcher->projectTypeChanged(this, oldType, InvalidProject);
}
+void Qt4ProFileNode::updateCodeModelSupportFromBuild(const QStringList &files)
+{
+ qDebug()<<"Qt4ProFileNode::updateCodeModelSupportFromBuild"<<files;
+ foreach (const QString &file, files) {
+ QMap<QString, Qt4UiCodeModelSupport *>::const_iterator it, end;
+ end = m_uiCodeModelSupport.constEnd();
+ for (it = m_uiCodeModelSupport.constBegin(); it != end; ++it) {
+ if (it.value()->fileName() == file)
+ it.value()->updateFromBuild();
+ }
+ }
+}
+
+void Qt4ProFileNode::updateCodeModelSupportFromEditor(const QString &uiFileName, Designer::Internal::FormWindowEditor *fw)
+{
+ QMap<QString, Qt4UiCodeModelSupport *>::const_iterator it;
+ it = m_uiCodeModelSupport.constFind(uiFileName);
+ if (it != m_uiCodeModelSupport.constEnd()) {
+ it.value()->updateFromEditor(fw);
+ }
+ foreach (ProjectExplorer::ProjectNode *pro, subProjectNodes())
+ if (Qt4ProFileNode *qt4proFileNode = qobject_cast<Qt4ProFileNode *>(pro))
+ qt4proFileNode->updateCodeModelSupportFromEditor(uiFileName, fw);
+}
+
+void Qt4ProFileNode::createUiCodeModelSupport()
+{
+ qDebug()<<"creatUiCodeModelSupport()";
+ CppTools::CppModelManagerInterface *modelManager
+ = ExtensionSystem::PluginManager::instance()->getObject<CppTools::CppModelManagerInterface>();
+
+ // First move all to
+ QMap<QString, Qt4UiCodeModelSupport *> oldCodeModelSupport;
+ oldCodeModelSupport = m_uiCodeModelSupport;
+ m_uiCodeModelSupport.clear();
+
+ // Only those two project types can have ui files for us
+ if (m_projectType == ApplicationTemplate || m_projectType == LibraryTemplate) {
+ // Find all ui files
+ FindUiFileNodesVisitor uiFilesVisitor;
+ this->accept(&uiFilesVisitor);
+ const QList<FileNode*> uiFiles = uiFilesVisitor.uiFileNodes;
+
+ // Find the UiDir, there can only ever be one
+ QString uiDir = buildDir();
+ QStringList tmp = m_varValues[UiDirVar];
+ if (tmp.size() != 0)
+ uiDir = tmp.first();
+
+ foreach (FileNode *uiFile, uiFiles) {
+ const QString uiHeaderFilePath
+ = QString("%1/ui_%2.h").arg(uiDir, QFileInfo(uiFile->path()).completeBaseName());
+
+ qDebug()<<"code model support for "<<uiFile->path()<<" "<<uiHeaderFilePath;
+ QMap<QString, Qt4UiCodeModelSupport *>::iterator it = oldCodeModelSupport.find(uiFile->path());
+ if (it != oldCodeModelSupport.end()) {
+ qDebug()<<"updated old codemodelsupport";
+ Qt4UiCodeModelSupport *cms = it.value();
+ cms->setFileName(uiHeaderFilePath);
+ m_uiCodeModelSupport.insert(it.key(), cms);
+ oldCodeModelSupport.erase(it);
+ } else {
+ qDebug()<<"adding new codemodelsupport";
+ Qt4UiCodeModelSupport *cms = new Qt4UiCodeModelSupport(modelManager, m_project, uiFile->path(), uiHeaderFilePath);
+ m_uiCodeModelSupport.insert(uiFile->path(), cms);
+ modelManager->addEditorSupport(cms);
+ }
+ }
+ }
+ // Remove old
+ QMap<QString, Qt4UiCodeModelSupport *>::const_iterator it, end;
+ end = oldCodeModelSupport.constEnd();
+ for (it = oldCodeModelSupport.constBegin(); it!=end; ++it) {
+ modelManager->removeEditorSupport(it.value());
+ delete it.value();
+ }
+}
Qt4NodesWatcher::Qt4NodesWatcher(QObject *parent)
: NodesWatcher(parent)
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
index d527725071ffc1ccbb9e64052904cb1d036641ba..9200ac101bd0565952cf26a0e5e6b87a2d21b32c 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qt4nodes.h
@@ -52,6 +52,12 @@ namespace ProjectExplorer {
class FileWatcher;
}
+namespace Designer {
+namespace Internal {
+class FormWindowEditor;
+}
+}
+
namespace Qt4ProjectManager {
// Import base classes into namespace
@@ -76,6 +82,7 @@ namespace Internal {
using ProjectExplorer::FileType;
class ProFileReader;
+class Qt4UiCodeModelSupport;
// Type of projects
enum Qt4ProjectType {
@@ -127,7 +134,6 @@ public:
//internal
ProFileReader *createProFileReader() const;
-
protected:
void clear();
static QStringList varNames(FileType type);
@@ -165,6 +171,8 @@ private:
// watching changes to the .pro and .pri files on disk
ProjectExplorer::FileWatcher *m_fileWatcher;
+ QMap<QString, Qt4UiCodeModelSupport *> m_uiCodeModelSupport;
+
// managed by Qt4ProFileNode
friend class Qt4ProFileNode;
};
@@ -186,6 +194,8 @@ public:
QStringList variableValue(const Qt4Variable var) const;
+ void updateCodeModelSupportFromBuild(const QStringList &files);
+ void updateCodeModelSupportFromEditor(const QString &uiFileName, Designer::Internal::FormWindowEditor *fw);
public slots:
void scheduleUpdate();
void update();
@@ -193,7 +203,8 @@ private slots:
void buildStateChanged(ProjectExplorer::Project*);
private:
- void updateUiFiles();
+ void createUiCodeModelSupport();
+ QStringList updateUiFiles();
Qt4ProFileNode *createSubProFileNode(const QString &path);
QStringList uiDirPaths(ProFileReader *reader) const;
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index f0f80fe50ec8270a2bb75a95ab8f018c3c752d56..6063992b6edf267b6bf21c311814ee9a1dae9de0 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -245,10 +245,6 @@ Qt4Project::Qt4Project(Qt4Manager *manager, const QString& fileName) :
m_updateCodeModelTimer.setSingleShot(true);
m_updateCodeModelTimer.setInterval(20);
connect(&m_updateCodeModelTimer, SIGNAL(timeout()), this, SLOT(updateCodeModel()));
-
- m_addUiFilesTimer.setSingleShot(true);
- m_addUiFilesTimer.setInterval(20);
- connect(&m_addUiFilesTimer, SIGNAL(timeout()), this, SLOT(addUiFiles()));
}
Qt4Project::~Qt4Project()
@@ -376,27 +372,6 @@ namespace {
};
}
-void Qt4Project::addUiFilesToCodeModel(const QStringList &files)
-{
- // if we already have a full updateCodeModel() scheduled
- // then we don't need to this seperately
- // since that one will add also all the ui files
- if (m_updateCodeModelTimer.isActive())
- return;
- m_addUiFilesTimer.start();
- m_uiFilesToAdd << files;
-}
-
-void Qt4Project::addUiFiles()
-{
- if (m_updateCodeModelTimer.isActive())
- return;
- CppTools::CppModelManagerInterface *modelManager =
- ExtensionSystem::PluginManager::instance()->getObject<CppTools::CppModelManagerInterface>();
- modelManager->updateSourceFiles(m_uiFilesToAdd);
- m_uiFilesToAdd.clear();
-}
-
void Qt4Project::scheduleUpdateCodeModel(Qt4ProjectManager::Internal::Qt4ProFileNode *pro)
{
m_updateCodeModelTimer.start();
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index 7a8ae6d67a2b05744e18758bfa7f5c7b991c2f55..1bf27c59d0afbc0aae5ce6983430a553d369ac47 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -184,9 +184,6 @@ public:
void notifyChanged(const QString &name);
- // called by qt4ProjectNode to add ui_*.h files to the codemodel
- void addUiFilesToCodeModel(const QStringList &files);
-
QString makeCommand(const QString &buildConfiguration) const;
// Is called by qmakestep qt4configurationwidget if the settings change
@@ -216,7 +213,6 @@ private slots:
const Qt4ProjectManager::Internal::Qt4ProjectType oldType,
const Qt4ProjectManager::Internal::Qt4ProjectType newType);
void proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *node);
- void addUiFiles();
protected:
virtual void restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader &settingsReader);
@@ -253,8 +249,6 @@ private:
Internal::Qt4ProjectFiles *m_projectFiles;
QTimer m_updateCodeModelTimer;
- QTimer m_addUiFilesTimer;
- QStringList m_uiFilesToAdd;
QList<Qt4ProjectManager::Internal::Qt4ProFileNode *> m_proFilesForCodeModelUpdate;
QMap<QString, Internal::CodeModelInfo> m_codeModelInfo;
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui b/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
index fda58058507507399709315d837a2a90f2897066..07ef627d9615ee2005b4d7f8cfaebc204dbf9c9e 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
@@ -10,9 +10,6 @@
<height>247</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<layout class="QFormLayout" name="formLayout">
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
index 470e535d730aac437f2c1d9509a230686975d0d4..eed8ab50691ea67adb52a5b6ad1cd1e147edbcc6 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
@@ -47,6 +47,7 @@
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <utils/listutils.h>
+#include <designer/formwindoweditor.h>
#include <QtCore/QCoreApplication>
#include <QtCore/QDir>
@@ -81,7 +82,9 @@ Qt4Manager::Qt4Manager(Qt4ProjectManagerPlugin *plugin)
m_plugin(plugin),
m_projectExplorer(0),
m_contextProject(0),
- m_languageID(0)
+ m_languageID(0),
+ m_lastEditor(0),
+ m_dirty(false)
{
m_languageID = Core::UniqueIDManager::instance()->
uniqueIdentifier(ProjectExplorer::Constants::LANG_CXX);
@@ -110,6 +113,61 @@ void Qt4Manager::notifyChanged(const QString &name)
void Qt4Manager::init()
{
m_projectExplorer = ProjectExplorer::ProjectExplorerPlugin::instance();
+ connect(Core::EditorManager::instance(), SIGNAL(editorAboutToClose(Core::IEditor*)),
+ this, SLOT(editorAboutToClose(Core::IEditor*)));
+
+ connect(Core::EditorManager::instance(), SIGNAL(currentEditorChanged(Core::IEditor*)),
+ this, SLOT(editorChanged(Core::IEditor*)));
+}
+
+void Qt4Manager::editorChanged(Core::IEditor *editor)
+{
+ // Handle old editor
+ Designer::Internal::FormWindowEditor *lastEditor = qobject_cast<Designer::Internal::FormWindowEditor *>(m_lastEditor);
+ if (lastEditor) {
+ disconnect(lastEditor, SIGNAL(changed()), this, SLOT(uiEditorContentsChanged()));
+
+ if (m_dirty) {
+ foreach(Qt4Project *project, m_projects)
+ project->rootProjectNode()->updateCodeModelSupportFromEditor(lastEditor->file()->fileName(), lastEditor);
+ m_dirty = false;
+ }
+ }
+
+ m_lastEditor = editor;
+
+ // Handle new editor
+ if (Designer::Internal::FormWindowEditor *fw = qobject_cast<Designer::Internal::FormWindowEditor *>(editor))
+ connect(fw, SIGNAL(changed()), this, SLOT(uiEditorContentsChanged()));
+}
+
+void Qt4Manager::editorAboutToClose(Core::IEditor *editor)
+{
+ if (m_lastEditor == editor) {
+ // Oh no our editor is going to be closed
+ // get the content first
+ Designer::Internal::FormWindowEditor *lastEditor = qobject_cast<Designer::Internal::FormWindowEditor *>(m_lastEditor);
+ if (lastEditor) {
+ disconnect(lastEditor, SIGNAL(changed()), this, SLOT(uiEditorContentsChanged()));
+ if (m_dirty) {
+ foreach(Qt4Project *project, m_projects)
+ project->rootProjectNode()->updateCodeModelSupportFromEditor(lastEditor->file()->fileName(), lastEditor);
+ m_dirty = false;
+ }
+ }
+ m_lastEditor = 0;
+ }
+}
+
+void Qt4Manager::uiEditorContentsChanged()
+{
+ // cast sender, get filename
+ if (m_dirty)
+ return;
+ Designer::Internal::FormWindowEditor *fw = qobject_cast<Designer::Internal::FormWindowEditor *>(sender());
+ if (!fw)
+ return;
+ m_dirty = true;
}
int Qt4Manager::projectContext() const
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.h b/src/plugins/qt4projectmanager/qt4projectmanager.h
index 43b64937cfecbd1093b860b219b0ea879a9bebb1..c0c19610b7ee6d6f29e7b496acc3e897a5ab9fef 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.h
@@ -36,6 +36,10 @@
#include <QtCore/QModelIndex>
+namespace Core {
+ class IEditor;
+}
+
namespace ExtensionSystem {
class PluginManager;
}
@@ -92,6 +96,11 @@ public slots:
void runQMake();
void runQMakeContextMenu();
+private slots:
+ void editorAboutToClose(Core::IEditor *editor);
+ void uiEditorContentsChanged();
+ void editorChanged(Core::IEditor*);
+
private:
QList<Qt4Project *> m_projects;
void runQMake(ProjectExplorer::Project *p);
@@ -104,7 +113,8 @@ private:
ProjectExplorer::Project *m_contextProject;
int m_languageID;
-
+ Core::IEditor *m_lastEditor;
+ bool m_dirty;
};
} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index 7df7e44bdedfef46c5c16f6bb5d3240c31de6f58..6e9f4d0e503a8ade203654adda7bb6885492445f 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -1,7 +1,7 @@
TEMPLATE = lib
TARGET = Qt4ProjectManager
QT += network
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(qt4projectmanager_dependencies.pri)
HEADERS = qt4projectmanagerplugin.h \
qt4projectmanager.h \
@@ -20,6 +20,8 @@ HEADERS = qt4projectmanagerplugin.h \
wizards/librarywizard.h \
wizards/librarywizarddialog.h \
wizards/guiappwizarddialog.h \
+ wizards/emptyprojectwizard.h \
+ wizards/emptyprojectwizarddialog.h \
wizards/modulespage.h \
wizards/filespage.h \
wizards/qtwizard.h \
@@ -32,9 +34,10 @@ HEADERS = qt4projectmanagerplugin.h \
speinfo.h \
qt4projectconfigwidget.h \
qt4buildenvironmentwidget.h \
- projectloadwizard.h\
- qtversionmanager.h\
- qtoptionspage.h
+ projectloadwizard.h \
+ qtversionmanager.h \
+ qtoptionspage.h \
+ qtuicodemodelsupport.h
SOURCES = qt4projectmanagerplugin.cpp \
qt4projectmanager.cpp \
qt4project.cpp \
@@ -51,6 +54,8 @@ SOURCES = qt4projectmanagerplugin.cpp \
wizards/librarywizard.cpp \
wizards/librarywizarddialog.cpp \
wizards/guiappwizarddialog.cpp \
+ wizards/emptyprojectwizard.cpp \
+ wizards/emptyprojectwizarddialog.cpp \
wizards/modulespage.cpp \
wizards/filespage.cpp \
wizards/qtwizard.cpp \
@@ -62,9 +67,10 @@ SOURCES = qt4projectmanagerplugin.cpp \
speinfo.cpp \
qt4projectconfigwidget.cpp \
qt4buildenvironmentwidget.cpp \
- projectloadwizard.cpp\
- qtversionmanager.cpp\
- qtoptionspage.cpp
+ projectloadwizard.cpp \
+ qtversionmanager.cpp \
+ qtoptionspage.cpp \
+ qtuicodemodelsupport.cpp
FORMS = envvariablespage.ui \
enveditdialog.ui \
proeditorcontainer.ui \
@@ -73,11 +79,10 @@ FORMS = envvariablespage.ui \
qt4projectconfigwidget.ui \
embeddedpropertiespage.ui \
qt4buildenvironmentwidget.ui \
- qtversionmanager.ui\
+ qtversionmanager.ui \
showbuildlog.ui
RESOURCES = qt4projectmanager.qrc \
wizards/wizards.qrc
include(../../shared/proparser/proparser.pri)
DEFINES += QT_NO_CAST_TO_ASCII
-
OTHER_FILES += Qt4ProjectManager.pluginspec
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri b/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
index df694f31fccadd9e07ed247f6a68fca5eb32d62a..9a493156ad5a2d69369b1f77fa1f3c33dd960d9b 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
+++ b/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
@@ -2,3 +2,4 @@ include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../plugins/cpptools/cpptools.pri)
include(../../plugins/cppeditor/cppeditor.pri)
include(../../plugins/help/help.pri)
+include(../../plugins/designer/designer.pri)
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index a199b43c7312088a011a04c686272807d529fcfa..8fcf5011ed4cb6553832b9ee7b456f11fc6b01f7 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -33,6 +33,7 @@
#include "wizards/consoleappwizard.h"
#include "wizards/guiappwizard.h"
#include "wizards/librarywizard.h"
+#include "wizards/emptyprojectwizard.h"
#include "profileeditorfactory.h"
#include "qt4projectmanagerconstants.h"
#include "qt4project.h"
@@ -115,6 +116,8 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
m_proFileEditorFactory = new ProFileEditorFactory(m_qt4ProjectManager, editorHandler);
addObject(m_proFileEditorFactory);
+ addAutoReleasedObject(new EmptyProjectWizard);
+
GuiAppWizard *guiWizard = new GuiAppWizard;
addAutoReleasedObject(guiWizard);
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
index febde6bb1350db3c2f63781a13840c4ba8dcaffb..7b894b369d501105119fd9062f8178bf54c13fc1 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
@@ -43,6 +43,7 @@ namespace Internal {
class ProFileEditorFactory;
class ConsoleAppWizard;
class GuiAppWizard;
+class EmptyProjectWizard;
class QMakeStepFactory;
class MakeStepFactory;
class GccParserFactory;
diff --git a/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp b/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..baf1e00855d9dddff2df67bc70cf056785698001
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp
@@ -0,0 +1,157 @@
+#include "qtuicodemodelsupport.h"
+
+#include "qt4project.h"
+#include <designer/formwindoweditor.h>
+
+using namespace Qt4ProjectManager;
+using namespace Internal;
+
+Qt4UiCodeModelSupport::Qt4UiCodeModelSupport(CppTools::CppModelManagerInterface *modelmanager,
+ Qt4Project *project,
+ const QString &source,
+ const QString &uiHeaderFile)
+ : CppTools::AbstractEditorSupport(modelmanager),
+ m_project(project),
+ m_sourceName(source),
+ m_fileName(uiHeaderFile),
+ m_updateIncludingFiles(false)
+{
+ qDebug()<<"ctor Qt4UiCodeModelSupport for"<<m_sourceName;
+ init();
+}
+
+Qt4UiCodeModelSupport::~Qt4UiCodeModelSupport()
+{
+ qDebug()<<"dtor ~Qt4UiCodeModelSupport for"<<m_sourceName;
+}
+
+void Qt4UiCodeModelSupport::init()
+{
+ QDateTime sourceTime = QFileInfo(m_sourceName).lastModified();
+ QFileInfo uiHeaderFileInfo(m_fileName);
+ QDateTime uiHeaderTime = uiHeaderFileInfo.exists() ? uiHeaderFileInfo.lastModified() : QDateTime();
+ if (uiHeaderTime.isValid() && (uiHeaderTime > sourceTime)) {
+ QFile file(m_fileName);
+ if (file.open(QFile::ReadOnly)) {
+ qDebug()<<"ui*h file is more recent then source file, using information from ui*h file"<<m_fileName;
+ QTextStream stream(&file);
+ m_contents = stream.readAll().toUtf8();
+ m_cacheTime = uiHeaderTime;
+ return;
+ }
+ }
+
+ qDebug()<<"ui*h file not found, or not recent enough, trying to create it on the fly";
+ QFile file(m_sourceName);
+ if (file.open(QFile::ReadOnly)) {
+ QTextStream stream(&file);
+ const QString contents = stream.readAll();
+ if (runUic(contents)) {
+ qDebug()<<"created on the fly";
+ return;
+ } else {
+ // uic run was unsuccesfull
+ qDebug()<<"uic run wasn't succesfull";
+ m_cacheTime = QDateTime();
+ m_contents = QByteArray();
+ // and if the header file wasn't there, next time we need to update
+ // all of the files that include this header
+ if (!uiHeaderFileInfo.exists())
+ m_updateIncludingFiles = true;
+ return;
+ }
+ } else {
+ qDebug()<<"Could open "<<m_sourceName<<"needed for the cpp model";
+ m_contents = QByteArray();
+ }
+}
+
+QByteArray Qt4UiCodeModelSupport::contents() const
+{
+ return m_contents;
+}
+
+QString Qt4UiCodeModelSupport::fileName() const
+{
+ return m_fileName;
+}
+
+void Qt4UiCodeModelSupport::setFileName(const QString &name)
+{
+ if (m_fileName == name && m_cacheTime.isValid())
+ return;
+ m_fileName = name;
+ m_contents.clear();
+ m_cacheTime = QDateTime();
+ init();
+}
+
+bool Qt4UiCodeModelSupport::runUic(const QString &ui) const
+{
+ QProcess uic;
+ uic.setEnvironment(m_project->environment(m_project->activeBuildConfiguration()).toStringList());
+ uic.start(m_project->qtVersion(m_project->activeBuildConfiguration())->uicCommand(), QStringList(), QIODevice::ReadWrite);
+ uic.waitForStarted();
+ uic.write(ui.toUtf8());
+ uic.closeWriteChannel();
+ if (uic.waitForFinished()) {
+ m_contents = uic.readAllStandardOutput();
+ m_cacheTime = QDateTime::currentDateTime();
+// qDebug()<<"\nusing uic from"<<m_project->qtVersion(m_project->activeBuildConfiguration())->uicCommand();
+// qDebug()<<"resulted in:";
+// qDebug()<< m_contents;
+// qDebug()<<"=============================";
+ return true;
+ } else {
+ qDebug()<<"running uic failed"<<" using uic: "<<m_project->qtVersion(m_project->activeBuildConfiguration())->uicCommand();
+ qDebug()<<uic.readAllStandardError();
+ qDebug()<<uic.readAllStandardOutput();
+ qDebug()<<uic.errorString();
+ qDebug()<<uic.error();
+ uic.kill();
+ }
+ return false;
+}
+
+void Qt4UiCodeModelSupport::updateFromEditor(Designer::Internal::FormWindowEditor *fw)
+{
+ qDebug()<<"Qt4UiCodeModelSupport::updateFromEditor"<<fw;
+ if (runUic(fw->contents())) {
+ qDebug()<<"runUic: success, updated on the fly";
+ updateDocument();
+ } else {
+ qDebug()<<"runUic: failed, not updated";
+ }
+}
+
+void Qt4UiCodeModelSupport::updateFromBuild()
+{
+ qDebug()<<"Qt4UiCodeModelSupport::updateFromBuild() for file"<<m_sourceName;
+ // This is mostly a fall back for the cases when uic couldn't be run
+ // it pays special attention to the case where a ui_*h was newly created
+ QDateTime sourceTime = QFileInfo(m_sourceName).lastModified();
+ if (m_cacheTime.isValid() && m_cacheTime >= sourceTime) {
+ qDebug()<<"Cache is still more recent then source";
+ return;
+ } else {
+ QFileInfo fi(m_fileName);
+ QDateTime uiHeaderTime = fi.exists() ? fi.lastModified() : QDateTime();
+ if (uiHeaderTime.isValid() && (uiHeaderTime > sourceTime)) {
+ if (m_cacheTime >= uiHeaderTime)
+ return;
+ qDebug()<<"found ui*h updating from it";
+
+ QFile file(m_fileName);
+ if (file.open(QFile::ReadOnly)) {
+ QTextStream stream(&file);
+ m_contents = stream.readAll().toUtf8();
+ m_cacheTime = uiHeaderTime;
+ updateDocument();
+ return;
+ }
+ }
+
+ qDebug()<<"ui*h not found or not more recent then source not changing anything";
+ }
+}
+
diff --git a/src/plugins/qt4projectmanager/qtuicodemodelsupport.h b/src/plugins/qt4projectmanager/qtuicodemodelsupport.h
new file mode 100644
index 0000000000000000000000000000000000000000..4b968cbdbe84a1a76a8e64e573d94da24733fd9e
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qtuicodemodelsupport.h
@@ -0,0 +1,75 @@
+/**************************************************************************
+**
+** 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.
+**
+**************************************************************************/
+
+#ifndef QTUICODEMODELSUPPORT_H
+#define QTUICODEMODELSUPPORT_H
+
+#include <cpptools/cppmodelmanagerinterface.h>
+
+#include <QtCore/QDateTime>
+
+namespace Designer {
+namespace Internal {
+class FormWindowEditor;
+}
+}
+
+namespace Qt4ProjectManager {
+class Qt4Project;
+namespace Internal {
+
+class Qt4UiCodeModelSupport : public CppTools::AbstractEditorSupport
+{
+public:
+ Qt4UiCodeModelSupport(CppTools::CppModelManagerInterface *modelmanager,
+ Qt4Project *project,
+ const QString &sourceFile,
+ const QString &uiHeaderFile);
+ ~Qt4UiCodeModelSupport();
+ void setFileName(const QString &name);
+ void setSourceName(const QString &name);
+ virtual QByteArray contents() const;
+ virtual QString fileName() const;
+ void updateFromEditor(Designer::Internal::FormWindowEditor *);
+ void updateFromBuild();
+private:
+ void init();
+ bool runUic(const QString &ui) const;
+ Qt4Project *m_project;
+ QString m_sourceName;
+ QString m_fileName;
+ mutable bool m_updateIncludingFiles;
+ mutable QByteArray m_contents;
+ mutable QDateTime m_cacheTime;
+};
+
+
+} // Internal
+} // Qt4ProjectManager
+#endif // QTUICODEMODELSUPPORT_H
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index e4ea46516c97677f0810b6f5d5b549682fc20e1e..6905799ab0dcd82db5c1a93f7483cfd4d1d966cd 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -384,6 +384,7 @@ void QtVersion::setPath(const QString &path)
m_versionInfoUpToDate = false;
m_mkspecUpToDate = false;
m_qmakeCommand = QString::null;
+ m_uicCommand = QString::null;
// TODO do i need to optimize this?
m_hasDebuggingHelper = !debuggingHelperLibrary().isEmpty();
}
@@ -753,6 +754,29 @@ QString QtVersion::qmakeCommand() const
return QString::null;
}
+QString QtVersion::uicCommand() const
+{
+ if (!isValid())
+ return QString::null;
+ if (!m_uicCommand.isNull())
+ return m_uicCommand;
+ QString qtdirbin = versionInfo().value("QT_INSTALL_BINS") + "/";
+ QStringList possibleCommands;
+#ifdef Q_OS_WIN
+ possibleCommands<< "uic.exe";
+#else
+ possibleCommands << "uic-qt4" << "uic4" << "uic" ;
+#endif
+ foreach (const QString &possibleCommand, possibleCommands) {
+ const QString &fullPath = qtdirbin + possibleCommand;
+ if (QFileInfo(fullPath).exists()) {
+ m_uicCommand = QDir::cleanPath(fullPath);
+ return m_uicCommand;
+ }
+ }
+ return QString::null;
+}
+
ProjectExplorer::ToolChain::ToolChainType QtVersion::toolchainType() const
{
if (!isValid())
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index b8b8834bca99777acc0b9b08063850944df24959..35a1827dc658827e0c8171132190a9ad95ef7a52 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -64,6 +64,7 @@ public:
QString mkspec() const;
QString mkspecPath() const;
QString qmakeCommand() const;
+ QString uicCommand() const;
QString qtVersionString() const;
// Returns the PREFIX, BINPREFIX, DOCPREFIX and similar information
QHash<QString,QString> versionInfo() const;
@@ -109,7 +110,6 @@ private:
mutable QString m_mkspec; // updated lazily
mutable QString m_mkspecFullPath;
QString m_mingwDirectory;
- QString m_prependPath;
QString m_msvcVersion;
mutable QHash<QString,QString> m_versionInfo; // updated lazily
int m_id;
@@ -118,6 +118,7 @@ private:
mutable bool m_defaultConfigIsDebug;
mutable bool m_defaultConfigIsDebugAndRelease;
mutable QString m_qmakeCommand;
+ mutable QString m_uicCommand;
// This is updated on first call to qmakeCommand
// That function is called from updateVersionInfo()
mutable QString m_qtVersionString;
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.ui b/src/plugins/qt4projectmanager/qtversionmanager.ui
index 2dd168325cef1211a516d5954cad18087bc2e83a..9cf209006831cb33b271d4562dedde0f1fc7010c 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.ui
+++ b/src/plugins/qt4projectmanager/qtversionmanager.ui
@@ -10,9 +10,6 @@
<height>505</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox">
diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c7cdc2abdeb690753930ffd2616806ee58750b1d
--- /dev/null
+++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp
@@ -0,0 +1,69 @@
+/**************************************************************************
+**
+** 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 "emptyprojectwizard.h"
+
+#include "emptyprojectwizarddialog.h"
+
+#include <utils/pathchooser.h>
+
+namespace Qt4ProjectManager {
+namespace Internal {
+
+EmptyProjectWizard::EmptyProjectWizard()
+ : QtWizard(tr("Empty Qt4 Project"),
+ tr("Creates an empty Qt project."),
+ QIcon(":/wizards/images/gui.png"))
+{
+}
+
+QWizard *EmptyProjectWizard::createWizardDialog(QWidget *parent,
+ const QString &defaultPath,
+ const WizardPageList &extensionPages) const
+{
+ EmptyProjectWizardDialog *dialog = new EmptyProjectWizardDialog(name(), icon(), extensionPages, parent);
+ dialog->setPath(defaultPath.isEmpty() ? Core::Utils::PathChooser::homePath() : defaultPath);
+ return dialog;
+}
+
+Core::GeneratedFiles
+ EmptyProjectWizard::generateFiles(const QWizard *w,
+ QString * /*errorMessage*/) const
+{
+ const EmptyProjectWizardDialog *wizard = qobject_cast< const EmptyProjectWizardDialog *>(w);
+ const QtProjectParameters params = wizard->parameters();
+ const QString projectPath = params.projectPath();
+ const QString profileName = Core::BaseFileWizard::buildFileName(projectPath, params.name, profileSuffix());
+
+ Core::GeneratedFile profile(profileName);
+ return Core::GeneratedFiles() << profile;
+}
+
+} // namespace Internal
+} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.h b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.h
new file mode 100644
index 0000000000000000000000000000000000000000..289fe91af617801fac113a85abfb1e8f8afd0aec
--- /dev/null
+++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.h
@@ -0,0 +1,57 @@
+/**************************************************************************
+**
+** 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.
+**
+**************************************************************************/
+
+#ifndef EMPTYPROJECTWIZARD_H
+#define EMPTYPROJECTWIZARD_H
+
+#include "qtwizard.h"
+
+namespace Qt4ProjectManager {
+namespace Internal {
+
+class EmptyProjectWizard : public QtWizard
+{
+ Q_OBJECT
+
+public:
+ EmptyProjectWizard();
+
+protected:
+ virtual QWizard *createWizardDialog(QWidget *parent,
+ const QString &defaultPath,
+ const WizardPageList &extensionPages) const;
+
+ virtual Core::GeneratedFiles generateFiles(const QWizard *w,
+ QString *errorMessage) const;
+};
+
+} // namespace Internal
+} // namespace Qt4ProjectManager
+
+#endif // EMPTYPROJECTWIZARD_H
diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..685973adc8ba5e07e241e65fdb9b8b3746e79277
--- /dev/null
+++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp
@@ -0,0 +1,80 @@
+/**************************************************************************
+**
+** 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 "emptyprojectwizarddialog.h"
+
+#include "emptyprojectwizard.h"
+
+#include <utils/projectintropage.h>
+
+namespace Qt4ProjectManager {
+namespace Internal {
+
+EmptyProjectWizardDialog::EmptyProjectWizardDialog(const QString &templateName,
+ const QIcon &icon,
+ const QList<QWizardPage*> &extensionPages,
+ QWidget *parent) :
+ QWizard(parent),
+ m_introPage(new Core::Utils::ProjectIntroPage)
+{
+ setWindowIcon(icon);
+ setWindowTitle(templateName);
+ Core::BaseFileWizard::setupWizard(this);
+
+ m_introPage->setDescription(tr("This wizard generates an empty Qt4 project. "
+ "Add files to it later on by using the other wizards. "
+ "You can press 'Finish' at any point in time."));
+
+ addPage(m_introPage);
+
+ foreach (QWizardPage *p, extensionPages)
+ addPage(p);
+}
+
+void EmptyProjectWizardDialog::setPath(const QString &path)
+{
+ m_introPage->setPath(path);
+}
+
+void EmptyProjectWizardDialog::setName(const QString &name)
+{
+ m_introPage->setName(name);
+}
+
+QtProjectParameters EmptyProjectWizardDialog::parameters() const
+{
+ QtProjectParameters rc;
+ rc.type = QtProjectParameters::EmptyProject;
+ rc.name = m_introPage->name();
+ rc.path = m_introPage->path();
+ return rc;
+}
+
+} // namespace Internal
+} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.h b/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.h
new file mode 100644
index 0000000000000000000000000000000000000000..8e6f38a408ecf0f778bd33ba99123924f8e2951a
--- /dev/null
+++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.h
@@ -0,0 +1,69 @@
+/**************************************************************************
+**
+** 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.
+**
+**************************************************************************/
+
+#ifndef EMPTYPROJECTWIZARDDIALOG_H
+#define EMPTYPROJECTWIZARDDIALOG_H
+
+#include <QtGui/QWizard>
+
+namespace Core {
+ namespace Utils {
+ class ProjectIntroPage;
+ }
+}
+
+namespace Qt4ProjectManager {
+namespace Internal {
+
+struct QtProjectParameters;
+
+class EmptyProjectWizardDialog : public QWizard
+{
+ Q_OBJECT
+
+public:
+ explicit EmptyProjectWizardDialog(const QString &templateName,
+ const QIcon &icon,
+ const QList<QWizardPage*> &extensionPages,
+ QWidget *parent = 0);
+
+ QtProjectParameters parameters() const;
+
+public slots:
+ void setPath(const QString &path);
+ void setName(const QString &name);
+
+private:
+ Core::Utils::ProjectIntroPage *m_introPage;
+};
+
+} // namespace Internal
+} // namespace Qt4ProjectManager
+
+#endif // EMPTYPROJECTWIZARDDIALOG_H
diff --git a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp
index 11c0d9d5e7c9ffe38458c85f64649c7ee700a4cd..965da1652284ca1803683f8e4402713d95cf29f6 100644
--- a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp
@@ -77,6 +77,8 @@ void QtProjectParameters::writeProFile(QTextStream &str) const
case Qt4Plugin:
str << "TEMPLATE = lib\nCONFIG += plugin\n";
break;
+ default:
+ break;
}
if (!targetDirectory.isEmpty())
diff --git a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h
index b992591d71593d5d9bae837c59255f51c83b0bf4..0f07071149a8363322999562da92b9fb1b1c1dc5 100644
--- a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h
+++ b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h
@@ -47,7 +47,7 @@ QString createMacro(const QString &name, const QString &suffix);
// write a .pro-file section.
struct QtProjectParameters {
- enum Type { ConsoleApp, GuiApp, StaticLibrary, SharedLibrary, Qt4Plugin };
+ enum Type { ConsoleApp, GuiApp, StaticLibrary, SharedLibrary, Qt4Plugin, EmptyProject };
QtProjectParameters();
// Return project path as "path/name"
diff --git a/src/plugins/qtestlib/QTestLibPlugin.qwp b/src/plugins/qtestlib/QTestLibPlugin.qwp
index d48704e276493e7d2a7ca4d67c26a13125ccf001..3b9ffe654b734684b3328b4f3ce114bc506d9cc5 100644
--- a/src/plugins/qtestlib/QTestLibPlugin.qwp
+++ b/src/plugins/qtestlib/QTestLibPlugin.qwp
@@ -1,4 +1,4 @@
-<!DOCTYPE QtWorkbenchManifest>
+<!DOCTYPE QtCreatorManifest>
<qwp>
<pluginName>QTestLibPlugin</pluginName>
<author>Trolltech</author>
diff --git a/src/plugins/qtestlib/qtestlib.pro b/src/plugins/qtestlib/qtestlib.pro
index 5031b1d6b479f15e01b7802f55b102eeb380e5a6..68dbecd57b23f081d16f68689306b242824741b4 100644
--- a/src/plugins/qtestlib/qtestlib.pro
+++ b/src/plugins/qtestlib/qtestlib.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
TARGET = QTestLibPlugin
QT += xml
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
SOURCES += qtestlibplugin.cpp
diff --git a/src/plugins/qtscripteditor/qtscripteditor.pro b/src/plugins/qtscripteditor/qtscripteditor.pro
index 357e52df93d0e71b3799e832c510362259499a71..7fd3ff19c6dbd23306e7620cbd57042ddb7d1846 100644
--- a/src/plugins/qtscripteditor/qtscripteditor.pro
+++ b/src/plugins/qtscripteditor/qtscripteditor.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
TARGET = QtScriptEditor
QT += script
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/texteditor/texteditor.pri)
include(../../shared/qscripthighlighter/qscripthighlighter.pri)
diff --git a/src/plugins/quickopen/directoryfilter.ui b/src/plugins/quickopen/directoryfilter.ui
index 9e618324e9491b20964275f27e30d5261fa763cd..fbc5f82ae263a37fcb081e72d1ae67f97309d4b2 100644
--- a/src/plugins/quickopen/directoryfilter.ui
+++ b/src/plugins/quickopen/directoryfilter.ui
@@ -10,9 +10,6 @@
<height>271</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Dialog</string>
- </property>
<layout class="QGridLayout">
<item row="0" column="0">
<layout class="QGridLayout">
diff --git a/src/plugins/quickopen/quickopen.pro b/src/plugins/quickopen/quickopen.pro
index f5a7dd9ce01bcaf1a6878b8ef4f4705c95800f75..83b4cd58dd260638863bdfb0d4e9f4f1bd41a1b5 100644
--- a/src/plugins/quickopen/quickopen.pro
+++ b/src/plugins/quickopen/quickopen.pro
@@ -1,7 +1,7 @@
TEMPLATE = lib
TARGET = QuickOpen
DEFINES += QUICKOPEN_LIBRARY
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(quickopen_dependencies.pri)
HEADERS += quickopenplugin.h \
quickopentoolwindow.h \
diff --git a/src/plugins/quickopen/settingswidget.ui b/src/plugins/quickopen/settingswidget.ui
index bc01858c81dd191e800951714e26e9940e2c9873..03653fe6a0ae1cfa2123be8b828600ea62ce534b 100644
--- a/src/plugins/quickopen/settingswidget.ui
+++ b/src/plugins/quickopen/settingswidget.ui
@@ -48,7 +48,7 @@
<bool>false</bool>
</property>
<property name="text" >
- <string>Edit</string>
+ <string>Edit...</string>
</property>
</widget>
</item>
@@ -72,12 +72,12 @@
<item>
<widget class="QLabel" name="label" >
<property name="text" >
- <string>Refresh Intervall:</string>
+ <string>Refresh Interval:</string>
</property>
</widget>
</item>
<item>
- <widget class="QSpinBox" name="refreshIntervall" >
+ <widget class="QSpinBox" name="refreshInterval" >
<property name="frame" >
<bool>true</bool>
</property>
diff --git a/src/plugins/regexp/regexp.pro b/src/plugins/regexp/regexp.pro
index dfe52ef02454ded159f881f1412476eb69a04da2..98e20b317e8c070c25cedf885a2160fe4dec8967 100644
--- a/src/plugins/regexp/regexp.pro
+++ b/src/plugins/regexp/regexp.pro
@@ -1,7 +1,7 @@
TEMPLATE = lib
TARGET = RegExp
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
QT += xml
diff --git a/src/plugins/resourceeditor/resourceeditor.pro b/src/plugins/resourceeditor/resourceeditor.pro
index c90cafffe53549a642efce6c132be3f63541704d..8d55df33f25fb3d0ed503a09c1284fff52773975 100644
--- a/src/plugins/resourceeditor/resourceeditor.pro
+++ b/src/plugins/resourceeditor/resourceeditor.pro
@@ -3,7 +3,7 @@ TARGET = ResourceEditor
qtAddLibrary(QtDesigner)
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(../../libs/utils/utils.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../shared/qrceditor/qrceditor.pri)
diff --git a/src/plugins/snippets/snippets.pro b/src/plugins/snippets/snippets.pro
index bbfb4b75b592f9441e4dd92add38685720dacc1a..99d391e73f55caec4a4b4a29476deb9d82e40dd5 100644
--- a/src/plugins/snippets/snippets.pro
+++ b/src/plugins/snippets/snippets.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
TARGET = Snippets
QT += xml
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/texteditor/texteditor.pri)
diff --git a/src/plugins/subversion/settingspage.ui b/src/plugins/subversion/settingspage.ui
index 21b20187bbd7dd5b59f25597ee9734fa31a5f38b..007026bab8637dd0c3fd9deafb482483a142063a 100644
--- a/src/plugins/subversion/settingspage.ui
+++ b/src/plugins/subversion/settingspage.ui
@@ -10,9 +10,6 @@
<height>280</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
diff --git a/src/plugins/subversion/subversion.pro b/src/plugins/subversion/subversion.pro
index 270693347c3bb6464b75ed0bf38e3271d8b53535..985a32648e1b5f49500fd0477e09f39b42a45aac 100644
--- a/src/plugins/subversion/subversion.pro
+++ b/src/plugins/subversion/subversion.pro
@@ -1,7 +1,7 @@
TEMPLATE = lib
TARGET = Subversion
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../plugins/texteditor/texteditor.pri)
include(../../plugins/coreplugin/coreplugin.pri)
diff --git a/src/plugins/texteditor/basetextdocument.cpp b/src/plugins/texteditor/basetextdocument.cpp
index 55b9e143792280d9aed4aea59c39486d7f3eb859..17141e8cc3de4c11c9bb2090bf8e22459fcd7c56 100644
--- a/src/plugins/texteditor/basetextdocument.cpp
+++ b/src/plugins/texteditor/basetextdocument.cpp
@@ -163,18 +163,7 @@ void BaseTextDocument::checkPermissions()
{
if (!m_fileName.isEmpty()) {
const QFileInfo fi(m_fileName);
-
-#ifdef Q_OS_WIN
- // Check for permissions on NTFS file systems
- qt_ntfs_permission_lookup++;
-#endif
-
m_fileIsReadOnly = !fi.isWritable();
-
-#ifdef Q_OS_WIN
- qt_ntfs_permission_lookup--;
-#endif
-
} else {
m_fileIsReadOnly = false;
}
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 6a635c32dec01e3cf265f5dea00b462cc63b9dcf..8af95a69825b369a3f8dcbe4fa40cf481cad0028 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -41,6 +41,7 @@
#ifndef TEXTEDITOR_STANDALONE
#include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/manhattanstyle.h>
#include <extensionsystem/pluginmanager.h>
#include <find/basetextfind.h>
#include <texteditor/fontsettings.h>
@@ -2415,7 +2416,16 @@ void BaseTextEditor::drawFoldingMarker(QPainter *painter, const QPalette &pal,
if (hovered)
opt.palette.setBrush(QPalette::Window, pal.highlight());
- style()->drawPrimitive(QStyle::PE_IndicatorBranch, &opt, painter, this);
+ QStyle *s = style();
+
+ if (ManhattanStyle *ms = qobject_cast<ManhattanStyle*>(s))
+ s = ms->systemStyle();
+
+ // QGtkStyle needs a small correction to draw the marker in the right place
+ if (qstrcmp(s->metaObject()->className(), "QGtkStyle") == 0)
+ opt.rect.translate(-2, 0);
+
+ s->drawPrimitive(QStyle::PE_IndicatorBranch, &opt, painter, this);
}
void BaseTextEditor::slotModificationChanged(bool m)
@@ -3769,8 +3779,12 @@ void BaseTextEditor::setDisplaySettings(const DisplaySettings &ds)
}
d->m_displaySettings = ds;
- d->extraAreaHighlightCollapseBlockNumber = d->extraAreaHighlightCollapseColumn = -1;
- d->m_highlightBlocksInfo = BaseTextEditorPrivateHighlightBlocks();
+ if (!ds.m_highlightBlocks) {
+ d->extraAreaHighlightCollapseBlockNumber = d->extraAreaHighlightCollapseColumn = -1;
+ d->m_highlightBlocksInfo = BaseTextEditorPrivateHighlightBlocks();
+ }
+
+ slotCursorPositionChanged();
viewport()->update();
extraArea()->update();
}
diff --git a/src/plugins/texteditor/behaviorsettingspage.ui b/src/plugins/texteditor/behaviorsettingspage.ui
index 107e6966595aca86f3739473aaae43673654cab1..7e8afc6c174de05bcabea33f732b81130ff11938 100644
--- a/src/plugins/texteditor/behaviorsettingspage.ui
+++ b/src/plugins/texteditor/behaviorsettingspage.ui
@@ -10,9 +10,6 @@
<height>325</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="0">
<widget class="QGroupBox" name="groupBoxStorageSettings">
diff --git a/src/plugins/texteditor/displaysettingspage.ui b/src/plugins/texteditor/displaysettingspage.ui
index ee465dd857220972f8c2ba3902243ab46e671183..d040a94b89958b8259a113eed0cea907268c7e5a 100644
--- a/src/plugins/texteditor/displaysettingspage.ui
+++ b/src/plugins/texteditor/displaysettingspage.ui
@@ -10,9 +10,6 @@
<height>335</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="2" column="0">
<spacer name="verticalSpacer">
diff --git a/src/plugins/texteditor/fontsettingspage.ui b/src/plugins/texteditor/fontsettingspage.ui
index 8aafb751b2fe8596a2f1dc5629a17d1a6003576a..a9b391e55bb21e8892be9e615ea803dd1d4982f3 100644
--- a/src/plugins/texteditor/fontsettingspage.ui
+++ b/src/plugins/texteditor/fontsettingspage.ui
@@ -10,9 +10,6 @@
<height>471</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout">
<property name="spacing">
<number>6</number>
diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro
index a16a898b1d74b5fa540269f2df4b76b4cc023805..be36fe0ef91e1f9db1fdd9e34b60780c4caeede4 100644
--- a/src/plugins/texteditor/texteditor.pro
+++ b/src/plugins/texteditor/texteditor.pro
@@ -1,7 +1,7 @@
TEMPLATE = lib
TARGET = TextEditor
DEFINES += TEXTEDITOR_LIBRARY
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(texteditor_dependencies.pri)
SOURCES += texteditorplugin.cpp \
textfilewizard.cpp \
diff --git a/src/plugins/vcsbase/vcsbase.pro b/src/plugins/vcsbase/vcsbase.pro
index 510dbf5982614a657f6525fc4265f7564f08969a..be345d2ad54fe55bf298ab3d1977377652c8b6eb 100644
--- a/src/plugins/vcsbase/vcsbase.pro
+++ b/src/plugins/vcsbase/vcsbase.pro
@@ -1,7 +1,7 @@
TEMPLATE = lib
TARGET = VCSBase
DEFINES += VCSBASE_LIBRARY
-include(../../qworkbenchplugin.pri)
+include(../../qtcreatorplugin.pri)
include(vcsbase_dependencies.pri)
HEADERS += vcsbase_global.h \
vcsbaseconstants.h \
diff --git a/src/plugins/vcsbase/vcsbasesettingspage.ui b/src/plugins/vcsbase/vcsbasesettingspage.ui
index 16012b7239cbb09340b40d4483982b05669db6ba..0d8b3cd74ab7ccfede9ac0a812b65ef596b25c06 100644
--- a/src/plugins/vcsbase/vcsbasesettingspage.ui
+++ b/src/plugins/vcsbase/vcsbasesettingspage.ui
@@ -10,9 +10,6 @@
<height>407</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
diff --git a/src/qworkbenchlibrary.pri b/src/qtcreatorlibrary.pri
similarity index 100%
rename from src/qworkbenchlibrary.pri
rename to src/qtcreatorlibrary.pri
diff --git a/src/qworkbenchplugin.pri b/src/qtcreatorplugin.pri
similarity index 96%
rename from src/qworkbenchplugin.pri
rename to src/qtcreatorplugin.pri
index d65e94c747e337d94fc5772879415da2624fe199..cb3e57f4e89ce44ce909d293246ba9fcede935ab 100644
--- a/src/qworkbenchplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -11,7 +11,7 @@ DEPENDPATH += $$IDE_SOURCE_TREE/src/plugins
# copy the plugin spec
isEmpty(TARGET) {
- error("qworkbenchplugin.pri: You must provide a TARGET")
+ error("qtcreatorplugin.pri: You must provide a TARGET")
}
PLUGINSPECS = $${_PRO_FILE_PWD_}/$${TARGET}.pluginspec
diff --git a/src/shared/cplusplus/AST.cpp b/src/shared/cplusplus/AST.cpp
index 1f051146bf497c85167c933b7cc27738f44d7aaa..53098b4a5eeb9d6b4d01ffb5992f2838e8f079b2 100644
--- a/src/shared/cplusplus/AST.cpp
+++ b/src/shared/cplusplus/AST.cpp
@@ -148,6 +148,7 @@ AttributeAST *AttributeAST::clone(MemoryPool *pool) const
ast->rparen_token = rparen_token;
if (next)
ast->next = next->clone(pool);
+ ast->comma_token = comma_token;
return ast;
}
@@ -331,6 +332,7 @@ unsigned AsmDefinitionAST::lastToken() const
BaseSpecifierAST *BaseSpecifierAST::clone(MemoryPool *pool) const
{
BaseSpecifierAST *ast = new (pool) BaseSpecifierAST;
+ ast->comma_token = comma_token;
ast->token_virtual = token_virtual;
ast->token_access_specifier = token_access_specifier;
if (name)
@@ -1149,6 +1151,7 @@ unsigned DeclaratorIdAST::lastToken() const
DeclaratorListAST *DeclaratorListAST::clone(MemoryPool *pool) const
{
DeclaratorListAST *ast = new (pool) DeclaratorListAST;
+ ast->comma_token = comma_token;
if (declarator)
ast->declarator = declarator->clone(pool);
if (next)
@@ -1395,6 +1398,7 @@ unsigned EnumSpecifierAST::lastToken() const
EnumeratorAST *EnumeratorAST::clone(MemoryPool *pool) const
{
EnumeratorAST *ast = new (pool) EnumeratorAST;
+ ast->comma_token = comma_token;
ast->identifier_token = identifier_token;
ast->equal_token = equal_token;
if (expression)
@@ -1517,6 +1521,7 @@ unsigned ExceptionSpecificationAST::lastToken() const
ExpressionListAST *ExpressionListAST::clone(MemoryPool *pool) const
{
ExpressionListAST *ast = new (pool) ExpressionListAST;
+ ast->comma_token = comma_token;
if (expression)
ast->expression = expression->clone(pool);
if (next)
@@ -1954,6 +1959,7 @@ unsigned LinkageSpecificationAST::lastToken() const
MemInitializerAST *MemInitializerAST::clone(MemoryPool *pool) const
{
MemInitializerAST *ast = new (pool) MemInitializerAST;
+ ast->comma_token = comma_token;
if (name)
ast->name = name->clone(pool);
ast->lparen_token = lparen_token;
@@ -2938,8 +2944,10 @@ TypeofSpecifierAST *TypeofSpecifierAST::clone(MemoryPool *pool) const
{
TypeofSpecifierAST *ast = new (pool) TypeofSpecifierAST;
ast->typeof_token = typeof_token;
+ ast->lparen_token = lparen_token;
if (expression)
ast->expression = expression->clone(pool);
+ ast->rparen_token = rparen_token;
if (next)
ast->next = next->clone(pool);
return ast;
@@ -3066,6 +3074,7 @@ unsigned SwitchStatementAST::lastToken() const
TemplateArgumentListAST *TemplateArgumentListAST::clone(MemoryPool *pool) const
{
TemplateArgumentListAST *ast = new (pool) TemplateArgumentListAST;
+ ast->comma_token = comma_token;
if (template_argument)
ast->template_argument = template_argument->clone(pool);
if (next)
diff --git a/src/shared/cplusplus/AST.h b/src/shared/cplusplus/AST.h
index 44d5cd695a499a8d58d5cfd7e1684a3383dbe9e4..960c90921cddb4dd191e201535c319308997363f 100644
--- a/src/shared/cplusplus/AST.h
+++ b/src/shared/cplusplus/AST.h
@@ -265,6 +265,7 @@ public:
ExpressionListAST *expression_list;
unsigned rparen_token;
AttributeAST *next;
+ unsigned comma_token;
public:
virtual AttributeAST *asAttribute()
@@ -283,7 +284,9 @@ class CPLUSPLUS_EXPORT TypeofSpecifierAST: public SpecifierAST
{
public:
unsigned typeof_token;
+ unsigned lparen_token;
ExpressionAST *expression;
+ unsigned rparen_token;
public:
virtual TypeofSpecifierAST *asTypeofSpecifier()
@@ -359,6 +362,7 @@ public:
CoreDeclaratorAST *core_declarator;
PostfixDeclaratorAST *postfix_declarators;
SpecifierAST *attributes;
+ unsigned equals_token;
ExpressionAST *initializer;
public:
@@ -377,6 +381,7 @@ protected:
class CPLUSPLUS_EXPORT ExpressionListAST: public ExpressionAST
{
public:
+ unsigned comma_token;
ExpressionAST *expression;
ExpressionListAST *next;
@@ -482,6 +487,7 @@ protected:
class CPLUSPLUS_EXPORT BaseSpecifierAST: public AST
{
public:
+ unsigned comma_token;
unsigned token_virtual;
unsigned token_access_specifier;
NameAST *name;
@@ -847,6 +853,7 @@ protected:
class CPLUSPLUS_EXPORT DeclaratorListAST: public AST
{
public:
+ unsigned comma_token;
DeclaratorAST *declarator;
DeclaratorListAST *next;
@@ -971,6 +978,7 @@ protected:
class CPLUSPLUS_EXPORT EnumeratorAST: public AST
{
public:
+ unsigned comma_token;
unsigned identifier_token;
unsigned equal_token;
ExpressionAST *expression;
@@ -1229,6 +1237,7 @@ protected:
class CPLUSPLUS_EXPORT MemInitializerAST: public AST
{
public:
+ unsigned comma_token;
NameAST *name;
unsigned lparen_token;
ExpressionAST *expression;
@@ -2073,6 +2082,7 @@ protected:
class CPLUSPLUS_EXPORT TemplateArgumentListAST: public AST
{
public:
+ unsigned comma_token;
ExpressionAST *template_argument;
TemplateArgumentListAST *next;
diff --git a/src/shared/cplusplus/ASTVisitor.cpp b/src/shared/cplusplus/ASTVisitor.cpp
index 2cc3d218c5414418a2b522f1b6bf3e49de55184a..d5ca68e470934cd8de679a2e980ea8f5fd2b25d8 100644
--- a/src/shared/cplusplus/ASTVisitor.cpp
+++ b/src/shared/cplusplus/ASTVisitor.cpp
@@ -69,6 +69,9 @@ Control *ASTVisitor::control() const
TranslationUnit *ASTVisitor::translationUnit() const
{ return _control->translationUnit(); }
+unsigned ASTVisitor::tokenCount() const
+{ return translationUnit()->tokenCount(); }
+
const Token &ASTVisitor::tokenAt(unsigned index) const
{ return translationUnit()->tokenAt(index); }
diff --git a/src/shared/cplusplus/ASTVisitor.h b/src/shared/cplusplus/ASTVisitor.h
index 64002b8a6c3e4b84e48a4e19297c11a9ae1e6064..365c188aa04c2cdad9d876116d552479627244d5 100644
--- a/src/shared/cplusplus/ASTVisitor.h
+++ b/src/shared/cplusplus/ASTVisitor.h
@@ -67,6 +67,7 @@ public:
Control *control() const;
TranslationUnit *translationUnit() const;
+ unsigned tokenCount() const;
const Token &tokenAt(unsigned index) const;
int tokenKind(unsigned index) const;
const char *spell(unsigned index) const;
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp
index 0e21a1ae84d5d9859d13af83cd61a64f6e2da935..0c4f6450fd918833f0478f44d27ff8e8349681b5 100644
--- a/src/shared/cplusplus/Parser.cpp
+++ b/src/shared/cplusplus/Parser.cpp
@@ -609,10 +609,11 @@ bool Parser::parseTemplateArgumentList(TemplateArgumentListAST *&node)
(*template_argument_ptr)->template_argument = template_argument;
template_argument_ptr = &(*template_argument_ptr)->next;
while (LA() == T_COMMA) {
- consumeToken();
+ unsigned comma_token = consumeToken();
if (parseTemplateArgument(template_argument)) {
*template_argument_ptr = new (_pool) TemplateArgumentListAST;
+ (*template_argument_ptr)->comma_token = comma_token;
(*template_argument_ptr)->template_argument = template_argument;
template_argument_ptr = &(*template_argument_ptr)->next;
}
@@ -993,7 +994,7 @@ bool Parser::parseDeclarator(DeclaratorAST *&node, bool stopAtCppInitializer)
ExpressionAST *initializer = 0;
bool blocked = blockErrors(true);
- if (parseInitializer(initializer)) {
+ if (parseInitializer(initializer, &node->equals_token)) {
if (NestedExpressionAST *expr = initializer->asNestedExpression()) {
if (expr->expression && expr->rparen_token && (LA() == T_COMMA || LA() == T_SEMICOLON)) {
rewind(lparen_token);
@@ -1151,6 +1152,7 @@ bool Parser::parseEnumSpecifier(SpecifierAST *&node)
ast->enum_token = enum_token;
ast->name = name;
ast->lbrace_token = consumeToken();
+ unsigned comma_token = 0;
EnumeratorAST **enumerator_ptr = &ast->enumerators;
while (int tk = LA()) {
if (tk == T_RBRACE)
@@ -1161,13 +1163,13 @@ bool Parser::parseEnumSpecifier(SpecifierAST *&node)
skipUntil(T_IDENTIFIER);
}
- if (parseEnumerator(*enumerator_ptr))
+ if (parseEnumerator(*enumerator_ptr)) {
+ (*enumerator_ptr)->comma_token = comma_token;
enumerator_ptr = &(*enumerator_ptr)->next;
+ }
- if (LA() != T_RBRACE) {
- unsigned comma_token = 0;
+ if (LA() != T_RBRACE)
match(T_COMMA, &comma_token);
- }
}
match(T_RBRACE, &ast->rbrace_token);
node = ast;
@@ -1183,7 +1185,7 @@ bool Parser::parseTemplateParameterList(DeclarationAST *&node)
if (parseTemplateParameter(*template_parameter_ptr)) {
template_parameter_ptr = &(*template_parameter_ptr)->next;
while (LA() == T_COMMA) {
- consumeToken();
+ consumeToken(); // XXX Store this token somewhere
if (parseTemplateParameter(*template_parameter_ptr))
template_parameter_ptr = &(*template_parameter_ptr)->next;
@@ -1566,7 +1568,7 @@ bool Parser::parseInitDeclarator(DeclaratorAST *&node,
}
rewind(colon_token);
} else if (LA() == T_EQUAL || (! acceptStructDeclarator && LA() == T_LPAREN)) {
- parseInitializer(node->initializer);
+ parseInitializer(node->initializer, &node->equals_token);
}
return true;
}
@@ -1581,10 +1583,12 @@ bool Parser::parseBaseClause(BaseSpecifierAST *&node)
ast = &(*ast)->next;
while (LA() == T_COMMA) {
- consumeToken();
+ unsigned comma_token = consumeToken();
- if (parseBaseSpecifier(*ast))
- ast = &(*ast)->next;
+ if (parseBaseSpecifier(*ast)) {
+ (*ast)->comma_token = comma_token;
+ ast = &(*ast)->next;\
+ }
}
}
@@ -1593,12 +1597,12 @@ bool Parser::parseBaseClause(BaseSpecifierAST *&node)
return false;
}
-bool Parser::parseInitializer(ExpressionAST *&node)
+bool Parser::parseInitializer(ExpressionAST *&node, unsigned *equals_token)
{
if (LA() == T_LPAREN) {
return parsePrimaryExpression(node);
} else if (LA() == T_EQUAL) {
- consumeToken();
+ (*equals_token) = consumeToken();
return parseInitializerClause(node);
}
return false;
@@ -1611,9 +1615,12 @@ bool Parser::parseMemInitializerList(MemInitializerAST *&node)
if (parseMemInitializer(*initializer)) {
initializer = &(*initializer)->next;
while (LA() == T_COMMA) {
- consumeToken();
- if (parseMemInitializer(*initializer))
+ unsigned comma_token = consumeToken();
+
+ if (parseMemInitializer(*initializer)) {
+ (*initializer)->comma_token = comma_token;
initializer = &(*initializer)->next;
+ }
}
return true;
}
@@ -1668,10 +1675,11 @@ bool Parser::parseExpressionList(ExpressionListAST *&node)
(*expression_list_ptr)->expression = expression;
expression_list_ptr = &(*expression_list_ptr)->next;
while (LA() == T_COMMA) {
- consumeToken();
+ unsigned comma_token = consumeToken();
if (parseExpression(expression)) {
*expression_list_ptr = new (_pool) ExpressionListAST;
+ (*expression_list_ptr)->comma_token = comma_token;
(*expression_list_ptr)->expression = expression;
expression_list_ptr = &(*expression_list_ptr)->next;
}
@@ -1716,10 +1724,11 @@ bool Parser::parseInitializerList(ExpressionListAST *&node)
(*initializer_ptr)->expression = initializer;
initializer_ptr = &(*initializer_ptr)->next;
while (LA() == T_COMMA) {
- consumeToken();
+ unsigned comma_token = consumeToken();
initializer = 0;
parseInitializerClause(initializer);
*initializer_ptr = new (_pool) ExpressionListAST;
+ (*initializer_ptr)->comma_token = comma_token;
(*initializer_ptr)->expression = initializer;
initializer_ptr = &(*initializer_ptr)->next;
}
@@ -2326,18 +2335,17 @@ bool Parser::parseAttributeList(AttributeAST *&node)
AttributeAST *ast = new (_pool) AttributeAST;
ast->identifier_token = consumeToken();
if (LA() == T_LPAREN) {
- consumeToken();
+ ast->lparen_token = consumeToken();
if (LA() == T_IDENTIFIER && (LA(2) == T_COMMA || LA(2) == T_RPAREN)) {
ast->tag_token = consumeToken();
if (LA() == T_COMMA) {
- consumeToken();
+ ast->comma_token = consumeToken();
parseExpressionList(ast->expression_list);
}
} else {
parseExpressionList(ast->expression_list);
}
- unsigned rparen_token = 0;
- match(T_RPAREN, &rparen_token);
+ match(T_RPAREN, &ast->rparen_token);
}
*attribute_ptr = ast;
@@ -2360,7 +2368,8 @@ bool Parser::parseBuiltinTypeSpecifier(SpecifierAST *&node)
if (LA() == T_LPAREN) {
unsigned lparen_token = consumeToken();
if (parseTypeId(ast->expression) && LA() == T_RPAREN) {
- consumeToken();
+ ast->lparen_token = lparen_token;
+ ast->rparen_token = consumeToken();
node = ast;
return true;
}
@@ -2491,10 +2500,11 @@ bool Parser::parseSimpleDeclaration(DeclarationAST *&node,
if (LA() == T_COMMA || LA() == T_SEMICOLON || has_complex_type_specifier) {
while (LA() == T_COMMA) {
- consumeToken();
+ unsigned comma_token = consumeToken();
declarator = 0;
if (parseInitDeclarator(declarator, acceptStructDeclarator)) {
*declarator_ptr = new (_pool) DeclaratorListAST;
+ (*declarator_ptr)->comma_token = comma_token;
(*declarator_ptr)->declarator = declarator;
declarator_ptr = &(*declarator_ptr)->next;
}
diff --git a/src/shared/cplusplus/Parser.h b/src/shared/cplusplus/Parser.h
index b2d55f3868fe4ac6750740b390054d3700e2a5c9..9b8671b65d99d9ce9b47af042e9336ca715086ed 100644
--- a/src/shared/cplusplus/Parser.h
+++ b/src/shared/cplusplus/Parser.h
@@ -127,7 +127,7 @@ public:
bool parseInclusiveOrExpression(ExpressionAST *&node);
bool parseInitDeclarator(DeclaratorAST *&node, bool acceptStructDeclarator);
bool parseInitializerList(ExpressionListAST *&node);
- bool parseInitializer(ExpressionAST *&node);
+ bool parseInitializer(ExpressionAST *&node, unsigned *equals_token);
bool parseInitializerClause(ExpressionAST *&node);
bool parseLabeledStatement(StatementAST *&node);
bool parseLinkageBody(DeclarationAST *&node);
diff --git a/src/shared/cplusplus/PrettyPrinter.cpp b/src/shared/cplusplus/PrettyPrinter.cpp
index d0a3c579c1f45c10cee100f40145a86be8799bf4..c97de44140057596285fdaf14684fe843fffa12e 100644
--- a/src/shared/cplusplus/PrettyPrinter.cpp
+++ b/src/shared/cplusplus/PrettyPrinter.cpp
@@ -38,119 +38,133 @@ CPLUSPLUS_USE_NAMESPACE
PrettyPrinter::PrettyPrinter(Control *control, std::ostream &out)
: ASTVisitor(control),
- out(out),
- depth(0)
+ _out(out),
+ _depth(0),
+ _lastToken(0)
{ }
-void PrettyPrinter::operator()(AST *ast)
-{ accept(ast); }
+void PrettyPrinter::operator()(AST *ast, const QByteArray &contents)
+{
+ _contents = contents;
+ accept(ast);
+
+ if (_lastToken + 1 < tokenCount())
+ outToken(_lastToken + 1);
+}
void PrettyPrinter::indent()
-{ ++depth; }
+{ ++_depth; }
void PrettyPrinter::deindent()
-{ --depth; }
+{ --_depth; }
void PrettyPrinter::newline()
-{ out << '\n' << std::string(depth * 4, ' '); }
+{
+ _out << '\n' << std::string(_depth * 4, ' ');
+}
+
+void PrettyPrinter::outToken(unsigned token)
+{
+ if (!token)
+ return;
+
+ const Token &t = tokenAt(token);
+ const unsigned start = _lastToken ? tokenAt(_lastToken).end() : 0;
+ const unsigned end = t.begin();
+ _lastToken = token;
+
+ // Preserve non-AST text
+ QByteArray ba(_contents.constData() + start, end - start);
+ _out << ba.constData();
+
+ // Print the token itself
+ QByteArray tt(_contents.constData() + t.begin(), t.length);
+ _out << tt.constData();
+}
bool PrettyPrinter::visit(AccessDeclarationAST *ast)
{
deindent();
- newline();
- out << spell(ast->access_specifier_token);
- if (ast->slots_token)
- out << ' ' << spell(ast->slots_token);
- out << ':' << std::endl;
+ outToken(ast->access_specifier_token);
+ outToken(ast->slots_token);
+ outToken(ast->colon_token);
indent();
return false;
}
bool PrettyPrinter::visit(ArrayAccessAST *ast)
{
- out << '[';
+ outToken(ast->lbracket_token);
accept(ast->expression);
- out << ']';
+ outToken(ast->rbracket_token);
return false;
}
bool PrettyPrinter::visit(ArrayDeclaratorAST *ast)
{
- out << '[';
+ outToken(ast->lbracket_token);
accept(ast->expression);
- out << ']';
+ outToken(ast->rbracket_token);
return false;
}
bool PrettyPrinter::visit(ArrayInitializerAST *ast)
{
- out << '{';
+ outToken(ast->lbrace_token);
for (ExpressionListAST *it = ast->expression_list; it; it = it->next) {
+ outToken(it->comma_token);
accept(it->expression);
- if (it->next)
- out << ", ";
}
- out << '}';
+ outToken(ast->rbrace_token);
return false;
}
bool PrettyPrinter::visit(AsmDefinitionAST *ast)
{
- out << spell(ast->asm_token);
- if (ast->volatile_token)
- out << ' ' << spell(ast->volatile_token) << ' ';
- out << '(';
- out << "/* ### implement me */";
- out << ");";
+ outToken(ast->asm_token);
+ outToken(ast->volatile_token);
+ outToken(ast->lparen_token);
+ /* ### implement me */
+ outToken(ast->rparen_token);
+ outToken(ast->semicolon_token);
return false;
}
bool PrettyPrinter::visit(AttributeSpecifierAST *ast)
{
- out << "attribute((";
+ outToken(ast->attribute_token);
+ outToken(ast->first_lparen_token);
+ outToken(ast->second_lparen_token);
for (AttributeAST *it = ast->attributes; it; it = it->next) {
+ outToken(it->comma_token);
accept(it);
- if (it->next)
- out << ", ";
}
- out << "))";
+ outToken(ast->first_rparen_token);
+ outToken(ast->second_rparen_token);
return false;
}
bool PrettyPrinter::visit(AttributeAST *ast)
{
- out << spell(ast->identifier_token);
+ outToken(ast->identifier_token);
if (ast->lparen_token) {
- out << '(';
- out << spell(ast->tag_token);
+ outToken(ast->lparen_token);
+ outToken(ast->tag_token);
if (ast->expression_list) {
- out << '(';
for (ExpressionListAST *it = ast->expression_list; it; it = it->next) {
+ outToken(ast->expression_list->comma_token);
accept(it->expression);
- if (it->next)
- out << ", ";
}
- out << ')';
}
- out << ')';
+ outToken(ast->rparen_token);
}
return false;
}
bool PrettyPrinter::visit(BaseSpecifierAST *ast)
{
- if (ast->token_virtual && ast->token_access_specifier) {
- out << "virtual";
- out << ' ';
- out << spell(ast->token_access_specifier);
- out << ' ';
- } else if (ast->token_virtual) {
- out << "virtual";
- out << ' ';
- } else if (ast->token_access_specifier) {
- out << spell(ast->token_access_specifier);
- out << ' ';
- }
+ outToken(ast->token_virtual);
+ outToken(ast->token_access_specifier);
accept(ast->name);
return false;
}
@@ -158,132 +172,113 @@ bool PrettyPrinter::visit(BaseSpecifierAST *ast)
bool PrettyPrinter::visit(BinaryExpressionAST *ast)
{
accept(ast->left_expression);
- out << ' ' << spell(ast->binary_op_token) << ' ';
+ outToken(ast->binary_op_token);
accept(ast->right_expression);
return false;
}
bool PrettyPrinter::visit(BoolLiteralAST *ast)
{
- out << spell(ast->token);
+ outToken(ast->token);
return false;
}
-bool PrettyPrinter::visit(BreakStatementAST *)
+bool PrettyPrinter::visit(BreakStatementAST *ast)
{
- out << "break;";
+ outToken(ast->break_token);
+ outToken(ast->semicolon_token);
return false;
}
bool PrettyPrinter::visit(CallAST *ast)
{
- out << '(';
+ outToken(ast->lparen_token);
for (ExpressionListAST *it = ast->expression_list; it; it = it->next) {
+ outToken(it->comma_token);
accept(it->expression);
- if (it->next)
- out << ", ";
}
- out << ')';
+ outToken(ast->rparen_token);
return false;
}
bool PrettyPrinter::visit(CaseStatementAST *ast)
{
- out << "case ";
+ outToken(ast->case_token);
accept(ast->expression);
- out << ':';
- if (! ast->statement) {
- newline();
+ outToken(ast->colon_token);
+ if (! ast->statement)
return false;
- }
if (ast->statement->asCompoundStatement()) {
- out << ' ';
accept(ast->statement);
} else if (ast->statement->asCaseStatement() || ast->statement->asLabeledStatement()) {
- newline();
accept(ast->statement);
} else {
indent();
- newline();
accept(ast->statement);
deindent();
- newline();
}
return false;
}
bool PrettyPrinter::visit(CastExpressionAST *ast)
{
- out << '(';
+ outToken(ast->lparen_token);
accept(ast->type_id);
- out << ')';
+ outToken(ast->rparen_token);
accept(ast->expression);
return false;
}
bool PrettyPrinter::visit(CatchClauseAST *ast)
{
- out << "catch";
- out << '(';
+ outToken(ast->catch_token);
+ outToken(ast->lparen_token);
accept(ast->exception_declaration);
- out << ')';
+ outToken(ast->rparen_token);
accept(ast->statement);
return false;
}
bool PrettyPrinter::visit(ClassSpecifierAST *ast)
{
- out << spell(ast->classkey_token);
- out << ' ';
+ outToken(ast->classkey_token);
if (ast->attributes) {
accept(ast->attributes);
- out << ' ';
}
accept(ast->name);
if (ast->colon_token) {
- out << ':';
- out << ' ';
+ outToken(ast->colon_token);
for (BaseSpecifierAST *it = ast->base_clause; it; it = it->next) {
+ outToken(it->comma_token);
accept(it);
- if (it->next)
- out << ", ";
}
}
- newline();
- out << '{';
+ outToken(ast->lbrace_token);
if (ast->member_specifiers) {
indent();
- newline();
if (ast->member_specifiers) {
for (DeclarationAST *it = ast->member_specifiers; it; it = it->next) {
accept(it);
- if (it->next)
- newline();
}
}
deindent();
- newline();
}
- out << '}';
+ outToken(ast->rbrace_token);
return false;
}
bool PrettyPrinter::visit(CompoundStatementAST *ast)
{
- out << '{';
+ outToken(ast->lbrace_token);
if (ast->statements) {
indent();
- newline();
for (StatementAST *it = ast->statements; it; it = it->next) {
accept(it);
- if (it->next)
- newline();
}
deindent();
- newline();
}
- out << '}';
+ outToken(ast->rbrace_token);
return false;
}
@@ -291,13 +286,8 @@ bool PrettyPrinter::visit(ConditionAST *ast)
{
for (SpecifierAST *it = ast->type_specifier; it; it = it->next) {
accept(it);
- if (it->next)
- out << ' ';
}
if (ast->declarator) {
- if (ast->type_specifier)
- out << ' ';
-
accept(ast->declarator);
}
return false;
@@ -306,28 +296,25 @@ bool PrettyPrinter::visit(ConditionAST *ast)
bool PrettyPrinter::visit(ConditionalExpressionAST *ast)
{
accept(ast->condition);
- out << '?';
+ outToken(ast->question_token);
accept(ast->left_expression);
- out << ':';
+ outToken(ast->colon_token);
accept(ast->right_expression);
return false;
}
-bool PrettyPrinter::visit(ContinueStatementAST *)
+bool PrettyPrinter::visit(ContinueStatementAST *ast)
{
- out << "continue";
- out << ';';
+ outToken(ast->continue_token);
+ outToken(ast->semicolon_token);
return false;
}
bool PrettyPrinter::visit(ConversionFunctionIdAST *ast)
{
- out << "operator";
- out << ' ';
+ outToken(ast->operator_token);
for (SpecifierAST *it = ast->type_specifier; it; it = it->next) {
accept(it);
- if (it->next)
- out << ' ';
}
for (PtrOperatorAST *it = ast->ptr_operators; it; it = it->next) {
accept(it);
@@ -337,29 +324,25 @@ bool PrettyPrinter::visit(ConversionFunctionIdAST *ast)
bool PrettyPrinter::visit(CppCastExpressionAST *ast)
{
- out << spell(ast->cast_token);
- out << '<';
- out << ' ';
+ outToken(ast->cast_token);
+ outToken(ast->less_token);
accept(ast->type_id);
- out << ' ';
- out << '>';
- out << '(';
+ outToken(ast->greater_token);
+ outToken(ast->lparen_token);
accept(ast->expression);
- out << ')';
+ outToken(ast->rparen_token);
return false;
}
bool PrettyPrinter::visit(CtorInitializerAST *ast)
{
- out << ':';
- out << ' ';
+ outToken(ast->colon_token);
for (MemInitializerAST *it = ast->member_initializers; it; it = it->next) {
+ outToken(it->comma_token);
accept(it->name);
- out << '(';
+ outToken(it->lparen_token);
accept(it->expression);
- out << ')';
- if (it->next)
- out << ", ";
+ outToken(it->rparen_token);
}
return false;
}
@@ -370,8 +353,6 @@ bool PrettyPrinter::visit(DeclaratorAST *ast)
accept(it);
}
if (ast->core_declarator) {
- if (ast->ptr_operators)
- out << ' ';
accept(ast->core_declarator);
}
for (PostfixDeclaratorAST *it = ast->postfix_declarators; it; it = it->next) {
@@ -379,13 +360,9 @@ bool PrettyPrinter::visit(DeclaratorAST *ast)
}
for (SpecifierAST *it = ast->attributes; it; it = it->next) {
accept(it);
- if (it->next)
- out << ' ';
}
if (ast->initializer) {
- out << ' ';
- out << '=';
- out << ' ';
+ outToken(ast->equals_token);
accept(ast->initializer);
}
return false;
@@ -406,20 +383,17 @@ bool PrettyPrinter::visit(DeclaratorIdAST *ast)
bool PrettyPrinter::visit(DeclaratorListAST *ast)
{
for (DeclaratorListAST *it = ast; it; it = it->next) {
+ outToken(ast->comma_token);
accept(it->declarator);
- if (it->next)
- out << ", ";
}
return false;
}
bool PrettyPrinter::visit(DeleteExpressionAST *ast)
{
- if (ast->scope_token)
- out << "::";
- out << "delete";
+ outToken(ast->scope_token);
+ outToken(ast->delete_token);
if (ast->expression) {
- out << ' ';
accept(ast->expression);
}
return false;
@@ -427,75 +401,64 @@ bool PrettyPrinter::visit(DeleteExpressionAST *ast)
bool PrettyPrinter::visit(DestructorNameAST *ast)
{
- out << '~';
- out << spell(ast->identifier_token);
+ outToken(ast->tilde_token);
+ outToken(ast->identifier_token);
return false;
}
bool PrettyPrinter::visit(DoStatementAST *ast)
{
- out << "do";
+ outToken(ast->do_token);
if (ast->statement) {
- out << ' ';
accept(ast->statement);
}
- out << "while";
- out << '(';
+ outToken(ast->while_token);
+ outToken(ast->lparen_token);
accept(ast->expression);
- out << ')';
- out << ';';
+ outToken(ast->rparen_token);
+ outToken(ast->semicolon_token);
return false;
}
bool PrettyPrinter::visit(ElaboratedTypeSpecifierAST *ast)
{
- out << spell(ast->classkey_token);
+ outToken(ast->classkey_token);
if (ast->name) {
- out << ' ';
accept(ast->name);
}
return false;
}
-bool PrettyPrinter::visit(EmptyDeclarationAST *)
+bool PrettyPrinter::visit(EmptyDeclarationAST *ast)
{
- out << ';';
+ outToken(ast->semicolon_token);
return false;
}
bool PrettyPrinter::visit(EnumSpecifierAST *ast)
{
- out << "enum";
+ outToken(ast->enum_token);
if (ast->name) {
- out << ' ';
accept(ast->name);
}
- out << ' ';
- out << '{';
+ outToken(ast->lbrace_token);
if (ast->enumerators) {
indent();
- newline();
for (EnumeratorAST *it = ast->enumerators; it; it = it->next) {
+ outToken(it->comma_token);
accept(it);
- if (it->next) {
- out << ", ";
- newline();
- }
}
deindent();
- newline();
}
- out << '}';
+ outToken(ast->rbrace_token);
return false;
}
bool PrettyPrinter::visit(EnumeratorAST *ast)
{
- out << spell(ast->identifier_token);
+ outToken(ast->identifier_token);
if (ast->equal_token) {
- out << ' ';
- out << '=';
- out << ' ';
+ outToken(ast->equal_token);
accept(ast->expression);
}
return false;
@@ -505,42 +468,35 @@ bool PrettyPrinter::visit(ExceptionDeclarationAST *ast)
{
for (SpecifierAST *it = ast->type_specifier; it; it = it->next) {
accept(it);
- if (it->next)
- out << ' ';
}
if (ast->declarator) {
- if (ast->type_specifier)
- out << ' ';
accept(ast->declarator);
}
- if (ast->dot_dot_dot_token)
- out << "...";
+ outToken(ast->dot_dot_dot_token);
return false;
}
bool PrettyPrinter::visit(ExceptionSpecificationAST *ast)
{
- out << "throw";
- out << '(';
+ outToken(ast->throw_token);
+ outToken(ast->lparen_token);
if (ast->dot_dot_dot_token)
- out << "...";
+ outToken(ast->dot_dot_dot_token);
else {
for (ExpressionListAST *it = ast->type_ids; it; it = it->next) {
+ outToken(it->comma_token);
accept(it->expression);
- if (it->next)
- out << ", ";
}
}
- out << ')';
+ outToken(ast->rparen_token);
return false;
}
bool PrettyPrinter::visit(ExpressionListAST *ast)
{
for (ExpressionListAST *it = ast; it; it = it->next) {
+ outToken(it->comma_token);
accept(it->expression);
- if (it->next)
- out << ", ";
}
return false;
}
@@ -554,35 +510,32 @@ bool PrettyPrinter::visit(ExpressionOrDeclarationStatementAST *ast)
bool PrettyPrinter::visit(ExpressionStatementAST *ast)
{
accept(ast->expression);
- out << ';';
+ outToken(ast->semicolon_token);
return false;
}
bool PrettyPrinter::visit(ForStatementAST *ast)
{
- out << "for";
- out << ' ';
- out << '(';
+ outToken(ast->for_token);
+ outToken(ast->lparen_token);
accept(ast->initializer);
accept(ast->condition);
- out << ';';
+ outToken(ast->semicolon_token);
accept(ast->expression);
- out << ')';
+ outToken(ast->rparen_token);
accept(ast->statement);
return false;
}
bool PrettyPrinter::visit(FunctionDeclaratorAST *ast)
{
- out << '(';
+ outToken(ast->lparen_token);
accept(ast->parameters);
- out << ')';
+ outToken(ast->rparen_token);
for (SpecifierAST *it = ast->cv_qualifier_seq; it; it = it->next) {
- out << ' ';
accept(it);
}
if (ast->exception_specification) {
- out << ' ';
accept(ast->exception_specification);
}
return false;
@@ -592,51 +545,38 @@ bool PrettyPrinter::visit(FunctionDefinitionAST *ast)
{
for (SpecifierAST *it = ast->decl_specifier_seq; it; it = it->next) {
accept(it);
- if (it->next)
- out << ' ';
}
if (ast->declarator) {
- if (ast->decl_specifier_seq)
- out << ' ';
accept(ast->declarator);
}
accept(ast->ctor_initializer);
- newline();
accept(ast->function_body);
- if (ast->next)
- newline(); // one extra line after the function definiton.
return false;
}
bool PrettyPrinter::visit(GotoStatementAST *ast)
{
- out << "goto";
- out << ' ';
- out << spell(ast->identifier_token);
- out << ';';
+ outToken(ast->goto_token);
+ outToken(ast->identifier_token);
+ outToken(ast->semicolon_token);
return false;
}
bool PrettyPrinter::visit(IfStatementAST *ast)
{
- out << "if";
- out << ' ';
- out << '(';
+ outToken(ast->if_token);
+ outToken(ast->lparen_token);
accept(ast->condition);
- out << ')';
+ outToken(ast->rparen_token);
if (ast->statement->asCompoundStatement()) {
- out << ' ';
accept(ast->statement);
} else {
indent();
- newline();
accept(ast->statement);
deindent();
- newline();
}
if (ast->else_token) {
- out << "else";
- out << ' ';
+ outToken(ast->else_token);
accept(ast->else_statement);
}
return false;
@@ -644,37 +584,31 @@ bool PrettyPrinter::visit(IfStatementAST *ast)
bool PrettyPrinter::visit(LabeledStatementAST *ast)
{
- out << spell(ast->label_token);
- out << ':';
+ outToken(ast->label_token);
+ outToken(ast->colon_token);
accept(ast->statement);
return false;
}
bool PrettyPrinter::visit(LinkageBodyAST *ast)
{
- out << '{';
+ outToken(ast->lbrace_token);
if (ast->declarations) {
indent();
- newline();
for (DeclarationAST *it = ast->declarations; it; it = it->next) {
accept(it);
- if (it->next)
- newline();
}
deindent();
- newline();
}
- out << '}';
+ outToken(ast->rbrace_token);
return false;
}
bool PrettyPrinter::visit(LinkageSpecificationAST *ast)
{
- out << "extern";
- out << ' ';
+ outToken(ast->extern_token);
if (ast->extern_type) {
- out << '"' << spell(ast->extern_type) << '"';
- out << ' ';
+ outToken(ast->extern_type);
}
accept(ast->declaration);
@@ -684,19 +618,16 @@ bool PrettyPrinter::visit(LinkageSpecificationAST *ast)
bool PrettyPrinter::visit(MemInitializerAST *ast)
{
accept(ast->name);
- out << '(';
+ outToken(ast->lparen_token);
accept(ast->expression);
- out << ')';
+ outToken(ast->rparen_token);
return false;
}
bool PrettyPrinter::visit(MemberAccessAST *ast)
{
- out << spell(ast->access_token);
- if (ast->template_token) {
- out << "template";
- out << ' ';
- }
+ outToken(ast->access_token);
+ outToken(ast->template_token);
accept(ast->member_name);
return false;
}
@@ -709,78 +640,65 @@ bool PrettyPrinter::visit(NamedTypeSpecifierAST *ast)
bool PrettyPrinter::visit(NamespaceAST *ast)
{
- out << "namespace";
- if (ast->identifier_token) {
- out << ' ';
- out << spell(ast->identifier_token);
- }
+ outToken(ast->namespace_token);
+ outToken(ast->identifier_token);
for (SpecifierAST *it = ast->attributes; it; it = it->next) {
- out << ' ';
accept(it);
}
- out << ' ';
accept(ast->linkage_body);
return false;
}
bool PrettyPrinter::visit(NamespaceAliasDefinitionAST *ast)
{
- out << "namespace";
- out << ' ';
- out << spell(ast->namespace_name);
- out << ' ';
- out << '=';
- out << ' ';
+ outToken(ast->namespace_token);
+ outToken(ast->namespace_name);
+ outToken(ast->equal_token);
accept(ast->name);
- out << ';';
+ outToken(ast->semicolon_token);
return false;
}
bool PrettyPrinter::visit(NestedDeclaratorAST *ast)
{
- out << '(';
+ outToken(ast->lparen_token);
accept(ast->declarator);
- out << ')';
+ outToken(ast->rparen_token);
return false;
}
bool PrettyPrinter::visit(NestedExpressionAST *ast)
{
- out << '(';
+ outToken(ast->lparen_token);
accept(ast->expression);
- out << ')';
+ outToken(ast->rparen_token);
return false;
}
bool PrettyPrinter::visit(NestedNameSpecifierAST *ast)
{
accept(ast->class_or_namespace_name);
- if (ast->scope_token)
- out << "::";
+ outToken(ast->scope_token);
return false;
}
bool PrettyPrinter::visit(NewArrayDeclaratorAST *ast)
{
- out << '[';
+ outToken(ast->lbracket_token);
accept(ast->expression);
- out << ']';
+ outToken(ast->rbracket_token);
return false;
}
bool PrettyPrinter::visit(NewExpressionAST *ast)
{
- if (ast->scope_token)
- out << "::";
- out << "new";
- out << ' ';
+ outToken(ast->scope_token);
+ outToken(ast->new_token);
accept(ast->new_placement);
- if (ast->new_placement)
- out << ' ';
if (ast->lparen_token) {
- out << '(';
+ outToken(ast->lparen_token);
accept(ast->type_id);
- out << ')';
+ outToken(ast->rparen_token);
} else {
accept(ast->new_type_id);
}
@@ -790,29 +708,26 @@ bool PrettyPrinter::visit(NewExpressionAST *ast)
bool PrettyPrinter::visit(NewPlacementAST *ast)
{
- out << '(';
+ outToken(ast->lparen_token);
for (ExpressionListAST *it = ast->expression_list; it; it = it->next) {
+ outToken(it->comma_token);
accept(it->expression);
- if (it->next)
- out << ", ";
}
- out << ')';
+ outToken(ast->rparen_token);
return false;
}
bool PrettyPrinter::visit(NewInitializerAST *ast)
{
- out << '(';
+ outToken(ast->lparen_token);
accept(ast->expression);
- out << ')';
+ outToken(ast->rparen_token);
return false;
}
bool PrettyPrinter::visit(NewTypeIdAST *ast)
{
for (SpecifierAST *it = ast->type_specifier; it; it = it->next) {
- if (it != ast->type_specifier)
- out << ' ';
accept(it);
}
for (PtrOperatorAST *it = ast->ptr_operators; it; it = it->next) {
@@ -826,34 +741,23 @@ bool PrettyPrinter::visit(NewTypeIdAST *ast)
bool PrettyPrinter::visit(NumericLiteralAST *ast)
{
- switch (tokenKind(ast->token)) {
- case T_CHAR_LITERAL:
- out << '\'' << spell(ast->token) << '\'';
- break;
- case T_WIDE_CHAR_LITERAL:
- out << "L\'" << spell(ast->token) << '\'';
- break;
-
- default:
- out << spell(ast->token);
- }
+ outToken(ast->token);
return false;
}
bool PrettyPrinter::visit(OperatorAST *ast)
{
- out << spell(ast->op_token);
+ outToken(ast->op_token);
if (ast->open_token) {
- out << spell(ast->open_token);
- out << spell(ast->close_token);
+ outToken(ast->open_token);
+ outToken(ast->close_token);
}
return false;
}
bool PrettyPrinter::visit(OperatorFunctionIdAST *ast)
{
- out << "operator";
- out << ' ';
+ outToken(ast->operator_token);
accept(ast->op);
return false;
}
@@ -862,18 +766,11 @@ bool PrettyPrinter::visit(ParameterDeclarationAST *ast)
{
for (SpecifierAST *it = ast->type_specifier; it; it = it->next) {
accept(it);
- if (it->next)
- out << ' ';
}
if (ast->declarator) {
- out << ' ';
accept(ast->declarator);
}
- if (ast->equal_token) {
- out << ' ';
- out << '=';
- out << ' ';
- }
+ outToken(ast->equal_token);
accept(ast->expression);
return false;
}
@@ -881,43 +778,37 @@ bool PrettyPrinter::visit(ParameterDeclarationAST *ast)
bool PrettyPrinter::visit(ParameterDeclarationClauseAST *ast)
{
for (DeclarationAST *it = ast->parameter_declarations; it; it = it->next) {
+ // XXX handle the comma tokens correctly
accept(it);
- if (it->next)
- out << ", ";
}
return false;
}
bool PrettyPrinter::visit(PointerAST *ast)
{
- out << '*';
+ outToken(ast->star_token);
for (SpecifierAST *it = ast->cv_qualifier_seq; it; it = it->next) {
accept(it);
- if (it->next)
- out << ' ';
}
return false;
}
bool PrettyPrinter::visit(PointerToMemberAST *ast)
{
- if (ast->global_scope_token)
- out << "::";
+ outToken(ast->global_scope_token);
for (NestedNameSpecifierAST *it = ast->nested_name_specifier; it; it = it->next) {
accept(it);
}
- out << '*';
+ outToken(ast->star_token);
for (SpecifierAST *it = ast->cv_qualifier_seq; it; it = it->next) {
accept(it);
- if (it->next)
- out << ' ';
}
return false;
}
bool PrettyPrinter::visit(PostIncrDecrAST *ast)
{
- out << spell(ast->incr_decr_token);
+ outToken(ast->incr_decr_token);
return false;
}
@@ -932,8 +823,7 @@ bool PrettyPrinter::visit(PostfixExpressionAST *ast)
bool PrettyPrinter::visit(QualifiedNameAST *ast)
{
- if (ast->global_scope_token)
- out << "::";
+ outToken(ast->global_scope_token);
for (NestedNameSpecifierAST *it = ast->nested_name_specifier; it; it = it->next) {
accept(it);
}
@@ -941,20 +831,19 @@ bool PrettyPrinter::visit(QualifiedNameAST *ast)
return false;
}
-bool PrettyPrinter::visit(ReferenceAST *)
+bool PrettyPrinter::visit(ReferenceAST *ast)
{
- out << '&';
+ outToken(ast->amp_token);
return false;
}
bool PrettyPrinter::visit(ReturnStatementAST *ast)
{
- out << "return";
+ outToken(ast->return_token);
if (ast->expression) {
- out << ' ';
accept(ast->expression);
}
- out << ';';
+ outToken(ast->semicolon_token);
return false;
}
@@ -962,39 +851,32 @@ bool PrettyPrinter::visit(SimpleDeclarationAST *ast)
{
for (SpecifierAST *it = ast->decl_specifier_seq; it; it = it->next) {
accept(it);
- if (it->next)
- out << ' ';
}
if (ast->declarators) {
- if (ast->decl_specifier_seq)
- out << ' ';
-
for (DeclaratorListAST *it = ast->declarators; it; it = it->next) {
+ outToken(it->comma_token);
accept(it->declarator);
- if (it->next)
- out << ", ";
}
}
- out << ';';
+ outToken(ast->semicolon_token);
return false;
}
bool PrettyPrinter::visit(SimpleNameAST *ast)
{
- out << spell(ast->identifier_token);
+ outToken(ast->identifier_token);
return false;
}
bool PrettyPrinter::visit(SimpleSpecifierAST *ast)
{
- out << spell(ast->specifier_token);
+ outToken(ast->specifier_token);
return false;
}
bool PrettyPrinter::visit(SizeofExpressionAST *ast)
{
- out << "sizeof";
- out << ' ';
+ outToken(ast->sizeof_token);
accept(ast->expression);
return false;
}
@@ -1002,23 +884,17 @@ bool PrettyPrinter::visit(SizeofExpressionAST *ast)
bool PrettyPrinter::visit(StringLiteralAST *ast)
{
for (StringLiteralAST *it = ast; it; it = it->next) {
- if (tokenKind(ast->token) == T_STRING_LITERAL)
- out << '"' << spell(ast->token) << '"';
- else
- out << "L\"" << spell(ast->token) << '"';
- if (it->next)
- out << ' ';
+ outToken(it->token);
}
return false;
}
bool PrettyPrinter::visit(SwitchStatementAST *ast)
{
- out << "switch";
- out << ' ';
- out << '(';
+ outToken(ast->switch_token);
+ outToken(ast->lparen_token);
accept(ast->condition);
- out << ')';
+ outToken(ast->rparen_token);
accept(ast->statement);
return false;
}
@@ -1026,92 +902,71 @@ bool PrettyPrinter::visit(SwitchStatementAST *ast)
bool PrettyPrinter::visit(TemplateArgumentListAST *ast)
{
for (TemplateArgumentListAST *it = ast; it; it = it->next) {
+ outToken(it->comma_token);
accept(it->template_argument);
- if (it->next)
- out << ", ";
}
return false;
}
bool PrettyPrinter::visit(TemplateDeclarationAST *ast)
{
- if (ast->export_token) {
- out << "export";
- out << ' ';
- }
- out << "template";
- out << ' ';
- out << '<';
+ outToken(ast->export_token);
+ outToken(ast->template_token);
+ outToken(ast->less_token);
if (ast->template_parameters) {
- out << ' ';
for (DeclarationAST *it = ast->template_parameters; it; it = it->next) {
+ // XXX handle the comma tokens correctly
accept(it);
- if (it->next)
- out << ", ";
}
- out << ' ';
}
- out << '>';
- newline();
+ outToken(ast->greater_token);
accept(ast->declaration);
return false;
}
bool PrettyPrinter::visit(TemplateIdAST *ast)
{
- out << spell(ast->identifier_token);
- out << '<';
+ outToken(ast->identifier_token);
+ outToken(ast->less_token);
if (ast->template_arguments) {
- out << ' ';
for (TemplateArgumentListAST *it = ast->template_arguments; it; it = it->next) {
+ outToken(it->comma_token);
accept(it->template_argument);
- if (it->next)
- out << ", ";
}
- out << ' ';
}
- out << '>';
+ outToken(ast->greater_token);
return false;
}
bool PrettyPrinter::visit(TemplateTypeParameterAST *ast)
{
- out << "template";
- out << ' ';
- out << '<';
+ outToken(ast->template_token);
+ outToken(ast->less_token);
if (ast->template_parameters) {
- out << ' ';
for (DeclarationAST *it = ast->template_parameters; it; it = it->next) {
+ // XXX handle the comma tokens correctly
accept(it);
- if (it->next)
- out << ", ";
}
- out << ' ';
}
- out << '>';
- out << ' ';
- out << "class";
- out << ' ';
+ outToken(ast->greater_token);
+ outToken(ast->class_token);
accept(ast->name);
if (ast->equal_token) {
- out << ' ';
- out << '=';
- out << ' ';
+ outToken(ast->equal_token);
accept(ast->type_id);
}
return false;
}
-bool PrettyPrinter::visit(ThisExpressionAST *)
+bool PrettyPrinter::visit(ThisExpressionAST *ast)
{
- out << "this";
+ outToken(ast->this_token);
return false;
}
bool PrettyPrinter::visit(ThrowExpressionAST *ast)
{
- out << "throw";
- out << ' ';
+ outToken(ast->throw_token);
accept(ast->expression);
return false;
}
@@ -1120,16 +975,13 @@ bool PrettyPrinter::visit(TranslationUnitAST *ast)
{
for (DeclarationAST *it = ast->declarations; it; it = it->next) {
accept(it);
- if (it->next)
- newline();
}
return false;
}
bool PrettyPrinter::visit(TryBlockStatementAST *ast)
{
- out << "try";
- out << ' ';
+ outToken(ast->try_token);
accept(ast->statement);
for (CatchClauseAST *it = ast->catch_clause_seq; it; it = it->next) {
accept(it);
@@ -1141,16 +993,13 @@ bool PrettyPrinter::visit(TypeConstructorCallAST *ast)
{
for (SpecifierAST *it = ast->type_specifier; it; it = it->next) {
accept(it);
- if (it->next)
- out << ' ';
}
- out << '(';
+ outToken(ast->lparen_token);
for (ExpressionListAST *it = ast->expression_list; it; it = it->next) {
+ outToken(it->comma_token);
accept(it->expression);
- if (it->next)
- out << ", ";
}
- out << ')';
+ outToken(ast->rparen_token);
return false;
}
@@ -1158,11 +1007,8 @@ bool PrettyPrinter::visit(TypeIdAST *ast)
{
for (SpecifierAST *it = ast->type_specifier; it; it = it->next) {
accept(it);
- if (it->next)
- out << ' ';
}
if (ast->type_specifier && ast->declarator) {
- out << ' ';
accept(ast->declarator);
}
return false;
@@ -1170,48 +1016,43 @@ bool PrettyPrinter::visit(TypeIdAST *ast)
bool PrettyPrinter::visit(TypeidExpressionAST *ast)
{
- out << "typeid";
- out << '(';
+ outToken(ast->typeid_token);
+ outToken(ast->lparen_token);
accept(ast->expression);
- out << ')';
+ outToken(ast->rparen_token);
return false;
}
bool PrettyPrinter::visit(TypeofSpecifierAST *ast)
{
- out << "typeof";
- out << '(';
+ outToken(ast->typeof_token);
+ outToken(ast->lparen_token);
accept(ast->expression);
- out << ')';
+ outToken(ast->rparen_token);
return false;
}
bool PrettyPrinter::visit(TypenameCallExpressionAST *ast)
{
- out << "typename";
- out << ' ';
+ outToken(ast->typename_token);
accept(ast->name);
- out << '(';
+ outToken(ast->lparen_token);
for (ExpressionListAST *it = ast->expression_list; it; it = it->next) {
+ outToken(it->comma_token);
accept(it->expression);
- if (it->next)
- out << ", ";
}
- out << ')';
+ outToken(ast->rparen_token);
return false;
}
bool PrettyPrinter::visit(TypenameTypeParameterAST *ast)
{
- out << spell(ast->classkey_token);
+ outToken(ast->classkey_token);
if (ast->name) {
- out << ' ';
accept(ast->name);
}
if (ast->equal_token) {
- out << ' ';
- out << '=';
- out << ' ';
+ outToken(ast->equal_token);
accept(ast->type_id);
}
return false;
@@ -1219,70 +1060,59 @@ bool PrettyPrinter::visit(TypenameTypeParameterAST *ast)
bool PrettyPrinter::visit(UnaryExpressionAST *ast)
{
- out << spell(ast->unary_op_token);
+ outToken(ast->unary_op_token);
accept(ast->expression);
return false;
}
bool PrettyPrinter::visit(UsingAST *ast)
{
- out << "using";
- out << ' ';
- if (ast->typename_token) {
- out << "typename";
- out << ' ';
- }
+ outToken(ast->using_token);
+ outToken(ast->typename_token);
accept(ast->name);
- out << ';';
+ outToken(ast->semicolon_token);
return false;
}
bool PrettyPrinter::visit(UsingDirectiveAST *ast)
{
- out << "using";
- out << ' ';
- out << "namespace";
- out << ' ';
+ outToken(ast->using_token);
+ outToken(ast->namespace_token);
accept(ast->name);
- out << ';';
+ outToken(ast->semicolon_token);
return false;
}
bool PrettyPrinter::visit(WhileStatementAST *ast)
{
- out << "while";
- out << ' ';
- out << '(';
+ outToken(ast->while_token);
+ outToken(ast->lparen_token);
accept(ast->condition);
- out << ')';
- out << ' ';
+ outToken(ast->rparen_token);
if (ast->statement && ast->statement->asCompoundStatement())
accept(ast->statement);
else {
indent();
- newline();
accept(ast->statement);
deindent();
- newline();
}
return false;
}
bool PrettyPrinter::visit(QtMethodAST *ast)
{
- out << ast->method_token;
- out << '(';
+ outToken(ast->method_token);
+ outToken(ast->lparen_token);
accept(ast->declarator);
- out << ')';
+ outToken(ast->rparen_token);
return false;
}
bool PrettyPrinter::visit(CompoundLiteralAST *ast)
{
- out << '(';
+ outToken(ast->lparen_token);
accept(ast->type_id);
- out << ')';
- out << ' ';
+ outToken(ast->rparen_token);
accept(ast->initializer);
return false;
}
diff --git a/src/shared/cplusplus/PrettyPrinter.h b/src/shared/cplusplus/PrettyPrinter.h
index 960893884ebac466e06e5831ecbae35a3a363468..db7c7e26d151f6db24ff2fe2ec0f0bd9cb9469a6 100644
--- a/src/shared/cplusplus/PrettyPrinter.h
+++ b/src/shared/cplusplus/PrettyPrinter.h
@@ -34,6 +34,7 @@
#include "ASTVisitor.h"
#include <iosfwd>
+#include <QByteArray>
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE
@@ -43,7 +44,7 @@ class CPLUSPLUS_EXPORT PrettyPrinter: protected ASTVisitor
public:
PrettyPrinter(Control *control, std::ostream &out);
- void operator()(AST *ast);
+ void operator()(AST *ast, const QByteArray &contents);
protected:
virtual bool visit(AccessDeclarationAST *ast);
@@ -148,10 +149,14 @@ protected:
void indent();
void deindent();
void newline();
+ void outToken(unsigned token);
private:
- std::ostream &out;
- unsigned depth;
+ std::ostream &_out;
+ unsigned _depth;
+
+ unsigned _lastToken;
+ QByteArray _contents;
};
CPLUSPLUS_END_NAMESPACE
diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp
index 4531cb5bb83eb7ce6a60e9abef0a45ce1fdefcd9..626a9ccf8cc0b5f894f44b2f2f1e0ab99cf2b299 100644
--- a/src/shared/help/bookmarkmanager.cpp
+++ b/src/shared/help/bookmarkmanager.cpp
@@ -48,7 +48,6 @@
#include <QtGui/QDialogButtonBox>
#include <QtGui/QSortFilterProxyModel>
-QT_BEGIN_NAMESPACE
BookmarkDialog::BookmarkDialog(BookmarkManager *manager, const QString &title,
const QString &url, QWidget *parent)
@@ -400,7 +399,7 @@ void BookmarkWidget::customContextMenuRequested(const QPoint &point)
emit requestShowLink(data);
}
else if (picked_action == showItemNewTab) {
- CentralWidget::instance()->setSourceInNewTab(data);
+ Help::Internal::CentralWidget::instance()->setSourceInNewTab(data);
}
else if (picked_action == removeItem) {
bookmarkManager->removeBookmarkItem(treeView,
@@ -575,7 +574,7 @@ bool BookmarkWidget::eventFilter(QObject *object, QEvent *e)
if (index.isValid() && (me->button() == Qt::MidButton)) {
QString data = index.data(Qt::UserRole + 10).toString();
if (!data.isEmpty() && data != QLatin1String("Folder"))
- CentralWidget::instance()->setSourceInNewTab(data);
+ Help::Internal::CentralWidget::instance()->setSourceInNewTab(data);
}
}
return QWidget::eventFilter(object, e);
@@ -700,7 +699,7 @@ void BookmarkManager::removeBookmarkItem(QTreeView *treeView, const QModelIndex&
if (data == QLatin1String("Folder") && item->rowCount() > 0) {
int value = QMessageBox::question(treeView, tr("Remove"),
tr("You are going to delete a Folder which will also<br>"
- "remove its content. Are you sure to continue?"),
+ "remove its content. Are you sure you would like to continue?"),
QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel);
if (value == QMessageBox::Cancel)
@@ -858,5 +857,3 @@ void BookmarkManager::readBookmarksRecursive(const QStandardItem *item,
readBookmarksRecursive(child, stream, (depth +1));
}
}
-
-QT_END_NAMESPACE
diff --git a/src/shared/help/bookmarkmanager.h b/src/shared/help/bookmarkmanager.h
index 0aff1efa8de7cc59356ed761e40eaf03a0a094b0..00f93f670c88fee6ca3b441bc9633c3db0acc218 100644
--- a/src/shared/help/bookmarkmanager.h
+++ b/src/shared/help/bookmarkmanager.h
@@ -55,6 +55,8 @@ class QHelpEngineCore;
class QAbstractItemModel;
class QSortFilterProxyModel;
+QT_END_NAMESPACE
+
class BookmarkManager;
class BookmarkDialog : public QDialog
@@ -190,6 +192,4 @@ private:
QHelpEngineCore *helpEngine;
};
-QT_END_NAMESPACE
-
#endif
diff --git a/src/shared/help/contentwindow.cpp b/src/shared/help/contentwindow.cpp
index 2a9d860c6a5a52703c80cd98ce73f74fb6001959..1e69effb365c969a0e63771f2e10071242d6f43e 100644
--- a/src/shared/help/contentwindow.cpp
+++ b/src/shared/help/contentwindow.cpp
@@ -37,8 +37,6 @@
#include <QtHelp/QHelpEngine>
#include <QtHelp/QHelpContentWidget>
-QT_BEGIN_NAMESPACE
-
ContentWindow::ContentWindow(QHelpEngine *helpEngine)
: m_helpEngine(helpEngine)
, m_contentWidget(0)
@@ -118,7 +116,7 @@ bool ContentWindow::eventFilter(QObject *o, QEvent *e)
qobject_cast<QHelpContentModel*>(m_contentWidget->model());
QHelpContentItem *itm =
contentModel->contentItemAt(m_contentWidget->currentIndex());
- CentralWidget::instance()->setSourceInNewTab(itm->url());
+ Help::Internal::CentralWidget::instance()->setSourceInNewTab(itm->url());
}
}
return QWidget::eventFilter(o, e);
@@ -143,7 +141,7 @@ void ContentWindow::showContextMenu(const QPoint &pos)
if (curTab == action)
emit linkActivated(itm->url());
else if (newTab == action)
- CentralWidget::instance()->setSourceInNewTab(itm->url());
+ Help::Internal::CentralWidget::instance()->setSourceInNewTab(itm->url());
}
void ContentWindow::itemClicked(const QModelIndex &index)
@@ -157,5 +155,3 @@ void ContentWindow::itemClicked(const QModelIndex &index)
if (itm)
emit linkActivated(itm->url());
}
-
-QT_END_NAMESPACE
diff --git a/src/shared/help/contentwindow.h b/src/shared/help/contentwindow.h
index 07b5227733d7e69f17355dbb89dc45245abdc467..86a21197473e5ff0da3be52b2e38467864e7a94d 100644
--- a/src/shared/help/contentwindow.h
+++ b/src/shared/help/contentwindow.h
@@ -39,6 +39,8 @@ QT_BEGIN_NAMESPACE
class QHelpEngine;
class QHelpContentWidget;
+QT_END_NAMESPACE
+
class ContentWindow : public QWidget
{
Q_OBJECT
@@ -69,6 +71,4 @@ private:
int m_expandDepth;
};
-QT_END_NAMESPACE
-
#endif // CONTENTWINDOW_H
diff --git a/src/shared/help/helpviewer.cpp b/src/shared/help/helpviewer.cpp
index 89a13358352a9f307b938d345fe792b253695e39..150658ca9db4696423300bc904a794728e325eb2 100644
--- a/src/shared/help/helpviewer.cpp
+++ b/src/shared/help/helpviewer.cpp
@@ -49,7 +49,6 @@
#include <QNetworkReply>
#include <QNetworkRequest>
-QT_BEGIN_NAMESPACE
#if !defined(QT_NO_WEBKIT)
@@ -148,7 +147,7 @@ QNetworkReply *HelpNetworkAccessManager::createRequest(Operation op,
class HelpPage : public QWebPage
{
public:
- HelpPage(CentralWidget *central, QHelpEngine *engine, QObject *parent);
+ HelpPage(Help::Internal::CentralWidget *central, QHelpEngine *engine, QObject *parent);
protected:
virtual QWebPage *createWindow(QWebPage::WebWindowType);
@@ -157,11 +156,11 @@ protected:
const QNetworkRequest &request, NavigationType type);
private:
- CentralWidget *centralWidget;
+ Help::Internal::CentralWidget *centralWidget;
QHelpEngine *helpEngine;
};
-HelpPage::HelpPage(CentralWidget *central, QHelpEngine *engine, QObject *parent)
+HelpPage::HelpPage(Help::Internal::CentralWidget *central, QHelpEngine *engine, QObject *parent)
: QWebPage(parent), centralWidget(central), helpEngine(engine)
{
}
@@ -209,7 +208,7 @@ bool HelpPage::acceptNavigationRequest(QWebFrame *,
return false;
}
-HelpViewer::HelpViewer(QHelpEngine *engine, CentralWidget *parent)
+HelpViewer::HelpViewer(QHelpEngine *engine, Help::Internal::CentralWidget *parent)
: QWebView(parent), helpEngine(engine), parentWidget(parent)
{
setPage(new HelpPage(parent, helpEngine, this));
@@ -309,7 +308,7 @@ void HelpViewer::actionChanged()
#else // !defined(QT_NO_WEBKIT)
-HelpViewer::HelpViewer(QHelpEngine *engine, CentralWidget *parent)
+HelpViewer::HelpViewer(QHelpEngine *engine, Help::Internal::CentralWidget *parent)
: QTextBrowser(parent)
, zoomCount(0)
, controlPressed(false)
@@ -526,5 +525,3 @@ void HelpViewer::wheelEvent(QWheelEvent *e)
}
#endif // !defined(QT_NO_WEBKIT)
-
-QT_END_NAMESPACE
diff --git a/src/shared/help/helpviewer.h b/src/shared/help/helpviewer.h
index 7f85cf9d2caf8d730bf42ecbe3a1ab96fd467424..8ed876032b40b632d71a818bf49c0581cdd5acaa 100644
--- a/src/shared/help/helpviewer.h
+++ b/src/shared/help/helpviewer.h
@@ -42,7 +42,6 @@
QT_BEGIN_NAMESPACE
class QHelpEngine;
-class CentralWidget;
class QPoint;
class QString;
@@ -50,6 +49,14 @@ class QKeyEvent;
class QMouseEvent;
class QContextMenuEvent;
+QT_END_NAMESPACE
+
+namespace Help {
+namespace Internal {
+ class CentralWidget;
+} // namespace Internal
+} // namespace Help
+
#if !defined(QT_NO_WEBKIT)
class HelpViewer : public QWebView
@@ -57,7 +64,7 @@ class HelpViewer : public QWebView
Q_OBJECT
public:
- HelpViewer(QHelpEngine *helpEngine, CentralWidget *parent);
+ HelpViewer(QHelpEngine *helpEngine, Help::Internal::CentralWidget *parent);
void setSource(const QUrl &url);
inline QUrl source() const
@@ -101,7 +108,7 @@ private Q_SLOTS:
private:
QHelpEngine *helpEngine;
- CentralWidget* parentWidget;
+ Help::Internal::CentralWidget* parentWidget;
QUrl homeUrl;
};
@@ -112,7 +119,7 @@ class HelpViewer : public QTextBrowser
Q_OBJECT
public:
- HelpViewer(QHelpEngine *helpEngine, CentralWidget *parent);
+ HelpViewer(QHelpEngine *helpEngine, Help::Internal::CentralWidget *parent);
void setSource(const QUrl &url);
void resetZoom();
@@ -148,12 +155,10 @@ private:
bool controlPressed;
QString lastAnchor;
QHelpEngine *helpEngine;
- CentralWidget* parentWidget;
+ Help::Internal::CentralWidget* parentWidget;
QUrl homeUrl;
};
#endif
-QT_END_NAMESPACE
-
#endif
diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp
index 3ce9dd1620bda19c631b87a68fbdf0ea7d781d3a..fd01473e1eba5cf4a50b980e85246e945efd38e0 100644
--- a/src/shared/help/indexwindow.cpp
+++ b/src/shared/help/indexwindow.cpp
@@ -42,8 +42,6 @@
#include <QtHelp/QHelpEngine>
#include <QtHelp/QHelpIndexWidget>
-QT_BEGIN_NAMESPACE
-
IndexWindow::IndexWindow(QHelpEngine *helpEngine, QWidget *parent)
: QWidget(parent)
, m_searchLineEdit(0)
@@ -134,12 +132,12 @@ bool IndexWindow::eventFilter(QObject *obj, QEvent *e)
if (model) {
QMap<QString, QUrl> links = model->linksForKeyword(keyword);
if (links.count() == 1) {
- CentralWidget::instance()->
+ Help::Internal::CentralWidget::instance()->
setSourceInNewTab(links.constBegin().value());
} else {
TopicChooser tc(this, keyword, links);
if (tc.exec() == QDialog::Accepted) {
- CentralWidget::instance()->setSourceInNewTab(tc.link());
+ Help::Internal::CentralWidget::instance()->setSourceInNewTab(tc.link());
}
}
}
@@ -158,10 +156,10 @@ bool IndexWindow::eventFilter(QObject *obj, QEvent *e)
if (links.count() > 1) {
TopicChooser tc(this, keyword, links);
if (tc.exec() == QDialog::Accepted) {
- CentralWidget::instance()->setSourceInNewTab(tc.link());
+ Help::Internal::CentralWidget::instance()->setSourceInNewTab(tc.link());
}
} else if (links.count() == 1) {
- CentralWidget::instance()->
+ Help::Internal::CentralWidget::instance()->
setSourceInNewTab(links.constBegin().value());
}
}
@@ -200,5 +198,3 @@ void IndexWindow::focusInEvent(QFocusEvent *e)
m_searchLineEdit->setFocus();
}
}
-
-QT_END_NAMESPACE
diff --git a/src/shared/help/indexwindow.h b/src/shared/help/indexwindow.h
index 56dd6181f08eafda0dd3066aa0457f6c5001027e..6cb8b86932402d7e386c674753682443bab6c4e6 100644
--- a/src/shared/help/indexwindow.h
+++ b/src/shared/help/indexwindow.h
@@ -39,6 +39,8 @@ QT_BEGIN_NAMESPACE
class QHelpIndexWidget;
class QHelpEngine;
+QT_END_NAMESPACE
+
class IndexWindow : public QWidget
{
Q_OBJECT
@@ -73,6 +75,4 @@ private:
QHelpEngine *m_helpEngine;
};
-QT_END_NAMESPACE
-
#endif // INDEXWINDOW_H
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 95bd578d9fc1ade933e388c37eab46ddc2d777af..04652b7db9f5f481bccc41148deecd6099114bad 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -2076,16 +2076,6 @@ bool ProFileEvaluator::Private::evaluateFile(const QString &fileName, bool *resu
if (result)
*result = false;
}
-/* if (ok && readFeatures) {
- QStringList configs = values("CONFIG");
- QSet<QString> processed;
- foreach (const QString &fn, configs) {
- if (!processed.contains(fn)) {
- processed.insert(fn);
- evaluateFeatureFile(fn, 0);
- }
- }
- } */
return ok;
}
diff --git a/src/shared/qrceditor/qrceditor.ui b/src/shared/qrceditor/qrceditor.ui
index 02b5780f54cde01c05b4b162897ac9fc7890fe0f..0fe1b01b42e97966f0d786112652ad2970bb29d3 100644
--- a/src/shared/qrceditor/qrceditor.ui
+++ b/src/shared/qrceditor/qrceditor.ui
@@ -10,9 +10,6 @@
<height>381</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>-1</number>
diff --git a/src/tools/qtcreatorwidgets/customwidgets.cpp b/src/tools/qtcreatorwidgets/customwidgets.cpp
index ce78a732999f7c756f864d103e3176d4394bfa66..d25e97587b96d8b64c11972de76fcbc80ef1b98f 100644
--- a/src/tools/qtcreatorwidgets/customwidgets.cpp
+++ b/src/tools/qtcreatorwidgets/customwidgets.cpp
@@ -154,6 +154,17 @@ SubmitFieldWidget_CW::SubmitFieldWidget_CW(QObject *parent) :
{
}
+PathListEditor_CW::PathListEditor_CW(QObject *parent) :
+ QObject(parent),
+ CustomWidget<Core::Utils::PathListEditor>
+ (QLatin1String("<utils/pathlisteditor.h>"),
+ false,
+ QLatin1String(groupC),
+ QIcon(),
+ QLatin1String("Edit a path list variable"))
+{
+}
+
// -------------- WidgetCollection
WidgetCollection::WidgetCollection(QObject *parent) :
QObject(parent)
@@ -169,6 +180,7 @@ WidgetCollection::WidgetCollection(QObject *parent) :
m_plugins.push_back(new QtColorButton_CW(this));
m_plugins.push_back(new SubmitEditorWidget_CW(this));
m_plugins.push_back(new SubmitFieldWidget_CW(this));
+ m_plugins.push_back(new PathListEditor_CW(this));
}
QList<QDesignerCustomWidgetInterface*> WidgetCollection::customWidgets() const
diff --git a/src/tools/qtcreatorwidgets/customwidgets.h b/src/tools/qtcreatorwidgets/customwidgets.h
index 7f9bd4efeb866b83535a666119de14f833fdc35c..f11d5253860db7ab4a6dde0f5d55a560bc085a09 100644
--- a/src/tools/qtcreatorwidgets/customwidgets.h
+++ b/src/tools/qtcreatorwidgets/customwidgets.h
@@ -42,6 +42,7 @@
#include <utils/qtcolorbutton.h>
#include <utils/submiteditorwidget.h>
#include <utils/submitfieldwidget.h>
+#include <utils/pathlisteditor.h>
#include <QtDesigner/QDesignerCustomWidgetCollectionInterface>
@@ -152,6 +153,16 @@ public:
explicit SubmitFieldWidget_CW(QObject *parent = 0);
};
+class PathListEditor_CW :
+ public QObject,
+ public CustomWidget<Core::Utils::PathListEditor>
+{
+ Q_OBJECT
+ Q_INTERFACES(QDesignerCustomWidgetInterface)
+public:
+ explicit PathListEditor_CW(QObject *parent = 0);
+};
+
// Collection
class WidgetCollection : public QObject, public QDesignerCustomWidgetCollectionInterface
diff --git a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
index aa727f405a32527026dea261b4838f3d9d875813..ad78021f03685b9d243eeba6cd800c00b6443a46 100644
--- a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
+++ b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
@@ -14,7 +14,11 @@ linux-* {
QTC_LIBS=$$dirname(PWD)
QTC_LIBS=$$dirname(QTC_LIBS)
QTC_LIBS=$$dirname(QTC_LIBS)
- QTC_LIBS=$$QTC_LIBS/lib/qtcreator
+ linux-*64 {
+ QTC_LIBS=$$QTC_LIBS/lib64/qtcreator
+ } else {
+ QTC_LIBS=$$QTC_LIBS/lib/qtcreator
+ }
QMAKE_RPATHDIR *= $$QTC_LIBS
}
diff --git a/tests/manual/cplusplus/main.cpp b/tests/manual/cplusplus/main.cpp
index 3953256f7c2d5a53f8c696f61fd2f2d8e66dd4fb..6395d70e4f02b4c2e0aa19214142bcd871d86bd6 100644
--- a/tests/manual/cplusplus/main.cpp
+++ b/tests/manual/cplusplus/main.cpp
@@ -73,8 +73,9 @@ public:
void rewrite(const TranslationUnit *unit,
const QByteArray &contents,
- QByteArray *out) const
+ QByteArray *out)
{
+ _source = contents;
const char *source = contents.constData();
unsigned previousTokenEndPosition = 0;
for (unsigned i = 0; i < unit->tokenCount(); ++i) {
@@ -104,6 +105,9 @@ public:
previousTokenEndPosition = tk.end();
}
}
+
+protected:
+ QByteArray _source;
};
class SimpleRefactor: protected ASTVisitor, Rewrite {
@@ -192,12 +196,13 @@ protected:
return false;
}
- virtual bool visit(CppCastExpressionAST *ast) {
+ virtual bool visit(CppCastExpressionAST *ast)
+ {
// Replace the C++ cast expression (e.g. static_cast<foo>(a)) with
// the one generated by the pretty printer.
std::ostringstream o;
PrettyPrinter pp(control(), o);
- pp(ast);
+ pp(ast, _source);
remove(ast->firstToken(), ast->lastToken());
const std::string str = o.str();
insertTextBefore(ast->firstToken(), str.c_str());
@@ -267,7 +272,7 @@ int main(int argc, char *argv[])
printf("%s\n", out.constData());
} else if (test_pretty_printer) {
PrettyPrinter pp(&control, std::cout);
- pp(unit.ast());
+ pp(unit.ast(), source);
}
return EXIT_SUCCESS;
}
diff --git a/tests/manual/fakevim/runremotely.sh b/tests/manual/fakevim/runremotely.sh
index 927c8aec9d91c779d627f4eb0dd3ff0c18303b42..c2c47955fae0703052dbd5af6c07061f6b068256 100755
--- a/tests/manual/fakevim/runremotely.sh
+++ b/tests/manual/fakevim/runremotely.sh
@@ -10,6 +10,6 @@ qtlibs=`ldd ${executable} | grep libQt | sed -e 's/^.*=> \(.*\) (.*)$/\1/'`
ssh ${account} "mkdir -p ${targetdir}"
scp ${executable} ${qtlibs} ${account}:${targetdir}
ssh ${account} "chrpath -r ${targetdir} ${targetdir}/*"
-ssh ${account} "gdbserver localhost:5555 ${targetdir}/${exename}"
+ssh -X ${account} "gdbserver localhost:5555 ${targetdir}/${exename}"
ssh ${account} "rm ${targetdir}/* ; rmdir ${targetdir}"
diff --git a/tests/manual/progressmanager/roundprogress.ui b/tests/manual/progressmanager/roundprogress.ui
index 1c1fe4b47252b9dbbc2688a7a3e27c458ecbfdab..8ed0cdfdf9a9444d2a2bc77ef9e38674590bc87c 100644
--- a/tests/manual/progressmanager/roundprogress.ui
+++ b/tests/manual/progressmanager/roundprogress.ui
@@ -9,9 +9,6 @@
<height>144</height>
</rect>
</property>
- <property name="windowTitle" >
- <string>Form</string>
- </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="FutureProgress" name="progressButton" >