feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Change-Id: I4d1954622e28ff292ed7699268c5572102869d56
This commit is contained in:
Eike Ziller
2022-09-30 09:04:25 +02:00
parent e27653a3d3 ab4c9b9679
commit a0f008b8e1
258 changed files with 6318 additions and 14772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

182
dist/changelog/changes-9.0.0.md vendored Normal file
View File

@@ -0,0 +1,182 @@
Qt Creator 9
============
Qt Creator version 9 contains bug fixes and new features.
The most important changes are listed in this document. For a complete list of
changes, see the Git log for the Qt Creator sources that you can check out from
the public Git repository. For example:
git clone git://code.qt.io/qt-creator/qt-creator.git
git log --cherry-pick --pretty=oneline origin/8.0..v9.0.0
General
-------
* Added change log browser `Help > Change Log` (`Qt Creator > Change Log` on
macOS)
* Added option for showing locator as a centered popup
* Added non-menu actions to locator `t` filter
Editing
-------
* Added option for visualizing indentation (QTCREATORBUG-22756)
* Added option for `Tint whole margin area`
* Added option for line spacing (QTCREATORBUG-13727)
* Added `Create Cursors at Selected Line Ends`
* Improved UI for multiple markers on the same line (QTCREATORBUG-27415)
* Fixed performance issue with large selections
* Fixed `Rewrap Paragraph` for Doxygen comments (QTCREATORBUG-9739)
* Fixed MIME type matching for generic highlighting with MIME type aliases
### C++
* Moved code style editor from dialog directly into the preferences page
* Added `Show Preprocessed Source`
* Added `Follow Symbol` for QRC files in string literals (QTCREATORBUG-28087)
* Added option for returning only non-value types by const reference
(QTCREATORBUG-25790)
* Fixed that selection was not considered for refactoring actions
(QTCREATORBUG-27886)
* Clangd
* Added option for using single Clangd instance for the whole session
(QTCREATORBUG-26526)
* Added option for maximum number of completion results (default 100)
(QTCREATORBUG-27152)
* Added option for document specific preprocessor directives
(QTCREATORBUG-20423)
* Fixed semantic highlighting for `__func__`
* Fixed double items in outline after switching Clangd off and on
(QTCREATORBUG-27594)
* Built-in
* Added support for structured bindings (QTCREATORBUG-27975)
* ClangFormat
* Moved settings back to top level preferences page
### Language Server Protocol
* Improved performance for large documents
* Fixed that server was not restarted after 5 times, even if a long time passed
after the last time
### Binaries
* Added support for character encoding
### Image Viewer
* Made `Fit to Screen` sticky and added option for the default
(QTCREATORBUG-27816)
Projects
--------
* Added option for hiding build system output with `Show Right Sidebar`
(QTCREATORBUG-26069)
* Fixed that opening terminal from build environment settings did not change
directory to build directory
### CMake
* Moved settings from `Kits` and `Build & Run` into their own `CMake` category
* Turned `Package manager auto setup` off by default
* Added support for CMake configure presets (QTCREATORBUG-24555)
* Added option for changing environment for configure step
* Added option for hiding subfolders in source groups (QTCREATORBUG-27432)
* Fixed that `PATH` environment variable was not completely set up during first
CMake run
### Qbs
* Fixed that `qbs.sysroot` was not considered
Debugging
---------
* Added warning for missing QML debugging functionality for mobile and embedded
devices
* Fixed display of strings with characters more than 2 bytes long
Version Control Systems
-----------------------
### Git
* Added support for user-configured comment character (QTCREATORBUG-28042)
Test Integration
----------------
* Added support for Squish
* Catch 2
* Fixed handling of exceptions (QTCREATORBUG-28131)
Platforms
---------
### Windows
* Improved detection of MinGW and LLVM ABI (QTCREATORBUG-26247)
* Fixed wrong debugger when importing build (QTCREATORBUG-27758)
* Fixed issues when drives are mapped (QTCREATORBUG-27869, QTCREATORBUG-28031)
* Fixed that output could be missing for Qt based external tools
(QTCREATORBUG-27828)
### macOS
* Added auto-detection of `ccache` compilers from Homebrew (QTCREATORBUG-27792)
* Fixed that theme partially switched between dark and light when system theme
changed during runtime (QTCREATORBUG-28066)
### iOS
* Fixed determination of Qt version when debugging
### Remote Linux
* Added option for SSH port to wizard
* Added fallback for devices without `base64`
### Docker
* Added option for `docker` command
* Added detection of Python
* Improved device wizard
Credits for these changes go to:
--------------------------------
Aaron Barany
Alessandro Portale
Alexander Akulich
Alexander Drozdov
André Pönitz
Artem Sokolovskii
Assam Boudjelthia
Björn Schäpers
Christiaan Janssen
Christian Kandeler
Christian Stenger
Cristian Adam
Daniele Bortolotti
David Schulz
Eike Ziller
Fawzi Mohamed
Florian Koch
Henning Gruendl
Jaroslaw Kobus
Lucie Gérard
Marco Bubke
Marcus Tillmanns
Miikka Heikkinen
Orgad Shaneh
Piotr Mućko
Robert Löhning
Sergey Levin
Sivert Krøvel
Tasuku Suzuki
Thiago Macieira
Thomas Hartmann
Tim Jenssen
Ulf Hermann
Yasser Grimes

37
share/qtcreator/templates/wizards/codesnippet/CMakeLists.txt Normal file
View File

@@ -0,0 +1,37 @@
cmake_minimum_required(VERSION 3.5)
project(%{ProjectName} VERSION 0.1 LANGUAGES CXX)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS %{QtModule})
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS %{QtModule})
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
qt_add_executable(%{ProjectName} MANUAL_FINALIZATION %{CppFileName})
else()
if(ANDROID)
add_library(%{ProjectName} SHARED %{CppFileName})
else()
add_executable(%{ProjectName} %{CppFileName})
endif()
endif()
target_link_libraries(%{ProjectName} PRIVATE Qt${QT_VERSION_MAJOR}::%{QtModule})
install(TARGETS %{ProjectName}
@if %{MacOSBundle}
BUNDLE DESTINATION .
@endif
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
set_target_properties(%{ProjectName} PROPERTIES MACOSX_BUNDLE %{MacOSBundleValue})
if(QT_VERSION_MAJOR EQUAL 6)
qt_finalize_executable(%{ProjectName})
endif()

2
share/qtcreator/templates/wizards/codesnippet/main.cpp
View File

@@ -1 +1 @@
%CODE%
%{CodeSnippet}

17
share/qtcreator/templates/wizards/codesnippet/project.pro
View File

@@ -1,17 +0,0 @@
TEMPLATE = app
@if "%TYPE%" == "core"
QT = core
@else
QT = core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@endif
@if "%CONSOLE%" == "true"
CONFIG += console
@endif
@if "%APP_BUNDLE%" == "false"
CONFIG -= app_bundle
@endif
CONFIG += c++11
SOURCES += \\
main.%CppSourceSuffix%

113
share/qtcreator/templates/wizards/codesnippet/wizard.json Normal file
View File

@@ -0,0 +1,113 @@
{
"version": 1,
"supportedProjectTypes": [ "CMakeProjectManager.CMakeProject" ],
"id": "Z.Snippet",
"category": "H.Project",
"trDescription": "Creates a CMake-based test project for which a code snippet can be entered.",
"trDisplayName": "Code Snippet",
"trDisplayCategory": "Other Project",
"featuresRequired": [ "QtSupport.Wizards.FeatureQt" ],
"enabled": "%{JS: value('Plugins').indexOf('CMakeProjectManager') >= 0}",
"options":
[
{ "key": "ProjectFile", "value": "%{ProjectDirectory}/CMakeLists.txt" },
{ "key": "CppFileName", "value": "%{JS: 'main.' + Util.preferredSuffix('text/x-c++src')}" },
{ "key": "MacOSBundleValue", "value": "%{JS: %{MacOSBundle} ? 'TRUE' : 'FALSE' }" }
],
"pages":
[
{
"trDisplayName": "Project Location",
"trShortTitle": "Location",
"typeId": "Project",
"data":
{
"trDescription": "Creates a CMake-based test project for which a code snippet can be entered."
}
},
{
"trDisplayName": "Define Code snippet",
"trShortTitle": "Code snippet",
"typeId": "Fields",
"data":
[
{
"name": "CodeSnippet",
"trDisplayName": "Code:",
"type": "TextEdit",
"data":
{
"trText": "int main(int argc, char *argv[])\n{\n return 0;\n}"
}
},
{
"name": "QtModule",
"trDisplayName": "Use Qt Modules:",
"type": "ComboBox",
"persistenceKey": "QtModule",
"data":
{
"index": 1,
"items":
[
{
"trKey": "QtCore",
"value": "Core"
},
{
"trKey": "QtCore, QtWidgets",
"value": "Widgets"
}
]
}
},
{
"name": "MacOSBundle",
"trDisplayName": "Application bundle (macOS)",
"type": "CheckBox",
"persistenceKey": "MacOSBundle",
"data":
{
"checked": true
}
}
]
},
{
"trDisplayName": "Kit Selection",
"trShortTitle": "Kits",
"typeId": "Kits",
"enabled": "%{JS: !value('IsSubproject')}",
"data":
{
"projectFilePath": "%{ProjectFile}"
}
},
{
"trDisplayName": "Project Management",
"trShortTitle": "Summary",
"typeId": "Summary"
}
],
"generators":
[
{
"typeId": "File",
"data":
[
{
"source": "CMakeLists.txt",
"target": "%{ProjectFile}",
"openAsProject": true
},
{
"source": "main.cpp",
"target": "%{CppFileName}",
"openInEditor": true
}
]
}
]
}

49
share/qtcreator/templates/wizards/codesnippet/wizard.xml
View File

@@ -1,49 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
Custom project wizard configuration example file. Note that by convention,
the project file goes last.
The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and
leave room for the Qt 4 target page.
-->
<wizard version="1" kind="project"
class="qmakeproject" firstpage="10"
id="Z.Snippet" category="H.Project">
<description>Creates a qmake-based test project for which a code snippet can be entered.</description>
<displayname>Code Snippet</displayname>;
<displaycategory>Other Project</displaycategory>
<files>
<file source="main.cpp" target="main.%CppSourceSuffix%" openeditor="true"/>
<file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
</files>
<fieldpagetitle>Snippet Parameters</fieldpagetitle>
<fields>
<field name="CODE">
<fieldcontrol class="QTextEdit" defaulttext="int main(int argc, char *argv[])&#10;{&#10; return 0;&#10;}&#10;"/>
<fielddescription>Code:</fielddescription>
</field>
<field name="TYPE">
<fielddescription>Type:</fielddescription>
<fieldcontrol class="QComboBox" defaultindex="0">
<comboentries>
<comboentry value="core">
<comboentrytext>Headless (QtCore)</comboentrytext>
</comboentry>
<comboentry value="gui">
<comboentrytext>Gui application (QtCore, QtGui, QtWidgets)</comboentrytext>
</comboentry>
</comboentries>
</fieldcontrol>
</field>
<field name="CONSOLE">
<fieldcontrol class="QCheckBox" defaultvalue="true"/>
<fielddescription>Console application</fielddescription>
</field>
<field name="APP_BUNDLE">
<fieldcontrol class="QCheckBox"/>
<fielddescription>Application bundle (Mac)</fielddescription>
</field>
</fields>
</wizard>

1426
share/qtcreator/translations/qtcreator_cs.ts
View File

File diff suppressed because it is too large Load Diff

373
share/qtcreator/translations/qtcreator_da.ts
View File

@@ -4302,23 +4302,14 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Value requested by kit: %1</source>
<translation>Værdi anmodet af kit: %1</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeBuildStep</name>
<message>
<source>The build configuration is currently disabled.</source>
<translation>Byggekonfigurationen er deaktiveret på nuværende tidspunkt.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigItem</name>
<message>
<source>Failed to open %1 for reading.</source>
<translation>Kunne ikke åbne %1 til læsning.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigurationKitInformation</name>
<message>
<source>CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version.</source>
<translation>CMake-konfigurationen har ikke sat nogen sti til en qmake-binær, selvom kittet har en gyldig Qt version.</translation>
@@ -4363,9 +4354,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>CMake Configuration</source>
<translation>CMake-konfiguration</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeGeneratorKitInformation</name>
<message>
<source>CMake Tool is unconfigured, CMake generator will be ignored.</source>
<translation>CMake-værktøj er ikke konfigureret, CMake-generator ignoreres.</translation>
@@ -4406,9 +4394,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>&lt;Use Default Generator&gt;</source>
<translation>&lt;brug standard generator&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeKitInformation</name>
<message>
<source>CMake version %1 is unsupported. Please update to version 3.0 or later.</source>
<translation>CMake-version %1 understøttes ikke. Opdater venligst til version 3.0 eller senere.</translation>
@@ -4425,9 +4410,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Path to the cmake executable</source>
<translation>Sti til cmake-eksekverbaren</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeProject</name>
<message>
<source>No cmake tool set.</source>
<translation>Intet cmake-værktøj sat.</translation>
@@ -4440,9 +4422,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Scan &quot;%1&quot; project tree</source>
<translation>Skan &quot;%1&quot; projekttræ</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeSettingsPage</name>
<message>
<source> (Default)</source>
<translation> (standard)</translation>
@@ -4487,9 +4466,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Path:</source>
<translation>Sti:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeToolManager</name>
<message>
<source>CMake at %1</source>
<translation>CMake ved %1</translation>
@@ -4498,9 +4474,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>System CMake at %1</source>
<translation>Systemets CMake ved %1</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::ConfigModel</name>
<message>
<source>Key</source>
<translation>Nøgle</translation>
@@ -4521,9 +4494,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Value</source>
<translation>Værdi</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::ConfigModelItemDelegate</name>
<message>
<source>Select a file for %1</source>
<translation>Vælg en fil for %1</translation>
@@ -4532,9 +4502,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Select a directory for %1</source>
<translation>Vælg en mappe for %1</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::BuildDirManager</name>
<message>
<source>Failed to create build directory &quot;%1&quot;.</source>
<translation>Kunne ikke oprette bygmappe &quot;%1&quot;.</translation>
@@ -4555,14 +4522,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>&lt;removed&gt;</source>
<translation>&lt;fjernet&gt;</translation>
</message>
<message>
<source>Key</source>
<translation>Nøgle</translation>
</message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message>
<source>Project</source>
<translation>Projekt</translation>
@@ -4579,16 +4538,10 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Apply Changes to Project</source>
<translation>Anvend ændringer til projekt</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfiguration</name>
<message>
<source>CMake configuration set by the kit was overridden in the project.</source>
<translation>CMake-konfiguration sat af kittet blev tilsidesat af projektet.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name>
<message>
<source>Default</source>
<extracomment>The name of the build configuration created by default for a cmake project.</extracomment>
@@ -4614,13 +4567,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Release with Debug Information</source>
<translation>Udgivelse med fejlretinformation</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message>
<source>Build directory:</source>
<translation>Bygmappe:</translation>
@@ -4685,10 +4631,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Apply Configuration Changes</source>
<translation>Anvend konfigurationsændringer</translation>
</message>
<message>
<source>&lt;UNSET&gt;</source>
<translation>&lt;AFSÆT&gt;</translation>
</message>
<message>
<source>bool</source>
<comment>display string for cmake type BOOLEAN</comment>
@@ -4713,9 +4655,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Force to %1</source>
<translation>Tving til %1</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStep</name>
<message>
<source>CMake Build</source>
<extracomment>Default display name for the cmake make step.</extracomment>
@@ -4741,9 +4680,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Project did not parse successfully, cannot build.</source>
<translation>Projekt blev ikke parset, kan ikke bygge.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepConfigWidget</name>
<message>
<source>Tool arguments:</source>
<translation>Værktøjsargumenter:</translation>
@@ -4761,25 +4697,15 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>&lt;b&gt;No build configuration found on this kit.&lt;/b&gt;</source>
<translation>&lt;b&gt;Ingen byggekonfiguration fundet i dette kit.&lt;/b&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepFactory</name>
<message>
<source>Build</source>
<comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment>
<translation>Byg</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeConfigurationKitConfigWidget</name>
<message>
<source>Change...</source>
<translation>Skift...</translation>
</message>
<message>
<source>CMake Configuration</source>
<translation>CMake-konfiguration</translation>
</message>
<message>
<source>Default configuration passed to CMake when setting up a project.</source>
<translation>Standard konfiguration videregivet til CMake når et projekt sættes op.</translation>
@@ -4792,20 +4718,10 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source>
<translation>Indtast én variabel pr. linje med variabelnavnet separeret fra variablens værdi med &quot;=&quot;.&lt;br&gt;Du kan give et tip om type ved at tilføje &quot;:TYPE&quot; før &quot;=&quot;.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeEditorFactory</name>
<message>
<source>CMake Editor</source>
<translation>CMake-redigering</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeGeneratorKitConfigWidget</name>
<message>
<source>Change...</source>
<translation>Skift...</translation>
</message>
<message>
<source>CMake generator:</source>
<translation>CMake-generator:</translation>
@@ -4822,10 +4738,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>CMake generator defines how a project is built when using CMake.&lt;br&gt;This setting is ignored when using other build systems.</source>
<translation>CMake-generator definerer hvordan et projekt bygges ved brug af CMake.&lt;br&gt;Denne indstilling ignoreres når andre byggesystemer bruges.</translation>
</message>
<message>
<source>CMake Generator</source>
<translation>CMake-generator</translation>
</message>
<message>
<source>Generator:</source>
<translation>Generator:</translation>
@@ -4842,9 +4754,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Toolset:</source>
<translation>Værktøjssæt:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeKitConfigWidget</name>
<message>
<source>CMake Tool:</source>
<translation>CMake-værktøj:</translation>
@@ -4857,16 +4766,10 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>&lt;No CMake Tool available&gt;</source>
<translation>&lt;Intet tilgængeligt CMake-værktøj&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeLocatorFilter</name>
<message>
<source>Build CMake target</source>
<translation>Byg CMake-mål</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeManager</name>
<message>
<source>Run CMake</source>
<translation>Kør CMake</translation>
@@ -4879,47 +4782,24 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Rescan Project</source>
<translation>Genskan projekt</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeProjectPlugin</name>
<message>
<source>CMake</source>
<comment>SnippetProvider</comment>
<translation>CMake</translation>
</message>
<message>
<source>Build</source>
<translation>Byg</translation>
</message>
<message>
<source>Build &quot;%1&quot;</source>
<translation>Byg &quot;%1&quot;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfiguration</name>
<message>
<source>The project no longer builds the target associated with this run configuration.</source>
<translation>Projektet bygger ikke længere målet tilknyttet med denne kør-konfiguration.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeTarget</name>
<message>
<source>Desktop</source>
<comment>CMake Default target display name</comment>
<translation>Desktop</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeToolConfigWidget</name>
<message>
<source>Add</source>
<translation>Tilføj</translation>
@@ -4948,9 +4828,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>New CMake</source>
<translation>Ny CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::ServerMode</name>
<message>
<source>Running &quot;%1 %2&quot; in %3.</source>
<translation>Kører &quot;%1 %2&quot; i %3.</translation>
@@ -5035,9 +4912,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Received a signal in reply to a request.</source>
<translation>Modtog et signal som svar til en anmodning.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::ServerModeReader</name>
<message>
<source>Parsing of CMake project failed: Connection to CMake server lost.</source>
<translation>Parsing af CMake-projekt mislykkedes: Forbindelse til CMake-server tabt.</translation>
@@ -5094,21 +4968,10 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>&lt;Headers&gt;</source>
<translation>&lt;headere&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::TeaLeafReader</name>
<message>
<source>The build directory is not for %1 but for %2</source>
<translation>Bygmappen er ikke til %1 men til %2</translation>
</message>
<message>
<source>Running &quot;%1 %2&quot; in %3.</source>
<translation>Kører &quot;%1 %2&quot; i %3.</translation>
</message>
<message>
<source>Configuring &quot;%1&quot;</source>
<translation>Konfigurerer &quot;%1&quot;</translation>
</message>
<message>
<source>*** cmake process crashed.</source>
<translation>*** cmake-proces holdt op med at virke.</translation>
@@ -5343,7 +5206,7 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
</message>
</context>
<context>
<name>ClearCase::Internal::ActivitySelector</name>
<name>ClearCase</name>
<message>
<source>Select &amp;activity:</source>
<translation>Vælg &amp;aktivitet:</translation>
@@ -5356,9 +5219,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
<source>Keep item activity</source>
<translation>Hold post aktivitet</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::CheckOutDialog</name>
<message>
<source>Check Out</source>
<translation>Check out</translation>
@@ -5384,9 +5244,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
<extracomment>Hijack: Unset read-only flag without check-out. This is used for local changes which the user does not want to commit.</extracomment>
<translation>Brug &amp;hijacked fil</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseControl</name>
<message>
<source>Check &amp;Out</source>
<translation>Check &amp;out</translation>
@@ -5395,16 +5252,10 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
<source>&amp;Hijack</source>
<translation>&amp;Hijack</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseEditorWidget</name>
<message>
<source>Annotate version &quot;%1&quot;</source>
<translation>Annotate version &quot;%1&quot;</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCasePlugin</name>
<message>
<source>Editing Derived Object: %1</source>
<translation>Redigerer afledt objekt: %1</translation>
@@ -5702,31 +5553,18 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
<source>Updating ClearCase Index</source>
<translation>Opdaterer ClearCase-indeks</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseSubmitEditor</name>
<message>
<source>ClearCase Check In</source>
<translation>ClearCase check in</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseSubmitEditorWidget</name>
<message>
<source>Chec&amp;k in even if identical to previous version</source>
<translation>Chec&amp;k in selv hvis identisk med forrige version</translation>
</message>
<message>
<source>&amp;Preserve file modification time</source>
<translation>&amp;Bevar filændringstid</translation>
</message>
<message>
<source>&amp;Check In</source>
<translation>&amp;Check in</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::SettingsPage</name>
<message>
<source>Configuration</source>
<translation>Konfiguration</translation>
@@ -5808,9 +5646,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
<source>ClearCase</source>
<translation>ClearCase</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::SettingsPageWidget</name>
<message>
<source>ClearCase Command</source>
<translation>ClearCase-kommando</translation>
@@ -5823,9 +5658,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
<source>DiffUtils is available for free download at http://gnuwin32.sourceforge.net/packages/diffutils.htm. Extract it to a directory in your PATH.</source>
<translation>DiffUtils kan frit downloades på http://gnuwin32.sourceforge.net/packages/diffutils.htm. Udpak den til en mappe i din PATH.</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::UndoCheckOut</name>
<message>
<source>Dialog</source>
<translation>Dialog</translation>
@@ -5838,9 +5670,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere
<source>&amp;Save copy of the file with a &apos;.keep&apos; extension</source>
<translation>&amp;Gem kopi af filen med en &apos;.keep&apos;-endelse</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::VersionSelector</name>
<message>
<source>Confirm Version to Check Out</source>
<translation>Bekræft version som skal check out</translation>
@@ -29179,7 +29008,7 @@ Filerne i Android-pakke kildemappen kopieres til bygmappens Android-mappe og sta
</message>
</context>
<context>
<name>QmakePriFile</name>
<name>QmakeProjectManager</name>
<message>
<source>Failed</source>
<translation>Mislykkedes</translation>
@@ -29192,9 +29021,6 @@ Filerne i Android-pakke kildemappen kopieres til bygmappens Android-mappe og sta
<source>File Error</source>
<translation>Filfejl</translation>
</message>
</context>
<context>
<name>QmakeProFile</name>
<message>
<source>Error while parsing file %1. Giving up.</source>
<translation>Fejl under parsing af filen %1. Opgiver.</translation>
@@ -29203,25 +29029,16 @@ Filerne i Android-pakke kildemappen kopieres til bygmappens Android-mappe og sta
<source>Could not find .pro file for subdirectory &quot;%1&quot; in &quot;%2&quot;.</source>
<translation>Kunne ikke finde .pro-fil for undermappen &quot;%1&quot; i &quot;%2&quot;.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager</name>
<message>
<source>&quot;%1&quot; is used by qmake, but &quot;%2&quot; is configured in the kit.
Please update your kit or choose a mkspec for qmake that matches your target environment better.</source>
<translation>&quot;%1&quot; bruges af qmake, men &quot;%2&quot; er konfigureret i kittet.
Opdater venligst dit kit eller vælg en mkspec for qmake som matcher dit mål-miljø bedre.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::AddLibraryWizard</name>
<message>
<source>Add Library</source>
<translation>Tilføj bibliotek</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ClassDefinition</name>
<message>
<source>The header file</source>
<translation>Headerfilen</translation>
@@ -29322,9 +29139,6 @@ Opdater venligst dit kit eller vælg en mkspec for qmake som matcher dit mål-mi
<source>Icon files (*.png *.ico *.jpg *.xpm *.tif *.svg)</source>
<translation>Ikonfiler (*.png *.ico *.jpg *.xpm *.tif *.svg)</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ClassList</name>
<message>
<source>&lt;New class&gt;</source>
<translation>&lt;ny klasse&gt;</translation>
@@ -29337,9 +29151,6 @@ Opdater venligst dit kit eller vælg en mkspec for qmake som matcher dit mål-mi
<source>Delete class %1 from list?</source>
<translation>Slet klassen %1 fra liste?</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetPluginWizardPage</name>
<message>
<source>WizardPage</source>
<translation>Assistent side</translation>
@@ -29380,9 +29191,6 @@ Opdater venligst dit kit eller vælg en mkspec for qmake som matcher dit mål-mi
<source>Plugin Details</source>
<translation>Plugindetaljer</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWidgetsWizardPage</name>
<message>
<source>Custom Qt Widget Wizard</source>
<translation>Brugerdefineret Qt widget-assistent</translation>
@@ -29407,9 +29215,6 @@ Opdater venligst dit kit eller vælg en mkspec for qmake som matcher dit mål-mi
<source>Custom Widgets</source>
<translation>Brugerdefineret widgets</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWizard</name>
<message>
<source>Qt Custom Designer Widget</source>
<translation>Qt brugerdefineret Designer-widget</translation>
@@ -29418,16 +29223,10 @@ Opdater venligst dit kit eller vælg en mkspec for qmake som matcher dit mål-mi
<source>Creates a Qt Custom Designer Widget or a Custom Widget Collection.</source>
<translation>Opretter et Qt brugerdefineret Designer-widget eller en brugerdefineret widget-samling.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWizardDialog</name>
<message>
<source>This wizard generates a Qt Designer Custom Widget or a Qt Designer Custom Widget Collection project.</source>
<translation>Denne assistent genererer en Qt Designer brugerdefineret widget eller et Qt Designer brugerdefineret widget-samling-projekt.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DesignerExternalEditor</name>
<message>
<source>Qt Designer is not responding (%1).</source>
<translation>Qt Designer svarer ikke (%1).</translation>
@@ -29436,16 +29235,10 @@ Opdater venligst dit kit eller vælg en mkspec for qmake som matcher dit mål-mi
<source>Unable to create server socket: %1</source>
<translation>Kunne ikke oprette server-socket: %1</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DesktopQmakeRunConfiguration</name>
<message>
<source>Qt Run Configuration</source>
<translation>Qt kør-konfiguration</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DetailsPage</name>
<message>
<source>Details</source>
<translation>Detaljer</translation>
@@ -29482,9 +29275,6 @@ Opdater venligst dit kit eller vælg en mkspec for qmake som matcher dit mål-mi
<source>Specify the package to link to</source>
<translation>Angiv pakken som der skal linkes til</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ExternalQtEditor</name>
<message>
<source>Unable to start &quot;%1&quot;</source>
<translation>Kunne ikke starte &quot;%1&quot;</translation>
@@ -29493,9 +29283,6 @@ Opdater venligst dit kit eller vælg en mkspec for qmake som matcher dit mål-mi
<source>The application &quot;%1&quot; could not be found.</source>
<translation>Programmet &quot;%1&quot; kunne ikke findes.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::FilesPage</name>
<message>
<source>Class Information</source>
<translation>Klasseinformation</translation>
@@ -29504,20 +29291,10 @@ Opdater venligst dit kit eller vælg en mkspec for qmake som matcher dit mål-mi
<source>Specify basic information about the classes for which you want to generate skeleton source code files.</source>
<translation>Angiv grundlæggende information om klasserne for hvilke du vil generere skelet kildekode-fil.</translation>
</message>
<message>
<source>Details</source>
<translation>Detaljer</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::FilesSelectionWizardPage</name>
<message>
<source>Files</source>
<translation>Filer</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::GuiAppWizard</name>
<message>
<source>Qt Widgets Application</source>
<translation>Qt widgets-program</translation>
@@ -29530,16 +29307,10 @@ Preselects a desktop Qt for building the application if available.</source>
Prævælger en desktop Qt til bygning af programmet, hvis tilgængeligt.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::GuiAppWizardDialog</name>
<message>
<source>This wizard generates a Qt Widgets Application project. The application derives by default from QApplication and includes an empty widget.</source>
<translation>Denne assistent genererer et Qt Widgets-programprojekt. Programmet stammer som standard fra QApplication og inkluderer en tom widget.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryDetailsController</name>
<message>
<source>Linkage:</source>
<translation>Linkning:</translation>
@@ -29564,9 +29335,6 @@ Prævælger en desktop Qt til bygning af programmet, hvis tilgængeligt.</transl
<source>%1 Library</source>
<translation>%1 bibliotek</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryDetailsWidget</name>
<message>
<source>Library:</source>
<translation>Bibliotek:</translation>
@@ -29599,10 +29367,6 @@ Prævælger en desktop Qt til bygning af programmet, hvis tilgængeligt.</transl
<source>Windows</source>
<translation>Windows</translation>
</message>
<message>
<source>Linkage:</source>
<translation>Linkning:</translation>
</message>
<message>
<source>Dynamic</source>
<translation>Dynamisk</translation>
@@ -29611,10 +29375,6 @@ Prævælger en desktop Qt til bygning af programmet, hvis tilgængeligt.</transl
<source>Static</source>
<translation>Statisk</translation>
</message>
<message>
<source>Mac:</source>
<translation>Mac:</translation>
</message>
<message>
<source>Library</source>
<translation>Bibliotek</translation>
@@ -29639,9 +29399,6 @@ Prævælger en desktop Qt til bygning af programmet, hvis tilgængeligt.</transl
<source>Remove &quot;d&quot; suffix for release version</source>
<translation>Fjern &quot;d&quot;-suffiks for udgiv-version</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryTypePage</name>
<message>
<source>Library Type</source>
<translation>Bibliotekstype</translation>
@@ -29692,9 +29449,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>Type</source>
<translation>Type</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryWizard</name>
<message>
<source>C++ Library</source>
<translation>C++-bibliotek</translation>
@@ -29703,9 +29457,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>Creates a C++ library based on qmake. This can be used to create:&lt;ul&gt;&lt;li&gt;a shared C++ library for use with &lt;tt&gt;QPluginLoader&lt;/tt&gt; and runtime (Plugins)&lt;/li&gt;&lt;li&gt;a shared or static C++ library for use with another project at linktime&lt;/li&gt;&lt;/ul&gt;</source>
<translation>Opretter et C++-bibliotek baseret på qmake. Dette kan bruges til at oprette:&lt;ul&gt;&lt;li&gt;et delt C++-bibliotek til brug sammen med &lt;tt&gt;QPluginLoader&lt;/tt&gt; og runtime (plugins)&lt;/li&gt;&lt;li&gt;et delt eller statisk C++-bibliotek til brug sammen med et andet projekt ved linktime&lt;/li&gt;&lt;/ul&gt;</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryWizardDialog</name>
<message>
<source>Shared Library</source>
<translation>Delt bibliotek</translation>
@@ -29718,21 +29469,10 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>Qt Plugin</source>
<translation>Qt-plugin</translation>
</message>
<message>
<source>Type</source>
<translation>Type</translation>
</message>
<message>
<source>This wizard generates a C++ Library project.</source>
<translation>Denne assistent genererer et C++-bibliotek-projekt.</translation>
</message>
<message>
<source>Details</source>
<translation>Detaljer</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::MakeStep</name>
<message>
<source>Override %1:</source>
<translation>Tilsidesæt %1:</translation>
@@ -29741,16 +29481,10 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>Make arguments:</source>
<translation>Make-argumenter:</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::MakeStepFactory</name>
<message>
<source>Make</source>
<translation>Make</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ModulesPage</name>
<message>
<source>Select Required Modules</source>
<translation>Vælg krævet moduler</translation>
@@ -29763,28 +29497,14 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>Modules</source>
<translation>Moduler</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::PluginGenerator</name>
<message>
<source>Creating multiple widget libraries (%1, %2) in one project (%3) is not supported.</source>
<translation>Oprettelse af flere widget-biblioteker (%1, %2) i et projekt (%3) understøttes ikke.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QMakeStep</name>
<message>
<source>qmake build configuration:</source>
<translation>qmake-byggekonfiguration:</translation>
</message>
<message>
<source>Debug</source>
<translation>Fejlretning</translation>
</message>
<message>
<source>Release</source>
<translation>Udgivelse</translation>
</message>
<message>
<source>Additional arguments:</source>
<translation>Yderligere argumenter:</translation>
@@ -29805,16 +29525,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>Effective qmake call:</source>
<translation>Virkende qmake kald:</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QMakeStepFactory</name>
<message>
<source>qmake</source>
<translation>qmake</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeKitConfigWidget</name>
<message>
<source>Qt mkspec:</source>
<translation>Qt mkspec:</translation>
@@ -29823,9 +29533,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>The mkspec to use when building the project with qmake.&lt;br&gt;This setting is ignored when using other build systems.</source>
<translation>Mkspec som skal bruges når projektet bygges med qmake.&lt;br&gt;Denne indstilling ignoreres når der bruges andre byggesystemer.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectConfigWidget</name>
<message>
<source>Shadow build:</source>
<translation>Skygge-byg:</translation>
@@ -29872,20 +29579,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<comment>%1 error message, %2 build directory</comment>
<translation>%1 Byggen i %2 overskrives.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectImporter</name>
<message>
<source>Debug</source>
<translation>Fejlret</translation>
</message>
<message>
<source>Release</source>
<translation>Udgiv</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectManagerPlugin</name>
<message>
<source>Build</source>
<translation>Byg</translation>
@@ -29946,9 +29639,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>Add Library...</source>
<translation>Tilføj bibliotek...</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::Qt4Target</name>
<message>
<source>Desktop</source>
<comment>Qt4 Desktop target display name</comment>
@@ -29964,9 +29654,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<comment>Qt4 Maemo Device target display name</comment>
<translation>Maemo-enhed</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SimpleProjectWizard</name>
<message>
<source>Import as qmake Project (Limited Functionality)</source>
<translation>Importér som qmake-projekt (begrænset funktionalitet)</translation>
@@ -29975,9 +29662,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>Imports existing projects that do not use qmake, CMake or Autotools.&lt;p&gt;This creates a qmake .pro file that allows you to use %1 as a code editor and as a launcher for debugging and analyzing tools. If you want to build the project, you might need to edit the generated .pro file.</source>
<translation>Importerer eksisterende projekter som ikke bruger qmake, CMake eller Autotools.&lt;p&gt;Dette opretter en qmake .pro-fil der giver dig mulighed for at bruge %1 som en koderedigering og som en starter til fejlretnings- of analyseringsværktøjer. Hvis du vil bygge projektet, så kan det være du skal redigere den genererede .pro-fil.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SimpleProjectWizardDialog</name>
<message>
<source>Import Existing Project</source>
<translation>Importér eksisterende projekt</translation>
@@ -29998,9 +29682,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>File Selection</source>
<translation>Valg af fil</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SubdirsProjectWizard</name>
<message>
<source>Subdirs Project</source>
<translation>Undermapper-projekt</translation>
@@ -30022,16 +29703,10 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<comment>Title of dialog</comment>
<translation>Nyt underprojekt</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SubdirsProjectWizardDialog</name>
<message>
<source>This wizard generates a Qt Subdirs project. Add subprojects to it later on by using the other wizards.</source>
<translation>Denne assistent genererer et Qt undermapper-projekt. Tilføj underprojekter til det senere ved at bruge de andre assistenter.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SummaryPage</name>
<message>
<source>Summary</source>
<translation>Opsummering</translation>
@@ -30040,9 +29715,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>The following snippet will be added to the&lt;br&gt;&lt;b&gt;%1&lt;/b&gt; file:</source>
<translation>Følgende snippet skal tilføjes til &lt;br&gt;&lt;b&gt;%1&lt;/b&gt;-filen:</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::MakeStep</name>
<message>
<source>Make</source>
<comment>Qt MakeStep display name.</comment>
@@ -30052,13 +29724,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>Cannot find Makefile. Check your build settings.</source>
<translation>Kan ikke finde Makefile. Tjek dine bygindstillinger.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::MakeStepConfigWidget</name>
<message>
<source>Override %1:</source>
<translation>Tilsidesæt %1:</translation>
</message>
<message>
<source>Make:</source>
<translation>Make:</translation>
@@ -30075,9 +29740,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>&lt;b&gt;Make:&lt;/b&gt; %1 not found in the environment.</source>
<translation>&lt;b&gt;Make:&lt;/b&gt; %1 ikke fundet i miljøet.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QMakeStep</name>
<message>
<source>qmake</source>
<extracomment>QMakeStep default display name</extracomment>
@@ -30103,9 +29765,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>&lt;no Make step found&gt;</source>
<translation>&lt;intet Make-trin fundet&gt;</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QMakeStepConfigWidget</name>
<message>
<source>QML Debugging</source>
<translation>QML-fejlretning</translation>
@@ -30142,9 +29801,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>Disables QML debugging. QML profiling will still work.</source>
<translation>Deaktiverer QML-fejlretning. QML-profilering vil stadig virke.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeBuildConfiguration</name>
<message>
<source>Could not parse Makefile.</source>
<translation>Kunne ikke parse Makefile.</translation>
@@ -30169,9 +29825,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>Parsing the .pro file</source>
<translation>Parser .pro-fil</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeBuildConfigurationFactory</name>
<message>
<source>Release</source>
<extracomment>The name of the release build configuration created by default for a qmake project.</extracomment>
@@ -30205,9 +29858,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<extracomment>Non-ASCII characters in directory suffix may cause build issues.</extracomment>
<translation>Profile</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeKitInformation</name>
<message>
<source>No Qt version set, so mkspec is ignored.</source>
<translation>Ingen Qt version sat, så mkspec ignoreres.</translation>
@@ -30224,16 +29874,10 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>Mkspec configured for qmake by the Kit.</source>
<translation>Mkspec konfigureret for qmake af kittet.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeManager</name>
<message>
<source>QMake</source>
<translation>QMake</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakePriFile</name>
<message>
<source>Headers</source>
<translation>Headere</translation>
@@ -30262,9 +29906,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
<source>Other files</source>
<translation>Andre filer</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeProject</name>
<message>
<source>Reading Project &quot;%1&quot;</source>
<translation>Læser projektet &quot;%1&quot;</translation>
@@ -30292,7 +29933,7 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro-
</message>
</context>
<context>
<name>QmakeProjectManager::QtVersion</name>
<name>QmakeProjectManager</name>
<message>
<source>The build directory needs to be at the same level as the source directory.</source>
<translation>Bygmappen skal være på samme niveau som kildemappen.</translation>
@@ -43065,7 +42706,7 @@ skal være et repository krævet SSH-autentifikation (se dokumentation på SSH o
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingForm</name>
<name>CMakeProjectManager</name>
<message>
<source>Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects.</source>
<translation>Beslutter om filstier kopieres til udklipsholderen til indsættelse i CMakeLists.txt-filen, når du tilføjer nye filer til CMake-projekter.</translation>
@@ -43701,11 +43342,7 @@ Kopiér stien til kildefilerne til udklipsholderen?</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingsPage</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<name>CMakeProjectManager</name>
</context>
<context>
<name>Core::HelpManager</name>

245
share/qtcreator/translations/qtcreator_de.ts
View File

@@ -197,7 +197,7 @@
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<name>CMakeProjectManager</name>
<message>
<source>Filter</source>
<translation>Filter</translation>
@@ -13548,7 +13548,7 @@ Lokale Pull-Operationen werden nicht auf den Master-Branch angewandt.</translati
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeManager</name>
<name>CMakeProjectManager</name>
<message>
<source>Run CMake</source>
<translation>CMake ausführen</translation>
@@ -17448,7 +17448,7 @@ Diese Präfixe werden zusätzlich zum Dateinamen beim Wechseln zwischen Header-
</message>
</context>
<context>
<name>QmakeProjectManager::QMakeStep</name>
<name>QmakeProjectManager</name>
<message>
<source>qmake</source>
<extracomment>QMakeStep default display name</extracomment>
@@ -20170,7 +20170,7 @@ hinzufügen, um dem QML-Editor den wahrscheinlichen URI mitzuteilen.</translatio
</message>
</context>
<context>
<name>ClearCase::Internal::CheckOutDialog</name>
<name>ClearCase</name>
<message>
<source>Check Out</source>
<translation>Check Out</translation>
@@ -20196,9 +20196,6 @@ hinzufügen, um dem QML-Editor den wahrscheinlichen URI mitzuteilen.</translatio
<source>&amp;Checkout comment:</source>
<translation>&amp;Checkout-Kommentar:</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::SettingsPage</name>
<message>
<source>Configuration</source>
<translation>Konfiguration</translation>
@@ -20276,9 +20273,6 @@ hinzufügen, um dem QML-Editor den wahrscheinlichen URI mitzuteilen.</translatio
<source>Do &amp;not prompt for comment during checkout or check-in</source>
<translation>Beim Check-in oder Check-out &amp;nicht nach Kommentaren fragen</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::UndoCheckOut</name>
<message>
<source>Dialog</source>
<translation>Dialog</translation>
@@ -20291,9 +20285,6 @@ hinzufügen, um dem QML-Editor den wahrscheinlichen URI mitzuteilen.</translatio
<source>The file was changed.</source>
<translation>Die Datei wurde geändert.</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::VersionSelector</name>
<message>
<source>Confirm Version to Check Out</source>
<translation>Bestätigung der Check-Out-Version</translation>
@@ -20353,7 +20344,7 @@ hinzufügen, um dem QML-Editor den wahrscheinlichen URI mitzuteilen.</translatio
</message>
</context>
<context>
<name>ClearCase::Internal::ActivitySelector</name>
<name>ClearCase</name>
<message>
<source>Select &amp;activity:</source>
<translation>Aktivität &amp;auswählen:</translation>
@@ -20366,31 +20357,18 @@ hinzufügen, um dem QML-Editor den wahrscheinlichen URI mitzuteilen.</translatio
<source>Keep item activity</source>
<translation>Aktivität des Elements beibehalten</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseSubmitEditor</name>
<message>
<source>ClearCase Check In</source>
<translation>ClearCase Einchecken</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseSubmitEditorWidget</name>
<message>
<source>Chec&amp;k in even if identical to previous version</source>
<translation>Einchec&amp;ken auch wenn zur Vorgängerversion identisch</translation>
</message>
<message>
<source>&amp;Preserve file modification time</source>
<translation>Änderungsdatum von D&amp;ateien beibehalten</translation>
</message>
<message>
<source>&amp;Check In</source>
<translation>&amp;Einchecken</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::SettingsPageWidget</name>
<message>
<source>ClearCase Command</source>
<translation>ClearCase-Befehl</translation>
@@ -24892,7 +24870,7 @@ das beim Drücken unter dem Zeiger oder Berührungspunkt war, unter diesem Punkt
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ClassDefinition</name>
<name>QmakeProjectManager</name>
<message>
<source>The header file</source>
<translation>Header-Datei</translation>
@@ -24993,9 +24971,6 @@ das beim Drücken unter dem Zeiger oder Berührungspunkt war, unter diesem Punkt
<source>Icon files (*.png *.ico *.jpg *.xpm *.tif *.svg)</source>
<translation>Symboldateien (*.png *.ico *.jpg *.xpm *.tif *.svg)</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetPluginWizardPage</name>
<message>
<source>WizardPage</source>
<translation>WizardPage</translation>
@@ -25036,9 +25011,6 @@ das beim Drücken unter dem Zeiger oder Berührungspunkt war, unter diesem Punkt
<source>Plugin Details</source>
<translation>Plugin-Details</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWidgetsWizardPage</name>
<message>
<source>Custom Qt Widget Wizard</source>
<translation>Assistent zur Erstellung benutzerdefinierter Qt-Widgets</translation>
@@ -25063,9 +25035,6 @@ das beim Drücken unter dem Zeiger oder Berührungspunkt war, unter diesem Punkt
<source>Custom Widgets</source>
<translation>Benutzerdefinierte Widgets</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryDetailsWidget</name>
<message>
<source>Library:</source>
<translation>Bibliothek:</translation>
@@ -25205,14 +25174,11 @@ das beim Drücken unter dem Zeiger oder Berührungspunkt war, unter diesem Punkt
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::AddLibraryWizard</name>
<name>QmakeProjectManager</name>
<message>
<source>Add Library</source>
<translation>Bibliothek hinzufügen</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryTypePage</name>
<message>
<source>Library Type</source>
<translation>Typ der Bibliothek</translation>
@@ -25263,9 +25229,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<source>Type</source>
<translation>Typ</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DetailsPage</name>
<message>
<source>Details</source>
<translation>Details</translation>
@@ -25302,9 +25265,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<source>Specify the package to link to</source>
<translation>Geben Sie das zu bindende Paket an</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SummaryPage</name>
<message>
<source>Summary</source>
<translation>Zusammenfassung</translation>
@@ -25313,9 +25273,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<source>The following snippet will be added to the&lt;br&gt;&lt;b&gt;%1&lt;/b&gt; file:</source>
<translation>Die folgende Angabe wird in die Datei &lt;br&gt;&lt;b&gt;%1&lt;/b&gt; eingefügt:</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ClassList</name>
<message>
<source>&lt;New class&gt;</source>
<translation>&lt;Neue Klasse&gt;</translation>
@@ -25328,9 +25285,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<source>Delete class %1 from list?</source>
<translation>Soll die Klasse %1 aus der Liste gelöscht werden?</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWizard</name>
<message>
<source>Qt Custom Designer Widget</source>
<translation>Benutzerdefiniertes Widget für Qt Designer</translation>
@@ -25339,23 +25293,14 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<source>Creates a Qt Custom Designer Widget or a Custom Widget Collection.</source>
<translation>Erstellt ein oder mehrere benutzerdefinierte Widgets für Qt Designer.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWizardDialog</name>
<message>
<source>This wizard generates a Qt Designer Custom Widget or a Qt Designer Custom Widget Collection project.</source>
<translation>Dieser Assistent erstellt ein Projekt mit einem oder mehreren benutzerdefinierten Widgets für Qt Designer.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::PluginGenerator</name>
<message>
<source>Creating multiple widget libraries (%1, %2) in one project (%3) is not supported.</source>
<translation>Die Erzeugung von mehreren Bibliotheken (%1, %2) in einem Projekt (%3) wird nicht unterstützt.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ExternalQtEditor</name>
<message>
<source>Unable to start &quot;%1&quot;</source>
<translation>&quot;%1&quot; kann nicht gestartet werden</translation>
@@ -25364,9 +25309,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<source>The application &quot;%1&quot; could not be found.</source>
<translation>Die Anwendung &quot;%1&quot; konnte nicht gefunden werden.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DesignerExternalEditor</name>
<message>
<source>Qt Designer is not responding (%1).</source>
<translation>Qt Designer antwortet nicht (%1).</translation>
@@ -25375,13 +25317,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<source>Unable to create server socket: %1</source>
<translation>Der Server-Socket konnte nicht erzeugt werden: %1</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryDetailsController</name>
<message>
<source>Linkage:</source>
<translation>Linken:</translation>
</message>
<message>
<source>%1 Dynamic</source>
<translation>%1 dynamisch</translation>
@@ -25390,10 +25325,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<source>%1 Static</source>
<translation>%1 statisch</translation>
</message>
<message>
<source>Mac:</source>
<translation>Mac:</translation>
</message>
<message>
<source>%1 Framework</source>
<translation>%1 Framework</translation>
@@ -25402,9 +25333,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<source>%1 Library</source>
<translation>%1 Bibliothek</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectImporter</name>
<message>
<source>Debug</source>
<translation>Debug</translation>
@@ -25413,9 +25341,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<source>Release</source>
<translation>Release</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QMakeStepConfigWidget</name>
<message>
<source>QML Debugging</source>
<translation>QML-Debuggen</translation>
@@ -25424,14 +25349,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<source>qmake build configuration:</source>
<translation>qmake Build-Konfiguration:</translation>
</message>
<message>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
<source>Release</source>
<translation>Release</translation>
</message>
<message>
<source>Additional arguments:</source>
<translation>Zusätzliche Argumente:</translation>
@@ -25464,9 +25381,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<source>&lt;b&gt;qmake:&lt;/b&gt; %1 %2</source>
<translation>&lt;b&gt;qmake:&lt;/b&gt; %1 %2</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SubdirsProjectWizard</name>
<message>
<source>Subdirs Project</source>
<translation>Subdirs-Projekt</translation>
@@ -25488,9 +25402,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<comment>Title of dialog</comment>
<translation>Neues Teilprojekt</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SubdirsProjectWizardDialog</name>
<message>
<source>This wizard generates a Qt Subdirs project. Add subprojects to it later on by using the other wizards.</source>
<translation>Dieser Assistent erstellt ein Qt-Projekt vom Typ subdirs. Unterprojekte können später mit anderen Assistenten hinzugefügt werden.</translation>
@@ -25626,7 +25537,7 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeBuildConfiguration</name>
<name>QmakeProjectManager</name>
<message>
<source>General</source>
<translation>Allgemein</translation>
@@ -25694,9 +25605,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<extracomment>Non-ASCII characters in directory suffix may cause build issues.</extracomment>
<translation>Profile</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeProject</name>
<message>
<source>No Qt version set in kit.</source>
<translation>Im Kit ist keine Qt-Version gesetzt.</translation>
@@ -25713,9 +25621,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<source>Project is part of Qt sources that do not match the Qt defined in the kit.</source>
<translation>Das Projekt ist Teil von Qt-Quellen, die nicht zum im Kit definierten Qt passen.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectManagerPlugin</name>
<message>
<source>Build</source>
<translation>Erstellen</translation>
@@ -28312,7 +28217,7 @@ Der vom Kit mindestens benötigte API-Level ist %1.</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseEditorWidget</name>
<name>ClearCase</name>
<message>
<source>Annotate version &quot;%1&quot;</source>
<translation>Annotation für Version &quot;%1&quot;</translation>
@@ -31994,7 +31899,7 @@ Senden selbst auch Zeit benötigt.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeProject</name>
<name>CMakeProjectManager</name>
<message>
<source>No cmake tool set.</source>
<translation>Keine CMake Anwendung konfiguriert.</translation>
@@ -32003,9 +31908,6 @@ Senden selbst auch Zeit benötigt.</translation>
<source>No compilers set in kit.</source>
<translation>Im Kit sind keine Compiler eingerichtet.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeSettingsPage</name>
<message>
<source>Version: %1&lt;br&gt;Supports fileApi: %2</source>
<translation>Version: %1&lt;br&gt;Unterstützt fileApi: %2</translation>
@@ -32070,9 +31972,6 @@ Senden selbst auch Zeit benötigt.</translation>
<source>Help file:</source>
<translation>Hilfedatei:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeToolConfigWidget</name>
<message>
<source>Add</source>
<translation>Hinzufügen</translation>
@@ -32101,21 +32000,10 @@ Senden selbst auch Zeit benötigt.</translation>
<source>New CMake</source>
<translation>Neues CMake</translation>
</message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeToolManager</name>
<message>
<source>System CMake at %1</source>
<translation>System-CMake in %1</translation>
</message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>Core::BaseFileWizard</name>
@@ -35018,7 +34906,7 @@ Dies könnte Probleme während der Ausführung verursachen.
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStep</name>
<name>CMakeProjectManager</name>
<message>
<source>CMake Build</source>
<extracomment>Default display name for the cmake make step.</extracomment>
@@ -35053,9 +34941,6 @@ Dies könnte Probleme während der Ausführung verursachen.
<comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment>
<translation>Erstellen</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepConfigWidget</name>
<message>
<source>CMake arguments:</source>
<translation>Kommandozeilenargumente für CMake:</translation>
@@ -35073,9 +34958,6 @@ Dies könnte Probleme während der Ausführung verursachen.
<comment>CMakeProjectManager::CMakeBuildStepConfigWidget display name.</comment>
<translation>Build</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::ConfigModel</name>
<message>
<source>Key</source>
<translation>Schlüssel</translation>
@@ -35088,10 +34970,6 @@ Dies könnte Probleme während der Ausführung verursachen.
<source>Current kit: %1</source>
<translation>Aktuelles Kit: %1</translation>
</message>
<message>
<source>&lt;UNSET&gt;</source>
<translation>&lt;UNGESETZT&gt;</translation>
</message>
<message>
<source>Value</source>
<translation>Wert</translation>
@@ -36176,7 +36054,7 @@ Siehe auch die Einstellungen für Google Test.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfiguration</name>
<name>CMakeProjectManager</name>
<message>
<source>Changing Build Directory</source>
<translation>Build-Verzeichnis ändern</translation>
@@ -37772,7 +37650,7 @@ Fehler: %5</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigItem</name>
<name>CMakeProjectManager</name>
<message>
<source>Failed to open %1 for reading.</source>
<translation>Die Datei %1 konnte nicht zum Lesen geöffnet werden.</translation>
@@ -37801,23 +37679,16 @@ Fehler: %5</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeProjectPlugin</name>
<name>CMakeProjectManager</name>
<message>
<source>CMake</source>
<comment>SnippetProvider</comment>
<translation>CMake</translation>
</message>
<message>
<source>Build</source>
<translation>Erstellen</translation>
</message>
<message>
<source>Build &quot;%1&quot;</source>
<translation>&quot;%1&quot; erstellen</translation>
</message>
</context>
<context>
<name>CMakeProjectManager</name>
<message>
<source>Current CMake: %1</source>
<translation>Aktuelles CMake: %1</translation>
@@ -38504,7 +38375,7 @@ Ablaufdatum: %3</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakePriFile</name>
<name>QmakeProjectManager</name>
<message>
<source>Headers</source>
<translation>Header-Dateien</translation>
@@ -38537,9 +38408,6 @@ Ablaufdatum: %3</translation>
<source>Generated Files</source>
<translation>Erzeugte Dateien</translation>
</message>
</context>
<context>
<name>QmakePriFile</name>
<message>
<source>Failed</source>
<translation>Fehlgeschlagen</translation>
@@ -38552,9 +38420,6 @@ Ablaufdatum: %3</translation>
<source>File Error</source>
<translation>Dateifehler</translation>
</message>
</context>
<context>
<name>QmakeProFile</name>
<message>
<source>Error while parsing file %1. Giving up.</source>
<translation>Fehler beim Auswerten der Datei %1. Abbruch.</translation>
@@ -38563,9 +38428,6 @@ Ablaufdatum: %3</translation>
<source>Could not find .pro file for subdirectory &quot;%1&quot; in &quot;%2&quot;.</source>
<translation>Die .pro-Datei des Unterverzeichnisses &quot;%1&quot; konnte in &quot;%2&quot; nicht gefunden werden.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager</name>
<message>
<source>&quot;%1&quot; is used by qmake, but &quot;%2&quot; is configured in the kit.
Please update your kit (%3) or choose a mkspec for qmake that matches your target environment better.</source>
@@ -40456,7 +40318,7 @@ Breche ausstehende Operationen ab...
</message>
</context>
<context>
<name>CMakeProjectManager::ConfigModelItemDelegate</name>
<name>CMakeProjectManager</name>
<message>
<source>Select a file for %1</source>
<translation>Wählen Sie eine Datei für %1</translation>
@@ -40974,7 +40836,7 @@ Breche ausstehende Operationen ab...
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingForm</name>
<name>CMakeProjectManager</name>
<message>
<source>Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects.</source>
<translation>Legt fest, ob beim Hinzufügen von neuen Dateien zu CMake-Projekten deren Dateipfade in die Zwischenablage kopiert werden, um sie in die CMakeLists.txt-Datei einzufügen.</translation>
@@ -42575,7 +42437,7 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeMakeStep</name>
<name>QmakeProjectManager</name>
<message>
<source>Cannot find Makefile. Check your build settings.</source>
<translation>Die Makefile-Datei konnte nicht gefunden werden. Bitte überprüfen Sie die Einstellungen zur Erstellung.</translation>
@@ -45611,7 +45473,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCasePluginPrivate</name>
<name>ClearCase</name>
<message>
<source>Editing Derived Object: %1</source>
<translation>Bearbeite abgeleitetes Objekt: %1</translation>
@@ -45890,7 +45752,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSystem</name>
<name>CMakeProjectManager</name>
<message>
<source>Scan &quot;%1&quot; project tree</source>
<translation>Durchsuche &quot;%1&quot;-Projektbaum</translation>
@@ -45915,16 +45777,10 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>CMakeCache.txt file not found.</source>
<translation>Datei CMakeCache.txt nicht gefunden.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeKitAspect</name>
<message>
<source>&lt;No CMake Tool available&gt;</source>
<translation>&lt;Kein CMake-Werkzeug verfügbar&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeKitAspect</name>
<message>
<source>CMake Tool</source>
<translation>CMake-Werkzeug</translation>
@@ -45933,10 +45789,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>The CMake Tool to use when building a project with CMake.&lt;br&gt;This setting is ignored when using other build systems.</source>
<translation>Das zum Erstellen eines Projektes mit CMake zu verwendende CMake-Werkzeug.&lt;br&gt;Diese Einstellung wird bei der Verwendung anderer Build-Systeme ignoriert.</translation>
</message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message>
<source>Unconfigured</source>
<translation>Nicht konfiguriert</translation>
@@ -45945,9 +45797,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>Path to the cmake executable</source>
<translation>Pfad zur ausführbaren Datei von cmake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeGeneratorKitAspect</name>
<message>
<source>Change...</source>
<translation>Ändern...</translation>
@@ -45980,9 +45829,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>Toolset:</source>
<translation>Toolset:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeGeneratorKitAspect</name>
<message>
<source>CMake generator</source>
<translation>CMake-Generator</translation>
@@ -46023,17 +45869,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>Toolset: %1</source>
<translation>Toolset: %1</translation>
</message>
<message>
<source>CMake Generator</source>
<translation>CMake-Generator</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeConfigurationKitAspect</name>
<message>
<source>Change...</source>
<translation>Ändern...</translation>
</message>
<message>
<source>Edit CMake Configuration</source>
<translation>CMake-Konfiguration bearbeiten</translation>
@@ -46042,9 +45877,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source>
<translation>Eine Variable pro Zeile eingeben, Name und Wert durch &quot;=&quot; trennen.&lt;br&gt;Ein Typhinweis kann mit &quot;:TYPE&quot; vor dem &quot;=&quot; angegeben werden.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigurationKitAspect</name>
<message>
<source>CMake Configuration</source>
<translation>CMake-Konfiguration</translation>
@@ -46093,23 +45925,14 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>CMake configuration has a path to a C++ compiler set that does not match the compiler path configured in the tool chain of the kit.</source>
<translation>Die CMake-Konfiguration hat einen C++-Compiler gesetzt, der nicht mit dem Compiler der Toolchain übereinstimmt, die vom Kit verwendet wird.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::BuildCMakeTargetLocatorFilter</name>
<message>
<source>Build CMake target</source>
<translation>CMake-Ziel erstellen</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::OpenCMakeTargetLocatorFilter</name>
<message>
<source>Open CMake target</source>
<translation>CMake-Ziel öffnen</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeProcess</name>
<message>
<source>Running %1 in %2.</source>
<translation>Führe %1 in %2 aus.</translation>
@@ -46118,16 +45941,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>Configuring &quot;%1&quot;</source>
<translation>Konfiguriere &quot;%1&quot;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingWidget</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::FileApi</name>
<message>
<source>&lt;Build Directory&gt;</source>
<translation>&lt;Build-Verzeichnis&gt;</translation>
@@ -47800,7 +47613,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeKitAspect</name>
<name>QmakeProjectManager</name>
<message>
<source>Qt mkspec</source>
<translation>Qt-mkspec</translation>
@@ -47821,9 +47634,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>mkspec</source>
<translation>mkspec</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeBuildSystem</name>
<message>
<source>Reading Project &quot;%1&quot;</source>
<translation>Lese Projekt &quot;%1&quot;</translation>
@@ -48970,22 +48780,11 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::FileApiReader</name>
<name>CMakeProjectManager</name>
<message>
<source>Parsing has been canceled.</source>
<translation>Auswertung wurde abgebrochen.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::ProjectTreeHelper</name>
<message>
<source>&lt;Build Directory&gt;</source>
<translation>&lt;Build-Verzeichnis&gt;</translation>
</message>
<message>
<source>&lt;Other Locations&gt;</source>
<translation>&lt;Andere Orte&gt;</translation>
</message>
<message>
<source>&lt;Headers&gt;</source>
<translation>&lt;Header-Dateien&gt;</translation>

234
share/qtcreator/translations/qtcreator_es.ts
View File

@@ -271,7 +271,7 @@
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildEnvironmentWidget</name>
<name>CMakeProjectManager</name>
<message>
<source>Clear system environment</source>
<translation type="unfinished"></translation>
@@ -280,9 +280,6 @@
<source>Build Environment</source>
<translation>Entorno de construcción</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name>
<message>
<source>Create</source>
<translation type="unfinished"></translation>
@@ -295,23 +292,14 @@
<source>New Configuration Name:</source>
<translation type="unfinished">Nombre para nueva configuración:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
<source>&amp;Change</source>
<translation>&amp;Cambiar</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
<message>
<source>CMake Wizard</source>
<translation>Asistente CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfigurationWidget</name>
<message>
<source>Arguments:</source>
<translation>Argumentos:</translation>
@@ -356,9 +344,6 @@
<source>Base environment for this runconfiguration:</source>
<translation type="unfinished">Entorno base para éste ajuste de ejecución:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
<message>
<source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; 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 type="unfinished"></translation>
@@ -368,9 +353,6 @@
<translatorcomment>shadow build ¿? en la sombra?</translatorcomment>
<translation type="obsolete">Qt Creator ha detectado un entorno de construcción entremezclado con las fuentes, lo que impide la construcción en un directorio separado. Qt Creator no le permitirá alterar el directorio de construcción. Si quiere construir en un directorio separado, limpie el directorio de los fuentes y abra nuevamente el proyecto.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunPage</name>
<message>
<source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
<translation type="unfinished"></translation>
@@ -431,9 +413,6 @@
<source>No valid cmake executable specified.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
<source>CMake</source>
<translation></translation>
@@ -442,9 +421,6 @@
<source>CMake executable</source>
<translation>Ejecutable CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message>
<source>Additional arguments:</source>
<translation>Argumentos adicionales:</translation>
@@ -457,9 +433,6 @@
<source>&lt;b&gt;Make:&lt;/b&gt; %1 %2</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::ShadowBuildPage</name>
<message>
<source>Please enter the directory in which you want to build your project. </source>
<translation>Por favor, ingrese el directorio en el que quiere construir el proyecto.</translation>
@@ -472,9 +445,6 @@
<source>Build directory:</source>
<translation>Directorio de construcción:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::XmlFileUpToDatePage</name>
<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="obsolete">Qt Creator ha encontrado un archivo cbp reciente, el mismo será interpretado para recopilar información acerca del proyecto. Puede cambiar los argumentos de línea de comandos usados para crear este archivo en el proyecto. Responda Finalizar para cargar el proyecto.</translation>
@@ -8150,7 +8120,7 @@ al control de versiones (%2)?</translation>
</message>
</context>
<context>
<name>QMakeStep</name>
<name>QmakeProjectManager</name>
<message>
<source>QMake Build Configuration:</source>
<translation>Ajustes de construcción QMake:</translation>
@@ -8377,7 +8347,7 @@ al control de versiones (%2)?</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ConsoleAppWizard</name>
<name>QmakeProjectManager</name>
<message>
<source>Qt4 Console Application</source>
<translation>Aplicación Qt4 de consola</translation>
@@ -8386,16 +8356,10 @@ al control de versiones (%2)?</translation>
<source>Creates a Qt4 console application.</source>
<translation>Crea una aplicación Qt4 de consola.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ConsoleAppWizardDialog</name>
<message>
<source>This wizard generates a Qt4 console application project. The application derives from QCoreApplication and does not provide a GUI.</source>
<translation>Este asistente genera un proyecto de aplicación Qt4 para consola. La aplicación es derivada de QCoreApplication y no provee interfaz gráfica de usuario.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DesignerExternalEditor</name>
<message>
<source>Qt Designer is not responding (%1).</source>
<translation>Qt Designer no está respondiendo (%1).</translation>
@@ -8404,16 +8368,10 @@ al control de versiones (%2)?</translation>
<source>Unable to create server socket: %1</source>
<translation>No se pudo crear socket de servidor: %1</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::EmbeddedPropertiesPanel</name>
<message>
<source>Embedded Linux</source>
<translation>Linux embebido</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::EmptyProjectWizard</name>
<message>
<source>Empty Qt4 Project</source>
<translation>Proyecto Qt4 vacío</translation>
@@ -8422,16 +8380,10 @@ al control de versiones (%2)?</translation>
<source>Creates an empty Qt project.</source>
<translation>Crea un proyecto Qt vacío.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::EmptyProjectWizardDialog</name>
<message>
<source>This wizard generates an empty Qt4 project. Add files to it later on by using the other wizards.</source>
<translation>Este asistente genera un proyecto Qt4 vacío. Puede agregarle archivos mas tarde mediante otros asistentes.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ExternalQtEditor</name>
<message>
<source>Unable to start &quot;%1&quot;</source>
<translation>Imposible iniciar &quot;%1&quot;</translation>
@@ -8440,9 +8392,6 @@ al control de versiones (%2)?</translation>
<source>The application &quot;%1&quot; could not be found.</source>
<translation>La aplicación &quot;%1&quot; no pudo ser encontrada.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::FilesPage</name>
<message>
<source>Class Information</source>
<translation>Información de la clase</translation>
@@ -8451,9 +8400,6 @@ al control de versiones (%2)?</translation>
<source>Specify basic information about the classes for which you want to generate skeleton source code files.</source>
<translation>Especifique la información básica acerca de las clases para las que quiera generar plantillas de código fuente.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::GuiAppWizard</name>
<message>
<source>Qt4 Gui Application</source>
<translation>Aplicación Qt4 con GUI</translation>
@@ -8466,16 +8412,10 @@ al control de versiones (%2)?</translation>
<source>The template file &apos;%1&apos; could not be opened for reading: %2</source>
<translation>El archivo de plantilla &apos;%1&apos; no pudo ser abierto para lectura: %2</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::GuiAppWizardDialog</name>
<message>
<source>This wizard generates a Qt4 GUI application project. The application derives by default from QApplication and includes an empty widget.</source>
<translation>Este asistente genera un proyecto de aplicación Qt4. La aplicación es derivada de QApplication e incluye un Widget vacío.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryWizard</name>
<message>
<source>C++ Library</source>
<translation>Librería C++</translation>
@@ -8484,9 +8424,6 @@ al control de versiones (%2)?</translation>
<source>Creates a C++ Library.</source>
<translation>Crea una librería C++.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryWizardDialog</name>
<message>
<source>Shared library</source>
<translation>Librería compartida</translation>
@@ -8507,9 +8444,6 @@ al control de versiones (%2)?</translation>
<source>This wizard generates a C++ library project.</source>
<translation>Este asistente genera un proyecto de Librería C++.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ModulesPage</name>
<message>
<source>Select required modules</source>
<translation>Seleccione los módulos requeridos</translation>
@@ -8518,9 +8452,6 @@ al control de versiones (%2)?</translation>
<source>Select the modules you want to include in your project. The recommended modules for this project are selected by default.</source>
<translation>Seleccione los módulos que quiere incluir en su proyecto. Los módulos recomendados para el proyecto aparecen marcados por defecto.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ProEditor</name>
<message>
<source>New</source>
<translation>Nuevo</translation>
@@ -8576,9 +8507,6 @@ al control de versiones (%2)?</translation>
<source>Add Block</source>
<translation>Agregar bloque</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ProEditorModel</name>
<message>
<source>&lt;Global Scope&gt;</source>
<translation>&lt;Alcance global&gt;</translation>
@@ -8615,9 +8543,6 @@ al control de versiones (%2)?</translation>
<source>Insert Item</source>
<translation>Insertar item</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ProjectLoadWizard</name>
<message>
<source>Import existing settings</source>
<translation>Importar ajustes guardados</translation>
@@ -8642,9 +8567,6 @@ al control de versiones (%2)?</translation>
<source>&lt;b&gt;Note:&lt;/b&gt; Importing the settings will automatically add the Qt Version from:&lt;br&gt;&lt;b&gt;%1&lt;/b&gt; to the list of Qt versions.</source>
<translation type="obsolete">&lt;b&gt;Nota:&lt;/b&gt; La importación del ajuste agregará automáticamente la versión de Qt desde:&lt;br&gt;&lt;b&gt;%1&lt;/b&gt; a la lista de versiones de Qt.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeBuildEnvironmentWidget</name>
<message>
<source>Clear system environment</source>
<translation type="unfinished"></translation>
@@ -8653,9 +8575,6 @@ al control de versiones (%2)?</translation>
<source>Build Environment</source>
<translation>Entorno de construcción</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakePriFileNode</name>
<message>
<source>Headers</source>
<translation type="unfinished"></translation>
@@ -8700,20 +8619,10 @@ al control de versiones (%2)?</translation>
<source>Error while changing pro file %1.</source>
<translation>Error modificando el archivo de proyecto %1.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProFileNode</name>
<message>
<source>Error while parsing file %1. Giving up.</source>
<translation>Error interpretando el archivo %1. No se continuará intentando.</translation>
</message>
<message>
<source>Could not find .pro file for sub dir &apos;%1&apos; in &apos;%2&apos;</source>
<translation>No se encontró el archivo .pro para el subdirectorio &apos;%1&apos; en &apos;%2&apos;</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectConfigWidget</name>
<message>
<source>Configuration Name:</source>
<translation>Nombre de configuración:</translation>
@@ -8780,16 +8689,10 @@ al control de versiones (%2)?</translation>
<source>Tool Chain:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectManagerPlugin</name>
<message>
<source>Run qmake</source>
<translation>Ejecutar qmake</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeRunConfiguration</name>
<message>
<source>Qt4RunConfiguration</source>
<translation type="unfinished"></translation>
@@ -8798,9 +8701,6 @@ al control de versiones (%2)?</translation>
<source>Could not parse %1. The Qt4 run configuration %2 can not be started.</source>
<translation>No se pudo interpretar %1. El ajuste de ejecución %2 no puede iniciarse.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeRunConfigurationWidget</name>
<message>
<source>Arguments:</source>
<translation type="unfinished">Argumentos:</translation>
@@ -8821,10 +8721,6 @@ al control de versiones (%2)?</translation>
<source>System Environment</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Build Environment</source>
<translation type="unfinished">Entorno de construcción</translation>
</message>
<message>
<source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2 %3</source>
<translation type="unfinished"></translation>
@@ -8873,9 +8769,6 @@ al control de versiones (%2)?</translation>
<source>Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)</source>
<translation>Usar versión debug de frameworks (DYLD_IMAGE_SUFFIX=_debug)</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QtOptionsPageWidget</name>
<message>
<source>&lt;specify a name&gt;</source>
<translation>&lt;especifique un nombre&gt;</translation>
@@ -8945,9 +8838,6 @@ al control de versiones (%2)?</translation>
<source>Found Qt version %1, using mkspec %2</source>
<translation>Se encontró la version %1 de Qt, usando mkspec %2</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QtVersionManager</name>
<message>
<source>Path:</source>
<translation type="obsolete">Ruta:</translation>
@@ -9043,16 +8933,10 @@ p, li { white-space: pre-wrap; }
<source>MWC Directory:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QtWizard</name>
<message>
<source>The project %1 could not be opened.</source>
<translation>El proyecto %1 no pudo ser abierto.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ValueEditor</name>
<message>
<source>Edit Variable</source>
<translation>Editar variable</translation>
@@ -9122,11 +9006,6 @@ p, li { white-space: pre-wrap; }
<source>New</source>
<translation>Nuevo</translation>
</message>
<message>
<location/>
<source>Remove</source>
<translation>Suprimir</translation>
</message>
<message>
<source>Edit Values</source>
<translation>Editar valores</translation>
@@ -9143,9 +9022,6 @@ p, li { white-space: pre-wrap; }
<source>Edit Advanced Expression</source>
<translation>Editar expresión avanzada</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::MakeStep</name>
<message>
<source>&lt;font color=&quot;#ff0000&quot;&gt;Could not find make command: %1 in the build environment&lt;/font&gt;</source>
<translation>&lt;font color=&quot;#ff0000&quot;&gt;No se encontró el comando make: %1 en el entorno de de construcción&lt;/font&gt;</translation>
@@ -9154,9 +9030,6 @@ p, li { white-space: pre-wrap; }
<source>&lt;font color=&quot;#0000ff&quot;&gt;&lt;b&gt;No Makefile found, assuming project is clean.&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;#0000ff&quot;&gt;&lt;b&gt;No se encontró el archivo Makefile, se asume que el proyecto está limpio.&lt;/b&gt;&lt;/font&gt;</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::MakeStepConfigWidget</name>
<message>
<source>Override %1:</source>
<translation>Redefinir %1:</translation>
@@ -9169,16 +9042,10 @@ p, li { white-space: pre-wrap; }
<source>&lt;b&gt;Make:&lt;/b&gt; %1 %2 in %3</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::MakeStepFactory</name>
<message>
<source>Make</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QMakeStep</name>
<message>
<source>
&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;No valid Qt version set. Set one in Preferences &lt;/b&gt;&lt;/font&gt;
@@ -9199,9 +9066,6 @@ p, li { white-space: pre-wrap; }
<source>&lt;font color=&quot;#0000ff&quot;&gt;Configuration unchanged, skipping QMake step.&lt;/font&gt;</source>
<translation>&lt;font color=&quot;#0000ff&quot;&gt;Configuration intacta, saltando paso QMake.&lt;/font&gt;</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QMakeStepConfigWidget</name>
<message>
<source>&lt;b&gt;QMake:&lt;/b&gt; No Qt version set. QMake can not be run.</source>
<translation type="unfinished"></translation>
@@ -9214,16 +9078,10 @@ p, li { white-space: pre-wrap; }
<source>No valid Qt version set.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QMakeStepFactory</name>
<message>
<source>QMake</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeManager</name>
<message>
<source>Loading project %1 ...</source>
<translation>Cargando el proyecto %1 ...</translation>
@@ -9248,9 +9106,6 @@ p, li { white-space: pre-wrap; }
<source>Done opening project</source>
<translation>Abriendo proyecto: Listo</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QtVersionManager</name>
<message>
<source>&lt;not found&gt;</source>
<translation>&lt;no encontrado&gt;</translation>
@@ -11801,7 +11656,7 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ClassDefinition</name>
<name>QmakeProjectManager</name>
<message>
<source>Form</source>
<translation type="unfinished">Formulario</translation>
@@ -11929,9 +11784,6 @@ p, li { white-space: pre-wrap; }
<source>Icon files (*.png *.ico *.jpg *.xpm *.tif *.svg)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetPluginWizardPage</name>
<message>
<source>WizardPage</source>
<translation type="unfinished"></translation>
@@ -11976,9 +11828,6 @@ p, li { white-space: pre-wrap; }
<source>icons.qrc</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWidgetsWizardPage</name>
<message>
<source>Custom Qt Widget Wizard</source>
<translation type="unfinished"></translation>
@@ -12130,11 +11979,7 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DevicesPreferencePane</name>
<message>
<source>Form</source>
<translation type="unfinished">Formulario</translation>
</message>
<name>QmakeProjectManager</name>
<message>
<location/>
<source>Installed S60 SDKs:</source>
@@ -13193,7 +13038,7 @@ Reason: %2</source>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ClassList</name>
<name>QmakeProjectManager</name>
<message>
<source>&lt;New class&gt;</source>
<translation type="unfinished"></translation>
@@ -13206,9 +13051,6 @@ Reason: %2</source>
<source>Delete class %1 from list?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWizard</name>
<message>
<source>Qt4 Designer Custom Widget</source>
<translation type="unfinished"></translation>
@@ -13217,16 +13059,10 @@ Reason: %2</source>
<source>Creates a Qt4 Designer Custom Widget or a Custom Widget Collection.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWizardDialog</name>
<message>
<source>This wizard generates a Qt4 Designer Custom Widget or a Qt4 Designer Custom Widget Collection project.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::PluginGenerator</name>
<message>
<source>Cannot open icon file %1.</source>
<translation type="unfinished"></translation>
@@ -13248,7 +13084,7 @@ Reason: %2</source>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceRunConfiguration</name>
<name>QmakeProjectManager</name>
<message>
<source>%1 on Device</source>
<translation type="unfinished"></translation>
@@ -13261,13 +13097,6 @@ Reason: %2</source>
<source>Could not parse %1. The QtS60 Device run configuration %2 can not be started.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceRunConfigurationWidget</name>
<message>
<source>Name:</source>
<translation type="unfinished">Nombre:</translation>
</message>
<message>
<source>Install File:</source>
<translation type="unfinished"></translation>
@@ -13296,16 +13125,6 @@ Reason: %2</source>
<source>Key file:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceRunConfigurationFactory</name>
<message>
<source>%1 on Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceRunControlBase</name>
<message>
<source>Creating %1.sisx ...</source>
<translation type="unfinished"></translation>
@@ -13380,9 +13199,6 @@ Check if the phone is connected and the TRK application is running.</source>
<source>An error has occurred while running %1.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceRunControl</name>
<message>
<source>Finished.</source>
<translation type="unfinished"></translation>
@@ -13399,9 +13215,6 @@ Check if the phone is connected and the TRK application is running.</source>
<source>Could not start application: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceDebugRunControl</name>
<message>
<source>Warning: Cannot locate the symbol file belonging to %1.</source>
<translation type="unfinished"></translation>
@@ -13414,16 +13227,10 @@ Check if the phone is connected and the TRK application is running.</source>
<source>Debugging finished.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DevicesWidget</name>
<message>
<source>No Qt installed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60EmulatorRunConfiguration</name>
<message>
<source>%1 in Emulator</source>
<translation type="unfinished"></translation>
@@ -13436,27 +13243,6 @@ Check if the phone is connected and the TRK application is running.</source>
<source>Could not parse %1. The QtS60 emulator run configuration %2 can not be started.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60EmulatorRunConfigurationWidget</name>
<message>
<source>Name:</source>
<translation type="unfinished">Nombre:</translation>
</message>
<message>
<source>Executable:</source>
<translation type="unfinished">Ejecutable:</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60EmulatorRunConfigurationFactory</name>
<message>
<source>%1 in Emulator</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60EmulatorRunControl</name>
<message>
<source>Starting %1...</source>
<translation type="unfinished">Iniciando %1...</translation>
@@ -13469,9 +13255,6 @@ Check if the phone is connected and the TRK application is running.</source>
<source>%1 exited with code %2</source>
<translation type="unfinished">%1 finalizó retornando %2</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60Manager</name>
<message>
<source>Run in Emulator</source>
<translation type="unfinished"></translation>
@@ -13484,9 +13267,6 @@ Check if the phone is connected and the TRK application is running.</source>
<source>Debug on Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeBuildConfigurationFactory</name>
<message>
<source>Using Default Qt Version</source>
<translation type="unfinished"></translation>

1425
share/qtcreator/translations/qtcreator_fr.ts
View File

File diff suppressed because it is too large Load Diff

346
share/qtcreator/translations/qtcreator_hr.ts
View File

@@ -1926,7 +1926,7 @@ Međutim, korištenje opuštenih i proširenih pravila također znači da nije m
</message>
</context>
<context>
<name>ClearCase::Internal::CheckOutDialog</name>
<name>ClearCase</name>
<message>
<source>Check Out</source>
<translation>Odjava</translation>
@@ -1952,9 +1952,6 @@ Međutim, korištenje opuštenih i proširenih pravila također znači da nije m
<extracomment>Hijack: Unset read-only flag without check-out. This is used for local changes which the user does not want to commit.</extracomment>
<translation>Koristi &amp;otetu datoteku</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::SettingsPage</name>
<message>
<source>Configuration</source>
<translation>Konfiguracija</translation>
@@ -2036,9 +2033,6 @@ Međutim, korištenje opuštenih i proširenih pravila također znači da nije m
<source>ClearCase</source>
<translation>ClearCase</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::UndoCheckOut</name>
<message>
<source>Dialog</source>
<translation>Dijalog</translation>
@@ -2051,9 +2045,6 @@ Međutim, korištenje opuštenih i proširenih pravila također znači da nije m
<source>&amp;Save copy of the file with a &apos;.keep&apos; extension</source>
<translation>&amp;Spremi kopiju datoteke s nastavkom &apos;.keep&apos;</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::VersionSelector</name>
<message>
<source>Confirm Version to Check Out</source>
<translation>Potvrdi verziju u odjavi</translation>
@@ -2085,7 +2076,7 @@ Međutim, korištenje opuštenih i proširenih pravila također znači da nije m
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingForm</name>
<name>CMakeProjectManager</name>
<message>
<source>Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects.</source>
<translation>Određuje, da li se staze datoteke kopiraju u međuspremnik za lijepljenje u datoteku CMakeLists.txt, kad dodaješ nove datoteke CMake projektima.</translation>
@@ -6274,7 +6265,7 @@ Greška: %5</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ClassDefinition</name>
<name>QmakeProjectManager</name>
<message>
<source>The header file</source>
<translation>Datoteka zaglavlja</translation>
@@ -6375,9 +6366,6 @@ Greška: %5</translation>
<source>Icon files (*.png *.ico *.jpg *.xpm *.tif *.svg)</source>
<translation>Datoteke ikona (*.png *.ico *.jpg *.xpm *.tif *.svg)</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetPluginWizardPage</name>
<message>
<source>WizardPage</source>
<translation>Stranice čarobnjaka</translation>
@@ -6418,9 +6406,6 @@ Greška: %5</translation>
<source>Plugin Details</source>
<translation>Detalji o priključku</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWidgetsWizardPage</name>
<message>
<source>Custom Qt Widget Wizard</source>
<translation>Prilagođeni čarobnjak za QT programčiće</translation>
@@ -6445,9 +6430,6 @@ Greška: %5</translation>
<source>Custom Widgets</source>
<translation>Prilagođeni programčići</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryDetailsWidget</name>
<message>
<source>Library file:</source>
<translation>Datoteka biblioteke:</translation>
@@ -6524,9 +6506,6 @@ Greška: %5</translation>
<source>Remove &quot;d&quot; suffix for release version</source>
<translation>Ukloni nastavak &quot;d&quot; iz verzije za objavljivanje</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectConfigWidget</name>
<message>
<source>Shadow build:</source>
<translation>Prikaži gradnju:</translation>
@@ -6573,21 +6552,10 @@ Greška: %5</translation>
<comment>%1 error message, %2 build directory</comment>
<translation>%1 Gradnja %2 će se prepisati.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QMakeStep</name>
<message>
<source>qmake build configuration:</source>
<translation>Konfiguracija qmake gradnje:</translation>
</message>
<message>
<source>Debug</source>
<translation>Uklanjanje grešaka</translation>
</message>
<message>
<source>Release</source>
<translation>Objavljivanje</translation>
</message>
<message>
<source>Additional arguments:</source>
<translation>Dodatni argumenti:</translation>
@@ -17402,7 +17370,7 @@ Izlaz:
</message>
</context>
<context>
<name>ClearCase::Internal::ActivitySelector</name>
<name>ClearCase</name>
<message>
<source>Select &amp;activity:</source>
<translation>Odaberi &amp;aktivnost:</translation>
@@ -17415,9 +17383,6 @@ Izlaz:
<source>Keep item activity</source>
<translation>Zadrži aktivnost stavke</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseControl</name>
<message>
<source>Check &amp;Out</source>
<translation type="unfinished"></translation>
@@ -17426,16 +17391,10 @@ Izlaz:
<source>&amp;Hijack</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseEditorWidget</name>
<message>
<source>Annotate version &quot;%1&quot;</source>
<translation>Pribilježi verziju &quot;%1&quot;</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCasePlugin</name>
<message>
<source>Editing Derived Object: %1</source>
<translation type="unfinished"></translation>
@@ -17704,31 +17663,18 @@ Izlaz:
<source>Updating ClearCase Index</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseSubmitEditor</name>
<message>
<source>ClearCase Check In</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseSubmitEditorWidget</name>
<message>
<source>Chec&amp;k in even if identical to previous version</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Preserve file modification time</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Check In</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ClearCase::Internal::SettingsPageWidget</name>
<message>
<source>ClearCase Command</source>
<translation type="unfinished"></translation>
@@ -17743,7 +17689,7 @@ Izlaz:
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::BuildDirManager</name>
<name>CMakeProjectManager</name>
<message>
<source>Failed to create build directory &quot;%1&quot;.</source>
<translation>Neupjelo stvaranje direktorija za gradnju &quot;%1&quot;.</translation>
@@ -17788,16 +17734,10 @@ Izlaz:
<source>Apply Changes to Project</source>
<translation>Primijeni promjene u CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfiguration</name>
<message>
<source>CMake configuration set by the kit was overridden in the project.</source>
<translation>CMake konfiguracija postavljena od kompleta je prepisana u ovom projektu.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name>
<message>
<source>Default</source>
<extracomment>The name of the build configuration created by default for a cmake project.</extracomment>
@@ -17823,13 +17763,6 @@ Izlaz:
<source>Release with Debug Information</source>
<translation>Izdaj s podacima o ispravkama</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message>
<source>Build directory:</source>
<translation>Direktorij izgradnje:</translation>
@@ -17922,9 +17855,6 @@ Izlaz:
<source>Force to %1</source>
<translation>Prisili na %1</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStep</name>
<message>
<source>CMake Build</source>
<extracomment>Default display name for the cmake make step.</extracomment>
@@ -17955,9 +17885,6 @@ Izlaz:
<comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment>
<translation>Gradnja</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeBuildStep</name>
<message>
<source>The build configuration is currently disabled.</source>
<translation>Konfiguracija za gradnju je trenutačno onemogućena.</translation>
@@ -17979,7 +17906,7 @@ Izlaz:
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepConfigWidget</name>
<name>CMakeProjectManager</name>
<message>
<source>Build</source>
<comment>CMakeProjectManager::CMakeBuildStepConfigWidget display name.</comment>
@@ -17997,16 +17924,10 @@ Izlaz:
<source>&lt;b&gt;No build configuration found on this kit.&lt;/b&gt;</source>
<translation>&lt;b&gt;U ovom kompletu nije nađena konfiguracija gradnje.&lt;/b&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigItem</name>
<message>
<source>Failed to open %1 for reading.</source>
<translation>Neuspjelo otvaranje od %1 za čitanje.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeKitConfigWidget</name>
<message>
<source>CMake Tool</source>
<translation>CMake alat</translation>
@@ -18019,9 +17940,6 @@ Izlaz:
<source>&lt;No CMake Tool available&gt;</source>
<translation>&lt;Nema dostupnog CMake alata&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeGeneratorKitConfigWidget</name>
<message>
<source>Change...</source>
<translation>Promijeni …</translation>
@@ -18062,13 +17980,6 @@ Izlaz:
<source>Toolset:</source>
<translation>Skup alata:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeConfigurationKitConfigWidget</name>
<message>
<source>Change...</source>
<translation>Promijeni …</translation>
</message>
<message>
<source>CMake Configuration</source>
<translation>CMake konfiguracija</translation>
@@ -18085,17 +17996,10 @@ Izlaz:
<source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source>
<translation>Upiši jednu varijablu po retku, a naziv varijable odvoji od vrijednosti varijable s &quot;=&quot;. &lt;br&gt; Možeš navesti vrstu savjeta dodavanjem &quot;: TYPE&quot; prije &quot;=&quot;.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeKitInformation</name>
<message>
<source>CMake version %1 is unsupported. Please update to version 3.0 or later.</source>
<translation>CMake verzija %1 nije podržana. Aktualiziraj na verziju 3.0 ili noviju.</translation>
</message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message>
<source>Unconfigured</source>
<translation>Nekonfigurirano</translation>
@@ -18104,9 +18008,6 @@ Izlaz:
<source>Path to the cmake executable</source>
<translation>Staza do izvršne cmake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeGeneratorKitInformation</name>
<message>
<source>CMake Tool is unconfigured, CMake generator will be ignored.</source>
<translation>CMake alat nije konfiguriran, zanemarit će se CMake generator.</translation>
@@ -18143,13 +18044,6 @@ Izlaz:
<source>Toolset: %1</source>
<translation>Skup alata: %1</translation>
</message>
<message>
<source>CMake Generator</source>
<translation>CMake generator</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigurationKitInformation</name>
<message>
<source>CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version.</source>
<translation type="unfinished"></translation>
@@ -18190,20 +18084,10 @@ Izlaz:
<source>CMake configuration has a path to a C++ compiler set that does not match the compiler path configured in the tool chain of the kit.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CMake Configuration</source>
<translation>CMake konfiguracija</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeLocatorFilter</name>
<message>
<source>Build CMake target</source>
<translation>Odredište za CMake gradnju</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeProject</name>
<message>
<source>No cmake tool set.</source>
<translation>Nijedan cmake alat nije postavljen.</translation>
@@ -18216,16 +18100,10 @@ Izlaz:
<source>Scan &quot;%1&quot; project tree</source>
<translation>Pretraži &quot;%1&quot; stablo projekta</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeEditorFactory</name>
<message>
<source>CMake Editor</source>
<translation>CMake uređivač</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeManager</name>
<message>
<source>Run CMake</source>
<translation>Pokreni CMake</translation>
@@ -18275,30 +18153,20 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeProjectPlugin</name>
<name>CMakeProjectManager</name>
<message>
<source>CMake</source>
<comment>SnippetProvider</comment>
<translation>CMake</translation>
</message>
<message>
<source>Build</source>
<translation>Izgradi</translation>
</message>
<message>
<source>Build &quot;%1&quot;</source>
<translation>Izgradi &quot;%1&quot;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfiguration</name>
<message>
<source>The project no longer builds the target associated with this run configuration.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeSettingsPage</name>
<message>
<source> (Default)</source>
<translation> (Zadano)</translation>
@@ -18343,9 +18211,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
<source>Path:</source>
<translation>Staza:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeToolConfigWidget</name>
<message>
<source>Add</source>
<translation>Dodaj</translation>
@@ -18374,23 +18239,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
<source>New CMake</source>
<translation>Novi CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingsPage</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeToolManager</name>
<message>
<source>CMake at %1</source>
<translation>CMake pri %1</translation>
@@ -18399,17 +18247,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
<source>System CMake at %1</source>
<translation>CMake sustava pri %1</translation>
</message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::ConfigModel</name>
<message>
<source>Key</source>
<translation>Ključ</translation>
</message>
<message>
<source>Value</source>
<translation>Vrijednost</translation>
@@ -18422,13 +18259,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
<source>Current kit: %1</source>
<translation>Trenutačni komplet: %1</translation>
</message>
<message>
<source>&lt;UNSET&gt;</source>
<translation>&lt;NEPOSTAVLJENO&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager</name>
<message>
<source>Current CMake: %1</source>
<translation>Trenutačni CMake: %1</translation>
@@ -18441,9 +18271,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
<source>Value requested by kit: %1</source>
<translation>Komplet zahtijeva vrijednost: %1</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::ConfigModelItemDelegate</name>
<message>
<source>Select a file for %1</source>
<translation>Odaberi datoteku za %1</translation>
@@ -18452,9 +18279,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
<source>Select a directory for %1</source>
<translation>Odaberi direktorij za %1</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::ServerMode</name>
<message>
<source>Running &quot;%1 %2&quot; in %3.</source>
<translation>Pokretanje &quot;%1 %2&quot; u %3.</translation>
@@ -18539,9 +18363,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
<source>Received a signal in reply to a request.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::ServerModeReader</name>
<message>
<source>Parsing of CMake project failed: Connection to CMake server lost.</source>
<translation>Obrada CMake projekta neuspjela: Veza sa CMake poslužiteljem izgubljena.</translation>
@@ -18598,21 +18419,10 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
<source>&lt;Headers&gt;</source>
<translation>&lt;Zaglavlja&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::TeaLeafReader</name>
<message>
<source>The build directory is not for %1 but for %2</source>
<translation>Direktorij gradnje nije za %1, već za %2</translation>
</message>
<message>
<source>Running &quot;%1 %2&quot; in %3.</source>
<translation>Pokretanje &quot;%1 %2&quot; u %3.</translation>
</message>
<message>
<source>Configuring &quot;%1&quot;</source>
<translation>Konfiguriranje &quot;%1&quot;</translation>
</message>
<message>
<source>*** cmake process crashed.</source>
<translation>*** cmake proces se urušio.</translation>
@@ -33080,14 +32890,11 @@ These files are preserved.</source>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::AddLibraryWizard</name>
<name>QmakeProjectManager</name>
<message>
<source>Add Library</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryTypePage</name>
<message>
<source>Library Type</source>
<translation type="unfinished"></translation>
@@ -33135,9 +32942,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>Type</source>
<translation>Vrsta</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DetailsPage</name>
<message>
<source>Details</source>
<translation type="unfinished">Detalji</translation>
@@ -33174,9 +32978,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>Specify the package to link to</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SummaryPage</name>
<message>
<source>Summary</source>
<translation type="unfinished"></translation>
@@ -33185,9 +32986,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>The following snippet will be added to the&lt;br&gt;&lt;b&gt;%1&lt;/b&gt; file:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ClassList</name>
<message>
<source>&lt;New class&gt;</source>
<translation type="unfinished"></translation>
@@ -33200,9 +32998,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>Delete class %1 from list?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWizard</name>
<message>
<source>Qt Custom Designer Widget</source>
<translation type="unfinished"></translation>
@@ -33211,30 +33006,18 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>Creates a Qt Custom Designer Widget or a Custom Widget Collection.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWizardDialog</name>
<message>
<source>This wizard generates a Qt Designer Custom Widget or a Qt Designer Custom Widget Collection project.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::PluginGenerator</name>
<message>
<source>Creating multiple widget libraries (%1, %2) in one project (%3) is not supported.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DesktopQmakeRunConfiguration</name>
<message>
<source>Qt Run Configuration</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ExternalQtEditor</name>
<message>
<source>Unable to start &quot;%1&quot;</source>
<translation type="unfinished"></translation>
@@ -33243,9 +33026,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>The application &quot;%1&quot; could not be found.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DesignerExternalEditor</name>
<message>
<source>Qt Designer is not responding (%1).</source>
<translation type="unfinished"></translation>
@@ -33254,13 +33034,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>Unable to create server socket: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryDetailsController</name>
<message>
<source>Linkage:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 Dynamic</source>
<translation type="unfinished"></translation>
@@ -33269,10 +33042,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>%1 Static</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mac:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 Framework</source>
<translation type="unfinished"></translation>
@@ -33281,9 +33050,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>%1 Library</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeBuildConfiguration</name>
<message>
<source>Could not parse Makefile.</source>
<translation type="unfinished"></translation>
@@ -33308,9 +33074,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>Parsing the .pro file</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QtVersion</name>
<message>
<source>The build directory needs to be at the same level as the source directory.</source>
<translation type="unfinished"></translation>
@@ -33330,7 +33093,7 @@ Neither the path to the library nor the path to its includes is added to the .pr
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeBuildConfigurationFactory</name>
<name>QmakeProjectManager</name>
<message>
<source>Release</source>
<extracomment>The name of the release build configuration created by default for a qmake project.</extracomment>
@@ -33364,9 +33127,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<extracomment>Non-ASCII characters in directory suffix may cause build issues.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeKitConfigWidget</name>
<message>
<source>Qt mkspec</source>
<translation type="unfinished"></translation>
@@ -33375,9 +33135,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>The mkspec to use when building the project with qmake.&lt;br&gt;This setting is ignored when using other build systems.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeKitInformation</name>
<message>
<source>No Qt version set, so mkspec is ignored.</source>
<translation type="unfinished"></translation>
@@ -33394,16 +33151,10 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>Mkspec configured for qmake by the Kit.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeMakeStep</name>
<message>
<source>Cannot find Makefile. Check your build settings.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakePriFile</name>
<message>
<source>Headers</source>
<translation type="unfinished"></translation>
@@ -33432,9 +33183,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>Other files</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakePriFile</name>
<message>
<source>Failed</source>
<translation type="unfinished"></translation>
@@ -33447,9 +33195,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>File Error</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProFile</name>
<message>
<source>Error while parsing file %1. Giving up.</source>
<translation type="unfinished"></translation>
@@ -33458,9 +33203,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>Could not find .pro file for subdirectory &quot;%1&quot; in &quot;%2&quot;.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeProject</name>
<message>
<source>Reading Project &quot;%1&quot;</source>
<translation type="unfinished"></translation>
@@ -33477,35 +33219,15 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>No C++ compiler set in kit.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager</name>
<message>
<source>&quot;%1&quot; is used by qmake, but &quot;%2&quot; is configured in the kit.
Please update your kit (%3) or choose a mkspec for qmake that matches your target environment better.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectImporter</name>
<message>
<source>Debug</source>
<translation>Ispravi greške</translation>
</message>
<message>
<source>Release</source>
<translation>Objavi</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeManager</name>
<message>
<source>QMake</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectManagerPlugin</name>
<message>
<source>Build</source>
<translation type="unfinished"></translation>
@@ -33566,9 +33288,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
<source>Add Library...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QMakeStep</name>
<message>
<source>qmake</source>
<extracomment>QMakeStep default display name</extracomment>
@@ -33594,9 +33313,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
<source>&lt;no Make step found&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QMakeStepConfigWidget</name>
<message>
<source>QML Debugging</source>
<translation type="unfinished"></translation>
@@ -33734,7 +33450,7 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::FilesPage</name>
<name>QmakeProjectManager</name>
<message>
<source>Class Information</source>
<translation type="unfinished"></translation>
@@ -33743,13 +33459,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
<source>Specify basic information about the classes for which you want to generate skeleton source code files.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Details</source>
<translation type="unfinished">Detalji</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::GuiAppWizard</name>
<message>
<source>Qt Widgets Application</source>
<translation type="unfinished"></translation>
@@ -33760,16 +33469,10 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
Preselects a desktop Qt for building the application if available.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::GuiAppWizardDialog</name>
<message>
<source>This wizard generates a Qt Widgets Application project. The application derives by default from QApplication and includes an empty widget.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryWizard</name>
<message>
<source>C++ Library</source>
<translation type="unfinished"></translation>
@@ -33778,9 +33481,6 @@ Preselects a desktop Qt for building the application if available.</source>
<source>Creates a C++ library based on qmake. This can be used to create:&lt;ul&gt;&lt;li&gt;a shared C++ library for use with &lt;tt&gt;QPluginLoader&lt;/tt&gt; and runtime (Plugins)&lt;/li&gt;&lt;li&gt;a shared or static C++ library for use with another project at linktime&lt;/li&gt;&lt;/ul&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryWizardDialog</name>
<message>
<source>Shared Library</source>
<translation type="unfinished"></translation>
@@ -33793,21 +33493,10 @@ Preselects a desktop Qt for building the application if available.</source>
<source>Qt Plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Type</source>
<translation>Vrsta</translation>
</message>
<message>
<source>This wizard generates a C++ Library project.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Details</source>
<translation type="unfinished">Detalji</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ModulesPage</name>
<message>
<source>Select Required Modules</source>
<translation type="unfinished"></translation>
@@ -33820,16 +33509,10 @@ Preselects a desktop Qt for building the application if available.</source>
<source>Modules</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::FilesSelectionWizardPage</name>
<message>
<source>Files</source>
<translation type="unfinished">Datoteke</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SimpleProjectWizardDialog</name>
<message>
<source>Import Existing Project</source>
<translation type="unfinished"></translation>
@@ -33850,9 +33533,6 @@ Preselects a desktop Qt for building the application if available.</source>
<source>File Selection</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SimpleProjectWizard</name>
<message>
<source>Import as qmake Project (Limited Functionality)</source>
<translation type="unfinished"></translation>
@@ -33861,9 +33541,6 @@ Preselects a desktop Qt for building the application if available.</source>
<source>Imports existing projects that do not use qmake, CMake or Autotools.&lt;p&gt;This creates a qmake .pro file that allows you to use %1 as a code editor and as a launcher for debugging and analyzing tools. If you want to build the project, you might need to edit the generated .pro file.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SubdirsProjectWizard</name>
<message>
<source>Subdirs Project</source>
<translation type="unfinished"></translation>
@@ -33885,9 +33562,6 @@ Preselects a desktop Qt for building the application if available.</source>
<comment>Title of dialog</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SubdirsProjectWizardDialog</name>
<message>
<source>This wizard generates a Qt Subdirs project. Add subprojects to it later on by using the other wizards.</source>
<translation type="unfinished"></translation>

264
share/qtcreator/translations/qtcreator_hu.ts
View File

@@ -263,7 +263,7 @@
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::0</name>
<name>CMakeProjectManager</name>
<message>
<source>Build Environment</source>
<translation type="obsolete">Fordítási környezet</translation>
@@ -356,9 +356,6 @@
<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="obsolete">A Qt Creator megtalálta a legutolsó cbp fájlt, amelyet a Qt Creator elemzésre for használni, hogy információkat nyerhessen a projektről. Megváltoztathatja aparancssori argumentumokat, amelyeket új fájl létrehozására hoztak létre projekt módban. Kattintson a befejezés gombra a projekt betöltéséhez.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name>
<message>
<source>Create</source>
<translation>Létrehozás</translation>
@@ -371,9 +368,6 @@
<source>New Configuration Name:</source>
<translation>Új konfiguráció név:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildEnvironmentWidget</name>
<message>
<source>Clear system environment</source>
<translation>Rendszer környezet megtisztítása</translation>
@@ -382,23 +376,14 @@
<source>Build Environment</source>
<translation>Fordítási környezet</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
<source>&amp;Change</source>
<translation>&amp;Váltotatás</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
<message>
<source>CMake Wizard</source>
<translation>CMake Varázsló</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfigurationWidget</name>
<message>
<source>Arguments:</source>
<translation>Argumentumok:</translation>
@@ -431,17 +416,10 @@
<source>System Environment</source>
<translation>Rendszer környezet</translation>
</message>
<message>
<source>Build Environment</source>
<translation>Fordítási környezet</translation>
</message>
<message>
<source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source>
<translation></translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunPage</name>
<message>
<source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
<translation>Kérem határozza meg a cmake futtatható fájl útvonalát. Nem található cmake futtatható fájl az útvonalon.</translation>
@@ -502,9 +480,6 @@
<source>No valid cmake executable specified.</source>
<translation>Nincsen érvényes, meghatározott cmake futtatható.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
@@ -513,16 +488,10 @@
<source>CMake executable</source>
<translation>CMake futtatható fájl</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
<message>
<source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; 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>A Qt Creator egy &lt;b&gt;beépített forrást észlelt a(z) %1-ben&lt;/b&gt;, amely megelőzi az árnyék építéstől. A Qt Creator nem fogja engedélyezni Önnek, hogy megváltoztassa az építési könyvtárat. Ha árnyék építést szeretne végrehajtani, ürítse ki a forrás könyvtárat és nyissa meg újra a projektet.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message>
<source>Additional arguments:</source>
<translation>További argumentumok:</translation>
@@ -535,9 +504,6 @@
<source>&lt;b&gt;Make:&lt;/b&gt; %1 %2</source>
<translation>&lt;b&gt;Make:&lt;/b&gt; %1 %2</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::ShadowBuildPage</name>
<message>
<source>Please enter the directory in which you want to build your project. </source>
<translation>Kérem gépelje be a könyvtár nevét, amelybe a projektet szeretné felépíteni.</translation>
@@ -12631,7 +12597,7 @@ a verziókövetőhöz (%2)?</translation>
</message>
</context>
<context>
<name>QMakeStep</name>
<name>QmakeProjectManager</name>
<message>
<source>QMake Build Configuration:</source>
<translation>QMake Építési Konfiguráció:</translation>
@@ -13030,7 +12996,7 @@ a verziókövetőhöz (%2)?</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::0</name>
<name>QmakeProjectManager</name>
<message>
<source>&lt;font color=&quot;#ff0000&quot;&gt;Could not find make command: %1 in the build environment&lt;/font&gt;</source>
<translation type="obsolete">&lt;font color=&quot;#ff0000&quot;&gt;A make parancs nem található: %1 a fordító környezetben&lt;/font&gt;</translation>
@@ -13099,9 +13065,6 @@ a verziókövetőhöz (%2)?</translation>
<source>Auto-detected Qt</source>
<translation type="obsolete">Automatikusan észlelt Qt</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::0</name>
<message>
<source>Qt4 Console Application</source>
<translation type="obsolete">Qt4 konzol alkalmazás</translation>
@@ -13678,9 +13641,6 @@ p, li { white-space: pre-wrap; }
<source>Edit Advanced Expression</source>
<translation type="obsolete">Speciális kifejezés szerkesztése</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ClassDefinition</name>
<message>
<source>Form</source>
<translation>Forma</translation>
@@ -13785,9 +13745,6 @@ p, li { white-space: pre-wrap; }
<source>Icon files (*.png *.ico *.jpg *.xpm *.tif *.svg)</source>
<translation>ikon fájlok (*.png *.ico *.jpg *.xpm *.tif *.svg)</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ClassList</name>
<message>
<source>&lt;New class&gt;</source>
<translation>&lt;Új osztály&gt;</translation>
@@ -13800,9 +13757,6 @@ p, li { white-space: pre-wrap; }
<source>Delete class %1 from list?</source>
<translation>%1 osztály törlése a listáról?</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ConsoleAppWizard</name>
<message>
<source>Qt4 Console Application</source>
<translation>Qt4 konzol alkalmazás</translation>
@@ -13811,16 +13765,10 @@ p, li { white-space: pre-wrap; }
<source>Creates a Qt4 console application.</source>
<translation>Egy Qt4 konzol alkalmazás létrehozása.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ConsoleAppWizardDialog</name>
<message>
<source>This wizard generates a Qt4 console application project. The application derives from QCoreApplication and does not provide a GUI.</source>
<translation>Ez a varázsló egy Qt4 konzol alkalmazási projektet generál. Az alkalmazás a QCoreApplication-ből származik és nem biztosít GUI-t.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetPluginWizardPage</name>
<message>
<source>WizardPage</source>
<translation>Varázsló lap</translation>
@@ -13857,9 +13805,6 @@ p, li { white-space: pre-wrap; }
<source>icons.qrc</source>
<translation>icons.qrc</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWidgetsWizardPage</name>
<message>
<source>Custom Qt Widget Wizard</source>
<translation>Szokásos Qt Widget Varázsló</translation>
@@ -13876,9 +13821,6 @@ p, li { white-space: pre-wrap; }
<source>Specify the list of custom widgets and their properties.</source>
<translation>Határozza meg a szokásos widgetek listáját és tulajdonságaikat.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWizard</name>
<message>
<source>Qt4 Designer Custom Widget</source>
<translation>Qt4 Designer Szokásos Widget</translation>
@@ -13887,16 +13829,10 @@ p, li { white-space: pre-wrap; }
<source>Creates a Qt4 Designer Custom Widget or a Custom Widget Collection.</source>
<translation>Qt4 Designer Szokásos Widget vagy szokásos Widget gyűjtemény létrehozása.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWizardDialog</name>
<message>
<source>This wizard generates a Qt4 Designer Custom Widget or a Qt4 Designer Custom Widget Collection project.</source>
<translation>Ez a varázsló egy Qt4 Designer szokásos Widget-t vagy Qt4 Designer szokásos Widget gyűjtemény projektet generál.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DesignerExternalEditor</name>
<message>
<source>Qt Designer is not responding (%1).</source>
<translation>A Qt Designer nem válaszol (%1).</translation>
@@ -13905,16 +13841,10 @@ p, li { white-space: pre-wrap; }
<source>Unable to create server socket: %1</source>
<translation>Nem lehet szerver socket-et létrehozni: %1</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::EmbeddedPropertiesPanel</name>
<message>
<source>Embedded Linux</source>
<translation>Beágyazott Linux</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::EmptyProjectWizard</name>
<message>
<source>Empty Qt4 Project</source>
<translation>Üres Qt4 Projekt</translation>
@@ -13923,16 +13853,10 @@ p, li { white-space: pre-wrap; }
<source>Creates an empty Qt project.</source>
<translation>Egy üres Qt projekt létrehozása.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::EmptyProjectWizardDialog</name>
<message>
<source>This wizard generates an empty Qt4 project. Add files to it later on by using the other wizards.</source>
<translation>Ez a varázsló egy üres Qt4 projektet generál. Fájlok hozzáadása később más varázslók használatával.können später Dateien hinzufügt werden.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ExternalQtEditor</name>
<message>
<source>Unable to start &quot;%1&quot;</source>
<translation>Nem lehet elindítani a(z) &quot;%1&quot;-t</translation>
@@ -13941,9 +13865,6 @@ p, li { white-space: pre-wrap; }
<source>The application &quot;%1&quot; could not be found.</source>
<translation>A(z) &quot;%1&quot; alkalmazás nem található.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::FilesPage</name>
<message>
<source>Class Information</source>
<translation>Osztály információ</translation>
@@ -14108,7 +14029,7 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::GuiAppWizard</name>
<name>QmakeProjectManager</name>
<message>
<source>Qt4 Gui Application</source>
<translation>Qt4 Gui Alkalmazás</translation>
@@ -14121,16 +14042,10 @@ p, li { white-space: pre-wrap; }
<source>The template file &apos;%1&apos; could not be opened for reading: %2</source>
<translation>A(z) &apos;%1&apos;-es példa fájlt nem sikerült megnyitni olvasásra: %2</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::GuiAppWizardDialog</name>
<message>
<source>This wizard generates a Qt4 GUI application project. The application derives by default from QApplication and includes an empty widget.</source>
<translation>Ez a varázsló egy Qt4 GUI alkalmazói projektet generál. Az alkalmazás az alapértelmezett QApplication-ből származik és egy üres widget tartalmaz.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryWizard</name>
<message>
<source>C++ Library</source>
<translation>C++ könyvtár</translation>
@@ -14139,9 +14054,6 @@ p, li { white-space: pre-wrap; }
<source>Creates a C++ Library.</source>
<translation>C++ könyvtár létrehozása.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryWizardDialog</name>
<message>
<source>Shared library</source>
<translation>Megosztott könyvtár</translation>
@@ -14162,16 +14074,10 @@ p, li { white-space: pre-wrap; }
<source>This wizard generates a C++ library project.</source>
<translation>Ez a varázsló C++ könyvtár projektet generál.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::MakeStepFactory</name>
<message>
<source>Make</source>
<translation>Make</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ModulesPage</name>
<message>
<source>Select required modules</source>
<translation>Az igényelt modulok kiválasztása</translation>
@@ -14180,9 +14086,6 @@ p, li { white-space: pre-wrap; }
<source>Select the modules you want to include in your project. The recommended modules for this project are selected by default.</source>
<translation>Válassza ki a projektbe betenni kívánt modulokat. Az erre a projektre ajánlott modulok automatikusan ki vannak választva.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::PluginGenerator</name>
<message>
<source>Cannot open icon file %1.</source>
<translation>Nem lehet megnyitni a(z) ikon fájlt.</translation>
@@ -14195,9 +14098,6 @@ p, li { white-space: pre-wrap; }
<source>Cannot open %1: %2</source>
<translation>Nem lehet megnyitni a(z) %1-t: %2</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ProEditor</name>
<message>
<source>New</source>
<translation>Új</translation>
@@ -14250,9 +14150,6 @@ p, li { white-space: pre-wrap; }
<source>Add Block</source>
<translation>Blokk hozzáadása</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ProEditorModel</name>
<message>
<source>&lt;Global Scope&gt;</source>
<translation>&lt;Globális hatókör&gt;</translation>
@@ -14289,9 +14186,6 @@ p, li { white-space: pre-wrap; }
<source>Insert Item</source>
<translation>Elem beszúrása</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ProjectLoadWizard</name>
<message>
<source>Import existing build settings</source>
<translation>Meglevő építési beállítások importolása</translation>
@@ -14308,16 +14202,10 @@ p, li { white-space: pre-wrap; }
<source>&lt;b&gt;Note:&lt;/b&gt; Importing the settings will automatically add the Qt Version identified by &lt;br&gt;&lt;b&gt;%1&lt;/b&gt; to the list of Qt versions.</source>
<translation>&lt;b&gt;Megjegyzés:&lt;/b&gt; A beállítások importálása automatikusan hozzá fogja adni a Qt verziót, amely &lt;br&gt;&lt;b&gt;%1&lt;/b&gt; -val van azonosítva a Qt verziók listájához..</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QMakeStepFactory</name>
<message>
<source>QMake</source>
<translation>QMake</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeBuildEnvironmentWidget</name>
<message>
<source>Clear system environment</source>
<translation>Rendszer környezet megtisztítása</translation>
@@ -14326,9 +14214,6 @@ p, li { white-space: pre-wrap; }
<source>Build Environment</source>
<translation>Fordítási környezet</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakePriFileNode</name>
<message>
<source>Headers</source>
<translation>Fejállomány</translation>
@@ -14373,20 +14258,10 @@ p, li { white-space: pre-wrap; }
<source>Error while changing pro file %1.</source>
<translation>Hiba történt a(z) %1 pro fájl módosítása közben.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProFileNode</name>
<message>
<source>Error while parsing file %1. Giving up.</source>
<translation>Hiba történt a(z) fájl elemzése közben. Leáll.</translation>
</message>
<message>
<source>Could not find .pro file for sub dir &apos;%1&apos; in &apos;%2&apos;</source>
<translation>Nem sikerült megtalálni a .pro fájlt a(z) &apos;%2&apos;-ben a(z) &apos;%1&apos;alkönytár számára</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectConfigWidget</name>
<message>
<source>Qt Version:</source>
<translation>Qt verzió:</translation>
@@ -14439,16 +14314,10 @@ p, li { white-space: pre-wrap; }
<source>General</source>
<translation>Általános</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectManagerPlugin</name>
<message>
<source>Run qmake</source>
<translation>qmake futtatása</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeRunConfiguration</name>
<message>
<source>Qt4RunConfiguration</source>
<translation>Qt4RunConfiguration</translation>
@@ -14457,9 +14326,6 @@ p, li { white-space: pre-wrap; }
<source>Could not parse %1. The Qt4 run configuration %2 can not be started.</source>
<translation>Nem sikerült az %1 emlemzése. A(z) %2-t futtató Qt4 elindítása nem sikerült.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeRunConfigurationWidget</name>
<message>
<source>Name:</source>
<translation>Név:</translation>
@@ -14508,10 +14374,6 @@ p, li { white-space: pre-wrap; }
<source>System Environment</source>
<translation>Rendszer környezet</translation>
</message>
<message>
<source>Build Environment</source>
<translation>Fordítási környezet</translation>
</message>
<message>
<source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2 (in terminal)</source>
<translation>Futtatható fájl futtatása: &lt;b&gt;%1&lt;/b&gt; %2 (terminálban)</translation>
@@ -14520,9 +14382,6 @@ p, li { white-space: pre-wrap; }
<source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source>
<translation>Futtatható fájl futtatása: &lt;b&gt;%1&lt;/b&gt; %2</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QtOptionsPageWidget</name>
<message>
<source>&lt;specify a name&gt;</source>
<translation>&lt;egy név meghatározása&gt;</translation>
@@ -14579,9 +14438,6 @@ p, li { white-space: pre-wrap; }
<source>Found Qt version %1, using mkspec %2</source>
<translation>Talált Qt verzió: %1, mkspec használata: %2</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QtVersionManager</name>
<message>
<source>Qt versions</source>
<translation>Qt verziók</translation>
@@ -14662,16 +14518,10 @@ p, li { white-space: pre-wrap; }
<source>Default Qt Version:</source>
<translation>Alapértelmezett Qt Verzió:</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QtWizard</name>
<message>
<source>The project %1 could not be opened.</source>
<translation>Nem sikerült megnyitni a(z) %1 prokeltet.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceDebugRunControl</name>
<message>
<source>Warning: Cannot locate the symbol file belonging to %1.</source>
<translation>Figyelmeztetés: Nem sikerült behatárolni a szimbólum fájlt ami a(z) %1-hez tartozik.</translation>
@@ -14684,9 +14534,6 @@ p, li { white-space: pre-wrap; }
<source>Debugging finished.</source>
<translation>Debuggolás befejezve.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceRunConfiguration</name>
<message>
<source>%1 on Symbian Device</source>
<translation>%1 Symbian eszközön</translation>
@@ -14699,24 +14546,10 @@ p, li { white-space: pre-wrap; }
<source>Could not parse %1. The QtS60 Device run configuration %2 can not be started.</source>
<translation>Nem sikerült a(z) %1 elemzése. A QtS60 eszköz futtatási konfigurációját %2 nem lehet elindítani.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceRunConfigurationFactory</name>
<message>
<source>%1 on Symbian Device</source>
<translation>%1 Symbian eszközön</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceRunConfigurationWidget</name>
<message>
<source>Device:</source>
<translation>Eszköz:</translation>
</message>
<message>
<source>Name:</source>
<translation>Név:</translation>
</message>
<message>
<source>Install File:</source>
<translation>Teleptő fájl:</translation>
@@ -14769,9 +14602,6 @@ p, li { white-space: pre-wrap; }
<source>Connecting...</source>
<translation>Csatlakozás...</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceRunControl</name>
<message>
<source>Finished.</source>
<translation>Befejezve.</translation>
@@ -14788,9 +14618,6 @@ p, li { white-space: pre-wrap; }
<source>Could not start application: %1</source>
<translation>Nem sikerült elindítani az alkalmazást: %1</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceRunControlBase</name>
<message>
<source>There is no device plugged in.</source>
<translation>Nincsen bedugott eszköz.</translation>
@@ -14891,17 +14718,10 @@ Ellenőrizze le, hogy vajon a telefon csatlakoztatva van-e és a TRK alkalmazás
<source>An error has occurred while running %1.</source>
<translation>Hiba történt a(z) %1 futtatása közben.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60Devices::0</name>
<message>
<source>Id:</source>
<translation type="obsolete">Azonosító:</translation>
</message>
<message>
<source>Name:</source>
<translation type="obsolete">Név:</translation>
</message>
<message>
<source>EPOC:</source>
<translation type="obsolete">EPOC:</translation>
@@ -14914,17 +14734,10 @@ Ellenőrizze le, hogy vajon a telefon csatlakoztatva van-e és a TRK alkalmazás
<source>Qt:</source>
<translation type="obsolete">Qt:</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60Devices::Device</name>
<message>
<source>Id:</source>
<translation>Azonosító:</translation>
</message>
<message>
<source>Name:</source>
<translation>Név:</translation>
</message>
<message>
<source>EPOC:</source>
<translation>EPOC:</translation>
@@ -14937,13 +14750,6 @@ Ellenőrizze le, hogy vajon a telefon csatlakoztatva van-e és a TRK alkalmazás
<source>Qt:</source>
<translation>Qt:</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DevicesPreferencePane</name>
<message>
<source>Form</source>
<translation>Forma</translation>
</message>
<message>
<source>Installed S60 SDKs:</source>
<translation>S60 SDK-k installálva:</translation>
@@ -14968,16 +14774,10 @@ Ellenőrizze le, hogy vajon a telefon csatlakoztatva van-e és a TRK alkalmazás
<source>S60 SDKs</source>
<translation>S60 SDK-k</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DevicesWidget</name>
<message>
<source>No Qt installed</source>
<translation>Nincsen a Qt installálva</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60EmulatorRunConfiguration</name>
<message>
<source>%1 in Symbian Emulator</source>
<translation>%1 Symbian emulátorban</translation>
@@ -14990,31 +14790,14 @@ Ellenőrizze le, hogy vajon a telefon csatlakoztatva van-e és a TRK alkalmazás
<source>Could not parse %1. The Qt for Symbian emulator run configuration %2 can not be started.</source>
<translation>Nem sikerült a(z) %1 elemzése. Nem lehet elindítani a Qt-t a Symbian emulátor futtatási konfigurációjára (%2).</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60EmulatorRunConfigurationFactory</name>
<message>
<source>%1 in Symbian Emulator</source>
<translation>%1 Symbian Emulátorban</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60EmulatorRunConfigurationWidget</name>
<message>
<source>Name:</source>
<translation>Név:</translation>
</message>
<message>
<source>Executable:</source>
<translation>Futtatható:</translation>
</message>
<message>
<source>Summary: Run %1 in emulator</source>
<translation></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60EmulatorRunControl</name>
<message>
<source>Starting %1...</source>
<translation>%1 elindítása...</translation>
@@ -15027,9 +14810,6 @@ Ellenőrizze le, hogy vajon a telefon csatlakoztatva van-e és a TRK alkalmazás
<source>%1 exited with code %2</source>
<translation>%1 befejeződött %2-s kóddal</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60Manager</name>
<message>
<source>Run in Emulator</source>
<translation>Futtatás emulátorban</translation>
@@ -15042,9 +14822,6 @@ Ellenőrizze le, hogy vajon a telefon csatlakoztatva van-e és a TRK alkalmazás
<source>Debug on Device</source>
<translation>Debug eszközön</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ValueEditor</name>
<message>
<source>Edit Variable</source>
<translation>Variable bearbeiten</translation>
@@ -15097,14 +14874,6 @@ Ellenőrizze le, hogy vajon a telefon csatlakoztatva van-e és a TRK alkalmazás
<source>Edit Items</source>
<translation>Elemek szerkesztése</translation>
</message>
<message>
<source>New</source>
<translation>Új</translation>
</message>
<message>
<source>Remove</source>
<translation>Eltávolítás</translation>
</message>
<message>
<source>Edit Values</source>
<translation>Értékek szerkesztése</translation>
@@ -15121,9 +14890,6 @@ Ellenőrizze le, hogy vajon a telefon csatlakoztatva van-e és a TRK alkalmazás
<source>Edit Advanced Expression</source>
<translation>Speciális kifejezés szerkesztése</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::MakeStep</name>
<message>
<source>&lt;font color=&quot;#ff0000&quot;&gt;Could not find make command: %1 in the build environment&lt;/font&gt;</source>
<translation>&lt;font color=&quot;#ff0000&quot;&gt;A make parancs nem található: %1 a fordító környezetben&lt;/font&gt;</translation>
@@ -15132,9 +14898,6 @@ Ellenőrizze le, hogy vajon a telefon csatlakoztatva van-e és a TRK alkalmazás
<source>&lt;font color=&quot;#0000ff&quot;&gt;&lt;b&gt;No Makefile found, assuming project is clean.&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;#0000ff&quot;&gt;&lt;b&gt;Makefile nem található, feltételezve hogy a projekt tiszta.&lt;/b&gt;&lt;/font&gt;</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::MakeStepConfigWidget</name>
<message>
<source>Override %1:</source>
<translation>%1 megsemmisítése:</translation>
@@ -15147,9 +14910,6 @@ Ellenőrizze le, hogy vajon a telefon csatlakoztatva van-e és a TRK alkalmazás
<source>&lt;b&gt;Make:&lt;/b&gt; %1 %2 in %3</source>
<translation>&lt;b&gt;Make:&lt;/b&gt; %1 %2 %3-ban</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QMakeStep</name>
<message>
<source>
&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;No valid Qt version set. Set one in Preferences &lt;/b&gt;&lt;/font&gt;
@@ -15170,9 +14930,6 @@ Ellenőrizze le, hogy vajon a telefon csatlakoztatva van-e és a TRK alkalmazás
<source>&lt;font color=&quot;#0000ff&quot;&gt;Configuration unchanged, skipping QMake step.&lt;/font&gt;</source>
<translation>&lt;font color=&quot;#0000ff&quot;&gt;Nem változott a konfiguráció, QMake lépés átugrása &lt;/font&gt;</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QMakeStepConfigWidget</name>
<message>
<source>&lt;b&gt;QMake:&lt;/b&gt; No Qt version set. QMake can not be run.</source>
<translation>&lt;b&gt;QMake:&lt;/b&gt; Nincsen beállított Qt verzió. Nem lehet futtatni a QMake-t.</translation>
@@ -15185,9 +14942,6 @@ Ellenőrizze le, hogy vajon a telefon csatlakoztatva van-e és a TRK alkalmazás
<source>No valid Qt version set.</source>
<translation>Nincs érvényes Qt verzió beállítva.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeBuildConfigurationFactory</name>
<message>
<source>Using Default Qt Version</source>
<translation>Alapértelmezett Qt verzió használata</translation>
@@ -15212,9 +14966,6 @@ Ellenőrizze le, hogy vajon a telefon csatlakoztatva van-e és a TRK alkalmazás
<source>%1 Release</source>
<translation>%1 Release</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeManager</name>
<message>
<source>Loading project %1 ...</source>
<translation>%1 Projekt betöltése ...</translation>
@@ -15239,9 +14990,6 @@ Ellenőrizze le, hogy vajon a telefon csatlakoztatva van-e és a TRK alkalmazás
<source>Done opening project</source>
<translation>Projektek megnyitva</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QtVersionManager</name>
<message>
<source>&lt;not found&gt;</source>
<translation>&lt;nem található&gt;</translation>
@@ -15250,10 +14998,6 @@ Ellenőrizze le, hogy vajon a telefon csatlakoztatva van-e és a TRK alkalmazás
<source>Qt in PATH</source>
<translation>Qt az útvonalon</translation>
</message>
<message>
<source>Name:</source>
<translation>Név:</translation>
</message>
<message>
<source>Source:</source>
<translation>Forrás:</translation>

222
share/qtcreator/translations/qtcreator_it.ts
View File

@@ -294,7 +294,7 @@
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildEnvironmentWidget</name>
<name>CMakeProjectManager</name>
<message>
<source>Clear system environment</source>
<translation type="unfinished"></translation>
@@ -303,9 +303,6 @@
<source>Build Environment</source>
<translation>Ambiente di Compilazione</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name>
<message>
<source>Create</source>
<translation type="unfinished"></translation>
@@ -318,23 +315,14 @@
<source>New Configuration Name:</source>
<translation type="unfinished">Nome della Nuova Configurazione:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
<source>&amp;Change</source>
<translation>&amp;Cambia</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
<message>
<source>CMake Wizard</source>
<translation>Procedura Guidata di CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfigurationWidget</name>
<message>
<source>Arguments:</source>
<translation>Parametri:</translation>
@@ -375,9 +363,6 @@
<source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
<message>
<source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; 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 type="unfinished"></translation>
@@ -386,9 +371,6 @@
<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 type="obsolete">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::CMakeRunPage</name>
<message>
<source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
<translation type="unfinished"></translation>
@@ -449,9 +431,6 @@
<source>No valid cmake executable specified.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
@@ -460,9 +439,6 @@
<source>CMake executable</source>
<translation>Eseguibile CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message>
<source>Additional arguments:</source>
<translation>Parametri aggiuntivi:</translation>
@@ -475,9 +451,6 @@
<source>&lt;b&gt;Make:&lt;/b&gt; %1 %2</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::ShadowBuildPage</name>
<message>
<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>
@@ -490,9 +463,6 @@
<source>Build directory:</source>
<translation>Cartella di compilazione:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::XmlFileUpToDatePage</name>
<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="obsolete">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>
@@ -8051,7 +8021,7 @@ al VCS (%2)?</translation>
</message>
</context>
<context>
<name>QMakeStep</name>
<name>QmakeProjectManager</name>
<message>
<source>QMake Build Configuration:</source>
<translation>Configurazione di QMake:</translation>
@@ -8274,7 +8244,7 @@ al VCS (%2)?</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ConsoleAppWizard</name>
<name>QmakeProjectManager</name>
<message>
<source>Qt4 Console Application</source>
<translation>Applicazione Qt4 per Linea di Comando</translation>
@@ -8283,16 +8253,10 @@ al VCS (%2)?</translation>
<source>Creates a Qt4 console application.</source>
<translation>Crea una applicazione per console Qt4.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ConsoleAppWizardDialog</name>
<message>
<source>This wizard generates a Qt4 console application project. The application derives from QCoreApplication and does not provide a GUI.</source>
<translation>Questa procedura guidata genera un progetto per applicazione console Qt4. L&apos;applicazione deriva da QCoreApplication e non include una GUI.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DesignerExternalEditor</name>
<message>
<source>Qt Designer is not responding (%1).</source>
<translation>Qt Designer non risponde (%1).</translation>
@@ -8301,16 +8265,10 @@ al VCS (%2)?</translation>
<source>Unable to create server socket: %1</source>
<translation>Impossibile creare il socket del server: %1</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::EmbeddedPropertiesPanel</name>
<message>
<source>Embedded Linux</source>
<translation>Embedded Linux</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::EmptyProjectWizard</name>
<message>
<source>Empty Qt4 Project</source>
<translation>Progetto Qt4 Vuoto</translation>
@@ -8319,16 +8277,10 @@ al VCS (%2)?</translation>
<source>Creates an empty Qt project.</source>
<translation>Crea un progetto Qt4 vuoto.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::EmptyProjectWizardDialog</name>
<message>
<source>This wizard generates an empty Qt4 project. Add files to it later on by using the other wizards.</source>
<translation>Questa procedura guidata genera un progetto Qt4 vuoto. Altri file potranno essere aggiunti in seguito con altre procedure guidate.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ExternalQtEditor</name>
<message>
<source>Unable to start &quot;%1&quot;</source>
<translation>Impossibile avviare &quot;%1&quot;</translation>
@@ -8337,9 +8289,6 @@ al VCS (%2)?</translation>
<source>The application &quot;%1&quot; could not be found.</source>
<translation>L&apos;applicazione &quot;%1&quot; non è stata trovata.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::FilesPage</name>
<message>
<source>Class Information</source>
<translation>Informazioni sulla Classe</translation>
@@ -8348,9 +8297,6 @@ al VCS (%2)?</translation>
<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>QmakeProjectManager::Internal::GuiAppWizard</name>
<message>
<source>Qt4 Gui Application</source>
<translation>Applicazione Qt4 Gui</translation>
@@ -8363,16 +8309,10 @@ al VCS (%2)?</translation>
<source>The template file &apos;%1&apos; could not be opened for reading: %2</source>
<translation>Il file template &apos;%1&apos; non può essere aperto in lettura: %2</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::GuiAppWizardDialog</name>
<message>
<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&apos;applicazione deriva da QApplication ed include un widget vuoto.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryWizard</name>
<message>
<source>C++ Library</source>
<translation>Libreria C++</translation>
@@ -8381,9 +8321,6 @@ al VCS (%2)?</translation>
<source>Creates a C++ Library.</source>
<translation>Crea una Libreria C++.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryWizardDialog</name>
<message>
<source>Shared library</source>
<translation>Libreria condivisa</translation>
@@ -8404,9 +8341,6 @@ al VCS (%2)?</translation>
<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>QmakeProjectManager::Internal::ModulesPage</name>
<message>
<source>Select required modules</source>
<translation>Marca i moduli richiesti</translation>
@@ -8415,9 +8349,6 @@ al VCS (%2)?</translation>
<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>QmakeProjectManager::Internal::ProEditor</name>
<message>
<source>New</source>
<translation>Nuovo</translation>
@@ -8473,9 +8404,6 @@ al VCS (%2)?</translation>
<source>Add Block</source>
<translation>Aggiungi Blocco</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ProEditorModel</name>
<message>
<source>&lt;Global Scope&gt;</source>
<translation>&lt;Ambito Globale&gt;</translation>
@@ -8512,9 +8440,6 @@ al VCS (%2)?</translation>
<source>Insert Item</source>
<translation>Inserisci Elemento</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ProjectLoadWizard</name>
<message>
<source>Import existing settings</source>
<translation>Importa le impostazioni esistenti</translation>
@@ -8539,9 +8464,6 @@ al VCS (%2)?</translation>
<source>&lt;b&gt;Note:&lt;/b&gt; Importing the settings will automatically add the Qt Version from:&lt;br&gt;&lt;b&gt;%1&lt;/b&gt; to the list of Qt versions.</source>
<translation type="obsolete">&lt;b&gt;Nota:&lt;/b&gt; Importando le impostazioni, si aggiungerà automaticamente la Versione di Qt in:&lt;br&gt;&lt;b&gt;%1&lt;/b&gt; alla lista delle Versioni di Qt.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeBuildEnvironmentWidget</name>
<message>
<source>Clear system environment</source>
<translation type="unfinished"></translation>
@@ -8550,9 +8472,6 @@ al VCS (%2)?</translation>
<source>Build Environment</source>
<translation>Ambiente di Compilazione</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakePriFileNode</name>
<message>
<source>Headers</source>
<translation type="unfinished"></translation>
@@ -8597,20 +8516,10 @@ al VCS (%2)?</translation>
<source>Error while changing pro file %1.</source>
<translation>Errore durante la modifica del file pro %1.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProFileNode</name>
<message>
<source>Error while parsing file %1. Giving up.</source>
<translation>Errore durante la lettura del file %1. Rinuncio.</translation>
</message>
<message>
<source>Could not find .pro file for sub dir &apos;%1&apos; in &apos;%2&apos;</source>
<translation>Impossibile trovare il file .pro della sottocartella &apos;%1&apos; in &apos;%2&apos;</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectConfigWidget</name>
<message>
<source>Configuration Name:</source>
<translation>Nome della Configurazione:</translation>
@@ -8677,16 +8586,10 @@ al VCS (%2)?</translation>
<source>Tool Chain:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectManagerPlugin</name>
<message>
<source>Run qmake</source>
<translation>Avvia qmake</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeRunConfiguration</name>
<message>
<source>Qt4RunConfiguration</source>
<translation>Qt4RunConfiguration</translation>
@@ -8695,9 +8598,6 @@ al VCS (%2)?</translation>
<source>Could not parse %1. The Qt4 run configuration %2 can not be started.</source>
<translation>Impossibile leggere %1. L&apos;esecuzione &apos;%2&apos; non può essere avviata.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeRunConfigurationWidget</name>
<message>
<source>Arguments:</source>
<translation type="unfinished">Parametri:</translation>
@@ -8766,9 +8666,6 @@ al VCS (%2)?</translation>
<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>QmakeProjectManager::Internal::QtOptionsPageWidget</name>
<message>
<source>&lt;specify a name&gt;</source>
<translation>&lt;specifica un nome&gt;</translation>
@@ -8838,9 +8735,6 @@ al VCS (%2)?</translation>
<source>Found Qt version %1, using mkspec %2</source>
<translation>Trovata la versione Qt %1, uso l&apos;mkspec %2</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QtVersionManager</name>
<message>
<source>Qt versions</source>
<translation>Versioni Qt</translation>
@@ -8936,16 +8830,10 @@ p, li { white-space: pre-wrap; }
<source>MWC Directory:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QtWizard</name>
<message>
<source>The project %1 could not be opened.</source>
<translation>Impossibile aprire il progetto %1.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ValueEditor</name>
<message>
<source>Edit Variable</source>
<translation>Modifica Variabile</translation>
@@ -9015,11 +8903,6 @@ p, li { white-space: pre-wrap; }
<source>New</source>
<translation>Nuovo</translation>
</message>
<message>
<location/>
<source>Remove</source>
<translation>Rimuovi</translation>
</message>
<message>
<source>Edit Values</source>
<translation>Modifica i Valori</translation>
@@ -9036,9 +8919,6 @@ p, li { white-space: pre-wrap; }
<source>Edit Advanced Expression</source>
<translation>Modifica Espressione Avanzata</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::MakeStep</name>
<message>
<source>&lt;font color=&quot;#ff0000&quot;&gt;Could not find make command: %1 in the build environment&lt;/font&gt;</source>
<translation>&lt;font color=&quot;#ff0000&quot;&gt;Impossibile trovare il comando make: %1 nell&apos;ambiente di compilazione&lt;/font&gt;</translation>
@@ -9047,9 +8927,6 @@ p, li { white-space: pre-wrap; }
<source>&lt;font color=&quot;#0000ff&quot;&gt;&lt;b&gt;No Makefile found, assuming project is clean.&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;#0000ff&quot;&gt;&lt;b&gt;Non trovo il Makefile. Assumo che il progetto sia pulito.&lt;/b&gt;&lt;/font&gt;</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::MakeStepConfigWidget</name>
<message>
<source>Override %1:</source>
<translation>Ridefinisci %1:</translation>
@@ -9062,16 +8939,10 @@ p, li { white-space: pre-wrap; }
<source>&lt;b&gt;Make:&lt;/b&gt; %1 %2 in %3</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::MakeStepFactory</name>
<message>
<source>Make</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QMakeStep</name>
<message>
<source>
&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;No valid Qt version set. Set one in Preferences &lt;/b&gt;&lt;/font&gt;
@@ -9092,9 +8963,6 @@ p, li { white-space: pre-wrap; }
<source>&lt;font color=&quot;#0000ff&quot;&gt;Configuration unchanged, skipping QMake step.&lt;/font&gt;</source>
<translation>&lt;font color=&quot;#0000ff&quot;&gt;La configurazione non è cambiata, salto la fase QMake.&lt;/font&gt;</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QMakeStepConfigWidget</name>
<message>
<source>&lt;b&gt;QMake:&lt;/b&gt; No Qt version set. QMake can not be run.</source>
<translation type="unfinished"></translation>
@@ -9107,16 +8975,10 @@ p, li { white-space: pre-wrap; }
<source>No valid Qt version set.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QMakeStepFactory</name>
<message>
<source>QMake</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeManager</name>
<message>
<source>Loading project %1 ...</source>
<translation>Caricamento del progetto %1 ...</translation>
@@ -9141,9 +9003,6 @@ p, li { white-space: pre-wrap; }
<source>Done opening project</source>
<translation>Progetto aperto</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QtVersionManager</name>
<message>
<source>&lt;not found&gt;</source>
<translation>&lt;non trovato&gt;</translation>
@@ -11648,7 +11507,7 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ClassDefinition</name>
<name>QmakeProjectManager</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
@@ -11776,9 +11635,6 @@ p, li { white-space: pre-wrap; }
<source>Icon files (*.png *.ico *.jpg *.xpm *.tif *.svg)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetPluginWizardPage</name>
<message>
<source>WizardPage</source>
<translation type="unfinished"></translation>
@@ -11823,9 +11679,6 @@ p, li { white-space: pre-wrap; }
<source>icons.qrc</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWidgetsWizardPage</name>
<message>
<source>Custom Qt Widget Wizard</source>
<translation type="unfinished"></translation>
@@ -11977,11 +11830,7 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DevicesPreferencePane</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<name>QmakeProjectManager</name>
<message>
<location/>
<source>Installed S60 SDKs:</source>
@@ -12958,7 +12807,7 @@ Reason: %2</source>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ClassList</name>
<name>QmakeProjectManager</name>
<message>
<source>&lt;New class&gt;</source>
<translation type="unfinished"></translation>
@@ -12971,9 +12820,6 @@ Reason: %2</source>
<source>Delete class %1 from list?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWizard</name>
<message>
<source>Qt4 Designer Custom Widget</source>
<translation type="unfinished"></translation>
@@ -12982,16 +12828,10 @@ Reason: %2</source>
<source>Creates a Qt4 Designer Custom Widget or a Custom Widget Collection.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWizardDialog</name>
<message>
<source>This wizard generates a Qt4 Designer Custom Widget or a Qt4 Designer Custom Widget Collection project.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::PluginGenerator</name>
<message>
<source>Cannot open icon file %1.</source>
<translation type="unfinished"></translation>
@@ -13013,7 +12853,7 @@ Reason: %2</source>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceRunConfiguration</name>
<name>QmakeProjectManager</name>
<message>
<source>%1 on Device</source>
<translation type="unfinished"></translation>
@@ -13026,9 +12866,6 @@ Reason: %2</source>
<source>Could not parse %1. The QtS60 Device run configuration %2 can not be started.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceRunConfigurationWidget</name>
<message>
<source>Name:</source>
<translation type="unfinished">Nome:</translation>
@@ -13061,16 +12898,6 @@ Reason: %2</source>
<source>Key file:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceRunConfigurationFactory</name>
<message>
<source>%1 on Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceRunControlBase</name>
<message>
<source>Creating %1.sisx ...</source>
<translation type="unfinished"></translation>
@@ -13145,9 +12972,6 @@ Check if the phone is connected and the TRK application is running.</source>
<source>An error has occurred while running %1.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceRunControl</name>
<message>
<source>Finished.</source>
<translation type="unfinished"></translation>
@@ -13164,9 +12988,6 @@ Check if the phone is connected and the TRK application is running.</source>
<source>Could not start application: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DeviceDebugRunControl</name>
<message>
<source>Warning: Cannot locate the symbol file belonging to %1.</source>
<translation type="unfinished"></translation>
@@ -13179,16 +13000,10 @@ Check if the phone is connected and the TRK application is running.</source>
<source>Debugging finished.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60DevicesWidget</name>
<message>
<source>No Qt installed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60EmulatorRunConfiguration</name>
<message>
<source>%1 in Emulator</source>
<translation type="unfinished"></translation>
@@ -13201,27 +13016,10 @@ Check if the phone is connected and the TRK application is running.</source>
<source>Could not parse %1. The QtS60 emulator run configuration %2 can not be started.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60EmulatorRunConfigurationWidget</name>
<message>
<source>Name:</source>
<translation type="unfinished">Nome:</translation>
</message>
<message>
<source>Executable:</source>
<translation type="unfinished">Eseguibile:</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60EmulatorRunConfigurationFactory</name>
<message>
<source>%1 in Emulator</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60EmulatorRunControl</name>
<message>
<source>Starting %1...</source>
<translation type="unfinished">Avvio di %1...</translation>
@@ -13234,9 +13032,6 @@ Check if the phone is connected and the TRK application is running.</source>
<source>%1 exited with code %2</source>
<translation type="unfinished">%1 è uscito con il codice %2</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::S60Manager</name>
<message>
<source>Run in Emulator</source>
<translation type="unfinished"></translation>
@@ -13249,9 +13044,6 @@ Check if the phone is connected and the TRK application is running.</source>
<source>Debug on Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeBuildConfigurationFactory</name>
<message>
<source>Using Default Qt Version</source>
<translation type="unfinished"></translation>

953
share/qtcreator/translations/qtcreator_ja.ts
View File

File diff suppressed because it is too large Load Diff

343
share/qtcreator/translations/qtcreator_pl.ts
View File

@@ -984,7 +984,7 @@
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ClassDefinition</name>
<name>QmakeProjectManager</name>
<message>
<source>Form</source>
<translation>Formularz</translation>
@@ -1089,9 +1089,6 @@
<source>Icon files (*.png *.ico *.jpg *.xpm *.tif *.svg)</source>
<translation>Pliki z ikonami (*.png *.ico *.jpg *.xpm *.tif *.svg)</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetPluginWizardPage</name>
<message>
<source>WizardPage</source>
<translation>StronaKreatora</translation>
@@ -1132,9 +1129,6 @@
<source>Plugin Details</source>
<translation>Szczegóły wtyczki</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWidgetsWizardPage</name>
<message>
<source>Custom Qt Widget Wizard</source>
<translation>Kreator własnych widżetów Qt</translation>
@@ -1159,9 +1153,6 @@
<source>Custom Widgets</source>
<translation>Własne widżety</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectConfigWidget</name>
<message>
<source>Shadow Build Directory</source>
<translation>Katalog kompilacji w innym miejscu</translation>
@@ -2081,7 +2072,7 @@ Przyczyna: %3</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<name>CMakeProjectManager</name>
<message>
<source>Build directory:</source>
<translation>Katalog wersji:</translation>
@@ -2135,13 +2126,6 @@ Przyczyna: %3</translation>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>Core::BaseFileWizard</name>
<message>
@@ -8462,7 +8446,7 @@ do projektu &quot;%2&quot;.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ClassList</name>
<name>QmakeProjectManager</name>
<message>
<source>&lt;New class&gt;</source>
<translation>&lt;Nowa klasa&gt;</translation>
@@ -8475,9 +8459,6 @@ do projektu &quot;%2&quot;.</translation>
<source>Delete class %1 from list?</source>
<translation>Czy usunąć klasę %1 z listy?</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWizard</name>
<message>
<source>Qt Custom Designer Widget</source>
<translation>Własny widżet Qt Designera</translation>
@@ -8486,23 +8467,14 @@ do projektu &quot;%2&quot;.</translation>
<source>Creates a Qt Custom Designer Widget or a Custom Widget Collection.</source>
<translation>Tworzy własny widżet Qt Designera lub kolekcję własnych widżetów.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWizardDialog</name>
<message>
<source>This wizard generates a Qt Designer Custom Widget or a Qt Designer Custom Widget Collection project.</source>
<translation>Ten kreator generuje projekt własnego widżetu Qt Designera lub projekt kolekcji własnych widżetów Qt4 Designera.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::PluginGenerator</name>
<message>
<source>Creating multiple widget libraries (%1, %2) in one project (%3) is not supported.</source>
<translation>Tworzenie wielu bibliotek z widżetami (%1, %2) w jednym projekcie (%3) nie jest obsługiwane.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ExternalQtEditor</name>
<message>
<source>Unable to start &quot;%1&quot;</source>
<translation>Nie można uruchomić &quot;%1&quot;</translation>
@@ -8511,9 +8483,6 @@ do projektu &quot;%2&quot;.</translation>
<source>The application &quot;%1&quot; could not be found.</source>
<translation>Nie można odnaleźć aplikacji &quot;%1&quot;.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DesignerExternalEditor</name>
<message>
<source>Qt Designer is not responding (%1).</source>
<translation>Qt Designer nie odpowiada (%1).</translation>
@@ -8522,9 +8491,6 @@ do projektu &quot;%2&quot;.</translation>
<source>Unable to create server socket: %1</source>
<translation>Nie można utworzyć gniazda serwera: %1</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::MakeStep</name>
<message>
<source>Make</source>
<comment>Qt MakeStep display name.</comment>
@@ -8534,9 +8500,6 @@ do projektu &quot;%2&quot;.</translation>
<source>Cannot find Makefile. Check your build settings.</source>
<translation>Nie można odnaleźć pliku Makefile. Sprawdź swoje ustawienia budowania.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::MakeStepConfigWidget</name>
<message>
<source>Override %1:</source>
<translation>Nadpisz %1:</translation>
@@ -8557,16 +8520,10 @@ do projektu &quot;%2&quot;.</translation>
<source>&lt;b&gt;Make:&lt;/b&gt; %1 not found in the environment.</source>
<translation>&lt;b&gt;Make:&lt;/b&gt; Nie odnaleziono %1 w środowisku.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::MakeStepFactory</name>
<message>
<source>Make</source>
<translation>Make</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QMakeStep</name>
<message>
<source>qmake</source>
<extracomment>QMakeStep default display name</extracomment>
@@ -8592,9 +8549,6 @@ do projektu &quot;%2&quot;.</translation>
<source>&lt;no Make step found&gt;</source>
<translation>&lt;brak kroku Make&gt;</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QMakeStepConfigWidget</name>
<message>
<source>QML Debugging</source>
<translation>Debugowanie QML</translation>
@@ -8627,23 +8581,10 @@ do projektu &quot;%2&quot;.</translation>
<source>Disables QML debugging. QML profiling will still work.</source>
<translation>Blokuje debugowanie QML, profilowanie QML pozostawia włączone.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QMakeStepFactory</name>
<message>
<source>qmake</source>
<translation>qmake</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeManager</name>
<message>
<source>QMake</source>
<translation>QMake</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectManagerPlugin</name>
<message>
<source>Run qmake</source>
<translation>Uruchom qmake</translation>
@@ -8805,7 +8746,7 @@ do projektu &quot;%2&quot;.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::FilesPage</name>
<name>QmakeProjectManager</name>
<message>
<source>Class Information</source>
<translation>Informacje o klasie</translation>
@@ -8818,9 +8759,6 @@ do projektu &quot;%2&quot;.</translation>
<source>Details</source>
<translation>Szczegóły</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::GuiAppWizard</name>
<message>
<source>Qt Widgets Application</source>
<translation>Aplikacja Qt Widgets</translation>
@@ -8833,16 +8771,10 @@ Preselects a desktop Qt for building the application if available.</source>
Wstępnie wybiera wersję desktopową Qt do budowania aplikacji (jeśli jest dostępna).</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::GuiAppWizardDialog</name>
<message>
<source>This wizard generates a Qt Widgets Application project. The application derives by default from QApplication and includes an empty widget.</source>
<translation>Ten kreator generuje projekt aplikacji Qt Widgets. Aplikacja domyślnie dziedziczy z QApplication i zawiera pusty widżet.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryWizard</name>
<message>
<source>C++ Library</source>
<translation>Biblioteka C++</translation>
@@ -8851,9 +8783,6 @@ Wstępnie wybiera wersję desktopową Qt do budowania aplikacji (jeśli jest dos
<source>Creates a C++ library based on qmake. This can be used to create:&lt;ul&gt;&lt;li&gt;a shared C++ library for use with &lt;tt&gt;QPluginLoader&lt;/tt&gt; and runtime (Plugins)&lt;/li&gt;&lt;li&gt;a shared or static C++ library for use with another project at linktime&lt;/li&gt;&lt;/ul&gt;</source>
<translation>Tworzy bibliotekę C++ bazującą na qmake. Umożliwia utworzenie:&lt;ul&gt;&lt;li&gt;dzielonej biblioteki C++, zdolnej do ładowania wtyczek za pomocą &lt;tt&gt;QPluginLoader&lt;/tt&gt;&lt;/li&gt;&lt;li&gt;dzielonej lub statycznej biblioteki C++, którą można dowiązać do innego projektu&lt;/li&gt;&lt;/ul&gt;</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryWizardDialog</name>
<message>
<source>Shared Library</source>
<translation>Biblioteka współdzielona</translation>
@@ -8874,13 +8803,6 @@ Wstępnie wybiera wersję desktopową Qt do budowania aplikacji (jeśli jest dos
<source>This wizard generates a C++ Library project.</source>
<translation>Ten kreator generuje projekt biblioteki C++.</translation>
</message>
<message>
<source>Details</source>
<translation>Szczegóły</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ModulesPage</name>
<message>
<source>Select Required Modules</source>
<translation>Wybierz wymagane moduły</translation>
@@ -10636,11 +10558,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::TestWizardPage</name>
<message>
<source>WizardPage</source>
<translation>StronaKreatora</translation>
</message>
<name>QmakeProjectManager</name>
<message>
<source>Specify basic information about the test class for which you want to generate skeleton source code file.</source>
<translation>Podaj podstawowe informacje o klasie testowej, dla której ma zostać wygenerowany szkielet pliku z kodem źródłowym.</translation>
@@ -10685,10 +10603,6 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<source>Test Class Information</source>
<translation>Informacje o klasie testowej</translation>
</message>
<message>
<source>Details</source>
<translation>Szczegóły</translation>
</message>
</context>
<context>
<name>VcsBase::CleanDialog</name>
@@ -10946,7 +10860,7 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfiguration</name>
<name>CMakeProjectManager</name>
<message>
<source>Run CMake kit</source>
<translation>Uruchom zestaw CMake</translation>
@@ -10959,9 +10873,6 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM
<source>The executable is not built by the current build configuration</source>
<translation>Plik wykonywalny nie został zbudowany przez bieżącą konfigurację budowania</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeTarget</name>
<message>
<source>Desktop</source>
<comment>CMake Default target display name</comment>
@@ -12238,7 +12149,7 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::TestWizard</name>
<name>QmakeProjectManager</name>
<message>
<source>Qt Unit Test</source>
<translation>Test jednostkowy Qt</translation>
@@ -12247,9 +12158,6 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM
<source>Creates a QTestLib-based unit test for a feature or a class. Unit tests allow you to verify that the code is fit for use and that there are no regressions.</source>
<translation>Tworzy test jednostkowy funkcjonalności lub klasy, dziedzicząc z QTestLib. Testy jednostkowe pozwalają na weryfikowanie działania kodu i wykrywanie regresji.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::TestWizardDialog</name>
<message>
<source>This wizard generates a Qt Unit Test consisting of a single source file with a test class.</source>
<translation>Ten kreator generuje test jednostkowy Qt składający się z pojedynczego pliku źródłowego z klasą testową.</translation>
@@ -12540,7 +12448,7 @@ które można ustawić poniżej.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeProject</name>
<name>QmakeProjectManager</name>
<message>
<source>Reading Project &quot;%1&quot;</source>
<translation>Odczyt projektu &quot;%1&quot;</translation>
@@ -12576,7 +12484,7 @@ które można ustawić poniżej.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QtVersion</name>
<name>QmakeProjectManager</name>
<message>
<source>The build directory needs to be at the same level as the source directory.</source>
<translation>Katalog przeznaczony do budowania musi być na tym samym poziomie co katalog ze źródłami.</translation>
@@ -13055,7 +12963,7 @@ Identyfikatory muszą rozpoczynać się małą literą.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryDetailsWidget</name>
<name>QmakeProjectManager</name>
<message>
<source>Library:</source>
<translation>Biblioteka:</translation>
@@ -13810,14 +13718,11 @@ zamiast w jego katalogu instalacyjnym.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::AddLibraryWizard</name>
<name>QmakeProjectManager</name>
<message>
<source>Add Library</source>
<translation>Dodaj bibliotekę</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryTypePage</name>
<message>
<source>Library Type</source>
<translation>Typ biblioteki</translation>
@@ -13844,10 +13749,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>Links to a system library using pkg-config.</source>
<translation>Dowiązuje bibliotekę systemową używając pkg-config.</translation>
</message>
<message>
<source>Type</source>
<translation>Typ</translation>
</message>
<message>
<source>External library</source>
<translation>Zewnętrzna biblioteka</translation>
@@ -13868,9 +13769,6 @@ Adds the library and include paths to the .pro file.</source>
<translation>Dowiązuje bibliotekę, która jest wewnątrz drzewa budowy projektu.
Ścieżki do biblioteki i jej nagłówków zostaną dodane do pliku .pro.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DetailsPage</name>
<message>
<source>System Library</source>
<translation>Biblioteka systemowa</translation>
@@ -13891,10 +13789,6 @@ Adds the library and include paths to the .pro file.</source>
<source>External Library</source>
<translation>Zewnętrzna biblioteka</translation>
</message>
<message>
<source>Details</source>
<translation>Szczegóły</translation>
</message>
<message>
<source>Specify the library to link to and the includes path</source>
<translation>Wskaż bibliotekę, która ma zostać dowiązana i podaj ścieżkę do jej nagłówków</translation>
@@ -13907,9 +13801,6 @@ Adds the library and include paths to the .pro file.</source>
<source>Choose the project file of the library to link to</source>
<translation>Wybierz plik projektu biblioteki, która ma zostać dowiązana</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SummaryPage</name>
<message>
<source>Summary</source>
<translation>Podsumowanie</translation>
@@ -13918,13 +13809,6 @@ Adds the library and include paths to the .pro file.</source>
<source>The following snippet will be added to the&lt;br&gt;&lt;b&gt;%1&lt;/b&gt; file:</source>
<translation>Do pliku &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;zostanie dodany następujący fragment:</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryDetailsController</name>
<message>
<source>Linkage:</source>
<translation>Dowiązanie:</translation>
</message>
<message>
<source>%1 Dynamic</source>
<translation>%1 Dynamiczne</translation>
@@ -13933,10 +13817,6 @@ Adds the library and include paths to the .pro file.</source>
<source>%1 Static</source>
<translation>%1 Statyczne</translation>
</message>
<message>
<source>Mac:</source>
<translation>Mac:</translation>
</message>
<message>
<source>%1 Framework</source>
<translation>%1 Framework</translation>
@@ -15041,7 +14921,7 @@ Local pulls are not applied to the master branch.</source>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeManager</name>
<name>CMakeProjectManager</name>
<message>
<source>Run CMake</source>
<translation>Uruchom CMake</translation>
@@ -16177,7 +16057,7 @@ Ponowić próbę?</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SubdirsProjectWizard</name>
<name>QmakeProjectManager</name>
<message>
<source>Subdirs Project</source>
<translation>Projekt z podkatalogami</translation>
@@ -16199,9 +16079,6 @@ Ponowić próbę?</translation>
<comment>Title of dialog</comment>
<translation>Nowy podprojekt</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SubdirsProjectWizardDialog</name>
<message>
<source>This wizard generates a Qt Subdirs project. Add subprojects to it later on by using the other wizards.</source>
<translation>Ten kreator generuje projekt z podkatalogami Qt. Podprojekty mogą być dodane później przy użyciu innych kreatorów.</translation>
@@ -17748,7 +17625,7 @@ Do you want to save the data first?</source>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeBuildConfiguration</name>
<name>QmakeProjectManager</name>
<message>
<source>Could not parse Makefile.</source>
<translation>Błąd parsowania pliku Makefile.</translation>
@@ -17773,9 +17650,6 @@ Do you want to save the data first?</source>
<source>Parsing the .pro file</source>
<translation>Parsowanie pliku .pro</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeBuildConfigurationFactory</name>
<message>
<source>Release</source>
<comment>Shadow build directory suffix</comment>
@@ -19990,30 +19864,15 @@ Przedrostki te, w dodatku do nazwy bieżącego pliku, używane są do przełącz
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::MakeStep</name>
<name>QmakeProjectManager</name>
<message>
<source>Make arguments:</source>
<translation>Argumenty make&apos;a:</translation>
</message>
<message>
<source>Override %1:</source>
<translation>Nadpisz %1:</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QMakeStep</name>
<message>
<source>qmake build configuration:</source>
<translation>Konfiguracja qmake:</translation>
</message>
<message>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
<source>Release</source>
<translation>Release</translation>
</message>
<message>
<source>Additional arguments:</source>
<translation>Dodatkowe argumenty:</translation>
@@ -21577,7 +21436,7 @@ Wersje Qt można dodać w: Opcje &gt; Budowanie i uruchamianie &gt; Wersje Qt.</
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeLocatorFilter</name>
<name>CMakeProjectManager</name>
<message>
<source>Build CMake target</source>
<translation>Zbudowanie programu CMake&apos;owego</translation>
@@ -23008,7 +22867,7 @@ poinstruuje Qt Creatora o URI.</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::CheckOutDialog</name>
<name>ClearCase</name>
<message>
<source>Check Out</source>
<translation>Kopia robocza</translation>
@@ -23034,9 +22893,6 @@ poinstruuje Qt Creatora o URI.</translation>
<source>&amp;Checkout comment:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ClearCase::Internal::SettingsPage</name>
<message>
<source>Configuration</source>
<translation>Konfiguracja</translation>
@@ -23118,9 +22974,6 @@ poinstruuje Qt Creatora o URI.</translation>
<source>Do &amp;not prompt for comment during checkout or check-in</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ClearCase::Internal::UndoCheckOut</name>
<message>
<source>Dialog</source>
<translation>Dialog</translation>
@@ -23133,9 +22986,6 @@ poinstruuje Qt Creatora o URI.</translation>
<source>&amp;Save copy of the file with a &apos;.keep&apos; extension</source>
<translation>&amp;Zachowaj kopię pliku z rozszerzeniem &quot;.keep&quot;</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::VersionSelector</name>
<message>
<source>Confirm Version to Check Out</source>
<translation>Potwierdź wersję dla kopii roboczej</translation>
@@ -23174,7 +23024,7 @@ poinstruuje Qt Creatora o URI.</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ActivitySelector</name>
<name>ClearCase</name>
<message>
<source>Select &amp;activity:</source>
<translation>Wybierz &amp;aktywność:</translation>
@@ -23187,9 +23037,6 @@ poinstruuje Qt Creatora o URI.</translation>
<source>Keep item activity</source>
<translation>Zachowaj aktywność elementu</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCasePlugin</name>
<message>
<source>C&amp;learCase</source>
<translation>C&amp;learCase</translation>
@@ -23482,31 +23329,18 @@ poinstruuje Qt Creatora o URI.</translation>
<source>Enter activity headline</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseSubmitEditor</name>
<message>
<source>ClearCase Check In</source>
<translation>Wrzuć do ClearCase</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseSubmitEditorWidget</name>
<message>
<source>Chec&amp;k in even if identical to previous version</source>
<translation>W&amp;rzuć, nawet jeśli wersja jest identyczna z wersją poprzednią</translation>
</message>
<message>
<source>&amp;Preserve file modification time</source>
<translation>Zachowaj czas modyfikacji &amp;pliku</translation>
</message>
<message>
<source>&amp;Check In</source>
<translation>&amp;Wrzuć</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::SettingsPageWidget</name>
<message>
<source>ClearCase Command</source>
<translation>Komenda ClearCase</translation>
@@ -23628,7 +23462,7 @@ You can choose another communication channel here, such as a serial line or cust
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseControl</name>
<name>ClearCase</name>
<message>
<source>Check &amp;Out</source>
<translation type="unfinished"></translation>
@@ -23974,7 +23808,7 @@ You can choose another communication channel here, such as a serial line or cust
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeKitConfigWidget</name>
<name>QmakeProjectManager</name>
<message>
<source>The mkspec to use when building the project with qmake.&lt;br&gt;This setting is ignored when using other build systems.</source>
<translation>Mkspec, który należy użyć do budowania projektów qmake.&lt;br&gt;To ustawienie zostanie zignorowane dla innych systemów budowania.</translation>
@@ -23983,9 +23817,6 @@ You can choose another communication channel here, such as a serial line or cust
<source>Qt mkspec:</source>
<translation>Qt mkspec:</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeKitInformation</name>
<message>
<source>No Qt version set, so mkspec is ignored.</source>
<translation>Brak ustawionej wersji Qt, mkspec zostanie zignorowany.</translation>
@@ -28213,7 +28044,7 @@ Proszę zamknąć wszystkie instancje tej aplikacji przed uruchomieniem budowani
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::Qt4Target</name>
<name>QmakeProjectManager</name>
<message>
<source>Desktop</source>
<comment>Qt4 Desktop target display name</comment>
@@ -28276,7 +28107,7 @@ Proszę zamknąć wszystkie instancje tej aplikacji przed uruchomieniem budowani
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DesktopQmakeRunConfiguration</name>
<name>QmakeProjectManager</name>
<message>
<source>The .pro file &quot;%1&quot; is currently being parsed.</source>
<translation>Trwa parsowanie pliku .pro &quot;%1&quot;.</translation>
@@ -28285,9 +28116,6 @@ Proszę zamknąć wszystkie instancje tej aplikacji przed uruchomieniem budowani
<source>Qt Run Configuration</source>
<translation>Konfiguracja uruchamiania Qt</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DesktopQmakeRunConfigurationWidget</name>
<message>
<source>Executable:</source>
<translation>Plik wykonywalny:</translation>
@@ -28317,17 +28145,6 @@ Proszę zamknąć wszystkie instancje tej aplikacji przed uruchomieniem budowani
<translation>Dodaj ścieżkę poszukiwań bibliotek na potrzeby budowania do zmiennej LD_LIBRARY_PATH</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectImporter</name>
<message>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
<source>Release</source>
<translation>Release</translation>
</message>
</context>
<context>
<name>TabViewToolAction</name>
<message>
@@ -30646,7 +30463,7 @@ Zainstaluj SDK o wersji %1 lub wyższej.</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseEditorWidget</name>
<name>ClearCase</name>
<message>
<source>Annotate version &quot;%1&quot;</source>
<translation>Dołącz adnotację do wersji &quot;%1&quot;</translation>
@@ -34389,7 +34206,7 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeKitConfigWidget</name>
<name>CMakeProjectManager</name>
<message>
<source>CMake Tool:</source>
<translation>Narzędzie CMake:</translation>
@@ -34402,17 +34219,10 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan
<source>&lt;No CMake Tool available&gt;</source>
<translation>&lt;Brak narzędzia CMake&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeKitInformation</name>
<message>
<source>CMake version %1 is unsupported. Please update to version 3.0 or later.</source>
<translation>Wersja CMake %1 nie jest obsługiwana. Należy zainstalować wersję 3.0 lub nowszą.</translation>
</message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message>
<source>Unconfigured</source>
<translation>Nieskonfigurowane</translation>
@@ -34421,9 +34231,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan
<source>Path to the cmake executable</source>
<translation>Ścieżka do pliku wykonywalnego cmake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeSettingsPage</name>
<message>
<source> (Default)</source>
<translatorcomment>what default???</translatorcomment>
@@ -34461,9 +34268,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan
<source>Path:</source>
<translation>Ścieżka:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeToolConfigWidget</name>
<message>
<source>Add</source>
<translation>Dodaj</translation>
@@ -34492,9 +34296,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan
<source>New CMake</source>
<translation>Nowy CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeToolManager</name>
<message>
<source>CMake at %1</source>
<translation>CMake w %1</translation>
@@ -36532,7 +36333,7 @@ itself takes time.</source>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeProject</name>
<name>CMakeProjectManager</name>
<message>
<source>No cmake tool set.</source>
<translation>Nie ustawiono narzędzia cmake.</translation>
@@ -37912,7 +37713,7 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::BuildDirManager</name>
<name>CMakeProjectManager</name>
<message>
<source>Failed to create temporary directory &quot;%1&quot;.</source>
<translation>Nie można utworzyć katalogu tymczasowego &quot;%1&quot;.</translation>
@@ -37945,16 +37746,10 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
<source>Apply Changes to Project</source>
<translation>Zastosuj zmiany w projekcie</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfiguration</name>
<message>
<source>CMake configuration set by the kit was overridden in the project.</source>
<translation>Konfiguracja CMake, ustawiona przez zestaw narzędzi, została nadpisana przez projekt.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStep</name>
<message>
<source>CMake Build</source>
<extracomment>Default display name for the cmake make step.</extracomment>
@@ -37982,16 +37777,10 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
<translation>Błąd parsowania QMake: %1
</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeBuildStep</name>
<message>
<source>The build configuration is currently disabled.</source>
<translation>Konfiguracja budowania aktualnie wyłączona.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepConfigWidget</name>
<message>
<source>Tool arguments:</source>
<translation>Argumenty narzędzia:</translation>
@@ -38009,17 +37798,11 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
<source>&lt;b&gt;No build configuration found on this kit.&lt;/b&gt;</source>
<translation>&lt;b&gt;Brak konfiguracji budowania dla tego zestawu narzędzi.&lt;/b&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepFactory</name>
<message>
<source>Build</source>
<comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment>
<translation>Budowanie</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeGeneratorKitConfigWidget</name>
<message>
<source>Change...</source>
<translation>Zmień...</translation>
@@ -38060,13 +37843,6 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
<source>Toolset:</source>
<translation>Zestaw narzędzi:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeConfigurationKitConfigWidget</name>
<message>
<source>Change...</source>
<translation>Zmień...</translation>
</message>
<message>
<source>CMake Configuration</source>
<translation>Konfiguracja CMake</translation>
@@ -38083,9 +37859,6 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
<source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source>
<translation>W każdej linii podaj jedną zmienną. Nazwa zmiennej powinna być oddzielona od wartości zmiennej przy użyciu &quot;=&quot;.&lt;br&gt;Informacje o typie można dodać poprzez umieszczenie &quot;:TYP&quot; przed &quot;=&quot;.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeGeneratorKitInformation</name>
<message>
<source>CMake Tool is unconfigured, CMake generator will be ignored.</source>
<translation>Narzędzie CMake nie jest skonfigurowane. Generator CMake zostanie zignorowany.</translation>
@@ -38118,17 +37891,10 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
<source>&lt;br&gt;Toolset: %1</source>
<translation>&lt;br&gt;Zestaw narzędzi: %1</translation>
</message>
<message>
<source>CMake Generator</source>
<translation>Generator CMake</translation>
</message>
<message>
<source>&lt;Use Default Generator&gt;</source>
<translation>&lt;Użyj domyślnego generatora&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigurationKitInformation</name>
<message>
<source>CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version.</source>
<translation>Brak ścieżki do pliku wykonywalnego qmake w konfiguracji CMake, mimo że zestaw narzędzi posiada poprawną wersję Qt.</translation>
@@ -38169,17 +37935,6 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
<source>CMake configuration has a path to a C++ compiler set, even though the kit has no valid tool chain.</source>
<translation>Konfiguracja CMake posiada ustawioną ścieżkę do kompilatora C++, mimo że zestaw narzędzi nie posiada poprawnej ścieżki.</translation>
</message>
<message>
<source>CMake Configuration</source>
<translation>Konfiguracja CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::ConfigModel</name>
<message>
<source>&lt;UNSET&gt;</source>
<translation>&lt;USUNIĘTO&gt;</translation>
</message>
<message>
<source>Kit value: %1</source>
<translation>Wartość zestawu narzędzi: %1</translation>
@@ -38192,10 +37947,6 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
<source>Value</source>
<translation>Wartość</translation>
</message>
<message>
<source>Advanced</source>
<translation>Zaawansowane</translation>
</message>
</context>
<context>
<name>Core::Internal::ThemeChooser</name>
@@ -39300,7 +39051,7 @@ Komunikat:
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeEditorFactory</name>
<name>CMakeProjectManager</name>
<message>
<source>CMake Editor</source>
<translation>Edytor CMake</translation>
@@ -39541,14 +39292,11 @@ w ścieżce.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::FilesSelectionWizardPage</name>
<name>QmakeProjectManager</name>
<message>
<source>Files</source>
<translation>Pliki</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SimpleProjectWizardDialog</name>
<message>
<source>Import Existing Project</source>
<translation>Import istniejącego projektu</translation>
@@ -39569,9 +39317,6 @@ w ścieżce.</translation>
<source>File Selection</source>
<translation>Wybór pliku</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SimpleProjectWizard</name>
<message>
<source>Import as qmake Project (Limited Functionality)</source>
<translation>Zaimportuj jako projekt qmake (ograniczona funkcjonalność)</translation>
@@ -42013,7 +41758,7 @@ Błąd: %2</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigItem</name>
<name>CMakeProjectManager</name>
<message>
<source>Failed to open %1 for reading.</source>
<translation>Błąd otwierania %1 do odczytu.</translation>
@@ -42042,7 +41787,7 @@ Błąd: %2</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeProjectPlugin</name>
<name>CMakeProjectManager</name>
<message>
<source>CMake</source>
<comment>SnippetProvider</comment>
@@ -42056,9 +41801,6 @@ Błąd: %2</translation>
<source>Build &quot;%1&quot;</source>
<translation>Zbuduj &quot;%1&quot;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager</name>
<message>
<source>Current CMake: %1</source>
<translation>Bieżący CMake: %1</translation>
@@ -42067,9 +41809,6 @@ Błąd: %2</translation>
<source>Not in CMakeCache.txt</source>
<translation>Brak w CMakeCache.txt</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::ServerMode</name>
<message>
<source>Running &quot;%1 %2&quot; in %3.</source>
<translation>Uruchamianie &quot;%1 %2&quot; w %3.</translation>
@@ -42154,9 +41893,6 @@ Błąd: %2</translation>
<source>Received a signal in reply to a request.</source>
<translation>Otrzymano sygnał w odpowiedzi na żądanie.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::ServerModeReader</name>
<message>
<source>Configuring &quot;%1&quot;</source>
<translation>Konfiguracja &quot;%1&quot;</translation>
@@ -42189,21 +41925,10 @@ Błąd: %2</translation>
<source>&lt;Headers&gt;</source>
<translation>&lt;Nagłówki&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::TeaLeafReader</name>
<message>
<source>The build directory is not for %1 but for %2</source>
<translation>Katalog budowania nie jest przeznaczony dla %1, lecz dla %2</translation>
</message>
<message>
<source>Running &quot;%1 %2&quot; in %3.</source>
<translation>Uruchamianie &quot;%1 %2&quot; w %3.</translation>
</message>
<message>
<source>Configuring &quot;%1&quot;</source>
<translation>Konfiguracja &quot;%1&quot;</translation>
</message>
<message>
<source>*** cmake process crashed.</source>
<translation>*** Proces cmake przerwał pracę.</translation>
@@ -42503,7 +42228,7 @@ Termin wygaśnięcia: %3</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakePriFile</name>
<name>QmakeProjectManager</name>
<message>
<source>Headers</source>
<translation>Nagłówki</translation>
@@ -42532,9 +42257,6 @@ Termin wygaśnięcia: %3</translation>
<source>Other files</source>
<translation>Inne pliki</translation>
</message>
</context>
<context>
<name>QmakePriFile</name>
<message>
<source>Failed</source>
<translation>Niepoprawnie zakończone</translation>
@@ -42547,9 +42269,6 @@ Termin wygaśnięcia: %3</translation>
<source>File Error</source>
<translation>Błąd pliku</translation>
</message>
</context>
<context>
<name>QmakeProFile</name>
<message>
<source>Error while parsing file %1. Giving up.</source>
<translation>Błąd parsowania pliku %1. Przetwarzanie przerwane.</translation>

277
share/qtcreator/translations/qtcreator_ru.ts
View File

@@ -6074,16 +6074,10 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Value requested by kit: %1</source>
<translation>Запрошенное комплектом значение: %1</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigItem</name>
<message>
<source>Failed to open %1 for reading.</source>
<translation>Не удалось открыть %1 для чтения.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigurationKitAspect</name>
<message>
<source>CMake Configuration</source>
<translation>Конфигурация CMake</translation>
@@ -6132,9 +6126,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>CMake configuration has a path to a C++ compiler set that does not match the compiler path configured in the tool chain of the kit.</source>
<translation>В конфигурации CMake указан путь к компилятору С++, но он не совпадает с заданным в инструментарии комплекта.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeGeneratorKitAspect</name>
<message>
<source>CMake generator</source>
<translation>Генератор CMake</translation>
@@ -6183,9 +6174,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>CMake Generator</source>
<translation>Генератор CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeKitAspect</name>
<message>
<source>CMake Tool</source>
<translation>Программа CMake</translation>
@@ -6210,9 +6198,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Path to the cmake executable</source>
<translation>Путь к программе cmake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeProject</name>
<message>
<source>No cmake tool set.</source>
<translation>Программа cmake не указана.</translation>
@@ -6221,9 +6206,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>No compilers set in kit.</source>
<translation>У комплекта не заданы компиляторы.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeSettingsPage</name>
<message>
<source>Version: %1&lt;br&gt;Supports fileApi: %2</source>
<translation>Версия: %1&lt;br&gt;Поддерживается fileApi: %2</translation>
@@ -6288,20 +6270,10 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Help file:</source>
<translation>Файл справки:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeToolManager</name>
<message>
<source>System CMake at %1</source>
<translation>Системная CMake в %1</translation>
</message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::ConfigModel</name>
<message>
<source>Key</source>
<translation>Ключ</translation>
@@ -6322,9 +6294,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Value</source>
<translation>Значение</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::ConfigModelItemDelegate</name>
<message>
<source>Select a file for %1</source>
<translation>Выберите файл для %1</translation>
@@ -6333,9 +6302,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Select a directory for %1</source>
<translation>Выберите каталог для %1</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal</name>
<message>
<source>Failed to set up CMake file API support. Qt Creator cannot extract project information.</source>
<translation>Не удалось настроить поддержку API файла CMake. Qt Creator не может извлечь информацию о проекте.</translation>
@@ -6408,16 +6374,10 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Invalid target file generated by CMake: Broken indexes in target details.</source>
<translation>CMake создал неверный цели файл: повреждены индексы в деталях цели.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::BuildCMakeTargetLocatorFilter</name>
<message>
<source>Build CMake target</source>
<translation>Собрать цель CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfiguration</name>
<message>
<source>Changing Build Directory</source>
<translation>Изменение каталога сборки</translation>
@@ -6434,9 +6394,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Release with Debug Information</source>
<translation>Выпуск с отладочной информацией</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
<source>Filter</source>
<translation>Фильтр</translation>
@@ -6497,10 +6454,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Apply Configuration Changes</source>
<translation>Применить изменения</translation>
</message>
<message>
<source>&lt;UNSET&gt;</source>
<translation>&lt;не задано&gt;</translation>
</message>
<message>
<source>bool</source>
<comment>display string for cmake type BOOLEAN</comment>
@@ -6526,13 +6479,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<translatorcomment>Принудительно булевый/файл/каталог/строка</translatorcomment>
<translation>Принудительно %1</translation>
</message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStep</name>
<message>
<source>CMake Build</source>
<extracomment>Default display name for the cmake make step.</extracomment>
@@ -6567,9 +6513,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment>
<translation>Сборка</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepConfigWidget</name>
<message>
<source>CMake arguments:</source>
<translation>Параметры CMake:</translation>
@@ -6587,9 +6530,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<comment>CMakeProjectManager::CMakeBuildStepConfigWidget display name.</comment>
<translation>Сборка</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSystem</name>
<message>
<source>Scan &quot;%1&quot; project tree</source>
<translation>Сканирование дерева проекта «%1»</translation>
@@ -6618,9 +6558,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>CMakeCache.txt file not found.</source>
<translation>Не удалось найти файл CMakeCache.txt.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeConfigurationKitAspect</name>
<message>
<source>Change...</source>
<translation>Изменить...</translation>
@@ -6633,13 +6570,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source>
<translation>Задавайте значения переменных по одной в строке, отделяя значение от имени символом &quot;=&quot;.&lt;br&gt;Можно указывать тип, добавляя «:ТИП» перед &quot;=&quot;.&lt;br&gt;Например: CMAKE_BUILD_TYPE:STRING=DebWithRelInfo.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeGeneratorKitAspect</name>
<message>
<source>Change...</source>
<translation>Изменить...</translation>
</message>
<message>
<source>%1 - %2, Platform: %3, Toolset: %4</source>
<translation>%1 - %2, Платформа: %3, Инструментарий: %4</translation>
@@ -6648,10 +6578,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>&lt;none&gt;</source>
<translation>&lt;нет&gt;</translation>
</message>
<message>
<source>CMake Generator</source>
<translation>Генератор CMake</translation>
</message>
<message>
<source>Generator:</source>
<translation>Генератор:</translation>
@@ -6668,16 +6594,10 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Toolset:</source>
<translation>Инструментарий:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeKitAspect</name>
<message>
<source>&lt;No CMake Tool available&gt;</source>
<translation>&lt;Программа CMake недоступна&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeManager</name>
<message>
<source>Run CMake</source>
<translation>Запустить CMake</translation>
@@ -6730,9 +6650,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Build File is not supported for generator &quot;%1&quot;</source>
<translation>Операция «Собрать файл» не поддерживается генератором «%1»</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeProcess</name>
<message>
<source>Running %1 in %2.</source>
<translation>Работа %1 на %2.</translation>
@@ -6753,25 +6670,15 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>CMake process exited with exit code %1.</source>
<translation>Процесс CMake завершился с кодом %1.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeProjectPlugin</name>
<message>
<source>CMake</source>
<comment>SnippetProvider</comment>
<translation>CMake</translation>
</message>
<message>
<source>Build</source>
<translation>Собрать</translation>
</message>
<message>
<source>Build &quot;%1&quot;</source>
<translation>Собрать «%1»</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingForm</name>
<message>
<source>Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects.</source>
<translation>Определяет, будут ли копироваться в буфер обмена пути файлов для вставки в файл CMakeLists.txt при добавлении их в проект CMake.</translation>
@@ -6792,16 +6699,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Copy file paths</source>
<translation>Копировать</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingWidget</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeToolConfigWidget</name>
<message>
<source>Add</source>
<translation>Добавить</translation>
@@ -6830,13 +6727,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>New CMake</source>
<translation>Новый CMake</translation>
</message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeToolTreeItem</name>
<message>
<source>CMake executable path does not exist.</source>
<translation>Не найден путь к программе CMake.</translation>
@@ -6853,9 +6743,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>CMake executable does not provided required IDE integration features.</source>
<translation>Не указана программа CMake необходимая для среды разработки.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::FileApi</name>
<message>
<source>&lt;Build Directory&gt;</source>
<translation>&lt;Каталог сборки&gt;</translation>
@@ -6864,38 +6751,18 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>&lt;Other Locations&gt;</source>
<translation>&lt;Другие места&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::FileApiReader</name>
<message>
<source>Parsing has been canceled.</source>
<translation>Разбор был отменён.</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::InitialCMakeArgumentsAspect</name>
<message>
<source>Initial CMake parameters:</source>
<translation>Начальные параметры CMake:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::OpenCMakeTargetLocatorFilter</name>
<message>
<source>Open CMake target</source>
<translation>Открыть цель CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::ProjectTreeHelper</name>
<message>
<source>&lt;Build Directory&gt;</source>
<translation>&lt;Каталог сборки&gt;</translation>
</message>
<message>
<source>&lt;Other Locations&gt;</source>
<translation>&lt;Другие места&gt;</translation>
</message>
<message>
<source>&lt;Headers&gt;</source>
<translation>&lt;Заголовки&gt;</translation>
@@ -8072,7 +7939,7 @@ Set a valid executable first.</source>
</message>
</context>
<context>
<name>ClearCase::Internal::ActivitySelector</name>
<name>ClearCase</name>
<message>
<source>Select &amp;activity:</source>
<translation>Выбрать &amp;активность:</translation>
@@ -8085,9 +7952,6 @@ Set a valid executable first.</source>
<source>Keep item activity</source>
<translation>Сохранить активность элемента</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::CheckOutDialog</name>
<message>
<source>Check Out</source>
<translation>Создание изменяемой копии</translation>
@@ -8113,16 +7977,10 @@ Set a valid executable first.</source>
<source>&amp;Checkout comment:</source>
<translation>&amp;Комментарий:</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseEditorWidget</name>
<message>
<source>Annotate version &quot;%1&quot;</source>
<translation>Аннотация версии «%1»</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCasePluginPrivate</name>
<message>
<source>Editing Derived Object: %1</source>
<translation>Изменение производного объекта: %1</translation>
@@ -8399,31 +8257,18 @@ Set a valid executable first.</source>
<source>&amp;Hijack</source>
<translation>&amp;Исправить</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseSubmitEditor</name>
<message>
<source>ClearCase Check In</source>
<translation>Фиксация ClearCase</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::ClearCaseSubmitEditorWidget</name>
<message>
<source>Chec&amp;k in even if identical to previous version</source>
<translation>Фиксироват&amp;ь, даже если совпадает с предыдущей версией</translation>
</message>
<message>
<source>&amp;Preserve file modification time</source>
<translation>&amp;Сохранять время изменения файлов</translation>
</message>
<message>
<source>&amp;Check In</source>
<translation>&amp;Фиксировать</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::SettingsPage</name>
<message>
<source>Configuration</source>
<translation>Конфигурация</translation>
@@ -8503,9 +8348,6 @@ Set a valid executable first.</source>
<source>Do &amp;not prompt for comment during checkout or check-in</source>
<translation>&amp;Не спрашивать комментарии при получении и фиксации</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::SettingsPageWidget</name>
<message>
<source>ClearCase Command</source>
<translation>Команда ClearCase</translation>
@@ -8522,9 +8364,6 @@ Set a valid executable first.</source>
<source>ClearCase</source>
<translation>ClearCase</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::UndoCheckOut</name>
<message>
<source>Dialog</source>
<translation></translation>
@@ -8537,9 +8376,6 @@ Set a valid executable first.</source>
<source>&amp;Save copy of the file with a &apos;.keep&apos; extension</source>
<translation>&amp;Сохранить копию файла с расширением «.keep»</translation>
</message>
</context>
<context>
<name>ClearCase::Internal::VersionSelector</name>
<message>
<source>Confirm Version to Check Out</source>
<translation>Подтвердите версию для извлечения</translation>
@@ -37486,7 +37322,7 @@ The affected files are:
</message>
</context>
<context>
<name>QmakePriFile</name>
<name>QmakeProjectManager</name>
<message>
<source>Failed</source>
<translation>Сбой</translation>
@@ -37499,9 +37335,6 @@ The affected files are:
<source>File Error</source>
<translation>Ошибка файла</translation>
</message>
</context>
<context>
<name>QmakeProFile</name>
<message>
<source>Error while parsing file %1. Giving up.</source>
<translation>Ошибка разбора файла %1. Отмена.</translation>
@@ -37510,25 +37343,16 @@ The affected files are:
<source>Could not find .pro file for subdirectory &quot;%1&quot; in &quot;%2&quot;.</source>
<translation>Не удалось найти .pro файл для подкаталога «%1» в «%2».</translation>
</message>
</context>
<context>
<name>QmakeProjectManager</name>
<message>
<source>&quot;%1&quot; is used by qmake, but &quot;%2&quot; is configured in the kit.
Please update your kit (%3) or choose a mkspec for qmake that matches your target environment better.</source>
<translation>«%1» используется qmake, но «%2» задан в комплекте.
Обновите комплект (%3) или выберите подходящей для вашей целевой платформы mkspec для qmake.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::AddLibraryWizard</name>
<message>
<source>Add Library</source>
<translation>Добавить библиотеку</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::BaseQmakeProjectWizardDialog</name>
<message>
<source>Required Qt features not present.</source>
<translation>Отсутствуют необходимые особенности Qt.</translation>
@@ -37541,9 +37365,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
<source>Qt version does not provide all features.</source>
<translation>Профиль Qt не имеет всех особенностей.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ClassDefinition</name>
<message>
<source>The header file</source>
<translation>Заголовочный файл</translation>
@@ -37644,9 +37465,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
<source>Icon files (*.png *.ico *.jpg *.xpm *.tif *.svg)</source>
<translation>Файлы значков (*.png *.ico *.jpg *.xpm *.tif *.svg)</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ClassList</name>
<message>
<source>&lt;New class&gt;</source>
<translation>&lt;Новый класс&gt;</translation>
@@ -37659,9 +37477,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
<source>Delete class %1 from list?</source>
<translation>Удалить класс %1 из списка?</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetPluginWizardPage</name>
<message>
<source>WizardPage</source>
<translation></translation>
@@ -37702,9 +37517,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
<source>Plugin Details</source>
<translation>Подробнее о модуле</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWidgetsWizardPage</name>
<message>
<source>Custom Qt Widget Wizard</source>
<translation>Мастер пользовательских виджетов</translation>
@@ -37729,9 +37541,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
<source>Custom Widgets</source>
<translation>Особые виджеты</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWizard</name>
<message>
<source>Qt Custom Designer Widget</source>
<translation>Пользовательский виджет Qt Designer</translation>
@@ -37740,16 +37549,10 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
<source>Creates a Qt Custom Designer Widget or a Custom Widget Collection.</source>
<translation>Создание пользовательского виджета Qt Designer или набора пользовательских виджетов.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::CustomWidgetWizardDialog</name>
<message>
<source>This wizard generates a Qt Designer Custom Widget or a Qt Designer Custom Widget Collection project.</source>
<translation>Этот мастер создаст пользовательский виджет или набор пользовательских виджетов для Qt Designer.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DesignerExternalEditor</name>
<message>
<source>Qt Designer is not responding (%1).</source>
<translation>Qt Designer не отвечает (%1).</translation>
@@ -37758,9 +37561,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
<source>Unable to create server socket: %1</source>
<translation>Невозможно создать серверный сокет: %1</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::DetailsPage</name>
<message>
<source>Details</source>
<translation>Подробнее</translation>
@@ -37797,9 +37597,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
<source>Specify the package to link to</source>
<translation>Выберите пакет для компоновки</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::ExternalQtEditor</name>
<message>
<source>Unable to start &quot;%1&quot;</source>
<translation>Не удалось запустить «%1»</translation>
@@ -37808,9 +37605,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
<source>The application &quot;%1&quot; could not be found.</source>
<translation>Не удалось найти приложение «%1».</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryDetailsController</name>
<message>
<source>Linkage:</source>
<translation>Компоновка:</translation>
@@ -37835,9 +37629,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
<source>%1 Library</source>
<translation>%1 Библиотека</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryDetailsWidget</name>
<message>
<source>Library:</source>
<translation>Библиотека:</translation>
@@ -37870,10 +37661,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
<source>Windows</source>
<translation>Windows</translation>
</message>
<message>
<source>Linkage:</source>
<translation>Компоновка:</translation>
</message>
<message>
<source>Dynamic</source>
<translation>Динамическая</translation>
@@ -37882,10 +37669,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
<source>Static</source>
<translation>Статическая</translation>
</message>
<message>
<source>Mac:</source>
<translation>Mac:</translation>
</message>
<message>
<source>Library</source>
<translation>Библиотека</translation>
@@ -37914,9 +37697,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
<source>Library type:</source>
<translation>Тип библиотеки:</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::LibraryTypePage</name>
<message>
<source>Library Type</source>
<translation>Тип библиотеки</translation>
@@ -37967,16 +37747,10 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>Type</source>
<translation>Тип</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::PluginGenerator</name>
<message>
<source>Creating multiple widget libraries (%1, %2) in one project (%3) is not supported.</source>
<translation>Создание нескольких библиотек виджетов (%1, %2) в одном проекте (%3) не поддерживается.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeKitAspect</name>
<message>
<source>Qt mkspec</source>
<translation>Qt mkspec</translation>
@@ -38001,9 +37775,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>Mkspec configured for qmake by the kit.</source>
<translation>Mkspec настроенный комплектом для qmake.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectImporter</name>
<message>
<source>Debug</source>
<translation>Отладка</translation>
@@ -38012,9 +37783,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>Release</source>
<translation>Выпуск</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeProjectManagerPlugin</name>
<message>
<source>Build</source>
<translation>Собрать</translation>
@@ -38079,9 +37847,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>QMake</source>
<translation>QMake</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::QmakeSettingsPage</name>
<message>
<source>Warn if a project&apos;s source and build directories are not at the same level</source>
<translation>Предупреждать, если каталоги сборки и исходников проекта находятся на разных уровнях</translation>
@@ -38102,9 +37867,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>Qmake</source>
<translation>QMake</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SubdirsProjectWizard</name>
<message>
<source>Subdirs Project</source>
<translation>Проект с поддиректориями</translation>
@@ -38126,16 +37888,10 @@ Neither the path to the library nor the path to its includes is added to the .pr
<comment>Title of dialog</comment>
<translation>Создание подпроекта</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SubdirsProjectWizardDialog</name>
<message>
<source>This wizard generates a Qt Subdirs project. Add subprojects to it later on by using the other wizards.</source>
<translation>Этот мастер создаст проект Qt с подкаталогами. Затем с помощью других мастеров добавьте в него подпроекты.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::Internal::SummaryPage</name>
<message>
<source>Summary</source>
<translation>Итог</translation>
@@ -38144,9 +37900,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>The following snippet will be added to the&lt;br&gt;&lt;b&gt;%1&lt;/b&gt; file:</source>
<translation>Следующий код будет добавлен в&lt;br&gt;файл &lt;b&gt;%1&lt;/b&gt;:</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QMakeStep</name>
<message>
<source>qmake</source>
<extracomment>QMakeStep default display name</extracomment>
@@ -38172,9 +37925,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>&lt;no Make step found&gt;</source>
<translation>&lt;этап Make не найден&gt;</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QMakeStepConfigWidget</name>
<message>
<source>QML Debugging</source>
<translation>Отладка QML</translation>
@@ -38183,14 +37933,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>qmake build configuration:</source>
<translation>Конфигурация сборки qmake:</translation>
</message>
<message>
<source>Debug</source>
<translation>Отладка</translation>
</message>
<message>
<source>Release</source>
<translation>Выпуск</translation>
</message>
<message>
<source>Additional arguments:</source>
<translation>Дополнительные параметры:</translation>
@@ -38223,9 +37965,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>&lt;b&gt;qmake:&lt;/b&gt; %1 %2</source>
<translation>&lt;b&gt;qmake:&lt;/b&gt; %1 %2</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeBuildConfiguration</name>
<message>
<source>General</source>
<translation>Основное</translation>
@@ -38293,9 +38032,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<extracomment>Non-ASCII characters in directory suffix may cause build issues.</extracomment>
<translation>Profile</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeBuildSystem</name>
<message>
<source>Reading Project &quot;%1&quot;</source>
<translation>Чтение проекта «%1»</translation>
@@ -38308,9 +38044,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>Cannot parse project &quot;%1&quot;: No kit selected.</source>
<translation>Не удалось разобрать проект «%1»: комплект не выбран.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeMakeStep</name>
<message>
<source>Cannot find Makefile. Check your build settings.</source>
<translation>Не удалось обнаружить Makefile. Проверьте настройки сборки.</translation>
@@ -38319,9 +38052,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>The build directory is not at the same level as the source directory, which could be the reason for the build failure.</source>
<translation>Каталог сборки не на том же уровне, что каталог исходников. Из-за этого может возникнуть сбой сборки.</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakePriFile</name>
<message>
<source>Headers</source>
<translation>Заголовочные</translation>
@@ -38354,9 +38084,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<source>Generated Files</source>
<translation>Созданные файлы</translation>
</message>
</context>
<context>
<name>QmakeProjectManager::QmakeProject</name>
<message>
<source>No Qt version set in kit.</source>
<translation>Для комплекта не задан профиль Qt.</translation>

549
share/qtcreator/translations/qtcreator_sl.ts
View File

File diff suppressed because it is too large Load Diff

684
share/qtcreator/translations/qtcreator_uk.ts
View File

File diff suppressed because it is too large Load Diff

1037
share/qtcreator/translations/qtcreator_zh_CN.ts
View File

File diff suppressed because it is too large Load Diff

576
share/qtcreator/translations/qtcreator_zh_TW.ts
View File

File diff suppressed because it is too large Load Diff

2
src/libs/utils/filepath.cpp
View File

@@ -1219,6 +1219,8 @@ FilePath FilePath::searchInDirectories(const FilePaths &dirs) const
FilePath FilePath::searchInPath(const FilePaths &additionalDirs, PathAmending amending) const
{
if (isAbsolutePath())
return *this;
FilePaths directories = deviceEnvironment().path();
if (!additionalDirs.isEmpty()) {
if (amending == AppendToPath)

7
src/libs/utils/layoutbuilder.h
View File

@@ -217,6 +217,13 @@ public:
Stack(std::initializer_list<LayoutItem> items) : LayoutBuilder(StackLayout, items) {}
};
class QTCREATOR_UTILS_EXPORT Splitter : public LayoutBuilder
{
public:
Splitter() : LayoutBuilder(StackLayout) {}
Splitter(std::initializer_list<LayoutItem> items) : LayoutBuilder(StackLayout, items) {}
};
using Space = LayoutBuilder::Space;
using Span = LayoutBuilder::Span;

32
src/plugins/android/androidavdmanager.cpp
View File

@@ -15,7 +15,6 @@
#include <utils/runextensions.h>
#include <QApplication>
#include <QFileInfo>
#include <QLoggingCategory>
#include <QMainWindow>
#include <QMessageBox>
@@ -26,17 +25,14 @@
using namespace Utils;
namespace {
static Q_LOGGING_CATEGORY(avdManagerLog, "qtc.android.avdManager", QtWarningMsg)
}
namespace Android {
namespace Internal {
namespace Android::Internal {
using namespace std;
const int avdCreateTimeoutMs = 30000;
static Q_LOGGING_CATEGORY(avdManagerLog, "qtc.android.avdManager", QtWarningMsg)
/*!
Runs the \c avdmanager tool specific to configuration \a config with arguments \a args. Returns
\c true if the command is successfully executed. Output is copied into \a output. The function
@@ -244,16 +240,15 @@ QString AndroidAvdManager::startAvd(const QString &name) const
bool AndroidAvdManager::startAvdAsync(const QString &avdName) const
{
QFileInfo info(m_config.emulatorToolPath().toString());
if (!info.exists()) {
const QString emulatorToolPath = m_config.emulatorToolPath().toUserOutput();
QMetaObject::invokeMethod(Core::ICore::mainWindow(), [emulatorToolPath] {
const FilePath emulator = m_config.emulatorToolPath();
if (!emulator.exists()) {
QMetaObject::invokeMethod(Core::ICore::mainWindow(), [emulator] {
QMessageBox::critical(Core::ICore::dialogParent(),
AndroidAvdManager::tr("Emulator Tool Is Missing"),
AndroidAvdManager::tr(
"Install the missing emulator tool (%1) to the"
" installed Android SDK.")
.arg(emulatorToolPath));
.arg(emulator.displayName()));
});
return false;
}
@@ -343,16 +338,13 @@ bool AndroidAvdManager::waitForBooted(const QString &serialNumber,
for (int i = 0; i < 60; ++i) {
if (cancelChecker && cancelChecker())
return false;
if (isAvdBooted(serialNumber)) {
if (isAvdBooted(serialNumber))
return true;
} else {
QThread::sleep(2);
if (!m_config.isConnected(serialNumber)) // device was disconnected
return false;
}
QThread::sleep(2);
if (!m_config.isConnected(serialNumber)) // device was disconnected
return false;
}
return false;
}
} // namespace Internal
} // namespace Android
} // Android::Internal

6
src/plugins/android/androidavdmanager.h
View File

@@ -7,8 +7,7 @@
#include <functional>
#include <memory>
namespace Android {
namespace Internal {
namespace Android::Internal {
class AndroidAvdManager
{
@@ -40,5 +39,4 @@ private:
const AndroidConfig &m_config;
};
} // namespace Internal
} // namespace Android
} // Android::Internal

1
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -42,6 +42,7 @@
#include <QLoggingCategory>
#include <QMessageBox>
#include <QPushButton>
#include <QRegularExpression>
#include <QVBoxLayout>
using namespace ProjectExplorer;

37
src/plugins/android/androidtoolchain.cpp
View File

@@ -11,19 +11,15 @@
#include <utils/environment.h>
#include <QFileInfo>
#include <QLoggingCategory>
namespace {
static Q_LOGGING_CATEGORY(androidTCLog, "qtc.android.toolchainmanagement", QtWarningMsg);
}
using namespace ProjectExplorer;
using namespace Utils;
namespace Android {
namespace Internal {
using namespace ProjectExplorer;
using namespace Utils;
static Q_LOGGING_CATEGORY(androidTCLog, "qtc.android.toolchainmanagement", QtWarningMsg);
using ClangTargetsType = QHash<QString, Abi>;
Q_GLOBAL_STATIC_WITH_ARGS(ClangTargetsType, ClangTargets, ({
@@ -37,14 +33,10 @@ Q_GLOBAL_STATIC_WITH_ARGS(ClangTargetsType, ClangTargets, ({
Abi(Abi::ArmArchitecture, Abi::LinuxOS, Abi::AndroidLinuxFlavor, Abi::ElfFormat, 64)}}
));
Q_GLOBAL_STATIC_WITH_ARGS(QList<Utils::Id>, LanguageIds, (
{ProjectExplorer::Constants::CXX_LANGUAGE_ID,
ProjectExplorer::Constants::C_LANGUAGE_ID}))
static ToolChain *findToolChain(Utils::FilePath &compilerPath, Utils::Id lang, const QString &target,
static ToolChain *findToolChain(FilePath &compilerPath, Id lang, const QString &target,
const ToolChainList &alreadyKnown)
{
ToolChain * tc = Utils::findOrDefault(alreadyKnown, [target, compilerPath, lang](ToolChain *tc) {
ToolChain *tc = Utils::findOrDefault(alreadyKnown, [target, compilerPath, lang](ToolChain *tc) {
return tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID
&& tc->language() == lang
&& tc->targetAbi() == ClangTargets->value(target)
@@ -59,12 +51,12 @@ AndroidToolChain::AndroidToolChain()
setTypeDisplayName(AndroidToolChain::tr("Android Clang"));
}
Utils::FilePath AndroidToolChain::ndkLocation() const
FilePath AndroidToolChain::ndkLocation() const
{
return m_ndkLocation;
}
void AndroidToolChain::setNdkLocation(const Utils::FilePath &ndkLocation)
void AndroidToolChain::setNdkLocation(const FilePath &ndkLocation)
{
m_ndkLocation = ndkLocation;
}
@@ -96,7 +88,7 @@ void AndroidToolChain::addToEnvironment(Environment &env) const
{
const AndroidConfig &config = AndroidConfigurations::currentConfig();
env.set(QLatin1String("ANDROID_NDK_HOST"), config.toolchainHostFromNdk(m_ndkLocation));
const Utils::FilePath javaHome = config.openJDKLocation();
const FilePath javaHome = config.openJDKLocation();
if (javaHome.exists()) {
env.set(Constants::JAVA_HOME_ENV_VAR, javaHome.toUserOutput());
const FilePath javaBin = javaHome.pathAppended("bin");
@@ -175,19 +167,24 @@ static FilePaths uniqueNdksForCurrentQtVersions()
ToolChainList AndroidToolChainFactory::autodetectToolChains(const ToolChainList &alreadyKnown)
{
const QList<Utils::FilePath> uniqueNdks = uniqueNdksForCurrentQtVersions();
const QList<FilePath> uniqueNdks = uniqueNdksForCurrentQtVersions();
return autodetectToolChainsFromNdks(alreadyKnown, uniqueNdks);
}
ToolChainList AndroidToolChainFactory::autodetectToolChainsFromNdks(
const ToolChainList &alreadyKnown,
const QList<Utils::FilePath> &ndkLocations,
const QList<FilePath> &ndkLocations,
const bool isCustom)
{
QList<ToolChain *> result;
const AndroidConfig config = AndroidConfigurations::currentConfig();
for (const Utils::FilePath &ndkLocation : ndkLocations) {
const Id LanguageIds[] {
ProjectExplorer::Constants::CXX_LANGUAGE_ID,
ProjectExplorer::Constants::C_LANGUAGE_ID
};
for (const FilePath &ndkLocation : ndkLocations) {
FilePath clangPath = config.clangPathFromNdk(ndkLocation);
if (!clangPath.exists()) {
qCDebug(androidTCLog) << "Clang toolchains detection fails. Can not find Clang"
@@ -195,7 +192,7 @@ ToolChainList AndroidToolChainFactory::autodetectToolChainsFromNdks(
continue;
}
for (const Utils::Id &lang : *LanguageIds) {
for (const Id &lang : LanguageIds) {
FilePath compilerCommand = clangPath;
if (lang == ProjectExplorer::Constants::CXX_LANGUAGE_ID)
compilerCommand = clangPlusPlusPath(clangPath);

6
src/plugins/android/createandroidmanifestwizard.cpp
View File

@@ -172,10 +172,10 @@ void ChooseDirectoryPage::checkPackageSourceDir()
{
const QString buildKey = m_wizard->buildKey();
const BuildTargetInfo bti = m_wizard->buildSystem()->buildTarget(buildKey);
const QString projectDir = bti.projectFilePath.toFileInfo().absolutePath();
const FilePath projectDir = bti.projectFilePath.absolutePath();
const QString newDir = m_androidPackageSourceDir->filePath().toString();
bool isComplete = QFileInfo(projectDir) != QFileInfo(newDir);
const FilePath newDir = m_androidPackageSourceDir->filePath();
bool isComplete = projectDir.canonicalPath() != newDir.canonicalPath();
m_sourceDirectoryWarning->setVisible(!isComplete);

14
src/plugins/android/javaeditor.cpp
View File

@@ -5,21 +5,18 @@
#include "javaindenter.h"
#include "androidconstants.h"
#include <texteditor/codeassist/keywordscompletionassist.h>
#include <coreplugin/editormanager/ieditorfactory.h>
#include <texteditor/codeassist/keywordscompletionassist.h>
#include <texteditor/textdocument.h>
#include <texteditor/texteditoractionhandler.h>
#include <texteditor/texteditorconstants.h>
#include <texteditor/texteditor.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/fileutils.h>
#include <utils/filepath.h>
#include <utils/uncommentselection.h>
#include <QFileInfo>
namespace Android {
namespace Internal {
namespace Android::Internal {
static TextEditor::TextDocument *createJavaDocument()
{
@@ -55,5 +52,4 @@ JavaEditorFactory::JavaEditorFactory()
setCompletionAssistProvider(new TextEditor::KeywordsCompletionAssistProvider(keywords));
}
} // namespace Internal
} // namespace Android
} // Android::Internal

6
src/plugins/android/javaeditor.h
View File

@@ -5,8 +5,7 @@
#include <texteditor/texteditor.h>
namespace Android {
namespace Internal {
namespace Android::Internal {
class JavaEditorFactory : public TextEditor::TextEditorFactory
{
@@ -14,5 +13,4 @@ public:
JavaEditorFactory();
};
} // namespace Internal
} // namespace Android
} // Android::Internal

29
src/plugins/android/javaparser.cpp
View File

@@ -5,35 +5,38 @@
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/task.h>
#include <QFileInfo>
using namespace Android::Internal;
#include <QRegularExpression>
using namespace ProjectExplorer;
using namespace Utils;
JavaParser::JavaParser() :
m_javaRegExp(QLatin1String("^(.*\\[javac\\]\\s)(.*\\.java):(\\d+):(.*)$"))
namespace Android::Internal {
JavaParser::JavaParser()
{ }
void JavaParser::setProjectFileList(const Utils::FilePaths &fileList)
void JavaParser::setProjectFileList(const FilePaths &fileList)
{
m_fileList = fileList;
}
void JavaParser::setBuildDirectory(const Utils::FilePath &buildDirectory)
void JavaParser::setBuildDirectory(const FilePath &buildDirectory)
{
m_buildDirectory = buildDirectory;
}
void JavaParser::setSourceDirectory(const Utils::FilePath &sourceDirectory)
void JavaParser::setSourceDirectory(const FilePath &sourceDirectory)
{
m_sourceDirectory = sourceDirectory;
}
Utils::OutputLineParser::Result JavaParser::handleLine(const QString &line,
Utils::OutputFormat type)
OutputLineParser::Result JavaParser::handleLine(const QString &line, OutputFormat type)
{
Q_UNUSED(type);
const QRegularExpressionMatch match = m_javaRegExp.match(line);
static const QRegularExpression javaRegExp("^(.*\\[javac\\]\\s)(.*\\.java):(\\d+):(.*)$");
const QRegularExpressionMatch match = javaRegExp.match(line);
if (!match.hasMatch())
return Status::NotHandled;
@@ -41,9 +44,9 @@ Utils::OutputLineParser::Result JavaParser::handleLine(const QString &line,
int lineno = match.captured(3).toInt(&ok);
if (!ok)
lineno = -1;
Utils::FilePath file = Utils::FilePath::fromUserInput(match.captured(2));
FilePath file = FilePath::fromUserInput(match.captured(2));
if (file.isChildOf(m_buildDirectory)) {
Utils::FilePath relativePath = file.relativeChildPath(m_buildDirectory);
FilePath relativePath = file.relativeChildPath(m_buildDirectory);
file = m_sourceDirectory.pathAppended(relativePath.toString());
}
if (file.toFileInfo().isRelative()) {
@@ -63,3 +66,5 @@ Utils::OutputLineParser::Result JavaParser::handleLine(const QString &line,
scheduleTask(task, 1);
return {Status::Done, linkSpecs};
}
} // Android::Internal

14
src/plugins/android/javaparser.h
View File

@@ -4,17 +4,13 @@
#pragma once
#include <projectexplorer/ioutputparser.h>
#include <utils/fileutils.h>
#include <QRegularExpression>
#include <utils/filepath.h>
namespace Android {
namespace Internal {
namespace Android::Internal {
class JavaParser : public ProjectExplorer::OutputTaskParser
{
Q_OBJECT
public:
JavaParser();
@@ -23,13 +19,11 @@ public:
void setSourceDirectory(const Utils::FilePath &sourceDirectory);
private:
Result handleLine(const QString &line, Utils::OutputFormat type) override;
Result handleLine(const QString &line, Utils::OutputFormat type) final;
const QRegularExpression m_javaRegExp;
Utils::FilePaths m_fileList;
Utils::FilePath m_sourceDirectory;
Utils::FilePath m_buildDirectory;
};
} // namespace Internal
} // namespace Android
} // Android::Internal

8
src/plugins/android/splashscreenwidget.cpp
View File

@@ -7,8 +7,6 @@
#include <texteditor/texteditor.h>
#include <utils/utilsicons.h>
#include <QFileDialog>
#include <QFileInfo>
#include <QGridLayout>
#include <QLabel>
#include <QLoggingCategory>
@@ -18,8 +16,7 @@
using namespace Utils;
namespace Android {
namespace Internal {
namespace Android::Internal {
static Q_LOGGING_CATEGORY(androidManifestEditorLog, "qtc.android.splashScreenWidget", QtWarningMsg)
@@ -244,5 +241,4 @@ void SplashScreenWidget::setImageFileName(const QString &imageFileName)
m_imageFileName = imageFileName;
}
} // namespace Internal
} // namespace Android
} // Android::Internal

6
src/plugins/android/splashscreenwidget.h
View File

@@ -15,8 +15,7 @@ class QColor;
class QImage;
QT_END_NAMESPACE
namespace Android {
namespace Internal {
namespace Android::Internal {
class SplashScreenWidget : public QWidget
{
@@ -73,5 +72,4 @@ private:
bool m_showImageFullScreen = false;
};
} // namespace Internal
} // namespace Android
} // Android::Internal

11
src/plugins/clangcodemodel/clangdclient.cpp
View File

@@ -138,9 +138,12 @@ void setupClangdConfigFile()
static BaseClientInterface *clientInterface(Project *project, const Utils::FilePath &jsonDbDir)
{
using CppEditor::ClangdSettings;
QString indexingOption = "--background-index";
const CppEditor::ClangdSettings settings(CppEditor::ClangdProjectSettings(project).settings());
if (!settings.indexingEnabled() || jsonDbDir.isEmpty())
const ClangdSettings settings(CppEditor::ClangdProjectSettings(project).settings());
const ClangdSettings::IndexingPriority indexingPriority = settings.indexingPriority();
const bool indexingEnabled = indexingPriority != ClangdSettings::IndexingPriority::Off;
if (!indexingEnabled)
indexingOption += "=0";
const QString headerInsertionOption = QString("--header-insertion=")
+ (settings.autoIncludeHeaders() ? "iwyu" : "never");
@@ -153,6 +156,10 @@ static BaseClientInterface *clientInterface(Project *project, const Utils::FileP
"--clang-tidy=0"}};
if (settings.workerThreadLimit() != 0)
cmd.addArg("-j=" + QString::number(settings.workerThreadLimit()));
if (indexingEnabled && settings.clangdVersion() >= QVersionNumber(15)) {
cmd.addArg("--background-index-priority="
+ ClangdSettings::priorityToString(indexingPriority));
}
if (!jsonDbDir.isEmpty())
cmd.addArg("--compile-commands-dir=" + jsonDbDir.toString());
if (clangdLogServer().isDebugEnabled())

8
src/plugins/clangtools/CMakeLists.txt
View File

@@ -33,16 +33,14 @@ add_qtc_plugin(ClangTools
clangtoolsprojectsettingswidget.cpp clangtoolsprojectsettingswidget.h
clangtoolssettings.cpp clangtoolssettings.h
clangtoolsutils.cpp clangtoolsutils.h
clazychecks.ui
diagnosticconfigswidget.cpp diagnosticconfigswidget.h
diagnosticmark.cpp diagnosticmark.h
documentclangtoolrunner.cpp documentclangtoolrunner.h
documentquickfixfactory.cpp documentquickfixfactory.h
executableinfo.cpp executableinfo.h
filterdialog.cpp filterdialog.h filterdialog.ui
runsettingswidget.cpp runsettingswidget.h runsettingswidget.ui
settingswidget.cpp settingswidget.h settingswidget.ui
tidychecks.ui
filterdialog.cpp filterdialog.h
runsettingswidget.cpp runsettingswidget.h
settingswidget.cpp settingswidget.h
virtualfilesystemoverlay.cpp virtualfilesystemoverlay.h
)

5
src/plugins/clangtools/clangtools.qbs
View File

@@ -56,7 +56,6 @@ QtcPlugin {
"clangtoolssettings.h",
"clangtoolsutils.cpp",
"clangtoolsutils.h",
"clazychecks.ui",
"diagnosticconfigswidget.cpp",
"diagnosticconfigswidget.h",
"diagnosticmark.cpp",
@@ -69,14 +68,10 @@ QtcPlugin {
"executableinfo.h",
"filterdialog.cpp",
"filterdialog.h",
"filterdialog.ui",
"runsettingswidget.cpp",
"runsettingswidget.h",
"runsettingswidget.ui",
"settingswidget.cpp",
"settingswidget.h",
"settingswidget.ui",
"tidychecks.ui",
"virtualfilesystemoverlay.cpp",
"virtualfilesystemoverlay.h",
]

183
src/plugins/clangtools/clazychecks.ui
View File

@@ -1,183 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ClangTools::Internal::ClazyChecks</class>
<widget class="QWidget" name="ClangTools::Internal::ClazyChecks">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>800</width>
<height>500</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="checksPage">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>See &lt;a href=&quot;https://github.com/KDE/clazy&quot;&gt;Clazy's homepage&lt;/a&gt; for more information.</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QGroupBox" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Filters</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="Utils::FancyLineEdit" name="filterLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="topicsResetButton">
<property name="text">
<string>Reset Topic Filter</string>
</property>
</widget>
</item>
<item>
<widget class="QListView" name="topicsView">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>150</width>
<height>16777215</height>
</size>
</property>
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="checksGroupBox">
<property name="title">
<string>Checks</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="enableLowerLevelsCheckBox">
<property name="toolTip">
<string>When enabling a level explicitly, also enable lower levels (Clazy semantic).</string>
</property>
<property name="text">
<string>Enable lower levels automatically</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QTreeView" name="checksView"/>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="invalidExecutablePage">
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="Utils::InfoLabel" name="invalidExecutableLabel">
<property name="text">
<string>Could not query the supported checks from the clazy-standalone executable.
Set a valid executable first.</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>382</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Utils::InfoLabel</class>
<extends>QLabel</extends>
<header location="global">utils/infolabel.h</header>
</customwidget>
<customwidget>
<class>Utils::FancyLineEdit</class>
<extends>QLineEdit</extends>
<header location="global">utils/fancylineedit.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

260
src/plugins/clangtools/diagnosticconfigswidget.cpp
View File

@@ -9,36 +9,192 @@
#include "clangtoolsutils.h"
#include "executableinfo.h"
#include "ui_clazychecks.h"
#include "ui_tidychecks.h"
#include <cppeditor/cppcodemodelsettings.h>
#include <cppeditor/cppeditorconstants.h>
#include <cppeditor/cpptoolsreuse.h>
#include <projectexplorer/selectablefilesmodel.h>
#include <projectexplorer/session.h>
#include <utils/algorithm.h>
#include <utils/fancylineedit.h>
#include <utils/fileutils.h>
#include <utils/infolabel.h>
#include <utils/layoutbuilder.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QApplication>
#include <QCheckBox>
#include <QComboBox>
#include <QDesktopServices>
#include <QDialog>
#include <QDialogButtonBox>
#include <QHBoxLayout>
#include <QGroupBox>
#include <QHeaderView>
#include <QLabel>
#include <QListView>
#include <QPushButton>
#include <QSortFilterProxyModel>
#include <QStackedWidget>
#include <QStringListModel>
#include <QTreeView>
#include <QTreeWidget>
#include <QTreeWidgetItem>
#include <QUuid>
#include <QVBoxLayout>
using namespace CppEditor;
using namespace Utils;
namespace ClangTools {
namespace Internal {
namespace ClangTools::Internal {
QString removeClangTidyCheck(const QString &checks, const QString &check);
QString removeClazyCheck(const QString &checks, const QString &check);
class TidyChecksWidget : public QWidget
{
Q_DECLARE_TR_FUNCTIONS(ClangTools::Internal::TidyChecks)
public:
QComboBox *tidyMode;
QPushButton *plainTextEditButton;
FancyLineEdit *filterLineEdit;
QTreeView *checksPrefixesTree;
QStackedWidget *stackedWidget;
TidyChecksWidget()
{
tidyMode = new QComboBox;
tidyMode->addItem(tr("Select Checks"));
tidyMode->addItem(tr("Use .clang-tidy config file"));
plainTextEditButton = new QPushButton(tr("Edit Checks as String..."));
filterLineEdit = new FancyLineEdit;
auto checksPage = new QWidget;
checksPrefixesTree = new QTreeView;
checksPrefixesTree->header()->setVisible(false);
checksPrefixesTree->setMinimumHeight(380);
auto invalidExecutableLabel = new InfoLabel;
invalidExecutableLabel->setAlignment(Qt::AlignLeft|Qt::AlignTop);
invalidExecutableLabel->setType(InfoLabel::Warning);
invalidExecutableLabel->setElideMode(Qt::ElideNone);
invalidExecutableLabel->setText(tr("Could not query the supported checks from the "
"clang-tidy executable.\nSet a valid executable first."));
auto invalidExecutablePage = new QWidget;
stackedWidget = new QStackedWidget;
stackedWidget->addWidget(checksPage);
stackedWidget->addWidget(new QWidget);
stackedWidget->addWidget(invalidExecutablePage);
using namespace Layouting;
Column {
checksPrefixesTree
}.attachTo(checksPage, WithoutMargins);
Column {
invalidExecutableLabel,
st,
}.attachTo(invalidExecutablePage, WithoutMargins);
Column {
Row { tidyMode, plainTextEditButton, filterLineEdit },
stackedWidget,
}.attachTo(this);
}
};
class ClazyChecksWidget : public QWidget
{
Q_DECLARE_TR_FUNCTIONS(ClangTools::Internal::ClazyChecks)
public:
QStackedWidget *stackedWidget;
FancyLineEdit *filterLineEdit;
QPushButton *topicsResetButton;
QListView *topicsView;
QGroupBox *checksGroupBox;
QCheckBox *enableLowerLevelsCheckBox;
QTreeView *checksView;
ClazyChecksWidget()
{
auto checksPage = new QWidget;
auto label = new QLabel;
label->setOpenExternalLinks(true);
label->setText(tr("See <a href=\"https://github.com/KDE/clazy\">"
"Clazy's homepage</a> for more information."));
auto groupBox = new QGroupBox(tr("Filters"));
QSizePolicy sp(QSizePolicy::Maximum, QSizePolicy::Preferred);
sp.setHorizontalStretch(1);
groupBox->setSizePolicy(sp);
filterLineEdit = new FancyLineEdit;
topicsResetButton = new QPushButton(tr("Reset Topic Filter"));
topicsView = new QListView;
checksGroupBox = new QGroupBox(tr("Checks"));
sp.setHorizontalPolicy(QSizePolicy::MinimumExpanding);
sp.setHorizontalStretch(100);
checksGroupBox->setSizePolicy(sp);
enableLowerLevelsCheckBox = new QCheckBox(tr("Enable lower levels automatically"));
enableLowerLevelsCheckBox->setToolTip(tr("When enabling a level explicitly, "
"also enable lower levels (Clazy semantic)."));
checksView = new QTreeView;
auto invalidExecutablePage = new QWidget;
auto invalidExecutableLabel = new InfoLabel;
invalidExecutableLabel->setType(InfoLabel::Warning);
invalidExecutableLabel->setElideMode(Qt::ElideNone);
invalidExecutableLabel->setAlignment(Qt::AlignLeft|Qt::AlignTop);
invalidExecutableLabel->setText(tr("Could not query the supported checks from the "
"clazy-standalone executable.\nSet a valid executable first."));
stackedWidget = new QStackedWidget;
stackedWidget->addWidget(checksPage);
stackedWidget->addWidget(invalidExecutablePage);
using namespace Layouting;
Column {
filterLineEdit,
topicsResetButton,
topicsView
}.attachTo(groupBox);
Column {
label,
Row { groupBox, checksGroupBox }
}.attachTo(checksPage, WithoutMargins);
Column {
invalidExecutableLabel,
st
}.attachTo(invalidExecutablePage, WithoutMargins);
Column {
enableLowerLevelsCheckBox,
checksView,
}.attachTo(checksGroupBox);
Column {
stackedWidget
}.attachTo(this);
}
};
class TidyOptionsDialog : public QDialog
{
@@ -49,9 +205,7 @@ public:
{
setWindowTitle(tr("Options for %1").arg(check));
resize(600, 300);
const auto mainLayout = new QVBoxLayout(this);
const auto widgetLayout = new QHBoxLayout;
mainLayout->addLayout(widgetLayout);
m_optionsWidget.setColumnCount(2);
m_optionsWidget.setHeaderLabels({tr("Option"), tr("Value")});
const auto addItem = [this](const QString &option, const QString &value) {
@@ -62,33 +216,42 @@ public:
for (auto it = options.begin(); it != options.end(); ++it)
addItem(it.key(), it.value());
m_optionsWidget.resizeColumnToContents(0);
widgetLayout->addWidget(&m_optionsWidget);
const auto buttonLayout = new QVBoxLayout;
widgetLayout->addLayout(buttonLayout);
const auto addButton = new QPushButton(tr("Add Option"));
const auto removeButton = new QPushButton(tr("Remove Option"));
const auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok
| QDialogButtonBox::Cancel);
using namespace Layouting;
Column {
Row {
&m_optionsWidget,
Column {
addButton,
removeButton,
st
}
},
buttonBox
}.attachTo(this);
connect(addButton, &QPushButton::clicked, this, [this, addItem] {
const auto item = addItem(tr("<new option>"), {});
m_optionsWidget.editItem(item);
});
buttonLayout->addWidget(addButton);
const auto removeButton = new QPushButton(tr("Remove Option"));
connect(removeButton, &QPushButton::clicked, this, [this] {
qDeleteAll(m_optionsWidget.selectedItems());
});
const auto toggleRemoveButtonEnabled = [this, removeButton] {
removeButton->setEnabled(!m_optionsWidget.selectionModel()->selectedRows().isEmpty());
};
connect(&m_optionsWidget, &QTreeWidget::itemSelectionChanged,
this, [toggleRemoveButtonEnabled] { toggleRemoveButtonEnabled(); });
toggleRemoveButtonEnabled();
buttonLayout->addWidget(removeButton);
buttonLayout->addStretch(1);
const auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok
| QDialogButtonBox::Cancel);
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
mainLayout->addWidget(buttonBox);
}
ClangDiagnosticConfig::TidyCheckOptions options() const
@@ -802,18 +965,13 @@ DiagnosticConfigsWidget::DiagnosticConfigsWidget(const ClangDiagnosticConfigs &c
, m_clazyTreeModel(new ClazyChecksTreeModel(clazyInfo.supportedChecks))
, m_clazyInfo(clazyInfo)
{
m_clazyChecks = std::make_unique<Ui::ClazyChecks>();
m_clazyChecksWidget = new QWidget();
m_clazyChecks->setupUi(m_clazyChecksWidget);
m_clazyChecks->invalidExecutableLabel->setType(Utils::InfoLabel::Warning);
m_clazyChecks->invalidExecutableLabel->setElideMode(Qt::ElideNone);
m_clazyChecks = new ClazyChecksWidget;
m_clazySortFilterProxyModel = new ClazyChecksSortFilterModel(this);
m_clazySortFilterProxyModel->setSourceModel(m_clazyTreeModel.get());
m_clazySortFilterProxyModel->setRecursiveFilteringEnabled(true);
m_clazySortFilterProxyModel->setAutoAcceptChildRows(true);
setupTreeView(m_clazyChecks->checksView, m_clazySortFilterProxyModel, 2);
m_clazyChecks->filterLineEdit->setFiltering(true);
m_clazyChecks->filterLineEdit->setPlaceholderText(tr("Filter by name"));
connect(m_clazyChecks->filterLineEdit, &Utils::FancyLineEdit::filterChanged,
m_clazySortFilterProxyModel,
qOverload<const QString &>(&QSortFilterProxyModel::setFilterRegularExpression));
@@ -846,25 +1004,19 @@ DiagnosticConfigsWidget::DiagnosticConfigsWidget(const ClangDiagnosticConfigs &c
connect(m_clazyChecks->enableLowerLevelsCheckBox, &QCheckBox::stateChanged, [this](int) {
const bool enable = m_clazyChecks->enableLowerLevelsCheckBox->isChecked();
m_clazyTreeModel->setEnableLowerLevels(enable);
codeModelSettings()->setEnableLowerClazyLevels(
m_clazyChecks->enableLowerLevelsCheckBox->isChecked());
codeModelSettings()->setEnableLowerClazyLevels(enable);
});
const Qt::CheckState checkEnableLowerClazyLevels
= codeModelSettings()->enableLowerClazyLevels() ? Qt::Checked : Qt::Unchecked;
m_clazyChecks->enableLowerLevelsCheckBox->setCheckState(checkEnableLowerClazyLevels);
m_tidyChecks = std::make_unique<Ui::TidyChecks>();
m_tidyChecksWidget = new QWidget();
m_tidyChecks->setupUi(m_tidyChecksWidget);
m_tidyChecks->invalidExecutableLabel->setType(Utils::InfoLabel::Warning);
m_tidyChecks->invalidExecutableLabel->setElideMode(Qt::ElideNone);
m_tidyChecks = new TidyChecksWidget;
const auto tidyFilterModel = new QSortFilterProxyModel(this);
tidyFilterModel->setRecursiveFilteringEnabled(true);
tidyFilterModel->setAutoAcceptChildRows(true);
tidyFilterModel->setSourceModel(m_tidyTreeModel.get());
setupTreeView(m_tidyChecks->checksPrefixesTree, tidyFilterModel);
m_tidyChecks->filterLineEdit->setFiltering(true);
m_tidyChecks->filterLineEdit->setPlaceholderText(tr("Filter by name"));
connect(m_tidyChecks->filterLineEdit, &Utils::FancyLineEdit::filterChanged, tidyFilterModel,
qOverload<const QString &>(&QSortFilterProxyModel::setFilterRegularExpression));
@@ -900,18 +1052,23 @@ DiagnosticConfigsWidget::DiagnosticConfigsWidget(const ClangDiagnosticConfigs &c
QDialog dialog;
dialog.setWindowTitle(tr("Checks"));
dialog.setLayout(new QVBoxLayout);
auto *textEdit = new QTextEdit(&dialog);
const QString initialChecks = m_tidyTreeModel->selectedChecks();
auto textEdit = new QTextEdit(&dialog);
textEdit->setReadOnly(readOnly);
dialog.layout()->addWidget(textEdit);
auto *buttonsBox = new QDialogButtonBox(QDialogButtonBox::Ok
textEdit->setPlainText(initialChecks);
auto buttonsBox = new QDialogButtonBox(QDialogButtonBox::Ok
| (readOnly ? QDialogButtonBox::NoButton
: QDialogButtonBox::Cancel));
dialog.layout()->addWidget(buttonsBox);
QObject::connect(buttonsBox, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
QObject::connect(buttonsBox, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
const QString initialChecks = m_tidyTreeModel->selectedChecks();
textEdit->setPlainText(initialChecks);
using namespace Layouting;
Column {
textEdit,
buttonsBox
}.attachTo(&dialog);
QObject::connect(&dialog, &QDialog::accepted, [=, &initialChecks]() {
const QString updatedChecks = textEdit->toPlainText();
@@ -926,17 +1083,25 @@ DiagnosticConfigsWidget::DiagnosticConfigsWidget(const ClangDiagnosticConfigs &c
connectClangTidyItemChanged();
});
QObject::connect(buttonsBox, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
QObject::connect(buttonsBox, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
dialog.exec();
});
connectClangTidyItemChanged();
connectClazyItemChanged();
tabWidget()->addTab(m_tidyChecksWidget, tr("Clang-Tidy Checks"));
tabWidget()->addTab(m_clazyChecksWidget, tr("Clazy Checks"));
tabWidget()->addTab(m_tidyChecks, tr("Clang-Tidy Checks"));
tabWidget()->addTab(m_clazyChecks, tr("Clazy Checks"));
}
DiagnosticConfigsWidget::~DiagnosticConfigsWidget() = default;
DiagnosticConfigsWidget::~DiagnosticConfigsWidget()
{
delete m_tidyChecks;
delete m_clazyChecks;
}
void DiagnosticConfigsWidget::syncClangTidyWidgets(const ClangDiagnosticConfig &config)
{
@@ -1192,7 +1357,6 @@ void disableChecks(const QList<Diagnostic> &diagnostics)
settings->writeSettings();
}
} // namespace Internal
} // namespace ClangTools
} // ClangTools::Internal
#include "diagnosticconfigswidget.moc"

34
src/plugins/clangtools/diagnosticconfigswidget.h
View File

@@ -9,23 +9,16 @@
#include <memory>
namespace ClangTools {
namespace Internal {
class Diagnostic;
namespace ClangTools::Internal {
// Not UI-related, but requires the tree model (or else a huge refactoring or code duplication).
QString removeClangTidyCheck(const QString &checks, const QString &check);
QString removeClazyCheck(const QString &checks, const QString &check);
void disableChecks(const QList<Diagnostic> &diagnostics);
namespace Ui {
class ClazyChecks;
class TidyChecks;
}
class TidyChecksTreeModel;
class ClazyChecksTreeModel;
class ClazyChecksSortFilterModel;
class ClazyChecksTreeModel;
class ClazyChecksWidget;
class Diagnostic;
class TidyChecksTreeModel;
class TidyChecksWidget;
void disableChecks(const QList<Diagnostic> &diagnostics);
// Like CppEditor::ClangDiagnosticConfigsWidget, but with tabs/widgets for clang-tidy and clazy
class DiagnosticConfigsWidget : public CppEditor::ClangDiagnosticConfigsWidget
@@ -60,18 +53,15 @@ private:
private:
// Clang-Tidy
std::unique_ptr<Ui::TidyChecks> m_tidyChecks;
QWidget *m_tidyChecksWidget = nullptr;
TidyChecksWidget *m_tidyChecks = nullptr;
std::unique_ptr<TidyChecksTreeModel> m_tidyTreeModel;
ClangTidyInfo m_tidyInfo;
// Clazy
std::unique_ptr<Ui::ClazyChecks> m_clazyChecks;
QWidget *m_clazyChecksWidget = nullptr;
std::unique_ptr<ClazyChecksTreeModel> m_clazyTreeModel;
ClazyChecksWidget *m_clazyChecks = nullptr;
ClazyChecksSortFilterModel *m_clazySortFilterProxyModel = nullptr;
std::unique_ptr<ClazyChecksTreeModel> m_clazyTreeModel;
ClazyStandaloneInfo m_clazyInfo;
};
} // namespace Internal
} // namespace ClangTools
} // ClangTools::Internal

80
src/plugins/clangtools/filterdialog.cpp
View File

@@ -2,15 +2,20 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "filterdialog.h"
#include "ui_filterdialog.h"
#include <utils/algorithm.h>
#include <utils/layoutbuilder.h>
#include <utils/treemodel.h>
#include <QApplication>
#include <QDialog>
#include <QDialogButtonBox>
#include <QHeaderView>
#include <QItemSelectionModel>
#include <QPushButton>
#include <QTreeView>
namespace ClangTools {
namespace Internal {
namespace ClangTools::Internal {
enum Columns { CheckName, Count };
@@ -59,61 +64,76 @@ public:
FilterDialog::FilterDialog(const Checks &checks, QWidget *parent)
: QDialog(parent)
, m_ui(new Ui::FilterDialog)
{
m_ui->setupUi(this);
resize(400, 400);
setWindowTitle(tr("Filter Diagnostics"));
auto selectAll = new QPushButton(tr("Select All"));
auto selectWithFixits = new QPushButton(tr("Select All with Fixits"));
auto selectNone = new QPushButton(tr("Clear Selection"));
auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
m_model = new FilterChecksModel(checks);
// View
m_ui->view->setModel(m_model);
m_ui->view->header()->setStretchLastSection(false);
m_ui->view->header()->setSectionResizeMode(Columns::CheckName, QHeaderView::Stretch);
m_ui->view->header()->setSectionResizeMode(Columns::Count, QHeaderView::ResizeToContents);
m_ui->view->setSelectionMode(QAbstractItemView::MultiSelection);
m_ui->view->setSelectionBehavior(QAbstractItemView::SelectRows);
m_ui->view->setIndentation(0);
connect(m_ui->view->selectionModel(), &QItemSelectionModel::selectionChanged, this, [&](){
const bool hasSelection = !m_ui->view->selectionModel()->selectedRows().isEmpty();
m_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(hasSelection);
m_view = new QTreeView(this);
m_view->setModel(m_model);
m_view->header()->setStretchLastSection(false);
m_view->header()->setSectionResizeMode(Columns::CheckName, QHeaderView::Stretch);
m_view->header()->setSectionResizeMode(Columns::Count, QHeaderView::ResizeToContents);
m_view->setSelectionMode(QAbstractItemView::MultiSelection);
m_view->setSelectionBehavior(QAbstractItemView::SelectRows);
m_view->setIndentation(0);
using namespace Utils::Layouting;
Column {
tr("Select the diagnostics to display."),
Row { selectAll, selectWithFixits, selectNone, st },
m_view,
buttonBox,
}.attachTo(this);
connect(m_view->selectionModel(), &QItemSelectionModel::selectionChanged, this, [&] {
const bool hasSelection = !m_view->selectionModel()->selectedRows().isEmpty();
buttonBox->button(QDialogButtonBox::Ok)->setEnabled(hasSelection);
});
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
// Buttons
connect(m_ui->selectNone, &QPushButton::clicked, m_ui->view, &QTreeView::clearSelection);
connect(m_ui->selectAll, &QPushButton::clicked, m_ui->view, &QTreeView::selectAll);
connect(m_ui->selectWithFixits, &QPushButton::clicked, m_ui->view, [this] {
m_ui->view->clearSelection();
connect(selectNone, &QPushButton::clicked, m_view, &QTreeView::clearSelection);
connect(selectAll, &QPushButton::clicked, m_view, &QTreeView::selectAll);
connect(selectWithFixits, &QPushButton::clicked, m_view, [this] {
m_view->clearSelection();
m_model->forItemsAtLevel<1>([&](CheckItem *item) {
if (item->check.hasFixit)
m_ui->view->selectionModel()->select(item->index(), selectionFlags());
m_view->selectionModel()->select(item->index(), selectionFlags());
});
});
m_ui->selectWithFixits->setEnabled(
selectWithFixits->setEnabled(
Utils::anyOf(checks, [](const Check &c) { return c.hasFixit; }));
// Select checks that are not filtered out
m_model->forItemsAtLevel<1>([this](CheckItem *item) {
if (item->check.isShown)
m_ui->view->selectionModel()->select(item->index(), selectionFlags());
m_view->selectionModel()->select(item->index(), selectionFlags());
});
}
FilterDialog::~FilterDialog()
{
delete m_ui;
}
FilterDialog::~FilterDialog() = default;
QSet<QString> FilterDialog::selectedChecks() const
{
QSet<QString> checks;
m_model->forItemsAtLevel<1>([&](CheckItem *item) {
if (m_ui->view->selectionModel()->isSelected(item->index()))
if (m_view->selectionModel()->isSelected(item->index()))
checks << item->check.name;
});
return checks;
}
} // namespace Internal
} // namespace ClangTools
} // ClangTools::Internal
#include "filterdialog.moc"

15
src/plugins/clangtools/filterdialog.h
View File

@@ -5,14 +5,16 @@
#include <QDialog>
namespace ClangTools {
namespace Internal {
QT_BEGIN_NAMESPACE
class QTreeView;
QT_END_NAMESPACE
namespace Ui { class FilterDialog; }
namespace ClangTools::Internal {
class FilterChecksModel;
class Check {
class Check
{
public:
QString name;
QString displayName;
@@ -33,9 +35,8 @@ public:
QSet<QString> selectedChecks() const;
private:
Ui::FilterDialog *m_ui;
FilterChecksModel *m_model;
QTreeView *m_view;
};
} // namespace Internal
} // namespace ClangTools
} // ClangTools::Internal

99
src/plugins/clangtools/filterdialog.ui
View File

@@ -1,99 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ClangTools::Internal::FilterDialog</class>
<widget class="QDialog" name="ClangTools::Internal::FilterDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>400</height>
</rect>
</property>
<property name="windowTitle">
<string>Filter Diagnostics</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Select the diagnostics to display.</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="selectAll">
<property name="text">
<string>Select All</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="selectWithFixits">
<property name="text">
<string>Select All with Fixits</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="selectNone">
<property name="text">
<string>Clear Selection</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QTreeView" name="view"/>
</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>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>ClangTools::Internal::FilterDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>ClangTools::Internal::FilterDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

89
src/plugins/clangtools/runsettingswidget.cpp
View File

@@ -2,7 +2,6 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "runsettingswidget.h"
#include "ui_runsettingswidget.h"
#include "clangtoolssettings.h"
#include "clangtoolsutils.h"
@@ -11,33 +10,58 @@
#include "settingswidget.h"
#include <cppeditor/clangdiagnosticconfigswidget.h>
#include <cppeditor/clangdiagnosticconfigsselectionwidget.h>
#include <utils/layoutbuilder.h>
#include <QApplication>
#include <QCheckBox>
#include <QSpinBox>
#include <QThread>
using namespace Utils;
namespace ClangTools {
namespace Internal {
namespace ClangTools::Internal {
RunSettingsWidget::RunSettingsWidget(QWidget *parent)
: QWidget(parent)
, m_ui(new Ui::RunSettingsWidget)
{
m_ui->setupUi(this);
resize(383, 125);
m_diagnosticWidget = new CppEditor::ClangDiagnosticConfigsSelectionWidget;
m_buildBeforeAnalysis = new QCheckBox(tr("Build the project before analysis"));
m_analyzeOpenFiles = new QCheckBox(tr("Analyze open files"));
m_parallelJobsSpinBox = new QSpinBox;
m_parallelJobsSpinBox->setRange(1, 32);
using namespace Layouting;
// FIXME: Let RunSettingsWidget inherit from QGroupBox?
Column {
Group {
title(tr("Run Options")),
Column {
m_diagnosticWidget,
m_buildBeforeAnalysis,
m_analyzeOpenFiles,
Row { tr("Parallel jobs:"), m_parallelJobsSpinBox, st },
}
}
}.attachTo(this, WithoutMargins);
}
RunSettingsWidget::~RunSettingsWidget()
{
delete m_ui;
}
RunSettingsWidget::~RunSettingsWidget() = default;
CppEditor::ClangDiagnosticConfigsSelectionWidget *RunSettingsWidget::diagnosticSelectionWidget()
{
return m_ui->diagnosticWidget;
return m_diagnosticWidget;
}
static CppEditor::ClangDiagnosticConfigsWidget *createEditWidget(
const CppEditor::ClangDiagnosticConfigs &configs, const Utils::Id &configToSelect)
const CppEditor::ClangDiagnosticConfigs &configs, const Id &configToSelect)
{
// Determine executable paths
FilePath clangTidyPath;
@@ -65,44 +89,43 @@ static CppEditor::ClangDiagnosticConfigsWidget *createEditWidget(
void RunSettingsWidget::fromSettings(const RunSettings &s)
{
disconnect(m_ui->diagnosticWidget, 0, 0, 0);
m_ui->diagnosticWidget->refresh(diagnosticConfigsModel(),
s.diagnosticConfigId(),
createEditWidget);
connect(m_ui->diagnosticWidget,
disconnect(m_diagnosticWidget, 0, 0, 0);
m_diagnosticWidget->refresh(diagnosticConfigsModel(),
s.diagnosticConfigId(),
createEditWidget);
connect(m_diagnosticWidget,
&CppEditor::ClangDiagnosticConfigsSelectionWidget::changed,
this,
&RunSettingsWidget::changed);
disconnect(m_ui->buildBeforeAnalysis, 0, 0, 0);
m_ui->buildBeforeAnalysis->setToolTip(hintAboutBuildBeforeAnalysis());
m_ui->buildBeforeAnalysis->setCheckState(s.buildBeforeAnalysis() ? Qt::Checked : Qt::Unchecked);
connect(m_ui->buildBeforeAnalysis, &QCheckBox::toggled, [this](bool checked) {
disconnect(m_buildBeforeAnalysis, 0, 0, 0);
m_buildBeforeAnalysis->setToolTip(hintAboutBuildBeforeAnalysis());
m_buildBeforeAnalysis->setCheckState(s.buildBeforeAnalysis() ? Qt::Checked : Qt::Unchecked);
connect(m_buildBeforeAnalysis, &QCheckBox::toggled, [this](bool checked) {
if (!checked)
showHintAboutBuildBeforeAnalysis();
emit changed();
});
disconnect(m_ui->parallelJobsSpinBox, 0, 0, 0);
m_ui->parallelJobsSpinBox->setValue(s.parallelJobs());
m_ui->parallelJobsSpinBox->setMinimum(1);
m_ui->parallelJobsSpinBox->setMaximum(QThread::idealThreadCount());
connect(m_ui->parallelJobsSpinBox, &QSpinBox::valueChanged, this, &RunSettingsWidget::changed);
m_ui->analyzeOpenFiles->setChecked(s.analyzeOpenFiles());
connect(m_ui->analyzeOpenFiles, &QCheckBox::toggled, this, &RunSettingsWidget::changed);
disconnect(m_parallelJobsSpinBox, 0, 0, 0);
m_parallelJobsSpinBox->setValue(s.parallelJobs());
m_parallelJobsSpinBox->setMinimum(1);
m_parallelJobsSpinBox->setMaximum(QThread::idealThreadCount());
connect(m_parallelJobsSpinBox, &QSpinBox::valueChanged, this, &RunSettingsWidget::changed);
m_analyzeOpenFiles->setChecked(s.analyzeOpenFiles());
connect(m_analyzeOpenFiles, &QCheckBox::toggled, this, &RunSettingsWidget::changed);
}
RunSettings RunSettingsWidget::toSettings() const
{
RunSettings s;
s.setDiagnosticConfigId(m_ui->diagnosticWidget->currentConfigId());
s.setBuildBeforeAnalysis(m_ui->buildBeforeAnalysis->checkState() == Qt::CheckState::Checked);
s.setParallelJobs(m_ui->parallelJobsSpinBox->value());
s.setAnalyzeOpenFiles(m_ui->analyzeOpenFiles->checkState() == Qt::CheckState::Checked);
s.setDiagnosticConfigId(m_diagnosticWidget->currentConfigId());
s.setBuildBeforeAnalysis(m_buildBeforeAnalysis->checkState() == Qt::CheckState::Checked);
s.setParallelJobs(m_parallelJobsSpinBox->value());
s.setAnalyzeOpenFiles(m_analyzeOpenFiles->checkState() == Qt::CheckState::Checked);
return s;
}
} // namespace Internal
} // namespace ClangTools
} // ClangTools::Internal

25
src/plugins/clangtools/runsettingswidget.h
View File

@@ -7,19 +7,18 @@
#include <QWidget>
namespace CppEditor {
class ClangDiagnosticConfigsSelectionWidget;
}
QT_BEGIN_NAMESPACE
class QCheckBox;
class QSpinBox;
QT_END_NAMESPACE
namespace ClangTools {
namespace Internal {
namespace CppEditor { class ClangDiagnosticConfigsSelectionWidget; }
namespace ClangTools::Internal {
class RunSettings;
namespace Ui {
class RunSettingsWidget;
}
class RunSettingsWidget : public QWidget
{
Q_OBJECT
@@ -37,8 +36,10 @@ signals:
void changed();
private:
Ui::RunSettingsWidget *m_ui;
CppEditor::ClangDiagnosticConfigsSelectionWidget *m_diagnosticWidget;
QCheckBox *m_buildBeforeAnalysis;
QCheckBox *m_analyzeOpenFiles;
QSpinBox *m_parallelJobsSpinBox;
};
} // namespace Internal
} // namespace ClangTools
} // ClangTools::Internal

97
src/plugins/clangtools/runsettingswidget.ui
View File

@@ -1,97 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ClangTools::Internal::RunSettingsWidget</class>
<widget class="QWidget" name="ClangTools::Internal::RunSettingsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>383</width>
<height>125</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Run Options</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="CppEditor::ClangDiagnosticConfigsSelectionWidget" name="diagnosticWidget" native="true"/>
</item>
<item>
<widget class="QCheckBox" name="buildBeforeAnalysis">
<property name="text">
<string>Build the project before analysis</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="analyzeOpenFiles">
<property name="text">
<string>Analyze open files</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="processesLayout">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Parallel jobs:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="parallelJobsSpinBox">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>32</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>CppEditor::ClangDiagnosticConfigsSelectionWidget</class>
<extends>QWidget</extends>
<header>cppeditor/clangdiagnosticconfigsselectionwidget.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

84
src/plugins/clangtools/settingswidget.cpp
View File

@@ -3,79 +3,76 @@
#include "settingswidget.h"
#include "ui_settingswidget.h"
#include "clangtoolsconstants.h"
#include "clangtoolsutils.h"
#include "runsettingswidget.h"
#include <cppeditor/clangdiagnosticconfigsmodel.h>
#include <cppeditor/clangdiagnosticconfigsselectionwidget.h>
#include <debugger/analyzer/analyzericons.h>
#include <optional>
#include <utils/layoutbuilder.h>
#include <utils/pathchooser.h>
#include <QCoreApplication>
using namespace Utils;
namespace ClangTools {
namespace Internal {
namespace ClangTools::Internal {
static SettingsWidget *m_instance = nullptr;
static void setupPathChooser(PathChooser *const chooser,
const QString &promptDiaglogTitle,
const QString &placeHolderText,
const FilePath &pathFromSettings,
const QString &historyCompleterId)
{
chooser->setPromptDialogTitle(promptDiaglogTitle);
chooser->setDefaultValue(placeHolderText);
chooser->setFilePath(pathFromSettings);
chooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
chooser->setHistoryCompleter(historyCompleterId);
}
SettingsWidget *SettingsWidget::instance()
{
return m_instance;
}
SettingsWidget::SettingsWidget()
: m_ui(new Ui::SettingsWidget)
, m_settings(ClangToolsSettings::instance())
: m_settings(ClangToolsSettings::instance())
{
m_instance = this;
m_ui->setupUi(this);
//
// Group box "Executables"
//
resize(400, 300);
QString placeHolderText = shippedClangTidyExecutable().toUserOutput();
FilePath path = m_settings->clangTidyExecutable();
if (path.isEmpty() && placeHolderText.isEmpty())
path = Constants::CLANG_TIDY_EXECUTABLE_NAME;
setupPathChooser(m_ui->clangTidyPathChooser,
tr("Clang-Tidy Executable"),
placeHolderText,
path,
"ClangTools.ClangTidyExecutable.History");
m_clangTidyPathChooser = new PathChooser;
m_clangTidyPathChooser->setExpectedKind(PathChooser::ExistingCommand);
m_clangTidyPathChooser->setPromptDialogTitle(tr("Clang-Tidy Executable"));
m_clangTidyPathChooser->setDefaultValue(placeHolderText);
m_clangTidyPathChooser->setFilePath(path);
m_clangTidyPathChooser->setHistoryCompleter("ClangTools.ClangTidyExecutable.History");
placeHolderText = shippedClazyStandaloneExecutable().toUserOutput();
path = m_settings->clazyStandaloneExecutable();
if (path.isEmpty() && placeHolderText.isEmpty())
path = Constants::CLAZY_STANDALONE_EXECUTABLE_NAME;
setupPathChooser(m_ui->clazyStandalonePathChooser,
tr("Clazy Executable"),
placeHolderText,
path,
"ClangTools.ClazyStandaloneExecutable.History");
m_clazyStandalonePathChooser = new PathChooser;
m_clazyStandalonePathChooser->setExpectedKind(PathChooser::ExistingCommand);
m_clazyStandalonePathChooser->setPromptDialogTitle(tr("Clazy Executable"));
m_clazyStandalonePathChooser->setDefaultValue(placeHolderText);
m_clazyStandalonePathChooser->setFilePath(path);
m_clazyStandalonePathChooser->setHistoryCompleter("ClangTools.ClazyStandaloneExecutable.History");
//
// Group box "Run Options"
//
m_runSettingsWidget = new RunSettingsWidget;
m_runSettingsWidget->fromSettings(m_settings->runSettings());
m_ui->runSettingsWidget->fromSettings(m_settings->runSettings());
using namespace Layouting;
Column {
Group {
title(tr("Executables")),
Form {
tr("Clang-Tidy:"), m_clangTidyPathChooser, br,
tr("Clazy-Standalone:"), m_clazyStandalonePathChooser
}
},
m_runSettingsWidget,
st
}.attachTo(this);
}
void SettingsWidget::apply()
@@ -85,11 +82,11 @@ void SettingsWidget::apply()
m_settings->setClazyStandaloneExecutable(clazyStandalonePath());
// Run options
m_settings->setRunSettings(m_ui->runSettingsWidget->toSettings());
m_settings->setRunSettings(m_runSettingsWidget->toSettings());
// Custom configs
const CppEditor::ClangDiagnosticConfigs customConfigs
= m_ui->runSettingsWidget->diagnosticSelectionWidget()->customConfigs();
= m_runSettingsWidget->diagnosticSelectionWidget()->customConfigs();
m_settings->setDiagnosticConfigs(customConfigs);
m_settings->writeSettings();
@@ -102,12 +99,12 @@ SettingsWidget::~SettingsWidget()
FilePath SettingsWidget::clangTidyPath() const
{
return m_ui->clangTidyPathChooser->rawFilePath();
return m_clangTidyPathChooser->rawFilePath();
}
FilePath SettingsWidget::clazyStandalonePath() const
{
return m_ui->clazyStandalonePathChooser->rawFilePath();
return m_clazyStandalonePathChooser->rawFilePath();
}
// ClangToolsOptionsPage
@@ -124,5 +121,4 @@ ClangToolsOptionsPage::ClangToolsOptionsPage()
setWidgetCreator([] { return new SettingsWidget; });
}
} // namespace Internal
} // namespace ClangTools
} // ClangTools::Internal

18
src/plugins/clangtools/settingswidget.h
View File

@@ -9,12 +9,14 @@
#include <memory>
namespace Utils { class FilePath; }
namespace Utils {
class FilePath;
class PathChooser;
} // Utils
namespace ClangTools {
namespace Internal {
namespace ClangTools::Internal {
namespace Ui { class SettingsWidget; }
class RunSettingsWidget;
class SettingsWidget : public Core::IOptionsPageWidget
{
@@ -32,8 +34,11 @@ public:
private:
void apply() final;
std::unique_ptr<Ui::SettingsWidget> m_ui;
ClangToolsSettings *m_settings;
Utils::PathChooser *m_clangTidyPathChooser;
Utils::PathChooser *m_clazyStandalonePathChooser;
RunSettingsWidget *m_runSettingsWidget;
};
class ClangToolsOptionsPage final : public Core::IOptionsPage
@@ -42,5 +47,4 @@ public:
ClangToolsOptionsPage();
};
} // namespace Internal
} // namespace ClangTools
} // ClangTools::Internal

80
src/plugins/clangtools/settingswidget.ui
View File

@@ -1,80 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ClangTools::Internal::SettingsWidget</class>
<widget class="QWidget" name="ClangTools::Internal::SettingsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Executables</string>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Clang-Tidy:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Utils::PathChooser" name="clangTidyPathChooser" native="true"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="clazyStandaloneLabel">
<property name="text">
<string>Clazy-Standalone:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Utils::PathChooser" name="clazyStandalonePathChooser" native="true"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="ClangTools::Internal::RunSettingsWidget" name="runSettingsWidget" native="true"/>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>183</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Utils::PathChooser</class>
<extends>QWidget</extends>
<header location="global">utils/pathchooser.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ClangTools::Internal::RunSettingsWidget</class>
<extends>QWidget</extends>
<header>clangtools/runsettingswidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

178
src/plugins/clangtools/tidychecks.ui
View File

@@ -1,178 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ClangTools::Internal::TidyChecks</class>
<widget class="QWidget" name="ClangTools::Internal::TidyChecks">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>800</width>
<height>500</height>
</rect>
</property>
<property name="windowTitle">
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QComboBox" name="tidyMode">
<item>
<property name="text">
<string>Select Checks</string>
</property>
</item>
<item>
<property name="text">
<string>Use .clang-tidy config file</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QPushButton" name="plainTextEditButton">
<property name="text">
<string>Edit Checks as String...</string>
</property>
</widget>
</item>
<item>
<widget class="Utils::FancyLineEdit" name="filterLineEdit"/>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="checksPage">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QTreeView" name="checksPrefixesTree">
<property name="minimumSize">
<size>
<width>0</width>
<height>300</height>
</size>
</property>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="emptyPage">
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</layout>
</widget>
<widget class="QWidget" name="invalidExecutablePage">
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="Utils::InfoLabel" name="invalidExecutableLabel">
<property name="text">
<string>Could not query the supported checks from the clang-tidy executable.
Set a valid executable first.</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>239</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Utils::InfoLabel</class>
<extends>QLabel</extends>
<header location="global">utils/infolabel.h</header>
</customwidget>
<customwidget>
<class>Utils::FancyLineEdit</class>
<extends>QLineEdit</extends>
<header location="global">utils/fancylineedit.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

7
src/plugins/clearcase/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ add_qtc_plugin(ClearCase
SOURCES
activityselector.cpp activityselector.h
annotationhighlighter.cpp annotationhighlighter.h
checkoutdialog.cpp checkoutdialog.h checkoutdialog.ui
checkoutdialog.cpp checkoutdialog.h
clearcaseconstants.h
clearcaseeditor.cpp clearcaseeditor.h
clearcaseplugin.cpp clearcaseplugin.h
@@ -11,7 +11,6 @@ add_qtc_plugin(ClearCase
clearcasesubmiteditor.cpp clearcasesubmiteditor.h
clearcasesubmiteditorwidget.cpp clearcasesubmiteditorwidget.h
clearcasesync.cpp clearcasesync.h
settingspage.cpp settingspage.h settingspage.ui
undocheckout.ui
versionselector.cpp versionselector.h versionselector.ui
settingspage.cpp settingspage.h
versionselector.cpp versionselector.h
)

12
src/plugins/clearcase/activityselector.cpp
View File

@@ -6,6 +6,7 @@
#include "clearcaseconstants.h"
#include "clearcaseplugin.h"
#include "clearcasesettings.h"
#include "clearcasetr.h"
#include <utils/qtcassert.h>
@@ -14,8 +15,7 @@
#include <QLabel>
#include <QToolButton>
using namespace ClearCase;
using namespace ClearCase::Internal;
namespace ClearCase::Internal {
ActivitySelector::ActivitySelector(QWidget *parent) : QWidget(parent)
{
@@ -24,7 +24,7 @@ ActivitySelector::ActivitySelector(QWidget *parent) : QWidget(parent)
auto hboxLayout = new QHBoxLayout(this);
hboxLayout->setContentsMargins(0, 0, 0, 0);
auto lblActivity = new QLabel(tr("Select &activity:"));
auto lblActivity = new QLabel(Tr::tr("Select &activity:"));
lblActivity->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
hboxLayout->addWidget(lblActivity);
@@ -32,7 +32,7 @@ ActivitySelector::ActivitySelector(QWidget *parent) : QWidget(parent)
m_cmbActivity->setMinimumSize(QSize(350, 0));
hboxLayout->addWidget(m_cmbActivity);
QString addText = tr("Add");
QString addText = Tr::tr("Add");
if (!ClearCasePlugin::settings().autoAssignActivityName)
addText.append(QLatin1String("..."));
auto btnAdd = new QToolButton;
@@ -67,7 +67,7 @@ bool ActivitySelector::refresh()
void ActivitySelector::addKeep()
{
m_cmbActivity->insertItem(0, tr("Keep item activity"), QLatin1String(Constants::KEEP_ACTIVITY));
m_cmbActivity->insertItem(0, Tr::tr("Keep item activity"), QLatin1String(Constants::KEEP_ACTIVITY));
setActivity(QLatin1String(Constants::KEEP_ACTIVITY));
}
@@ -93,3 +93,5 @@ void ActivitySelector::newActivity()
if (ClearCasePlugin::newActivity())
refresh();
}
} // ClearCase::Internal

6
src/plugins/clearcase/activityselector.h
View File

@@ -9,8 +9,7 @@ QT_BEGIN_NAMESPACE
class QComboBox;
QT_END_NAMESPACE
namespace ClearCase {
namespace Internal {
namespace ClearCase::Internal {
class ActivitySelector : public QWidget
{
@@ -33,5 +32,4 @@ private:
QComboBox *m_cmbActivity = nullptr;
};
} // namespace Internal
} // namespace ClearCase
} // ClearCase::Internal

5
src/plugins/clearcase/annotationhighlighter.cpp
View File

@@ -3,8 +3,7 @@
#include "annotationhighlighter.h"
using namespace ClearCase;
using namespace ClearCase::Internal;
namespace ClearCase::Internal {
ClearCaseAnnotationHighlighter::ClearCaseAnnotationHighlighter(const ChangeNumbers &changeNumbers,
QTextDocument *document) :
@@ -16,3 +15,5 @@ QString ClearCaseAnnotationHighlighter::changeNumber(const QString &block) const
const int pos = block.indexOf(m_separator);
return pos > 1 ? block.left(pos) : QString();
}
} // ClearCase::Internal

6
src/plugins/clearcase/annotationhighlighter.h
View File

@@ -5,8 +5,7 @@
#include <vcsbase/baseannotationhighlighter.h>
namespace ClearCase {
namespace Internal {
namespace ClearCase::Internal {
// Annotation highlighter for clearcase triggering on 'changenumber '
class ClearCaseAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
@@ -22,5 +21,4 @@ private:
const QChar m_separator = QLatin1Char('|');
};
} // namespace Internal
} // namespace ClearCase
} // ClearCase::Internal

98
src/plugins/clearcase/checkoutdialog.cpp
View File

@@ -4,45 +4,90 @@
#include "checkoutdialog.h"
#include "activityselector.h"
#include "ui_checkoutdialog.h"
#include "clearcasetr.h"
#include <utils/layoutbuilder.h>
#include <QAbstractButton>
#include <QApplication>
#include <QCheckBox>
#include <QDialog>
#include <QDialogButtonBox>
#include <QHBoxLayout>
#include <QLabel>
#include <QPlainTextEdit>
#include <QPushButton>
#include <QVBoxLayout>
namespace ClearCase {
namespace Internal {
namespace ClearCase::Internal {
CheckOutDialog::CheckOutDialog(const QString &fileName, bool isUcm, bool showComment,
QWidget *parent) :
QDialog(parent), ui(new Ui::CheckOutDialog)
QDialog(parent)
{
ui->setupUi(this);
ui->lblFileName->setText(fileName);
resize(352, 317);
setWindowTitle(Tr::tr("Check Out"));
auto lblFileName = new QLabel(fileName);
lblFileName->setTextInteractionFlags(Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse);
m_txtComment = new QPlainTextEdit(this);
m_txtComment->setTabChangesFocus(true);
m_lblComment = new QLabel(Tr::tr("&Checkout comment:"));
m_lblComment->setBuddy(m_txtComment);
m_chkReserved = new QCheckBox(Tr::tr("&Reserved"));
m_chkReserved->setChecked(true);
m_chkUnreserved = new QCheckBox(Tr::tr("&Unreserved if already reserved"));
m_chkPTime = new QCheckBox(Tr::tr("&Preserve file modification time"));
m_hijackedCheckBox = new QCheckBox(Tr::tr("Use &Hijacked file"));
m_hijackedCheckBox->setChecked(true);
auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
using namespace Utils::Layouting;
Column {
lblFileName,
m_lblComment,
m_txtComment,
m_chkReserved,
Row { Space(16), m_chkUnreserved },
m_chkPTime,
m_hijackedCheckBox,
buttonBox
}.attachTo(this);
m_verticalLayout = static_cast<QVBoxLayout *>(layout());
if (isUcm) {
m_actSelector = new ActivitySelector(this);
ui->verticalLayout->insertWidget(0, m_actSelector);
ui->verticalLayout->insertWidget(1, Utils::Layouting::createHr());
m_verticalLayout->insertWidget(0, m_actSelector);
m_verticalLayout->insertWidget(1, Utils::Layouting::createHr());
}
if (!showComment)
hideComment();
ui->buttonBox->button(QDialogButtonBox::Ok)->setFocus();
buttonBox->button(QDialogButtonBox::Ok)->setFocus();
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
connect(m_chkReserved, &QAbstractButton::toggled, this, &CheckOutDialog::toggleUnreserved);
}
CheckOutDialog::~CheckOutDialog()
{
delete ui;
}
CheckOutDialog::~CheckOutDialog() = default;
void CheckOutDialog::hideComment()
{
ui->lblComment->hide();
ui->txtComment->hide();
ui->verticalLayout->invalidate();
m_lblComment->hide();
m_txtComment->hide();
m_verticalLayout->invalidate();
adjustSize();
}
@@ -53,41 +98,40 @@ QString CheckOutDialog::activity() const
QString CheckOutDialog::comment() const
{
return ui->txtComment->toPlainText();
return m_txtComment->toPlainText();
}
bool CheckOutDialog::isReserved() const
{
return ui->chkReserved->isChecked();
return m_chkReserved->isChecked();
}
bool CheckOutDialog::isUnreserved() const
{
return ui->chkUnreserved->isChecked();
return m_chkUnreserved->isChecked();
}
bool CheckOutDialog::isPreserveTime() const
{
return ui->chkPTime->isChecked();
return m_chkPTime->isChecked();
}
bool CheckOutDialog::isUseHijacked() const
{
return ui->hijackedCheckBox->isChecked();
return m_hijackedCheckBox->isChecked();
}
void CheckOutDialog::hideHijack()
{
ui->hijackedCheckBox->setVisible(false);
ui->hijackedCheckBox->setChecked(false);
m_hijackedCheckBox->setVisible(false);
m_hijackedCheckBox->setChecked(false);
}
void CheckOutDialog::toggleUnreserved(bool checked)
{
ui->chkUnreserved->setEnabled(checked);
m_chkUnreserved->setEnabled(checked);
if (!checked)
ui->chkUnreserved->setChecked(false);
m_chkUnreserved->setChecked(false);
}
} // namespace Internal
} // namespace ClearCase
} // ClearCase::Internal

22
src/plugins/clearcase/checkoutdialog.h
View File

@@ -5,10 +5,14 @@
#include <QDialog>
namespace ClearCase {
namespace Internal {
QT_BEGIN_NAMESPACE
class QCheckBox;
class QLabel;
class QPlainTextEdit;
class QVBoxLayout;
QT_END_NAMESPACE
namespace Ui { class CheckOutDialog; }
namespace ClearCase::Internal {
class ActivitySelector;
@@ -34,9 +38,15 @@ public:
private:
void toggleUnreserved(bool checked);
Ui::CheckOutDialog *ui;
ActivitySelector *m_actSelector = nullptr;
QVBoxLayout *m_verticalLayout;
QLabel *m_lblComment;
QPlainTextEdit *m_txtComment;
QCheckBox *m_chkReserved;
QCheckBox *m_chkUnreserved;
QCheckBox *m_chkPTime;
QCheckBox *m_hijackedCheckBox;
};
} // namespace Internal
} // namespace ClearCase
} // ClearCase::Internal

162
src/plugins/clearcase/checkoutdialog.ui
View File

@@ -1,162 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ClearCase::Internal::CheckOutDialog</class>
<widget class="QDialog" name="ClearCase::Internal::CheckOutDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>352</width>
<height>317</height>
</rect>
</property>
<property name="windowTitle">
<string>Check Out</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="lblFileName">
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lblComment">
<property name="text">
<string>&amp;Checkout comment:</string>
</property>
<property name="buddy">
<cstring>txtComment</cstring>
</property>
</widget>
</item>
<item>
<widget class="QPlainTextEdit" name="txtComment">
<property name="tabChangesFocus">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="chkReserved">
<property name="text">
<string>&amp;Reserved</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>16</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="chkUnreserved">
<property name="text">
<string>&amp;Unreserved if already reserved</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="chkPTime">
<property name="text">
<string>&amp;Preserve file modification time</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="hijackedCheckBox">
<property name="text">
<string extracomment="Hijack: Unset read-only flag without check-out. This is used for local changes which the user does not want to commit.">Use &amp;Hijacked file</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</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>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>ClearCase::Internal::CheckOutDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>ClearCase::Internal::CheckOutDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>chkReserved</sender>
<signal>toggled(bool)</signal>
<receiver>ClearCase::Internal::CheckOutDialog</receiver>
<slot>toggleUnreserved(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>50</x>
<y>173</y>
</hint>
<hint type="destinationlabel">
<x>6</x>
<y>186</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>toggleUnreserved(bool)</slot>
<slot>newActivity()</slot>
</slots>
</ui>

4
src/plugins/clearcase/clearcase.qbs
View File

@@ -20,7 +20,6 @@ QtcPlugin {
"annotationhighlighter.h",
"checkoutdialog.cpp",
"checkoutdialog.h",
"checkoutdialog.ui",
"clearcaseconstants.h",
"clearcaseeditor.cpp",
"clearcaseeditor.h",
@@ -36,11 +35,8 @@ QtcPlugin {
"clearcasesync.h",
"settingspage.cpp",
"settingspage.h",
"settingspage.ui",
"undocheckout.ui",
"versionselector.cpp",
"versionselector.h",
"versionselector.ui",
]
}

8
src/plugins/clearcase/clearcaseeditor.cpp
View File

@@ -2,6 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "clearcaseeditor.h"
#include "clearcasetr.h"
#include "annotationhighlighter.h"
@@ -9,8 +10,7 @@
#include <QTextCursor>
using namespace ClearCase;
using namespace ClearCase::Internal;
namespace ClearCase::Internal {
ClearCaseEditorWidget::ClearCaseEditorWidget() :
m_versionNumberPattern(QLatin1String("[\\\\/]main[\\\\/][^ \t\n\"]*"))
@@ -21,7 +21,7 @@ ClearCaseEditorWidget::ClearCaseEditorWidget() :
// "+++ D:\depot\...\mainwindow.cpp[TAB]Sun May 01 14:22:37 2011" (local)
setDiffFilePattern("^[-+]{3} ([^\\t]+?)(?:@@|\\t)");
setLogEntryPattern("version \"([^\"]+)\"");
setAnnotateRevisionTextFormat(tr("Annotate version \"%1\""));
setAnnotateRevisionTextFormat(Tr::tr("Annotate version \"%1\""));
setAnnotationEntryPattern("([^|]*)\\|[^\\n]*\\n");
setAnnotationSeparatorPattern("\\n-{30}");
}
@@ -46,3 +46,5 @@ VcsBase::BaseAnnotationHighlighter *ClearCaseEditorWidget::createAnnotationHighl
{
return new ClearCaseAnnotationHighlighter(changes);
}
} // ClearCase::Internal

6
src/plugins/clearcase/clearcaseeditor.h
View File

@@ -7,8 +7,7 @@
#include <QRegularExpression>
namespace ClearCase {
namespace Internal {
namespace ClearCase::Internal {
class ClearCaseEditorWidget : public VcsBase::VcsBaseEditorWidget
{
@@ -25,5 +24,4 @@ private:
const QRegularExpression m_versionNumberPattern;
};
} // namespace Internal
} // namespace ClearCase
} // ClearCase::Internal

205
src/plugins/clearcase/clearcaseplugin.cpp
View File

@@ -11,9 +11,9 @@
#include "clearcasesubmiteditor.h"
#include "clearcasesubmiteditorwidget.h"
#include "clearcasesync.h"
#include "clearcasetr.h"
#include "settingspage.h"
#include "versionselector.h"
#include "ui_undocheckout.h"
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h>
@@ -32,6 +32,7 @@
#include <utils/algorithm.h>
#include <utils/hostosinfo.h>
#include <utils/infobar.h>
#include <utils/layoutbuilder.h>
#include <utils/parameteraction.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
@@ -47,7 +48,10 @@
#include <vcsbase/vcsbaseplugin.h>
#include <vcsbase/vcscommand.h>
#include <QAbstractButton>
#include <QAction>
#include <QApplication>
#include <QCheckBox>
#include <QDebug>
#include <QDialog>
#include <QDialogButtonBox>
@@ -56,6 +60,7 @@
#include <QFuture>
#include <QFutureInterface>
#include <QInputDialog>
#include <QLabel>
#include <QList>
#include <QMenu>
#include <QMessageBox>
@@ -66,6 +71,7 @@
#include <QTextCodec>
#include <QUuid>
#include <QVBoxLayout>
#ifdef WITH_TESTS
#include <QTest>
#include <coreplugin/vcsmanager.h>
@@ -80,22 +86,22 @@ using namespace std::placeholders;
namespace ClearCase {
namespace Internal {
static const char CLEARCASE_CONTEXT[] = "ClearCase Context";
static const char CMD_ID_CLEARCASE_MENU[] = "ClearCase.Menu";
static const char CMD_ID_CHECKOUT[] = "ClearCase.CheckOut";
static const char CMD_ID_CHECKIN[] = "ClearCase.CheckInCurrent";
static const char CMD_ID_UNDOCHECKOUT[] = "ClearCase.UndoCheckOut";
static const char CMD_ID_UNDOHIJACK[] = "ClearCase.UndoHijack";
static const char CMD_ID_DIFF_CURRENT[] = "ClearCase.DiffCurrent";
static const char CMD_ID_HISTORY_CURRENT[] = "ClearCase.HistoryCurrent";
static const char CMD_ID_ANNOTATE[] = "ClearCase.Annotate";
static const char CMD_ID_ADD_FILE[] = "ClearCase.AddFile";
static const char CMD_ID_DIFF_ACTIVITY[] = "ClearCase.DiffActivity";
static const char CMD_ID_CHECKIN_ACTIVITY[] = "ClearCase.CheckInActivity";
static const char CMD_ID_UPDATEINDEX[] = "ClearCase.UpdateIndex";
static const char CMD_ID_UPDATE_VIEW[] = "ClearCase.UpdateView";
static const char CMD_ID_CHECKIN_ALL[] = "ClearCase.CheckInAll";
static const char CMD_ID_STATUS[] = "ClearCase.Status";
const char CLEARCASE_CONTEXT[] = "ClearCase Context";
const char CMD_ID_CLEARCASE_MENU[] = "ClearCase.Menu";
const char CMD_ID_CHECKOUT[] = "ClearCase.CheckOut";
const char CMD_ID_CHECKIN[] = "ClearCase.CheckInCurrent";
const char CMD_ID_UNDOCHECKOUT[] = "ClearCase.UndoCheckOut";
const char CMD_ID_UNDOHIJACK[] = "ClearCase.UndoHijack";
const char CMD_ID_DIFF_CURRENT[] = "ClearCase.DiffCurrent";
const char CMD_ID_HISTORY_CURRENT[] = "ClearCase.HistoryCurrent";
const char CMD_ID_ANNOTATE[] = "ClearCase.Annotate";
const char CMD_ID_ADD_FILE[] = "ClearCase.AddFile";
const char CMD_ID_DIFF_ACTIVITY[] = "ClearCase.DiffActivity";
const char CMD_ID_CHECKIN_ACTIVITY[] = "ClearCase.CheckInActivity";
const char CMD_ID_UPDATEINDEX[] = "ClearCase.UpdateIndex";
const char CMD_ID_UPDATE_VIEW[] = "ClearCase.UpdateView";
const char CMD_ID_CHECKIN_ALL[] = "ClearCase.CheckInAll";
const char CMD_ID_STATUS[] = "ClearCase.Status";
const int s_silentRun = VcsCommand::NoOutput | VcsCommand::FullySynchronously;
const int s_verboseRun = VcsCommand::ShowStdOut | VcsCommand::FullySynchronously;
@@ -416,7 +422,7 @@ void ClearCasePluginPrivate::updateEditDerivedObjectWarning(const QString &fileN
return;
infoBar->addInfo(InfoBarEntry(derivedObjectWarning,
tr("Editing Derived Object: %1").arg(fileName)));
Tr::tr("Editing Derived Object: %1").arg(fileName)));
} else {
infoBar->removeInfo(derivedObjectWarning);
}
@@ -615,82 +621,82 @@ ClearCasePluginPrivate::ClearCasePluginPrivate()
const QString prefix = QLatin1String("cc");
// register cc prefix in Locator
m_commandLocator = new CommandLocator("cc", description, prefix, this);
m_commandLocator->setDescription(tr("Triggers a ClearCase version control operation."));
m_commandLocator->setDescription(Tr::tr("Triggers a ClearCase version control operation."));
//register actions
ActionContainer *toolsContainer = ActionManager::actionContainer(M_TOOLS);
ActionContainer *clearcaseMenu = ActionManager::createMenu(CMD_ID_CLEARCASE_MENU);
clearcaseMenu->menu()->setTitle(tr("C&learCase"));
clearcaseMenu->menu()->setTitle(Tr::tr("C&learCase"));
toolsContainer->addMenu(clearcaseMenu);
m_menuAction = clearcaseMenu->menu()->menuAction();
Command *command;
m_checkOutAction = new ParameterAction(tr("Check Out..."), tr("Check &Out \"%1\"..."), ParameterAction::AlwaysEnabled, this);
m_checkOutAction = new ParameterAction(Tr::tr("Check Out..."), Tr::tr("Check &Out \"%1\"..."), ParameterAction::AlwaysEnabled, this);
command = ActionManager::registerAction(m_checkOutAction, CMD_ID_CHECKOUT,
context);
command->setAttribute(Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+O") : tr("Alt+L,Alt+O")));
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+O") : Tr::tr("Alt+L,Alt+O")));
connect(m_checkOutAction, &QAction::triggered, this, &ClearCasePluginPrivate::checkOutCurrentFile);
clearcaseMenu->addAction(command);
m_commandLocator->appendCommand(command);
m_checkInCurrentAction = new ParameterAction(tr("Check &In..."), tr("Check &In \"%1\"..."), ParameterAction::AlwaysEnabled, this);
m_checkInCurrentAction = new ParameterAction(Tr::tr("Check &In..."), Tr::tr("Check &In \"%1\"..."), ParameterAction::AlwaysEnabled, this);
command = ActionManager::registerAction(m_checkInCurrentAction, CMD_ID_CHECKIN, context);
command->setAttribute(Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+I") : tr("Alt+L,Alt+I")));
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+I") : Tr::tr("Alt+L,Alt+I")));
connect(m_checkInCurrentAction, &QAction::triggered, this, &ClearCasePluginPrivate::startCheckInCurrentFile);
clearcaseMenu->addAction(command);
m_commandLocator->appendCommand(command);
m_undoCheckOutAction = new ParameterAction(tr("Undo Check Out"), tr("&Undo Check Out \"%1\""), ParameterAction::AlwaysEnabled, this);
m_undoCheckOutAction = new ParameterAction(Tr::tr("Undo Check Out"), Tr::tr("&Undo Check Out \"%1\""), ParameterAction::AlwaysEnabled, this);
command = ActionManager::registerAction(m_undoCheckOutAction, CMD_ID_UNDOCHECKOUT, context);
command->setAttribute(Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+U") : tr("Alt+L,Alt+U")));
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+U") : Tr::tr("Alt+L,Alt+U")));
connect(m_undoCheckOutAction, &QAction::triggered, this, &ClearCasePluginPrivate::undoCheckOutCurrent);
clearcaseMenu->addAction(command);
m_commandLocator->appendCommand(command);
m_undoHijackAction = new ParameterAction(tr("Undo Hijack"), tr("Undo Hi&jack \"%1\""), ParameterAction::AlwaysEnabled, this);
m_undoHijackAction = new ParameterAction(Tr::tr("Undo Hijack"), Tr::tr("Undo Hi&jack \"%1\""), ParameterAction::AlwaysEnabled, this);
command = ActionManager::registerAction(m_undoHijackAction, CMD_ID_UNDOHIJACK, context);
command->setAttribute(Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+R") : tr("Alt+L,Alt+R")));
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+R") : Tr::tr("Alt+L,Alt+R")));
connect(m_undoHijackAction, &QAction::triggered, this, &ClearCasePluginPrivate::undoHijackCurrent);
clearcaseMenu->addAction(command);
m_commandLocator->appendCommand(command);
clearcaseMenu->addSeparator(context);
m_diffCurrentAction = new ParameterAction(tr("Diff Current File"), tr("&Diff \"%1\""), ParameterAction::EnabledWithParameter, this);
m_diffCurrentAction = new ParameterAction(Tr::tr("Diff Current File"), Tr::tr("&Diff \"%1\""), ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_diffCurrentAction,
CMD_ID_DIFF_CURRENT, context);
command->setAttribute(Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+D") : tr("Alt+L,Alt+D")));
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+D") : Tr::tr("Alt+L,Alt+D")));
connect(m_diffCurrentAction, &QAction::triggered, this, &ClearCasePluginPrivate::diffCurrentFile);
clearcaseMenu->addAction(command);
m_commandLocator->appendCommand(command);
m_historyCurrentAction = new ParameterAction(tr("History Current File"), tr("&History \"%1\""), ParameterAction::EnabledWithParameter, this);
m_historyCurrentAction = new ParameterAction(Tr::tr("History Current File"), Tr::tr("&History \"%1\""), ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_historyCurrentAction,
CMD_ID_HISTORY_CURRENT, context);
command->setAttribute(Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+H") : tr("Alt+L,Alt+H")));
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+H") : Tr::tr("Alt+L,Alt+H")));
connect(m_historyCurrentAction, &QAction::triggered, this,
&ClearCasePluginPrivate::historyCurrentFile);
clearcaseMenu->addAction(command);
m_commandLocator->appendCommand(command);
m_annotateCurrentAction = new ParameterAction(tr("Annotate Current File"), tr("&Annotate \"%1\""), ParameterAction::EnabledWithParameter, this);
m_annotateCurrentAction = new ParameterAction(Tr::tr("Annotate Current File"), Tr::tr("&Annotate \"%1\""), ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_annotateCurrentAction,
CMD_ID_ANNOTATE, context);
command->setAttribute(Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+A") : tr("Alt+L,Alt+A")));
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+A") : Tr::tr("Alt+L,Alt+A")));
connect(m_annotateCurrentAction, &QAction::triggered, this,
&ClearCasePluginPrivate::annotateCurrentFile);
clearcaseMenu->addAction(command);
m_commandLocator->appendCommand(command);
m_addFileAction = new ParameterAction(tr("Add File..."), tr("Add File \"%1\""), ParameterAction::EnabledWithParameter, this);
m_addFileAction = new ParameterAction(Tr::tr("Add File..."), Tr::tr("Add File \"%1\""), ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_addFileAction, CMD_ID_ADD_FILE, context);
command->setAttribute(Command::CA_UpdateText);
connect(m_addFileAction, &QAction::triggered, this, &ClearCasePluginPrivate::addCurrentFile);
@@ -698,14 +704,14 @@ ClearCasePluginPrivate::ClearCasePluginPrivate()
clearcaseMenu->addSeparator(context);
m_diffActivityAction = new QAction(tr("Diff A&ctivity..."), this);
m_diffActivityAction = new QAction(Tr::tr("Diff A&ctivity..."), this);
m_diffActivityAction->setEnabled(false);
command = ActionManager::registerAction(m_diffActivityAction, CMD_ID_DIFF_ACTIVITY, context);
connect(m_diffActivityAction, &QAction::triggered, this, &ClearCasePluginPrivate::diffActivity);
clearcaseMenu->addAction(command);
m_commandLocator->appendCommand(command);
m_checkInActivityAction = new ParameterAction(tr("Ch&eck In Activity"), tr("Chec&k In Activity \"%1\"..."), ParameterAction::EnabledWithParameter, this);
m_checkInActivityAction = new ParameterAction(Tr::tr("Ch&eck In Activity"), Tr::tr("Chec&k In Activity \"%1\"..."), ParameterAction::EnabledWithParameter, this);
m_checkInActivityAction->setEnabled(false);
command = ActionManager::registerAction(m_checkInActivityAction, CMD_ID_CHECKIN_ACTIVITY, context);
connect(m_checkInActivityAction, &QAction::triggered, this, &ClearCasePluginPrivate::startCheckInActivity);
@@ -715,12 +721,12 @@ ClearCasePluginPrivate::ClearCasePluginPrivate()
clearcaseMenu->addSeparator(context);
m_updateIndexAction = new QAction(tr("Update Index"), this);
m_updateIndexAction = new QAction(Tr::tr("Update Index"), this);
command = ActionManager::registerAction(m_updateIndexAction, CMD_ID_UPDATEINDEX, context);
connect(m_updateIndexAction, &QAction::triggered, this, &ClearCasePluginPrivate::updateIndex);
clearcaseMenu->addAction(command);
m_updateViewAction = new ParameterAction(tr("Update View"), tr("U&pdate View \"%1\""), ParameterAction::EnabledWithParameter, this);
m_updateViewAction = new ParameterAction(Tr::tr("Update View"), Tr::tr("U&pdate View \"%1\""), ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_updateViewAction, CMD_ID_UPDATE_VIEW, context);
connect(m_updateViewAction, &QAction::triggered, this, &ClearCasePluginPrivate::updateView);
command->setAttribute(Command::CA_UpdateText);
@@ -728,16 +734,16 @@ ClearCasePluginPrivate::ClearCasePluginPrivate()
clearcaseMenu->addSeparator(context);
m_checkInAllAction = new QAction(tr("Check In All &Files..."), this);
m_checkInAllAction = new QAction(Tr::tr("Check In All &Files..."), this);
command = ActionManager::registerAction(m_checkInAllAction, CMD_ID_CHECKIN_ALL, context);
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+F") : tr("Alt+L,Alt+F")));
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+F") : Tr::tr("Alt+L,Alt+F")));
connect(m_checkInAllAction, &QAction::triggered, this, &ClearCasePluginPrivate::startCheckInAll);
clearcaseMenu->addAction(command);
m_commandLocator->appendCommand(command);
m_statusAction = new QAction(tr("View &Status"), this);
m_statusAction = new QAction(Tr::tr("View &Status"), this);
command = ActionManager::registerAction(m_statusAction, CMD_ID_STATUS, context);
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+S") : tr("Alt+L,Alt+S")));
command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+S") : Tr::tr("Alt+L,Alt+S")));
connect(m_statusAction, &QAction::triggered, this, &ClearCasePluginPrivate::viewStatus);
clearcaseMenu->addAction(command);
m_commandLocator->appendCommand(command);
@@ -990,7 +996,7 @@ void ClearCasePluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as)
QString ClearCasePluginPrivate::commitDisplayName() const
{
return tr("Check In");
return Tr::tr("Check In");
}
void ClearCasePluginPrivate::checkOutCurrentFile()
@@ -1017,6 +1023,51 @@ void ClearCasePluginPrivate::setStatus(const QString &file, FileStatus::Status s
QMetaObject::invokeMethod(this, &ClearCasePluginPrivate::updateStatusActions);
}
class UndoCheckOutDialog : public QDialog
{
public:
UndoCheckOutDialog()
{
resize(323, 105);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
setWindowTitle(Tr::tr("Dialog"));
lblMessage = new QLabel(this);
QPalette palette;
QBrush brush(QColor(255, 0, 0, 255));
brush.setStyle(Qt::SolidPattern);
palette.setBrush(QPalette::Active, QPalette::WindowText, brush);
palette.setBrush(QPalette::Inactive, QPalette::WindowText, brush);
QBrush brush1(QColor(68, 96, 92, 255));
brush1.setStyle(Qt::SolidPattern);
palette.setBrush(QPalette::Disabled, QPalette::WindowText, brush1);
auto lblModified = new QLabel(Tr::tr("The file was changed."));
lblModified->setPalette(palette);
chkKeep = new QCheckBox(Tr::tr("&Save copy of the file with a '.keep' extension"));
chkKeep->setChecked(true);
auto buttonBox = new QDialogButtonBox(QDialogButtonBox::No|QDialogButtonBox::Yes);
using namespace Layouting;
Column {
lblMessage,
lblModified,
chkKeep,
buttonBox
}.attachTo(this);
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
}
QLabel *lblMessage;
QCheckBox *chkKeep;
};
void ClearCasePluginPrivate::undoCheckOutCurrent()
{
const VcsBasePluginState state = currentState();
@@ -1033,14 +1084,12 @@ void ClearCasePluginPrivate::undoCheckOutCurrent()
bool keep = false;
if (result.exitCode()) { // return value is 1 if there is any difference
Ui::UndoCheckOut uncoUi;
QDialog uncoDlg;
uncoUi.setupUi(&uncoDlg);
uncoUi.lblMessage->setText(tr("Do you want to undo the check out of \"%1\"?").arg(fileName));
uncoUi.chkKeep->setChecked(m_settings.keepFileUndoCheckout);
if (uncoDlg.exec() != QDialog::Accepted)
UndoCheckOutDialog dialog;
dialog.lblMessage->setText(Tr::tr("Do you want to undo the check out of \"%1\"?").arg(fileName));
dialog.chkKeep->setChecked(m_settings.keepFileUndoCheckout);
if (dialog.exec() != QDialog::Accepted)
return;
keep = uncoUi.chkKeep->isChecked();
keep = dialog.chkKeep->isChecked();
if (keep != m_settings.keepFileUndoCheckout) {
m_settings.keepFileUndoCheckout = keep;
m_settings.toSettings(ICore::settings());
@@ -1117,15 +1166,13 @@ void ClearCasePluginPrivate::undoHijackCurrent()
askKeep = false;
}
if (askKeep) {
Ui::UndoCheckOut unhijackUi;
QDialog unhijackDlg;
unhijackUi.setupUi(&unhijackDlg);
unhijackDlg.setWindowTitle(tr("Undo Hijack File"));
unhijackUi.lblMessage->setText(tr("Do you want to undo hijack of \"%1\"?")
UndoCheckOutDialog unhijackDlg;
unhijackDlg.setWindowTitle(Tr::tr("Undo Hijack File"));
unhijackDlg.lblMessage->setText(Tr::tr("Do you want to undo hijack of \"%1\"?")
.arg(QDir::toNativeSeparators(fileName)));
if (unhijackDlg.exec() != QDialog::Accepted)
return;
keep = unhijackUi.chkKeep->isChecked();
keep = unhijackDlg.chkKeep->isChecked();
}
FileChangeBlocker fcb(FilePath::fromString(state.currentFile()));
@@ -1160,7 +1207,7 @@ void ClearCasePluginPrivate::ccDiffWithPred(const FilePath &workingDir, const QS
return; // done here, diff is opened in a new window
}
if (!m_settings.extDiffAvailable) {
VcsOutputWindow::appendError(tr("External diff is required to compare multiple files."));
VcsOutputWindow::appendError(Tr::tr("External diff is required to compare multiple files."));
return;
}
QString result;
@@ -1232,12 +1279,12 @@ void ClearCasePluginPrivate::diffActivity()
if (Constants::debug)
qDebug() << Q_FUNC_INFO;
if (!m_settings.extDiffAvailable) {
VcsOutputWindow::appendError(tr("External diff is required to compare multiple files."));
VcsOutputWindow::appendError(Tr::tr("External diff is required to compare multiple files."));
return;
}
FilePath topLevel = state.topLevel();
QString activity = QInputDialog::getText(ICore::dialogParent(), tr("Enter Activity"),
tr("Activity Name"), QLineEdit::Normal, m_activity);
QString activity = QInputDialog::getText(ICore::dialogParent(), Tr::tr("Enter Activity"),
Tr::tr("Activity Name"), QLineEdit::Normal, m_activity);
if (activity.isEmpty())
return;
const QStringList versions = ccGetActivityVersions(topLevel, activity);
@@ -1335,7 +1382,7 @@ void ClearCasePluginPrivate::startCheckInActivity()
connect(buttonBox, &QDialogButtonBox::rejected, &dlg, &QDialog::reject);
layout->addWidget(actSelector);
layout->addWidget(buttonBox);
dlg.setWindowTitle(tr("Check In Activity"));
dlg.setWindowTitle(Tr::tr("Check In Activity"));
if (!dlg.exec())
return;
@@ -1369,13 +1416,13 @@ void ClearCasePluginPrivate::startCheckIn(const FilePath &workingDir, const QStr
return;
if (isCheckInEditorOpen()) {
VcsOutputWindow::appendWarning(tr("Another check in is currently being executed."));
VcsOutputWindow::appendWarning(Tr::tr("Another check in is currently being executed."));
return;
}
// Get list of added/modified/deleted files
if (files.empty()) {
VcsOutputWindow::appendWarning(tr("There are no modified files."));
VcsOutputWindow::appendWarning(Tr::tr("There are no modified files."));
return;
}
// Create a new submit change file containing the submit template
@@ -1611,7 +1658,7 @@ CommandResult ClearCasePluginPrivate::runCleartool(const FilePath &workingDir,
QTextCodec *outputCodec) const
{
if (m_settings.ccBinaryPath.isEmpty())
return CommandResult(ProcessResult::StartFailed, tr("No ClearCase executable specified."));
return CommandResult(ProcessResult::StartFailed, Tr::tr("No ClearCase executable specified."));
std::unique_ptr<VcsCommand> command;
command.reset(VcsBaseClient::createVcsCommand(workingDir, Environment::systemEnvironment()));
@@ -1679,8 +1726,8 @@ bool ClearCasePluginPrivate::vcsOpen(const FilePath &workingDir, const QString &
(fi.isWritable() || vcsStatus(absPath).status == FileStatus::Unknown))
runAsync(sync, QStringList(absPath)).waitForFinished();
if (vcsStatus(absPath).status == FileStatus::CheckedOut) {
QMessageBox::information(ICore::dialogParent(), tr("ClearCase Checkout"),
tr("File is already checked out."));
QMessageBox::information(ICore::dialogParent(), Tr::tr("ClearCase Checkout"),
Tr::tr("File is already checked out."));
return true;
}
@@ -1775,7 +1822,7 @@ bool ClearCasePluginPrivate::vcsSetActivity(const FilePath &workingDir, const QS
const CommandResult result =
runCleartool(workingDir, args, m_settings.timeOutS, VcsCommand::ShowStdOut);
if (result.result() != ProcessResult::FinishedWithSuccess) {
QMessageBox::warning(ICore::dialogParent(), title, tr("Set current activity failed: %1")
QMessageBox::warning(ICore::dialogParent(), title, Tr::tr("Set current activity failed: %1")
.arg(result.exitMessage()), QMessageBox::Ok);
return false;
}
@@ -1855,7 +1902,7 @@ bool ClearCasePluginPrivate::ccFileOp(const FilePath &workingDir, const QString
verticalLayout->addWidget(actSelector);
}
auto commentLabel = new QLabel(tr("Enter &comment:"));
auto commentLabel = new QLabel(Tr::tr("Enter &comment:"));
verticalLayout->addWidget(commentLabel);
auto commentEdit = new QTextEdit;
@@ -1928,24 +1975,24 @@ static QString baseName(const QString &fileName)
bool ClearCasePluginPrivate::vcsAdd(const FilePath &workingDir, const QString &fileName)
{
return ccFileOp(workingDir, tr("ClearCase Add File %1").arg(baseName(fileName)),
return ccFileOp(workingDir, Tr::tr("ClearCase Add File %1").arg(baseName(fileName)),
QStringList({"mkelem", "-ci"}), fileName);
}
bool ClearCasePluginPrivate::vcsDelete(const FilePath &workingDir, const QString &fileName)
{
const QString title(tr("ClearCase Remove Element %1").arg(baseName(fileName)));
if (QMessageBox::warning(ICore::dialogParent(), title, tr("This operation is irreversible. Are you sure?"),
const QString title(Tr::tr("ClearCase Remove Element %1").arg(baseName(fileName)));
if (QMessageBox::warning(ICore::dialogParent(), title, Tr::tr("This operation is irreversible. Are you sure?"),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::No)
return true;
return ccFileOp(workingDir, tr("ClearCase Remove File %1").arg(baseName(fileName)),
return ccFileOp(workingDir, Tr::tr("ClearCase Remove File %1").arg(baseName(fileName)),
QStringList({"rmname", "-force"}), fileName);
}
bool ClearCasePluginPrivate::vcsMove(const FilePath &workingDir, const QString &from, const QString &to)
{
return ccFileOp(workingDir, tr("ClearCase Rename File %1 -> %2")
return ccFileOp(workingDir, Tr::tr("ClearCase Rename File %1 -> %2")
.arg(baseName(from)).arg(baseName(to)),
QStringList("move"), from, to);
}
@@ -2046,8 +2093,8 @@ bool ClearCasePluginPrivate::newActivity()
QStringList args;
args << QLatin1String("mkactivity") << QLatin1String("-f");
if (!m_settings.autoAssignActivityName) {
QString headline = QInputDialog::getText(ICore::dialogParent(), tr("Activity Headline"),
tr("Enter activity headline"));
QString headline = QInputDialog::getText(ICore::dialogParent(), Tr::tr("Activity Headline"),
Tr::tr("Enter activity headline"));
if (headline.isEmpty())
return false;
args << QLatin1String("-headline") << headline;
@@ -2165,7 +2212,7 @@ void ClearCasePluginPrivate::updateIndex()
m_statusMap->clear();
QFuture<void> result = runAsync(sync, transform(project->files(Project::SourceFiles), &FilePath::toString));
if (!m_settings.disableIndexer)
ProgressManager::addTask(result, tr("Updating ClearCase Index"), ClearCase::Constants::TASK_INDEX);
ProgressManager::addTask(result, Tr::tr("Updating ClearCase Index"), ClearCase::Constants::TASK_INDEX);
}
/*! retrieve a \a file (usually of the form path\to\filename.cpp@@\main\ver)
@@ -2413,14 +2460,14 @@ void ClearCasePluginPrivate::vcsAnnotate(const FilePath &filePath, int line)
QString ClearCasePluginPrivate::vcsOpenText() const
{
return tr("Check &Out");
return Tr::tr("Check &Out");
}
QString ClearCasePluginPrivate::vcsMakeWritableText() const
{
if (isDynamic())
return {};
return tr("&Hijack");
return Tr::tr("&Hijack");
}
QString ClearCasePluginPrivate::vcsTopic(const FilePath &directory)

6
src/plugins/clearcase/clearcaseplugin.h
View File

@@ -10,8 +10,7 @@
#include <QStringList>
#include <QSharedPointer>
namespace ClearCase {
namespace Internal {
namespace ClearCase::Internal {
class ClearCaseSettings;
@@ -91,5 +90,4 @@ private slots:
#endif
};
} // namespace Internal
} // namespace ClearCase
} // ClearCase::Internal

36
src/plugins/clearcase/clearcasesettings.cpp
View File

@@ -7,23 +7,25 @@
#include <QSettings>
static const char groupC[] = "ClearCase";
static const char commandKeyC[] = "Command";
namespace ClearCase::Internal {
static const char historyCountKeyC[] = "HistoryCount";
static const char timeOutKeyC[] = "TimeOut";
static const char autoCheckOutKeyC[] = "AutoCheckOut";
static const char noCommentKeyC[] = "NoComment";
static const char keepFileUndoCheckoutKeyC[] = "KeepFileUnDoCheckout";
static const char diffTypeKeyC[] = "DiffType";
static const char diffArgsKeyC[] = "DiffArgs";
static const char autoAssignActivityKeyC[] = "AutoAssignActivityName";
static const char promptToCheckInKeyC[] = "PromptToCheckIn";
static const char disableIndexerKeyC[] = "DisableIndexer";
static const char totalFilesKeyC[] = "TotalFiles";
static const char indexOnlyVOBsC[] = "IndexOnlyVOBs";
const char groupC[] = "ClearCase";
const char commandKeyC[] = "Command";
static const char defaultDiffArgs[] = "-ubp";
const char historyCountKeyC[] = "HistoryCount";
const char timeOutKeyC[] = "TimeOut";
const char autoCheckOutKeyC[] = "AutoCheckOut";
const char noCommentKeyC[] = "NoComment";
const char keepFileUndoCheckoutKeyC[] = "KeepFileUnDoCheckout";
const char diffTypeKeyC[] = "DiffType";
const char diffArgsKeyC[] = "DiffArgs";
const char autoAssignActivityKeyC[] = "AutoAssignActivityName";
const char promptToCheckInKeyC[] = "PromptToCheckIn";
const char disableIndexerKeyC[] = "DisableIndexer";
const char totalFilesKeyC[] = "TotalFiles";
const char indexOnlyVOBsC[] = "IndexOnlyVOBs";
const char defaultDiffArgs[] = "-ubp";
enum { defaultTimeOutS = 30, defaultHistoryCount = 50 };
@@ -32,8 +34,6 @@ static QString defaultCommand()
return QLatin1String("cleartool" QTC_HOST_EXE_SUFFIX);
}
using namespace ClearCase::Internal;
ClearCaseSettings::ClearCaseSettings() :
ccCommand(defaultCommand()),
diffArgs(QLatin1String(defaultDiffArgs)),
@@ -118,3 +118,5 @@ bool ClearCaseSettings::equals(const ClearCaseSettings &s) const
&& indexOnlyVOBs == s.indexOnlyVOBs
&& totalFiles == s.totalFiles;
}
} // ClearCase::Internal

6
src/plugins/clearcase/clearcasesettings.h
View File

@@ -12,8 +12,7 @@ QT_BEGIN_NAMESPACE
class QSettings;
QT_END_NAMESPACE
namespace ClearCase {
namespace Internal {
namespace ClearCase::Internal {
enum DiffType
{
@@ -55,5 +54,4 @@ public:
int timeOutS;
};
} // namespace Internal
} // namespace ClearCase
} // ClearCase::Internal

7
src/plugins/clearcase/clearcasesubmiteditor.cpp
View File

@@ -4,17 +4,18 @@
#include "clearcasesubmiteditor.h"
#include "clearcasesubmiteditorwidget.h"
#include "clearcasetr.h"
#include <coreplugin/idocument.h>
#include <vcsbase/submitfilemodel.h>
using namespace ClearCase::Internal;
namespace ClearCase::Internal {
ClearCaseSubmitEditor::ClearCaseSubmitEditor() :
VcsBase::VcsBaseSubmitEditor(new ClearCaseSubmitEditorWidget)
{
document()->setPreferredDisplayName(tr("ClearCase Check In"));
document()->setPreferredDisplayName(Tr::tr("ClearCase Check In"));
}
ClearCaseSubmitEditorWidget *ClearCaseSubmitEditor::submitEditorWidget()
@@ -45,3 +46,5 @@ QByteArray ClearCaseSubmitEditor::fileContents() const
{
return VcsBase::VcsBaseSubmitEditor::fileContents().trimmed();
}
} // ClearCase::Internal

6
src/plugins/clearcase/clearcasesubmiteditor.h
View File

@@ -5,8 +5,7 @@
#include <vcsbase/vcsbasesubmiteditor.h>
namespace ClearCase {
namespace Internal {
namespace ClearCase::Internal {
class ClearCaseSubmitEditorWidget;
@@ -28,5 +27,4 @@ protected:
QByteArray fileContents() const override;
};
} // namespace Internal
} // namespace ClearCase
} // ClearCase::Internal

11
src/plugins/clearcase/clearcasesubmiteditorwidget.cpp
View File

@@ -4,13 +4,14 @@
#include "clearcasesubmiteditorwidget.h"
#include "activityselector.h"
#include "clearcasetr.h"
#include <utils/layoutbuilder.h>
#include <QCheckBox>
#include <QVBoxLayout>
using namespace ClearCase::Internal;
namespace ClearCase::Internal {
ClearCaseSubmitEditorWidget::ClearCaseSubmitEditorWidget()
{
@@ -19,10 +20,10 @@ ClearCaseSubmitEditorWidget::ClearCaseSubmitEditorWidget()
m_verticalLayout = new QVBoxLayout(checkInWidget);
m_chkIdentical = new QCheckBox(tr("Chec&k in even if identical to previous version"));
m_chkIdentical = new QCheckBox(Tr::tr("Chec&k in even if identical to previous version"));
m_verticalLayout->addWidget(m_chkIdentical);
m_chkPTime = new QCheckBox(tr("&Preserve file modification time"));
m_chkPTime = new QCheckBox(Tr::tr("&Preserve file modification time"));
m_verticalLayout->addWidget(m_chkPTime);
insertTopWidget(checkInWidget);
@@ -73,5 +74,7 @@ void ClearCaseSubmitEditorWidget::addActivitySelector(bool isUcm)
QString ClearCaseSubmitEditorWidget::commitName() const
{
return tr("&Check In");
return Tr::tr("&Check In");
}
} // ClearCase::Internal

6
src/plugins/clearcase/clearcasesubmiteditorwidget.h
View File

@@ -10,8 +10,7 @@ class QCheckBox;
class QVBoxLayout;
QT_END_NAMESPACE
namespace ClearCase {
namespace Internal {
namespace ClearCase::Internal {
class ActivitySelector;
@@ -40,5 +39,4 @@ private:
QVBoxLayout *m_verticalLayout;
};
} // namespace Internal
} // namespace ClearCase
} // ClearCase::Internal

7
src/plugins/clearcase/clearcasesync.cpp
View File

@@ -20,8 +20,7 @@
using namespace Utils;
namespace ClearCase {
namespace Internal {
namespace ClearCase::Internal {
static void runProcess(QFutureInterface<void> &future,
const ClearCaseSettings &settings,
@@ -333,6 +332,4 @@ void ClearCaseSync::verifyFileNotManagedDynamicView()
#endif
} // namespace Internal
} // namespace ClearCase
} // ClearCase::Internal

6
src/plugins/clearcase/clearcasesync.h
View File

@@ -11,8 +11,7 @@ template <typename T>
class QFutureInterface;
QT_END_NAMESPACE
namespace ClearCase {
namespace Internal {
namespace ClearCase::Internal {
class ClearCaseSync : public QObject
{
@@ -53,5 +52,4 @@ public slots:
#endif
};
} // namespace Internal
} // namespace ClearCase
} // ClearCase::Internal

197
src/plugins/clearcase/settingspage.cpp
View File

@@ -6,92 +6,198 @@
#include "clearcaseconstants.h"
#include "clearcaseplugin.h"
#include "clearcasesettings.h"
#include "ui_settingspage.h"
#include "clearcasetr.h"
#include <vcsbase/vcsbaseconstants.h>
#include <utils/environment.h>
#include <utils/hostosinfo.h>
#include <utils/layoutbuilder.h>
#include <utils/pathchooser.h>
#include <QCheckBox>
#include <QCoreApplication>
#include <QLabel>
#include <QLineEdit>
#include <QRadioButton>
#include <QSpinBox>
using namespace Utils;
namespace ClearCase {
namespace Internal {
namespace ClearCase::Internal {
class SettingsPageWidget final : public Core::IOptionsPageWidget
{
Q_DECLARE_TR_FUNCTIONS(ClearCase::Internal::SettingsPageWidget)
public:
SettingsPageWidget();
private:
void apply() final;
Ui::SettingsPage m_ui;
Utils::PathChooser *commandPathChooser;
QRadioButton *graphicalDiffRadioButton;
QRadioButton *externalDiffRadioButton;
QLineEdit *diffArgsEdit;
QSpinBox *historyCountSpinBox;
QSpinBox *timeOutSpinBox;
QCheckBox *autoCheckOutCheckBox;
QCheckBox *promptCheckBox;
QCheckBox *disableIndexerCheckBox;
QLineEdit *indexOnlyVOBsEdit;
QCheckBox *autoAssignActivityCheckBox;
QCheckBox *noCommentCheckBox;
};
SettingsPageWidget::SettingsPageWidget()
{
m_ui.setupUi(this);
m_ui.commandPathChooser->setPromptDialogTitle(tr("ClearCase Command"));
m_ui.commandPathChooser->setExpectedKind(PathChooser::ExistingCommand);
m_ui.commandPathChooser->setHistoryCompleter(QLatin1String("ClearCase.Command.History"));
resize(512, 589);
commandPathChooser = new PathChooser;
commandPathChooser->setPromptDialogTitle(Tr::Tr::tr("ClearCase Command"));
commandPathChooser->setExpectedKind(PathChooser::ExistingCommand);
commandPathChooser->setHistoryCompleter("ClearCase.Command.History");
graphicalDiffRadioButton = new QRadioButton(Tr::tr("&Graphical (single file only)"));
graphicalDiffRadioButton->setChecked(true);
auto diffWidget = new QWidget;
diffWidget->setEnabled(false);
externalDiffRadioButton = new QRadioButton(Tr::tr("&External"));
QObject::connect(externalDiffRadioButton, &QRadioButton::toggled, diffWidget, &QWidget::setEnabled);
diffArgsEdit = new QLineEdit(diffWidget);
QPalette palette;
QBrush brush(QColor(255, 0, 0, 255));
brush.setStyle(Qt::SolidPattern);
palette.setBrush(QPalette::Active, QPalette::WindowText, brush);
palette.setBrush(QPalette::Inactive, QPalette::WindowText, brush);
QBrush brush1(QColor(68, 96, 92, 255));
brush1.setStyle(Qt::SolidPattern);
palette.setBrush(QPalette::Disabled, QPalette::WindowText, brush1);
auto diffWarningLabel = new QLabel;
diffWarningLabel->setPalette(palette);
diffWarningLabel->setWordWrap(true);
historyCountSpinBox = new QSpinBox;
historyCountSpinBox->setMaximum(10000);
timeOutSpinBox = new QSpinBox;
timeOutSpinBox->setSuffix(Tr::tr("s", nullptr));
timeOutSpinBox->setRange(1, 360);
timeOutSpinBox->setValue(30);
autoCheckOutCheckBox = new QCheckBox(Tr::tr("&Automatically check out files on edit"));
promptCheckBox = new QCheckBox(Tr::tr("&Prompt on check-in"));
disableIndexerCheckBox = new QCheckBox(Tr::tr("Di&sable indexer"));
indexOnlyVOBsEdit = new QLineEdit;
indexOnlyVOBsEdit->setToolTip(Tr::tr("VOBs list, separated by comma. Indexer will only traverse "
"the specified VOBs. If left blank, all active VOBs will be indexed."));
autoAssignActivityCheckBox = new QCheckBox(Tr::tr("Aut&o assign activity names"));
autoAssignActivityCheckBox->setToolTip(Tr::tr("Check this if you have a trigger that renames "
"the activity automatically. You will not be prompted for activity name."));
noCommentCheckBox = new QCheckBox(Tr::tr("Do &not prompt for comment during checkout or check-in"));
noCommentCheckBox->setToolTip(Tr::tr("Check out or check in files with no comment (-nc/omment)."));
using namespace Layouting;
Row {
Tr::tr("Arg&uments:"),
diffArgsEdit
}.attachTo(diffWidget, WithoutMargins);
Column {
Group {
title(Tr::tr("Configuration")),
Form {
Tr::tr("&Command:"), commandPathChooser
}
},
Group {
title(Tr::tr("Diff")),
Form {
graphicalDiffRadioButton, br,
externalDiffRadioButton, diffWidget, br,
Span(2, diffWarningLabel)
}
},
Group {
title(Tr::tr("Miscellaneous")),
Form {
Tr::tr("&History count:"), historyCountSpinBox, br,
Tr::tr("&Timeout:"), timeOutSpinBox, br,
autoCheckOutCheckBox, br,
autoAssignActivityCheckBox, br,
noCommentCheckBox, br,
promptCheckBox, br,
disableIndexerCheckBox, br,
Tr::tr("&Index only VOBs:"), indexOnlyVOBsEdit,
}
},
st
}.attachTo(this);
const ClearCaseSettings &s = ClearCasePlugin::settings();
m_ui.commandPathChooser->setFilePath(FilePath::fromString(s.ccCommand));
m_ui.timeOutSpinBox->setValue(s.timeOutS);
m_ui.autoCheckOutCheckBox->setChecked(s.autoCheckOut);
m_ui.noCommentCheckBox->setChecked(s.noComment);
commandPathChooser->setFilePath(FilePath::fromString(s.ccCommand));
timeOutSpinBox->setValue(s.timeOutS);
autoCheckOutCheckBox->setChecked(s.autoCheckOut);
noCommentCheckBox->setChecked(s.noComment);
bool extDiffAvailable = !Environment::systemEnvironment().searchInPath(QLatin1String("diff")).isEmpty();
if (extDiffAvailable) {
m_ui.diffWarningLabel->setVisible(false);
diffWarningLabel->setVisible(false);
} else {
QString diffWarning = tr("In order to use External diff, \"diff\" command needs to be accessible.");
QString diffWarning = Tr::tr("In order to use External diff, \"diff\" command needs to be accessible.");
if (HostOsInfo::isWindowsHost()) {
diffWarning += QLatin1Char(' ');
diffWarning.append(tr("DiffUtils is available for free download at "
"http://gnuwin32.sourceforge.net/packages/diffutils.htm. "
"Extract it to a directory in your PATH."));
diffWarning.append(Tr::tr("DiffUtils is available for free download at "
"http://gnuwin32.sourceforge.net/packages/diffutils.htm. "
"Extract it to a directory in your PATH."));
}
m_ui.diffWarningLabel->setText(diffWarning);
m_ui.externalDiffRadioButton->setEnabled(false);
diffWarningLabel->setText(diffWarning);
externalDiffRadioButton->setEnabled(false);
}
if (extDiffAvailable && s.diffType == ExternalDiff)
m_ui.externalDiffRadioButton->setChecked(true);
externalDiffRadioButton->setChecked(true);
else
m_ui.graphicalDiffRadioButton->setChecked(true);
m_ui.autoAssignActivityCheckBox->setChecked(s.autoAssignActivityName);
m_ui.historyCountSpinBox->setValue(s.historyCount);
m_ui.promptCheckBox->setChecked(s.promptToCheckIn);
m_ui.disableIndexerCheckBox->setChecked(s.disableIndexer);
m_ui.diffArgsEdit->setText(s.diffArgs);
m_ui.indexOnlyVOBsEdit->setText(s.indexOnlyVOBs);
graphicalDiffRadioButton->setChecked(true);
autoAssignActivityCheckBox->setChecked(s.autoAssignActivityName);
historyCountSpinBox->setValue(s.historyCount);
promptCheckBox->setChecked(s.promptToCheckIn);
disableIndexerCheckBox->setChecked(s.disableIndexer);
diffArgsEdit->setText(s.diffArgs);
indexOnlyVOBsEdit->setText(s.indexOnlyVOBs);
}
void SettingsPageWidget::apply()
{
ClearCaseSettings rc;
rc.ccCommand = m_ui.commandPathChooser->rawFilePath().toString();
rc.ccBinaryPath = m_ui.commandPathChooser->filePath();
rc.timeOutS = m_ui.timeOutSpinBox->value();
rc.autoCheckOut = m_ui.autoCheckOutCheckBox->isChecked();
rc.noComment = m_ui.noCommentCheckBox->isChecked();
if (m_ui.graphicalDiffRadioButton->isChecked())
rc.ccCommand = commandPathChooser->rawFilePath().toString();
rc.ccBinaryPath = commandPathChooser->filePath();
rc.timeOutS = timeOutSpinBox->value();
rc.autoCheckOut = autoCheckOutCheckBox->isChecked();
rc.noComment = noCommentCheckBox->isChecked();
if (graphicalDiffRadioButton->isChecked())
rc.diffType = GraphicalDiff;
else if (m_ui.externalDiffRadioButton->isChecked())
else if (externalDiffRadioButton->isChecked())
rc.diffType = ExternalDiff;
rc.autoAssignActivityName = m_ui.autoAssignActivityCheckBox->isChecked();
rc.historyCount = m_ui.historyCountSpinBox->value();
rc.promptToCheckIn = m_ui.promptCheckBox->isChecked();
rc.disableIndexer = m_ui.disableIndexerCheckBox->isChecked();
rc.diffArgs = m_ui.diffArgsEdit->text();
rc.indexOnlyVOBs = m_ui.indexOnlyVOBsEdit->text();
rc.extDiffAvailable = m_ui.externalDiffRadioButton->isEnabled();
rc.autoAssignActivityName = autoAssignActivityCheckBox->isChecked();
rc.historyCount = historyCountSpinBox->value();
rc.promptToCheckIn = promptCheckBox->isChecked();
rc.disableIndexer = disableIndexerCheckBox->isChecked();
rc.diffArgs = diffArgsEdit->text();
rc.indexOnlyVOBs = indexOnlyVOBsEdit->text();
rc.extDiffAvailable = externalDiffRadioButton->isEnabled();
ClearCasePlugin::setSettings(rc);
}
@@ -99,10 +205,9 @@ void SettingsPageWidget::apply()
ClearCaseSettingsPage::ClearCaseSettingsPage()
{
setId(ClearCase::Constants::VCS_ID_CLEARCASE);
setDisplayName(SettingsPageWidget::tr("ClearCase"));
setDisplayName(Tr::tr("ClearCase"));
setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
setWidgetCreator([] { return new SettingsPageWidget; });
}
} // Internal
} // ClearCase
} // ClearCase::Internal

6
src/plugins/clearcase/settingspage.h
View File

@@ -5,8 +5,7 @@
#include <coreplugin/dialogs/ioptionspage.h>
namespace ClearCase {
namespace Internal {
namespace ClearCase::Internal {
class ClearCaseSettingsPage final : public Core::IOptionsPage
{
@@ -14,5 +13,4 @@ public:
ClearCaseSettingsPage();
};
} // namespace ClearCase
} // namespace Internal
} // ClearCase::Internal

318
src/plugins/clearcase/settingspage.ui
View File

@@ -1,318 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ClearCase::Internal::SettingsPage</class>
<widget class="QWidget" name="ClearCase::Internal::SettingsPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>512</width>
<height>589</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="generalGroupBox">
<property name="title">
<string>Configuration</string>
</property>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="commandLabel">
<property name="text">
<string>&amp;Command:</string>
</property>
<property name="buddy">
<cstring>commandPathChooser</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Utils::PathChooser" name="commandPathChooser" native="true"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Diff</string>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QRadioButton" name="graphicalDiffRadioButton">
<property name="text">
<string>&amp;Graphical (single file only)</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="externalDiffRadioButton">
<property name="text">
<string>&amp;External</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QWidget" name="diffWidget" native="true">
<property name="enabled">
<bool>false</bool>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="diffArgsLabel">
<property name="text">
<string>Arg&amp;uments:</string>
</property>
<property name="buddy">
<cstring>diffArgsEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="diffArgsEdit"/>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="diffWarningLabel">
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>68</red>
<green>96</green>
<blue>92</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="miscGroupBox">
<property name="title">
<string>Miscellaneous</string>
</property>
<layout class="QFormLayout" name="formLayout_2">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="historyCountLabel">
<property name="text">
<string>&amp;History count:</string>
</property>
<property name="buddy">
<cstring>historyCountSpinBox</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="historyCountSpinBox">
<property name="maximum">
<number>10000</number>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="timeOutLabel">
<property name="text">
<string>&amp;Timeout:</string>
</property>
<property name="buddy">
<cstring>timeOutSpinBox</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QSpinBox" name="timeOutSpinBox">
<property name="suffix">
<string>s</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>360</number>
</property>
<property name="value">
<number>30</number>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="autoCheckOutCheckBox">
<property name="text">
<string>&amp;Automatically check out files on edit</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QCheckBox" name="promptCheckBox">
<property name="text">
<string>&amp;Prompt on check-in</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QCheckBox" name="disableIndexerCheckBox">
<property name="text">
<string>Di&amp;sable indexer</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="indexOnlyVOBsLabel">
<property name="text">
<string extracomment="VOB: Versioned Object Base">&amp;Index only VOBs:</string>
</property>
<property name="buddy">
<cstring>indexOnlyVOBsEdit</cstring>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLineEdit" name="indexOnlyVOBsEdit">
<property name="toolTip">
<string>VOBs list, separated by comma. Indexer will only traverse the specified VOBs. If left blank, all active VOBs will be indexed.</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="autoAssignActivityCheckBox">
<property name="toolTip">
<string>Check this if you have a trigger that renames the activity automatically. You will not be prompted for activity name.</string>
</property>
<property name="text">
<string>Aut&amp;o assign activity names</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QCheckBox" name="noCommentCheckBox">
<property name="toolTip">
<string>Check out or check in files with no comment (-nc/omment).</string>
</property>
<property name="text">
<string>Do &amp;not prompt for comment during checkout or check-in</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Utils::PathChooser</class>
<extends>QWidget</extends>
<header location="global">utils/pathchooser.h</header>
<container>1</container>
<slots>
<signal>editingFinished()</signal>
<signal>browsingFinished()</signal>
</slots>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>graphicalDiffRadioButton</tabstop>
<tabstop>externalDiffRadioButton</tabstop>
<tabstop>diffArgsEdit</tabstop>
<tabstop>historyCountSpinBox</tabstop>
<tabstop>timeOutSpinBox</tabstop>
<tabstop>autoCheckOutCheckBox</tabstop>
<tabstop>autoAssignActivityCheckBox</tabstop>
<tabstop>noCommentCheckBox</tabstop>
<tabstop>promptCheckBox</tabstop>
<tabstop>disableIndexerCheckBox</tabstop>
<tabstop>indexOnlyVOBsEdit</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>externalDiffRadioButton</sender>
<signal>toggled(bool)</signal>
<receiver>diffWidget</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>83</x>
<y>122</y>
</hint>
<hint type="destinationlabel">
<x>203</x>
<y>140</y>
</hint>
</hints>
</connection>
</connections>
</ui>

127
src/plugins/clearcase/undocheckout.ui
View File

@@ -1,127 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ClearCase::Internal::UndoCheckOut</class>
<widget class="QDialog" name="ClearCase::Internal::UndoCheckOut">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>323</width>
<height>105</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="lblMessage"/>
</item>
<item>
<widget class="QLabel" name="lblModified">
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>68</red>
<green>96</green>
<blue>92</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="text">
<string>The file was changed.</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="chkKeep">
<property name="text">
<string>&amp;Save copy of the file with a '.keep' extension</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::No|QDialogButtonBox::Yes</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>ClearCase::Internal::UndoCheckOut</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>ClearCase::Internal::UndoCheckOut</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

92
src/plugins/clearcase/versionselector.cpp
View File

@@ -3,22 +3,52 @@
#include "versionselector.h"
#include "ui_versionselector.h"
#include "clearcasetr.h"
#include <utils/layoutbuilder.h>
#include <QDialogButtonBox>
#include <QLabel>
#include <QPlainTextEdit>
#include <QRadioButton>
#include <QRegularExpression>
#include <QTextEdit>
#include <QTextStream>
#include <QVBoxLayout>
namespace ClearCase {
namespace Internal {
namespace ClearCase::Internal {
VersionSelector::VersionSelector(const QString &fileName, const QString &message, QWidget *parent) :
QDialog(parent),
ui(new Ui::VersionSelector)
QDialog(parent)
{
ui->setupUi(this);
ui->headerLabel->setText(ui->headerLabel->text().arg(fileName));
ui->loadedText->setHtml("<html><head/><body><p><b>"
+ tr("Note: You will not be able to check in this file without merging "
resize(413, 435);
setWindowTitle(Tr::tr("Confirm Version to Check Out"));
auto headerLabel = new QLabel(Tr::tr("Multiple versions of \"%1\" can be checked out. "
"Select the version to check out:").arg(fileName));
headerLabel->setWordWrap(true);
headerLabel->setTextInteractionFlags(Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse);
auto loadedRadioButton = new QRadioButton(Tr::tr("&Loaded version"));
loadedRadioButton->setChecked(true);
auto loadedLabel = new QLabel;
auto loadedCreatedByLabel = new QLabel;
auto loadedCreatedOnLabel = new QLabel;
auto updatedLabel = new QLabel;
auto updatedCreatedByLabel = new QLabel;
auto updatedCreatedOnLabel = new QLabel;
auto updatedText = new QPlainTextEdit;
updatedText->setReadOnly(true);
m_updatedRadioButton = new QRadioButton(Tr::tr("Version after &update"));
auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
auto loadedText = new QTextEdit;
loadedText->setHtml("<html><head/><body><p><b>"
+ Tr::tr("Note: You will not be able to check in this file without merging "
"the changes (not supported by the plugin)")
+ "</b></p></body></html>");
m_stream = new QTextStream(message.toLocal8Bit(), QIODevice::ReadOnly | QIODevice::Text);
@@ -27,24 +57,45 @@ VersionSelector::VersionSelector(const QString &fileName, const QString &message
line = m_stream->readLine();
if (!readValues())
return;
ui->loadedLabel->setText(m_versionID);
ui->loadedCreatedByLabel->setText(m_createdBy);
ui->loadedCreatedOnLabel->setText(m_createdOn);
ui->loadedText->insertPlainText(m_message + QLatin1Char(' '));
loadedLabel->setText(m_versionID);
loadedCreatedByLabel->setText(m_createdBy);
loadedCreatedOnLabel->setText(m_createdOn);
loadedText->insertPlainText(m_message + QLatin1Char(' '));
line = m_stream->readLine(); // 2) Version after update
if (!readValues())
return;
ui->updatedLabel->setText(m_versionID);
ui->updatedCreatedByLabel->setText(m_createdBy);
ui->updatedCreatedOnLabel->setText(m_createdOn);
ui->updatedText->setPlainText(m_message);
updatedLabel->setText(m_versionID);
updatedCreatedByLabel->setText(m_createdBy);
updatedCreatedOnLabel->setText(m_createdOn);
updatedText->setPlainText(m_message);
using namespace Utils::Layouting;
Column {
headerLabel,
Form {
loadedRadioButton, loadedLabel, br,
Tr::tr("Created by:"), loadedCreatedByLabel, br,
Tr::tr("Created on:"), loadedCreatedOnLabel, br,
Span(2, loadedText),
},
Form {
m_updatedRadioButton, updatedLabel, br,
Tr::tr("Created by:"), updatedCreatedByLabel, br,
Tr::tr("Created on:"), updatedCreatedOnLabel, br,
Span(2, updatedText)
},
buttonBox,
}.attachTo(this);
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
}
VersionSelector::~VersionSelector()
{
delete m_stream;
delete ui;
}
bool VersionSelector::readValues()
@@ -85,8 +136,7 @@ bool VersionSelector::readValues()
bool VersionSelector::isUpdate() const
{
return (ui->updatedRadioButton->isChecked());
return m_updatedRadioButton->isChecked();
}
} // namespace Internal
} // namespace ClearCase
} // ClearCase::Internal

12
src/plugins/clearcase/versionselector.h
View File

@@ -6,13 +6,11 @@
#include <QDialog>
QT_BEGIN_NAMESPACE
class QRadioButton;
class QTextStream;
QT_END_NAMESPACE
namespace ClearCase {
namespace Internal {
namespace Ui { class VersionSelector; }
namespace ClearCase::Internal {
class VersionSelector : public QDialog
{
@@ -27,10 +25,10 @@ public:
private:
bool readValues();
Ui::VersionSelector *ui;
QTextStream *m_stream;
QString m_versionID, m_createdBy, m_createdOn, m_message;
QRadioButton *m_updatedRadioButton;
};
} // namespace Internal
} // namespace ClearCase
} // ClearCase::Internal

188
src/plugins/clearcase/versionselector.ui
View File

@@ -1,188 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ClearCase::Internal::VersionSelector</class>
<widget class="QDialog" name="ClearCase::Internal::VersionSelector">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>413</width>
<height>435</height>
</rect>
</property>
<property name="windowTitle">
<string>Confirm Version to Check Out</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="headerLabel">
<property name="text">
<string>Multiple versions of "%1" can be checked out. Select the version to check out:</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item>
<layout class="QFormLayout" name="loadedLayout">
<item row="0" column="0">
<widget class="QRadioButton" name="loadedRadioButton">
<property name="text">
<string>&amp;Loaded version</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="loadedLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="loadedCreatedByHeaderLabel">
<property name="text">
<string>Created by:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="loadedCreatedByLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="loadedCreatedOnHeaderLabel">
<property name="text">
<string>Created on:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="loadedCreatedOnLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QTextEdit" name="loadedText"/>
</item>
</layout>
</item>
<item>
<layout class="QFormLayout" name="updatedLayout">
<item row="0" column="1">
<widget class="QLabel" name="updatedLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="updatedCreatedByHeaderLabel">
<property name="text">
<string>Created by:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="updatedCreatedByLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="updatedCreatedOnHeaderLabel">
<property name="text">
<string extracomment="Date">Created on:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="updatedCreatedOnLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QPlainTextEdit" name="updatedText">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QRadioButton" name="updatedRadioButton">
<property name="text">
<string>Version after &amp;update</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>
<tabstops>
<tabstop>loadedRadioButton</tabstop>
<tabstop>loadedText</tabstop>
<tabstop>updatedRadioButton</tabstop>
<tabstop>updatedText</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>ClearCase::Internal::VersionSelector</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>ClearCase::Internal::VersionSelector</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

6
src/plugins/cmakeprojectmanager/builddirparameters.cpp
View File

@@ -18,8 +18,7 @@
using namespace ProjectExplorer;
namespace CMakeProjectManager {
namespace Internal {
namespace CMakeProjectManager::Internal {
BuildDirParameters::BuildDirParameters() = default;
@@ -78,5 +77,4 @@ CMakeTool *BuildDirParameters::cmakeTool() const
return CMakeToolManager::findById(cmakeToolId);
}
} // namespace Internal
} // namespace CMakeProjectManager
} // CMakeProjectManager::Internal

6
src/plugins/cmakeprojectmanager/builddirparameters.h
View File

@@ -8,8 +8,7 @@
#include <utils/environment.h>
#include <utils/filepath.h>
namespace CMakeProjectManager {
namespace Internal {
namespace CMakeProjectManager::Internal {
class CMakeBuildSystem;
@@ -37,5 +36,4 @@ public:
QStringList additionalCMakeArguments;
};
} // namespace Internal
} // namespace CMakeProjectManager
} // CMakeProjectManager::Internal

6
src/plugins/cmakeprojectmanager/cmakeautocompleter.cpp
View File

@@ -5,8 +5,7 @@
#include <QRegularExpression>
namespace CMakeProjectManager {
namespace Internal {
namespace CMakeProjectManager::Internal {
CMakeAutoCompleter::CMakeAutoCompleter()
{
@@ -123,5 +122,4 @@ bool CMakeAutoCompleter::contextAllowsElectricCharacters(const QTextCursor &curs
return !isInComment(cursor) && !isInString(cursor);
}
} // namespace Internal
} // namespace CMakeProjectManager
} // CMakeProjectManager::Internal

6
src/plugins/cmakeprojectmanager/cmakeautocompleter.h
View File

@@ -7,8 +7,7 @@
#include <texteditor/autocompleter.h>
namespace CMakeProjectManager {
namespace Internal {
namespace CMakeProjectManager::Internal {
class CMAKE_EXPORT CMakeAutoCompleter : public TextEditor::AutoCompleter
{
@@ -27,5 +26,4 @@ public:
bool contextAllowsElectricCharacters(const QTextCursor &cursor) const override;
};
} // namespace Internal
} // namespace CMakeProjectManager
} // CMakeProjectManager::Internal

127
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -10,6 +10,7 @@
#include "cmakekitinformation.h"
#include "cmakeproject.h"
#include "cmakeprojectconstants.h"
#include "cmakeprojectmanagertr.h"
#include "cmakeprojectplugin.h"
#include "cmakespecificsettings.h"
#include "configmodel.h"
@@ -75,8 +76,8 @@
using namespace ProjectExplorer;
using namespace Utils;
using namespace CMakeProjectManager::Internal;
using namespace CMakeProjectManager::Internal;
namespace CMakeProjectManager {
static Q_LOGGING_CATEGORY(cmakeBuildConfigurationLog, "qtc.cmake.bc", QtWarningMsg);
@@ -96,8 +97,6 @@ namespace Internal {
class CMakeBuildSettingsWidget : public NamedWidget
{
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeBuildSettingsWidget)
public:
CMakeBuildSettingsWidget(CMakeBuildSystem *bc);
@@ -165,7 +164,7 @@ static QModelIndex mapToSource(const QAbstractItemView *view, const QModelIndex
}
CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) :
NamedWidget(tr("CMake")),
NamedWidget(Tr::tr("CMake")),
m_buildSystem(bs),
m_configModel(new ConfigModel(this)),
m_configFilterModel(new CategorySortFilterModel(this)),
@@ -211,19 +210,19 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) :
m_warningMessageLabel->setVisible(false);
m_configurationStates = new QTabBar(this);
m_configurationStates->addTab(tr("Initial Configuration"));
m_configurationStates->addTab(tr("Current Configuration"));
m_configurationStates->addTab(Tr::tr("Initial Configuration"));
m_configurationStates->addTab(Tr::tr("Current Configuration"));
connect(m_configurationStates, &QTabBar::currentChanged, this, [this](int index) {
updateConfigurationStateIndex(index);
});
m_kitConfiguration = new QPushButton(tr("Kit Configuration"));
m_kitConfiguration->setToolTip(tr("Edit the current kit's CMake configuration."));
m_kitConfiguration = new QPushButton(Tr::tr("Kit Configuration"));
m_kitConfiguration->setToolTip(Tr::tr("Edit the current kit's CMake configuration."));
m_kitConfiguration->setFixedWidth(m_kitConfiguration->sizeHint().width());
connect(m_kitConfiguration, &QPushButton::clicked, this, [this]() { kitCMakeConfiguration(); });
m_filterEdit = new FancyLineEdit;
m_filterEdit->setPlaceholderText(tr("Filter"));
m_filterEdit->setPlaceholderText(Tr::tr("Filter"));
m_filterEdit->setFiltering(true);
auto tree = new TreeView;
connect(tree, &TreeView::activated,
@@ -271,46 +270,46 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) :
m_showProgressTimer.setInterval(50); // don't show progress for < 50ms tasks
connect(&m_showProgressTimer, &QTimer::timeout, [this]() { m_progressIndicator->show(); });
m_addButton = new QPushButton(tr("&Add"));
m_addButton->setToolTip(tr("Add a new configuration value."));
m_addButton = new QPushButton(Tr::tr("&Add"));
m_addButton->setToolTip(Tr::tr("Add a new configuration value."));
auto addButtonMenu = new QMenu(this);
addButtonMenu->addAction(tr("&Boolean"))->setData(
addButtonMenu->addAction(Tr::tr("&Boolean"))->setData(
QVariant::fromValue(static_cast<int>(ConfigModel::DataItem::BOOLEAN)));
addButtonMenu->addAction(tr("&String"))->setData(
addButtonMenu->addAction(Tr::tr("&String"))->setData(
QVariant::fromValue(static_cast<int>(ConfigModel::DataItem::STRING)));
addButtonMenu->addAction(tr("&Directory"))->setData(
addButtonMenu->addAction(Tr::tr("&Directory"))->setData(
QVariant::fromValue(static_cast<int>(ConfigModel::DataItem::DIRECTORY)));
addButtonMenu->addAction(tr("&File"))->setData(
addButtonMenu->addAction(Tr::tr("&File"))->setData(
QVariant::fromValue(static_cast<int>(ConfigModel::DataItem::FILE)));
m_addButton->setMenu(addButtonMenu);
m_editButton = new QPushButton(tr("&Edit"));
m_editButton->setToolTip(tr("Edit the current CMake configuration value."));
m_editButton = new QPushButton(Tr::tr("&Edit"));
m_editButton->setToolTip(Tr::tr("Edit the current CMake configuration value."));
m_setButton = new QPushButton(tr("&Set"));
m_setButton->setToolTip(tr("Set a value in the CMake configuration."));
m_setButton = new QPushButton(Tr::tr("&Set"));
m_setButton->setToolTip(Tr::tr("Set a value in the CMake configuration."));
m_unsetButton = new QPushButton(tr("&Unset"));
m_unsetButton->setToolTip(tr("Unset a value in the CMake configuration."));
m_unsetButton = new QPushButton(Tr::tr("&Unset"));
m_unsetButton->setToolTip(Tr::tr("Unset a value in the CMake configuration."));
m_resetButton = new QPushButton(tr("&Reset"));
m_resetButton->setToolTip(tr("Reset all unapplied changes."));
m_resetButton = new QPushButton(Tr::tr("&Reset"));
m_resetButton->setToolTip(Tr::tr("Reset all unapplied changes."));
m_resetButton->setEnabled(false);
m_batchEditButton = new QPushButton(tr("Batch Edit..."));
m_batchEditButton->setToolTip(tr("Set or reset multiple values in the CMake configuration."));
m_batchEditButton = new QPushButton(Tr::tr("Batch Edit..."));
m_batchEditButton->setToolTip(Tr::tr("Set or reset multiple values in the CMake configuration."));
m_showAdvancedCheckBox = new QCheckBox(tr("Advanced"));
m_showAdvancedCheckBox = new QCheckBox(Tr::tr("Advanced"));
connect(m_configView->selectionModel(), &QItemSelectionModel::selectionChanged,
this, [this](const QItemSelection &, const QItemSelection &) {
updateSelection();
});
m_reconfigureButton = new QPushButton(tr("Run CMake"));
m_reconfigureButton = new QPushButton(Tr::tr("Run CMake"));
m_reconfigureButton->setEnabled(false);
auto clearBox = new QCheckBox(tr("Clear system environment"), this);
auto clearBox = new QCheckBox(Tr::tr("Clear system environment"), this);
clearBox->setChecked(cbc->useClearConfigureEnvironment());
auto envWidget = new EnvironmentWidget(this, EnvironmentWidget::TypeLocal, clearBox);
@@ -479,14 +478,14 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) :
connect(addButtonMenu, &QMenu::triggered, this, [this](QAction *action) {
ConfigModel::DataItem::Type type =
static_cast<ConfigModel::DataItem::Type>(action->data().value<int>());
QString value = tr("<UNSET>");
QString value = Tr::tr("<UNSET>");
if (type == ConfigModel::DataItem::BOOLEAN)
value = QString::fromLatin1("OFF");
m_configModel->appendConfiguration(tr("<UNSET>"), value, type, isInitialConfiguration());
m_configModel->appendConfiguration(Tr::tr("<UNSET>"), value, type, isInitialConfiguration());
const TreeItem *item = m_configModel->findNonRootItem([&value, type](TreeItem *item) {
ConfigModel::DataItem dataItem = ConfigModel::dataItemFromIndex(item->index());
return dataItem.key == tr("<UNSET>") && dataItem.type == type && dataItem.value == value;
return dataItem.key == Tr::tr("<UNSET>") && dataItem.type == type && dataItem.value == value;
});
QModelIndex idx = m_configModel->indexForItem(item);
idx = m_configTextFilterModel->mapFromSource(m_configFilterModel->mapFromSource(idx));
@@ -537,14 +536,14 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) :
void CMakeBuildSettingsWidget::batchEditConfiguration()
{
auto dialog = new QDialog(this);
dialog->setWindowTitle(tr("Edit CMake Configuration"));
dialog->setWindowTitle(Tr::tr("Edit CMake Configuration"));
dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->setModal(true);
auto layout = new QVBoxLayout(dialog);
auto editor = new QPlainTextEdit(dialog);
auto label = new QLabel(dialog);
label->setText(tr("Enter one CMake <a href=\"variable\">variable</a> per line.<br/>"
label->setText(Tr::tr("Enter one CMake <a href=\"variable\">variable</a> per line.<br/>"
"To set or change a variable, use -D&lt;variable&gt;:&lt;type&gt;=&lt;value&gt;.<br/>"
"&lt;type&gt; can have one of the following values: FILEPATH, PATH, BOOL, INTERNAL, or STRING.<br/>"
"To unset a variable, use -U&lt;variable&gt;.<br/>"));
@@ -598,9 +597,9 @@ void CMakeBuildSettingsWidget::reconfigureWithInitialParameters()
if (!doNotAsk) {
QDialogButtonBox::StandardButton reply = Utils::CheckableMessageBox::question(
Core::ICore::dialogParent(),
tr("Re-configure with Initial Parameters"),
tr("Clear CMake configuration and configure with initial parameters?"),
tr("Do not ask again"),
Tr::tr("Re-configure with Initial Parameters"),
Tr::tr("Clear CMake configuration and configure with initial parameters?"),
Tr::tr("Do not ask again"),
&doNotAsk,
QDialogButtonBox::Yes | QDialogButtonBox::No,
QDialogButtonBox::Yes);
@@ -657,7 +656,7 @@ void CMakeBuildSettingsWidget::kitCMakeConfiguration()
m_buildSystem->kit()->blockNotification();
auto dialog = new QDialog(this);
dialog->setWindowTitle(tr("Kit CMake Configuration"));
dialog->setWindowTitle(Tr::tr("Kit CMake Configuration"));
dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->setModal(true);
dialog->setSizeGripEnabled(true);
@@ -708,7 +707,7 @@ void CMakeBuildSettingsWidget::updateConfigureDetailsWidgetsSummary(
cmd.addArgs(configurationArguments);
params.setCommandLine(cmd);
m_configureDetailsWidget->setSummaryText(params.summary(tr("Configure")));
m_configureDetailsWidget->setSummaryText(params.summary(Tr::tr("Configure")));
m_configureDetailsWidget->setState(DetailsWidget::Expanded);
}
@@ -777,14 +776,14 @@ void CMakeBuildSettingsWidget::updateButtonState()
// Update label and text boldness of the reconfigure button
QFont reconfigureButtonFont = m_reconfigureButton->font();
if (isParsing) {
m_reconfigureButton->setText(tr("Stop CMake"));
m_reconfigureButton->setText(Tr::tr("Stop CMake"));
reconfigureButtonFont.setBold(false);
} else {
m_reconfigureButton->setEnabled(true);
if (isInitial) {
m_reconfigureButton->setText(tr("Re-configure with Initial Parameters"));
m_reconfigureButton->setText(Tr::tr("Re-configure with Initial Parameters"));
} else {
m_reconfigureButton->setText(tr("Run CMake"));
m_reconfigureButton->setText(Tr::tr("Run CMake"));
}
reconfigureButtonFont.setBold(isInitial ? m_configModel->hasChanges(isInitial)
: !configChanges.isEmpty());
@@ -998,21 +997,21 @@ QAction *CMakeBuildSettingsWidget::createForceAction(int type, const QModelIndex
QString typeString;
switch (type) {
case ConfigModel::DataItem::BOOLEAN:
typeString = tr("bool", "display string for cmake type BOOLEAN");
typeString = Tr::tr("bool", "display string for cmake type BOOLEAN");
break;
case ConfigModel::DataItem::FILE:
typeString = tr("file", "display string for cmake type FILE");
typeString = Tr::tr("file", "display string for cmake type FILE");
break;
case ConfigModel::DataItem::DIRECTORY:
typeString = tr("directory", "display string for cmake type DIRECTORY");
typeString = Tr::tr("directory", "display string for cmake type DIRECTORY");
break;
case ConfigModel::DataItem::STRING:
typeString = tr("string", "display string for cmake type STRING");
typeString = Tr::tr("string", "display string for cmake type STRING");
break;
case ConfigModel::DataItem::UNKNOWN:
return nullptr;
}
QAction *forceAction = new QAction(tr("Force to %1").arg(typeString), nullptr);
QAction *forceAction = new QAction(Tr::tr("Force to %1").arg(typeString), nullptr);
forceAction->setEnabled(m_configModel->canForceTo(idx, t));
connect(forceAction, &QAction::triggered,
this, [this, idx, t]() { m_configModel->forceTo(idx, t); });
@@ -1033,7 +1032,7 @@ bool CMakeBuildSettingsWidget::eventFilter(QObject *target, QEvent *event)
auto menu = new QMenu(this);
connect(menu, &QMenu::triggered, menu, &QMenu::deleteLater);
auto help = new QAction(tr("Help"), this);
auto help = new QAction(Tr::tr("Help"), this);
menu->addAction(help);
connect(help, &QAction::triggered, this, [=] {
const CMakeConfigItem item = ConfigModel::dataItemFromIndex(idx).toCMakeConfigItem();
@@ -1058,8 +1057,8 @@ bool CMakeBuildSettingsWidget::eventFilter(QObject *target, QEvent *event)
menu->addSeparator();
auto applyKitOrInitialValue = new QAction(isInitialConfiguration()
? tr("Apply Kit Value")
: tr("Apply Initial Configuration Value"),
? Tr::tr("Apply Kit Value")
: Tr::tr("Apply Initial Configuration Value"),
this);
menu->addAction(applyKitOrInitialValue);
connect(applyKitOrInitialValue, &QAction::triggered, this, [this] {
@@ -1079,7 +1078,7 @@ bool CMakeBuildSettingsWidget::eventFilter(QObject *target, QEvent *event)
menu->addSeparator();
auto copy = new QAction(tr("Copy"), this);
auto copy = new QAction(Tr::tr("Copy"), this);
menu->addAction(copy);
connect(copy, &QAction::triggered, this, [this] {
const QModelIndexList selectedIndexes = m_configView->selectionModel()->selectedIndexes();
@@ -1377,8 +1376,8 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
if (QDir(oldDir).exists("CMakeCache.txt") && !QDir(newDir).exists("CMakeCache.txt")) {
if (QMessageBox::information(
Core::ICore::dialogParent(),
tr("Changing Build Directory"),
tr("Change the build directory to \"%1\" and start with a "
Tr::tr("Changing Build Directory"),
Tr::tr("Change the build directory to \"%1\" and start with a "
"basic CMake configuration?")
.arg(newDir),
QMessageBox::Ok,
@@ -1398,7 +1397,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
additionalCMakeArgumentsAspect->setMacroExpanderProvider([this] { return macroExpander(); });
macroExpander()->registerVariable(DEVELOPMENT_TEAM_FLAG,
tr("The CMake flag for the development team"),
Tr::tr("The CMake flag for the development team"),
[this] {
const CMakeConfig flags = signingFlags();
if (!flags.isEmpty())
@@ -1406,7 +1405,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
return QString();
});
macroExpander()->registerVariable(PROVISIONING_PROFILE_FLAG,
tr("The CMake flag for the provisioning profile"),
Tr::tr("The CMake flag for the provisioning profile"),
[this] {
const CMakeConfig flags = signingFlags();
if (flags.size() > 1 && !flags.at(1).isUnset) {
@@ -1416,7 +1415,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
});
macroExpander()->registerVariable(CMAKE_OSX_ARCHITECTURES_FLAG,
tr("The CMake flag for the architecture on macOS"),
Tr::tr("The CMake flag for the architecture on macOS"),
[target] {
if (HostOsInfo::isRunningUnderRosetta()) {
if (auto *qt = QtSupport::QtKitAspect::qtVersion(target->kit())) {
@@ -1430,7 +1429,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
return QLatin1String();
});
macroExpander()->registerVariable(QT_QML_DEBUG_FLAG,
tr("The CMake flag for QML debugging, if enabled"),
Tr::tr("The CMake flag for QML debugging, if enabled"),
[this] {
if (aspect<QtSupport::QmlDebuggingAspect>()->value()
== TriState::Enabled) {
@@ -1997,17 +1996,17 @@ BuildInfo CMakeBuildConfigurationFactory::createBuildInfo(BuildType buildType)
break;
case BuildTypeMinSizeRel:
info.typeName = "MinSizeRel";
info.displayName = CMakeBuildConfiguration::tr("Minimum Size Release");
info.displayName = Tr::tr("Minimum Size Release");
info.buildType = BuildConfiguration::Release;
break;
case BuildTypeRelWithDebInfo:
info.typeName = "RelWithDebInfo";
info.displayName = CMakeBuildConfiguration::tr("Release with Debug Information");
info.displayName = Tr::tr("Release with Debug Information");
info.buildType = BuildConfiguration::Profile;
break;
case BuildTypeProfile: {
info.typeName = "Profile";
info.displayName = CMakeBuildConfiguration::tr("Profile");
info.displayName = Tr::tr("Profile");
info.buildType = BuildConfiguration::Profile;
QVariantMap extraInfo;
// override CMake build type, which defaults to info.typeName
@@ -2125,9 +2124,9 @@ Environment CMakeBuildConfiguration::baseConfigureEnvironment() const
QString CMakeBuildConfiguration::baseConfigureEnvironmentText() const
{
if (useClearConfigureEnvironment())
return tr("Clean Environment");
return Tr::tr("Clean Environment");
else
return tr("System Environment");
return Tr::tr("System Environment");
}
QString CMakeBuildSystem::cmakeBuildType() const
@@ -2262,7 +2261,7 @@ void InitialCMakeArgumentsAspect::toMap(QVariantMap &map) const
InitialCMakeArgumentsAspect::InitialCMakeArgumentsAspect()
{
setSettingsKey("CMake.Initial.Parameters");
setLabelText(tr("Additional CMake <a href=\"options\">options</a>:"));
setLabelText(Tr::tr("Additional CMake <a href=\"options\">options</a>:"));
setDisplayStyle(LineEditDisplay);
}
@@ -2273,7 +2272,7 @@ InitialCMakeArgumentsAspect::InitialCMakeArgumentsAspect()
AdditionalCMakeOptionsAspect::AdditionalCMakeOptionsAspect()
{
setSettingsKey("CMake.Additional.Options");
setLabelText(tr("Additional CMake <a href=\"options\">options</a>:"));
setLabelText(Tr::tr("Additional CMake <a href=\"options\">options</a>:"));
setDisplayStyle(LineEditDisplay);
}
@@ -2292,7 +2291,7 @@ SourceDirectoryAspect::SourceDirectoryAspect()
BuildTypeAspect::BuildTypeAspect()
{
setSettingsKey(CMAKE_BUILD_TYPE);
setLabelText(tr("Build type:"));
setLabelText(Tr::tr("Build type:"));
setDisplayStyle(LineEditDisplay);
setDefaultValue("Unknown");
}

47
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -9,6 +9,7 @@
#include "cmakeparser.h"
#include "cmakeproject.h"
#include "cmakeprojectconstants.h"
#include "cmakeprojectmanagertr.h"
#include "cmaketool.h"
#include <coreplugin/find/itemviewfind.h>
@@ -38,8 +39,7 @@ using namespace Core;
using namespace ProjectExplorer;
using namespace Utils;
namespace CMakeProjectManager {
namespace Internal {
namespace CMakeProjectManager::Internal {
const char BUILD_TARGETS_KEY[] = "CMakeProjectManager.MakeStep.BuildTargets";
const char CMAKE_ARGUMENTS_KEY[] = "CMakeProjectManager.MakeStep.CMakeArguments";
@@ -112,17 +112,17 @@ QVariant CMakeTargetItem::data(int column, int role) const
if (column == 0) {
if (role == Qt::DisplayRole) {
if (m_target.isEmpty())
return CMakeBuildStep::tr("Current executable");
return Tr::tr("Current executable");
return m_target;
}
if (role == Qt::ToolTipRole) {
if (m_target.isEmpty()) {
return CMakeBuildStep::tr("Build the executable used in the active run "
return Tr::tr("Build the executable used in the active run "
"configuration. Currently: %1")
.arg(m_step->activeRunConfigTarget());
}
return CMakeBuildStep::tr("Target: %1").arg(m_target);
return Tr::tr("Target: %1").arg(m_target);
}
if (role == Qt::CheckStateRole)
@@ -161,12 +161,12 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Utils::Id id) :
{
m_cmakeArguments = addAspect<StringAspect>();
m_cmakeArguments->setSettingsKey(CMAKE_ARGUMENTS_KEY);
m_cmakeArguments->setLabelText(tr("CMake arguments:"));
m_cmakeArguments->setLabelText(Tr::tr("CMake arguments:"));
m_cmakeArguments->setDisplayStyle(StringAspect::LineEditDisplay);
m_toolArguments = addAspect<StringAspect>();
m_toolArguments->setSettingsKey(TOOL_ARGUMENTS_KEY);
m_toolArguments->setLabelText(tr("Tool arguments:"));
m_toolArguments->setLabelText(Tr::tr("Tool arguments:"));
m_toolArguments->setDisplayStyle(StringAspect::LineEditDisplay);
Kit *kit = buildConfiguration()->kit();
@@ -176,13 +176,13 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Utils::Id id) :
m_useiOSAutomaticProvisioningUpdates->setSettingsKey(
IOS_AUTOMATIC_PROVISIONG_UPDATES_ARGUMENTS_KEY);
m_useiOSAutomaticProvisioningUpdates->setLabel(
tr("Enable automatic provisioning updates:"));
Tr::tr("Enable automatic provisioning updates:"));
m_useiOSAutomaticProvisioningUpdates->setToolTip(
tr("Tells xcodebuild to create and download a provisioning profile "
Tr::tr("Tells xcodebuild to create and download a provisioning profile "
"if a valid one does not exist."));
}
m_buildTargetModel.setHeader({tr("Target")});
m_buildTargetModel.setHeader({Tr::tr("Target")});
setBuildTargets({defaultBuildTarget()});
auto *bs = qobject_cast<CMakeBuildSystem *>(buildSystem());
@@ -248,7 +248,7 @@ bool CMakeBuildStep::init()
if (!bc->isEnabled()) {
emit addTask(BuildSystemTask(Task::Error,
tr("The build configuration is currently disabled.")));
Tr::tr("The build configuration is currently disabled.")));
emitFaultyConfigurationMessage();
return false;
}
@@ -256,7 +256,7 @@ bool CMakeBuildStep::init()
CMakeTool *tool = CMakeKitAspect::cmakeTool(kit());
if (!tool || !tool->isValid()) {
emit addTask(BuildSystemTask(Task::Error,
tr("A CMake tool must be set up for building. "
Tr::tr("A CMake tool must be set up for building. "
"Configure a CMake tool in the kit options.")));
emitFaultyConfigurationMessage();
return false;
@@ -280,7 +280,7 @@ bool CMakeBuildStep::init()
if (bc->buildDirectory() != projectDirectory) {
if (projectDirectory.pathAppended("CMakeCache.txt").exists()) {
emit addTask(BuildSystemTask(Task::Warning,
tr("There is a CMakeCache.txt file in \"%1\", which suggest an "
Tr::tr("There is a CMakeCache.txt file in \"%1\", which suggest an "
"in-source build was done before. You are now building in \"%2\", "
"and the CMakeCache.txt file might confuse CMake.")
.arg(projectDirectory.toUserOutput(), bc->buildDirectory().toUserOutput())));
@@ -323,10 +323,10 @@ void CMakeBuildStep::doRun()
m_waiting = false;
auto bs = static_cast<CMakeBuildSystem *>(buildSystem());
if (bs->persistCMakeState()) {
emit addOutput(tr("Persisting CMake state..."), BuildStep::OutputFormat::NormalMessage);
emit addOutput(Tr::tr("Persisting CMake state..."), BuildStep::OutputFormat::NormalMessage);
m_waiting = true;
} else if (buildSystem()->isWaitingForParse()) {
emit addOutput(tr("Running CMake in preparation to build..."), BuildStep::OutputFormat::NormalMessage);
emit addOutput(Tr::tr("Running CMake in preparation to build..."), BuildStep::OutputFormat::NormalMessage);
m_waiting = true;
}
@@ -353,7 +353,7 @@ void CMakeBuildStep::handleProjectWasParsed(bool success)
} else if (success) {
runImpl();
} else {
AbstractProcessStep::stdError(tr("Project did not parse successfully, cannot build."));
AbstractProcessStep::stdError(Tr::tr("Project did not parse successfully, cannot build."));
emit finished(false);
}
}
@@ -518,7 +518,7 @@ QWidget *CMakeBuildStep::createConfigWidget()
setSummaryText(summaryText);
};
setDisplayName(tr("Build", "ConfigWidget display name."));
setDisplayName(Tr::tr("Build", "ConfigWidget display name."));
auto buildTargetsView = new QTreeView;
buildTargetsView->setMinimumHeight(200);
@@ -530,7 +530,7 @@ QWidget *CMakeBuildStep::createConfigWidget()
ItemViewFind::LightColored);
auto createAndAddEnvironmentWidgets = [this](Layouting::Form &builder) {
auto clearBox = new QCheckBox(tr("Clear system environment"));
auto clearBox = new QCheckBox(Tr::tr("Clear system environment"));
clearBox->setChecked(useClearEnvironment());
auto envWidget = new EnvironmentWidget(nullptr, EnvironmentWidget::TypeLocal, clearBox);
@@ -564,7 +564,7 @@ QWidget *CMakeBuildStep::createConfigWidget()
if (m_useiOSAutomaticProvisioningUpdates)
builder.addRow(m_useiOSAutomaticProvisioningUpdates);
builder.addRow({new QLabel(tr("Targets:")), frame});
builder.addRow({new QLabel(Tr::tr("Targets:")), frame});
if (!isCleanStep() && !m_buildPreset.isEmpty())
createAndAddEnvironmentWidgets(builder);
@@ -712,9 +712,9 @@ Environment CMakeBuildStep::baseEnvironment() const
QString CMakeBuildStep::baseEnvironmentText() const
{
if (useClearEnvironment())
return tr("Clean Environment");
return Tr::tr("Clean Environment");
else
return tr("System Environment");
return Tr::tr("System Environment");
}
void CMakeBuildStep::processFinished(int exitCode, QProcess::ExitStatus status)
@@ -728,11 +728,10 @@ void CMakeBuildStep::processFinished(int exitCode, QProcess::ExitStatus status)
CMakeBuildStepFactory::CMakeBuildStepFactory()
{
registerStep<CMakeBuildStep>(Constants::CMAKE_BUILD_STEP_ID);
setDisplayName(CMakeBuildStep::tr("CMake Build", "Display name for CMakeProjectManager::CMakeBuildStep id."));
setDisplayName(Tr::tr("CMake Build", "Display name for CMakeProjectManager::CMakeBuildStep id."));
setSupportedProjectType(Constants::CMAKE_PROJECT_ID);
}
} // Internal
} // CMakeProjectManager
} // CMakeProjectManager::Internal
#include <cmakebuildstep.moc>

6
src/plugins/cmakeprojectmanager/cmakebuildstep.h
View File

@@ -11,8 +11,7 @@ class CommandLine;
class StringAspect;
} // Utils
namespace CMakeProjectManager {
namespace Internal {
namespace CMakeProjectManager::Internal {
class CMakeBuildStep;
@@ -123,5 +122,4 @@ public:
CMakeBuildStepFactory();
};
} // namespace Internal
} // namespace CMakeProjectManager
} // CMakeProjectManager::Internal

29
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -11,6 +11,7 @@
#include "cmakeproject.h"
#include "cmakeprojectconstants.h"
#include "cmakeprojectnodes.h"
#include "cmakeprojectmanagertr.h"
#include "cmakeprojectplugin.h"
#include "cmakespecificsettings.h"
#include "projecttreehelper.h"
@@ -59,8 +60,7 @@
using namespace ProjectExplorer;
using namespace Utils;
namespace CMakeProjectManager {
namespace Internal {
namespace CMakeProjectManager::Internal {
static void copySourcePathsToClipboard(const FilePaths &srcPaths, const ProjectNode *node)
{
@@ -92,8 +92,8 @@ static void noAutoAdditionNotify(const FilePaths &filePaths, const ProjectNode *
bool checkValue{false};
QDialogButtonBox::StandardButton reply = CheckableMessageBox::question(
Core::ICore::dialogParent(),
QMessageBox::tr("Copy to Clipboard?"),
QMessageBox::tr("Files are not automatically added to the "
Tr::tr("Copy to Clipboard?"),
Tr::tr("Files are not automatically added to the "
"CMakeLists.txt file of the CMake project."
"\nCopy the path to the source files to the clipboard?"),
"Remember My Choice",
@@ -359,7 +359,7 @@ void CMakeBuildSystem::setParametersAndRequestParse(const BuildDirParameters &pa
if (!tool || !tool->isValid()) {
TaskHub::addTask(
BuildSystemTask(Task::Error,
tr("The kit needs to define a CMake tool to parse this project.")));
Tr::tr("The kit needs to define a CMake tool to parse this project.")));
return;
}
if (!tool->hasFileApi()) {
@@ -391,8 +391,8 @@ bool CMakeBuildSystem::mustApplyConfigurationChangesArguments(const BuildDirPara
return false;
int answer = QMessageBox::question(Core::ICore::dialogParent(),
tr("Apply configuration changes?"),
"<p>" + tr("Run CMake with configuration changes?")
Tr::tr("Apply configuration changes?"),
"<p>" + Tr::tr("Run CMake with configuration changes?")
+ "</p><pre>"
+ parameters.configurationChangesArguments.join("\n")
+ "</pre>",
@@ -498,7 +498,7 @@ void CMakeBuildSystem::combineScanAndParse(bool restoredFromBackup)
if (restoredFromBackup)
project()->addIssue(
CMakeProject::IssueType::Warning,
tr("<b>CMake configuration failed<b>"
Tr::tr("<b>CMake configuration failed<b>"
"<p>The backup of the previous configuration has been restored.</p>"
"<p>Issues and \"Projects > Build\" settings "
"show more information about the failure.</p"));
@@ -516,7 +516,7 @@ void CMakeBuildSystem::combineScanAndParse(bool restoredFromBackup)
project()->addIssue(
CMakeProject::IssueType::Warning,
tr("<b>Failed to load project<b>"
Tr::tr("<b>Failed to load project<b>"
"<p>Issues and \"Projects > Build\" settings "
"show more information about the failure.</p"));
}
@@ -704,7 +704,7 @@ void CMakeBuildSystem::updateFallbackProjectData()
QTC_CHECK(m_treeScanner.isFinished());
if (m_treeScanner.asyncScanForFiles(projectDirectory()))
Core::ProgressManager::addTask(m_treeScanner.future(),
tr("Scan \"%1\" project tree")
Tr::tr("Scan \"%1\" project tree")
.arg(project()->displayName()),
"CMake.Scan.Tree");
}
@@ -853,13 +853,13 @@ void CMakeBuildSystem::ensureBuildDirectory(const BuildDirParameters &parameters
const FilePath bdir = parameters.buildDirectory;
if (!buildConfiguration()->createBuildDirectory()) {
handleParsingFailed(tr("Failed to create build directory \"%1\".").arg(bdir.toUserOutput()));
handleParsingFailed(Tr::tr("Failed to create build directory \"%1\".").arg(bdir.toUserOutput()));
return;
}
const CMakeTool *tool = parameters.cmakeTool();
if (!tool) {
handleParsingFailed(tr("No CMake tool set up in kit."));
handleParsingFailed(Tr::tr("No CMake tool set up in kit."));
return;
}
@@ -867,7 +867,7 @@ void CMakeBuildSystem::ensureBuildDirectory(const BuildDirParameters &parameters
if (!tool->cmakeExecutable().ensureReachable(bdir)) {
// Make sure that the build directory is available on the device.
handleParsingFailed(
tr("The remote CMake executable cannot write to the local build directory."));
Tr::tr("The remote CMake executable cannot write to the local build directory."));
}
}
}
@@ -1337,5 +1337,4 @@ MakeInstallCommand CMakeBuildSystem::makeInstallCommand(const FilePath &installR
return cmd;
}
} // namespace Internal
} // namespace CMakeProjectManager
} // CMakeProjectManager::Internal

5
src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp
View File

@@ -3,6 +3,8 @@
#include "cmakeconfigitem.h"
#include "cmakeprojectmanagertr.h"
#include <projectexplorer/kit.h>
#include <utils/algorithm.h>
@@ -337,8 +339,7 @@ CMakeConfig CMakeConfig::fromFile(const Utils::FilePath &cacheFile, QString *err
QFile cache(cacheFile.toString());
if (!cache.open(QIODevice::ReadOnly | QIODevice::Text)) {
if (errorMessage)
*errorMessage = QCoreApplication::translate("CMakeProjectManager::CMakeConfigItem", "Failed to open %1 for reading.")
.arg(cacheFile.toUserOutput());
*errorMessage = Tr::tr("Failed to open %1 for reading.").arg(cacheFile.toUserOutput());
return CMakeConfig();
}

1
src/plugins/cmakeprojectmanager/cmakeconfigitem.h
View File

@@ -5,7 +5,6 @@
#include "cmake_global.h"
#include <QByteArray>
#include <QStringList>

12
src/plugins/cmakeprojectmanager/cmakeeditor.cpp
View File

@@ -21,13 +21,18 @@
using namespace Core;
using namespace TextEditor;
namespace CMakeProjectManager {
namespace Internal {
namespace CMakeProjectManager::Internal {
//
// CMakeEditor
//
class CMakeEditor : public TextEditor::BaseTextEditor
{
public:
void contextHelp(const HelpCallback &callback) const final;
};
void CMakeEditor::contextHelp(const HelpCallback &callback) const
{
int pos = position();
@@ -239,5 +244,4 @@ CMakeEditorFactory::CMakeEditorFactory()
contextMenu->addAction(ActionManager::command(TextEditor::Constants::UN_COMMENT_SELECTION));
}
} // namespace Internal
} // namespace CMakeProjectManager
} // CMakeProjectManager::Internal

18
src/plugins/cmakeprojectmanager/cmakeeditor.h
View File

@@ -5,20 +5,7 @@
#include <texteditor/texteditor.h>
namespace CMakeProjectManager {
namespace Internal {
class CMakeEditorWidget;
class CMakeEditor : public TextEditor::BaseTextEditor
{
Q_OBJECT
public:
void contextHelp(const HelpCallback &callback) const override;
friend class CMakeEditorWidget;
};
namespace CMakeProjectManager::Internal {
class CMakeEditorFactory : public TextEditor::TextEditorFactory
{
@@ -26,5 +13,4 @@ public:
CMakeEditorFactory();
};
} // namespace Internal
} // namespace CMakeProjectManager
} // CMakeProjectManager::Internal

21
src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp
View File

@@ -14,18 +14,18 @@
#include <QFileInfo>
using namespace CMakeProjectManager::Internal;
using namespace TextEditor;
using namespace ProjectExplorer;
// -------------------------------
// CMakeFileCompletionAssistProvider
// -------------------------------
namespace CMakeProjectManager::Internal {
IAssistProcessor *CMakeFileCompletionAssistProvider::createProcessor(const AssistInterface *) const
class CMakeFileCompletionAssist : public TextEditor::KeywordsCompletionAssistProcessor
{
return new CMakeFileCompletionAssist;
}
public:
CMakeFileCompletionAssist();
TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) final;
};
CMakeFileCompletionAssist::CMakeFileCompletionAssist() :
KeywordsCompletionAssistProcessor(Keywords())
@@ -50,3 +50,10 @@ IAssistProposal *CMakeFileCompletionAssist::perform(const AssistInterface *inter
setKeywords(kw);
return KeywordsCompletionAssistProcessor::perform(interface);
}
IAssistProcessor *CMakeFileCompletionAssistProvider::createProcessor(const AssistInterface *) const
{
return new CMakeFileCompletionAssist;
}
} // CMakeProjectManager::Internal

19
src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h
View File

@@ -5,25 +5,12 @@
#include <texteditor/codeassist/keywordscompletionassist.h>
namespace CMakeProjectManager {
namespace Internal {
class CMakeFileCompletionAssist : public TextEditor::KeywordsCompletionAssistProcessor
{
public:
CMakeFileCompletionAssist();
// IAssistProcessor interface
TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) override;
};
namespace CMakeProjectManager::Internal {
class CMakeFileCompletionAssistProvider : public TextEditor::CompletionAssistProvider
{
Q_OBJECT
public:
TextEditor::IAssistProcessor *createProcessor(const TextEditor::AssistInterface *) const override;
TextEditor::IAssistProcessor *createProcessor(const TextEditor::AssistInterface *) const final;
};
} // Internal
} // CMakeProjectManager
} // CMakeProjectManager::Internal

8
src/plugins/cmakeprojectmanager/cmakeindenter.cpp
View File

@@ -3,8 +3,7 @@
#include "cmakeindenter.h"
namespace CMakeProjectManager {
namespace Internal {
namespace CMakeProjectManager::Internal {
CMakeIndenter::CMakeIndenter(QTextDocument *doc)
: TextEditor::TextIndenter(doc)
@@ -111,7 +110,4 @@ int CMakeIndenter::indentFor(const QTextBlock &block,
return qMax(0, indentation);
}
} // namespace Internal
} // namespace CMakeProjectManager
} // CMakeProjectManager::Internal

6
src/plugins/cmakeprojectmanager/cmakeindenter.h
View File

@@ -7,8 +7,7 @@
#include <texteditor/textindenter.h>
namespace CMakeProjectManager {
namespace Internal {
namespace CMakeProjectManager::Internal {
class CMAKE_EXPORT CMakeIndenter : public TextEditor::TextIndenter
{
@@ -21,5 +20,4 @@ public:
int cursorPositionInEditor = -1) override;
};
} // namespace Internal
} // namespace CMakeProjectManager
} // CMakeProjectManager::Internal

106
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -1,10 +1,11 @@
// Copyright (C) 2016 Canonical Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "cmakeconfigitem.h"
#include "cmakekitinformation.h"
#include "cmakeconfigitem.h"
#include "cmakeprojectconstants.h"
#include "cmakeprojectmanagertr.h"
#include "cmakeprojectplugin.h"
#include "cmakespecificsettings.h"
#include "cmaketool.h"
@@ -50,9 +51,6 @@ using namespace ProjectExplorer;
using namespace Utils;
namespace CMakeProjectManager {
// --------------------------------------------------------------------
// CMakeKitAspect:
// --------------------------------------------------------------------
static bool isIos(const Kit *k)
{
@@ -69,7 +67,6 @@ static Id defaultCMakeToolId()
class CMakeKitAspectWidget final : public KitAspectWidget
{
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeKitAspect)
public:
CMakeKitAspectWidget(Kit *kit, const KitAspect *ki) : KitAspectWidget(kit, ki),
m_comboBox(createSubWidget<QComboBox>()),
@@ -137,7 +134,7 @@ private:
m_comboBox->removeItem(pos);
if (m_comboBox->count() == 0) {
m_comboBox->addItem(tr("<No CMake Tool available>"), Id().toSetting());
m_comboBox->addItem(Tr::tr("<No CMake Tool available>"), Id().toSetting());
m_comboBox->setEnabled(false);
} else {
m_comboBox->setEnabled(true);
@@ -199,8 +196,8 @@ CMakeKitAspect::CMakeKitAspect()
{
setObjectName(QLatin1String("CMakeKitAspect"));
setId(Constants::TOOL_ID);
setDisplayName(tr("CMake Tool"));
setDescription(tr("The CMake Tool to use when building a project with CMake.<br>"
setDisplayName(Tr::tr("CMake Tool"));
setDescription(Tr::tr("The CMake Tool to use when building a project with CMake.<br>"
"This setting is ignored when using other build systems."));
setPriority(20000);
@@ -278,7 +275,7 @@ void CMakeKitAspect::fix(Kit *k)
KitAspect::ItemList CMakeKitAspect::toUserOutput(const Kit *k) const
{
const CMakeTool *const tool = cmakeTool(k);
return {{tr("CMake"), tool ? tool->displayName() : tr("Unconfigured")}};
return {{Tr::tr("CMake"), tool ? tool->displayName() : Tr::tr("Unconfigured")}};
}
KitAspectWidget *CMakeKitAspect::createConfigWidget(Kit *k) const
@@ -290,7 +287,7 @@ KitAspectWidget *CMakeKitAspect::createConfigWidget(Kit *k) const
void CMakeKitAspect::addToMacroExpander(Kit *k, MacroExpander *expander) const
{
QTC_ASSERT(k, return);
expander->registerFileVariables("CMake:Executable", tr("Path to the cmake executable"),
expander->registerFileVariables("CMake:Executable", Tr::tr("Path to the cmake executable"),
[k] {
CMakeTool *tool = CMakeKitAspect::cmakeTool(k);
return tool ? tool->cmakeExecutable() : FilePath();
@@ -306,7 +303,7 @@ QSet<Id> CMakeKitAspect::availableFeatures(const Kit *k) const
QString CMakeKitAspect::msgUnsupportedVersion(const QByteArray &versionString)
{
return tr("CMake version %1 is unsupported. Update to "
return Tr::tr("CMake version %1 is unsupported. Update to "
"version 3.14 (with file-api) or later.")
.arg(QString::fromUtf8(versionString));
}
@@ -324,8 +321,6 @@ const char TOOLSET_KEY[] = "Toolset";
class CMakeGeneratorKitAspectWidget final : public KitAspectWidget
{
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeGeneratorKitAspect)
public:
CMakeGeneratorKitAspectWidget(Kit *kit, const KitAspect *ki)
: KitAspectWidget(kit, ki),
@@ -338,7 +333,7 @@ public:
});
m_label->setToolTip(ki->description());
m_changeButton->setText(tr("Change..."));
m_changeButton->setText(Tr::tr("Change..."));
refresh();
connect(m_changeButton, &QPushButton::clicked,
this, &CMakeGeneratorKitAspectWidget::changeGenerator);
@@ -380,9 +375,9 @@ private:
messageLabel << generator;
if (!platform.isEmpty())
messageLabel << ", " << tr("Platform") << ": " << platform;
messageLabel << ", " << Tr::tr("Platform") << ": " << platform;
if (!toolset.isEmpty())
messageLabel << ", " << tr("Toolset") << ": " << toolset;
messageLabel << ", " << Tr::tr("Toolset") << ": " << toolset;
m_label->setText(messageLabel.join(""));
}
@@ -396,7 +391,7 @@ private:
flags |= Qt::MSWindowsFixedSizeDialogHint;
changeDialog->setWindowFlags(flags);
changeDialog->setWindowTitle(tr("CMake Generator"));
changeDialog->setWindowTitle(Tr::tr("CMake Generator"));
auto layout = new QGridLayout(changeDialog);
layout->setSizeConstraint(QLayout::SetFixedSize);
@@ -414,19 +409,19 @@ private:
layout->addWidget(cmakeLabel, row, 1);
++row;
layout->addWidget(new QLabel(tr("Generator:")), row, 0);
layout->addWidget(new QLabel(Tr::tr("Generator:")), row, 0);
layout->addWidget(generatorCombo, row, 1);
++row;
layout->addWidget(new QLabel(tr("Extra generator:")), row, 0);
layout->addWidget(new QLabel(Tr::tr("Extra generator:")), row, 0);
layout->addWidget(extraGeneratorCombo, row, 1);
++row;
layout->addWidget(new QLabel(tr("Platform:")), row, 0);
layout->addWidget(new QLabel(Tr::tr("Platform:")), row, 0);
layout->addWidget(platformEdit, row, 1);
++row;
layout->addWidget(new QLabel(tr("Toolset:")), row, 0);
layout->addWidget(new QLabel(Tr::tr("Toolset:")), row, 0);
layout->addWidget(toolsetEdit, row, 1);
++row;
@@ -452,7 +447,7 @@ private:
generatorCombo->setCurrentText(name);
extraGeneratorCombo->clear();
extraGeneratorCombo->addItem(tr("<none>"), QString());
extraGeneratorCombo->addItem(Tr::tr("<none>"), QString());
for (const QString &eg : qAsConst(it->extraGenerators))
extraGeneratorCombo->addItem(eg, eg);
extraGeneratorCombo->setEnabled(extraGeneratorCombo->count() > 1);
@@ -550,8 +545,8 @@ CMakeGeneratorKitAspect::CMakeGeneratorKitAspect()
{
setObjectName(QLatin1String("CMakeGeneratorKitAspect"));
setId(GENERATOR_ID);
setDisplayName(tr("CMake <a href=\"generator\">generator</a>"));
setDescription(tr("CMake generator defines how a project is built when using CMake.<br>"
setDisplayName(Tr::tr("CMake <a href=\"generator\">generator</a>"));
setDescription(Tr::tr("CMake generator defines how a project is built when using CMake.<br>"
"This setting is ignored when using other build systems."));
setPriority(19000);
}
@@ -755,7 +750,7 @@ Tasks CMakeGeneratorKitAspect::validate(const Kit *k) const
};
if (!tool->isValid()) {
addWarning(tr("CMake Tool is unconfigured, CMake generator will be ignored."));
addWarning(Tr::tr("CMake Tool is unconfigured, CMake generator will be ignored."));
} else {
const GeneratorInfo info = generatorInfo(k);
QList<CMakeTool::Generator> known = tool->supportedGenerators();
@@ -763,15 +758,15 @@ Tasks CMakeGeneratorKitAspect::validate(const Kit *k) const
return g.matches(info.generator, info.extraGenerator);
});
if (it == known.constEnd()) {
addWarning(tr("CMake Tool does not support the configured generator."));
addWarning(Tr::tr("CMake Tool does not support the configured generator."));
} else {
if (!it->supportsPlatform && !info.platform.isEmpty())
addWarning(tr("Platform is not supported by the selected CMake generator."));
addWarning(Tr::tr("Platform is not supported by the selected CMake generator."));
if (!it->supportsToolset && !info.toolset.isEmpty())
addWarning(tr("Toolset is not supported by the selected CMake generator."));
addWarning(Tr::tr("Toolset is not supported by the selected CMake generator."));
}
if (!tool->hasFileApi()) {
addWarning(tr("The selected CMake binary does not support file-api. "
addWarning(Tr::tr("The selected CMake binary does not support file-api. "
"%1 will not be able to parse CMake projects.")
.arg(Core::Constants::IDE_DISPLAY_NAME));
}
@@ -838,15 +833,15 @@ KitAspect::ItemList CMakeGeneratorKitAspect::toUserOutput(const Kit *k) const
const GeneratorInfo info = generatorInfo(k);
QString message;
if (info.generator.isEmpty()) {
message = tr("<Use Default Generator>");
message = Tr::tr("<Use Default Generator>");
} else {
message = tr("Generator: %1<br>Extra generator: %2").arg(info.generator).arg(info.extraGenerator);
message = Tr::tr("Generator: %1<br>Extra generator: %2").arg(info.generator).arg(info.extraGenerator);
if (!info.platform.isEmpty())
message += "<br/>" + tr("Platform: %1").arg(info.platform);
message += "<br/>" + Tr::tr("Platform: %1").arg(info.platform);
if (!info.toolset.isEmpty())
message += "<br/>" + tr("Toolset: %1").arg(info.toolset);
message += "<br/>" + Tr::tr("Toolset: %1").arg(info.toolset);
}
return {{tr("CMake Generator"), message}};
return {{Tr::tr("CMake Generator"), message}};
}
KitAspectWidget *CMakeGeneratorKitAspect::createConfigWidget(Kit *k) const
@@ -880,8 +875,6 @@ const char QTC_CMAKE_PRESET_KEY[] = "QTC_CMAKE_PRESET";
class CMakeConfigurationKitAspectWidget final : public KitAspectWidget
{
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeConfigurationKitAspect)
public:
CMakeConfigurationKitAspectWidget(Kit *kit, const KitAspect *ki)
: KitAspectWidget(kit, ki),
@@ -889,7 +882,7 @@ public:
m_manageButton(createSubWidget<QPushButton>())
{
refresh();
m_manageButton->setText(tr("Change..."));
m_manageButton->setText(Tr::tr("Change..."));
connect(m_manageButton, &QAbstractButton::clicked,
this, &CMakeConfigurationKitAspectWidget::editConfigurationChanges);
}
@@ -940,11 +933,11 @@ private:
const CMakeTool *tool = CMakeKitAspect::cmakeTool(kit());
m_dialog = new QDialog(m_summaryLabel->window());
m_dialog->setWindowTitle(tr("Edit CMake Configuration"));
m_dialog->setWindowTitle(Tr::tr("Edit CMake Configuration"));
auto layout = new QVBoxLayout(m_dialog);
m_editor = new QPlainTextEdit;
auto editorLabel = new QLabel(m_dialog);
editorLabel->setText(tr("Enter one CMake <a href=\"variable\">variable</a> per line.<br/>"
editorLabel->setText(Tr::tr("Enter one CMake <a href=\"variable\">variable</a> per line.<br/>"
"To set a variable, use -D&lt;variable&gt;:&lt;type&gt;=&lt;value&gt;.<br/>"
"&lt;type&gt; can have one of the following values: FILEPATH, PATH, "
"BOOL, INTERNAL, or STRING."));
@@ -959,7 +952,7 @@ private:
m_additionalEditor = new QLineEdit;
auto additionalLabel = new QLabel(m_dialog);
additionalLabel->setText(tr("Additional CMake <a href=\"options\">options</a>:"));
additionalLabel->setText(Tr::tr("Additional CMake <a href=\"options\">options</a>:"));
connect(additionalLabel, &QLabel::linkActivated, this, [=](const QString &) {
CMakeTool::openCMakeHelpUrl(tool, "%1/manual/cmake.1.html#options");
});
@@ -1042,8 +1035,8 @@ CMakeConfigurationKitAspect::CMakeConfigurationKitAspect()
{
setObjectName(QLatin1String("CMakeConfigurationKitAspect"));
setId(CONFIGURATION_ID);
setDisplayName(tr("CMake Configuration"));
setDescription(tr("Default configuration passed to CMake when setting up a project."));
setDisplayName(Tr::tr("CMake Configuration"));
setDescription(Tr::tr("Default configuration passed to CMake when setting up a project."));
setPriority(18000);
}
@@ -1156,6 +1149,7 @@ Tasks CMakeConfigurationKitAspect::validate(const Kit *k) const
const ToolChain *const tcC = ToolChainKitAspect::cToolChain(k);
const ToolChain *const tcCxx = ToolChainKitAspect::cxxToolChain(k);
const CMakeConfig config = configuration(k);
const CMakeTool *const cmake = CMakeKitAspect::cmakeTool(k);
const bool isQt4 = version && version->qtVersion() < QVersionNumber(5, 0, 0);
FilePath qmakePath; // This is relative to the cmake used for building.
@@ -1167,11 +1161,11 @@ Tasks CMakeConfigurationKitAspect::validate(const Kit *k) const
const FilePath expandedValue
= FilePath::fromString(k->macroExpander()->expand(QString::fromUtf8(i.value)));
if (i.key == CMAKE_QMAKE_KEY)
qmakePath = expandedValue;
qmakePath = expandedValue.onDevice(cmake->cmakeExecutable());
else if (i.key == CMAKE_C_TOOLCHAIN_KEY)
tcCPath = expandedValue;
tcCPath = expandedValue.onDevice(cmake->cmakeExecutable());
else if (i.key == CMAKE_CXX_TOOLCHAIN_KEY)
tcCxxPath = expandedValue;
tcCxxPath = expandedValue.onDevice(cmake->cmakeExecutable());
else if (i.key == CMAKE_PREFIX_PATH_KEY)
qtInstallDirs = CMakeConfigItem::cmakeSplitValue(expandedValue.path());
}
@@ -1184,22 +1178,22 @@ Tasks CMakeConfigurationKitAspect::validate(const Kit *k) const
// Validate Qt:
if (qmakePath.isEmpty()) {
if (version && version->isValid() && isQt4) {
addWarning(tr("CMake configuration has no path to qmake binary set, "
addWarning(Tr::tr("CMake configuration has no path to qmake binary set, "
"even though the kit has a valid Qt version."));
}
} else {
if (!version || !version->isValid()) {
addWarning(tr("CMake configuration has a path to a qmake binary set, "
addWarning(Tr::tr("CMake configuration has a path to a qmake binary set, "
"even though the kit has no valid Qt version."));
} else if (qmakePath != version->qmakeFilePath() && isQt4) {
addWarning(tr("CMake configuration has a path to a qmake binary set "
addWarning(Tr::tr("CMake configuration has a path to a qmake binary set "
"that does not match the qmake binary path "
"configured in the Qt version."));
}
}
if (version && !qtInstallDirs.contains(version->prefix().path()) && !isQt4) {
if (version->isValid()) {
addWarning(tr("CMake configuration has no CMAKE_PREFIX_PATH set "
addWarning(Tr::tr("CMake configuration has no CMAKE_PREFIX_PATH set "
"that points to the kit Qt version."));
}
}
@@ -1207,15 +1201,15 @@ Tasks CMakeConfigurationKitAspect::validate(const Kit *k) const
// Validate Toolchains:
if (tcCPath.isEmpty()) {
if (tcC && tcC->isValid()) {
addWarning(tr("CMake configuration has no path to a C compiler set, "
addWarning(Tr::tr("CMake configuration has no path to a C compiler set, "
"even though the kit has a valid tool chain."));
}
} else {
if (!tcC || !tcC->isValid()) {
addWarning(tr("CMake configuration has a path to a C compiler set, "
addWarning(Tr::tr("CMake configuration has a path to a C compiler set, "
"even though the kit has no valid tool chain."));
} else if (tcCPath != tcC->compilerCommand() && tcCPath != tcC->compilerCommand().onDevice(tcCPath)) {
addWarning(tr("CMake configuration has a path to a C compiler set "
addWarning(Tr::tr("CMake configuration has a path to a C compiler set "
"that does not match the compiler path "
"configured in the tool chain of the kit."));
}
@@ -1223,15 +1217,15 @@ Tasks CMakeConfigurationKitAspect::validate(const Kit *k) const
if (tcCxxPath.isEmpty()) {
if (tcCxx && tcCxx->isValid()) {
addWarning(tr("CMake configuration has no path to a C++ compiler set, "
addWarning(Tr::tr("CMake configuration has no path to a C++ compiler set, "
"even though the kit has a valid tool chain."));
}
} else {
if (!tcCxx || !tcCxx->isValid()) {
addWarning(tr("CMake configuration has a path to a C++ compiler set, "
addWarning(Tr::tr("CMake configuration has a path to a C++ compiler set, "
"even though the kit has no valid tool chain."));
} else if (tcCxxPath != tcCxx->compilerCommand() && tcCxxPath != tcCxx->compilerCommand().onDevice(tcCxxPath)) {
addWarning(tr("CMake configuration has a path to a C++ compiler set "
addWarning(Tr::tr("CMake configuration has a path to a C++ compiler set "
"that does not match the compiler path "
"configured in the tool chain of the kit."));
}
@@ -1253,7 +1247,7 @@ void CMakeConfigurationKitAspect::fix(Kit *k)
KitAspect::ItemList CMakeConfigurationKitAspect::toUserOutput(const Kit *k) const
{
return {{tr("CMake Configuration"), toStringList(k).join("<br>")}};
return {{Tr::tr("CMake Configuration"), toStringList(k).join("<br>")}};
}
KitAspectWidget *CMakeConfigurationKitAspect::createConfigWidget(Kit *k) const

6
src/plugins/cmakeprojectmanager/cmakekitinformation.h
View File

@@ -10,11 +10,11 @@
#include <projectexplorer/kitmanager.h>
namespace CMakeProjectManager {
class CMakeTool;
class CMAKE_EXPORT CMakeKitAspect : public ProjectExplorer::KitAspect
{
Q_OBJECT
public:
CMakeKitAspect();
@@ -40,7 +40,6 @@ public:
class CMAKE_EXPORT CMakeGeneratorKitAspect : public ProjectExplorer::KitAspect
{
Q_OBJECT
public:
CMakeGeneratorKitAspect();
@@ -73,7 +72,6 @@ private:
class CMAKE_EXPORT CMakeConfigurationKitAspect : public ProjectExplorer::KitAspect
{
Q_OBJECT
public:
CMakeConfigurationKitAspect();
@@ -104,4 +102,4 @@ private:
QVariant defaultValue(const ProjectExplorer::Kit *k) const;
};
} // namespace CMakeProjectManager
} // CMakeProjectManager

16
src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp
View File

@@ -6,8 +6,10 @@
#include "cmakebuildstep.h"
#include "cmakebuildsystem.h"
#include "cmakeproject.h"
#include "cmakeprojectmanagertr.h"
#include <coreplugin/editormanager/editormanager.h>
#include <projectexplorer/buildmanager.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/session.h>
@@ -15,11 +17,11 @@
#include <utils/algorithm.h>
using namespace CMakeProjectManager;
using namespace CMakeProjectManager::Internal;
using namespace ProjectExplorer;
using namespace Utils;
namespace CMakeProjectManager::Internal {
// --------------------------------------------------------------------
// CMakeTargetLocatorFilter:
// --------------------------------------------------------------------
@@ -93,8 +95,8 @@ void CMakeTargetLocatorFilter::projectListUpdated()
BuildCMakeTargetLocatorFilter::BuildCMakeTargetLocatorFilter()
{
setId("Build CMake target");
setDisplayName(tr("Build CMake target"));
setDescription(tr("Builds a target of any open CMake project."));
setDisplayName(Tr::tr("Build CMake target"));
setDescription(Tr::tr("Builds a target of any open CMake project."));
setDefaultShortcutString("cm");
setPriority(High);
}
@@ -143,8 +145,8 @@ void BuildCMakeTargetLocatorFilter::accept(const Core::LocatorFilterEntry &selec
OpenCMakeTargetLocatorFilter::OpenCMakeTargetLocatorFilter()
{
setId("Open CMake target definition");
setDisplayName(tr("Open CMake target"));
setDescription(tr("Jumps to the definition of a target of any open CMake project."));
setDisplayName(Tr::tr("Open CMake target"));
setDescription(Tr::tr("Jumps to the definition of a target of any open CMake project."));
setDefaultShortcutString("cmo");
setPriority(Medium);
}
@@ -169,3 +171,5 @@ void OpenCMakeTargetLocatorFilter::accept(const Core::LocatorFilterEntry &select
else
Core::EditorManager::openEditor(file, {}, Core::EditorManager::AllowExternalEditor);
}
} // CMakeProjectManager::Internal

12
src/plugins/cmakeprojectmanager/cmakelocatorfilter.h
View File

@@ -5,13 +5,10 @@
#include <coreplugin/locator/ilocatorfilter.h>
namespace CMakeProjectManager {
namespace Internal {
namespace CMakeProjectManager::Internal {
class CMakeTargetLocatorFilter : public Core::ILocatorFilter
{
Q_OBJECT
public:
CMakeTargetLocatorFilter();
@@ -27,8 +24,6 @@ private:
class BuildCMakeTargetLocatorFilter : CMakeTargetLocatorFilter
{
Q_OBJECT
public:
BuildCMakeTargetLocatorFilter();
@@ -40,8 +35,6 @@ public:
class OpenCMakeTargetLocatorFilter : CMakeTargetLocatorFilter
{
Q_OBJECT
public:
OpenCMakeTargetLocatorFilter();
@@ -51,5 +44,4 @@ public:
int *selectionLength) const final;
};
} // namespace Internal
} // namespace CMakeProjectManager
} // CMakeProjectManager::Internal

36
src/plugins/cmakeprojectmanager/cmakeprocess.cpp
View File

@@ -5,6 +5,7 @@
#include "builddirparameters.h"
#include "cmakeparser.h"
#include "cmakeprojectmanagertr.h"
#include <coreplugin/progressmanager/progressmanager.h>
#include <projectexplorer/buildsystem.h>
@@ -17,12 +18,11 @@
#include <QFutureWatcher>
using namespace ProjectExplorer;
using namespace Utils;
namespace CMakeProjectManager {
namespace Internal {
namespace CMakeProjectManager::Internal {
using namespace ProjectExplorer;
const int USER_STOP_EXIT_CODE = 15;
static QString stripTrailingNewline(QString str)
@@ -57,7 +57,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
if (!cmakeExecutable.ensureReachable(parameters.sourceDirectory)
|| !cmakeExecutable.ensureReachable(parameters.buildDirectory)) {
QString msg = ::CMakeProjectManager::Internal::CMakeProcess::tr(
QString msg = ::CMakeProjectManager::Tr::tr(
"The source or build directory is not reachable by the CMake executable.");
BuildSystem::appendBuildSystemOutput(msg + '\n');
emit finished();
@@ -68,8 +68,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
const FilePath buildDirectory = parameters.buildDirectory.onDevice(cmakeExecutable);
if (!buildDirectory.exists()) {
QString msg = ::CMakeProjectManager::Internal::CMakeProcess::tr(
"The build directory \"%1\" does not exist")
QString msg = ::CMakeProjectManager::Tr::tr( "The build directory \"%1\" does not exist")
.arg(buildDirectory.toUserOutput());
BuildSystem::appendBuildSystemOutput(msg + '\n');
emit finished();
@@ -78,9 +77,8 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
if (buildDirectory.needsDevice()) {
if (cmake->cmakeExecutable().host() != buildDirectory.host()) {
QString msg = ::CMakeProjectManager::Internal::CMakeProcess::tr(
"CMake executable \"%1\" and build directory "
"\"%2\" must be on the same device.")
QString msg = ::CMakeProjectManager::Tr::tr("CMake executable \"%1\" and build directory "
"\"%2\" must be on the same device.")
.arg(cmake->cmakeExecutable().toUserOutput(),
buildDirectory.toUserOutput());
BuildSystem::appendBuildSystemOutput(msg + '\n');
@@ -120,15 +118,13 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
BuildSystem::startNewBuildSystemOutput(
::CMakeProjectManager::Internal::CMakeProcess::tr("Running %1 in %2.")
BuildSystem::startNewBuildSystemOutput(::CMakeProjectManager::Tr::tr("Running %1 in %2.")
.arg(commandLine.toUserOutput(), buildDirectory.toUserOutput()));
m_futureInterface = QFutureInterface<void>();
m_futureInterface.setProgressRange(0, 1);
Core::ProgressManager::addTimedTask(m_futureInterface,
::CMakeProjectManager::Internal::CMakeProcess::tr(
"Configuring \"%1\"")
::CMakeProjectManager::Tr::tr("Configuring \"%1\"")
.arg(parameters.projectName),
"CMake.Configure",
10);
@@ -160,17 +156,14 @@ void CMakeProcess::handleProcessDone(const Utils::ProcessResultData &resultData)
QString msg;
if (resultData.m_error == QProcess::FailedToStart) {
msg = ::CMakeProjectManager::Internal::CMakeProcess::tr("CMake process failed to start.");
msg = ::CMakeProjectManager::Tr::tr("CMake process failed to start.");
} else if (resultData.m_exitStatus != QProcess::NormalExit) {
if (m_futureInterface.isCanceled() || code == USER_STOP_EXIT_CODE)
msg = ::CMakeProjectManager::Internal::CMakeProcess::tr(
"CMake process was canceled by the user.");
msg = ::CMakeProjectManager::Tr::tr("CMake process was canceled by the user.");
else
msg = ::CMakeProjectManager::Internal::CMakeProcess::tr("CMake process crashed.");
msg = ::CMakeProjectManager::Tr::tr("CMake process crashed.");
} else if (code != 0) {
msg = ::CMakeProjectManager::Internal::CMakeProcess::tr(
"CMake process exited with exit code %1.")
.arg(code);
msg = ::CMakeProjectManager::Tr::tr("CMake process exited with exit code %1.") .arg(code);
}
m_lastExitCode = code;
@@ -190,5 +183,4 @@ void CMakeProcess::handleProcessDone(const Utils::ProcessResultData &resultData)
BuildSystem::appendBuildSystemOutput(elapsedTime + '\n');
}
} // namespace Internal
} // namespace CMakeProjectManager
} // CMakeProjectManager::Internal

6
src/plugins/cmakeprojectmanager/cmakeprocess.h
View File

@@ -22,8 +22,7 @@ class ProcessResultData;
class QtcProcess;
}
namespace CMakeProjectManager {
namespace Internal {
namespace CMakeProjectManager::Internal {
class BuildDirParameters;
@@ -55,5 +54,4 @@ private:
int m_lastExitCode = 0;
};
} // namespace Internal
} // namespace CMakeProjectManager
} // CMakeProjectManager::Internal

Some files were not shown because too many files have changed in this diff Show More