diff --git a/dist/changes-2.0.0 b/dist/changes-2.0.0
index cf2c829d7644c1b139483a625e5156954b3bcb95..81e4b8266746880552899bb57cf796999ba501df 100644
--- a/dist/changes-2.0.0
+++ b/dist/changes-2.0.0
@@ -34,6 +34,8 @@ Editing
* Fixed auto indent for C style coments
* Copying text from the editor now supports HTML mime type, preserving
the syntax highlighting.
+ * Block selection defines a find & replace scope
+ * Added customizable default file encoding (in addition to the project setting)
CodePaster
* Implemented new protocol of pastebin.com including list functionality
diff --git a/doc/images/qmldesigner-code-completion.png b/doc/images/qmldesigner-code-completion.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e6261bbbc2af0f06145dbd1ba14a68eb1476fd8
Binary files /dev/null and b/doc/images/qmldesigner-code-completion.png differ
diff --git a/doc/images/qmldesigner-run-custom-exe.png b/doc/images/qmldesigner-run-custom-exe.png
new file mode 100644
index 0000000000000000000000000000000000000000..47d053220c947fd20b37dc07bb782b491c63ba2a
Binary files /dev/null and b/doc/images/qmldesigner-run-custom-exe.png differ
diff --git a/doc/images/qmldesigner-run-settings.png b/doc/images/qmldesigner-run-settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..41d53a99422f1a7da3b208a75c7b7d2c6f07dd4c
Binary files /dev/null and b/doc/images/qmldesigner-run-settings.png differ
diff --git a/doc/images/qtcreator-build-dependencies.png b/doc/images/qtcreator-build-dependencies.png
new file mode 100644
index 0000000000000000000000000000000000000000..d51a11be8afe4a5eac36d571b48ff959e0b78535
Binary files /dev/null and b/doc/images/qtcreator-build-dependencies.png differ
diff --git a/doc/images/qtcreator-build-issues.png b/doc/images/qtcreator-build-issues.png
index 2b3ca0c4dd357c71b3408e49916dcd40a09b5e14..3a596746952c46ea1589ad0171d2868fc15f692d 100644
Binary files a/doc/images/qtcreator-build-issues.png and b/doc/images/qtcreator-build-issues.png differ
diff --git a/doc/images/qtcreator-build-steps.png b/doc/images/qtcreator-build-steps.png
new file mode 100644
index 0000000000000000000000000000000000000000..b617406f90fbbb179e154e9e6703197c6a426011
Binary files /dev/null and b/doc/images/qtcreator-build-steps.png differ
diff --git a/doc/images/qtcreator-clean-steps.png b/doc/images/qtcreator-clean-steps.png
new file mode 100644
index 0000000000000000000000000000000000000000..778f06891668fc2b01c4e6f9faefce95fffa241d
Binary files /dev/null and b/doc/images/qtcreator-clean-steps.png differ
diff --git a/doc/images/qtcreator-editor-settings.png b/doc/images/qtcreator-editor-settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..3074d58a680d5fad62fe8458d27e75189546259a
Binary files /dev/null and b/doc/images/qtcreator-editor-settings.png differ
diff --git a/doc/images/qtcreator-maemo-emulator-button.png b/doc/images/qtcreator-maemo-emulator-button.png
new file mode 100644
index 0000000000000000000000000000000000000000..990b7d05d36b87632085fb57607238cc0ac7a57f
Binary files /dev/null and b/doc/images/qtcreator-maemo-emulator-button.png differ
diff --git a/doc/images/qtcreator-maemo-emulator-connection-key.png b/doc/images/qtcreator-maemo-emulator-connection-key.png
new file mode 100644
index 0000000000000000000000000000000000000000..93f40c51e4e87937122ae24355b021c85aaff2b3
Binary files /dev/null and b/doc/images/qtcreator-maemo-emulator-connection-key.png differ
diff --git a/doc/images/qtcreator-maemo-emulator-connection.png b/doc/images/qtcreator-maemo-emulator-connection.png
new file mode 100644
index 0000000000000000000000000000000000000000..efb998e10f553e80a84719ac4df62292e7b8e9b6
Binary files /dev/null and b/doc/images/qtcreator-maemo-emulator-connection.png differ
diff --git a/doc/images/qtcreator-pprunsettings.png b/doc/images/qtcreator-pprunsettings.png
index f278cdf36f2aa58d6b53f3d3109b20b6d07ab098..5988f60d07c2ccd4ffcff6b4071719a80eac3041 100644
Binary files a/doc/images/qtcreator-pprunsettings.png and b/doc/images/qtcreator-pprunsettings.png differ
diff --git a/doc/images/qtcreator-screenshot-build-settings.png b/doc/images/qtcreator-screenshot-build-settings.png
index 5a60981bd0e6cec1cb2fc69a97b8f19169d0ee4d..fbabf6c0b09a965518c1c75298b5ab92573ce3c6 100644
Binary files a/doc/images/qtcreator-screenshot-build-settings.png and b/doc/images/qtcreator-screenshot-build-settings.png differ
diff --git a/doc/images/qtcreator-screenshot-devconf.png b/doc/images/qtcreator-screenshot-devconf.png
index 951cd47860a25b584e97ef7c18fcd46e70dcab1f..768438b535216b880bfc9d22ee088314a56fe726 100644
Binary files a/doc/images/qtcreator-screenshot-devconf.png and b/doc/images/qtcreator-screenshot-devconf.png differ
diff --git a/doc/images/qtcreator-screenshot-run-settings.png b/doc/images/qtcreator-screenshot-run-settings.png
index 7a25cdbf7fbaf28d39f87bc4ed53eb8fb53e53c9..eb42afed05fcc025da3c09a58bdf563bfe1b6494 100644
Binary files a/doc/images/qtcreator-screenshot-run-settings.png and b/doc/images/qtcreator-screenshot-run-settings.png differ
diff --git a/doc/images/qtcreator-screenshot-toolchain.png b/doc/images/qtcreator-screenshot-toolchain.png
index 8ec4b95231080489545b78ffafcb46a47323ba36..29ccac0e356462b5dd6bc10d5feb337efab2ecb1 100644
Binary files a/doc/images/qtcreator-screenshot-toolchain.png and b/doc/images/qtcreator-screenshot-toolchain.png differ
diff --git a/doc/images/qtcreator-search-pane.png b/doc/images/qtcreator-search-pane.png
index 6d996ab7a4fc96475c394b3a752c6e127a849a59..2dfa438c674aea1a90f0c784aaf9027409fcd669 100644
Binary files a/doc/images/qtcreator-search-pane.png and b/doc/images/qtcreator-search-pane.png differ
diff --git a/doc/images/qtcreator-ssh-key-configuration.png b/doc/images/qtcreator-ssh-key-configuration.png
new file mode 100644
index 0000000000000000000000000000000000000000..138fa94b4e43c9b782c7a8742d5014163293ea45
Binary files /dev/null and b/doc/images/qtcreator-ssh-key-configuration.png differ
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 80fc2785c1e8e60da8aed6f3ae5dcddea0352b6b..cd1e9f127a0422fb824ef6b7ef4e7444fc6ee390 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -63,11 +63,19 @@
\o \l{Setting Up a Generic Project}
\o \l{Setting Up Development Environment for Maemo}
\o \l{Setting Up Development Environment for Symbian}
- \o \l{Building and Running Applications}
\o \l{Managing Sessions}
\endlist
+ \o \l{Building and Running Applications}
+ \list
+ \o \l{Building for Multiple Targets}
+ \o \l{Specifying Build Settings}
+ \o \l{Specifying Run Settings}
+ \o \l{Specifying Editor Settings}
+ \o \l{Specifying Dependencies}
+ \endlist
\o \l{Developing Qt Quick Applications}
\o \l{Optimizing Applications for Mobile Devices}
+ \o \l{Using the Maemo Emulator}
\o \l{Debugging}
\list
\o \l {Debugging Qt Applications}
@@ -285,6 +293,11 @@
\image qtcreator-breakdown.png
+ Qt Creator has been localized into several languages. If the system language
+ is one of the supported languages, it is automatically selected. To change
+ the language, select \gui {Tools > Options > Environment} and select a language
+ in the \gui Language field. The change takes effect after you restart Qt Creator.
+
\section1 Qt Creator Modes
The mode selector allows you to quickly switch between tasks such as
@@ -529,7 +542,7 @@
position.
\endlist
- To change \QD properties, select \gui Tools > \gui Options >
+ To change \QD properties, select \gui Tools > \gui Options... >
\gui Designer.
\list
\o Set the class properties and code generation preferences in \gui
@@ -618,14 +631,14 @@
\list
\o Set the font preferences and apply syntax highlighting in
\gui{Font & Colors}.
- \o Set tabs, indentation and the handling of whitespace in
+ \o Set tabs, indentation, the handling of whitespace, and mouse operations in
\gui Behavior.
\o Set various display properties, for example,
\l{Highlighting and folding blocks}{highlighting and folding blocks},
text wrapping or \l{Moving to symbol definition or declaration}
{moving to symbol definition or declaration}
in \gui Display.
- \o Configure \l{Code Completion}{code completion} in \gui Completion.
+ \o Configure \l{Completing Code}{code completion} in \gui Completion.
\endlist
@@ -704,7 +717,7 @@
option is enabled by default.
- \section1 Syntax Checking
+ \section1 Checking Code Syntax
As you write code Qt Creator checks code syntax. When Qt Creator spots a
syntax error in your code it underlines it and shows error details when you
@@ -724,21 +737,28 @@
\endlist
- \section1 Code Completion
+ \section1 Completing Code
+
+ Qt Creator understands the code as code, not just as plain text. This
+ allows it to help you to write well formatted code and to anticipate
+ what you are going to write and complete the code. The code completion
+ differs somewhat depending on whether you write Qt code or QML code.
+
+ \section2 Completing Qt Code
As you write code, Qt Creator provides a list of context-sensitive
suggestions to the statement currently under your cursor.
\image qtcreator-codecompletion.png
- Set code completion preferences in \gui Tools > \gui{Options...} >
- \gui{Text Editor} > \gui Completion. To trigger code completion
- manually press \key{Ctrl+Space}.
+ To open the list of suggestions at any time, press \key{Ctrl+Space}.
+ If only one option is available, Qt Creator inserts it automatically.
When completion is invoked manually, Qt Creator completes the common prefix
of the list of suggestions. This is especially useful for classes with
several similarly named members. To disable this functionality, uncheck
\gui{Autocomplete common prefix} in the code completion preferences.
+ Select \gui Tools > \gui{Options...} > \gui{Text Editor} > \gui Completion.
The following table lists available types for code completion and icon
used for each.
@@ -797,6 +817,15 @@
\i A namespace
\endtable
+ \section2 Completing QML Code
+
+ As you write QML code, Qt Creator suggests properties, IDs, and code
+ snippets to complete the code. The snippets can consist of multiple
+ fields that you specify values for. Select an item in the list and press
+ \key Tab or \key Enter to complete the code. Press \key Tab to
+ move between the fields and specify values for them.
+
+ \image qmldesigner-code-completion.png "Completing QML code"
\section1 Using Bookmarks
@@ -865,19 +894,24 @@
In the \gui{FakeVim} mode, you can run the main editor in a manner similar
to the Vim editor. To run the editor in the \gui{FakeVim} mode, select
- \gui{Edit} > \gui{Advanced} > \gui{Toggle vim-style editing} or press
+ \gui{Edit} > \gui{Advanced} > \gui{Use vim-style editing} or press
\key{Alt+V,Alt+V}.
In the \gui{FakeVim} mode, most keystrokes in the main editor will be
- intercepted and interpreted in a way that resembles Vim.
+ intercepted and interpreted in a way that resembles Vim. Documentation for
+ Vim is not included in Qt Creator. For more information on using Vim,
+ see \l{http://www.vim.org/docs.php}{Documentation} on the Vim web site.
To map commands entered on the \gui{FakeVim} command line to actions of the
Qt Creator core, select \gui{Tools} > \gui{Options...} > \gui{FakeVim} >
\gui{Ex Command Mapping}.
- To make changes to the \gui{Vim style settings}, select \gui{Tools} >
+ To make changes to the Vim style settings, select \gui{Tools} >
\gui{Options...} > \gui{General}.
+ To quit the FakeVim mode, click \gui {Quit FakeVim} or press
+ \key{Alt+V,Alt+V}.
+
\section1 Using an External Editor
@@ -934,10 +968,8 @@
, or press \key Shift+F3.
\endlist
- To narrow your search results, click
- \inlineimage qtcreator-locator-magnify.png
- in the \gui Find/Replace pane and select any of the following
- preferences:
+ You can restrict the search in the \gui Find field by selecting one
+ or several search criteria:
\list
\o To make your search case sensitive, select
\inlineimage qtcreator-editor-casesensitive.png
@@ -958,7 +990,7 @@
search is conducted within the selection.
To replace occurrences of the existing text, enter the new text in the
- \gui{Replace with} text box.
+ \gui{Replace with} field.
\list
\o To replace the selected occurrence and move to the next one,
click \inlineimage qtcreator-next.png
@@ -1066,7 +1098,10 @@
\section1 Renaming Symbols
- To rename a specific symbol in your project:
+ The functions used to rename symbols depends on whether you are
+ writing C++ or QML code. For QML, you can only rename IDs.
+
+ To rename a specific symbol in a Qt project:
\list 1
\o In the editor, place the cursor on the symbol you would like to
change and select \gui Tools > \gui C++ >
@@ -1089,6 +1124,17 @@
\note Renaming local symbols does not open the \gui{Search Results} pane.
The instances of the symbol are highlighted in code and you can edit the
symbol. All instances of the local symbol are changed as you type.
+
+ To rename an ID in a Qt Quick project:
+
+ \list 1
+
+ \o Right-click an ID in the QML code and select
+ \gui {Rename id}.
+
+ \o In the \gui {Rename id} field, enter the new ID.
+
+ \endlist
*/
/*!
@@ -1468,7 +1514,7 @@
conventions.
\o \c {%CppSourceSuffix%} is replaced by the default source suffix, which
- is defined in Qt Creator in \gui {Tools > Options > C++ > File Naming}.
+ is defined in Qt Creator in \gui {Tools > Options... > C++ > File Naming}.
For example, if users enter \bold MyClass, the filename becomes myclass.cpp
when the project is created.
@@ -1635,6 +1681,22 @@
\image qtcreator-qt4-qtversions.png
\endlist
+ \section1 Adding External Libraries to a qmake Project
+
+ Through external libraries Qt Creator can support code completion and
+ syntax highlighting as if they were part of the current project or the Qt
+ library.
+
+ To add an external library:
+ \list 1
+ \o Open your project file (.pro) using the \gui Projects pane.
+ \o Follow the instructions at \l{http://doc.trolltech.com/latest/qmake-project-files.html#declaring-other-libraries}
+ {Declaring other Libraries}.
+ \endlist
+
+ Syntax completion and highlighting work once your project successfully
+ builds and links against the external library.
+
*/
@@ -1642,7 +1704,7 @@
\contentspage index.html
\previouspage creator-developing-symbian.html
\page creator-building-running.html
- \nextpage creator-project-managing-sessions.html
+ \nextpage creator-building-targets.html
\title Building and Running Applications
@@ -1663,9 +1725,9 @@
The project pane consists of the following tabs:
\list
- \o Targets
- \o Editor Settings
- \o Dependencies
+ \o \l{Building for Multiple Targets}{Targets}
+ \o \l{Specifying Editor Settings}{Editor Settings}
+ \o \l{Specifying Dependencies}{Dependencies}
\endlist
Use the \gui Build and \gui Run buttons to switch between
@@ -1675,13 +1737,22 @@
\gui{Select a Project} option at the top to navigate between different
project edits.
- \section1 Building for Multiple Targets
+*/
+
+
+/*!
+ \contentspage index.html
+ \previouspage creator-building-running.html
+ \page creator-building-targets.html
+ \nextpage creator-build-settings.html
+
+ \title Building for Multiple Targets
Different build configurations allow you to quickly switch between
different build settings. By default, Qt Creator creates \bold debug
and \bold release build configurations.
- \section2 Building for Desktop
+ \section1 Building for Desktop
\list 1
@@ -1691,7 +1762,7 @@
\endlist
- \section2 Building for Qt Simulator
+ \section1 Building for Qt Simulator
You can use the Qt Simulator to test Qt applications that are intended
for mobile devices in an environment similar to that of the device. You
@@ -1706,10 +1777,23 @@
\endlist
- \section2 Building for Maemo
+ For more information about using the Qt Simulator, see the
+ \l{http://doc.qt.nokia.com/qt-simulator-beta/index.html}{Qt Simulator Manual}.
+
+ \section1 Building for Maemo
\list 1
+ \o Build and run the application for \l{Building for Qt Simulator}{Qt Simulator}.
+
+ \o Build and run the application for \l{Using the Maemo Emulator}{Maemo Emulator}.
+
+ \note The Maemo emulator support requires the Nokia Nokia N900 PR1.2 update.
+
+ \o If no problems are found, build and run the application for a device:
+
+ \list 1
+
\o Set up the MADDE development environment and specify a connection
to the device. For more information, see
\l{Setting Up Development Environment for Maemo}.
@@ -1718,18 +1802,22 @@
\o Click the \gui Run button.
+ \endlist
+
+ \endlist
+
Qt Creator uses the compiler specified in the MADDE toolchain to
build the application.
- The application is automatically copied to the device and executed
- there. The application views are displayed on the N900. Command-line
- output is visible in the Qt Creator \gui {Application output} view.
+ Qt Creator generates an installation package, installs in on the device,
+ and executes it. The application views are displayed on the Nokia N900.
+ Command-line
+ output is visible in the Qt Creator \gui {Application Output} view.
Debugging also works transparently.
- \endlist
- \section2 Building for Symbian
+ \section1 Building for Symbian
\list 1
@@ -1747,7 +1835,7 @@
for the device using RVCT, select it in the \gui {Tool chain} field
in the \gui{General} section.
- \section3 Building and Running for a Device
+ \section2 Building and Running for a Device
\list 1
@@ -1854,13 +1942,13 @@
\l{http://doc.qt.nokia.com/4.7-snapshot/qmake-platform-notes.html#capabilities}{Capabilities}.
- \section3 Building and Running for Symbian Emulator
+ \section2 Building and Running for Symbian Emulator
Select
the \gui{Symbian Emulator} target as the active one, and build and run your
project.
- \section3 Troubleshooting
+ \section2 Troubleshooting
If you cannot build the application, check if:
\list
@@ -1893,8 +1981,20 @@
mailing list archives or provide feedback to us via the methods described on the
\l{http://qt.gitorious.org/qt-creator/pages/Home}{Qt Creator Development Wiki}.
+*/
+
+
+/*!
+ \contentspage index.html
+ \previouspage creator-building-targets.html
+ \page creator-build-settings.html
+ \nextpage creator-run-settings.html
+
+ \title Specifying Build Settings
+
+ You specify build settings in the \gui Projects mode.
- \section2 Adding and Removing Build Configurations
+ \image qtcreator-projectpane.png
To add a new build configuration, click \gui Add and select the type of
configuration you would like to add. You can add as many build
@@ -1902,7 +2002,7 @@
To delete the build configuration currently selected, click \gui Remove.
- \section2 Editing Build Configurations
+ \section1 Editing Build Configurations
To edit a build configuration:
\list 1
@@ -1913,7 +2013,7 @@
\o The \l{glossary-project-qt}{Qt version} you want to use to
build your project. For more information, see
\l{Selecting the Qt version}.
- \o The toolchain required to build the project.
+ \o The tool chain required to build the project.
\o By default, projects are built in a separate directory
from the source directory, as \l{glossary-shadow-build}{shadow builds}.
This keeps the files generated for each target platform separate.
@@ -1925,19 +2025,23 @@
\endlist
\endlist
- \section2 Build Steps
+ \section1 Build Steps
The build system of Qt Creator is built on qmake and make. In
\gui{Build Steps} you can change the settings for qmake and make. Qt
Creator runs the make command using the Qt version defined for the current
build configuration.
- \section2 Clean Steps
+ \image qtcreator-build-steps.png "Build steps"
+
+ \section1 Clean Steps
You can use the cleaning process to remove intermediate files. This process
might help you to fix obscure issues during the process of building a
project.
+ \image qtcreator-clean-steps.png "Clean steps"
+
You can define the cleaning steps for your builds in the \gui{Clean Steps}:
\list
\o To add a clean step using make or a custom process, click
@@ -1952,7 +2056,7 @@
.
\endlist
- \section2 Build Environment
+ \section1 Build Environment
You can specify the environment you want to use for building in the
\bold{Build Environment} section. By default, the environment in which Qt
@@ -1962,24 +2066,88 @@
variables or add, reset and unset new variables based on your project
requirements.
- \section1 Run Settings
+*/
+
+
+/*!
+ \contentspage index.html
+ \previouspage creator-build-settings.html
+ \page creator-run-settings.html
+ \nextpage creator-editor-settings.html
+
+ \title Specifying Run Settings
Qt Creator automatically creates run configurations for your project.
- These run configurations derive their executable from the parsed .pro
+ To view and modify the settings, select \gui {Projects > Run}.
+ The settings to specify depend on the type of the project: qmake project
+ or Qt Quick project.
+
+ \section1 Specifying Run Settings for qmake Projects
+
+ The run configurations for qmake projects derive their executable from the parsed .pro
files. You can also create custom executable run configurations where you
can set the executable to be run.
\image qtcreator-pprunsettings.png
+ \section1 Specifying Run Settings for Qt Quick Projects
+
+ To run Qt Quick projects in the QML viewer, specify the connection to the
+ \gui {QML Runtime} in the \gui {Run configuration} field. The settings
+ are specified automatically and, usually, you do not need to change them:
+
+ \list
+
+ \o \gui {QML runtime} is the path to QML viewer executable.
+
+ \o \gui {QML runtime arguments} sets arguments for running the QML viewer.
+ The \c{-I <directory>} argument searches for C++ or QML plugins from
+ the project folder. For a list of available arguments, enter \c {qml --help}
+ on the command line.
+
+ \o \gui {Main QML File} is the Qt Quick project file.
- \section1 File Encoding
+ \o \gui {Debugging address} is the IP address to access the QML viewer.
- To define the default file encoding, select the desired encoding in the
+ \o \gui {Debugging port} is the port to access the QML viewer. You can use any
+ free port in the registered port range.
+
+ \endlist
+
+ \image qmldesigner-run-settings.png "Run settings for Qt Quick projects"
+
+ To set the executable to run, select \gui {Custom Executable} in the
+ \gui {Run configuration} field.
+
+ \image qmldesigner-run-custom-exe.png "Run settings for custom executables"
+
+*/
+
+
+/*!
+ \contentspage index.html
+ \previouspage creator-run-settings.html
+ \page creator-editor-settings.html
+ \nextpage creator-build-dependencies.html
+
+ \title Specifying Editor Settings
+
+ To define the default file encoding, select the desired encoding in \gui Projects >
\gui{Editor Settings}. By default, the Qt Creator uses the file encoding
used by your system.
+ \image qtcreator-editor-settings.png "Editor Settings view"
- \section1 Dependencies
+*/
+
+
+/*!
+ \contentspage index.html
+ \previouspage creator-editor-settings.html
+ \page creator-build-dependencies.html
+ \nextpage creator-project-managing-sessions.html
+
+ \title Specifying Dependencies
If you have multiple projects loaded in your session, you can define the
dependencies between them. Inter-project dependencies affect the build
@@ -1988,29 +2156,15 @@
\note Inter-project dependencies are unrelated inside a qmake
project.
- To define the dependencies between projects:
- \list 1
- \o Select the project for which you want to configure dependencies.
- \o Check the checkboxes in the Dependencies section to select other
- projects as dependencies.
- \endlist
-
-
- \section1 Adding External Libraries to a qmake Project
-
- Through external libraries Qt Creator can support code completion and
- syntax highlighting as if they were part of the current project or the Qt
- library.
+ \image qtcreator-build-dependencies.png "Dependencies view"
- To add an external library:
+ To define the dependencies between projects:
\list 1
- \o Open your project file (.pro) using the \gui Projects pane.
- \o Follow the instructions at \l{http://doc.trolltech.com/latest/qmake-project-files.html#declaring-other-libraries}
- {Declaring other Libraries}.
+ \o In \gui Projects, select a project.
+ \o Click \gui Dependencies.
+ \o Select projects as dependencies.
\endlist
- Syntax completion and highlighting work once your project successfully
- builds and links against the external library.
*/
@@ -2204,7 +2358,7 @@
\endlist
- \section1 Buiding and Running the Application
+ \section1 Building and Running the Application
\list 1
@@ -2910,7 +3064,7 @@
/*!
\contentspage index.html
- \previouspage creator-building-running.html
+ \previouspage creator-build-dependencies.html
\page creator-project-managing-sessions.html
\nextpage creator-visual-editor.html
@@ -2943,7 +3097,7 @@
/*!
\contentspage index.html
- \previouspage creator-usability.html
+ \previouspage creator-maemo-emulator.html
\page creator-debugging.html
\nextpage creator-debugging-cpp.html
@@ -2966,7 +3120,7 @@
When you start debugging, the appropriate tool is automatically selected depending
on the type of the project. If you only develop one kind of projects, you can turn
- off this automation in \gui {Tools > Options > Debugger > General}. Deselect the
+ off this automation in \gui {Tools > Options... > Debugger > General}. Deselect the
\gui {Change debugger language automatically} check box.
The choice of language also determines the contents of the \gui Debug menu.
@@ -3083,7 +3237,7 @@
\list
- \o \gui {Debugging address} is the local IP address to access the QML viewer.
+ \o \gui {Debugging address} is the IP address to access the QML viewer.
\o \gui {Debugging port} is the port to access the QML viewer. You can use any
free port in the registered port range.
@@ -3157,7 +3311,7 @@
inspector and the QML viewer.
You specify the connection in the \gui {Run Settings} in the \gui Projects mode.
- For more information, see \l{Run Settings}.
+ For more information, see \l{Specifying Run Settings for Qt Quick Projects}.
If the connection does not work, check the values of the \gui {Debugging address}
and \gui {Debugging port} fields. Check that the default port number is not reserved
@@ -3301,7 +3455,7 @@
The Qt Creator installation program asks you whether you want to
register Qt Creator as a post-mortem debugger. To change the setting, select
- \gui{Tools > Options > Debugger > Common > Use Creator for post-mortem debugging}.
+ \gui{Tools > Options... > Debugger > Common > Use Creator for post-mortem debugging}.
You can launch the debugger in the post-mortem mode if an application crashes
on Windows. Click the \gui {Debug in Qt Creator} button in the error message
@@ -4856,37 +5010,39 @@
Maemo is a software platform developed by Nokia for smartphones and
Internet Tablets. The Maemo SDK provides an open development environment
- for different applications on top of the Maemo platform.
- Maemo 5 is based on the Linux 2.6 operating system. You can find more
- information about the Maemo platform \l{http://maemo.org/intro/platform/}{here}.
+ for different applications on top of the Maemo platform. The necessary
+ tools from the Maemo SDK are also included in the Nokia Qt SDK.
+ The whole tool chain that you need to create, build, debug, run, and deploy
+ Maemo applictions is installed and configured when you install the Nokia
+ Qt SDK.
+
+ Maemo 5 is based on the Linux 2.6 operating system. For more
+ information about the Maemo platform, see
+ \l{http://maemo.org/intro/platform/}{Software Platform} on the Maemo web site.
\section1 Hardware and Software Requirements
To build and run Qt applications for Maemo, you need the following:
\list
- \o An N900 device with updates installed.
- \o The MADDE cross-platform Maemo development
- tool.
+ \o Nokia N900 device with PR1.2 or later installed.
+ \o MADDE cross-platform Maemo development
+ tool (installed as part of the Nokia Qt SDK).
For more information about MADDE pertaining to its
installation, configuration, and deployment on the device, see
\l{http://wiki.maemo.org/MADDE}{Introduction to MADDE}.
- \o An IP address for the device.
+ \o Nokia USB drivers.
- In order to setup the device IP address, you need to install
- PC Connectivity or implement it using CLI. More information about PC
- Connectivity can be found
- \l{http://pc-connectivity.garage.maemo.org/2nd_edition/node3.html#SECTION00032300000000000000}
- {here}.
- \endlist
+ Only needed if you develop on Windows and if you use a USB connection
+ to run applications on the device. The drivers are
+ installed as part of the Nokia Qt SDK. You can also download them from
+ \l{https://garage.maemo.org/frs/?group_id=801&release_id=2655}{PC Connectivity}
+ on the Maemo web site. Download and install the latest
+ PC_Connectivity_<version>.exe (at the time of writing,
+ PC_Connectivity_0.9.4.exe).
- To deploy and run Qt applications on Maemo devices, you need the
- following:
- \list
- \o The Nokia USB drivers that come, for example with, PC Suite, if you use
- a USB connection to run applications on the device.
\o Qt installed on the device. Recent images should have Qt pre-installed.
\endlist
@@ -4900,9 +5056,9 @@
\note The only supported build system for Maemo in Qt
Creator is qmake.
- \section1 Setting Up the N900
+ \section1 Setting Up the Nokia N900
- You can connect your device to your development PC using either an USB or a
+ You can connect your device to your development PC using either a USB or
WLAN connection.
For the device, you need to use a tool called Mad Developer to create the
@@ -4910,71 +5066,86 @@
diagnostics functions but is essential for creating connections between the
device and your development PC.
- For the development PC, you need to set up the N900 as a network device.
+ To use a WLAN connection, you must activate WLAN on the device and connect
+ it to the same WLAN as the development PC. The network address is displayed
+ in the Mad Developer.
+
+ To use an USB connection, you need to set up the Nokia N900 as a network device
+ on the development PC.
- \note If you plan to connect your development PC to the N900 only over WLAN, you can
+ \note If you plan to connect your development PC to the Nokia N900 only over WLAN, you can
ignore the USB-specific parts in the following sections.
- \section2 Installing the Mad Developer Package
+ \section2 Installing and Configuring Mad Developer
To install Mad Developer on your device, you need to add an application
- catalogue (repository) to the list of catalogues your device checks for
+ catalogue to the list of catalogues your device checks for
installable software, and install the actual Mad Developer software
- package. This is done according to the following
- steps:
+ package. After the installation, you must start Mad Developer and configure
+ a connection between the development PC and the device.
+
+ To install and configure Mad Developer:
+
\list 1
- \o Start the application manager
+ \o On the Nokia N900, select \gui {Application manager > Application catalogs
+ > New}.
- Enter the data as displayed in the screenshot below.
+ \o Specify the following settings:
- \note The complete web address is
+ \image qtcreator-app-manager-extras-devel-screenshot.png
+
+ \list a
+
+ \o \gui {Catalogue name}: \bold devel
+
+ \o \gui {Web address}:
\l http://repository.maemo.org/extras-devel
- \image qtcreator-app-manager-extras-devel-screenshot.png
+ \o \gui Distribution: \bold fremantle
- \o Select \gui{Download} > \gui{Development} > \gui{mad-developer}.
+ \o \gui Components: \bold {free non-free}
- The screenshots below shows the process for selecting the
- \gui{mad-developer}:
+ \endlist
- \image qt-creator-app_manager_screenshot1.png
- \image qt-creator-app_manager_screenshot2.png
+ \o Click \gui Save to add the catalogue.
+ \o Select \gui{Download} > \gui{Development} > \gui{mad-developer}
+ to install the Mad Developer software package.
+ \o Click \gui {Mad Developer} to start the Mad Developer application.
- \o Install the Mad Developer software package.
- \o Start the Mad Developer application.
- \endlist
+ \o To use a WLAN connection, activate WLAN on the device and connect
+ to the same network as the development PC. You can see the network
+ address in the \gui wlan0 field.
+
+ \o To use an USB connection:
- \note If you are using Microsoft Windows as development host, you must
+ \list a
+
+ \o If you are using Microsoft Windows as development host, you must
change the driver loaded for instantiating the connection.
- For this click \gui{Manage USB} and select \gui{Load g_ether}.
+ In the Mad Developer, select \gui{Manage USB} and select \gui{Load g_ether}.
- Follow the steps mentioned below to set up the USB settings:
- \list 1
- \o Click \gui Edit in the usb0 row and confirm with \gui Configure.
+ \o To set up the USB settings, click \gui Edit on the \gui usb0 row and
+ confirm by clicking \gui Configure.
- \note By default, you do not need to make changes. The usb0 row
+ \note By default, you do not need to make changes. The \gui usb0 row
displays the IP address 192.168.2.15.
- \o Select \gui{Developer Password} to generate a password for a freshly
- created user called "developer". The password stays valid for as long
- the password generation dialog is open.
+ \endlist
- Refer to the screenshot below as an example.
+ \o Select \gui{Developer Password} to generate a password for a freshly
+ created user called \bold developer. The password stays valid for as long
+ as the password generation dialog is open. You enter the password when
+ you configure the connection in Qt Creator.
\image qtcreator-mad-developer-screenshot.png
\endlist
- \section2 Establishing the USB Connection
-
- Connect your device to the development PC via the USB cable. A dialog
- pops up asking for the mode to use. Choose \gui{PC suite mode}.
-
- \note If you experience connection problems due to a USB port issue, switch
- to a different port.
+ \section1 Setting Up Network Connectivity on Development PC
-
- \section1 Setting Up Connectivity
+ Use the network configuration tools on your platform to specify the
+ connection to the device on the development PC. You need to do this
+ only if you use an USB connection.
\section2 Linux
@@ -4984,7 +5155,7 @@
\note If you have changed the IP address of the device when configuring
Mad Developer, you need to reflect those changes in your development PC USB
- network settings as well.
+ network settings.
Run the following command in a shell as root user:
\c{ifconfig usb0 192.168.2.14 up}
@@ -4997,95 +5168,174 @@
first dialog and \gui{Install the software automatically} in the second
dialog.
- Open the Network Connections window. The just installed Linux USB Ethernet
- connection is now displayed as a new Local Area Connection.
+ To specify a network connection:
+
+ \list 1
+
+ \o Open the Network Connections window.
- Perform the same steps through the Network configuration tools available
- with the operating system.
+ \o Select the Linux USB Ethernet
+ connection that is displayed as a new Local Area Connection.
- Change the IP to be set statically and enter the following values:
+ \o Edit the \gui {Internet Protocol Version 4 (TCP/IPv4)} properties
+ to specify the IP address for the connection.
+ In the \gui {Use the following IP address} field, enter the following values:
\list
- \o IP Address: 192.168.2.14
- \o SubnetMask: 255.255.255.0
- \o Default gateway: 192.168.2.15
+ \o \gui {IP Address}: \bold {192.168.2.14}
+ \o \gui SubnetMask: \bold {255.255.255.0}
+ \o \gui {Default gateway}: leave this field empty
\endlist
- Accept these settings and close the Network Configuration. Depending on
+ \endlist
+
+ Depending on
your version of Microsoft Windows you may have to unplug and re-plug the
- N900 to reload the driver with its configuration accordingly.
+ Nokia N900 to reload the driver with its configuration accordingly.
- \section2 Setting Up MADDE
+ \section1 Setting Up MADDE
If you install Nokia Qt SDK, the MADDE package is installed and
- configured automatically on your development PC and you can omit this step.
+ configured automatically on your development PC and you can omit this task.
+
+ \list 1
- After having downloaded the MADDE installer file for your platform from
- \l{http://wiki.maemo.org/MADDE}{here}, execute it and follow the
- instructions. The package will be installed. Then run:
- \c{mad-admin list targets} to see which targets are available.
- Install the target that starts with "fremantle" by using the command:
+ \o Download the MADDE installer file for your platform from the
+ \l{http://wiki.maemo.org/MADDE}{MADDE} site.
+
+ \o Execute the installer and follow the instructions.
+
+ \o To see which targets are available, run \c{mad-admin list targets}.
+
+ \o To install the target that starts with the string \bold fremantle, use the command:
\c{mad-admin create fremantle-qt-xxx}
+ \o In Qt Creator, register the MADDE tool chain:
+
+ \image qtcreator-screenshot-toolchain.png
+
+ \list a
+
+ \o Select \gui Tools > \gui Options... > \gui Qt4 > \gui{Qt Versions}.
+
+ \o Click \inlineimage qtcreator-windows-add.png,
+ to add a new Qt version.
+
+ The \gui{qmake Location} is the qmake
+ executable in \c{<MADDE dir>/targets/<fremantle target>/bin}.
+
+ \endlist
+
+ \endlist
+
When you have installed the target, you have a toolchain and a sysroot
environment for cross-compiling.
- \section1 Setting Up Qt Creator
+ \section1 Configuring Connections in Qt Creator
+
+ To be able to run and debug applications on the Maemo emulator and
+ devices, you must set up a connection to the emulator and the device in the
+ Qt Creator build and run settings. If you install Nokia Qt SDK, the
+ necessary software is installed and configured automatically and you
+ only need to configure a connection to the device.
+
+ You can protect the connections between Qt Creator and the Maemo emulator
+ or a device by using either a password or an SSH key. You must always
+ use a password for the initial connection, but can then deploy an SSH
+ key and use it for subsequent connections. If you use a password, you
+ must generate it in Mad Developer and enter it in Qt Creator every time
+ you connect to the Maemo emulator or to a device.
- Set up a connection to the device in the
- Qt Creator build and run settings, as follows:
+ If you do not have an SSH key, you can create it in Qt Creator. For more
+ information, see \l{Generating SSH Keys}.
+
+ To configure connections between Qt Creator and the Maemo emulator or
+ device:
\list 1
- \o If you install Qt Creator separately, you must register the
- MADDE toolchain:
+
+ \o If you install the Maemo emulator (QEMU) separately, you must
+ specify parameters to access it:
\list a
- \o Select \gui Tools > \gui Options > \gui Qt4 > \gui{Qt Versions}.
+ \o Start Mad Developer in the emulator.
- \o Click \inlineimage qtcreator-windows-add.png,
- to add a new Qt version.
+ \o Click \gui {Developer Password} to generate a password for
+ the connection.
- The \gui{qmake Location} is the qmake
- executable in \c{<MADDE dir>/targets/<fremantle target>/bin}.
+ \o In Qt Creator, select \gui {Tools > Options... > Projects >
+ Maemo Device Configurations > Add} to add a new configuration.
+
+ \image qtcreator-maemo-emulator-connection.png
+
+ \o In the \gui {Configuration name} field, enter a name for
+ the connection.
- \image qtcreator-screenshot-toolchain.png
+ \o In the \gui {Device type} field, select \gui {Local simulator}.
+
+ \o In the \gui {Authentication type} field, select \gui Password
+ for the initial connection.
+
+ \o In the \gui Password field, enter the password from the Mad
+ Developer for the initial connection.
+
+ You can use the default values for the other fields.
+
+ \o Click \gui Test to test the connection.
+
+ \o To avoid having to specify the password every time you connect
+ to the Maemo emulator, click \gui {Deploy Key...} and select
+ the file that contains your public key.
+
+ \o When you have deployed the key to the device, change the
+ configuration to use the SSH key for protection.
+
+ \image qtcreator-maemo-emulator-connection-key.png
+
+ The default location of the private key file is displayed in the
+ \gui {Private key file} field.
\endlist
- If you installed the Nokia Qt SDK, you can omit this step.
+ If you installed the Nokia Qt SDK, a connection has been configured
+ and you only need to specify the password and deploy the SSH key.
\o To deploy applications and run them remotely, specify parameters
for accessing devices:
\list a
- \o Select \gui Tools > \gui Options > \gui Qt4 >
- \gui{Maemo Devices} and add a new configuration.
+ \o Connect your device to the development PC via an USB cable or
+ a WLAN. For an USB connection, you are prompted to select the mode
+ to use. Choose \gui{PC suite mode}.
- \image qtcreator-screenshot-devconf.png
+ \note If you experience connection problems due to a USB port issue,
+ switch to a different port or use WLAN to connect to the device.
+
+ \o Select \gui Tools > \gui Options... > \gui Projects >
+ \gui{Maemo Device Configurations > Add}, and add a new configuration for a
+ \gui {Remote device}.
+ \image qtcreator-screenshot-devconf.png
- \note The password is the one MADDE Developer displays on the
- device.
+ \o In the \gui {Host name} field, enter the IP address from the
+ \gui usb0 or \gui wlan0 field in Mad Developer.
- \o Click \gui Test to check whether the device can be accessed
- properly.
+ \o Specify the other settings in the same way as for a Maemo emulator
+ connection.
- It is recommended that you use the password-based login
- only to deploy your public SSH key to the device
- (using the \gui{Deploy Key} button) and then switch to key-based
- authentication.
+ \o Click \gui Test to test the connection.
\o Click \gui OK to close the dialog.
\endlist
- \o To specify build settings:
+ \o To specify build and run settings:
\list a
\o Open a project for an application you want to develop for your
- N900.
+ Nokia N900.
\o Click \gui Projects to open the projects mode.
@@ -5094,19 +5344,184 @@
\image qtcreator-screenshot-build-settings.png
\o In the \gui{Run Settings} section, click \gui Add to add a new
- run configuration on the Maemo device.
+ run configuration.
\o Set a name and select the device configuration.
\image qtcreator-screenshot-run-settings.png
+ \note You can either add separate run settings for both the Maemo
+ emulator connection and the device connection or select the
+ \gui {Device configuration} before you run the application.
+
\endlist
\endlist
+ \section2 Generating SSH Keys
+
+ If you do not have an SSH public and private key pair, you can generate it
+ in Qt Creator. You can specify key length and the key algorithm, RSA or DSA.
+ If you only use the keys to protect connections to the Maemo emulator or
+ device, you can use the default values.
+
+ \list 1
+
+ \o Select \gui {Tools > Options... > Projects > Maemo Device Configurations
+ > Generate SSH Key...}.
+
+ \o Click \gui {Generate SSH Key}.
+
+ \image qtcreator-ssh-key-configuration.png "SSH Key Configuration dialog"
+
+ \o Click \gui {Save Public Key...} to select the location to save the
+ public key.
+
+ \o Click \gui {Save Private Key...} to specify the location to save the
+ private key.
+
+ \o Click \gui Close to close the dialog.
+
+ \endlist
+
*/
+/*!
+ \contentspage index.html
+ \previouspage creator-usability.html
+ \page creator-maemo-emulator.html
+ \nextpage creator-debugging.html
+
+ \title Using the Maemo Emulator
+
+ The Maemo emulator emulates the Nokia N900 device environment. You can test
+ applications in conditions practically identical to running the application
+ on a Nokia N900 device. You can test user interaction by using the keypad and
+ touch emulation.
+
+ \note The Maemo emulator support requires the Nokia N900 PR1.2 update.
+
+ To test the application UI, user interaction with the application, and
+ functionality that uses the mobility APIs, use the Qt Simulator,
+ instead. For more information, see the
+ \l{http://doc.qt.nokia.com/qt-simulator-beta/index.html}{Qt Simulator Manual}.
+
+ The Maemo emulator is installed and configured as part of the Nokia Qt SDK
+ package. You can also install and configure the MADDE environment and
+ Maemo emulator separately. For more information, see
+ \l{Setting Up Development Environment for Maemo}.
+
+ \section1 Starting the Maemo Emulator
+
+ The \gui {Start Maemo Emulator} button is visible if you have a project
+ open in Qt Creator for which you have added the Maemo build target.
+
+ To start the Maemo emulator:
+
+ \list 1
+
+ \o Click
+ \inlineimage qtcreator-maemo-emulator-button.png "Start Maemo Emulator button"
+ .
+
+ \o Select \gui {Mad Developer} on the Maemo emulator, to start the Mad Developer
+ application
+
+ \o If you have not deployed an SSH key to protect the connection between
+ Qt Creator and the Maemo emulator, select \gui {Developer Password} to generate
+ a password.
+
+ \o In Qt Creator, enter the password in the connection settings:
+ \gui {Tools > Options... > Projects > Maemo Device Configurations}.
+
+ \endlist
+
+ Test your application on the Maemo emulator as on a device. For a list of
+ keyboard shortcuts that you can use to emulate Nokia N900 keys and functions, see
+ \l {Emulating Nokia N900 Keys}.
+
+ \section1 Emulating Nokia N900 Keys
+
+ The following table summarizes the keyboard shortcuts that you can use
+ to emulate Nokia N900 keys and functions.
+
+ \table
+ \header
+ \o Nokia N900 Key
+ \o Keyboard Shortcut
+ \row
+ \o \list
+ \o Alphabet keys
+ \o Comma (,)
+ \o Period (.)
+ \o Space
+ \o Arrow keys
+ \o Enter
+ \o Backspace
+ \endlist
+ \o Respective keys on the development PC keyboard.
+ \row
+ \o Shift
+ \o Left Shift key
+ \row
+ \o Ctrl
+ \o Left Ctrl key
+ \row
+ \o Mode
+ \o Left Alt key
+ \row
+ \o Power
+ \o Esc
+ \row
+ \o Keypad slider open and close
+ \o F1
+ \row
+ \o Keypad lock
+ \o F2
+ \row
+ \o Camera lens open and close
+ \o F3
+ \row
+ \o Camera focus
+ \o F4
+ \row
+ \o Camera take picture
+ \o F5
+ \note The actual camera functionality is not emulated.
+ \row
+ \o Stereo headphones connect and disconnect
+ \o F6
+ \row
+ \o Volume down
+ \o F7
+ \row
+ \o Volume up
+ \o F8
+ \row
+ \o Accelerometer x axis, negative
+ \o 1
+ \row
+ \o Accelerometer x axis, positive
+ \o 2
+ \row
+ \o Accelerometer z axis, negative
+ \o 4
+ \row
+ \o Accelerometer z axis, positive
+ \o 5
+ \row
+ \o Accelerometer y axis, negative
+ \o 7
+ \row
+ \o Accelerometer y axis, positive
+ \o 8
+
+ \endtable
+
+
+*/
+
/*!
\contentspage index.html
@@ -5238,7 +5653,7 @@
\contentspage index.html
\previouspage creator-visual-editor.html
\page creator-usability.html
- \nextpage creator-debugging.html
+ \nextpage creator-maemo-emulator.html
\title Optimizing Applications for Mobile Devices
@@ -5372,7 +5787,7 @@
\section1 Using the Filter in Options Dialog
To find specific settings you require in \gui{Tools} > \gui{Options...}
- use the filter located at the top left of the Options dialog box.
+ use the filter located at the top left of the \gui Options dialog box.
\section1 Using Keyboard Shortcuts
@@ -5463,7 +5878,7 @@
To customize a keyboard shortcut:
\list 1
- \o Select \gui Tools > \gui Options > \gui Environment >
+ \o Select \gui Tools > \gui Options... > \gui Environment >
\gui Keyboard.
\o Select an action from the list.
\o In \gui{Key Sequence} enter the shortcut key you want to associate
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 0b586b4d877096481cf59958aaf0db89d5dc8521..737a823d378e7a9dc06bea716700aca808f760e1 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -17608,7 +17608,7 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<message>
<location filename="../../../src/plugins/debugger/cdb/coreengine.cpp" line="+54"/>
<source>Unable to load the debugger engine library '%1': %2</source>
- <translation>Die Debugger-Bibliothek konnte '%1' nicht geladen werden: %2</translation>
+ <translation>Die Debugger-Bibliothek '%1' konnte nicht geladen werden: %2</translation>
</message>
<message>
<location line="+163"/>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index cbc9da1ca2454f5649168934d166bec5620fe82f..b6126535e2879a5cd5236aab71b2fce551a6dc54 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -1040,7 +1040,7 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Verbose Symbol Loading</source>
- <translation>Pokazuj szczegóły podczas ładowania symboli</translation>
+ <translation>Gadatliwe Å‚adowania symboli</translation>
</message>
<message>
<location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="+58"/>
@@ -1740,7 +1740,7 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location line="+3"/>
<source>Diff</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice</translation>
</message>
<message>
<location line="+3"/>
@@ -1770,12 +1770,12 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location line="+17"/>
<source>Failed to create branch</source>
- <translation>Utworzenie gałęzi niepomyślnie zakończone</translation>
+ <translation>Nie można utworzyć gałęzi</translation>
</message>
<message>
<location line="+37"/>
<source>Failed to stash</source>
- <translation>Odłożenie zmian zakończone niepowodzeniem</translation>
+ <translation>Nie można odłożyć zmian</translation>
</message>
<message>
<location line="+6"/>
@@ -1795,7 +1795,7 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location line="+15"/>
<source>Failed to create a tracking branch</source>
- <translation>Utworzenie gałęzi śledzącej zakończone niepowodzeniem</translation>
+ <translation>Nie można utworzyć gałęzi śledzącej</translation>
</message>
</context>
<context>
@@ -2064,7 +2064,7 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<location/>
<source>Ignore whitespace changes in annotation</source>
- <translation type="unfinished">Ignoruj zmiany w spacjach w </translation>
+ <translation>Ignoruj zmiany w spacjach w adnotacjach</translation>
</message>
<message>
<location/>
@@ -2334,7 +2334,7 @@ Add, modify, and remove document filters, which determine the documentation set
<translation>Przetestuj</translation>
</message>
<message>
- <location filename="../../../src/plugins/perforce/settingspage.cpp" line="+136"/>
+ <location filename="../../../src/plugins/perforce/settingspage.cpp" line="+137"/>
<source>Perforce</source>
<translation>Perforce</translation>
</message>
@@ -3023,7 +3023,7 @@ Jednocześnie samoczynnie ustawia odpowiednią wersję Qt.</translation>
<message>
<location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp" line="+72"/>
<source>The Qt Creator User Interface</source>
- <translation>Interfesj użytkownika Qt Creatora</translation>
+ <translation>Interfejs użytkownika Qt Creatora</translation>
</message>
<message>
<location line="+2"/>
@@ -3037,12 +3037,12 @@ Jednocześnie samoczynnie ustawia odpowiednią wersję Qt.</translation>
</message>
<message>
<location line="+38"/>
- <location line="+58"/>
+ <location line="+53"/>
<source>Choose an example...</source>
<translation>Wybierz przykład...</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+85"/>
<source>Copy Project to writable Location?</source>
<translation>Kopiować projekt do miejsca zapisywalnego?</translation>
</message>
@@ -3605,12 +3605,12 @@ p, li { white-space: pre-wrap; }
<message>
<location/>
<source>Ignore whitespace changes in annotation</source>
- <translation type="unfinished"></translation>
+ <translation>Ignoruj zmiany w spacjach w adnotacjach</translation>
</message>
<message>
<location/>
<source>Log count:</source>
- <translation type="unfinished"></translation>
+ <translation>Licznik dziennika:</translation>
</message>
<message>
<location/>
@@ -4019,9 +4019,8 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>http://labs.trolltech.com/blogs/feed</source>
- <extracomment>Add localized feed here only if one exists</extracomment>
<translation>http://labs.trolltech.com/blogs/feed</translation>
</message>
<message>
@@ -4051,12 +4050,12 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/plugins/welcome/communitywelcomepagewidget.ui"/>
<source>Qt Support Sites</source>
- <translation type="unfinished"></translation>
+ <translation>Strony wsparcia technicznego Qt</translation>
</message>
<message>
<location/>
<source>Qt Links</source>
- <translation type="unfinished"></translation>
+ <translation>Strony o Qt</translation>
</message>
</context>
<context>
@@ -4358,7 +4357,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../../../src/app/main.cpp" line="+132"/>
<source>Failed to load core: %1</source>
- <translation>Nie udało się załadować zrzutu: %1</translation>
+ <translation>Nie można załadować zrzutu: %1</translation>
</message>
<message>
<location line="+5"/>
@@ -4419,7 +4418,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../../../src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp" line="+181"/>
- <location filename="../../../src/plugins/qmldesigner/core/pluginmanager/widgetpluginpath.cpp" line="+204"/>
+ <location filename="../../../src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp" line="+204"/>
<source>Failed Plugins</source>
<translation>Niezaładowane wtyczki</translation>
</message>
@@ -4754,7 +4753,7 @@ Przyczyna: %3</translation>
<translation type="obsolete">Pokaż szczegóły</translation>
</message>
<message>
- <location filename="../../../src/libs/utils/detailsbutton.cpp" line="+136"/>
+ <location filename="../../../src/libs/utils/detailsbutton.cpp" line="+68"/>
<source>Details</source>
<translation>Szczegóły</translation>
</message>
@@ -4800,7 +4799,7 @@ Przyczyna: %3</translation>
<message>
<location line="+10"/>
<source>Name matches MS Windows device. (%1).</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa pasuje do urzÄ…dzenia MS Windows. (%1).</translation>
</message>
</context>
<context>
@@ -6263,9 +6262,13 @@ Czy chcesz je nadpisać?</translation>
<context>
<name>Core::ModeManager</name>
<message>
- <location filename="../../../src/plugins/coreplugin/modemanager.cpp" line="+180"/>
<source>Switch to %1 mode</source>
- <translation>Przejdź do trybu %1</translation>
+ <translation type="obsolete">Przejdź do trybu %1</translation>
+ </message>
+ <message>
+ <location filename="../../../src/plugins/coreplugin/modemanager.cpp" line="+180"/>
+ <source>Switch to <b>%1</b> mode</source>
+ <translation>Przejdź do trybu <b>%1</b></translation>
</message>
</context>
<context>
@@ -6310,7 +6313,7 @@ Czy chcesz je nadpisać?</translation>
<context>
<name>Core::Internal::OutputPaneManager</name>
<message>
- <location filename="../../../src/plugins/coreplugin/outputpane.cpp" line="+206"/>
+ <location filename="../../../src/plugins/coreplugin/outputpane.cpp" line="+209"/>
<source>Output</source>
<translation>Komunikaty</translation>
</message>
@@ -6330,7 +6333,7 @@ Czy chcesz je nadpisać?</translation>
<translation>Poprzedni element</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<location line="+195"/>
<source>Maximize Output Pane</source>
<translation>Zmaksymalizuj panel z komunikatami</translation>
@@ -6537,7 +6540,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+183"/>
<source>Empty snippet received for "%1".</source>
- <translation type="unfinished"></translation>
+ <translation>Otrzymano pusty urywek dla "%1".</translation>
</message>
<message>
<source>This protocol supports no listing</source>
@@ -6735,7 +6738,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+17"/>
<source>Update code model</source>
- <translation>Odśwież model kodu</translation>
+ <translation>Uaktualnij model kodu</translation>
</message>
</context>
<context>
@@ -7074,12 +7077,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+7"/>
<source>Update Project</source>
- <translation>Odśwież projekt</translation>
+ <translation>Uaktualnij projekt</translation>
</message>
<message>
<location line="+0"/>
<source>Update Project "%1"</source>
- <translation>Odśwież projekt "%1"</translation>
+ <translation>Uaktualnij projekt "%1"</translation>
</message>
<message>
<location line="+9"/>
@@ -7880,7 +7883,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location filename="../../../src/plugins/debugger/debuggeractions.cpp" line="+226"/>
<source>This switches the debugger to instruction-wise operation mode. In this mode, stepping operates on single instructions and the source location view also shows the disassembled instructions.</source>
- <translation type="unfinished"></translation>
+ <translation>Przestawia debugger do trybu operowania na instrukcjach. W tym trybie kroczenie działa dla pojedynczych instrukcji i widok źródeł pokazuje również zdeasemblowane instrukcje.</translation>
</message>
<message>
<location line="+10"/>
@@ -7952,12 +7955,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+7"/>
<source>Verbose Log</source>
- <translation>Szczegółowy dziennik</translation>
+ <translation>Gadatliwy dziennik</translation>
</message>
<message>
<location line="+7"/>
<source>Operate by Instruction</source>
- <translation type="unfinished"></translation>
+ <translation>Operuj na instrukcjach</translation>
</message>
<message>
<location line="+11"/>
@@ -7967,42 +7970,42 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+13"/>
<source>Watch Expression "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Obserwuj wyrażenie "%1"</translation>
</message>
<message>
<location line="+4"/>
<source>Remove Watch Expression "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń obserwowanie wyrażenia "%1"</translation>
</message>
<message>
<location line="+4"/>
<source>Watch Expression "%1" in Separate Window</source>
- <translation type="unfinished"></translation>
+ <translation>Obserwuj wyrażenie "%1" w osobnym oknie</translation>
</message>
<message>
<location line="+14"/>
<source>Show "std::" Namespace in Types</source>
- <translation type="unfinished"></translation>
+ <translation>Pokazuj przestrzeń nazw "std::" w widoku typów</translation>
</message>
<message>
<location line="+8"/>
<source>Show Qt's Namespace in Types</source>
- <translation type="unfinished"></translation>
+ <translation>Pokazuj przestrzeń nazw Qt w widoku typów</translation>
</message>
<message>
<location line="+11"/>
<source>Use Debugging Helpers</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj asystenta debuggera</translation>
</message>
<message>
<location line="+22"/>
<source>Debug Debugging Helpers</source>
- <translation type="unfinished"></translation>
+ <translation>Debuguj asystenta debuggera</translation>
</message>
<message>
<location line="+8"/>
<source>Use Code Model</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj modelu kodu</translation>
</message>
<message>
<location line="+1"/>
@@ -8012,17 +8015,17 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+9"/>
<source>Recheck Debugging Helper Availability</source>
- <translation type="unfinished"></translation>
+ <translation>Sprawdź ponownie dostępność asystenta debuggera</translation>
</message>
<message>
<location line="+7"/>
<source>Synchronize Breakpoints</source>
- <translation type="unfinished"></translation>
+ <translation>Zsynchronizuj pułapki</translation>
</message>
<message>
<location line="+4"/>
<source>Use Precise Breakpoints</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj dokładnych pułapek</translation>
</message>
<message>
<location line="+1"/>
@@ -8042,7 +8045,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+23"/>
<source>Automatically Quit Debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Automatycznie zakańczaj debugger</translation>
</message>
<message>
<location line="+7"/>
@@ -8057,22 +8060,22 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+10"/>
<source>Use Tooltips in Locals View When Debugging</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj podpowiedzi w widoku ze zmiennymi lokalnymi podczas debugowania</translation>
</message>
<message>
<location line="+9"/>
<source>Use Tooltips in Breakpoints View When Debugging</source>
- <translation type="unfinished"></translation>
+ <translation>Używaj podpowiedzi w widoku z pułapkami podczas debugowania</translation>
</message>
<message>
<location line="+9"/>
<source>Show Address Data in Breakpoints View When Debugging</source>
- <translation type="unfinished"></translation>
+ <translation>Pokazuj adresy w widoku z pułapkami podczas debugowania</translation>
</message>
<message>
<location line="+9"/>
<source>Show Address Data in Stack View When Debugging</source>
- <translation type="unfinished"></translation>
+ <translation>Pokazuj adresy w widoku stosu podczas debugowania</translation>
</message>
<message>
<location line="+9"/>
@@ -8097,12 +8100,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+8"/>
<source>Register For Post-Mortem Debugging</source>
- <translation type="unfinished"></translation>
+ <translation>Zarejestruj do pośmiertnego debugowania</translation>
</message>
<message>
<location line="+32"/>
<source>Reload Full Stack</source>
- <translation type="unfinished"></translation>
+ <translation>Przeładuj cały stos</translation>
</message>
<message>
<location line="+4"/>
@@ -8117,12 +8120,12 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+11"/>
<source>Change debugger language automatically</source>
- <translation type="unfinished"></translation>
+ <translation>Automatycznie zmieniaj język debuggera</translation>
</message>
<message>
<location line="+1"/>
<source>Changes the debugger language according to the currently opened file.</source>
- <translation type="unfinished"></translation>
+ <translation>Zmienia język debuggera odpowiednio do zawartości otwartego pliku.</translation>
</message>
<message>
<source>Use tooltips in locals view when debugging</source>
@@ -8361,7 +8364,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+3"/>
<source>Immediately Return From Inner Function</source>
- <translation type="unfinished"></translation>
+ <translation>Powróć natychmiast z wewnętrznej funkcji</translation>
</message>
<message>
<location line="+2"/>
@@ -8383,7 +8386,7 @@ Zwróć uwagę że spowoduje to usunięcie lokalnego pliku.</translation>
<message>
<location line="+2"/>
<source>Snapshot</source>
- <translation type="unfinished"></translation>
+ <translation>Zrzut</translation>
</message>
<message>
<location line="+5"/>
@@ -8725,22 +8728,23 @@ Czy chcesz ją zakończyć?</translation>
<location line="+5"/>
<source>Application process could not be stopped:
%1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zatrzymać procesu aplikacji:
+%1</translation>
</message>
<message>
<location line="+5"/>
<source>Application started</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchomiono aplikacjÄ™</translation>
</message>
<message>
<location line="+5"/>
<source>Application running</source>
- <translation type="unfinished"></translation>
+ <translation>Aplikacja uruchomiona</translation>
</message>
<message>
<location line="+5"/>
<source>Attached to stopped application</source>
- <translation type="unfinished"></translation>
+ <translation>Dołączono do zatrzymanej aplikacji</translation>
</message>
<message>
<source>Inferior process could not be stopped:
@@ -9039,8 +9043,10 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message numerus="yes">
<location filename="../../../src/plugins/debugger/gdb/classicgdbengine.cpp" line="+129"/>
<source>Retrieving data for watch view (%n requests pending)...</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>Pobieranie danych dla widoku ze zmiennymi obserwowanymi (%n oczekujące żądanie)...</numerusform>
+ <numerusform>Pobieranie danych dla widoku ze zmiennymi obserwowanymi (%n oczekujące żądania)...</numerusform>
+ <numerusform>Pobieranie danych dla widoku ze zmiennymi obserwowanymi (%n oczekujących żądań)...</numerusform>
</translation>
</message>
<message>
@@ -9082,12 +9088,12 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+52"/>
<source><shadowed></source>
- <translation type="unfinished"></translation>
+ <translation><przykryto></translation>
</message>
<message>
<location filename="../../../src/plugins/debugger/gdb/classicgdbengine.cpp" line="+349"/>
<source><n/a></source>
- <translation type="unfinished"></translation>
+ <translation><niedostępne></translation>
</message>
<message>
<location line="+2"/>
@@ -9121,34 +9127,35 @@ Zaleca się użycie gdb wersji 6.7 lub późniejszej.</translation>
<message>
<location line="+18"/>
<source>Unexpected Gdb Exit</source>
- <translation type="unfinished"></translation>
+ <translation>Nieoczekiwanie zakończenie Gdb</translation>
</message>
<message>
<location line="-3"/>
<source>The gdb process exited unexpectedly (%1).</source>
- <translation type="unfinished"></translation>
+ <translation>Proces gdb nieoczekiwanie zakończył się (%1).</translation>
</message>
<message>
<location line="-1187"/>
<location line="+15"/>
<source>Snapshot Creation Error</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d tworzenia zrzutu</translation>
</message>
<message>
<location line="-14"/>
<source>Cannot create snapshot file.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć pliku ze zrzutem.</translation>
</message>
<message>
<location line="+15"/>
<source>Cannot create snapshot:
</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć zrzutu:
+</translation>
</message>
<message>
<location line="+17"/>
<source>Snapshot Reloading</source>
- <translation type="unfinished"></translation>
+ <translation>Przeładowywanie zrzutu</translation>
</message>
<message>
<location line="+1"/>
@@ -9159,7 +9166,7 @@ Do you want to stop the debugged process and load the selected snapshot?</source
<message>
<location line="+378"/>
<source>Finished retrieving data</source>
- <translation type="unfinished"></translation>
+ <translation>Zakończono pobieranie danych</translation>
</message>
<message>
<location line="+777"/>
@@ -9272,7 +9279,7 @@ You can choose between waiting longer or abort debugging.</source>
<message>
<location line="+4"/>
<source>Stopped: %1 by signal %2</source>
- <translation type="unfinished"></translation>
+ <translation>Zatrzymano: %1 przez sygnał %2</translation>
</message>
<message>
<location line="+106"/>
@@ -9334,7 +9341,7 @@ Zaleca się użycie gdb wersji 7.1 lub późniejszej.</translation>
<message>
<location line="+153"/>
<source>Jumping out of bogus frame...</source>
- <translation type="unfinished"></translation>
+ <translation>Wyskakiwanie z błędnej ramki...</translation>
</message>
<message>
<location line="+1379"/>
@@ -9471,7 +9478,7 @@ Zaleca się użycie gdb wersji 7.1 lub późniejszej.</translation>
<message>
<location line="+6"/>
<source>Unable to acquire a device on '%1'. It appears to be in use.</source>
- <translation>Nie można pozyskać urządzienia na "%1". Wygląda że jest w użyciu.</translation>
+ <translation>Nie można pozyskać urządzenia na "%1". Wygląda że jest w użyciu.</translation>
</message>
<message>
<location line="+118"/>
@@ -9587,7 +9594,7 @@ Zaleca się użycie gdb wersji 7.1 lub późniejszej.</translation>
<message>
<location line="+49"/>
<source>Update Module List</source>
- <translation>Odśwież listę modułów</translation>
+ <translation>Uaktualnij listę modułów</translation>
</message>
<message>
<location line="+2"/>
@@ -10297,7 +10304,7 @@ Zaleca się użycie gdb wersji 7.1 lub późniejszej.</translation>
<message>
<location line="+1"/>
<source>Generation</source>
- <translation type="unfinished">Generowanie</translation>
+ <translation>Generowanie</translation>
</message>
<message>
<location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+45"/>
@@ -10779,7 +10786,7 @@ Rebuilding the project might help.</source>
<message>
<location line="+175"/>
<source>The image could not be created: %1</source>
- <translation>Nie można utworzyć obrazu: %1</translation>
+ <translation>Nie można utworzyć pliku graficznego: %1</translation>
</message>
</context>
<context>
@@ -11299,7 +11306,7 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<context>
<name>Git::Internal::LocalBranchModel</name>
<message>
- <location filename="../../../src/plugins/git/branchmodel.cpp" line="+196"/>
+ <location filename="../../../src/plugins/git/branchmodel.cpp" line="+197"/>
<source><New branch></source>
<translation><Nowa gałąź></translation>
</message>
@@ -11481,7 +11488,7 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<message>
<location line="+5"/>
<source>Invalid revision</source>
- <translation type="unfinished"></translation>
+ <translation>Błędna poprawka</translation>
</message>
<message>
<location line="+90"/>
@@ -11496,7 +11503,7 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<message>
<location line="+62"/>
<source>Unable to describe revision %1 in %2: %3</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można opisać poprawki %1 w %2: %3</translation>
</message>
<message>
<location line="+45"/>
@@ -11517,17 +11524,17 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<message>
<location line="+19"/>
<source>Unable to run a 'git branch' command in %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić komendy "git branch" w %1: %2</translation>
</message>
<message>
<location line="+22"/>
<source>Unable to run 'git show' in %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić "git show" w %1: %2</translation>
</message>
<message>
<location line="+20"/>
<source>Unable to run 'git clean' in %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić "git clean" w %1: %2</translation>
</message>
<message>
<location line="+23"/>
@@ -11568,7 +11575,7 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<message>
<location line="+97"/>
<source>Unable to determine git version: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można określić wersji git: %1</translation>
</message>
<message>
<location line="-863"/>
@@ -11902,27 +11909,27 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<message>
<location line="+4"/>
<source>Repository Status</source>
- <translation type="unfinished"></translation>
+ <translation>Stan składnicy</translation>
</message>
<message>
<location line="+4"/>
<source>Log Repository</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż dziennik składnicy</translation>
</message>
<message>
<location line="+6"/>
<source>Apply Patch</source>
- <translation type="unfinished"></translation>
+ <translation>Zastosuj Å‚atÄ™</translation>
</message>
<message>
<location line="+0"/>
<source>Apply "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Zastosuj "%1"</translation>
</message>
<message>
<location line="+8"/>
<source>Apply Patch...</source>
- <translation type="unfinished"></translation>
+ <translation>Zastosuj Å‚atÄ™...</translation>
</message>
<message>
<location line="+4"/>
@@ -11932,12 +11939,12 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<message>
<location line="+3"/>
<source>Create Repository...</source>
- <translation type="unfinished"></translation>
+ <translation>Utwórz składnicę...</translation>
</message>
<message>
<location line="+6"/>
<source>Clean Repository...</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść składnicę...</translation>
</message>
<message>
<location line="+7"/>
@@ -12008,7 +12015,7 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<message>
<location line="+1"/>
<source>The repository is clean.</source>
- <translation type="unfinished"></translation>
+ <translation>Składnica jest czysta.</translation>
</message>
<message>
<location line="+63"/>
@@ -12018,7 +12025,7 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<message>
<location line="+2"/>
<source>Choose patch</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz Å‚atÄ™</translation>
</message>
<message>
<location line="+10"/>
@@ -12038,7 +12045,7 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<message>
<location line="+4"/>
<source>Log</source>
- <translation type="unfinished"></translation>
+ <translation>Dziennik</translation>
</message>
<message>
<location line="+4"/>
@@ -12254,7 +12261,7 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<message>
<location line="+138"/>
<source>Open Image</source>
- <translation>Otwórz obraz</translation>
+ <translation>Otwórz plik graficzny</translation>
</message>
<message>
<location line="+1"/>
@@ -12658,7 +12665,7 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<message>
<location line="-43"/>
<source>Update Project "%1"</source>
- <translation>Odśwież projekt "%1"</translation>
+ <translation>Uaktualnij projekt "%1"</translation>
</message>
<message>
<location line="+57"/>
@@ -12705,7 +12712,7 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<message>
<location line="-18"/>
<source>Update All</source>
- <translation>Odśwież wszystko</translation>
+ <translation>Uaktualnij wszystko</translation>
</message>
<message>
<location line="-94"/>
@@ -12715,7 +12722,7 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<message>
<location line="+0"/>
<source>Delete "%1"...</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń "%1"...</translation>
</message>
<message>
<location line="+29"/>
@@ -12735,32 +12742,32 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<message>
<location line="+8"/>
<source>Update Current Project</source>
- <translation type="unfinished"></translation>
+ <translation>Uaktualnij bieżący projekt</translation>
</message>
<message>
<location line="+9"/>
<source>Revert Unchanged</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć niezmienione</translation>
</message>
<message>
<location line="+0"/>
<source>Revert Unchanged Files of Project "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć niezmienione pliki projektu "%1"</translation>
</message>
<message>
<location line="+7"/>
<source>Revert Project</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany w projekcie</translation>
</message>
<message>
<location line="+0"/>
<source>Revert Project "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany w projekcie "%1"</translation>
</message>
<message>
<location line="+22"/>
<source>Repository Log</source>
- <translation type="unfinished"></translation>
+ <translation>Dziennik składnicy</translation>
</message>
<message>
<location line="+35"/>
@@ -12796,7 +12803,7 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<message>
<location line="+50"/>
<source>Do you want to revert all changes to the project "%1"?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy chcesz odwrócic wszystkie zmiany w projekcie "%1"?</translation>
</message>
<message>
<location line="+75"/>
@@ -12860,17 +12867,17 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<location line="+31"/>
<source>The file is not mapped</source>
<extracomment>File is not managed by Perforce</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Plik nie jest zmapowany</translation>
</message>
<message>
<location line="+24"/>
<source>Perforce repository: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Składnica Perforce: %1</translation>
</message>
<message>
<location line="+7"/>
<source>Perforce: Unable to determine the repository: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Perforce: Nie można określić składnicy: %1</translation>
</message>
<message>
<location line="-477"/>
@@ -12895,7 +12902,7 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<message>
<location line="+51"/>
<source>Perforce is not correctly configured.</source>
- <translation type="unfinished"></translation>
+ <translation>Perforce nie jest poprawnie skonfigurowany.</translation>
</message>
<message>
<location line="+98"/>
@@ -13066,7 +13073,7 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<context>
<name>ProjectExplorer::Internal::AllProjectsFind</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/allprojectsfind.cpp" line="+64"/>
+ <location filename="../../../src/plugins/projectexplorer/allprojectsfind.cpp" line="+65"/>
<source>All Projects</source>
<translation>Wszystkie projekty</translation>
</message>
@@ -13160,12 +13167,12 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<location line="+57"/>
<location line="+70"/>
<source><font color="#ff0000">Error while building project %1 (target: %2)</font></source>
- <translation><font color="#ff0000">BÅ‚Ä…d podczas budowania projektu %1 (cel: %2)</font></translation>
+ <translation><font color="#ff0000">BÅ‚Ä…d podczas budowania projektu %1 (produkt docelowy: %2)</font></translation>
</message>
<message>
<location line="-67"/>
<source>Error while building project %1 (target: %2)</source>
- <translation>BÅ‚Ä…d podczas budowania projektu %1 (cel: %2)</translation>
+ <translation>BÅ‚Ä…d podczas budowania projektu %1 (produkt docelowy: %2)</translation>
</message>
<message>
<source><font color="#ff0000">Error while building project %1</font></source>
@@ -13249,7 +13256,22 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<context>
<name>ProjectExplorer::Internal::BuildStepsPage</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/buildstepspage.cpp" line="+259"/>
+ <location filename="../../../src/plugins/projectexplorer/buildstepspage.cpp" line="+176"/>
+ <source>Move Up</source>
+ <translation>Przenieś do góry</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Move Down</source>
+ <translation>Przenieś na dół</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Remove Item</source>
+ <translation>Usuń element</translation>
+ </message>
+ <message>
+ <location line="+80"/>
<source>Removing Step failed</source>
<translation>Nie można usunąć kroku</translation>
</message>
@@ -13282,7 +13304,7 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<translation type="obsolete">Usuń krok z procesu budowania</translation>
</message>
<message>
- <location line="-208"/>
+ <location line="-216"/>
<source>Clean Steps</source>
<translation>Kroki procesu czyszczenia</translation>
</message>
@@ -13340,7 +13362,7 @@ Przebudowanie projektu może pomóc w odnalezieniu ich.</translation>
<context>
<name>ProjectExplorer::Internal::CurrentProjectFind</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/currentprojectfind.cpp" line="+64"/>
+ <location filename="../../../src/plugins/projectexplorer/currentprojectfind.cpp" line="+65"/>
<source>Current Project</source>
<translation>Bieżący projekt</translation>
</message>
@@ -13631,12 +13653,12 @@ Powód: %2</translation>
<message>
<location line="+5"/>
<source>Using <b>%1</b></source>
- <translation type="unfinished"></translation>
+ <translation>Używając <b>%1</b></translation>
</message>
<message>
<location line="+2"/>
<source>Using <b>%1</b> and</source>
- <translation type="unfinished"></translation>
+ <translation>Używając <b>%1</b> i</translation>
</message>
<message>
<source>Summary: No changes to Environment</source>
@@ -13672,17 +13694,17 @@ Powód: %2</translation>
<message>
<location line="+182"/>
<source>The application is still running.</source>
- <translation type="unfinished"></translation>
+ <translation>Aplikacja jest wciąż uruchomiona.</translation>
</message>
<message>
<location line="+3"/>
<source>Force it to quit?</source>
- <translation type="unfinished"></translation>
+ <translation>Zakończyć ją?</translation>
</message>
<message>
<location line="+2"/>
<source>Force Quit</source>
- <translation type="unfinished"></translation>
+ <translation>Zakończ</translation>
</message>
<message>
<source>Ctrl+Shift+R</source>
@@ -13717,7 +13739,7 @@ Powód: %2</translation>
<location filename="../../../src/plugins/projectexplorer/pluginfilefactory.cpp" line="+65"/>
<source>Project File Factory</source>
<comment>ProjectExplorer::ProjectFileFactory display name.</comment>
- <translation type="unfinished"></translation>
+ <translation>Fabryka plików projektu</translation>
</message>
<message>
<location line="+9"/>
@@ -13943,7 +13965,7 @@ Powód: %2</translation>
<message>
<location line="-123"/>
<source>Recent P&rojects</source>
- <translation type="unfinished"></translation>
+ <translation>Ostatnie p&rojekty</translation>
</message>
<message>
<location line="+133"/>
@@ -13989,7 +14011,7 @@ Powód: %2</translation>
<message>
<location line="+4"/>
<source>Ctrl+T</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+T</translation>
</message>
<message>
<location line="+119"/>
@@ -14005,7 +14027,7 @@ Powód: %2</translation>
<message>
<location line="+527"/>
<source>Always save files before build</source>
- <translation type="unfinished"></translation>
+ <translation>Zawsze zachowuj pliki przed budowaniem</translation>
</message>
<message>
<location line="+338"/>
@@ -14142,7 +14164,7 @@ do systemu kontroli wersji (%2)?</translation>
<message>
<location line="+27"/>
<source>Active run configuration</source>
- <translation type="unfinished">Aktywna konfiguracja uruchamiania</translation>
+ <translation>Aktywna konfiguracja uruchamiania</translation>
</message>
<message>
<location line="+3"/>
@@ -14168,7 +14190,7 @@ do systemu kontroli wersji (%2)?</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.cpp" line="+129"/>
<source>General</source>
- <translation type="unfinished">Ogólne</translation>
+ <translation>Ogólne</translation>
</message>
</context>
<context>
@@ -14180,7 +14202,7 @@ do systemu kontroli wersji (%2)?</translation>
<extracomment>No version control system selected
----------
No project selected</extracomment>
- <translation type="unfinished"></translation>
+ <translation><Brak></translation>
</message>
<message>
<location line="+47"/>
@@ -14192,7 +14214,7 @@ No project selected</extracomment>
<message>
<location line="+20"/>
<source>A version control system repository could not be created in '%1'.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć składnicy systemu kontroli wersji w "%1".</translation>
</message>
<message>
<location line="+8"/>
@@ -14309,7 +14331,7 @@ No project selected</extracomment>
<message>
<location line="+0"/>
<source>Files to be added in</source>
- <translation type="unfinished"></translation>
+ <translation>Pliki które mają zostać dodane w</translation>
</message>
</context>
<context>
@@ -14433,7 +14455,7 @@ No project selected</extracomment>
<message>
<location line="+2"/>
<source>Intel C++ Compiler (Linux)</source>
- <translation type="unfinished">Kompilator Intel C++ (Linux)</translation>
+ <translation>Kompilator Intel C++ (Linux)</translation>
</message>
<message>
<location line="+4"/>
@@ -14458,12 +14480,12 @@ No project selected</extracomment>
<message>
<location line="+2"/>
<source>GCCE/GnuPoc</source>
- <translation type="unfinished"></translation>
+ <translation>GCCE/GnuPoc</translation>
</message>
<message>
<location line="+2"/>
<source>RVCT (ARMV6)/GnuPoc</source>
- <translation type="unfinished"></translation>
+ <translation>RVCT (ARMV6)/GnuPoc</translation>
</message>
<message>
<location line="+2"/>
@@ -14478,7 +14500,7 @@ No project selected</extracomment>
<message>
<location line="+2"/>
<source>GCC for Maemo</source>
- <translation type="unfinished"></translation>
+ <translation>GCC dla Maemo</translation>
</message>
<message>
<location line="+2"/>
@@ -14680,12 +14702,12 @@ No project selected</extracomment>
<message>
<location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp" line="+49"/>
<source>Qt Custom Designer Widget</source>
- <translation type="unfinished"></translation>
+ <translation>Własny widżet Qt Designer</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a Qt Custom Designer Widget or a Custom Widget Collection.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy własny widżet Qt Designer lub kolekcję własnych widżetów.</translation>
</message>
</context>
<context>
@@ -14764,7 +14786,7 @@ No project selected</extracomment>
<location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+83"/>
<source>Make</source>
<comment>Qt4 MakeStep display name.</comment>
- <translation type="unfinished">Make</translation>
+ <translation>Make</translation>
</message>
<message>
<location line="+55"/>
@@ -14786,7 +14808,7 @@ No project selected</extracomment>
<message>
<location line="+16"/>
<source><b>Make:</b> %1 not found in the environment.</source>
- <translation type="unfinished"></translation>
+ <translation><b>Make:</b> Nie odnaleziono %1 w środowisku.</translation>
</message>
<message>
<source><b>Make Step:</b> %1 not found in the environment.</source>
@@ -14827,7 +14849,7 @@ No project selected</extracomment>
<message>
<location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+55"/>
<source>Project setup</source>
- <translation type="unfinished"></translation>
+ <translation>Ustawienia projektu</translation>
</message>
</context>
<context>
@@ -14856,17 +14878,17 @@ No project selected</extracomment>
<location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="+81"/>
<source>qmake</source>
<comment>QMakeStep display name.</comment>
- <translation type="unfinished"></translation>
+ <translation>QMake</translation>
</message>
<message>
<location line="+107"/>
<source><font color="#0000ff">Configuration is faulty, please check the Build Issues view for details.</font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#0000ff">Konfiguracja jest błędna, sprawdź szczegóły w widoku "Problemy budowania".</font></translation>
</message>
<message>
<location line="+6"/>
<source><font color="#0000ff">Configuration unchanged, skipping qmake step.</font></source>
- <translation type="unfinished"></translation>
+ <translation><font color="#0000ff">Konfiguracja niezmieniona, krok qmake opuszczony.</font></translation>
</message>
</context>
<context>
@@ -14886,12 +14908,12 @@ No project selected</extracomment>
<message>
<location line="+176"/>
<source><b>qmake:</b> No Qt version set. Cannot run qmake.</source>
- <translation type="unfinished"></translation>
+ <translation><b>QMake:</b> Brak ustawionej wersji Qt. Nie można uruchomić qmake.</translation>
</message>
<message>
<location line="+14"/>
<source><b>qmake:</b> %1 %2</source>
- <translation type="unfinished"></translation>
+ <translation><b>qmake:</b> %1 %2</translation>
</message>
</context>
<context>
@@ -14903,7 +14925,7 @@ No project selected</extracomment>
<message>
<location line="+89"/>
<source>qmake</source>
- <translation type="unfinished"></translation>
+ <translation>qmake</translation>
</message>
</context>
<context>
@@ -14938,7 +14960,7 @@ No project selected</extracomment>
<message>
<location line="+3"/>
<source>Arguments:</source>
- <translation type="unfinished">Argumenty:</translation>
+ <translation>Argumenty:</translation>
</message>
<message>
<location line="+1"/>
@@ -15059,37 +15081,37 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<message>
<location line="-152"/>
<source>Unable to remove existing file '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można usunąć istniejącego pliku "%1": %2</translation>
</message>
<message>
<location line="+15"/>
<source>Unable to rename file '%1' to '%2': %3</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zmienić nazwy pliku "%1" na "%2": %3</translation>
</message>
<message>
<location line="+11"/>
<source>Deploying</source>
- <translation type="unfinished"></translation>
+ <translation>Instalowanie</translation>
</message>
<message>
<location line="+40"/>
<source>Renaming new package '%1' to '%2'</source>
- <translation type="unfinished"></translation>
+ <translation>Zmienianie nazwy pakietu "%1" na "%2"</translation>
</message>
<message>
<location line="+6"/>
<source>Removing old package '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Usuwanie starego pakietu "%1"</translation>
</message>
<message>
<location line="+9"/>
<source>Package file not found</source>
- <translation type="unfinished"></translation>
+ <translation>Plik pakietu nie został odnaleziony</translation>
</message>
<message>
<location line="+8"/>
<source>Failed to find package '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odnaleźć pakietu "%1": %2</translation>
</message>
<message>
<location line="+71"/>
@@ -15126,7 +15148,7 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<message>
<location line="+100"/>
<source>The device '%1' has been disconnected</source>
- <translation type="unfinished"></translation>
+ <translation>Urządzenie "%1" zostało odłączone</translation>
</message>
<message>
<source>%1% copied.</source>
@@ -15228,7 +15250,7 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<message>
<location line="+2"/>
<source>Qt Symbian Emulator RunConfiguration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja uruchamiania emulatora Qt Symbian</translation>
</message>
<message>
<source>QtSymbianEmulatorRunConfiguration</source>
@@ -15362,7 +15384,7 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<message>
<location line="+37"/>
<source>Error while reading PRO file %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d podczas czytania pliku PRO %1: %2</translation>
</message>
<message>
<source>Error while parsing file %1. Giving up.</source>
@@ -15454,17 +15476,17 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<message>
<location line="+10"/>
<source>Build</source>
- <translation type="unfinished">Budowanie</translation>
+ <translation>Budowanie</translation>
</message>
<message>
<location line="+38"/>
<source>Run qmake in %1</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom qmake w %1</translation>
</message>
<message>
<location line="+1"/>
<source>Build in %1</source>
- <translation type="unfinished"></translation>
+ <translation>Zbuduj w %1</translation>
</message>
</context>
<context>
@@ -15480,22 +15502,22 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4runconfiguration.cpp" line="+533"/>
<source>Clean Environment</source>
- <translation type="unfinished">Czyste środowisko</translation>
+ <translation>Czyste środowisko</translation>
</message>
<message>
<location line="+2"/>
<source>System Environment</source>
- <translation type="unfinished">Åšrodowisko systemowe</translation>
+ <translation>Åšrodowisko systemowe</translation>
</message>
<message>
<location line="+2"/>
<source>Build Environment</source>
- <translation type="unfinished">Åšrodowisko budowania</translation>
+ <translation>Åšrodowisko budowania</translation>
</message>
<message>
<location line="+114"/>
<source>Qt4 RunConfiguration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja uruchamiania Qt4</translation>
</message>
</context>
<context>
@@ -15676,7 +15698,7 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<message>
<location line="+9"/>
<source>Select qmake Executable</source>
- <translation type="unfinished"></translation>
+ <translation>Wskaż program qmake</translation>
</message>
<message>
<location line="+2"/>
@@ -15696,7 +15718,7 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<message>
<location line="+2"/>
<source>Select the CSL ARM Toolchain (GCCE) Directory</source>
- <translation type="unfinished"></translation>
+ <translation>Wskaż katalog zestawu narzędzi CSL ARM (GCCE)</translation>
</message>
<message>
<location line="+11"/>
@@ -15717,41 +15739,47 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<location line="+63"/>
<source><html><body><table><tr><td>File:</td><td><pre>%1</pre></td></tr><tr><td>Last&nbsp;modified:</td><td>%2</td></tr><tr><td>Size:</td><td>%3 Bytes</td></tr></table></body></html></source>
<extracomment>Tooltip showing the debugging helper library file.</extracomment>
- <translation type="unfinished"></translation>
+ <translation><html><body><table><tr><td>Plik:</td><td><pre>%1</pre></td></tr><tr><td>Ostatnio&nbsp;zmodyfikowany:</td><td>%2</td></tr><tr><td>Rozmiar:</td><td>%3 Bajtów</td></tr></table></body></html></translation>
</message>
<message>
<location line="+103"/>
<source>This Qt Version has a unknown toolchain.</source>
- <translation type="unfinished"></translation>
+ <translation>Ta wersja Qt posiada nieznany zestaw narzędzi.</translation>
</message>
<message>
<location line="+44"/>
<source>Desktop</source>
<comment>Qt Version is meant for the desktop</comment>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+3"/>
<source>Symbian</source>
<comment>Qt Version is meant for Symbian</comment>
- <translation type="unfinished"></translation>
+ <translation>Symbian</translation>
</message>
<message>
<location line="+2"/>
<source>Maemo</source>
<comment>Qt Version is meant for Maemo</comment>
- <translation type="unfinished"></translation>
+ <translation>Maemo</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Qt Simulator</source>
+ <comment>Qt Version is meant for Qt Simulator</comment>
+ <translation>Symulator Qt</translation>
</message>
<message>
<location line="+2"/>
<source>unkown</source>
<comment>No idea what this Qt Version is meant for!</comment>
- <translation type="unfinished"></translation>
+ <translation>nieznana</translation>
</message>
<message>
<location line="+1"/>
<source>Found Qt version %1, using mkspec %2 (%3)</source>
- <translation type="unfinished"></translation>
+ <translation>Znaleziono wersję Qt %1 używającą mkspec %2 (%3)</translation>
</message>
<message>
<source>The Qt Version identified by %1 is not installed. Run make install</source>
@@ -15769,7 +15797,7 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<context>
<name>Qt4ProjectManager::QtVersionManager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+387"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+388"/>
<source><not found></source>
<translation><nie znaleziony></translation>
</message>
@@ -15829,13 +15857,13 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<location filename="../../../src/plugins/help/helpplugin.cpp" line="-520"/>
<source>EditorManager</source>
<comment>Next Open Document in History</comment>
- <translation type="unfinished"></translation>
+ <translation>Manager edytorów</translation>
</message>
<message>
<location line="+8"/>
<source>EditorManager</source>
<comment>Previous Open Document in History</comment>
- <translation type="unfinished"></translation>
+ <translation>Manager edytorów</translation>
</message>
</context>
<context>
@@ -15902,7 +15930,7 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<message>
<location line="+2"/>
<source>Specify basic information about the classes for which you want to generate skeleton source code files.</source>
- <translation>Podaj podstawowe informacje o klasach dla których chcesz wygenerować szkielet dla plików z kodem źródłowym.</translation>
+ <translation>Podaj podstawowe informacje o klasach dla których chcesz wygenerować szkielet plików z kodem źródłowym.</translation>
</message>
</context>
<context>
@@ -16451,17 +16479,17 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<message>
<location line="+6"/>
<source>Repository Status</source>
- <translation type="unfinished"></translation>
+ <translation>Stan składnicy</translation>
</message>
<message>
<location line="+6"/>
<source>Log Repository</source>
- <translation type="unfinished"></translation>
+ <translation>Dziennik składnicy</translation>
</message>
<message>
<location line="+6"/>
<source>Update Repository</source>
- <translation type="unfinished"></translation>
+ <translation>Uaktualnij składnicę</translation>
</message>
<message>
<location line="+13"/>
@@ -16476,22 +16504,22 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<message>
<location line="-26"/>
<source>Delete...</source>
- <translation type="unfinished">Usuń...</translation>
+ <translation>Usuń...</translation>
</message>
<message>
<location line="+0"/>
<source>Delete "%1"...</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń "%1"...</translation>
</message>
<message>
<location line="+8"/>
<source>Revert...</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany...</translation>
</message>
<message>
<location line="+0"/>
<source>Revert "%1"...</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany w "%1"...</translation>
</message>
<message>
<location line="+10"/>
@@ -16501,7 +16529,7 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<message>
<location line="+8"/>
<source>Status of Project "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż stan projektu "%1"</translation>
</message>
<message>
<location line="+8"/>
@@ -16516,17 +16544,17 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<message>
<location line="+7"/>
<source>Update Project</source>
- <translation>Odśwież projekt</translation>
+ <translation>Uaktualnij projekt</translation>
</message>
<message>
<location line="+0"/>
<source>Update Project "%1"</source>
- <translation>Odśwież projekt "%1"</translation>
+ <translation>Uaktualnij projekt "%1"</translation>
</message>
<message>
<location line="+52"/>
<source>Revert Repository...</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany w składnicy...</translation>
</message>
<message>
<location line="+11"/>
@@ -16566,17 +16594,17 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<message>
<location line="+131"/>
<source>Revert repository</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany w składnicy</translation>
</message>
<message>
<location line="+1"/>
<source>Would you like to revert all changes to the repository?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy chcesz odwrócić wszystkie zmiany w składnicy?</translation>
</message>
<message>
<location line="+8"/>
<source>Revert failed: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odwrócić zmian: %1</translation>
</message>
<message>
<location line="+20"/>
@@ -16616,7 +16644,7 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<location line="+33"/>
<source>Executing in %1: %2 %3
</source>
- <translation type="unfinished">Wykonywanie w %1: %2 %3
+ <translation>Wykonywanie w %1: %2 %3
</translation>
</message>
<message>
@@ -16713,7 +16741,7 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
<context>
<name>TextEditor::BaseTextEditorEditable</name>
<message>
- <location line="+4718"/>
+ <location line="+4802"/>
<source>Line: %1, Col: %2</source>
<translation>Linia: %1, kolumna: %2</translation>
</message>
@@ -17153,7 +17181,87 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<translation>Ctrl+J</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+5"/>
+ <source>Goto Line Start</source>
+ <translation>Przejdź do początku linii</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Line End</source>
+ <translation>Przejdź do końca linii</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Next Line</source>
+ <translation>Przejdź do następnej linii</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Previous Line</source>
+ <translation>Przejdź do poprzedniej linii</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Previous Character</source>
+ <translation>Przejdź do poprzedniego znaku</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Next Character</source>
+ <translation>Przejdź do następnego znaku</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Previous Word</source>
+ <translation>Przejdź do poprzedniego słowa</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Next Word</source>
+ <translation>Przejdź do następnego słowa</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Goto Line Start With Selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Line End With Selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Next Line With Selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Previous Line With Selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Previous Character With Selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Next Character With Selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Previous Word With Selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Goto Next Word With Selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+96"/>
<source><line number></source>
<translation><numer linii></translation>
</message>
@@ -17163,42 +17271,42 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<message>
<location filename="../../../src/plugins/texteditor/texteditorplugin.cpp" line="+94"/>
<source>Creates a text file (.txt).</source>
- <translation type="unfinished">Tworzy plik tekstowy (.txt).</translation>
+ <translation>Tworzy plik tekstowy (.txt).</translation>
</message>
<message>
<location line="+1"/>
<source>Text File</source>
- <translation type="unfinished">Plik tekstowy</translation>
+ <translation>Plik tekstowy</translation>
</message>
<message>
<location line="+2"/>
<source>General</source>
- <translation type="unfinished">Ogólne</translation>
+ <translation>Ogólne</translation>
</message>
<message>
<location line="+26"/>
<source>Triggers a completion in this scope</source>
- <translation type="unfinished">Przełącza uzupełnianie kody w tym zakresie</translation>
+ <translation>Przełącza uzupełnianie kodu w tym zakresie</translation>
</message>
<message>
<location line="+5"/>
<source>Ctrl+Space</source>
- <translation type="unfinished">Ctrl+Space</translation>
+ <translation>Ctrl+Space</translation>
</message>
<message>
<location line="+2"/>
<source>Meta+Space</source>
- <translation type="unfinished">Meta+Space</translation>
+ <translation>Meta+Space</translation>
</message>
<message>
<location line="+6"/>
<source>Triggers a quick fix in this scope</source>
- <translation type="unfinished">Uaktywnia w tym zakresie szybkÄ… poprawkÄ™</translation>
+ <translation>Uaktywnia w tym zakresie szybkÄ… poprawkÄ™</translation>
</message>
<message>
<location line="+4"/>
<source>Alt+Return</source>
- <translation type="unfinished">Alt+Return</translation>
+ <translation>Alt+Return</translation>
</message>
</context>
<context>
@@ -17498,7 +17606,7 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<message>
<location line="+2"/>
<source>Project from Version Control</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt z systemu kontroli wersji</translation>
</message>
</context>
<context>
@@ -17604,7 +17712,7 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<message>
<location filename="../../../src/plugins/welcome/communitywelcomepage.h" line="+49"/>
<source>News && Support</source>
- <translation type="unfinished"></translation>
+ <translation>Nowiny i wsparcie</translation>
</message>
</context>
<context>
@@ -17705,7 +17813,7 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<message>
<location filename="../../../src/plugins/help/helpviewer.cpp" line="+51"/>
<source><title>about:blank</title></source>
- <translation type="unfinished"></translation>
+ <translation><title>o:pusty</title></translation>
</message>
<message>
<location line="+3"/>
@@ -17834,7 +17942,7 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<message>
<location line="-9"/>
<source>Invalid file location</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawne położenie pliku</translation>
</message>
<message>
<location line="+11"/>
@@ -17960,7 +18068,7 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<message>
<location line="+3"/>
<source>&New...</source>
- <translation type="unfinished"></translation>
+ <translation>&Nowy...</translation>
</message>
<message>
<location line="+1"/>
@@ -17970,7 +18078,7 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<message>
<location line="+4"/>
<source>&Open...</source>
- <translation type="unfinished"></translation>
+ <translation>&Otwórz...</translation>
</message>
<message>
<location line="+1"/>
@@ -18000,7 +18108,7 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<message>
<location line="+7"/>
<source>&Preview</source>
- <translation type="unfinished"></translation>
+ <translation>&PodglÄ…d</translation>
</message>
<message>
<location line="+1"/>
@@ -18020,7 +18128,7 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<message>
<location line="+11"/>
<source>&Quit</source>
- <translation type="unfinished"></translation>
+ <translation>Za&kończ</translation>
</message>
<message>
<location line="+6"/>
@@ -18050,7 +18158,7 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<message>
<location line="+6"/>
<source>&Cut</source>
- <translation type="unfinished"></translation>
+ <translation>Wy&tnij</translation>
</message>
<message>
<location line="+6"/>
@@ -18060,7 +18168,7 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<message>
<location line="+6"/>
<source>&Delete</source>
- <translation type="unfinished"></translation>
+ <translation>&Usuń</translation>
</message>
<message>
<location line="+2"/>
@@ -18075,7 +18183,7 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<message>
<location line="+5"/>
<source>&View</source>
- <translation type="unfinished"></translation>
+ <translation>&Widok</translation>
</message>
<message>
<location line="+59"/>
@@ -18085,7 +18193,7 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<message>
<location line="+4"/>
<source>&About...</source>
- <translation type="unfinished"></translation>
+ <translation>Inform&acje o...</translation>
</message>
<message>
<location line="+51"/>
@@ -18095,7 +18203,7 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<message>
<location line="+94"/>
<source>Could not open file <%1></source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć pliku <%1></translation>
</message>
<message>
<location line="+107"/>
@@ -18209,7 +18317,7 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<translation type="obsolete">nieznany</translation>
</message>
<message>
- <location filename="../../../../creator-build-20/share/qtcreator/translations/mime_tr.h" line="+14"/>
+ <location filename="../../../../creator-20-build/share/qtcreator/translations/mime_tr.h" line="+14"/>
<source>CMake Project file</source>
<translation>Plik projektu CMake</translation>
</message>
@@ -18315,72 +18423,72 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
<message>
<location line="-29"/>
<source>BMP image</source>
- <translation type="unfinished"></translation>
+ <translation>Plik graficzny BMP</translation>
</message>
<message>
<location line="+1"/>
<source>GIF image</source>
- <translation type="unfinished"></translation>
+ <translation>Plik graficzny GIF</translation>
</message>
<message>
<location line="+1"/>
<source>ICO image</source>
- <translation type="unfinished"></translation>
+ <translation>Plik graficzny ICO</translation>
</message>
<message>
<location line="+1"/>
<source>JPEG image</source>
- <translation type="unfinished"></translation>
+ <translation>Plik graficzny JPEG</translation>
</message>
<message>
<location line="+1"/>
<source>MNG video</source>
- <translation type="unfinished"></translation>
+ <translation>Plik wideo MNG</translation>
</message>
<message>
<location line="+1"/>
<source>PBM image</source>
- <translation type="unfinished"></translation>
+ <translation>Plik graficzny PBM</translation>
</message>
<message>
<location line="+1"/>
<source>PGM image</source>
- <translation type="unfinished"></translation>
+ <translation>Plik graficzny PGM</translation>
</message>
<message>
<location line="+1"/>
<source>PNG image</source>
- <translation type="unfinished"></translation>
+ <translation>Plik graficzny PNG</translation>
</message>
<message>
<location line="+1"/>
<source>PPM image</source>
- <translation type="unfinished"></translation>
+ <translation>Plik graficzny PPM</translation>
</message>
<message>
<location line="+1"/>
<source>SVG image</source>
- <translation type="unfinished"></translation>
+ <translation>Plik graficzny SVG</translation>
</message>
<message>
<location line="+1"/>
<source>TIFF image</source>
- <translation type="unfinished"></translation>
+ <translation>Plik graficzny TIFF</translation>
</message>
<message>
<location line="+1"/>
<source>XBM image</source>
- <translation type="unfinished"></translation>
+ <translation>Plik graficzny XBM</translation>
</message>
<message>
<location line="+1"/>
<source>XPM image</source>
- <translation type="unfinished"></translation>
+ <translation>Plik graficzny XPM</translation>
</message>
<message>
<location line="+18"/>
<source>QML Project file</source>
- <translation type="unfinished"></translation>
+ <translation>Plik projektu QML</translation>
</message>
<message>
<location line="+4"/>
@@ -18527,7 +18635,7 @@ aktywny tylko po wpisaniu przedrostka</translation>
<message>
<location/>
<source>Refresh interval:</source>
- <translation type="unfinished"></translation>
+ <translation>Odświeżanie co:</translation>
</message>
</context>
<context>
@@ -18567,21 +18675,21 @@ aktywny tylko po wpisaniu przedrostka</translation>
<message>
<location line="+30"/>
<source>%1 filter update: 0 files</source>
- <translation>Odświeżenie filtra %1: 0 plików</translation>
+ <translation>Uaktualnienie filtra %1: 0 plików</translation>
</message>
<message numerus="yes">
<location line="+23"/>
<source>%1 filter update: %n files</source>
<translation>
- <numerusform>Odświeżenie filtra %1: %n plik</numerusform>
- <numerusform>Odświeżenie filtra %1: %n pliki</numerusform>
- <numerusform>Odświeżenie filtra %1: %n plików</numerusform>
+ <numerusform>Uaktualnienie filtra %1: %n plik</numerusform>
+ <numerusform>Uaktualnienie filtra %1: %n pliki</numerusform>
+ <numerusform>Uaktualnienie filtra %1: %n plików</numerusform>
</translation>
</message>
<message>
<location line="+41"/>
<source>%1 filter update: canceled</source>
- <translation>Odświeżenie filtra %1: anulowano</translation>
+ <translation>Uaktualnienie filtra %1: anulowano</translation>
</message>
</context>
<context>
@@ -18652,7 +18760,7 @@ aktywny tylko po wpisaniu przedrostka</translation>
<message>
<location line="+1"/>
<source>Options</source>
- <translation type="unfinished">Opcje</translation>
+ <translation>Opcje</translation>
</message>
<message>
<location line="+179"/>
@@ -18910,7 +19018,7 @@ aktywny tylko po wpisaniu przedrostka</translation>
<message>
<location filename="../../../src/plugins/coreplugin/actionmanager/commandmappings.ui"/>
<source>Command Mappings</source>
- <translation type="unfinished"></translation>
+ <translation>Mapa komend</translation>
</message>
<message>
<source>Filter:</source>
@@ -18929,7 +19037,7 @@ aktywny tylko po wpisaniu przedrostka</translation>
<message>
<location/>
<source>Target</source>
- <translation type="unfinished"></translation>
+ <translation>Produkt docelowy</translation>
</message>
<message>
<location/>
@@ -18949,12 +19057,12 @@ aktywny tylko po wpisaniu przedrostka</translation>
<message>
<location/>
<source>Target Identifier</source>
- <translation type="unfinished"></translation>
+ <translation>Identyfikator produktu docelowego</translation>
</message>
<message>
<location/>
<source>Target:</source>
- <translation type="unfinished"></translation>
+ <translation>Produkt docelowy:</translation>
</message>
<message>
<source>Remove</source>
@@ -18963,7 +19071,7 @@ aktywny tylko po wpisaniu przedrostka</translation>
<message>
<location/>
<source>Reset</source>
- <translation type="unfinished">Przywróć</translation>
+ <translation>Przywróć</translation>
</message>
</context>
<context>
@@ -19102,27 +19210,27 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/mercurial/mercurialcommitpanel.ui"/>
<source>General Information</source>
- <translation type="unfinished">Ogólne informacje</translation>
+ <translation>Ogólne informacje</translation>
</message>
<message>
<location/>
<source>Repository:</source>
- <translation type="unfinished">Składnica:</translation>
+ <translation>Składnica:</translation>
</message>
<message>
<location/>
<source>repository</source>
- <translation type="unfinished">składnica</translation>
+ <translation>składnica</translation>
</message>
<message>
<location/>
<source>Branch:</source>
- <translation type="unfinished">Gałąź:</translation>
+ <translation>Gałąź:</translation>
</message>
<message>
<location/>
<source>branch</source>
- <translation type="unfinished">gałąź</translation>
+ <translation>gałąź</translation>
</message>
<message>
<location/>
@@ -19132,12 +19240,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>Author:</source>
- <translation type="unfinished">Autor:</translation>
+ <translation>Autor:</translation>
</message>
<message>
<location/>
<source>Email:</source>
- <translation type="unfinished">Email:</translation>
+ <translation>Email:</translation>
</message>
</context>
<context>
@@ -19145,22 +19253,22 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/mercurial/optionspage.ui"/>
<source>Form</source>
- <translation type="unfinished">Formularz</translation>
+ <translation>Formularz</translation>
</message>
<message>
<location/>
<source>Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja</translation>
</message>
<message>
<location/>
<source>Command:</source>
- <translation type="unfinished">Komenda:</translation>
+ <translation>Komenda:</translation>
</message>
<message>
<location/>
<source>User</source>
- <translation type="unfinished"></translation>
+ <translation>Użytkownik</translation>
</message>
<message>
<location/>
@@ -19170,7 +19278,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>Default username:</source>
- <translation type="unfinished"></translation>
+ <translation>Domyślna nazwa użytkownika:</translation>
</message>
<message>
<location/>
@@ -19180,12 +19288,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>Default Email:</source>
- <translation type="unfinished"></translation>
+ <translation>Domyślny adres email:</translation>
</message>
<message>
<location/>
<source>Miscellaneous</source>
- <translation type="unfinished"></translation>
+ <translation>Różne</translation>
</message>
<message>
<location/>
@@ -19205,17 +19313,17 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>s</source>
- <translation type="unfinished"></translation>
+ <translation>s</translation>
</message>
<message>
<location/>
<source>Prompt on submit</source>
- <translation type="unfinished"></translation>
+ <translation>Pytaj przed wysłaniem zmian do serwera</translation>
</message>
<message>
<location filename="../../../src/plugins/mercurial/optionspage.cpp" line="+97"/>
<source>Mercurial</source>
- <translation type="unfinished">Mercurial</translation>
+ <translation>Mercurial</translation>
</message>
</context>
<context>
@@ -19223,7 +19331,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/mercurial/revertdialog.ui"/>
<source>Revert</source>
- <translation type="unfinished">Odwróć zmiany</translation>
+ <translation>Odwróć zmiany</translation>
</message>
<message>
<location/>
@@ -19233,7 +19341,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>Revision:</source>
- <translation type="unfinished"></translation>
+ <translation>Poprawka:</translation>
</message>
</context>
<context>
@@ -19251,12 +19359,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>Local filesystem:</source>
- <translation type="unfinished"></translation>
+ <translation>Lokalny system plików:</translation>
</message>
<message>
<location/>
<source>e.g. https://[user[:pass]@]host[:port]/[path]</source>
- <translation type="unfinished"></translation>
+ <translation>np. https://[użytkownik[:hasło]@]host[:port]/[ścieżka]</translation>
</message>
<message>
<location/>
@@ -19269,12 +19377,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/addtargetdialog.ui"/>
<source>Add target</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj produkt docelowy</translation>
</message>
<message>
<location/>
<source>Target:</source>
- <translation type="unfinished"></translation>
+ <translation>Produkt docelowy:</translation>
</message>
</context>
<context>
@@ -19282,7 +19390,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/doubletabwidget.ui"/>
<source>DoubleTabWidget</source>
- <translation type="unfinished"></translation>
+ <translation>PodwójnyTabWidżet</translation>
</message>
</context>
<context>
@@ -19290,7 +19398,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/targetsettingswidget.ui"/>
<source>TargetSettingsWidget</source>
- <translation type="unfinished"></translation>
+ <translation>WidżetDoUstawieńProduktuDocelowego</translation>
</message>
</context>
<context>
@@ -19389,7 +19497,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop.</source>
- <translation type="unfinished"></translation>
+ <translation>Ten obszar pokazuje podgląd edytowanego gradientu. Możesz tutaj również zmieniać parametry specyficzne dla typu gradientu, takie jak: punkt początkowy i końcowy, promień, itp... poprzez przeciągnięcie i upuszczenie uchwytu.</translation>
</message>
<message>
<location/>
@@ -19419,12 +19527,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>Gradient Stops Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Edytor punktów gradientu</translation>
</message>
<message>
<location/>
<source>This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions.</source>
- <translation type="unfinished"></translation>
+ <translation>Ten obszar pozwala na edycję punktów gradientu. Aby skopiować istniejący punkt kliknij dwukrotnie na jego uchwyt. W celu stworzenia nowego punktu kliknij dwukrotnie poza istniejącymi uchwytami punków. Przeciągnij i upuść uchwyt aby go przesunąć. Naciśnij prawy przycisk myszy aby pokazać menu z dodatkowymi akcjami.</translation>
</message>
<message>
<location/>
@@ -19434,37 +19542,37 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>Reset Zoom</source>
- <translation type="unfinished"></translation>
+ <translation>Normalny rozmiar</translation>
</message>
<message>
<location/>
<source>Position</source>
- <translation type="unfinished"></translation>
+ <translation>Pozycja</translation>
</message>
<message>
<location/>
<source>Hue</source>
- <translation type="unfinished"></translation>
+ <translation>Barwa</translation>
</message>
<message>
<location/>
<source>H</source>
- <translation type="unfinished"></translation>
+ <translation>H</translation>
</message>
<message>
<location/>
<source>Saturation</source>
- <translation type="unfinished"></translation>
+ <translation>Nasycenie</translation>
</message>
<message>
<location/>
<source>S</source>
- <translation type="unfinished"></translation>
+ <translation>S</translation>
</message>
<message>
<location/>
<source>Sat</source>
- <translation type="unfinished"></translation>
+ <translation>Nasycenie</translation>
</message>
<message>
<location/>
@@ -19474,22 +19582,22 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>V</source>
- <translation type="unfinished"></translation>
+ <translation>V</translation>
</message>
<message>
<location/>
<source>Val</source>
- <translation type="unfinished"></translation>
+ <translation>Wartość</translation>
</message>
<message>
<location/>
<source>Alpha</source>
- <translation type="unfinished"></translation>
+ <translation>Kanał alfa</translation>
</message>
<message>
<location/>
<source>A</source>
- <translation type="unfinished"></translation>
+ <translation>A</translation>
</message>
<message>
<location/>
@@ -19499,72 +19607,72 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>Spread</source>
- <translation type="unfinished"></translation>
+ <translation>RozciÄ…ganie</translation>
</message>
<message>
<location/>
<source>Color</source>
- <translation type="unfinished"></translation>
+ <translation>Kolor</translation>
</message>
<message>
<location/>
<source>Current stop's color</source>
- <translation type="unfinished"></translation>
+ <translation>Kolor bieżącego punktu</translation>
</message>
<message>
<location/>
<source>Show HSV specification</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż specyfikację HSV</translation>
</message>
<message>
<location/>
<source>HSV</source>
- <translation type="unfinished"></translation>
+ <translation>HSV</translation>
</message>
<message>
<location/>
<source>Show RGB specification</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż specyfikację RGB</translation>
</message>
<message>
<location/>
<source>RGB</source>
- <translation type="unfinished"></translation>
+ <translation>RGB</translation>
</message>
<message>
<location/>
<source>Current stop's position</source>
- <translation type="unfinished"></translation>
+ <translation>Pozycja bieżącego punktu</translation>
</message>
<message>
<location/>
<source>%</source>
- <translation type="unfinished"></translation>
+ <translation>%</translation>
</message>
<message>
<location/>
<source>Zoom In</source>
- <translation type="unfinished"></translation>
+ <translation>Powiększ</translation>
</message>
<message>
<location/>
<source>Zoom Out</source>
- <translation type="unfinished"></translation>
+ <translation>Pomniejsz</translation>
</message>
<message>
<location/>
<source>Toggle details extension</source>
- <translation type="unfinished"></translation>
+ <translation>Przełącz rozszerzenie ze szczegółami</translation>
</message>
<message>
<location/>
<source>></source>
- <translation type="unfinished"></translation>
+ <translation>></translation>
</message>
<message>
<location/>
<source>Linear Type</source>
- <translation type="unfinished"></translation>
+ <translation>Typ liniowy</translation>
</message>
<message>
<location/>
@@ -19574,109 +19682,109 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>Radial Type</source>
- <translation type="unfinished"></translation>
+ <translation>Typ radialny</translation>
</message>
<message>
<location/>
<source>Conical Type</source>
- <translation type="unfinished"></translation>
+ <translation>Typ stożkowy</translation>
</message>
<message>
<location/>
<source>Pad Spread</source>
- <translation type="unfinished"></translation>
+ <translation>Powtarzaj punkt brzegowy</translation>
</message>
<message>
<location/>
<source>Repeat Spread</source>
- <translation type="unfinished"></translation>
+ <translation>Powtarzaj cały zakres</translation>
</message>
<message>
<location/>
<source>Reflect Spread</source>
- <translation type="unfinished"></translation>
+ <translation>Powtarzaj z odbiciami</translation>
</message>
<message>
<location filename="../../../src/plugins/qmldesigner/components/propertyeditor/gradienteditor.cpp" line="+412"/>
<source>Start X</source>
- <translation type="unfinished"></translation>
+ <translation>PoczÄ…tek X</translation>
</message>
<message>
<location line="+4"/>
<source>Start Y</source>
- <translation type="unfinished"></translation>
+ <translation>PoczÄ…tek Y</translation>
</message>
<message>
<location line="+4"/>
<source>Final X</source>
- <translation type="unfinished"></translation>
+ <translation>Koniec X</translation>
</message>
<message>
<location line="+4"/>
<source>Final Y</source>
- <translation type="unfinished"></translation>
+ <translation>Koniec Y</translation>
</message>
<message>
<location line="+7"/>
<location line="+24"/>
<source>Central X</source>
- <translation type="unfinished"></translation>
+ <translation>Åšrodek X</translation>
</message>
<message>
<location line="-20"/>
<location line="+24"/>
<source>Central Y</source>
- <translation type="unfinished"></translation>
+ <translation>Åšrodek Y</translation>
</message>
<message>
<location line="-20"/>
<source>Focal X</source>
- <translation type="unfinished"></translation>
+ <translation>Ogniskowa X</translation>
</message>
<message>
<location line="+4"/>
<source>Focal Y</source>
- <translation type="unfinished"></translation>
+ <translation>Ogniskowa Y</translation>
</message>
<message>
<location line="+4"/>
<source>Radius</source>
- <translation type="unfinished"></translation>
+ <translation>Promień</translation>
</message>
<message>
<location line="+16"/>
<source>Angle</source>
- <translation type="unfinished"></translation>
+ <translation>KÄ…t</translation>
</message>
<message>
<location line="+288"/>
<source>Linear</source>
- <translation type="unfinished"></translation>
+ <translation>Liniowy</translation>
</message>
<message>
<location line="+1"/>
<source>Radial</source>
- <translation type="unfinished"></translation>
+ <translation>Radialny</translation>
</message>
<message>
<location line="+1"/>
<source>Conical</source>
- <translation type="unfinished"></translation>
+ <translation>Stożkowy</translation>
</message>
<message>
<location line="+20"/>
<source>Pad</source>
- <translation type="unfinished"></translation>
+ <translation>Brak</translation>
</message>
<message>
<location line="+1"/>
<source>Repeat</source>
- <translation type="unfinished"></translation>
+ <translation>Powtórzone</translation>
</message>
<message>
<location line="+1"/>
<source>Reflect</source>
- <translation type="unfinished"></translation>
+ <translation>Odbite</translation>
</message>
</context>
<context>
@@ -19697,12 +19805,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>Gradient Editor</source>
- <translation type="unfinished">Edytor gradientu</translation>
+ <translation>Edytor gradientu</translation>
</message>
<message>
<location/>
<source>This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop.</source>
- <translation type="unfinished"></translation>
+ <translation>Ten obszar pokazuje podgląd edytowanego gradientu. Możesz tutaj również zmieniać parametry specyficzne dla typu gradientu, takie jak: punkt początkowy i końcowy, promień, itp... poprzez przeciągnięcie i upuszczenie uchwytu.</translation>
</message>
<message>
<location/>
@@ -19732,12 +19840,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>Gradient Stops Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Edytor punktów gradientu</translation>
</message>
<message>
<location/>
<source>This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions.</source>
- <translation type="unfinished"></translation>
+ <translation>Ten obszar pozwala na edycję punktów gradientu. Aby skopiować istniejący punkt kliknij dwukrotnie na jego uchwyt. W celu stworzenia nowego punktu kliknij dwukrotnie poza istniejącymi uchwytami punków. Przeciągnij i upuść uchwyt aby go przesunąć. Naciśnij prawy przycisk myszy aby pokazać menu z dodatkowymi akcjami.</translation>
</message>
<message>
<location/>
@@ -19747,37 +19855,37 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>Reset Zoom</source>
- <translation type="unfinished"></translation>
+ <translation>Normalny rozmiar</translation>
</message>
<message>
<location/>
<source>Position</source>
- <translation type="unfinished"></translation>
+ <translation>Pozycja</translation>
</message>
<message>
<location/>
<source>Hue</source>
- <translation type="unfinished"></translation>
+ <translation>Barwa</translation>
</message>
<message>
<location/>
<source>H</source>
- <translation type="unfinished"></translation>
+ <translation>H</translation>
</message>
<message>
<location/>
<source>Saturation</source>
- <translation type="unfinished"></translation>
+ <translation>Nasycenie</translation>
</message>
<message>
<location/>
<source>S</source>
- <translation type="unfinished"></translation>
+ <translation>S</translation>
</message>
<message>
<location/>
<source>Sat</source>
- <translation type="unfinished"></translation>
+ <translation>Nasycenie</translation>
</message>
<message>
<location/>
@@ -19787,22 +19895,22 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>V</source>
- <translation type="unfinished"></translation>
+ <translation>V</translation>
</message>
<message>
<location/>
<source>Val</source>
- <translation type="unfinished"></translation>
+ <translation>Wartość</translation>
</message>
<message>
<location/>
<source>Alpha</source>
- <translation type="unfinished"></translation>
+ <translation>Kanał alfa</translation>
</message>
<message>
<location/>
<source>A</source>
- <translation type="unfinished"></translation>
+ <translation>A</translation>
</message>
<message>
<location/>
@@ -19812,72 +19920,72 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>Spread</source>
- <translation type="unfinished"></translation>
+ <translation>RozciÄ…ganie</translation>
</message>
<message>
<location/>
<source>Color</source>
- <translation type="unfinished"></translation>
+ <translation>Kolor</translation>
</message>
<message>
<location/>
<source>Current stop's color</source>
- <translation type="unfinished"></translation>
+ <translation>Kolor bieżącego punktu</translation>
</message>
<message>
<location/>
<source>Show HSV specification</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż specyfikację HSV</translation>
</message>
<message>
<location/>
<source>HSV</source>
- <translation type="unfinished"></translation>
+ <translation>HSV</translation>
</message>
<message>
<location/>
<source>Show RGB specification</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż specyfikację RGB</translation>
</message>
<message>
<location/>
<source>RGB</source>
- <translation type="unfinished"></translation>
+ <translation>RGB</translation>
</message>
<message>
<location/>
<source>Current stop's position</source>
- <translation type="unfinished"></translation>
+ <translation>Pozycja bieżącego punktu</translation>
</message>
<message>
<location/>
<source>%</source>
- <translation type="unfinished"></translation>
+ <translation>%</translation>
</message>
<message>
<location/>
<source>Zoom In</source>
- <translation type="unfinished"></translation>
+ <translation>Powiększ</translation>
</message>
<message>
<location/>
<source>Zoom Out</source>
- <translation type="unfinished"></translation>
+ <translation>Pomniejsz</translation>
</message>
<message>
<location/>
<source>Toggle details extension</source>
- <translation type="unfinished"></translation>
+ <translation>Przełącz rozszerzenie ze szczegółami</translation>
</message>
<message>
<location/>
<source>></source>
- <translation type="unfinished"></translation>
+ <translation>></translation>
</message>
<message>
<location/>
<source>Linear Type</source>
- <translation type="unfinished"></translation>
+ <translation>Typ liniowy</translation>
</message>
<message>
<location/>
@@ -19887,109 +19995,109 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>Radial Type</source>
- <translation type="unfinished"></translation>
+ <translation>Typ radialny</translation>
</message>
<message>
<location/>
<source>Conical Type</source>
- <translation type="unfinished"></translation>
+ <translation>Typ stożkowy</translation>
</message>
<message>
<location/>
<source>Pad Spread</source>
- <translation type="unfinished"></translation>
+ <translation>Powtarzaj punkt brzegowy</translation>
</message>
<message>
<location/>
<source>Repeat Spread</source>
- <translation type="unfinished"></translation>
+ <translation>Powtarzaj cały zakres</translation>
</message>
<message>
<location/>
<source>Reflect Spread</source>
- <translation type="unfinished"></translation>
+ <translation>Powtarzaj z odbiciami</translation>
</message>
<message>
<location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradienteditor.cpp" line="+431"/>
<source>Start X</source>
- <translation type="unfinished"></translation>
+ <translation>PoczÄ…tek X</translation>
</message>
<message>
<location line="+4"/>
<source>Start Y</source>
- <translation type="unfinished"></translation>
+ <translation>PoczÄ…tek Y</translation>
</message>
<message>
<location line="+4"/>
<source>Final X</source>
- <translation type="unfinished"></translation>
+ <translation>Koniec X</translation>
</message>
<message>
<location line="+4"/>
<source>Final Y</source>
- <translation type="unfinished"></translation>
+ <translation>Koniec Y</translation>
</message>
<message>
<location line="+7"/>
<location line="+24"/>
<source>Central X</source>
- <translation type="unfinished"></translation>
+ <translation>Åšrodek X</translation>
</message>
<message>
<location line="-20"/>
<location line="+24"/>
<source>Central Y</source>
- <translation type="unfinished"></translation>
+ <translation>Åšrodek Y</translation>
</message>
<message>
<location line="-20"/>
<source>Focal X</source>
- <translation type="unfinished"></translation>
+ <translation>Ogniskowa X</translation>
</message>
<message>
<location line="+4"/>
<source>Focal Y</source>
- <translation type="unfinished"></translation>
+ <translation>Ogniskowa Y</translation>
</message>
<message>
<location line="+4"/>
<source>Radius</source>
- <translation type="unfinished"></translation>
+ <translation>Promień</translation>
</message>
<message>
<location line="+16"/>
<source>Angle</source>
- <translation type="unfinished"></translation>
+ <translation>KÄ…t</translation>
</message>
<message>
<location line="+288"/>
<source>Linear</source>
- <translation type="unfinished"></translation>
+ <translation>Liniowy</translation>
</message>
<message>
<location line="+1"/>
<source>Radial</source>
- <translation type="unfinished"></translation>
+ <translation>Radialny</translation>
</message>
<message>
<location line="+1"/>
<source>Conical</source>
- <translation type="unfinished"></translation>
+ <translation>Stożkowy</translation>
</message>
<message>
<location line="+20"/>
<source>Pad</source>
- <translation type="unfinished"></translation>
+ <translation>Brak</translation>
</message>
<message>
<location line="+1"/>
<source>Repeat</source>
- <translation type="unfinished"></translation>
+ <translation>Powtórzone</translation>
</message>
<message>
<location line="+1"/>
<source>Reflect</source>
- <translation type="unfinished"></translation>
+ <translation>Odbite</translation>
</message>
</context>
<context>
@@ -19997,7 +20105,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientview.ui"/>
<source>Gradient View</source>
- <translation type="unfinished"></translation>
+ <translation>Widok gradientów</translation>
</message>
<message>
<location/>
@@ -20026,17 +20134,17 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientview.cpp" line="-104"/>
<source>Grad</source>
- <translation type="unfinished"></translation>
+ <translation>Grad</translation>
</message>
<message>
<location line="+26"/>
<source>Remove Gradient</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń gradient</translation>
</message>
<message>
<location line="+1"/>
<source>Are you sure you want to remove the selected gradient?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy chcesz usunąć zaznaczony gradient?</translation>
</message>
</context>
<context>
@@ -20045,7 +20153,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientviewdialog.ui"/>
<location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientviewdialog.h" line="+62"/>
<source>Select Gradient</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz gradient</translation>
</message>
</context>
<context>
@@ -20053,7 +20161,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmldesigner/settingspage.ui"/>
<source>Form</source>
- <translation type="unfinished">Formularz</translation>
+ <translation>Formularz</translation>
</message>
<message>
<source>Designer</source>
@@ -20062,22 +20170,22 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>Snapping</source>
- <translation type="unfinished"></translation>
+ <translation>PrzyciÄ…ganie</translation>
</message>
<message>
<location/>
<source>Item spacing</source>
- <translation type="unfinished"></translation>
+ <translation>Odstępy</translation>
</message>
<message>
<location/>
<source>Snap margin</source>
- <translation type="unfinished"></translation>
+ <translation>Margines</translation>
</message>
<message>
<location filename="../../../src/plugins/qmldesigner/settingspage.cpp" line="+83"/>
<source>Qt Quick Designer</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Quick Designer</translation>
</message>
</context>
<context>
@@ -20176,47 +20284,47 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location/>
<source>Configuration:</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja:</translation>
</message>
<message>
<location/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa</translation>
</message>
<message>
<location/>
<source>IP or host name of the device</source>
- <translation type="unfinished"></translation>
+ <translation>IP lub nazwa hosta urzÄ…dzenia</translation>
</message>
<message>
<location/>
<source>Ports:</source>
- <translation type="unfinished"></translation>
+ <translation>Porty:</translation>
</message>
<message>
<location/>
<source>SSH:</source>
- <translation type="unfinished"></translation>
+ <translation>SSH:</translation>
</message>
<message>
<location/>
<source>Gdb server:</source>
- <translation type="unfinished"></translation>
+ <translation>Server Gdb:</translation>
</message>
<message>
<location/>
<source>s</source>
- <translation type="unfinished"></translation>
+ <translation>s</translation>
</message>
<message>
<location/>
<source>Generate SSH Key ...</source>
- <translation type="unfinished"></translation>
+ <translation>Generuj klucz SSH...</translation>
</message>
<message>
<location/>
<source>Deploy Public Key ...</source>
- <translation type="unfinished"></translation>
+ <translation>Zainstaluj klucz publiczny...</translation>
</message>
</context>
<context>
@@ -20224,27 +20332,27 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.ui"/>
<source>Form</source>
- <translation type="unfinished">Formularz</translation>
+ <translation>Formularz</translation>
</message>
<message>
<location/>
<source>Self-signed certificate</source>
- <translation type="unfinished">Własnoręcznie podpisany certyfikat</translation>
+ <translation>Własnoręcznie podpisany certyfikat</translation>
</message>
<message>
<location/>
<source>Custom certificate:</source>
- <translation type="unfinished">WÅ‚asny certyfikat:</translation>
+ <translation>WÅ‚asny certyfikat:</translation>
</message>
<message>
<location/>
<source>Choose certificate file (.cer)</source>
- <translation type="unfinished">Wybierz certyfikat (.cer)</translation>
+ <translation>Wybierz certyfikat (.cer)</translation>
</message>
<message>
<location/>
<source>Key file:</source>
- <translation type="unfinished">Plik z kluczem:</translation>
+ <translation>Plik z kluczem:</translation>
</message>
</context>
<context>
@@ -20252,62 +20360,62 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/testwizardpage.ui"/>
<source>WizardPage</source>
- <translation type="unfinished">StronaKreatora</translation>
+ <translation>StronaKreatora</translation>
</message>
<message>
<location/>
<source>Specify basic information about the test class for which you want to generate skeleton source code file.</source>
- <translation type="unfinished"></translation>
+ <translation>Podaj podstawowe informacje o klasie testowej dla której chcesz wygenerować szkielet pliku z kodem źródłowym.</translation>
</message>
<message>
<location/>
<source>Class name:</source>
- <translation type="unfinished">Nazwa klasy:</translation>
+ <translation>Nazwa klasy:</translation>
</message>
<message>
<location/>
<source>Type:</source>
- <translation type="unfinished">Typ:</translation>
+ <translation>Typ:</translation>
</message>
<message>
<location/>
<source>Test</source>
- <translation type="unfinished">Przetestuj</translation>
+ <translation>Test jednostkowy</translation>
</message>
<message>
<location/>
<source>Benchmark</source>
- <translation type="unfinished"></translation>
+ <translation>Test wydajności</translation>
</message>
<message>
<location/>
<source>File:</source>
- <translation type="unfinished">Plik:</translation>
+ <translation>Plik:</translation>
</message>
<message>
<location/>
<source>Generate initialization and cleanup code</source>
- <translation type="unfinished"></translation>
+ <translation>Generuj inicjalizacjÄ™ i kod porzÄ…dkujÄ…cy</translation>
</message>
<message>
<location/>
<source>Test slot:</source>
- <translation type="unfinished"></translation>
+ <translation>Slot z testem:</translation>
</message>
<message>
<location/>
<source>Requires QApplication</source>
- <translation type="unfinished"></translation>
+ <translation>Wymaga QApplication</translation>
</message>
<message>
<location/>
<source>Use a test data set</source>
- <translation type="unfinished"></translation>
+ <translation>Użyj zestawy danych testowych</translation>
</message>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/testwizardpage.cpp" line="+46"/>
<source>Test Class Information</source>
- <translation type="unfinished"></translation>
+ <translation>Informacja o klasie testowej</translation>
</message>
</context>
<context>
@@ -20315,59 +20423,61 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/vcsbase/cleandialog.ui"/>
<source>Clean repository</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść składnicę</translation>
</message>
<message>
<location filename="../../../src/plugins/vcsbase/cleandialog.cpp" line="+68"/>
<source>The directory %1 could not be deleted.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można usunąć katalogu "%1".</translation>
</message>
<message>
<location line="+6"/>
<source>The file %1 could not be deleted.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można usunąć pliku "%1".</translation>
</message>
<message>
<location line="+36"/>
<source>There were errors when cleaning the repository %1:</source>
- <translation type="unfinished"></translation>
+ <translation>Wystąpiły błędy podczas usuwania składnicy %1:</translation>
</message>
<message>
<location line="+30"/>
<source>Delete...</source>
- <translation type="unfinished">Usuń...</translation>
+ <translation>Usuń...</translation>
</message>
<message>
<location line="+2"/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa</translation>
</message>
<message>
<location line="+18"/>
<source>Repository: %1</source>
- <translation type="unfinished">Składnica: %1</translation>
+ <translation>Składnica: %1</translation>
</message>
<message>
<location line="+30"/>
<source>%1 bytes, last modified %2</source>
- <translation type="unfinished"></translation>
+ <translation>%1 bajtów, ostatnio zmodyfikowano %2</translation>
</message>
<message>
<location line="+36"/>
<source>Delete</source>
- <translation type="unfinished">Usuń</translation>
+ <translation>Usuń</translation>
</message>
<message numerus="yes">
<location line="+1"/>
<source>Do you want to delete %n files?</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>Czy chcesz usunąć %n plik?</numerusform>
+ <numerusform>Czy chcesz usunąć %n pliki?</numerusform>
+ <numerusform>Czy chcesz usunąć %n plików?</numerusform>
</translation>
</message>
<message>
<location line="+11"/>
<source>Cleaning %1</source>
- <translation type="unfinished"></translation>
+ <translation>Czyszczenie %1</translation>
</message>
</context>
<context>
@@ -20375,7 +20485,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/libs/extensionsystem/plugindetailsview.cpp" line="+81"/>
<source>None</source>
- <translation type="unfinished">Brak</translation>
+ <translation>Brak</translation>
</message>
</context>
<context>
@@ -20385,12 +20495,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<location line="+19"/>
<location line="+58"/>
<source>Load on Startup</source>
- <translation type="unfinished"></translation>
+ <translation>Załadowany przy uruchomieniu</translation>
</message>
<message>
<location line="-70"/>
<source>Utilities</source>
- <translation type="unfinished"></translation>
+ <translation>Narzędzia</translation>
</message>
</context>
<context>
@@ -20398,7 +20508,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/libs/qmljs/qmljscheck.cpp" line="+328"/>
<source>'%1' is not a valid property name</source>
- <translation type="unfinished"></translation>
+ <translation>"%1" nie jest poprawną nazwą właściwości</translation>
</message>
<message>
<location line="-114"/>
@@ -20408,12 +20518,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+127"/>
<source>'%1' does not have members</source>
- <translation type="unfinished"></translation>
+ <translation>"%1" nie posiada składników</translation>
</message>
<message>
<location line="+16"/>
<source>'%1' is not a member of '%2'</source>
- <translation type="unfinished"></translation>
+ <translation>"%1" nie jest składnikiem "%2"</translation>
</message>
<message>
<location line="-245"/>
@@ -20428,17 +20538,17 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+4"/>
<source>value might be 'undefined'</source>
- <translation type="unfinished"></translation>
+ <translation>wartość może być "niezdefiniowana"</translation>
</message>
<message>
<location line="-37"/>
<source>numerical value expected</source>
- <translation type="unfinished"></translation>
+ <translation>oczekiwano wartości liczbowej</translation>
</message>
<message>
<location line="+11"/>
<source>boolean value expected</source>
- <translation type="unfinished"></translation>
+ <translation>oczekiwano wartości boolowskiej</translation>
</message>
<message>
<location line="+12"/>
@@ -20464,7 +20574,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="-2"/>
<source>using string literals for ids is discouraged</source>
- <translation type="unfinished"></translation>
+ <translation>używanie stałych znakowych dla identyfikatorów nie jest zalecane</translation>
</message>
<message>
<location line="+7"/>
@@ -20477,27 +20587,27 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/libs/qmljs/qmljsinterpreter.cpp" line="+342"/>
<source>The file is not module file.</source>
- <translation type="unfinished"></translation>
+ <translation>To nie jest plik modułu.</translation>
</message>
<message>
<location line="+12"/>
<source>Unexpected element <%1> in <%2></source>
- <translation type="unfinished"></translation>
+ <translation>Nieoczekiwany element <%1> w <%2></translation>
</message>
<message>
<location line="+9"/>
<source>invalid value '%1' for attribute %2 in <%3></source>
- <translation type="unfinished"></translation>
+ <translation>niepoprawna wartość "%1" dla atrybutu %2 w <%3></translation>
</message>
<message>
<location line="+4"/>
<source><%1> has no valid %2 attribute</source>
- <translation type="unfinished"></translation>
+ <translation><%1> nie posiada poprawnego atrybutu %2</translation>
</message>
<message>
<location line="+1631"/>
<source>%1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>%1: %2</translation>
</message>
</context>
<context>
@@ -20515,12 +20625,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+8"/>
<source>package import requires a version number</source>
- <translation type="unfinished"></translation>
+ <translation>import pakietu wymaga podania numeru wersji</translation>
</message>
<message>
<location line="+46"/>
<source>package not found</source>
- <translation type="unfinished"></translation>
+ <translation>pakiet nie został odnaleziony</translation>
</message>
</context>
<context>
@@ -20540,12 +20650,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/libs/utils/filterlineedit.cpp" line="+39"/>
<source>Filter</source>
- <translation type="unfinished"></translation>
+ <translation>Filtr</translation>
</message>
<message>
<location line="+1"/>
<source>Clear text</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść tekst</translation>
</message>
</context>
<context>
@@ -20558,7 +20668,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+2"/>
<source>The file %1 has been removed outside Qt Creator. Do you want to save it under a different name, or close the editor?</source>
- <translation type="unfinished"></translation>
+ <translation>Plik %1 został usunięty na zewnątrz Qt Creatora. Chcesz zachować go pod inną nazwą czy zamknąć edytor?</translation>
</message>
<message>
<location line="+3"/>
@@ -20597,12 +20707,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/bineditor/bineditor.cpp" line="+1131"/>
<source>Copying Failed</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d kopiowania</translation>
</message>
<message>
<location line="+1"/>
<source>You cannot copy more than 4 MB of binary data.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można skopiować więcej niż 4 MB danych binarnych.</translation>
</message>
<message>
<location line="+110"/>
@@ -20617,22 +20727,22 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+27"/>
<source>Jump to Address in This Window</source>
- <translation type="unfinished"></translation>
+ <translation>Skocz do adresu w tym oknie</translation>
</message>
<message>
<location line="+1"/>
<source>Jump to Address in New Window</source>
- <translation type="unfinished"></translation>
+ <translation>Skocz do adresu w nowym oknie</translation>
</message>
<message>
<location line="+25"/>
<source>Jump to Address 0x%1 in This Window</source>
- <translation type="unfinished"></translation>
+ <translation>Skocz do adresu 0x%1 w tym oknie</translation>
</message>
<message>
<location line="+2"/>
<source>Jump to Address 0x%1 in New Window</source>
- <translation type="unfinished"></translation>
+ <translation>Skocz do adresu 0x%1 w nowym oknie</translation>
</message>
</context>
<context>
@@ -20668,7 +20778,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<location filename="../../../src/plugins/projectexplorer/userfileaccessor.cpp" line="+772"/>
<source>Desktop</source>
<comment>CMake Default target display name</comment>
- <translation type="unfinished"></translation>
+ <translation>Desktop</translation>
</message>
</context>
<context>
@@ -20728,7 +20838,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/coreplugin/editormanager/systemeditor.cpp" line="+67"/>
<source>Could not open url %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć url %1.</translation>
</message>
</context>
<context>
@@ -20916,7 +21026,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/cvs/cvseditor.cpp" line="+57"/>
<source>Annotate revision "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Dołącz adnotację do poprawki "%1"</translation>
</message>
</context>
<context>
@@ -20924,7 +21034,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="+44"/>
<source>Cdb</source>
- <translation type="unfinished">Cdb</translation>
+ <translation>Cdb</translation>
</message>
</context>
<context>
@@ -20932,17 +21042,17 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp" line="+142"/>
<source><Unknown Type></source>
- <translation type="unfinished"><Nieznany typ></translation>
+ <translation><Nieznany typ></translation>
</message>
<message>
<location line="+13"/>
<source><Unknown Value></source>
- <translation type="unfinished"><Nieznana wartość></translation>
+ <translation><Nieznana wartość></translation>
</message>
<message>
<location line="+297"/>
<source><Unknown></source>
- <translation type="unfinished"><Nieznany></translation>
+ <translation><Nieznany></translation>
</message>
</context>
<context>
@@ -20950,12 +21060,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/debugger/cdb/coreengine.cpp" line="+54"/>
<source>Unable to load the debugger engine library '%1': %2</source>
- <translation type="unfinished">Nie udało się załadować biblioteki silnika debuggera '%1': %2</translation>
+ <translation>Nie udało się załadować biblioteki silnika debuggera '%1': %2</translation>
</message>
<message>
<location line="+163"/>
<source>Unable to resolve '%1' in the debugger engine library '%2'</source>
- <translation type="unfinished">Nie udało się rozwiązać symbolu '%1' w bibliotece silnika debuggera '%2'</translation>
+ <translation>Nie udało się rozwiązać symbolu '%1' w bibliotece silnika debuggera '%2'</translation>
</message>
</context>
<context>
@@ -20963,17 +21073,17 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+213"/>
<source>Unable to set the image path to %1: %2</source>
- <translation type="unfinished">Nie można ustawić ścieżki do obrazu programu na %1: %2</translation>
+ <translation>Nie można ustawić ścieżki do obrazu na %1: %2</translation>
</message>
<message>
<location line="+26"/>
<source>Unable to create a process '%1': %2</source>
- <translation type="unfinished">Nie można utworzyć procesu "%1": %2</translation>
+ <translation>Nie można utworzyć procesu "%1": %2</translation>
</message>
<message>
<location line="+28"/>
<source>Attaching to a process failed for process id %1: %2</source>
- <translation type="unfinished">Dołączenie do procesu o identyfikatorze %1 nie powiodło się: %2</translation>
+ <translation>Dołączenie do procesu o identyfikatorze %1 nie powiodło się: %2</translation>
</message>
</context>
<context>
@@ -20985,12 +21095,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/debugger/debuggeruiswitcher.cpp" line="+217"/>
<source>&Languages</source>
- <translation type="unfinished"></translation>
+ <translation>&Języki</translation>
</message>
<message>
<location line="+32"/>
<source>Alt+L</source>
- <translation type="unfinished"></translation>
+ <translation>Alt+L</translation>
</message>
<message>
<source>&Views</source>
@@ -21003,7 +21113,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+49"/>
<source>Language</source>
- <translation type="unfinished"></translation>
+ <translation>Język</translation>
</message>
</context>
<context>
@@ -21056,30 +21166,34 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/debugger/snapshotwindow.cpp" line="+76"/>
<source>Snapshots</source>
- <translation type="unfinished"></translation>
+ <translation>Zrzuty</translation>
</message>
<message>
<location line="+67"/>
<source>Adjust Column Widths to Contents</source>
- <translation type="unfinished"></translation>
+ <translation>Wyrównaj szerokości kolumn do ich zawartości</translation>
</message>
<message>
<location line="+3"/>
<source>Always Adjust Column Widths to Contents</source>
- <translation type="unfinished"></translation>
+ <translation>Zawsze wyrównuj szerokości kolumn do ich zawartości</translation>
</message>
</context>
<context>
<name>Designer::Internal::FormEditorFactory</name>
+ <message>
+ <source>Open Designer</source>
+ <translation type="obsolete">Otwórz Designera</translation>
+ </message>
<message>
<location filename="../../../src/plugins/designer/formeditorfactory.cpp" line="+93"/>
- <source>This file can only be edited in Design Mode.</source>
+ <source>This file can only be edited in <b>Design</b> mode.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>Open Designer</source>
- <translation type="unfinished"></translation>
+ <source>Switch mode</source>
+ <translation>Przełącz tryb</translation>
</message>
</context>
<context>
@@ -21101,7 +21215,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="-21"/>
<source>FakeVim</source>
- <translation type="unfinished">FakeVim</translation>
+ <translation>FakeVim</translation>
</message>
<message>
<location line="+22"/>
@@ -21111,7 +21225,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+1"/>
<source>Regular expression:</source>
- <translation type="unfinished"></translation>
+ <translation>Wyrażenie regularne:</translation>
</message>
<message>
<location line="+1"/>
@@ -21124,22 +21238,22 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/find/findplugin.cpp" line="+189"/>
<source>&Find/Replace</source>
- <translation type="unfinished">Z&najdź / zastąp</translation>
+ <translation>Z&najdź / zastąp</translation>
</message>
<message>
<location line="+18"/>
<source>Advanced Find</source>
- <translation type="unfinished"></translation>
+ <translation>Zaawansowane przeszukiwanie</translation>
</message>
<message>
<location line="+2"/>
<source>Open Advanced Find...</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz zaawansowane przeszukiwanie...</translation>
</message>
<message>
<location line="+2"/>
<source>Ctrl+Shift+F</source>
- <translation type="unfinished">Ctrl+Shift+F</translation>
+ <translation>Ctrl+Shift+F</translation>
</message>
</context>
<context>
@@ -21147,7 +21261,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="-212"/>
<source>Make</source>
- <translation type="unfinished">Make</translation>
+ <translation>Make</translation>
</message>
</context>
<context>
@@ -21155,7 +21269,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/git/branchmodel.cpp" line="-141"/>
<source>(no branch)</source>
- <translation type="unfinished"></translation>
+ <translation>(brak gałęzi)</translation>
</message>
</context>
<context>
@@ -21353,12 +21467,13 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<location filename="../../../src/plugins/mercurial/mercurialjobrunner.cpp" line="+152"/>
<source>Executing: %1 %2
</source>
- <translation type="unfinished"></translation>
+ <translation>Wykonywanie: %1 %2
+</translation>
</message>
<message>
<location line="+5"/>
<source>Unable to start mercurial process '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można rozpocząć procesu mercurial "%1": %2</translation>
</message>
<message>
<location line="+5"/>
@@ -21371,112 +21486,112 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/mercurial/mercurialplugin.cpp" line="+215"/>
<source>Mercurial</source>
- <translation type="unfinished">Mercurial</translation>
+ <translation>Mercurial</translation>
</message>
<message>
<location line="+22"/>
<source>Annotate Current File</source>
- <translation type="unfinished">Dołącz adnotację do bieżącego pliku</translation>
+ <translation>Dołącz adnotację do bieżącego pliku</translation>
</message>
<message>
<location line="+0"/>
<source>Annotate "%1"</source>
- <translation type="unfinished">Dołącz adnotację do "%1"</translation>
+ <translation>Dołącz adnotację do "%1"</translation>
</message>
<message>
<location line="+7"/>
<source>Diff Current File</source>
- <translation type="unfinished">Pokaż różnice w bieżącym pliku</translation>
+ <translation>Pokaż różnice w bieżącym pliku</translation>
</message>
<message>
<location line="+0"/>
<source>Diff "%1"</source>
- <translation type="unfinished">Pokaż różnice w "%1"</translation>
+ <translation>Pokaż różnice w "%1"</translation>
</message>
<message>
<location line="+3"/>
<source>Alt+H,Alt+D</source>
- <translation type="unfinished"></translation>
+ <translation>Alt+H,Alt+D</translation>
</message>
<message>
<location line="+5"/>
<source>Log Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Dziennik bieżącego pliku</translation>
</message>
<message>
<location line="+0"/>
<source>Log "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Dziennik "%1"</translation>
</message>
<message>
<location line="+3"/>
<source>Alt+H,Alt+L</source>
- <translation type="unfinished"></translation>
+ <translation>Alt+H,Alt+L</translation>
</message>
<message>
<location line="+5"/>
<source>Status Current File</source>
- <translation type="unfinished"></translation>
+ <translation>Stan bieżącego pliku</translation>
</message>
<message>
<location line="+0"/>
<source>Status "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Stan "%1"</translation>
</message>
<message>
<location line="+3"/>
<source>Alt+H,Alt+S</source>
- <translation type="unfinished"></translation>
+ <translation>Alt+H,Alt+S</translation>
</message>
<message>
<location line="+7"/>
<source>Add</source>
- <translation type="unfinished">Dodaj</translation>
+ <translation>Dodaj</translation>
</message>
<message>
<location line="+0"/>
<source>Add "%1"</source>
- <translation type="unfinished">Dodaj "%1"</translation>
+ <translation>Dodaj "%1"</translation>
</message>
<message>
<location line="+7"/>
<source>Delete...</source>
- <translation type="unfinished">Usuń...</translation>
+ <translation>Usuń...</translation>
</message>
<message>
<location line="+0"/>
<source>Delete "%1"...</source>
- <translation type="unfinished"></translation>
+ <translation>Usuń "%1"...</translation>
</message>
<message>
<location line="+7"/>
<source>Revert Current File...</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany w bieżącym pliku...</translation>
</message>
<message>
<location line="+0"/>
<source>Revert "%1"...</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany w "%1"...</translation>
</message>
<message>
<location line="+59"/>
<source>Diff</source>
- <translation type="unfinished"></translation>
+ <translation>Pokaż różnice</translation>
</message>
<message>
<location line="+7"/>
<source>Log</source>
- <translation type="unfinished"></translation>
+ <translation>Dziennik</translation>
</message>
<message>
<location line="+7"/>
<source>Revert...</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć zmiany...</translation>
</message>
<message>
<location line="+7"/>
<source>Status</source>
- <translation type="unfinished"></translation>
+ <translation>Stan</translation>
</message>
<message>
<location line="+44"/>
@@ -21491,12 +21606,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+7"/>
<source>Update...</source>
- <translation type="unfinished"></translation>
+ <translation>Uaktualnij...</translation>
</message>
<message>
<location line="+7"/>
<source>Import...</source>
- <translation type="unfinished">Importuj...</translation>
+ <translation>Importuj...</translation>
</message>
<message>
<location line="+7"/>
@@ -21516,7 +21631,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+3"/>
<source>Alt+H,Alt+C</source>
- <translation type="unfinished"></translation>
+ <translation>Alt+H,Alt+C</translation>
</message>
<message>
<location line="+5"/>
@@ -21536,7 +21651,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+12"/>
<source>Update</source>
- <translation type="unfinished"></translation>
+ <translation>Uaktualnij</translation>
</message>
<message>
<location line="+28"/>
@@ -21551,22 +21666,22 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+4"/>
<source>Diff Selected Files</source>
- <translation type="unfinished">Pokaż różnice w zaznaczonych plikach</translation>
+ <translation>Pokaż różnice w zaznaczonych plikach</translation>
</message>
<message>
<location line="+3"/>
<source>&Undo</source>
- <translation type="unfinished">&Cofnij</translation>
+ <translation>&Cofnij</translation>
</message>
<message>
<location line="+3"/>
<source>&Redo</source>
- <translation type="unfinished">&Przywróć</translation>
+ <translation>&Przywróć</translation>
</message>
<message>
<location line="+28"/>
<source>There are no changes to commit.</source>
- <translation type="unfinished"></translation>
+ <translation>Brak zmian do wysłania.</translation>
</message>
<message>
<location line="+8"/>
@@ -21609,7 +21724,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/mercurial/optionspage.cpp" line="-49"/>
<source>Mercurial Command</source>
- <translation type="unfinished"></translation>
+ <translation>Komenda Mercurial</translation>
</message>
</context>
<context>
@@ -21617,43 +21732,43 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/perforce/perforcechecker.cpp" line="+85"/>
<source>No executable specified</source>
- <translation type="unfinished">Nie podano programu do uruchomienia</translation>
+ <translation>Nie podano programu do uruchomienia</translation>
</message>
<message>
<location line="+26"/>
<source>"%1" timed out after %2ms.</source>
- <translation type="unfinished">"%1" bez odpowiedzi po %2ms.</translation>
+ <translation>"%1" bez odpowiedzi po %2ms.</translation>
</message>
<message>
<location line="+9"/>
<source>Unable to launch "%1": %2</source>
- <translation type="unfinished">Nie można uruchomić "%1": %2</translation>
+ <translation>Nie można uruchomić "%1": %2</translation>
</message>
<message>
<location line="+19"/>
<source>"%1" crashed.</source>
- <translation type="unfinished">Wystąpił błąd w "%1" - proces zakończony.</translation>
+ <translation>Wystąpił błąd w "%1" - proces zakończony.</translation>
</message>
<message>
<location line="+5"/>
<source>"%1" terminated with exit code %2: %3</source>
- <translation type="unfinished">"%1" zakończone kodem wyjściowym %2: %3</translation>
+ <translation>"%1" zakończone kodem wyjściowym %2: %3</translation>
</message>
<message>
<location line="+22"/>
<source>The client does not seem to contain any mapped files.</source>
- <translation type="unfinished">Wygląda na to, że klient nie ma żadnych zmapowanych plików.</translation>
+ <translation>Wygląda na to, że klient nie ma żadnych zmapowanych plików.</translation>
</message>
<message>
<location line="+6"/>
<source>Unable to determine the client root.</source>
<extracomment>Unable to determine root of the p4 client installation</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Nie można określić korzenia klienta.</translation>
</message>
<message>
<location line="+8"/>
<source>The repository "%1" does not exist.</source>
- <translation type="unfinished"></translation>
+ <translation>Składnica "%1" nie istnieje.</translation>
</message>
</context>
<context>
@@ -21683,12 +21798,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/buildconfiguration.cpp" line="+230"/>
<source>System Environment</source>
- <translation type="unfinished">Åšrodowisko systemowe</translation>
+ <translation>Åšrodowisko systemowe</translation>
</message>
<message>
<location line="+2"/>
<source>Clean Environment</source>
- <translation type="unfinished">Czyste środowisko</translation>
+ <translation>Czyste środowisko</translation>
</message>
</context>
<context>
@@ -21696,12 +21811,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/buildenvironmentwidget.cpp" line="+48"/>
<source>Clear system environment</source>
- <translation type="unfinished">Wyczyść środowisko systemowe</translation>
+ <translation>Wyczyść środowisko systemowe</translation>
</message>
<message>
<location line="+13"/>
<source>Build Environment</source>
- <translation type="unfinished">Åšrodowisko budowania</translation>
+ <translation>Åšrodowisko budowania</translation>
</message>
</context>
<context>
@@ -21709,7 +21824,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.cpp" line="-295"/>
<source>Build Settings</source>
- <translation type="unfinished">Ustawienia budowania</translation>
+ <translation>Ustawienia budowania</translation>
</message>
</context>
<context>
@@ -21717,7 +21832,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+31"/>
<source>Build Settings</source>
- <translation type="unfinished">Ustawienia budowania</translation>
+ <translation>Ustawienia budowania</translation>
</message>
</context>
<context>
@@ -21729,7 +21844,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<translation>Szczegóły</translation>
</message>
<message>
- <location filename="../../../../creator-build-20/share/qtcreator/translations/customwizard_tr.h" line="+1"/>
+ <location filename="../../../../creator-20-build/share/qtcreator/translations/customwizard_tr.h" line="+1"/>
<source>Creates a plug-in for the QML runtime.</source>
<translation type="unfinished"></translation>
</message>
@@ -21755,7 +21870,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/customwizard/customwizard.cpp" line="+321"/>
<source>The project %1 could not be opened.</source>
- <translation type="unfinished">Nie można otworzyć projektu %1.</translation>
+ <translation>Nie można otworzyć projektu %1.</translation>
</message>
</context>
<context>
@@ -21763,7 +21878,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/customwizard/customwizardpage.cpp" line="+196"/>
<source>Path:</source>
- <translation type="unfinished">Ścieżka:</translation>
+ <translation>Ścieżka:</translation>
</message>
</context>
<context>
@@ -21771,7 +21886,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/dependenciespanel.cpp" line="-29"/>
<source><No other projects in this session></source>
- <translation type="unfinished"></translation>
+ <translation><Brak innych projektów w tej sesji></translation>
</message>
</context>
<context>
@@ -21779,7 +21894,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+170"/>
<source>Dependencies</source>
- <translation type="unfinished">Zależności</translation>
+ <translation>Zależności</translation>
</message>
</context>
<context>
@@ -21787,7 +21902,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+29"/>
<source>Dependencies</source>
- <translation type="unfinished">Zależności</translation>
+ <translation>Zależności</translation>
</message>
</context>
<context>
@@ -21795,7 +21910,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/editorsettingspropertiespage.cpp" line="+48"/>
<source>Editor Settings</source>
- <translation type="unfinished">Ustawienia edytora</translation>
+ <translation>Ustawienia edytora</translation>
</message>
</context>
<context>
@@ -21803,7 +21918,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+27"/>
<source>Editor Settings</source>
- <translation type="unfinished">Ustawienia edytora</translation>
+ <translation>Ustawienia edytora</translation>
</message>
</context>
<context>
@@ -21811,47 +21926,47 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/foldernavigationwidget.cpp" line="-193"/>
<source>Open</source>
- <translation type="unfinished">Otwórz</translation>
+ <translation>Otwórz</translation>
</message>
<message>
<location line="+3"/>
<source>Open parent folder</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz katalog wyżej</translation>
</message>
<message>
<location line="+1"/>
<source>Open "%1"</source>
- <translation type="unfinished">Otwórz "%1"</translation>
+ <translation>Otwórz "%1"</translation>
</message>
<message>
<location line="+19"/>
<source>Open with</source>
- <translation type="unfinished"></translation>
+ <translation>Otwórz przy pomocy</translation>
</message>
<message>
<location line="+6"/>
<source>Choose folder...</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz katalog...</translation>
</message>
<message>
<location line="+12"/>
<source>Choose folder</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz katalog</translation>
</message>
<message>
<location line="+20"/>
<source>Show in Explorer...</source>
- <translation type="unfinished">Pokaż w "Explorer"...</translation>
+ <translation>Pokaż w "Explorer"...</translation>
</message>
<message>
<location line="+2"/>
<source>Show in Finder...</source>
- <translation type="unfinished">Pokaż w "Finder"...</translation>
+ <translation>Pokaż w "Finder"...</translation>
</message>
<message>
<location line="+2"/>
<source>Show containing folder...</source>
- <translation type="unfinished">Pokaż zawierający katalog...</translation>
+ <translation>Pokaż zawierający katalog...</translation>
</message>
<message>
<location line="+7"/>
@@ -21866,7 +21981,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+9"/>
<source>Launching a file browser failed</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można uruchomić przeglądarki plików</translation>
</message>
<message>
<location line="+1"/>
@@ -21882,22 +21997,24 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<source>'%1' returned the following error:
%2</source>
- <translation type="unfinished"></translation>
+ <translation>"%1" zwrócił następujący błąd:
+
+%2</translation>
</message>
<message>
<location line="+1"/>
<source>Settings...</source>
- <translation type="unfinished">Ustawienia...</translation>
+ <translation>Ustawienia...</translation>
</message>
<message>
<location line="+14"/>
<source>Launching Windows Explorer failed</source>
- <translation type="unfinished">Nie można uruchomić "Windows Explorer"</translation>
+ <translation>Nie można uruchomić "Windows Explorer"</translation>
</message>
<message>
<location line="+1"/>
<source>Could not find explorer.exe in path to launch Windows Explorer.</source>
- <translation type="unfinished">Nie można odnaleźć explorer.exe w ścieżce w celu uruchomienia "Windows Explorer".</translation>
+ <translation>Nie można odnaleźć explorer.exe w ścieżce w celu uruchomienia "Windows Explorer".</translation>
</message>
</context>
<context>
@@ -21905,12 +22022,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/miniprojecttargetselector.cpp" line="+188"/>
<source>Select active build configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz aktywnÄ… konfiguracjÄ™ budowania</translation>
</message>
<message>
<location line="+9"/>
<source>Select active run configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz aktywnÄ… konfiguracjÄ™ uruchamiania</translation>
</message>
<message>
<location line="+59"/>
@@ -21928,12 +22045,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+123"/>
<source>Project</source>
- <translation type="unfinished">Projekt</translation>
+ <translation>Projekt</translation>
</message>
<message>
<location line="+11"/>
<source>Select active project</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz aktywny projekt</translation>
</message>
<message>
<location line="+205"/>
@@ -21943,7 +22060,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+2"/>
<source><b>Target:</b> %1<br/></source>
- <translation type="unfinished"></translation>
+ <translation><b>Produkt docelowy:</b> %1<br/></translation>
</message>
<message>
<location line="+2"/>
@@ -21953,7 +22070,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+2"/>
<source><br/>%1</source>
- <translation type="unfinished"></translation>
+ <translation><br/>%1</translation>
</message>
</context>
<context>
@@ -21961,7 +22078,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/projectconfiguration.cpp" line="+49"/>
<source>Clone of %1</source>
- <translation type="unfinished"></translation>
+ <translation>Klon %1</translation>
</message>
</context>
<context>
@@ -21969,12 +22086,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/projectexplorerconstants.h" line="+189"/>
<source>Projects</source>
- <translation type="unfinished">Projekty</translation>
+ <translation>Projekty</translation>
</message>
<message>
<location line="+11"/>
<source>Other Project</source>
- <translation type="unfinished"></translation>
+ <translation>Inny projekt</translation>
</message>
</context>
<context>
@@ -21982,7 +22099,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/projectwindow.cpp" line="+306"/>
<source>Targets</source>
- <translation type="unfinished"></translation>
+ <translation>Produkty docelowe</translation>
</message>
</context>
<context>
@@ -21990,7 +22107,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.cpp" line="-159"/>
<source>Run Settings</source>
- <translation type="unfinished">Ustawienia uruchamiania</translation>
+ <translation>Ustawienia uruchamiania</translation>
</message>
</context>
<context>
@@ -21998,7 +22115,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+31"/>
<source>Run Settings</source>
- <translation type="unfinished">Ustawienia uruchamiania</translation>
+ <translation>Ustawienia uruchamiania</translation>
</message>
</context>
<context>
@@ -22006,18 +22123,19 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/projectexplorer/targetsettingspanel.cpp" line="+101"/>
<source>No target defined.</source>
- <translation type="unfinished"></translation>
+ <translation>Brak zdefiniowanych produktów docelowych.</translation>
</message>
<message>
<location line="+103"/>
<source>Qt Creator</source>
- <translation type="unfinished">Qt Creator</translation>
+ <translation>Qt Creator</translation>
</message>
<message>
<location line="+1"/>
<source>Do you really want to remove the
"%1" target?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy chcesz usunąć produkt docelowy
+"%1"?</translation>
</message>
</context>
<context>
@@ -22026,27 +22144,27 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<location filename="../../../src/plugins/projectexplorer/taskwindow.cpp" line="-459"/>
<location filename="../../../src/plugins/projectexplorer/taskwindow.h" line="+116"/>
<source>Build Issues</source>
- <translation type="unfinished">Problemy podczas budowania</translation>
+ <translation>Problemy podczas budowania</translation>
</message>
<message>
<location line="+11"/>
<source>&Copy</source>
- <translation type="unfinished">S&kopiuj</translation>
+ <translation>S&kopiuj</translation>
</message>
<message>
<location line="+7"/>
<source>&Annotate</source>
- <translation type="unfinished"></translation>
+ <translation>Dołącz &adnotację</translation>
</message>
<message>
<location line="+18"/>
<source>Show Warnings</source>
- <translation type="unfinished">Pokazuj ostrzeżenia</translation>
+ <translation>Pokazuj ostrzeżenia</translation>
</message>
<message>
<location line="+9"/>
<source>Filter by categories</source>
- <translation type="unfinished"></translation>
+ <translation>Przefiltruj według kategorii</translation>
</message>
</context>
<context>
@@ -22055,7 +22173,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<location filename="../../../src/plugins/projectexplorer/userfileaccessor.cpp" line="-5"/>
<source>Desktop</source>
<comment>Generic desktop target display name</comment>
- <translation type="unfinished"></translation>
+ <translation>Desktop</translation>
</message>
</context>
<context>
@@ -22065,54 +22183,60 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<location filename="../../../src/plugins/qt4projectmanager/qt4target.cpp" line="+61"/>
<source>Desktop</source>
<comment>Qt4 Desktop target display name</comment>
- <translation type="unfinished"></translation>
+ <translation>Desktop</translation>
</message>
<message>
<location line="+4"/>
<location filename="../../../src/plugins/qt4projectmanager/qt4target.cpp" line="+2"/>
<source>Symbian Emulator</source>
<comment>Qt4 Symbian Emulator target display name</comment>
- <translation type="unfinished"></translation>
+ <translation>Emulator Symbiana</translation>
</message>
<message>
<location line="+4"/>
<location filename="../../../src/plugins/qt4projectmanager/qt4target.cpp" line="+2"/>
<source>Symbian Device</source>
<comment>Qt4 Symbian Device target display name</comment>
- <translation type="unfinished"></translation>
+ <translation>UrzÄ…dzenie Symbian</translation>
</message>
<message>
<location line="+4"/>
<source>Maemo Emulator</source>
<comment>Qt4 Maemo Emulator target display name</comment>
- <translation type="unfinished"></translation>
+ <translation>Emulator Maemo</translation>
</message>
<message>
<location line="+4"/>
<source>Maemo Device</source>
<comment>Qt4 Maemo Device target display name</comment>
- <translation type="unfinished"></translation>
+ <translation>UrzÄ…dzenie Maemo</translation>
</message>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4target.cpp" line="+2"/>
<source>Maemo</source>
<comment>Qt4 Maemo target display name</comment>
- <translation type="unfinished"></translation>
+ <translation>Maemo</translation>
</message>
<message>
- <location line="+378"/>
+ <location line="+2"/>
+ <source>Qt Simulator</source>
+ <comment>Qt4 Simulator target display name</comment>
+ <translation>Symulator Qt</translation>
+ </message>
+ <message>
+ <location line="+383"/>
<source><b>Device:</b> Not connected</source>
- <translation type="unfinished"></translation>
+ <translation><b>Urządzenie:</b> Nie podłączone</translation>
</message>
<message>
<location line="+6"/>
<source><b>Device:</b> %1</source>
- <translation type="unfinished"></translation>
+ <translation><b>UrzÄ…dzenie:</b> %1</translation>
</message>
<message>
<location line="+1"/>
<source><b>Device:</b> %1, %2</source>
- <translation type="unfinished"></translation>
+ <translation><b>UrzÄ…dzenie:</b> %1, %2</translation>
</message>
</context>
<context>
@@ -22129,12 +22253,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp" line="+217"/>
<source>-New Form-</source>
- <translation type="unfinished"></translation>
+ <translation>-Nowy formularz-</translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+182"/>
<source>Cannot save to file "%1": permission denied.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zachować "%1": brak uprawnień.</translation>
</message>
<message>
<location line="+6"/>
@@ -22144,7 +22268,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+307"/>
<source>Cannot write file: "%1".</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zapisać pliku: "%1".</translation>
</message>
</context>
<context>
@@ -22152,12 +22276,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmldesigner/components/integration/xuifiledialog.cpp" line="+45"/>
<source>Open file</source>
- <translation type="unfinished">Otwórz plik</translation>
+ <translation>Otwórz plik</translation>
</message>
<message>
<location line="+22"/>
<source>Save file</source>
- <translation type="unfinished"></translation>
+ <translation>Zachowaj plik</translation>
</message>
<message>
<location line="+14"/>
@@ -22167,7 +22291,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+1"/>
<source>All files (*)</source>
- <translation type="unfinished">Wszystkie pliki (*)</translation>
+ <translation>Wszystkie pliki (*)</translation>
</message>
</context>
<context>
@@ -22176,25 +22300,25 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<location filename="../../../src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp" line="+127"/>
<source>Library</source>
<comment>Title of library view</comment>
- <translation type="unfinished"></translation>
+ <translation>Biblioteka</translation>
</message>
<message>
<location line="+39"/>
<source>Items</source>
<comment>Title of library items view</comment>
- <translation type="unfinished"></translation>
+ <translation>Elementy</translation>
</message>
<message>
<location line="+1"/>
<source>Resources</source>
<comment>Title of library resources view</comment>
- <translation type="unfinished">Zasoby</translation>
+ <translation>Zasoby</translation>
</message>
<message>
<location line="+5"/>
<source><Filter></source>
<comment>Library search input hint text</comment>
- <translation type="unfinished"></translation>
+ <translation><Filtr></translation>
</message>
</context>
<context>
@@ -22203,7 +22327,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<location filename="../../../src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp" line="+61"/>
<source>Navigator</source>
<comment>Title of navigator view</comment>
- <translation type="unfinished"></translation>
+ <translation>Nawigator</translation>
</message>
</context>
<context>
@@ -22211,7 +22335,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp" line="+161"/>
<source>About plugins</source>
- <translation type="unfinished"></translation>
+ <translation>Informacje o wtyczkach</translation>
</message>
</context>
<context>
@@ -22219,27 +22343,27 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp" line="-114"/>
<source>Failed to create instance.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć instancji.</translation>
</message>
<message>
<location line="+6"/>
<source>Not a QmlDesigner plugin.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie jest to wtyczka QmlDesigner.</translation>
</message>
<message>
- <location filename="../../../src/plugins/qmldesigner/core/pluginmanager/widgetpluginpath.cpp" line="-133"/>
+ <location filename="../../../src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp" line="-133"/>
<source>Failed to create instance of file '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć instancji pliku "%1": %2</translation>
</message>
<message>
<location line="+9"/>
<source>Failed to create instance of file '%1'.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć instancji pliku "%1".</translation>
</message>
<message>
<location line="+9"/>
<source>File '%1' is not a QmlDesigner plugin.</source>
- <translation type="unfinished"></translation>
+ <translation>Plik "%1" nie jest wtyczkÄ… QmlDesigner.</translation>
</message>
</context>
<context>
@@ -22248,7 +22372,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<location filename="../../../src/plugins/qmldesigner/components/propertyeditor/allpropertiesbox.cpp" line="+59"/>
<source>Properties</source>
<comment>Title of properties view.</comment>
- <translation type="unfinished">Właściwości</translation>
+ <translation>Właściwości</translation>
</message>
</context>
<context>
@@ -22256,73 +22380,73 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientstopscontroller.cpp" line="+173"/>
<source>H</source>
- <translation type="unfinished"></translation>
+ <translation>H</translation>
</message>
<message>
<location line="+1"/>
<source>S</source>
- <translation type="unfinished"></translation>
+ <translation>S</translation>
</message>
<message>
<location line="+1"/>
<source>V</source>
- <translation type="unfinished"></translation>
+ <translation>V</translation>
</message>
<message>
<location line="+6"/>
<location line="+4"/>
<source>Hue</source>
- <translation type="unfinished"></translation>
+ <translation>Barwa</translation>
</message>
<message>
<location line="-3"/>
<source>Sat</source>
- <translation type="unfinished"></translation>
+ <translation>Nasycenie</translation>
</message>
<message>
<location line="+1"/>
<source>Val</source>
- <translation type="unfinished"></translation>
+ <translation>Wartość</translation>
</message>
<message>
<location line="+3"/>
<source>Saturation</source>
- <translation type="unfinished"></translation>
+ <translation>Nasycenie</translation>
</message>
<message>
<location line="+1"/>
<source>Value</source>
- <translation type="unfinished">Wartość</translation>
+ <translation>Wartość</translation>
</message>
<message>
<location line="+22"/>
<source>R</source>
- <translation type="unfinished">R</translation>
+ <translation>R</translation>
</message>
<message>
<location line="+1"/>
<source>G</source>
- <translation type="unfinished"></translation>
+ <translation>G</translation>
</message>
<message>
<location line="+1"/>
<source>B</source>
- <translation type="unfinished"></translation>
+ <translation>B</translation>
</message>
<message>
<location line="+6"/>
<source>Red</source>
- <translation type="unfinished"></translation>
+ <translation>Czerwień</translation>
</message>
<message>
<location line="+1"/>
<source>Green</source>
- <translation type="unfinished"></translation>
+ <translation>Zieleń</translation>
</message>
<message>
<location line="+1"/>
<source>Blue</source>
- <translation type="unfinished"></translation>
+ <translation>Błękit</translation>
</message>
</context>
<context>
@@ -22330,37 +22454,37 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientstopswidget.cpp" line="+947"/>
<source>New Stop</source>
- <translation type="unfinished"></translation>
+ <translation>Nowy punkt</translation>
</message>
<message>
<location line="+1"/>
<source>Delete</source>
- <translation type="unfinished">Usuń</translation>
+ <translation>Usuń</translation>
</message>
<message>
<location line="+1"/>
<source>Flip All</source>
- <translation type="unfinished"></translation>
+ <translation>Odwróć wszystko</translation>
</message>
<message>
<location line="+1"/>
<source>Select All</source>
- <translation type="unfinished">Zaznacz wszystko</translation>
+ <translation>Zaznacz wszystko</translation>
</message>
<message>
<location line="+1"/>
<source>Zoom In</source>
- <translation type="unfinished"></translation>
+ <translation>Powiększ</translation>
</message>
<message>
<location line="+1"/>
<source>Zoom Out</source>
- <translation type="unfinished"></translation>
+ <translation>Pomniejsz</translation>
</message>
<message>
<location line="+1"/>
<source>Reset Zoom</source>
- <translation type="unfinished"></translation>
+ <translation>Normalny rozmiar</translation>
</message>
</context>
<context>
@@ -22369,22 +22493,22 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<location filename="../../../src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp" line="+76"/>
<source>base state</source>
<comment>Implicit default state</comment>
- <translation type="unfinished"></translation>
+ <translation>Stan bazowy</translation>
</message>
<message>
<location line="+47"/>
<source>Invalid state name</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawna nazwa stanu</translation>
</message>
<message>
<location line="+0"/>
<source>The empty string as a name is reserved for the base state.</source>
- <translation type="unfinished"></translation>
+ <translation>Pusta nazwa jest zarezerwowana dla stanu bazowego.</translation>
</message>
<message>
<location line="+0"/>
<source>Name already used in another state</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa jest już użyta w innym stanie</translation>
</message>
</context>
<context>
@@ -22392,13 +22516,13 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp" line="+106"/>
<source>base state</source>
- <translation type="unfinished"></translation>
+ <translation>Stan bazowy</translation>
</message>
<message>
<location line="+27"/>
<source>State%1</source>
<comment>Default name for newly created states</comment>
- <translation type="unfinished"></translation>
+ <translation>Stan%1</translation>
</message>
</context>
<context>
@@ -22407,43 +22531,43 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<location line="+60"/>
<source>States</source>
<comment>Title of Editor widget</comment>
- <translation type="unfinished"></translation>
+ <translation>Stany</translation>
</message>
</context>
<context>
<name>QmlDesigner::Internal::SubComponentManagerPrivate</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/core/metainfo/subcomponentmanager.cpp" line="+307"/>
+ <location filename="../../../src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp" line="+306"/>
<source>QML Components</source>
- <translation type="unfinished"></translation>
+ <translation>Komponenty QML</translation>
</message>
</context>
<context>
<name>QmlDesigner::RewriterView</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/core/model/rewriterview.cpp" line="+79"/>
+ <location filename="../../../src/plugins/qmldesigner/designercore/model/rewriterview.cpp" line="+79"/>
<source>Error parsing</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d parsowania</translation>
</message>
<message>
<location line="+2"/>
<source>Internal error</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd wewnętrzny</translation>
</message>
<message>
<location line="+6"/>
<source>"%1"</source>
- <translation type="unfinished"></translation>
+ <translation>"%1"</translation>
</message>
<message>
<location line="+6"/>
<source>line %1</source>
- <translation type="unfinished"></translation>
+ <translation>linia %1</translation>
</message>
<message>
<location line="+7"/>
<source>column %1</source>
- <translation type="unfinished"></translation>
+ <translation>kolumna %1</translation>
</message>
</context>
<context>
@@ -22451,17 +22575,17 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmldesigner/designmodewidget.cpp" line="+103"/>
<source><a href="goToError">Go to error</a></source>
- <translation type="unfinished"></translation>
+ <translation><a href="goToError">Przejdź do błędu</a></translation>
</message>
<message>
<location line="+16"/>
<source>%3 (%1:%2)</source>
- <translation type="unfinished"></translation>
+ <translation>%3 (%1:%2)</translation>
</message>
<message>
<location line="+3"/>
<source>Internal error (%1)</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd wewnętrzny (%1)</translation>
</message>
</context>
<context>
@@ -22469,97 +22593,97 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+26"/>
<source>&Undo</source>
- <translation type="unfinished">&Cofnij</translation>
+ <translation>&Cofnij</translation>
</message>
<message>
<location line="+2"/>
<source>&Redo</source>
- <translation type="unfinished">&Przywróć</translation>
+ <translation>&Przywróć</translation>
</message>
<message>
<location line="+2"/>
<source>Delete</source>
- <translation type="unfinished">Usuń</translation>
+ <translation>Usuń</translation>
</message>
<message>
<location line="+0"/>
<source>Delete "%1"</source>
- <translation type="unfinished">Usuń "%1"</translation>
+ <translation>Usuń "%1"</translation>
</message>
<message>
<location line="+2"/>
<source>Cu&t</source>
- <translation type="unfinished">Wy&tnij</translation>
+ <translation>Wy&tnij</translation>
</message>
<message>
<location line="+0"/>
<source>Cut "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Wytnij "%1"</translation>
</message>
<message>
<location line="+2"/>
<source>&Copy</source>
- <translation type="unfinished">S&kopiuj</translation>
+ <translation>S&kopiuj</translation>
</message>
<message>
<location line="+0"/>
<source>Copy "%1"</source>
- <translation type="unfinished">Skopiuj "%1"</translation>
+ <translation>Skopiuj "%1"</translation>
</message>
<message>
<location line="+2"/>
<source>&Paste</source>
- <translation type="unfinished">Wk&lej</translation>
+ <translation>Wk&lej</translation>
</message>
<message>
<location line="+0"/>
<source>Paste "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Wklej "%1"</translation>
</message>
<message>
<location line="+2"/>
<source>Select &All</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznacz &wszystko</translation>
</message>
<message>
<location line="+0"/>
<source>Select All "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznacz wszystkie "%1"</translation>
</message>
<message>
<location line="+2"/>
<source>Toggle Full Screen</source>
- <translation type="unfinished"></translation>
+ <translation>Przełącz pełny ekran</translation>
</message>
<message>
<location line="+2"/>
<source>&Restore Default View</source>
- <translation type="unfinished"></translation>
+ <translation>P&rzywróć domyślny widok</translation>
</message>
<message>
<location line="+2"/>
<source>Toggle &Left Sidebar</source>
- <translation type="unfinished"></translation>
+ <translation>Przełącz &lewy boczny pasek</translation>
</message>
<message>
<location line="+2"/>
<source>Toggle &Right Sidebar</source>
- <translation type="unfinished"></translation>
+ <translation>Przełącz p&rawy boczny pasek</translation>
</message>
<message>
<location line="+429"/>
<source>Projects</source>
- <translation type="unfinished">Projekty</translation>
+ <translation>Projekty</translation>
</message>
<message>
<location line="+4"/>
<source>File System</source>
- <translation type="unfinished">System plików</translation>
+ <translation>System plików</translation>
</message>
<message>
<location line="+4"/>
<source>Open Documents</source>
- <translation type="unfinished">Otwarte dokumenty</translation>
+ <translation>Otwarte dokumenty</translation>
</message>
</context>
<context>
@@ -22567,37 +22691,37 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmldesigner/qmldesignerplugin.cpp" line="+130"/>
<source>Switch Text/Design</source>
- <translation type="unfinished"></translation>
+ <translation>Przełącz tekst / projekt</translation>
</message>
<message>
<location line="+200"/>
<source>Save %1 As...</source>
- <translation type="unfinished">Zachowaj %1 jako...</translation>
+ <translation>Zachowaj %1 jako...</translation>
</message>
<message>
<location line="+1"/>
<source>&Save %1</source>
- <translation type="unfinished">&Zachowaj %1</translation>
+ <translation>&Zachowaj %1</translation>
</message>
<message>
<location line="+1"/>
<source>Revert %1 to Saved</source>
- <translation type="unfinished">Odwróć zmiany w %1</translation>
+ <translation>Odwróć zmiany w %1</translation>
</message>
<message>
<location line="+3"/>
<source>Close %1</source>
- <translation type="unfinished">Zamknij %1</translation>
+ <translation>Zamknij %1</translation>
</message>
<message>
<location line="+3"/>
<source>Close All Except %1</source>
- <translation type="unfinished"></translation>
+ <translation>Zamknij wszystko z wyjÄ…tkiem %1</translation>
</message>
<message>
<location line="+0"/>
<source>Close Others</source>
- <translation type="unfinished">Zamknij inne</translation>
+ <translation>Zamknij inne</translation>
</message>
</context>
<context>
@@ -22605,7 +22729,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmlinspector/components/canvasframerate.cpp" line="+251"/>
<source>Frame rate</source>
- <translation type="unfinished"></translation>
+ <translation>Klatki na sekundÄ™</translation>
</message>
</context>
<context>
@@ -22613,7 +22737,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+119"/>
<source>Total time elapsed (ms)</source>
- <translation type="unfinished"></translation>
+ <translation>ÅÄ…czny czas który upÅ‚ynÄ…Å‚</translation>
</message>
</context>
<context>
@@ -22621,22 +22745,22 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+77"/>
<source>Resolution:</source>
- <translation type="unfinished"></translation>
+ <translation>Rozdzielczość:</translation>
</message>
<message>
<location line="+5"/>
<source>Clear</source>
- <translation type="unfinished">Wyczyść</translation>
+ <translation>Wyczyść</translation>
</message>
<message>
<location line="+4"/>
<source>New Graph</source>
- <translation type="unfinished"></translation>
+ <translation>Nowy graf</translation>
</message>
<message>
<location line="+4"/>
<source>Enabled</source>
- <translation type="unfinished"></translation>
+ <translation>WÅ‚Ä…czony</translation>
</message>
</context>
<context>
@@ -22644,12 +22768,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmlinspector/components/expressionquerywidget.cpp" line="+88"/>
<source>Write and evaluate QtScript expressions.</source>
- <translation type="unfinished"></translation>
+ <translation>Wpisz i wykonaj polecenia QtScript.</translation>
</message>
<message>
<location line="+3"/>
<source>Clear Output</source>
- <translation type="unfinished"></translation>
+ <translation>Wyczyść wyjście</translation>
</message>
<message>
<source>Triggers a completion in this scope</source>
@@ -22666,7 +22790,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="-4"/>
<source><Type expression to evaluate></source>
- <translation type="unfinished"></translation>
+ <translation><Wpisz wyrażenie do wykonania></translation>
</message>
<message>
<location line="+35"/>
@@ -22688,7 +22812,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message numerus="yes">
<location line="+79"/>
<source><%n items></source>
- <translation type="unfinished">
+ <translation>
<numerusform><%n element></numerusform>
<numerusform><%n elementy></numerusform>
<numerusform><%n elementów></numerusform>
@@ -22700,27 +22824,27 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmlinspector/components/objectpropertiesview.cpp" line="+76"/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa</translation>
</message>
<message>
<location line="+0"/>
<source>Value</source>
- <translation type="unfinished">Wartość</translation>
+ <translation>Wartość</translation>
</message>
<message>
<location line="+0"/>
<source>Type</source>
- <translation type="unfinished">Typ</translation>
+ <translation>Typ</translation>
</message>
<message>
<location line="+5"/>
<source>&Watch expression</source>
- <translation type="unfinished"></translation>
+ <translation>&Obserwuj wyrażenie</translation>
</message>
<message>
<location line="+1"/>
<source>&Remove watch</source>
- <translation type="unfinished"></translation>
+ <translation>&Usuń obserwowanie wyrażenia</translation>
</message>
<message>
<location line="+1"/>
@@ -22730,12 +22854,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+3"/>
<source>&Group by item type</source>
- <translation type="unfinished"></translation>
+ <translation>&Grupuj według typów elementów</translation>
</message>
<message numerus="yes">
<location line="+116"/>
<source><%n items></source>
- <translation type="unfinished">
+ <translation>
<numerusform><%n element></numerusform>
<numerusform><%n elementy></numerusform>
<numerusform><%n elementów></numerusform>
@@ -22744,7 +22868,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+291"/>
<source>Watch expression '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Obserwuj wyrażenie "%1"</translation>
</message>
<message>
<location line="+8"/>
@@ -22762,27 +22886,27 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmlinspector/components/objecttree.cpp" line="+57"/>
<source>Add watch expression...</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj wyrażenie do obserwowania...</translation>
</message>
<message>
<location line="+1"/>
<source>Show uninspectable items</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Pokazuj elementy</translation>
</message>
<message>
<location line="+2"/>
<source>Go to file</source>
- <translation type="unfinished"></translation>
+ <translation>Przejdź do pliku</translation>
</message>
<message>
<location line="+215"/>
<source>Watch expression</source>
- <translation type="unfinished"></translation>
+ <translation>Obserwuj wyrażenie</translation>
</message>
<message>
<location line="+1"/>
<source>Expression:</source>
- <translation type="unfinished"></translation>
+ <translation>Wyrażenie:</translation>
</message>
</context>
<context>
@@ -22790,12 +22914,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmlinspector/components/watchtable.cpp" line="+153"/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa</translation>
</message>
<message>
<location line="+2"/>
<source>Value</source>
- <translation type="unfinished">Wartość</translation>
+ <translation>Wartość</translation>
</message>
</context>
<context>
@@ -22803,7 +22927,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+219"/>
<source>Stop watching</source>
- <translation type="unfinished"></translation>
+ <translation>Zatrzymaj obserwowanie</translation>
</message>
</context>
<context>
@@ -22811,12 +22935,12 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmlinspector/inspectoroutputwidget.cpp" line="+43"/>
<source>Output</source>
- <translation type="unfinished">Komunikaty</translation>
+ <translation>Komunikaty</translation>
</message>
<message>
<location line="+2"/>
<source>Clear</source>
- <translation type="unfinished">Wyczyść</translation>
+ <translation>Wyczyść</translation>
</message>
</context>
<context>
@@ -22824,22 +22948,22 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location filename="../../../src/plugins/qmlinspector/qmlinspector.cpp" line="+210"/>
<source>Failed to connect to debugger</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można połączyć się z debuggerem</translation>
</message>
<message>
<location line="+1"/>
<source>Could not connect to debugger server.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można połączyć się z serwerem debuggera.</translation>
</message>
<message>
<location line="+8"/>
<source>Invalid project, debugging canceled.</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawny projekt, anulowano debugowanie.</translation>
</message>
<message>
<location line="+7"/>
<source>Cannot find project run configuration, debugging canceled.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odnaleźć konfiguracji uruchamiania, anulowano debugowanie.</translation>
</message>
<message>
<location line="+38"/>
@@ -22883,7 +23007,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<message>
<location line="+111"/>
<source>Start Debugging C++ and QML Simultaneously...</source>
- <translation type="unfinished"></translation>
+ <translation>Rozpocznij jednoczesne debugowanie QML i C++...</translation>
</message>
<message>
<location line="+32"/>
@@ -22915,17 +23039,17 @@ Please check your project settings.</source>
<message>
<location line="-287"/>
<source>QML engine:</source>
- <translation type="unfinished"></translation>
+ <translation>Silnik QML:</translation>
</message>
<message>
<location line="+5"/>
<source>Object Tree</source>
- <translation type="unfinished"></translation>
+ <translation>Drzewo obiektów</translation>
</message>
<message>
<location line="+46"/>
<source>Properties and Watchers</source>
- <translation type="unfinished"></translation>
+ <translation>Właściwości i zmienne obserwowane</translation>
</message>
<message>
<location line="+24"/>
@@ -22943,27 +23067,27 @@ Please check your project settings.</source>
<message>
<location filename="../../../src/plugins/qmljseditor/qmljseditor.cpp" line="+865"/>
<source>Rename...</source>
- <translation type="unfinished">Zmień nazwę...</translation>
+ <translation>Zmień nazwę...</translation>
</message>
<message>
<location line="+1"/>
<source>New id:</source>
- <translation type="unfinished">Nowy identyfikator:</translation>
+ <translation>Nowy identyfikator:</translation>
</message>
<message>
<location line="+51"/>
<source>Unused variable</source>
- <translation type="unfinished"></translation>
+ <translation>Nieużywana zmienna</translation>
</message>
<message>
<location line="+151"/>
<source>Rename id '%1'...</source>
- <translation type="unfinished">Zmień nazwę identyfikatora "%1"...</translation>
+ <translation>Zmień nazwę identyfikatora "%1"...</translation>
</message>
<message>
<location line="+196"/>
<source><Select Symbol></source>
- <translation type="unfinished"><Wybierz symbol></translation>
+ <translation><Wybierz symbol></translation>
</message>
</context>
<context>
@@ -23002,7 +23126,7 @@ Please check your project settings.</source>
<message>
<location line="+6"/>
<source>Cancel</source>
- <translation type="unfinished">Anuluj</translation>
+ <translation>Anuluj</translation>
</message>
<message>
<location line="+8"/>
@@ -23020,27 +23144,27 @@ Please check your project settings.</source>
<message>
<location filename="../../../src/plugins/qmljseditor/qmljseditorplugin.cpp" line="+112"/>
<source>Creates a Qt QML file.</source>
- <translation type="unfinished">Tworzy plik QML Qt.</translation>
+ <translation>Tworzy plik Qt QML.</translation>
</message>
<message>
<location line="+1"/>
<source>Qt QML File</source>
- <translation type="unfinished">Plik QML Qt</translation>
+ <translation>Plik Qt QML</translation>
</message>
<message>
<location line="+15"/>
<source>Qt Quick</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Quick</translation>
</message>
<message>
<location line="+7"/>
<source>Ctrl+Alt+R</source>
- <translation type="unfinished">Ctrl+Alt+R</translation>
+ <translation>Ctrl+Alt+R</translation>
</message>
<message>
<location line="+4"/>
<source>Follow Symbol Under Cursor</source>
- <translation type="unfinished"></translation>
+ <translation>Podąż za symbolem pod kursorem</translation>
</message>
</context>
<context>
@@ -23048,7 +23172,7 @@ Please check your project settings.</source>
<message>
<location filename="../../../src/plugins/qmljseditor/qmljshoverhandler.cpp" line="+78"/>
<source>Unfiltered</source>
- <translation type="unfinished">Nieprzefiltrowane</translation>
+ <translation>Nieprzefiltrowane</translation>
</message>
</context>
<context>
@@ -23056,7 +23180,7 @@ Please check your project settings.</source>
<message>
<location filename="../../../src/plugins/qmljseditor/qmljsmodelmanager.cpp" line="+134"/>
<source>Indexing</source>
- <translation type="unfinished">Indeksowanie</translation>
+ <translation>Indeksowanie</translation>
</message>
</context>
<context>
@@ -23072,12 +23196,12 @@ Please check your project settings.</source>
<message>
<location filename="../../../src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp" line="+47"/>
<source>New QML Project</source>
- <translation type="unfinished">Nowy QML projekt</translation>
+ <translation>Nowy projekt QML</translation>
</message>
<message>
<location line="+1"/>
<source>This wizard generates a QML application project.</source>
- <translation type="unfinished">Ten kreator generuje projekt aplikacji QML.</translation>
+ <translation>Ten kreator generuje projekt aplikacji QML.</translation>
</message>
</context>
<context>
@@ -23085,19 +23209,19 @@ Please check your project settings.</source>
<message>
<location line="+14"/>
<source>Qt QML Application</source>
- <translation type="unfinished"></translation>
+ <translation>Aplikacja Qt QML</translation>
</message>
<message>
<location line="+2"/>
<source>Creates a Qt QML application.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy aplikacjÄ™ Qt QML.</translation>
</message>
<message>
<location line="+66"/>
<source>File generated by QtCreator</source>
<comment>qmlproject Template</comment>
<extracomment>Comment added to generated .qmlproject file</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Plik wygenerowany przez QtCreatora</translation>
</message>
<message>
<location line="+6"/>
@@ -23123,7 +23247,7 @@ Please check your project settings.</source>
<message>
<location filename="../../../src/plugins/qmlprojectmanager/qmlprojectconstants.h" line="+8"/>
<source>Qt Quick Project</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt Qt Quick</translation>
</message>
</context>
<context>
@@ -23159,19 +23283,19 @@ Please check your project settings.</source>
<message>
<location line="+36"/>
<source>Import Existing Qt QML Directory</source>
- <translation type="unfinished">Import istniejÄ…cego katalogu QML</translation>
+ <translation>Import istniejÄ…cego katalogu QML</translation>
</message>
<message>
<location line="+2"/>
<source>Creates a QML project from an existing directory of QML files.</source>
- <translation type="unfinished">Tworzy projekt QML na podstawie istniejÄ…cego katalogu z plikami QML.</translation>
+ <translation>Tworzy projekt QML na podstawie istniejÄ…cego katalogu z plikami QML.</translation>
</message>
<message>
<location line="+39"/>
<source>File generated by QtCreator</source>
<comment>qmlproject Template</comment>
<extracomment>Comment added to generated .qmlproject file</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Plik wygenerowany przez Qt Creatora</translation>
</message>
<message>
<location line="+6"/>
@@ -23197,7 +23321,7 @@ Please check your project settings.</source>
<message>
<location filename="../../../src/plugins/qmlprojectmanager/qmlprojectmanager.cpp" line="+76"/>
<source>Failed opening project '%1': Project already open</source>
- <translation type="unfinished">Nie można otworzyć projektu "%1": projekt jest już otwarty</translation>
+ <translation>Nie można otworzyć projektu "%1": projekt jest już otwarty</translation>
</message>
</context>
<context>
@@ -23221,7 +23345,7 @@ Please check your project settings.</source>
<message>
<location line="+1"/>
<source>Main QML File:</source>
- <translation type="unfinished">Główny plik QML:</translation>
+ <translation>Główny plik QML:</translation>
</message>
<message>
<location line="+1"/>
@@ -23239,7 +23363,7 @@ Please check your project settings.</source>
<message>
<location filename="../../../src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h" line="+52"/>
<source><Current File></source>
- <translation type="unfinished"><Bieżący plik></translation>
+ <translation><Bieżący plik></translation>
</message>
</context>
<context>
@@ -23247,7 +23371,7 @@ Please check your project settings.</source>
<message>
<location filename="../../../src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp" line="+60"/>
<source>Run QML Script</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom skrypt QML</translation>
</message>
</context>
<context>
@@ -23255,12 +23379,12 @@ Please check your project settings.</source>
<message>
<location filename="../../../src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp" line="+92"/>
<source>Starting %1 %2</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie %1 %2</translation>
</message>
<message>
<location line="+42"/>
<source>%1 exited with code %2</source>
- <translation type="unfinished">%1 zakończone kodem %2</translation>
+ <translation>%1 zakończone kodem %2</translation>
</message>
</context>
<context>
@@ -23268,7 +23392,7 @@ Please check your project settings.</source>
<message>
<location line="+30"/>
<source>Run</source>
- <translation type="unfinished">Uruchom</translation>
+ <translation>Uruchom</translation>
</message>
</context>
<context>
@@ -23276,68 +23400,74 @@ Please check your project settings.</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp" line="+100"/>
<source>Testing configuration...</source>
- <translation type="unfinished"></translation>
+ <translation>Testowanie konfiguracji...</translation>
</message>
<message>
<location line="+1"/>
<source>Stop Test</source>
- <translation type="unfinished"></translation>
+ <translation>Zatrzymaj test</translation>
</message>
<message>
<location line="+23"/>
<source>Device configuration test failed:
%1</source>
- <translation type="unfinished"></translation>
+ <translation>Test konfiguracji urządzenia zakończony niepowodzeniem:
+%1</translation>
</message>
<message>
<location line="+2"/>
<source>
Did you start Qemu?</source>
- <translation type="unfinished"></translation>
+ <translation>
+Czy uruchomiłeś Qemu?</translation>
</message>
<message>
<location line="+4"/>
<source>Qt version mismatch! Expected Qt on device: 4.6.2 or later.</source>
- <translation type="unfinished"></translation>
+ <translation>Niezgodność wersji Qt. Oczekiwano wersji 4.6.2 lub późniejszej dla urządzenia.</translation>
</message>
<message>
<location line="+19"/>
<source>Close</source>
- <translation type="unfinished">Zamknij</translation>
+ <translation>Zamknij</translation>
</message>
<message>
<location line="+17"/>
<source>Device configuration test failed: Unexpected output:
%1</source>
- <translation type="unfinished"></translation>
+ <translation>Test konfiguracji urządzenia zakończony niepowodzeniem: Nieoczekiwany komunikat:
+%1</translation>
</message>
<message>
<location line="+5"/>
<source>Hardware architecture: %1
</source>
- <translation type="unfinished"></translation>
+ <translation>Architektura sprzętu: %1
+</translation>
</message>
<message>
<location line="+1"/>
<source>Kernel version: %1
</source>
- <translation type="unfinished"></translation>
+ <translation>Wersja kernela: %1
+</translation>
</message>
<message>
<location line="+1"/>
<source>Device configuration successful.
</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja urządzenia zakończona pomyślnie.
+</translation>
</message>
<message>
<location line="+4"/>
<source>No Qt packages installed.</source>
- <translation type="unfinished"></translation>
+ <translation>Brak zainstalowanych pakietów Qt.</translation>
</message>
<message>
<location line="+4"/>
<source>List of installed Qt packages:</source>
- <translation type="unfinished"></translation>
+ <translation>Lista zainstalowanych pakietów Qt:</translation>
</message>
</context>
<context>
@@ -23346,12 +23476,12 @@ Did you start Qemu?</source>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp" line="+156"/>
<location line="+40"/>
<source>Start Maemo Emulator</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom emulator Maemo</translation>
</message>
<message>
<location line="+3"/>
<source>Stop Maemo Emulator</source>
- <translation type="unfinished"></translation>
+ <translation>Zatrzymaj emulator Maemo</translation>
</message>
</context>
<context>
@@ -23359,7 +23489,7 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp" line="+92"/>
<source>New Maemo Run Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Nowa konfiguracja uruchamiania Maemo</translation>
</message>
<message>
<location line="+323"/>
@@ -23377,37 +23507,37 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp" line="+67"/>
<source>Run configuration name:</source>
- <translation type="unfinished"></translation>
+ <translation>Nazwa konfiguracji uruchamiania:</translation>
</message>
<message>
<location line="+8"/>
<source><a href="%1">Manage device configurations</a></source>
- <translation type="unfinished"></translation>
+ <translation><a href="%1">ZarzÄ…dzanie konfiguracjami urzÄ…dzenia</a></translation>
</message>
<message>
<location line="+5"/>
<source><a href="%1">Set Debugger</a></source>
- <translation type="unfinished"></translation>
+ <translation><a href="%1">Ustaw debugger</a></translation>
</message>
<message>
<location line="+5"/>
<source>Device Configuration:</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja urzÄ…dzenia:</translation>
</message>
<message>
<location line="+2"/>
<source>Executable:</source>
- <translation type="unfinished">Program:</translation>
+ <translation>Program:</translation>
</message>
<message>
<location line="+2"/>
<source>Arguments:</source>
- <translation type="unfinished">Argumenty:</translation>
+ <translation>Argumenty:</translation>
</message>
<message>
<location line="+3"/>
<source>Simulator:</source>
- <translation type="unfinished"></translation>
+ <translation>Symulator:</translation>
</message>
</context>
<context>
@@ -23415,77 +23545,77 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp" line="+162"/>
<source>Files to deploy: %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Pliki do zainstalowania: %1.</translation>
</message>
<message>
<location line="-14"/>
<source>Deploying</source>
- <translation type="unfinished"></translation>
+ <translation>Instalowanie</translation>
</message>
<message>
<location line="-71"/>
<source>No device configuration set for run configuration.</source>
- <translation type="unfinished"></translation>
+ <translation>Brak konfiguracji urzÄ…dzenia dla konfiguracji uruchamiania.</translation>
</message>
<message>
<location line="+9"/>
<source>Cleaning up remote leftovers first ...</source>
- <translation type="unfinished"></translation>
+ <translation>Porządkowanie zdalnych pozostałości...</translation>
</message>
<message>
<location line="+20"/>
<source>Initial cleanup canceled by user.</source>
- <translation type="unfinished"></translation>
+ <translation>Wstępne porządkowanie anulowane przez użytkownika.</translation>
</message>
<message>
<location line="+3"/>
<source>Error running initial cleanup: %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd podczas wstępnego porządkowania: %1.</translation>
</message>
<message>
<location line="+4"/>
<source>Initial cleanup done.</source>
- <translation type="unfinished"></translation>
+ <translation>Zakończono wstępne porządkowanie.</translation>
</message>
<message>
<location line="+104"/>
<source>Starting remote application.</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchamianie zdalnej aplikacji.</translation>
</message>
<message>
<location line="+44"/>
<source>Deployment canceled by user.</source>
- <translation type="unfinished"></translation>
+ <translation>Instalowanie anulowane przez użytkownika.</translation>
</message>
<message>
<location line="+6"/>
<source>Deployment finished.</source>
- <translation type="unfinished"></translation>
+ <translation>Zakończono instalowanie.</translation>
</message>
<message>
<location line="+18"/>
<source>Remote execution canceled due to user request.</source>
- <translation type="unfinished"></translation>
+ <translation>Zdalne uruchomienie anulowane na żądanie użytkownika.</translation>
</message>
<message>
<location line="+3"/>
<source>Error running remote process: %1</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d zdalnego procesu: %1</translation>
</message>
<message>
<location line="+4"/>
<source>Finished running remote process.</source>
- <translation type="unfinished"></translation>
+ <translation>Zakończono zdalny proces.</translation>
</message>
<message>
<location line="+48"/>
<source>Remote Execution Failure</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d zdalnego procesu</translation>
</message>
<message>
<location line="-76"/>
<source>Deployment failed: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Instalacja zakończona niepowodzeniem: %1</translation>
</message>
</context>
<context>
@@ -23500,7 +23630,7 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp" line="+285"/>
<source>Run on device</source>
- <translation type="unfinished"></translation>
+ <translation>Uruchom na urzÄ…dzeniu</translation>
</message>
</context>
<context>
@@ -23508,54 +23638,54 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp" line="+341"/>
<source>Choose public key file</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz plik z kluczem publicznym</translation>
</message>
<message>
<location line="+22"/>
<source>Stop deploying</source>
- <translation type="unfinished"></translation>
+ <translation>Zatrzymaj instalowanie</translation>
</message>
<message>
<location line="-11"/>
<location line="+22"/>
<source>Deployment Failed</source>
- <translation type="unfinished"></translation>
+ <translation>Instalacja zakończona niepowodzeniem</translation>
</message>
<message>
<location line="-222"/>
<source>New Device Configuration %1</source>
<comment>Standard Configuration name with number</comment>
- <translation type="unfinished"></translation>
+ <translation>Nowa konfiguracja urzÄ…dzenia %1</translation>
</message>
<message>
<location line="+190"/>
<source>Public Key Files(*.pub);;All Files (*)</source>
- <translation type="unfinished"></translation>
+ <translation>Pliki z kluczami publicznymi (*.pub); Wszystkie pliki (*)</translation>
</message>
<message>
<location line="+11"/>
<source>Could not read public key file '%1'.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można odczytać pliku z publicznym kluczem "%1".</translation>
</message>
<message>
<location line="+22"/>
<source>Key deployment failed: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Instalacja klucza zakończona niepowodzeniem: %1</translation>
</message>
<message>
<location line="+2"/>
<source>Deployment Succeeded</source>
- <translation type="unfinished"></translation>
+ <translation>Instalacja zakończona pomyślnie</translation>
</message>
<message>
<location line="+1"/>
<source>Key was successfully deployed.</source>
- <translation type="unfinished"></translation>
+ <translation>Klucz został pomyślnie zainstalowany.</translation>
</message>
<message>
<location line="+13"/>
<source>Deploy Public Key ...</source>
- <translation type="unfinished"></translation>
+ <translation>Zainstaluj klucz publiczny...</translation>
</message>
</context>
<context>
@@ -23564,7 +23694,7 @@ Did you start Qemu?</source>
<location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp" line="+74"/>
<source>Create sis Package</source>
<comment>Create sis package build step name</comment>
- <translation type="unfinished"></translation>
+ <translation>Utwórz pakiet sis</translation>
</message>
</context>
<context>
@@ -23572,25 +23702,25 @@ Did you start Qemu?</source>
<message>
<location line="+149"/>
<source>Create sis Package</source>
- <translation type="unfinished"></translation>
+ <translation>Utwórz pakiet sis</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60CreatePackageStepConfigWidget</name>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>self-signed</source>
- <translation type="unfinished"></translation>
+ <translation>własnoręcznie podpisany</translation>
</message>
<message>
<location line="+2"/>
<source>signed with certificate %1 and key file %2</source>
- <translation type="unfinished"></translation>
+ <translation>podpisany certyfikatem %1 i kluczem %2</translation>
</message>
<message>
<location line="+4"/>
<source><b>Create sis Package:</b> %1</source>
- <translation type="unfinished"></translation>
+ <translation><b>Utwórz pakiet sis:</b> %1</translation>
</message>
</context>
<context>
@@ -23598,27 +23728,27 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4buildconfiguration.cpp" line="+571"/>
<source>Using Qt Version "%1"</source>
- <translation type="unfinished">Używając wersji "%1"</translation>
+ <translation>Używając wersji "%1"</translation>
</message>
<message>
<location line="+54"/>
<source>New configuration</source>
- <translation type="unfinished">Nowa konfiguracja</translation>
+ <translation>Nowa konfiguracja</translation>
</message>
<message>
<location line="+1"/>
<source>New Configuration Name:</source>
- <translation type="unfinished">Nazwa nowej konfiguracji:</translation>
+ <translation>Nazwa nowej konfiguracji:</translation>
</message>
<message>
<location line="+7"/>
<source>%1 Debug</source>
- <translation type="unfinished">%1 Debug</translation>
+ <translation>%1 Debug</translation>
</message>
<message>
<location line="+5"/>
<source>%1 Release</source>
- <translation type="unfinished">%1 Release</translation>
+ <translation>%1 Release</translation>
</message>
</context>
<context>
@@ -23626,36 +23756,36 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerconstants.h" line="+35"/>
<source>Qt4</source>
- <translation type="unfinished"></translation>
+ <translation>Qt4</translation>
</message>
<message>
<location line="+2"/>
<source>Qt Versions</source>
- <translation type="unfinished"></translation>
+ <translation>Wersje Qt</translation>
</message>
<message>
<location line="+5"/>
<source>Qt C++ Project</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt Qt C++</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::Qt4TargetFactory</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4target.cpp" line="-271"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt4target.cpp" line="-274"/>
<source>Debug</source>
- <translation type="unfinished"></translation>
+ <translation>Debug</translation>
</message>
<message>
<location line="+0"/>
<source>Release</source>
- <translation type="unfinished"></translation>
+ <translation>Release</translation>
</message>
</context>
<context>
<name>QtVersion</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+902"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+928"/>
<source>No qmake path set</source>
<translation>Nie ustawiono ścieżki do qmake</translation>
</message>
@@ -23672,10 +23802,10 @@ Did you start Qemu?</source>
<message>
<location line="+2"/>
<source>Could not determine the path to the binaries of the Qt installation, maybe the qmake path is wrong?</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można określić ścieżki do plików binarnych instalacji Qt. Sprawdź ścieżkę do qmake.</translation>
</message>
<message>
- <location line="+122"/>
+ <location line="+128"/>
<source>The Qt Version has no toolchain.</source>
<translation>Ta wersja Qt nie posiada zestawu narzędzi.</translation>
</message>
@@ -23685,12 +23815,12 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/mobileguiappwizard.cpp" line="+44"/>
<source>Mobile Qt Application</source>
- <translation type="unfinished"></translation>
+ <translation>Mobilna aplikacja Qt</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a mobile Qt Gui Application with one form.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy mobilnÄ… aplikacjÄ™ Qt Gui z jednym formularzem.</translation>
</message>
</context>
<context>
@@ -23699,12 +23829,12 @@ Did you start Qemu?</source>
<location filename="../../../src/plugins/qt4projectmanager/wizards/qtwizard.cpp" line="+225"/>
<location line="+4"/>
<source>Modules</source>
- <translation type="unfinished">Moduły</translation>
+ <translation>Moduły</translation>
</message>
<message>
<location line="+26"/>
<source>Qt Versions</source>
- <translation type="unfinished"></translation>
+ <translation>Wersje Qt</translation>
</message>
</context>
<context>
@@ -23712,78 +23842,78 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/targetsetuppage.ui"/>
<source>Qt Creator can set up the following targets:</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Creator może ustawić następujące produkty docelowe:</translation>
</message>
<message>
<location/>
<source>Qt Version</source>
- <translation type="unfinished"></translation>
+ <translation>Wersja Qt</translation>
</message>
<message>
<location/>
<source>Status</source>
- <translation type="unfinished"></translation>
+ <translation>Stan</translation>
</message>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp" line="+162"/>
<source>Import</source>
<comment>Is this an import of an existing build or a new one?</comment>
- <translation type="unfinished"></translation>
+ <translation>Import</translation>
</message>
<message>
<location line="+1"/>
<source>New</source>
<comment>Is this an import of an existing build or a new one?</comment>
- <translation type="unfinished">Nowy</translation>
+ <translation>Nowy</translation>
</message>
<message>
- <location line="+134"/>
+ <location line="+137"/>
<source>Qt Creator can set up the following targets for project <b>%1</b>:</source>
<comment>%1: Project name</comment>
- <translation type="unfinished"></translation>
+ <translation>Qt Creator może ustawić następujące produkty docelowe dla projektu <b>%1</b>:</translation>
</message>
<message>
<location line="+107"/>
<source>Choose a directory to scan for additional shadow builds</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz katalog w którym przeszukiwać dodatkowych wersji zbudowanych na zewnątrz</translation>
</message>
<message>
<location line="+13"/>
<source>No builds found</source>
- <translation type="unfinished"></translation>
+ <translation>Brak zbudowanych wersji</translation>
</message>
<message>
<location line="+1"/>
<source>No builds for project file "%1" were found in the folder "%2".</source>
<comment>%1: pro-file, %2: directory that was checked.</comment>
- <translation type="unfinished"></translation>
+ <translation>Brak zbudowanych wersji dla projektu "%1" w katalogu "%2".</translation>
</message>
<message>
<location line="+35"/>
<source><b>Error:</b> </source>
<comment>Severity is Task::Error</comment>
- <translation type="unfinished"></translation>
+ <translation><b>BÅ‚Ä…d:</b> </translation>
</message>
<message>
<location line="+4"/>
<source><b>Warning:</b> </source>
<comment>Severity is Task::Warning</comment>
- <translation type="unfinished"></translation>
+ <translation><b>Ostrzeżenie:</b> </translation>
</message>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/targetsetuppage.ui"/>
<source>Setup targets for your project</source>
- <translation type="unfinished"></translation>
+ <translation>Ustaw produkty docelowe dla projektu</translation>
</message>
<message>
<location/>
<source>Build Directory</source>
- <translation type="unfinished"></translation>
+ <translation>Katalog wersji</translation>
</message>
<message>
<location/>
<source>Import existing shadow build...</source>
- <translation type="unfinished"></translation>
+ <translation>Zaimportuj istniejÄ…cÄ… wersjÄ™ zbudowanÄ… w innym miejscu...</translation>
</message>
</context>
<context>
@@ -23791,12 +23921,12 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/testwizard.cpp" line="+51"/>
<source>Qt Unit Test</source>
- <translation type="unfinished"></translation>
+ <translation>Test jednostkowy Qt</translation>
</message>
<message>
<location line="+1"/>
<source>Creates a Qt Unit Test.</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzy test jednostkowy Qt.</translation>
</message>
</context>
<context>
@@ -23804,7 +23934,7 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp" line="+58"/>
<source>This wizard generates a Qt unit test consisting of a single source file with a test class.</source>
- <translation type="unfinished"></translation>
+ <translation>Ten kreator generuje test jednostkowy składający się z pojedynczego pliku źródłowego z klasą testową.</translation>
</message>
<message>
<location line="+8"/>
@@ -23817,13 +23947,13 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/subversion/subversioneditor.cpp" line="+54"/>
<source>Annotate revision "%1"</source>
- <translation type="unfinished"></translation>
+ <translation>Dołącz adnotację do poprawki "%1"</translation>
</message>
</context>
<context>
<name>TextEditor</name>
<message>
- <location filename="../../../src/plugins/texteditor/texteditorconstants.h" line="+111"/>
+ <location filename="../../../src/plugins/texteditor/texteditorconstants.h" line="+127"/>
<source>Text Editor</source>
<translation>Edytor tekstu</translation>
</message>
@@ -23868,47 +23998,47 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/vcsbase/vcsbaseplugin.cpp" line="+540"/>
<source>Version Control</source>
- <translation type="unfinished">System kontroli wersji</translation>
+ <translation>System kontroli wersji</translation>
</message>
<message>
<location line="+0"/>
<source>The file '%1' could not be deleted.</source>
- <translation type="unfinished">Nie można skasować pliku "%1".</translation>
+ <translation>Nie można usunąć pliku "%1".</translation>
</message>
<message>
<location line="+20"/>
<source>Choose repository directory</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz katalog składnicy</translation>
</message>
<message>
<location line="+6"/>
<source>The directory '%1' is already managed by a version control system (%2). Would you like to specify another directory?</source>
- <translation type="unfinished"></translation>
+ <translation>Katalog "%1" jest już zarządzany przez system kontroli wersji (%2). Czy chcesz podać inny katalog?</translation>
</message>
<message>
<location line="+3"/>
<source>Repository already under version control</source>
- <translation type="unfinished"></translation>
+ <translation>Składnica znajduje się już w systemie kontroli wersji</translation>
</message>
<message>
<location line="+6"/>
<source>Repository created</source>
- <translation type="unfinished"></translation>
+ <translation>Utworzono składnicę</translation>
</message>
<message>
<location line="+1"/>
<source>A version control repository has been created in %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Składnica systemu kontroli wersji została utworzona w %1.</translation>
</message>
<message>
<location line="+2"/>
<source>Repository creation failed</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd podczas tworzenia składnicy</translation>
</message>
<message>
<location line="+1"/>
<source>A version control repository could not be created in %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć składnicy systemu kontroli wersji w %1.</translation>
</message>
</context>
<context>
@@ -23916,17 +24046,17 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/shared/symbianutils/launcher.cpp" line="+492"/>
<source>Cannot open remote file '%1': %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć zdalnego pliku "%1": %2</translation>
</message>
<message>
<location line="+5"/>
<source>Cannot open '%1': %2</source>
- <translation type="unfinished">Nie można otworzyć "%1": %2</translation>
+ <translation>Nie można otworzyć "%1": %2</translation>
</message>
<message>
<location line="+363"/>
<source>Unable to acquire a device for port '%1'. It appears to be in use.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można pozyskać urządzenia na porcie "%1". Wygląda że jest w użyciu.</translation>
</message>
</context>
<context>
@@ -23943,22 +24073,22 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/cpaster/fileshareprotocolsettingswidget.ui"/>
<source>Form</source>
- <translation type="unfinished">Formularz</translation>
+ <translation>Formularz</translation>
</message>
<message>
<location/>
<source>&Path:</source>
- <translation type="unfinished"></translation>
+ <translation>Ś&cieżka:</translation>
</message>
<message>
<location/>
<source>&Display:</source>
- <translation type="unfinished"></translation>
+ <translation>&Wyświetl:</translation>
</message>
<message>
<location/>
<source>entries</source>
- <translation type="unfinished"></translation>
+ <translation>wpisów</translation>
</message>
<message>
<location/>
@@ -23971,7 +24101,7 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/qmlinspector/startexternalqmldialog.ui"/>
<source>Start Simultaneous QML and C++ Debugging </source>
- <translation type="unfinished"></translation>
+ <translation>Rozpocznij jednoczesne debugowanie QML i C++ </translation>
</message>
<message>
<location/>
@@ -23986,17 +24116,17 @@ Did you start Qemu?</source>
<message>
<location/>
<source>127.0.0.1</source>
- <translation type="unfinished">127.0.0.1</translation>
+ <translation>127.0.0.1</translation>
</message>
<message>
<location/>
<source>Project:</source>
- <translation type="unfinished"></translation>
+ <translation>Projekt:</translation>
</message>
<message>
<location/>
<source><No project></source>
- <translation type="unfinished"></translation>
+ <translation><Brak projektu></translation>
</message>
<message>
<location/>
@@ -24019,7 +24149,7 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.ui"/>
<source>Package contents:</source>
- <translation type="unfinished"></translation>
+ <translation>Zawartość pakietu:</translation>
</message>
</context>
<context>
@@ -24027,57 +24157,57 @@ Did you start Qemu?</source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosshconfigdialog.ui"/>
<source>SSH Key Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Konfiguracja klucza SSH</translation>
</message>
<message>
<location/>
<source>Options</source>
- <translation type="unfinished">Opcje</translation>
+ <translation>Opcje</translation>
</message>
<message>
<location/>
<source>Key size:</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar klucza:</translation>
</message>
<message>
<location/>
<source>Key algorithm:</source>
- <translation type="unfinished"></translation>
+ <translation>Algorytm klucza:</translation>
</message>
<message>
<location/>
<source>RSA</source>
- <translation type="unfinished"></translation>
+ <translation>RSA</translation>
</message>
<message>
<location/>
<source>DSA</source>
- <translation type="unfinished"></translation>
+ <translation>DSA</translation>
</message>
<message>
<location/>
<source>Key</source>
- <translation type="unfinished">Klucz</translation>
+ <translation>Klucz</translation>
</message>
<message>
<location/>
<source>Generate SSH Key</source>
- <translation type="unfinished"></translation>
+ <translation>Generuj klucz SSH</translation>
</message>
<message>
<location/>
<source>Save public Key...</source>
- <translation type="unfinished"></translation>
+ <translation>Zachowaj klucz publiczny...</translation>
</message>
<message>
<location/>
<source>Save private Key...</source>
- <translation type="unfinished"></translation>
+ <translation>Zachowaj klucz prywatny...</translation>
</message>
<message>
<location/>
<source>Close</source>
- <translation type="unfinished">Zamknij</translation>
+ <translation>Zamknij</translation>
</message>
</context>
<context>
@@ -24090,7 +24220,7 @@ Did you start Qemu?</source>
<message>
<location/>
<source> characters</source>
- <translation type="unfinished"></translation>
+ <translation> znakach</translation>
</message>
<message>
<location/>
@@ -24134,12 +24264,12 @@ name <email> alias <email></source>
<message>
<location line="+7"/>
<source>Source</source>
- <translation type="unfinished"></translation>
+ <translation>Źródło</translation>
</message>
<message>
<location line="+20"/>
<source>Source Size</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar źródła</translation>
</message>
<message>
<location line="+35"/>
@@ -24167,7 +24297,7 @@ name <email> alias <email></source>
<message>
<location filename="../qmldesigner/propertyeditor/Qt/ExpressionEditor.qml" line="+49"/>
<source>Expression</source>
- <translation type="unfinished">Wyrażenie</translation>
+ <translation>Wyrażenie</translation>
</message>
</context>
<context>
@@ -24175,28 +24305,28 @@ name <email> alias <email></source>
<message>
<location filename="../qmldesigner/propertyeditor/Qt/Extended.qml" line="+5"/>
<source>Effect</source>
- <translation type="unfinished"></translation>
+ <translation>Efekt</translation>
</message>
<message>
<location line="+71"/>
<location line="+70"/>
<source>Blur Radius:</source>
- <translation type="unfinished"></translation>
+ <translation>Promień rozmycia:</translation>
</message>
<message>
<location line="-18"/>
<source>Pixel Size:</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar piksli:</translation>
</message>
<message>
<location line="+41"/>
<source>x Offset: </source>
- <translation type="unfinished"></translation>
+ <translation>Przesunięcie x: </translation>
</message>
<message>
<location line="+11"/>
<source>y Offset: </source>
- <translation type="unfinished"></translation>
+ <translation>Przesunięcie y: </translation>
</message>
</context>
<context>
@@ -24204,12 +24334,12 @@ name <email> alias <email></source>
<message>
<location filename="../qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml" line="+64"/>
<source>Reset</source>
- <translation type="unfinished">Przywróć</translation>
+ <translation>Przywróć</translation>
</message>
<message>
<location line="+11"/>
<source>Set Expression</source>
- <translation type="unfinished"></translation>
+ <translation>Ustaw wyrażenie</translation>
</message>
</context>
<context>
@@ -24218,22 +24348,22 @@ name <email> alias <email></source>
<location filename="../qmldesigner/propertyeditor/Qt/FontGroupBox.qml" line="+6"/>
<location line="+7"/>
<source>Font</source>
- <translation type="unfinished">Czcionka</translation>
+ <translation>Czcionka</translation>
</message>
<message>
<location line="+25"/>
<source>Size</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar</translation>
</message>
<message>
<location line="+32"/>
<source>Font Style</source>
- <translation type="unfinished"></translation>
+ <translation>Styl czcionki</translation>
</message>
<message>
<location line="+9"/>
<source>Style</source>
- <translation type="unfinished"></translation>
+ <translation>Styl</translation>
</message>
</context>
<context>
@@ -24241,22 +24371,22 @@ name <email> alias <email></source>
<message>
<location filename="../qmldesigner/propertyeditor/Qt/Geometry.qml" line="+8"/>
<source>Geometry</source>
- <translation type="unfinished"></translation>
+ <translation>Geometria</translation>
</message>
<message>
<location line="+9"/>
<source>Position</source>
- <translation type="unfinished"></translation>
+ <translation>Pozycja</translation>
</message>
<message>
<location line="+40"/>
<source>Size</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar</translation>
</message>
<message>
<location line="+34"/>
<source>Lock aspect ratio</source>
- <translation type="unfinished"></translation>
+ <translation>Zablokuj aspekt</translation>
</message>
</context>
<context>
@@ -24269,17 +24399,17 @@ name <email> alias <email></source>
<message>
<location line="+7"/>
<source>Source</source>
- <translation type="unfinished"></translation>
+ <translation>Źródło</translation>
</message>
<message>
<location line="+19"/>
<source>Fill Mode</source>
- <translation type="unfinished"></translation>
+ <translation>Tryb wypełniania</translation>
</message>
<message>
<location line="+18"/>
<source>Aliasing</source>
- <translation type="unfinished"></translation>
+ <translation>Antyaliasing</translation>
</message>
<message>
<location line="+4"/>
@@ -24289,7 +24419,7 @@ name <email> alias <email></source>
<message>
<location line="+12"/>
<source>Source Size</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmiar źródła</translation>
</message>
<message>
<location line="+35"/>
@@ -24302,12 +24432,12 @@ name <email> alias <email></source>
<message>
<location filename="../qmldesigner/propertyeditor/Qt/Layout.qml" line="+7"/>
<source>Layout</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmieszczenie</translation>
</message>
<message>
<location line="+12"/>
<source>Anchors</source>
- <translation type="unfinished"></translation>
+ <translation>Kotwice</translation>
</message>
<message>
<location line="+33"/>
@@ -24317,7 +24447,7 @@ name <email> alias <email></source>
<location line="+48"/>
<location line="+48"/>
<source>Target</source>
- <translation type="unfinished"></translation>
+ <translation>Produkt docelowy</translation>
</message>
<message>
<location line="-224"/>
@@ -24327,7 +24457,7 @@ name <email> alias <email></source>
<location line="+48"/>
<location line="+48"/>
<source>Margin</source>
- <translation type="unfinished"></translation>
+ <translation>Margines</translation>
</message>
</context>
<context>
@@ -24335,17 +24465,17 @@ name <email> alias <email></source>
<message>
<location filename="../qmldesigner/propertyeditor/Qt/Modifiers.qml" line="+6"/>
<source>Manipulation</source>
- <translation type="unfinished"></translation>
+ <translation>Manipulacja</translation>
</message>
<message>
<location line="+118"/>
<source>Rotation</source>
- <translation type="unfinished"></translation>
+ <translation>Rotacja</translation>
</message>
<message>
<location line="+9"/>
<source>z</source>
- <translation type="unfinished"></translation>
+ <translation>z</translation>
</message>
</context>
<context>
@@ -24353,27 +24483,27 @@ name <email> alias <email></source>
<message>
<location filename="../qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml" line="+7"/>
<source>Colors</source>
- <translation type="unfinished"></translation>
+ <translation>Kolory</translation>
</message>
<message>
<location line="+43"/>
<source>Stops</source>
- <translation type="unfinished"></translation>
+ <translation>Punkty</translation>
</message>
<message>
<location line="+1"/>
<source>Gradient Stops</source>
- <translation type="unfinished"></translation>
+ <translation>Punkty gradientu</translation>
</message>
<message>
<location line="+14"/>
<source>Rectangle</source>
- <translation type="unfinished"></translation>
+ <translation>ProstokÄ…t</translation>
</message>
<message>
<location line="+45"/>
<source>Border</source>
- <translation type="unfinished"></translation>
+ <translation>Brzeg</translation>
</message>
</context>
<context>
@@ -24381,17 +24511,17 @@ name <email> alias <email></source>
<message>
<location filename="../qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml" line="+21"/>
<source>Rectangle</source>
- <translation type="unfinished"></translation>
+ <translation>ProstokÄ…t</translation>
</message>
<message>
<location line="+10"/>
<source>Border</source>
- <translation type="unfinished"></translation>
+ <translation>Brzeg</translation>
</message>
<message>
<location line="+11"/>
<source>Radius</source>
- <translation type="unfinished"></translation>
+ <translation>Promień</translation>
</message>
</context>
<context>
@@ -24399,27 +24529,27 @@ name <email> alias <email></source>
<message>
<location filename="../qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml" line="+11"/>
<source>Color</source>
- <translation type="unfinished"></translation>
+ <translation>Kolor</translation>
</message>
<message>
<location line="+4"/>
<source>Text</source>
- <translation type="unfinished">Tekst</translation>
+ <translation>Tekst</translation>
</message>
<message>
<location line="+7"/>
<source>Style</source>
- <translation type="unfinished"></translation>
+ <translation>Styl</translation>
</message>
<message>
<location line="+8"/>
<source>Selection</source>
- <translation type="unfinished">Zaznaczone</translation>
+ <translation>Zaznaczenie</translation>
</message>
<message>
<location line="+9"/>
<source>Selected</source>
- <translation type="unfinished"></translation>
+ <translation>Zaznaczony</translation>
</message>
</context>
<context>
@@ -24428,7 +24558,7 @@ name <email> alias <email></source>
<location filename="../qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml" line="+7"/>
<location line="+9"/>
<source>Text</source>
- <translation type="unfinished">Tekst</translation>
+ <translation>Tekst</translation>
</message>
<message>
<location line="+12"/>
@@ -24443,7 +24573,7 @@ name <email> alias <email></source>
<message>
<location line="+18"/>
<source>Aliasing</source>
- <translation type="unfinished"></translation>
+ <translation>Antyaliasing</translation>
</message>
<message>
<location line="+4"/>
@@ -24461,27 +24591,27 @@ name <email> alias <email></source>
<message>
<location filename="../qmldesigner/propertyeditor/Qt/Switches.qml" line="+21"/>
<source>special properties</source>
- <translation type="unfinished"></translation>
+ <translation>specjalne właściwości</translation>
</message>
<message>
<location line="+17"/>
<source>layout and geometry</source>
- <translation type="unfinished"></translation>
+ <translation>rozmieszczenie i geometria</translation>
</message>
<message>
<location line="+1"/>
<source>Geometry</source>
- <translation type="unfinished"></translation>
+ <translation>Geometria</translation>
</message>
<message>
<location line="+13"/>
<source>advanced properties</source>
- <translation type="unfinished"></translation>
+ <translation>zaawansowane właściwości</translation>
</message>
<message>
<location line="+3"/>
<source>Advanced</source>
- <translation type="unfinished"></translation>
+ <translation>Zaawansowane</translation>
</message>
</context>
<context>
@@ -24494,7 +24624,7 @@ name <email> alias <email></source>
<message>
<location line="+8"/>
<source>Format</source>
- <translation type="unfinished"></translation>
+ <translation>Format</translation>
</message>
</context>
<context>
@@ -24527,17 +24657,17 @@ name <email> alias <email></source>
<message>
<location line="+12"/>
<source>Flags</source>
- <translation type="unfinished"></translation>
+ <translation>Flagi</translation>
</message>
<message>
<location line="+3"/>
<source>Read Only</source>
- <translation type="unfinished"></translation>
+ <translation>Tylko do odczytu</translation>
</message>
<message>
<location line="+15"/>
<source>Cursor Visible</source>
- <translation type="unfinished"></translation>
+ <translation>Kursor widoczny</translation>
</message>
<message>
<location line="+14"/>
@@ -24555,7 +24685,7 @@ name <email> alias <email></source>
<message>
<location filename="../qmldesigner/propertyeditor/Qt/Transformation.qml" line="+6"/>
<source>Transformation</source>
- <translation type="unfinished"></translation>
+ <translation>Transformacja</translation>
</message>
<message>
<location line="+9"/>
@@ -24610,12 +24740,12 @@ name <email> alias <email></source>
<message>
<location line="+9"/>
<source>Scale</source>
- <translation type="unfinished"></translation>
+ <translation>Skala</translation>
</message>
<message>
<location line="+35"/>
<source>Rotation</source>
- <translation type="unfinished"></translation>
+ <translation>Rotacja</translation>
</message>
</context>
<context>
@@ -24624,12 +24754,12 @@ name <email> alias <email></source>
<location filename="../qmldesigner/propertyeditor/Qt/Type.qml" line="+7"/>
<location line="+7"/>
<source>Type</source>
- <translation type="unfinished">Typ</translation>
+ <translation>Typ</translation>
</message>
<message>
<location line="+17"/>
<source>Id</source>
- <translation type="unfinished"></translation>
+ <translation>Identyfikator</translation>
</message>
</context>
<context>
@@ -24638,22 +24768,22 @@ name <email> alias <email></source>
<location filename="../qmldesigner/propertyeditor/Qt/Visibility.qml" line="+6"/>
<location line="+9"/>
<source>Visibility</source>
- <translation type="unfinished"></translation>
+ <translation>Widoczność</translation>
</message>
<message>
<location line="+4"/>
<source>Is visible</source>
- <translation type="unfinished"></translation>
+ <translation>jest widoczny</translation>
</message>
<message>
<location line="+7"/>
<source>Clip</source>
- <translation type="unfinished"></translation>
+ <translation>Klip</translation>
</message>
<message>
<location line="+11"/>
<source>Opacity</source>
- <translation type="unfinished"></translation>
+ <translation>Nieprzezroczystość</translation>
</message>
</context>
<context>
@@ -24661,17 +24791,17 @@ name <email> alias <email></source>
<message>
<location filename="../qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml" line="+18"/>
<source>WebView</source>
- <translation type="unfinished"></translation>
+ <translation>WidokSieci</translation>
</message>
<message>
<location line="+21"/>
<source>Preferred Width</source>
- <translation type="unfinished"></translation>
+ <translation>Preferowana szerokość</translation>
</message>
<message>
<location line="+10"/>
<source>Page Height</source>
- <translation type="unfinished"></translation>
+ <translation>Wysokość strony</translation>
</message>
</context>
<context>
@@ -24679,12 +24809,12 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/libs/utils/fancymainwindow.cpp" line="+63"/>
<source>Locked</source>
- <translation type="unfinished">Zablokowany</translation>
+ <translation>Zablokowany</translation>
</message>
<message>
<location line="+2"/>
<source>Reset to Default Layout</source>
- <translation type="unfinished">Przywróć domyślne rozmieszczenie</translation>
+ <translation>Przywróć domyślne rozmieszczenie</translation>
</message>
<message>
<source>Reset to default layout</source>
@@ -24696,7 +24826,7 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/coreplugin/ssh/sshconnection.cpp" line="+93"/>
<source>Could not connect to host.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można połączyć się z hostem.</translation>
</message>
<message>
<location line="+5"/>
@@ -24709,7 +24839,7 @@ name <email> alias <email></source>
<message>
<location line="+133"/>
<source>Error sending input</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd podczas wysyłania wejścia</translation>
</message>
</context>
<context>
@@ -24717,48 +24847,48 @@ name <email> alias <email></source>
<message>
<location line="+59"/>
<source>Error setting up SFTP subsystem</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d podczas ustanawiania podsystemu SFTP</translation>
</message>
<message>
<location line="+28"/>
<location line="+20"/>
<source>Could not open file '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć pliku "%1"</translation>
</message>
<message>
<location line="-14"/>
<source>Could not uplodad file '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można wysłać pliku "%1"</translation>
</message>
<message>
<location line="+20"/>
<source>Could not copy remote file '%1' to local file '%2'</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można skopiować pliku zdalnego "%1" do pliku lokalnego "%2"</translation>
</message>
<message>
<location line="+12"/>
<source>Could not create remote directory</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć zdalnego katalogu</translation>
</message>
<message>
<location line="+9"/>
<source>Could not remove remote directory</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można usunąć zdalnego katalogu</translation>
</message>
<message>
<location line="+11"/>
<source>Could not get remote directory contents</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otrzymać zawartości zdalnego katalogu</translation>
</message>
<message>
<location line="+11"/>
<source>Could not remove remote file</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można usunąć zdalnego pliku</translation>
</message>
<message>
<location line="+9"/>
<source>Could not change remote working directory</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zmienić zdalnego katalogu roboczego</translation>
</message>
</context>
<context>
@@ -24766,18 +24896,18 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/coreplugin/ssh/sshkeygenerator.cpp" line="+21"/>
<source>Error creating temporary files.</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd podczas tworzenia plików tymczasowych.</translation>
</message>
<message>
<location line="+13"/>
<source>Error generating keys: %1</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d podczas generowania kluczy: %1</translation>
</message>
<message>
<location line="+6"/>
<location line="+8"/>
<source>Error reading temporary files.</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd podczas odczytywania plików tymczasowych.</translation>
</message>
</context>
<context>
@@ -24785,7 +24915,7 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/cpaster/fileshareprotocol.cpp" line="+104"/>
<source>Cannot open %1: %2</source>
- <translation type="unfinished">Nie można otworzyć %1: %2</translation>
+ <translation>Nie można otworzyć %1: %2</translation>
</message>
<message>
<location line="+9"/>
@@ -24795,7 +24925,7 @@ name <email> alias <email></source>
<message>
<location line="+15"/>
<source>Error in %1 at %2: %3</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d w %1 w linii %2: %3</translation>
</message>
<message>
<location line="+11"/>
@@ -24805,7 +24935,7 @@ name <email> alias <email></source>
<message>
<location line="+59"/>
<source>Unable to open a file for writing in %1: %2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć pliku %1 do zapisu: %2</translation>
</message>
<message>
<location line="+17"/>
@@ -24826,12 +24956,12 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/cpaster/protocol.cpp" line="+143"/>
<source>%1 - Configuration Error</source>
- <translation type="unfinished"></translation>
+ <translation>%1 - BÅ‚Ä…d konfiguracji</translation>
</message>
<message>
<location line="+4"/>
<source>Settings...</source>
- <translation type="unfinished">Ustawienia...</translation>
+ <translation>Ustawienia...</translation>
</message>
</context>
<context>
@@ -24839,7 +24969,7 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/cppeditor/cppeditorconstants.h" line="+23"/>
<source>C++</source>
- <translation type="unfinished">C++</translation>
+ <translation>C++</translation>
</message>
</context>
<context>
@@ -24847,7 +24977,7 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/debugger/gdb/gdbchooserwidget.cpp" line="+106"/>
<source>Unable to run '%1': %2</source>
- <translation type="unfinished">Nie można uruchomić "%1": %2</translation>
+ <translation>Nie można uruchomić "%1": %2</translation>
</message>
</context>
<context>
@@ -24855,22 +24985,22 @@ name <email> alias <email></source>
<message>
<location line="+43"/>
<source>Binary</source>
- <translation type="unfinished">Binarny</translation>
+ <translation>Plik binarny</translation>
</message>
<message>
<location line="+0"/>
<source>Toolchains</source>
- <translation type="unfinished"></translation>
+ <translation>Zestawy narzędzi</translation>
</message>
<message>
<location line="+186"/>
<source>Duplicate binary</source>
- <translation type="unfinished"></translation>
+ <translation>Powielony plik binarny</translation>
</message>
<message>
<location line="+1"/>
<source>The binary '%1' already exists.</source>
- <translation type="unfinished"></translation>
+ <translation>Plik binarny "%1" już istnieje.</translation>
</message>
</context>
<context>
@@ -24878,17 +25008,17 @@ name <email> alias <email></source>
<message>
<location line="+83"/>
<source>Desktop/General</source>
- <translation type="unfinished"></translation>
+ <translation>Desktop / Ogólne</translation>
</message>
<message>
<location line="+1"/>
<source>Symbian</source>
- <translation type="unfinished"></translation>
+ <translation>Symbian</translation>
</message>
<message>
<location line="+1"/>
<source>Maemo</source>
- <translation type="unfinished"></translation>
+ <translation>Maemo</translation>
</message>
</context>
<context>
@@ -24896,7 +25026,7 @@ name <email> alias <email></source>
<message>
<location line="+101"/>
<source>Select binary and toolchains</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz plik binarny i zestawy narzędzi</translation>
</message>
<message>
<location line="+3"/>
@@ -24906,7 +25036,7 @@ name <email> alias <email></source>
<message>
<location line="+2"/>
<source>Path:</source>
- <translation type="unfinished">Ścieżka:</translation>
+ <translation>Ścieżka:</translation>
</message>
</context>
<context>
@@ -24914,7 +25044,7 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/debugger/pdb/pdbengine.cpp" line="+155"/>
<source>Running requested...</source>
- <translation type="unfinished">Zażądano uruchomienia...</translation>
+ <translation>Zażądano uruchomienia...</translation>
</message>
<message>
<location line="+30"/>
@@ -24929,22 +25059,22 @@ name <email> alias <email></source>
<message>
<location line="+263"/>
<source>'%1' contains no identifier</source>
- <translation type="unfinished">"%1" nie zawiera identyfikatora</translation>
+ <translation>"%1" nie zawiera identyfikatora</translation>
</message>
<message>
<location line="+5"/>
<source>String literal %1</source>
- <translation type="unfinished">Stała znakowa %1</translation>
+ <translation>Stała znakowa %1</translation>
</message>
<message>
<location line="+15"/>
<source>Cowardly refusing to evaluate expression '%1' with potential side effects</source>
- <translation type="unfinished">Celowa odmowa obliczenia wyrażenia '%1' z możliwymi efektami ubocznymi</translation>
+ <translation>Tchórzliwa odmowa obliczenia wyrażenia '%1' z możliwymi efektami ubocznymi</translation>
</message>
<message>
<location line="+57"/>
<source>Pdb I/O Error</source>
- <translation type="unfinished"></translation>
+ <translation>Błąd wejścia / wyjścia Pdb</translation>
</message>
<message>
<location line="+10"/>
@@ -24959,7 +25089,7 @@ name <email> alias <email></source>
<message>
<location line="+3"/>
<source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
- <translation type="unfinished">Ostatnie wywołanie funkcji waitFor...() zakończyło się niepowodzeniem po określonym czasie. Stan QProcess się nie zmienił, możesz ponownie spróbować wywołać waitFor...().</translation>
+ <translation>Ostatnie wywołanie funkcji waitFor...() zakończyło się niepowodzeniem po określonym czasie. Stan QProcess się nie zmienił, możesz ponownie spróbować wywołać waitFor...().</translation>
</message>
<message>
<location line="+4"/>
@@ -24982,7 +25112,7 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/projectexplorer/sessiondialog.cpp" line="-129"/>
<source>Enter the name of the session:</source>
- <translation type="unfinished"></translation>
+ <translation>Podaj nazwÄ™ sesji:</translation>
</message>
</context>
<context>
@@ -24990,12 +25120,12 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/projectexplorer/targetselector.h" line="+24"/>
<source>Run</source>
- <translation type="unfinished">Uruchom</translation>
+ <translation>Uruchom</translation>
</message>
<message>
<location line="+1"/>
<source>Build</source>
- <translation type="unfinished">Budowanie</translation>
+ <translation>Zbuduj</translation>
</message>
</context>
<context>
@@ -25003,7 +25133,7 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/qmldesigner/components/integration/componentview.cpp" line="+75"/>
<source>whole document</source>
- <translation type="unfinished"></translation>
+ <translation>cały dokument</translation>
</message>
</context>
<context>
@@ -25011,15 +25141,15 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/qmldesigner/components/propertyeditor/filewidget.cpp" line="+102"/>
<source>Open File</source>
- <translation type="unfinished">Otwórz plik</translation>
+ <translation>Otwórz plik</translation>
</message>
</context>
<context>
<name>QmlDesigner::Internal::ModelPrivate</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/core/model/model.cpp" line="+172"/>
+ <location filename="../../../src/plugins/qmldesigner/designercore/model/model.cpp" line="+172"/>
<source>invalid type</source>
- <translation type="unfinished"></translation>
+ <translation>niepoprawny typ</translation>
</message>
</context>
<context>
@@ -25027,7 +25157,7 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/qmldesigner/settingspage.cpp" line="+10"/>
<source>Qt Quick</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Quick</translation>
</message>
</context>
<context>
@@ -25036,7 +25166,7 @@ name <email> alias <email></source>
<location filename="../../../src/plugins/qmlinspector/qmlinspector.cpp" line="-308"/>
<source>Engine %1</source>
<comment>engine number</comment>
- <translation type="unfinished"></translation>
+ <translation>Silnik %1</translation>
</message>
</context>
<context>
@@ -25044,7 +25174,7 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/qmlinspector/startexternalqmldialog.cpp" line="+17"/>
<source><No project></source>
- <translation type="unfinished"></translation>
+ <translation><Brak projektu></translation>
</message>
</context>
<context>
@@ -25052,13 +25182,14 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/qmljseditor/qmljspreviewrunner.cpp" line="+40"/>
<source>Failed to preview Qt Quick file</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć podglądu pliku Qt Quick</translation>
</message>
<message>
<location line="+1"/>
<source>Could not preview Qt Quick (QML) file. Reason:
%1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć podglądu pliku Qt Quick (QML). Przyczyna:
+%1</translation>
</message>
</context>
<context>
@@ -25066,7 +25197,7 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/qmlprojectmanager/qmltaskmanager.cpp" line="+57"/>
<source>QML</source>
- <translation type="unfinished"></translation>
+ <translation>QML</translation>
</message>
</context>
<context>
@@ -25074,12 +25205,12 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp" line="+78"/>
<source>Local File Path</source>
- <translation type="unfinished"></translation>
+ <translation>Ścieżka do lokalnego pliku</translation>
</message>
<message>
<location line="+0"/>
<source>Remote File Path</source>
- <translation type="unfinished"></translation>
+ <translation>Ścieżka do zdalnego pliku</translation>
</message>
</context>
<context>
@@ -25087,12 +25218,12 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp" line="+105"/>
<source>Creating package file ...</source>
- <translation type="unfinished"></translation>
+ <translation>Tworzenie pliku pakietu...</translation>
</message>
<message>
<location line="+3"/>
<source>Cannot open MADDE config file '%1'.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można otworzyć pliku konfiguracyjnego MADDE "%1".</translation>
</message>
<message>
<location line="+40"/>
@@ -25117,7 +25248,7 @@ name <email> alias <email></source>
<message>
<location line="+15"/>
<source>Package created.</source>
- <translation type="unfinished"></translation>
+ <translation>Utworzono pakiet.</translation>
</message>
<message>
<location line="+7"/>
@@ -25150,7 +25281,7 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp" line="+73"/>
<source><b>Create Package:</b> </source>
- <translation type="unfinished"></translation>
+ <translation><b>Utwórz pakiet:</b> </translation>
</message>
</context>
<context>
@@ -25158,7 +25289,7 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp" line="-168"/>
<source>New Maemo Run Configuration</source>
- <translation type="unfinished"></translation>
+ <translation>Nowa konfiguracja uruchamiania Maemo</translation>
</message>
</context>
<context>
@@ -25166,7 +25297,7 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.cpp" line="+69"/>
<source>Maemo Device Configurations</source>
- <translation type="unfinished">Konfiguracje urzÄ…dzenia Maemo</translation>
+ <translation>Konfiguracje urzÄ…dzenia Maemo</translation>
</message>
</context>
<context>
@@ -25174,23 +25305,24 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosshconfigdialog.cpp" line="+124"/>
<source>Save public key file</source>
- <translation type="unfinished"></translation>
+ <translation>Zachowaj plik z kluczem publicznym</translation>
</message>
<message>
<location line="+0"/>
<source>Save private key file</source>
- <translation type="unfinished"></translation>
+ <translation>Zachowaj plik z kluczem prywatnym</translation>
</message>
<message>
<location line="+13"/>
<source>Error writing file</source>
- <translation type="unfinished"></translation>
+ <translation>BÅ‚Ä…d zapisywania do pliku</translation>
</message>
<message>
<location line="+1"/>
<source>Could not write file '%1':
%2</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zapisać pliku "%1":
+ %2</translation>
</message>
</context>
<context>
@@ -25203,17 +25335,17 @@ name <email> alias <email></source>
<message>
<location line="+1"/>
<source>SDK Location</source>
- <translation type="unfinished">Położenie SDK</translation>
+ <translation>Położenie SDK</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Location</source>
- <translation type="unfinished">Położenie Qt</translation>
+ <translation>Położenie Qt</translation>
</message>
<message>
<location line="+157"/>
<source>Choose Qt folder</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz katalog Qt</translation>
</message>
</context>
<context>
@@ -25221,7 +25353,7 @@ name <email> alias <email></source>
<message>
<location line="-122"/>
<source>No Qt installed</source>
- <translation type="unfinished">Brak zainstalowanego Qt</translation>
+ <translation>Brak zainstalowanego Qt</translation>
</message>
</context>
<context>
@@ -25229,22 +25361,22 @@ name <email> alias <email></source>
<message>
<location line="+198"/>
<source>Step 1 of 2: Choose GnuPoc folder</source>
- <translation type="unfinished"></translation>
+ <translation>Krok 1 z 2: Wybierz katalog GnuPoc</translation>
</message>
<message>
<location line="+6"/>
<source>Step 2 of 2: Choose Qt folder</source>
- <translation type="unfinished"></translation>
+ <translation>Krok 2 z 2: Wybierz katalog Qt</translation>
</message>
<message>
<location line="+4"/>
<source>Adding GnuPoc</source>
- <translation type="unfinished"></translation>
+ <translation>Dodawanie GnuPoc</translation>
</message>
<message>
<location line="+1"/>
<source>GnuPoc and Qt folders must not be identical.</source>
- <translation type="unfinished"></translation>
+ <translation>Katalogi GnuPoc i Qt nie mogą być takie same.</translation>
</message>
</context>
<context>
@@ -25252,12 +25384,12 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60projectchecker.cpp" line="+53"/>
<source>The Symbian SDK and the project sources must reside on the same drive.</source>
- <translation type="unfinished"></translation>
+ <translation>Symbian SDK i źródła projektu muszą być na wspólnym dysku.</translation>
</message>
<message>
<location line="+8"/>
<source>The Symbian SDK was not found for Qt version %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Brak Symbian SDK dla Qt w wersji %1.</translation>
</message>
<message>
<location line="+6"/>
@@ -25267,7 +25399,7 @@ name <email> alias <email></source>
<message>
<location line="+12"/>
<source>The Symbian toolchain does not handle special characters in a project path well.</source>
- <translation type="unfinished"></translation>
+ <translation>Zestaw narzędzi dla Symbiana nie obsługuje również znaków specjalnych w ścieżkach projektów.</translation>
</message>
</context>
<context>
@@ -25275,22 +25407,22 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qt4project.cpp" line="+797"/>
<source>Evaluating</source>
- <translation type="unfinished"></translation>
+ <translation>Ewaluowanie</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::QtVersion</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="-989"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="-1021"/>
<source>The Qt version is invalid: %1</source>
<extracomment>%1: Reason for being invalid</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Wersja Qt nie jest poprawna: %1</translation>
</message>
<message>
<location line="+9"/>
<source>The qmake command "%1" was not found or is not executable.</source>
<extracomment>%1: Path to qmake executable</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Komenda qmake "%1" nie została odnaleziona lub nie jest plikiem wykonywanlym.</translation>
</message>
</context>
<context>
@@ -25324,7 +25456,7 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp" line="+277"/>
<source>Invalid Id</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawny identyfikator</translation>
</message>
</context>
<context>
@@ -25332,35 +25464,37 @@ name <email> alias <email></source>
<message>
<location filename="../../../src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp" line="+359"/>
<source>Invalid Id</source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawny identyfikator</translation>
</message>
</context>
<context>
<name>QmlDesigner::InvalidArgumentException</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/core/exceptions/invalidargumentexception.cpp" line="+60"/>
+ <location filename="../../../src/plugins/qmldesigner/designercore/exceptions/invalidargumentexception.cpp" line="+60"/>
<source>Failed to create item of type %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć elementu typu %1</translation>
</message>
</context>
<context>
<name>InvalidIdException</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/core/exceptions/invalididexception.cpp" line="+59"/>
+ <location filename="../../../src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp" line="+59"/>
<source>Ids have to be unique: </source>
- <translation type="unfinished"></translation>
+ <translation>Identyfikatory muszą być unikatowe: </translation>
</message>
<message>
<location line="+5"/>
<source>Invalid Id: </source>
- <translation type="unfinished"></translation>
+ <translation>Niepoprawny identyfikator: </translation>
</message>
<message>
<location line="+1"/>
<source>
Only alphanumeric characters and underscore allowed.
Ids must begin with a lowercase letter.</source>
- <translation type="unfinished"></translation>
+ <translation>
+Dozwolone są tylko znaki alfanumeryczne i podkreślenia.
+Identyfikatory muszą rozpoczynać się małą literą.</translation>
</message>
</context>
</TS>
diff --git a/src/libs/3rdparty/net7ssh/src/src.pro b/src/libs/3rdparty/net7ssh/src/src.pro
index a3eca025d79f607894a911e9a2c8955579149f60..1584dc722c0fb4572909c7fef3b3bb1ecea160a7 100644
--- a/src/libs/3rdparty/net7ssh/src/src.pro
+++ b/src/libs/3rdparty/net7ssh/src/src.pro
@@ -12,7 +12,7 @@ include(../net7ssh_dependencies.pri)
win32 {
LIBS += -lWs2_32
- win32-msvc*: QMAKE_CXXFLAGS += -wd4250 -wd4251 -wd4290
+ win32-msvc*: QMAKE_CXXFLAGS += -wd4100 -wd4101 -wd4250 -wd4251 -wd4290
DEFINES += _CRT_SECURE_NO_WARNINGS
DEFINES += NE7SSH_EXPORTS=1 _WINDLL _USRDLL _CONSOLE _WINDOWS
diff --git a/src/libs/utils/detailsbutton.cpp b/src/libs/utils/detailsbutton.cpp
index cd038d09f93dad608456b13f7226dc25bb34e0c8..d255f9245c0397c304aa77ae096a49122e589621 100644
--- a/src/libs/utils/detailsbutton.cpp
+++ b/src/libs/utils/detailsbutton.cpp
@@ -38,10 +38,34 @@
using namespace Utils;
+FadingPanel::FadingPanel(QWidget *parent) : QWidget(parent), m_opacityEffect(0)
+
+{
+ m_opacityEffect = new QGraphicsOpacityEffect;
+ m_opacityEffect->setOpacity(0);
+ setGraphicsEffect(m_opacityEffect);
+
+ // Workaround for issue with QGraphicsEffect. GraphicsEffect
+ // currently clears with Window color. Remove if flickering
+ // no longer occurs on fade-in
+ QPalette pal;
+ pal.setBrush(QPalette::All, QPalette::Window, Qt::transparent);
+ setPalette(pal);
+}
+
+void FadingPanel::fadeTo(float value)
+{
+ QPropertyAnimation *animation = new QPropertyAnimation(m_opacityEffect, "opacity");
+ animation->setDuration(200);
+ animation->setEndValue(value);
+ animation->start(QAbstractAnimation::DeleteWhenStopped);
+}
+
DetailsButton::DetailsButton(QWidget *parent) : QAbstractButton(parent), m_fader(0)
{
setCheckable(true);
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+ setText(tr("Details"));
}
QSize DetailsButton::sizeHint() const
@@ -114,7 +138,6 @@ QPixmap DetailsButton::cacheRendering(const QSize &size, bool checked)
p.setRenderHint(QPainter::Antialiasing, true);
p.translate(0.5, 0.5);
p.setPen(Qt::NoPen);
- QColor color = palette().highlight().color();
if(!checked) {
lg.setColorAt(0, QColor(0, 0, 0, 10));
lg.setColorAt(1, QColor(0, 0, 0, 16));
@@ -133,12 +156,11 @@ QPixmap DetailsButton::cacheRendering(const QSize &size, bool checked)
p.setPen(palette().color(QPalette::Text));
- QString text = tr("Details");
- QRect textRect = p.fontMetrics().boundingRect(text);
+ QRect textRect = p.fontMetrics().boundingRect(text());
textRect.setWidth(textRect.width() + 15);
textRect.moveCenter(rect().center());
- p.drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, text);
+ p.drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, text());
int arrowsize = 15;
QStyleOption arrowOpt;
diff --git a/src/libs/utils/detailsbutton.h b/src/libs/utils/detailsbutton.h
index f72f9840534a2a9c357c3e7ba704ca27a139dca0..90f4b93e182e536f2b6dabf3f2e2619d59372c55 100644
--- a/src/libs/utils/detailsbutton.h
+++ b/src/libs/utils/detailsbutton.h
@@ -31,12 +31,26 @@
#define DETAILSBUTTON_H
#include <QtGui/QAbstractButton>
+#include <QtGui/QToolButton>
#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
+#include <QtGui/QGraphicsOpacityEffect>
+#include <QtCore/QPropertyAnimation>
#include "utils_global.h"
namespace Utils {
+class QTCREATOR_UTILS_EXPORT FadingPanel : public QWidget
+{
+public:
+ FadingPanel(QWidget *parent = 0);
+ void fadeTo(float value);
+protected:
+ QGraphicsOpacityEffect *m_opacityEffect;
+};
+
+
class QTCREATOR_UTILS_EXPORT DetailsButton : public QAbstractButton
{
Q_OBJECT
diff --git a/src/libs/utils/detailswidget.cpp b/src/libs/utils/detailswidget.cpp
index 5ab766bff5a419938a2e634e2a30e9bf19e15f61..7b8053ce12937f203898f04e46fe3f6eb3d7457a 100644
--- a/src/libs/utils/detailswidget.cpp
+++ b/src/libs/utils/detailswidget.cpp
@@ -31,6 +31,7 @@
#include "detailsbutton.h"
#include <QtCore/QStack>
+#include <QtCore/QPropertyAnimation>
#include <QtGui/QGridLayout>
#include <QtGui/QLabel>
@@ -57,7 +58,7 @@ namespace Utils {
DetailsButton *m_detailsButton;
QGridLayout *m_grid;
QLabel *m_summaryLabel;
- QWidget *m_toolWidget;
+ Utils::FadingPanel *m_toolWidget;
QWidget *m_widget;
QPixmap m_collapsedPixmap;
@@ -210,7 +211,7 @@ namespace Utils {
updateControls();
}
- void DetailsWidget::setToolWidget(QWidget *widget)
+ void DetailsWidget::setToolWidget(Utils::FadingPanel *widget)
{
if (d->m_toolWidget == widget)
return;
@@ -221,7 +222,7 @@ namespace Utils {
return;
d->m_toolWidget->adjustSize();
- d->m_grid->addWidget(d->m_toolWidget, 0, 0, 1, 1, Qt::AlignCenter);
+ d->m_grid->addWidget(d->m_toolWidget, 0, 1, 1, 1, Qt::AlignRight);
d->m_grid->setColumnMinimumWidth(0, d->m_toolWidget->width());
d->m_grid->setRowMinimumHeight(0, d->m_toolWidget->height());
@@ -271,9 +272,11 @@ namespace Utils {
{
if (!d->m_toolWidget)
return;
-
+#ifdef Q_OS_MAC
d->m_toolWidget->setVisible(hovered);
-
+#else
+ d->m_toolWidget->fadeTo(hovered ? 1.0 : 0);
+#endif
d->m_hovered = hovered;
}
diff --git a/src/libs/utils/detailswidget.h b/src/libs/utils/detailswidget.h
index eb5c1b240313d97bb8bfbffc1e88aff57da024b3..a697015f5d7b42fb6bcac035cb82853cedf2ed4f 100644
--- a/src/libs/utils/detailswidget.h
+++ b/src/libs/utils/detailswidget.h
@@ -41,6 +41,7 @@ QT_END_NAMESPACE
namespace Utils {
struct DetailsWidgetPrivate;
+class FadingPanel;
class QTCREATOR_UTILS_EXPORT DetailsWidget : public QWidget
{
@@ -68,7 +69,7 @@ public:
void setWidget(QWidget *widget);
QWidget *widget() const;
- void setToolWidget(QWidget *widget);
+ void setToolWidget(Utils::FadingPanel *widget);
QWidget *toolWidget() const;
private slots:
diff --git a/src/libs/utils/uncommentselection.cpp b/src/libs/utils/uncommentselection.cpp
index a5da088da959a19b5653dcba43e2e2b387fe2939..c6e4b624b0d81cf58a0b8eee14742c8066be9553 100644
--- a/src/libs/utils/uncommentselection.cpp
+++ b/src/libs/utils/uncommentselection.cpp
@@ -70,7 +70,7 @@ void Utils::unCommentSelection(QPlainTextEdit *edit)
start -= 2;
}
- bool hasSelStart = (startPos < startText.length() - 2
+ bool hasSelStart = (startPos < startText.length() - 1
&& startText.at(startPos) == QLatin1Char('/')
&& startText.at(startPos+1) == QLatin1Char('*'));
diff --git a/src/plugins/cmakeprojectmanager/cmaketarget.cpp b/src/plugins/cmakeprojectmanager/cmaketarget.cpp
index 8a89c76a04eac2631c273d558168ae32de67250e..9e45ee2cdc031ae75e931a377897ac340e603ee3 100644
--- a/src/plugins/cmakeprojectmanager/cmaketarget.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketarget.cpp
@@ -34,6 +34,8 @@
#include "cmakerunconfiguration.h"
#include "cmakebuildconfiguration.h"
+#include <projectexplorer/customexecutablerunconfiguration.h>
+
#include <QtGui/QApplication>
#include <QtGui/QStyle>
@@ -131,6 +133,12 @@ void CMakeTarget::updateRunConfigurations()
CMakeRunConfiguration *rc = it.value();
removeRunConfiguration(rc);
}
+ if (runConfigurations().isEmpty()) {
+ // Oh no, no run configuration,
+ // create a custom executable run configuration
+ ProjectExplorer::CustomExecutableRunConfiguration *rc = new ProjectExplorer::CustomExecutableRunConfiguration(this);
+ addRunConfiguration(rc);
+ }
}
// -------------------------------------------------------------------------
diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index 84d8955c2f03feaad48eef507d91b5d474cb252c..a38f9d148c4cd8c5419932b4ad61c147751de17e 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -54,5 +54,10 @@
<file>images/progressbar.png</file>
<file>images/help.png</file>
<file>images/editclear.png</file>
+ <file>images/darkarrowdown.png</file>
+ <file>images/darkarrowup.png</file>
+ <file>images/darkclose.png</file>
+ <file>images/arrowdown.png</file>
+ <file>images/arrowup.png</file>
</qresource>
</RCC>
diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp
index a45d022b61597f5c111b0e96faf699b439b6a7d6..823f306b3efc88f0e83c35326386f44d36b52414 100644
--- a/src/plugins/coreplugin/dialogs/newdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/newdialog.cpp
@@ -282,6 +282,9 @@ Core::IWizard *NewDialog::showDialog()
for (int row = 0; row < m_proxyModel->rowCount(); ++row)
m_ui->templateCategoryView->setExpanded(m_proxyModel->index(row, 0), true);
+ // Ensure that item description is visible on first show
+ currentItemChanged(m_ui->templatesView->rootIndex().child(0,0));
+
updateOkButton();
if (exec() != Accepted)
return 0;
diff --git a/src/plugins/coreplugin/images/arrowdown.png b/src/plugins/coreplugin/images/arrowdown.png
new file mode 100644
index 0000000000000000000000000000000000000000..b49843f1d94431a2233d27d464aa3e9c2500f3e6
Binary files /dev/null and b/src/plugins/coreplugin/images/arrowdown.png differ
diff --git a/src/plugins/coreplugin/images/arrowup.png b/src/plugins/coreplugin/images/arrowup.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9d7b1e7d4b39eed0c89d394151fb4b0a6eb7bc3
Binary files /dev/null and b/src/plugins/coreplugin/images/arrowup.png differ
diff --git a/src/plugins/coreplugin/images/darkarrowdown.png b/src/plugins/coreplugin/images/darkarrowdown.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b07da15ffbdb11622ae8d109d2e8a058d477393
Binary files /dev/null and b/src/plugins/coreplugin/images/darkarrowdown.png differ
diff --git a/src/plugins/coreplugin/images/darkarrowup.png b/src/plugins/coreplugin/images/darkarrowup.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d751f9a1a03919d59b1e1ab71715905f12f2bda
Binary files /dev/null and b/src/plugins/coreplugin/images/darkarrowup.png differ
diff --git a/src/plugins/coreplugin/images/darkclose.png b/src/plugins/coreplugin/images/darkclose.png
new file mode 100644
index 0000000000000000000000000000000000000000..365fdb8ed7c11d118960cc56e3b2b16c91079cca
Binary files /dev/null and b/src/plugins/coreplugin/images/darkclose.png differ
diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp
index ff0ce2c15715a8598cd83f517712526552869f68..702b00e1da89cb8c3048f1f0c1350b9476e8b243 100644
--- a/src/plugins/coreplugin/modemanager.cpp
+++ b/src/plugins/coreplugin/modemanager.cpp
@@ -177,7 +177,7 @@ void ModeManager::objectAdded(QObject *obj)
ActionManager *am = d->m_mainWindow->actionManager();
const QString shortcutId = QLatin1String("QtCreator.Mode.") + mode->id();
QShortcut *shortcut = new QShortcut(d->m_mainWindow);
- shortcut->setWhatsThis(tr("Switch to %1 mode").arg(mode->displayName()));
+ shortcut->setWhatsThis(tr("Switch to <b>%1</b> mode").arg(mode->displayName()));
Command *cmd = am->registerShortcut(shortcut, shortcutId, QList<int>() << Constants::C_GLOBAL_ID);
d->m_modeShortcuts.insert(index, cmd);
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index 89903d7f6d50acff1beb487b05a9283967b093cf..e3b48e003193b860f830e39f3eca3b603476f5c6 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -201,7 +201,10 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
m_prevAction(0),
m_lastIndex(-1),
m_outputWidgetPane(new QStackedWidget),
- m_opToolBarWidgets(new QStackedWidget)
+ m_opToolBarWidgets(new QStackedWidget),
+ m_minimizeIcon(":/core/images/arrowdown.png"),
+ m_maximizeIcon(":/core/images/arrowup.png"),
+ m_maximised(false)
{
setWindowTitle(tr("Output"));
connect(m_widgetComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changePage()));
@@ -221,8 +224,9 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
connect(m_prevAction, SIGNAL(triggered()), this, SLOT(slotPrev()));
m_minMaxAction = new QAction(this);
- m_minMaxAction->setText(tr("Maximize Output Pane"));
- m_minMaxButton->setArrowType(Qt::UpArrow);
+ m_minMaxButton->setIcon(m_maximizeIcon);
+ m_minMaxButton->setToolTip(tr("Maximize Output Pane"));
+ m_minMaxAction->setText(m_minMaxButton->toolTip());
m_closeButton->setIcon(QIcon(":/core/images/closebutton.png"));
connect(m_closeButton, SIGNAL(clicked()), this, SLOT(slotHide()));
@@ -309,8 +313,8 @@ void OutputPaneManager::init()
#endif
cmd->setAttribute(Command::CA_UpdateText);
mpanes->addAction(cmd, "Coreplugin.OutputPane.ActionsGroup");
- m_minMaxButton->setDefaultAction(cmd->action());
connect(m_minMaxAction, SIGNAL(triggered()), this, SLOT(slotMinMax()));
+ connect(m_minMaxButton, SIGNAL(clicked()), this, SLOT(slotMinMax()));
QAction *sep = new QAction(this);
sep->setSeparator(true);
@@ -403,7 +407,7 @@ void OutputPaneManager::shortcutTriggered()
bool OutputPaneManager::isMaximized()const
{
- return m_minMaxButton->arrowType() == Qt::DownArrow;
+ return m_maximised;
}
void OutputPaneManager::slotMinMax()
@@ -412,11 +416,12 @@ void OutputPaneManager::slotMinMax()
if (!OutputPanePlaceHolder::m_current->isVisible()) // easier than disabling/enabling the action
return;
- bool maximize = m_minMaxButton->arrowType() == Qt::UpArrow;
- OutputPanePlaceHolder::m_current->maximizeOrMinimize(maximize);
- m_minMaxButton->setArrowType(maximize ? Qt::DownArrow : Qt::UpArrow);
- m_minMaxAction->setToolTip(maximize ? tr("Minimize Output Pane")
- : tr("Maximize Output Pane"));
+ m_maximised = !m_maximised;
+ OutputPanePlaceHolder::m_current->maximizeOrMinimize(m_maximised);
+ m_minMaxButton->setIcon(m_maximised ? m_minimizeIcon : m_maximizeIcon);
+ m_minMaxButton->setToolTip(m_maximised ? tr("Minimize Output Pane")
+ : tr("Maximize Output Pane"));
+ m_minMaxAction->setText(m_minMaxButton->toolTip());
}
void OutputPaneManager::buttonTriggered()
diff --git a/src/plugins/coreplugin/outputpane.h b/src/plugins/coreplugin/outputpane.h
index 64a0a0f7765e9e7e0b820c8aafcc6a6e34f7efe5..edfad8bb500d5d5e0643037dd44c07cb0ef40542 100644
--- a/src/plugins/coreplugin/outputpane.h
+++ b/src/plugins/coreplugin/outputpane.h
@@ -148,6 +148,9 @@ private:
QWidget *m_buttonsWidget;
QMap<int, QPushButton *> m_buttons;
QMap<QAction *, int> m_actions;
+ QPixmap m_minimizeIcon;
+ QPixmap m_maximizeIcon;
+ bool m_maximised;
};
class OutputPaneToggleButton : public QPushButton
diff --git a/src/plugins/designer/formeditorfactory.cpp b/src/plugins/designer/formeditorfactory.cpp
index 6b39e50fee806ee3d7aebcb3021204939ae12c79..7e7de93e1030edc85077fd121689a4e6e4f2e964 100644
--- a/src/plugins/designer/formeditorfactory.cpp
+++ b/src/plugins/designer/formeditorfactory.cpp
@@ -90,8 +90,8 @@ void FormEditorFactory::updateEditorInfoBar(Core::IEditor *editor)
{
if (qobject_cast<FormWindowEditor *>(editor)) {
Core::EditorManager::instance()->showEditorInfoBar(Constants::INFO_READ_ONLY,
- tr("This file can only be edited in Design Mode."),
- tr("Open Designer"), this, SLOT(designerModeClicked()));
+ tr("This file can only be edited in <b>Design</b> mode."),
+ tr("Switch mode"), this, SLOT(designerModeClicked()));
} else {
Core::EditorManager::instance()->hideEditorInfoBar(Constants::INFO_READ_ONLY);
}
diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp
index 21d00e303c66e4da4db340a203f6c67164886458..744b85490093bbe1a90145e5a57ba1cca1bf9e49 100644
--- a/src/plugins/projectexplorer/buildstepspage.cpp
+++ b/src/plugins/projectexplorer/buildstepspage.cpp
@@ -29,6 +29,7 @@
#include "buildstepspage.h"
#include "buildconfiguration.h"
+#include "detailsbutton.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
@@ -117,6 +118,12 @@ void BuildStepsPage::init(BuildConfiguration *bc)
s.detailsWidget->setSummaryText(s.widget->summaryText());
}
updateBuildStepButtonsState();
+
+ static QLatin1String buttonStyle(
+ "QToolButton{ border-width: 2;}"
+ "QToolButton:hover{border-image: url(:/welcome/images/btn_26_hover.png) 4;}"
+ "QToolButton:pressed{ border-image: url(:/welcome/images/btn_26_pressed.png) 4;}");
+ setStyleSheet(buttonStyle);
}
void BuildStepsPage::updateAddBuildStepMenu()
@@ -160,30 +167,32 @@ void BuildStepsPage::addBuildStepWidget(int pos, BuildStep *step)
s.detailsWidget->setSummaryText(s.widget->summaryText());
s.detailsWidget->setWidget(s.widget);
- s.upButton = new QToolButton(this);
- s.upButton->setArrowType(Qt::UpArrow);
- s.upButton->setMaximumHeight(22);
- s.upButton->setMaximumWidth(22);
-
- s.downButton = new QToolButton(this);
- s.downButton->setArrowType(Qt::DownArrow);
- s.downButton->setMaximumHeight(22);
- s.downButton->setMaximumWidth(22);
-#ifdef Q_OS_MAC
- s.upButton->setIconSize(QSize(10, 10));
- s.downButton->setIconSize(QSize(10, 10));
-#endif
- s.removeButton = new QToolButton(this);
- s.removeButton->setText(QChar('X'));
- s.removeButton->setMaximumHeight(22);
- s.removeButton->setMaximumWidth(22);
-
// layout
- QWidget *toolWidget = new QWidget(s.detailsWidget);
- toolWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ Utils::FadingPanel *toolWidget = new Utils::FadingPanel(s.detailsWidget);
+ QSize buttonSize(20, 26);
+
+ s.upButton = new QToolButton(toolWidget);
+ s.upButton->setAutoRaise(true);
+ s.upButton->setToolTip(tr("Move Up"));
+ s.upButton->setFixedSize(buttonSize);
+ s.upButton->setIcon(QIcon(":/core/images/darkarrowup.png"));
+
+ s.downButton = new QToolButton(toolWidget);
+ s.downButton->setAutoRaise(true);
+ s.downButton->setToolTip(tr("Move Down"));
+ s.downButton->setFixedSize(buttonSize);
+ s.downButton->setIcon(QIcon(":/core/images/darkarrowdown.png"));
+
+ s.removeButton = new QToolButton(toolWidget);
+ s.removeButton->setAutoRaise(true);
+ s.removeButton->setToolTip(tr("Remove Item"));
+ s.removeButton->setFixedSize(buttonSize);
+ s.removeButton->setIcon(QIcon(":/core/images/darkclose.png"));
+
+ toolWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
QHBoxLayout *hbox = new QHBoxLayout();
toolWidget->setLayout(hbox);
- hbox->setMargin(0);
+ hbox->setMargin(4);
hbox->setSpacing(0);
hbox->addWidget(s.upButton);
hbox->addWidget(s.downButton);
@@ -316,9 +325,14 @@ void BuildStepsPage::updateBuildStepButtonsState()
BuildStepsWidgetStruct s = m_buildSteps.at(i);
s.removeButton->setEnabled(!steps.at(i)->immutable());
m_removeMapper->setMapping(s.removeButton, i);
+
s.upButton->setEnabled((i > 0) && !(steps.at(i)->immutable() && steps.at(i - 1)));
m_upMapper->setMapping(s.upButton, i);
s.downButton->setEnabled((i + 1 < steps.count()) && !(steps.at(i)->immutable() && steps.at(i + 1)->immutable()));
m_downMapper->setMapping(s.downButton, i);
+
+ // Only show buttons when needed
+ s.downButton->setVisible(steps.count() != 1);
+ s.upButton->setVisible(steps.count() != 1);
}
}
diff --git a/src/plugins/projectexplorer/doubletabwidget.cpp b/src/plugins/projectexplorer/doubletabwidget.cpp
index 95010781afc17cc2f3c253af73fe7baef18f5652..91c9c12bb0e3814c5ec66feebaa37e13ceb1dc31 100644
--- a/src/plugins/projectexplorer/doubletabwidget.cpp
+++ b/src/plugins/projectexplorer/doubletabwidget.cpp
@@ -266,7 +266,7 @@ void DoubleTabWidget::paintEvent(QPaintEvent *event)
// draw background of second bar
painter.fillRect(QRect(0, r.height(), r.width(), OTHER_HEIGHT), grad);
- painter.setPen(Qt::black);
+ painter.setPen(QColor(0x505050));
painter.drawLine(0, r.height() + OTHER_HEIGHT,
r.width(), r.height() + OTHER_HEIGHT);
painter.setPen(Qt::white);
diff --git a/src/plugins/projectexplorer/images/targetseparatorbackground.png b/src/plugins/projectexplorer/images/targetseparatorbackground.png
index ff14f0d6737a1e08d2ea6444a34d76aaf7a12511..2205cf22650fa021af75814ee8c1811c0728bd7d 100644
Binary files a/src/plugins/projectexplorer/images/targetseparatorbackground.png and b/src/plugins/projectexplorer/images/targetseparatorbackground.png differ
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 70ab42ecd97a827a2d4f174aba11ab9b3c912a49..0f576fd9bd14f8c44701a15b66fb16b12e4c45fa 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -1390,9 +1390,9 @@ void ProjectExplorerPlugin::updateActions()
d->m_rebuildAction->setEnabled(enableBuildActions);
d->m_cleanAction->setEnabled(enableBuildActions);
- d->m_buildAction->setParameter(projectNameContextMenu);
- d->m_rebuildAction->setParameter(projectNameContextMenu);
- d->m_cleanAction->setParameter(projectNameContextMenu);
+ d->m_buildActionContextMenu->setParameter(projectNameContextMenu);
+ d->m_rebuildActionContextMenu->setParameter(projectNameContextMenu);
+ d->m_cleanActionContextMenu->setParameter(projectNameContextMenu);
d->m_buildActionContextMenu->setEnabled(enableBuildActionsContextMenu);
d->m_rebuildActionContextMenu->setEnabled(enableBuildActionsContextMenu);
diff --git a/src/plugins/projectexplorer/targetselector.cpp b/src/plugins/projectexplorer/targetselector.cpp
index d319be44013d1cb04cc9b2069c6906199a2f1334..61a582a40d97ca44d5a3b0335990401fc4f92b8c 100644
--- a/src/plugins/projectexplorer/targetselector.cpp
+++ b/src/plugins/projectexplorer/targetselector.cpp
@@ -219,6 +219,8 @@ void TargetSelector::paintEvent(QPaintEvent *event)
} else {
image= m_runselected;
}
+ } else {
+ p.setPen(Qt::black);
}
QRect buttonRect(x, 1, targetWidth() , image.height());
diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp
index c21ccf072c6ac3d6de16c34ff3c8461fc1ec0b37..2887a886cd9801c3b33bff7bfa7164979ff3bfdf 100644
--- a/src/plugins/projectexplorer/targetsettingspanel.cpp
+++ b/src/plugins/projectexplorer/targetsettingspanel.cpp
@@ -127,8 +127,7 @@ void TargetSettingsPanelWidget::setupUi()
updateTargetAddAndRemoveButtons();
- // Restore target originally set:
- m_project->setActiveTarget(activeTarget);
+ activeTargetChanged(activeTarget);
}
void TargetSettingsPanelWidget::currentTargetChanged(int targetIndex, int subIndex)
diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
index 2c36c30c63a506624c314070a0a4f90d4a393d60..8b94cfcb3337886ee68dbfdeddaf76d586395c93 100644
--- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
@@ -133,7 +133,7 @@ void DragTool::beginWithPoint(const QPointF &beginPoint)
}
-void DragTool::createQmlItemNode(const ItemLibraryInfo &itemLibraryRepresentation, QmlItemNode parentNode, QPointF scenePos)
+void DragTool::createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, QmlItemNode parentNode, QPointF scenePos)
{
QmlDesignerItemLibraryDragAndDrop::CustomDragAndDrop::hide();
@@ -142,7 +142,7 @@ void DragTool::createQmlItemNode(const ItemLibraryInfo &itemLibraryRepresentatio
FormEditorItem *parentItem = scene()->itemForQmlItemNode(parentNode);
QPointF pos = parentItem->mapFromScene(scenePos);
- m_dragNode = view()->createQmlItemNode(itemLibraryRepresentation, pos, parentNode);
+ m_dragNode = view()->createQmlItemNode(itemLibraryEntry, pos, parentNode);
Q_ASSERT(m_dragNode.modelNode().isValid());
Q_ASSERT(m_dragNode.isValid());
@@ -238,14 +238,14 @@ void DragTool::dragLeaveEvent(QGraphicsSceneDragDropEvent * event)
}
}
-static ItemLibraryInfo ItemLibraryInfoFromData(const QByteArray &data)
+static ItemLibraryEntry itemLibraryEntryFromData(const QByteArray &data)
{
QDataStream stream(data);
- ItemLibraryInfo itemLibraryInfo;
- stream >> itemLibraryInfo;
+ ItemLibraryEntry itemLibraryEntry;
+ stream >> itemLibraryEntry;
- return itemLibraryInfo;
+ return itemLibraryEntry;
}
void DragTool::dragMoveEvent(QGraphicsSceneDragDropEvent * event)
@@ -277,8 +277,8 @@ void DragTool::dragMoveEvent(QGraphicsSceneDragDropEvent * event)
if (event->mimeData()->hasFormat("application/vnd.bauhaus.itemlibraryinfo")) {
Q_ASSERT(!event->mimeData()->data("application/vnd.bauhaus.itemlibraryinfo").isEmpty());
- ItemLibraryInfo ItemLibraryInfo = ItemLibraryInfoFromData(event->mimeData()->data("application/vnd.bauhaus.itemlibraryinfo"));
- createQmlItemNode(ItemLibraryInfo, parentNode, event->scenePos());
+ ItemLibraryEntry itemLibraryEntry = itemLibraryEntryFromData(event->mimeData()->data("application/vnd.bauhaus.itemlibraryinfo"));
+ createQmlItemNode(itemLibraryEntry, parentNode, event->scenePos());
} else if (event->mimeData()->hasFormat("application/vnd.bauhaus.libraryresource")) {
Q_ASSERT(!event->mimeData()->data("application/vnd.bauhaus.libraryresource").isEmpty());
QString imageName = QString::fromLatin1((event->mimeData()->data("application/vnd.bauhaus.libraryresource")));
diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.h b/src/plugins/qmldesigner/components/formeditor/dragtool.h
index 0e3ae6cd5daad1273e2b6d4dfe59e40cb8f884b4..b029085525e558a76c0be629813bb7db66b08b84 100644
--- a/src/plugins/qmldesigner/components/formeditor/dragtool.h
+++ b/src/plugins/qmldesigner/components/formeditor/dragtool.h
@@ -86,7 +86,7 @@ protected:
private:
- void createQmlItemNode(const ItemLibraryInfo &ItemLibraryRepresentation, QmlItemNode parentNode, QPointF scenePos);
+ void createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, QmlItemNode parentNode, QPointF scenePos);
void createQmlItemNodeFromImage(const QString &imageName, QmlItemNode parentNode, QPointF scenePos);
FormEditorItem* calculateContainer(const QPointF &point, FormEditorItem * currentItem = 0);
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.h b/src/plugins/qmldesigner/components/formeditor/formeditorview.h
index dcdbd2387bdd929ecbe6f2703a854fe0045b1eb9..1c7d787c35166a9e69ae17dbc8803e7f4236c0ad 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.h
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.h
@@ -51,7 +51,7 @@ class ResizeTool;
class AnchorTool;
class DragTool;
class ItemCreatorTool;
-class ItemLibraryInfo;
+class ItemLibraryEntry;
class QmlItemNode;
class FormEditorView : public QmlModelView
diff --git a/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp b/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp
index b6e6a0df291c25154c389ac5387f1b79d4ccc59a..b9da6c86f1952c780e4b987f1345f277e9524743 100644
--- a/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp
@@ -170,8 +170,8 @@ void ItemCreatorTool::createAtItem(const QRectF &rect)
return;
if (list.first() == "item") {
RewriterTransaction transaction = view()->beginRewriterTransaction();
- ItemLibraryInfo itemLibraryRepresentation = view()->model()->metaInfo().itemLibraryRepresentation(list.at(1));
- QmlItemNode newNode = view()->createQmlItemNode(itemLibraryRepresentation, pos, parentNode);
+ ItemLibraryEntry itemLibraryEntry = view()->model()->metaInfo().itemLibraryInfo().entry(list.at(1));
+ QmlItemNode newNode = view()->createQmlItemNode(itemLibraryEntry, pos, parentNode);
newNode.modelNode().variantProperty("width") = rect.width();
newNode.modelNode().variantProperty("height") = rect.height();
QList<QmlItemNode> nodeList;
diff --git a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp
index 33be4c0fc96852eec1b126c3a67a77acf23f25a0..7e67256099dcce738f449026920f41e4b356af9a 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp
@@ -45,7 +45,6 @@ namespace QmlDesignerItemLibraryDragAndDrop {
void CustomDragAndDropIcon::startDrag()
{
m_size = m_icon.size();
- setPixmap(m_icon);
m_iconAlpha = 1;
m_previewAlpha = 0;
@@ -83,7 +82,6 @@ void CustomDragAndDropIcon::mouseMoveEvent(QMouseEvent *event)
move(pos);
else
move(-1000, -1000); //no hiding because of mouse grabbing
- setPixmap(currentImage());
resize(m_size);
show();
update();
@@ -119,13 +117,10 @@ void CustomDragAndDropIcon::mouseMoveEvent(QMouseEvent *event)
m_oldTarget = target;
}
-
-QPixmap CustomDragAndDropIcon::currentImage()
+void CustomDragAndDropIcon::paintEvent(QPaintEvent *event)
{
- //blend the two images (icon and preview) according to alpha values
- QPixmap pixmap(m_size);
- pixmap.fill(Qt::white);
- QPainter p(&pixmap);
+ QWidget::paintEvent(event);
+ QPainter p(this);
if (CustomDragAndDrop::isAccepted()) {
p.setOpacity(m_previewAlpha);
p.drawPixmap(0 ,0 , m_size.width(), m_size.height(), m_preview);
@@ -137,7 +132,6 @@ QPixmap CustomDragAndDropIcon::currentImage()
p.setOpacity(m_previewAlpha);
p.drawPixmap(0 ,0 , m_size.width(), m_size.height(), m_preview);
}
- return pixmap;
}
void CustomDragAndDropIcon::enter()
@@ -185,7 +179,6 @@ void CustomDragAndDropIcon::animateDrag(int frame)
m_size = QSize(width, height);
}
QPoint p = pos();
- setPixmap(currentImage());
resize(m_size);
move(p);
update(); //redrawing needed
diff --git a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.h b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.h
index 7d412246624cd01913c11729d2275193a4beedc7..3ab1b20376287591c0063914ccd2a163c1f14a5d 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.h
@@ -60,10 +60,9 @@ public slots:
protected:
virtual void mouseMoveEvent(QMouseEvent *);
+ virtual void paintEvent(QPaintEvent *event);
virtual void mouseReleaseEvent(QMouseEvent *);
private:
- QPixmap currentImage();
-
QWidget *m_oldTarget;
QPixmap m_preview;
QPixmap m_icon;
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h
index e5803f011482e4fb1351a971cec26d75bbcfe94a..71f4fb6fb2b25cae048326e0d1dcaa2de9b6ce88 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h
@@ -36,7 +36,7 @@ namespace QmlDesigner {
class ItemLibraryPrivate;
class MetaInfo;
-class ItemLibraryInfo;
+class ItemLibraryEntry;
class ItemLibrary : public QFrame
{
@@ -47,7 +47,6 @@ public:
ItemLibrary(QWidget *parent = 0);
virtual ~ItemLibrary();
- void addItemLibraryInfo(const ItemLibraryInfo &ItemLibraryInfo);
void setMetaInfo(const MetaInfo &metaInfo);
public Q_SLOTS:
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
index 01f04206df05cd92ca2c3825feb02ada7bab94db..0ac8a3d4d6b226739d072891dcf6129abe6209f2 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
@@ -387,7 +387,6 @@ bool ItemLibraryModel::isItemVisible(int itemLibId)
return elementModel(sectionLibId)->isItemVisible(itemLibId);
}
-
void ItemLibraryModel::update(const MetaInfo &metaInfo)
{
QMap<QString, int> sections;
@@ -403,32 +402,36 @@ void ItemLibraryModel::update(const MetaInfo &metaInfo)
*m_metaInfo = metaInfo;
}
- foreach (const QString &type, metaInfo.itemLibraryItems()) {
- foreach (const ItemLibraryInfo &itemLibraryRepresentation, itemLibraryRepresentations(type)) {
-
- QString itemSectionName = itemLibraryRepresentation.category();
- ItemLibrarySectionModel *sectionModel;
- ItemLibraryItemModel *itemModel;
- int itemId = m_nextLibId++, sectionId;
-
- if (sections.contains(itemSectionName)) {
- sectionId = sections.value(itemSectionName);
- sectionModel = elementModel(sectionId);
- } else {
- sectionId = m_nextLibId++;
- sectionModel = new ItemLibrarySectionModel(m_scriptEngine.data(), sectionId, itemSectionName, this);
- addElement(sectionModel, sectionId);
- sections.insert(itemSectionName, sectionId);
- }
-
- m_itemInfos.insert(itemId, itemLibraryRepresentation);
-
- itemModel = new ItemLibraryItemModel(m_scriptEngine.data(), itemId, itemLibraryRepresentation.name());
- itemModel->setItemIcon(itemLibraryRepresentation.icon());
- itemModel->setItemIconSize(m_itemIconSize);
- sectionModel->addSectionEntry(itemModel);
- m_sections.insert(itemId, sectionId);
+ foreach (ItemLibraryEntry entry, metaInfo.itemLibraryInfo().entries()) {
+ QString itemSectionName = entry.category();
+ ItemLibrarySectionModel *sectionModel;
+ ItemLibraryItemModel *itemModel;
+ int itemId = m_nextLibId++, sectionId;
+
+ if (sections.contains(itemSectionName)) {
+ sectionId = sections.value(itemSectionName);
+ sectionModel = elementModel(sectionId);
+ } else {
+ sectionId = m_nextLibId++;
+ sectionModel = new ItemLibrarySectionModel(m_scriptEngine.data(), sectionId, itemSectionName, this);
+ addElement(sectionModel, sectionId);
+ sections.insert(itemSectionName, sectionId);
}
+
+ m_itemInfos.insert(itemId, entry);
+
+ itemModel = new ItemLibraryItemModel(m_scriptEngine.data(), itemId, entry.name());
+
+ // delayed creation of (default) icons
+ if (entry.icon().isNull())
+ entry.setIcon(QIcon(QLatin1String(":/ItemLibrary/images/item-default-icon.png")));
+ if (entry.dragIcon().isNull())
+ entry.setDragIcon(createDragPixmap(getWidth(entry), getHeight(entry)));
+
+ itemModel->setItemIcon(entry.icon());
+ itemModel->setItemIconSize(m_itemIconSize);
+ sectionModel->addSectionEntry(itemModel);
+ m_sections.insert(itemId, sectionId);
}
updateVisibility();
@@ -499,9 +502,9 @@ void ItemLibraryModel::updateVisibility()
emit visibilityChanged();
}
-static inline int getWidth(const ItemLibraryInfo &itemLibraryRepresentation)
+int ItemLibraryModel::getWidth(const ItemLibraryEntry &itemLibraryEntry)
{
- foreach (const ItemLibraryInfo::Property &property, itemLibraryRepresentation.properties())
+ foreach (const ItemLibraryEntry::Property &property, itemLibraryEntry.properties())
{
if (property.name() == QLatin1String("width"))
return property.value().toInt();
@@ -509,9 +512,9 @@ static inline int getWidth(const ItemLibraryInfo &itemLibraryRepresentation)
return 64;
}
-static inline int getHeight(const ItemLibraryInfo &itemLibraryRepresentation)
+int ItemLibraryModel::getHeight(const ItemLibraryEntry &itemLibraryEntry)
{
- foreach (const ItemLibraryInfo::Property &property, itemLibraryRepresentation.properties())
+ foreach (const ItemLibraryEntry::Property &property, itemLibraryEntry.properties())
{
if (property.name() == QLatin1String("height"))
return property.value().toInt();
@@ -519,7 +522,7 @@ static inline int getHeight(const ItemLibraryInfo &itemLibraryRepresentation)
return 64;
}
-static inline QPixmap createDragPixmap(int width, int height)
+QPixmap ItemLibraryModel::createDragPixmap(int width, int height)
{
QImage dragImage(width, height, QImage::Format_RGB32); // TODO: draw item drag icon
dragImage.fill(0xffffffff);
@@ -531,53 +534,6 @@ static inline QPixmap createDragPixmap(int width, int height)
return QPixmap::fromImage(dragImage);
}
-QList<ItemLibraryInfo> ItemLibraryModel::itemLibraryRepresentations(const QString &type)
-{
- QList<ItemLibraryInfo> itemLibraryRepresentationList;
- NodeMetaInfo nodeInfo = m_metaInfo->nodeMetaInfo(type);
-
- if (nodeInfo.isQmlGraphicsItem()) {
- itemLibraryRepresentationList = m_metaInfo->itemLibraryRepresentations(nodeInfo);
-
- if (!m_metaInfo->hasNodeMetaInfo(type))
- qWarning() << "ItemLibrary: type not declared: " << type;
-
- static QIcon defaultIcon(QLatin1String(":/ItemLibrary/images/item-default-icon.png"));
-
- if (itemLibraryRepresentationList.isEmpty() || !m_metaInfo->hasNodeMetaInfo(type)) {
- QIcon icon = nodeInfo.icon();
- if (icon.isNull())
- icon = defaultIcon;
-
- ItemLibraryInfo itemLibraryInfo;
- itemLibraryInfo.setName(type);
- itemLibraryInfo.setTypeName(nodeInfo.typeName());
- itemLibraryInfo.setCategory(nodeInfo.category());
- itemLibraryInfo.setIcon(icon);
- itemLibraryInfo.setDragIcon(createDragPixmap(64, 64));
- itemLibraryInfo.setMajorVersion(nodeInfo.majorVersion());
- itemLibraryInfo.setMinorVersion(nodeInfo.minorVersion());
- itemLibraryRepresentationList.append(itemLibraryInfo);
- }
- else {
- foreach (ItemLibraryInfo itemLibraryRepresentation, itemLibraryRepresentationList) {
-
- QIcon icon = itemLibraryRepresentation.icon();
- if (itemLibraryRepresentation.icon().isNull())
- itemLibraryRepresentation.setIcon(defaultIcon);
-
- if (itemLibraryRepresentation.dragIcon().isNull())
- itemLibraryRepresentation.setDragIcon(createDragPixmap(getWidth(itemLibraryRepresentation), getHeight(itemLibraryRepresentation)));
-
- if (itemLibraryRepresentation.category().isEmpty())
- itemLibraryRepresentation.setCategory(nodeInfo.category());
- }
- }
- }
-
- return itemLibraryRepresentationList;
-}
-
} // namespace Internal
} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
index 5391d0d83a6077f4e02edaf75b85ab32c2a7665c..693680d2b8e447b6127ee4ca4eb65d3bd127c3b2 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
@@ -41,7 +41,7 @@ QT_FORWARD_DECLARE_CLASS(QMimeData);
namespace QmlDesigner {
class MetaInfo;
-class ItemLibraryInfo;
+class ItemLibraryEntry;
namespace Internal {
@@ -153,11 +153,14 @@ signals:
private:
void updateVisibility();
- QList<ItemLibraryInfo> itemLibraryRepresentations(const QString &type);
+
+ int getWidth(const ItemLibraryEntry &entry);
+ int getHeight(const ItemLibraryEntry &entry);
+ QPixmap createDragPixmap(int width, int height);
QWeakPointer<QScriptEngine> m_scriptEngine;
MetaInfo *m_metaInfo;
- QMap<int, ItemLibraryInfo> m_itemInfos;
+ QMap<int, ItemLibraryEntry> m_itemInfos;
QMap<int, int> m_sections;
QString m_searchText;
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
index 1fa3796d6b6533d0c7f4fb39b0714d6f36cd3304..c24395efaab3afe766ad20d41d23692ee2767e64 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
@@ -171,8 +171,9 @@ void IdItemDelegate::paint(QPainter *painter,
if (icon.isNull())
{
// if node has no own icon, search for it in the itemlibrary
- QList <ItemLibraryInfo> InfoList = node.metaInfo().metaInfo().itemLibraryRepresentations(node.metaInfo());
- foreach (const ItemLibraryInfo &entry, InfoList)
+ const ItemLibraryInfo libraryInfo = node.metaInfo().metaInfo().itemLibraryInfo();
+ QList <ItemLibraryEntry> infoList = libraryInfo.entriesForNodeMetaInfo(node.metaInfo());
+ foreach (const ItemLibraryEntry &entry, infoList)
{
if (entry.typeName()==node.metaInfo().typeName()) {
icon = entry.icon();
diff --git a/src/plugins/qmldesigner/components/resources/images/slider_indikator.png b/src/plugins/qmldesigner/components/resources/images/slider_indikator.png
index 80cbfc85203dd8149e5fde4a11ccfe5c2b31789f..343ec38d59083cfe3876c0a3279e56cf3452815f 100644
Binary files a/src/plugins/qmldesigner/components/resources/images/slider_indikator.png and b/src/plugins/qmldesigner/components/resources/images/slider_indikator.png differ
diff --git a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
index c82202426e4bc50eb3e40a055ff18b7bfdbf6c51..2aa7042d5ea81e1d34dbcbc3d5c1e606e6cc7623 100644
--- a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
+++ b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
@@ -27,8 +27,8 @@
**
**************************************************************************/
-#ifndef ItemLibraryINFO_H
-#define ItemLibraryINFO_H
+#ifndef ITEMLIBRARYINFO_H
+#define ITEMLIBRARYINFO_H
#include "corelib_global.h"
@@ -45,23 +45,26 @@ class NodeMetaInfo;
namespace Internal {
-class ItemLibraryInfoData;
+class MetaInfoPrivate;
+class ItemLibraryEntryData;
+class ItemLibraryInfoPrivate;
+
}
-class ItemLibraryInfo;
+class ItemLibraryEntry;
-CORESHARED_EXPORT QDataStream& operator<<(QDataStream& stream, const ItemLibraryInfo& ItemLibraryInfo);
-CORESHARED_EXPORT QDataStream& operator>>(QDataStream& stream, ItemLibraryInfo& ItemLibraryInfo);
+CORESHARED_EXPORT QDataStream& operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibraryEntry);
+CORESHARED_EXPORT QDataStream& operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry);
-class CORESHARED_EXPORT ItemLibraryInfo
+class CORESHARED_EXPORT ItemLibraryEntry
{
friend class QmlDesigner::MetaInfo;
friend class QmlDesigner::Internal::MetaInfoParser;
- friend CORESHARED_EXPORT QDataStream& QmlDesigner::operator<<(QDataStream& stream, const ItemLibraryInfo& image);
- friend CORESHARED_EXPORT QDataStream& QmlDesigner::operator>>(QDataStream& stream, ItemLibraryInfo& image);
+ friend CORESHARED_EXPORT QDataStream& QmlDesigner::operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibraryEntry);
+ friend CORESHARED_EXPORT QDataStream& QmlDesigner::operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry);
public:
- ItemLibraryInfo();
- ~ItemLibraryInfo();
+ ItemLibraryEntry();
+ ~ItemLibraryEntry();
QString name() const;
QString typeName() const;
@@ -72,8 +75,8 @@ public:
QIcon dragIcon() const;
QString qml() const;
- ItemLibraryInfo(const ItemLibraryInfo &other);
- ItemLibraryInfo& operator=(const ItemLibraryInfo &other);
+ ItemLibraryEntry(const ItemLibraryEntry &other);
+ ItemLibraryEntry& operator=(const ItemLibraryEntry &other);
typedef QmlDesigner::PropertyContainer Property;
@@ -90,11 +93,35 @@ public:
void setCategory(const QString &category);
void setQml(const QString &qml);
private:
- QExplicitlySharedDataPointer<Internal::ItemLibraryInfoData> m_data;
+ QExplicitlySharedDataPointer<Internal::ItemLibraryEntryData> m_data;
};
-}
-Q_DECLARE_METATYPE(QmlDesigner::ItemLibraryInfo)
+class CORESHARED_EXPORT ItemLibraryInfo
+{
+ friend class Internal::MetaInfoPrivate;
+public:
+ ItemLibraryInfo();
+ ItemLibraryInfo(const ItemLibraryInfo &other);
+ ~ItemLibraryInfo();
+
+ ItemLibraryInfo& operator=(const ItemLibraryInfo &other);
+
+ bool isValid();
+
+ QList<ItemLibraryEntry> entries() const;
+ QList<ItemLibraryEntry> entriesForNodeMetaInfo(const NodeMetaInfo &nodeMetaInfo) const;
+ ItemLibraryEntry entry(const QString &name) const;
+
+ ItemLibraryEntry addItemLibraryEntry(const NodeMetaInfo &nodeMetaInfo, const QString &itemLibraryRepresentationName);
+ void remove(const NodeMetaInfo &nodeMetaInfo);
+ void clear();
+
+private:
+ static ItemLibraryInfo createItemLibraryInfo(const ItemLibraryInfo &parentInfo);
+ QSharedPointer<Internal::ItemLibraryInfoPrivate> m_data;
+};
+
+} // namespace QmlDesigner
-#endif // ItemLibraryINFO_H
+#endif // ITEMLIBRARYINFO_H
diff --git a/src/plugins/qmldesigner/designercore/include/metainfo.h b/src/plugins/qmldesigner/designercore/include/metainfo.h
index f4c776ae9d1ca3499c14fe4ce15982144b561356..e6b0ead5bd35d28b1c2650219d434ac11ca8b19a 100644
--- a/src/plugins/qmldesigner/designercore/include/metainfo.h
+++ b/src/plugins/qmldesigner/designercore/include/metainfo.h
@@ -47,6 +47,7 @@ namespace QmlDesigner {
class ModelNode;
class AbstractProperty;
+class ItemLibraryInfo;
namespace Internal {
class MetaInfoPrivate;
@@ -58,6 +59,7 @@ namespace Internal {
CORESHARED_EXPORT bool operator==(const MetaInfo &first, const MetaInfo &second);
CORESHARED_EXPORT bool operator!=(const MetaInfo &first, const MetaInfo &second);
+
class CORESHARED_EXPORT MetaInfo
{
friend class QmlDesigner::Internal::MetaInfoPrivate;
@@ -82,11 +84,11 @@ public:
bool hasEnumerator(const QString &enumeratorName) const;
EnumeratorMetaInfo enumerator(const QString &enumeratorName) const;
- QStringList itemLibraryItems() const;
- QList<ItemLibraryInfo> itemLibraryRepresentations(const NodeMetaInfo &nodeMetaInfo) const;
- ItemLibraryInfo itemLibraryRepresentation(const QString &name) const;
+ ItemLibraryInfo itemLibraryInfo() const;
+
QString fromQtTypes(const QString &type) const;
+
public:
static MetaInfo global();
static void clearGlobal();
@@ -107,7 +109,6 @@ private:
EnumeratorMetaInfo addEnumerator(const QString &enumeratorScope, const QString &enumeratorName);
EnumeratorMetaInfo addFlag(const QString &enumeratorScope, const QString &enumeratorName);
- ItemLibraryInfo addItemLibraryInfo(const NodeMetaInfo &nodeMetaInfo, const QString &itemLibraryRepresentationName);
bool isGlobal() const;
diff --git a/src/plugins/qmldesigner/designercore/include/metainfoparser.h b/src/plugins/qmldesigner/designercore/include/metainfoparser.h
index 1b5e999871a25fb823a3fb305bfee34dedd053cb..1a0877713070d2d96abdbffe55d2d7a81a136825 100644
--- a/src/plugins/qmldesigner/designercore/include/metainfoparser.h
+++ b/src/plugins/qmldesigner/designercore/include/metainfoparser.h
@@ -40,7 +40,7 @@ namespace QmlDesigner {
class NodeMetaInfo;
class EnumeratorMetaInfo;
-class ItemLibraryInfo;
+class ItemLibraryEntry;
namespace Internal {
@@ -63,10 +63,10 @@ protected:
void handleFlagElementElement(QXmlStreamReader &reader, EnumeratorMetaInfo &enumeratorMetaInfo);
void handleNodeElement(QXmlStreamReader &reader);
void handleNodeInheritElement(QXmlStreamReader &reader, const QString &className);
- void handleNodeItemLibraryRepresentationElement(QXmlStreamReader &reader, const QString &className);
+ void handleNodeItemLibraryEntryElement(QXmlStreamReader &reader, const QString &className);
void handleAbstractPropertyElement(QXmlStreamReader &reader, NodeMetaInfo &nodeMetaInfo);
void handleAbstractPropertyDefaultValueElement(QXmlStreamReader &reader, NodeMetaInfo &nodeMetaInfo);
- void handleItemLibraryInfoPropertyElement(QXmlStreamReader &reader, ItemLibraryInfo &ItemLibraryInfo);
+ void handleItemLibraryEntryPropertyElement(QXmlStreamReader &reader, ItemLibraryEntry &itemLibraryEntry);
private:
MetaInfo m_metaInfo;
diff --git a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
index 17a740119df1c64e306942de5cd07616bc4dc0b8..3dfaa5855296602fb4a76be142db584d940920b1 100644
--- a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
+++ b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
@@ -52,7 +52,7 @@ namespace Internal {
class MetaInfoParser;
class NodeMetaInfoData;
class SubComponentManagerPrivate;
- class ItemLibraryInfoData;
+ class ItemLibraryEntryData;
}
class PropertyMetaInfo;
@@ -60,7 +60,7 @@ class PropertyMetaInfo;
class CORESHARED_EXPORT NodeMetaInfo
{
friend class QmlDesigner::MetaInfo;
- friend class QmlDesigner::Internal::ItemLibraryInfoData;
+ friend class QmlDesigner::Internal::ItemLibraryEntryData;
friend class QmlDesigner::Internal::MetaInfoPrivate;
friend class QmlDesigner::Internal::MetaInfoParser;
friend class QmlDesigner::Internal::SubComponentManagerPrivate;
@@ -95,7 +95,6 @@ public:
bool hasProperty(const QString &propertyName, bool resolveDotSyntax = false) const;
bool isContainer() const;
- bool isVisibleToItemLibrary() const;
bool isWidget() const;
bool isGraphicsWidget() const;
@@ -105,7 +104,6 @@ public:
bool isSubclassOf(const QString& type, int majorVersion = 4, int minorVersion = 6) const;
QIcon icon() const;
- QString category() const;
private:
NodeMetaInfo();
@@ -115,9 +113,7 @@ private:
void setTypeName(const QString &typeName);
void addProperty(const PropertyMetaInfo &property);
void setIsContainer(bool isContainer);
- void setIsVisibleToItemLibrary(bool isVisibleToItemLibrary);
void setIcon(const QIcon &icon);
- void setCategory(const QString &category);
void setQmlFile(const QString &filePath);
void setDefaultProperty(const QString &defaultProperty);
void setMajorVersion(int version);
diff --git a/src/plugins/qmldesigner/designercore/include/qmlmodelview.h b/src/plugins/qmldesigner/designercore/include/qmlmodelview.h
index 8406b7f03decc6739ea228041939c92a7bf1b1eb..f48f76fc31f53eb1214428b542faa85bdabd976e 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlmodelview.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlmodelview.h
@@ -40,7 +40,7 @@
namespace QmlDesigner {
-class ItemLibraryInfo;
+class ItemLibraryEntry;
class CORESHARED_EXPORT QmlModelView : public ForwardView<NodeInstanceView>
{
@@ -66,7 +66,7 @@ public:
int minorVersion,
const PropertyListType &propertyList = PropertyListType());
- QmlItemNode createQmlItemNode(const ItemLibraryInfo &ItemLibraryRepresentation, const QPointF &position, QmlItemNode parentNode);
+ QmlItemNode createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, const QPointF &position, QmlItemNode parentNode);
QmlItemNode createQmlItemNodeFromImage(const QString &imageName, const QPointF &position, QmlItemNode parentNode);
QmlObjectNode rootQmlObjectNode() const;
diff --git a/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h b/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h
index 988096933fbf9f7e223fb0ac16354b129015b9db..837f5d489badc5137880d5698e3f6a0063a4e961 100644
--- a/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h
+++ b/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h
@@ -54,8 +54,6 @@ public:
QStringList qmlFiles() const;
QStringList directories() const;
-signals:
- void qmlFilesChanged(const QStringList &oldPathList, const QStringList &newPathList);
private:
friend class Internal::SubComponentManagerPrivate;
diff --git a/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp
index a4671301283fc9b78840fcceebd28cef86509981..aa01e830caa768ce382f1b948e86f238f2e74f36 100644
--- a/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp
@@ -42,6 +42,7 @@
#include <private/qdeclarativeanchors_p.h>
#include <private/qdeclarativeanchors_p_p.h>
+#include <private/qdeclarativeitem_p.h>
#include <private/qdeclarativeproperty_p.h>
#include <private/qdeclarativerectangle_p.h>
@@ -292,33 +293,33 @@ void QmlGraphicsItemNodeInstance::resetProperty(const QString &name)
GraphicsObjectNodeInstance::resetProperty(name);
if (name == "anchors.fill") {
- qmlGraphicsItem()->anchors()->resetFill();
+ anchors()->resetFill();
resetHorizontal();
resetVertical();
} else if (name == "anchors.centerIn") {
- qmlGraphicsItem()->anchors()->resetCenterIn();
+ anchors()->resetCenterIn();
resetHorizontal();
resetVertical();
} else if (name == "anchors.top") {
- qmlGraphicsItem()->anchors()->resetTop();
+ anchors()->resetTop();
resetVertical();
} else if (name == "anchors.left") {
- qmlGraphicsItem()->anchors()->resetLeft();
+ anchors()->resetLeft();
resetHorizontal();
} else if (name == "anchors.right") {
- qmlGraphicsItem()->anchors()->resetRight();
+ anchors()->resetRight();
resetHorizontal();
} else if (name == "anchors.bottom") {
- qmlGraphicsItem()->anchors()->resetBottom();
+ anchors()->resetBottom();
resetVertical();
} else if (name == "anchors.horizontalCenter") {
- qmlGraphicsItem()->anchors()->resetHorizontalCenter();
+ anchors()->resetHorizontalCenter();
resetHorizontal();
} else if (name == "anchors.verticalCenter") {
- qmlGraphicsItem()->anchors()->resetVerticalCenter();
+ anchors()->resetVerticalCenter();
resetVertical();
} else if (name == "anchors.baseline") {
- qmlGraphicsItem()->anchors()->resetBaseline();
+ anchors()->resetBaseline();
resetVertical();
}
}
@@ -333,11 +334,11 @@ void QmlGraphicsItemNodeInstance::resetProperty(const QString &name)
//
// if (instance.isQmlGraphicsItem()) {
// Pointer qmlGraphicsItemInstance(instance.QmlGraphicsItemNodeInstance());
-// qmlGraphicsItem()->anchors()->setProperty("top", anchorLineFor(qmlGraphicsItemInstance->qmlGraphicsItem(), anchorLine));
+// anchors()->setProperty("top", anchorLineFor(qmlGraphicsItemInstance->qmlGraphicsItem(), anchorLine));
// }
// } else {
-// if (qmlGraphicsItem()->anchors()->usedAnchors().testFlag(QDeclarativeAnchors::HasTopAnchor)) {
-// qmlGraphicsItem()->anchors()->resetTop();
+// if (anchors()->usedAnchors().testFlag(QDeclarativeAnchors::HasTopAnchor)) {
+// anchors()->resetTop();
// setPropertyValue("y", modelNode().property("y").value());
// setPropertyValue("height", modelNode().property("height").value());
// }
@@ -350,11 +351,11 @@ void QmlGraphicsItemNodeInstance::resetProperty(const QString &name)
//
// if (instance.isQmlGraphicsItem()) {
// Pointer qmlGraphicsItemInstance(instance.QmlGraphicsItemNodeInstance());
-// qmlGraphicsItem()->anchors()->setProperty("left", anchorLineFor(qmlGraphicsItemInstance->qmlGraphicsItem(), anchorLine));
+// anchors()->setProperty("left", anchorLineFor(qmlGraphicsItemInstance->qmlGraphicsItem(), anchorLine));
// }
// } else {
-// if (qmlGraphicsItem()->anchors()->usedAnchors().testFlag(QDeclarativeAnchors::HasLeftAnchor)) {
-// qmlGraphicsItem()->anchors()->resetLeft();
+// if (anchors()->usedAnchors().testFlag(QDeclarativeAnchors::HasLeftAnchor)) {
+// anchors()->resetLeft();
// setPropertyValue("x", modelNode().property("x").value());
// setPropertyValue("width", modelNode().property("width").value());
// }
@@ -367,11 +368,11 @@ void QmlGraphicsItemNodeInstance::resetProperty(const QString &name)
//
// if (instance.isQmlGraphicsItem()) {
// Pointer qmlGraphicsItemInstance(instance.QmlGraphicsItemNodeInstance());
-// qmlGraphicsItem()->anchors()->setProperty("right", anchorLineFor(qmlGraphicsItemInstance->qmlGraphicsItem(), anchorLine));
+// anchors()->setProperty("right", anchorLineFor(qmlGraphicsItemInstance->qmlGraphicsItem(), anchorLine));
// }
// } else {
-// if (qmlGraphicsItem()->anchors()->usedAnchors().testFlag(QDeclarativeAnchors::HasRightAnchor)) {
-// qmlGraphicsItem()->anchors()->resetRight();
+// if (anchors()->usedAnchors().testFlag(QDeclarativeAnchors::HasRightAnchor)) {
+// anchors()->resetRight();
// setPropertyValue("x", modelNode().property("x").value());
// setPropertyValue("width", modelNode().property("width").value());
// }
@@ -384,11 +385,11 @@ void QmlGraphicsItemNodeInstance::resetProperty(const QString &name)
//
// if (instance.isQmlGraphicsItem()) {
// Pointer qmlGraphicsItemInstance(instance.QmlGraphicsItemNodeInstance());
-// qmlGraphicsItem()->anchors()->setProperty("bottom", anchorLineFor(qmlGraphicsItemInstance->qmlGraphicsItem(), anchorLine));
+// anchors()->setProperty("bottom", anchorLineFor(qmlGraphicsItemInstance->qmlGraphicsItem(), anchorLine));
// }
// } else {
-// if (qmlGraphicsItem()->anchors()->usedAnchors().testFlag(QDeclarativeAnchors::HasBottomAnchor)) {
-// qmlGraphicsItem()->anchors()->resetBottom();
+// if (anchors()->usedAnchors().testFlag(QDeclarativeAnchors::HasBottomAnchor)) {
+// anchors()->resetBottom();
// setPropertyValue("y", modelNode().property("y").value());
// setPropertyValue("height", modelNode().property("height").value());
// }
@@ -401,11 +402,11 @@ void QmlGraphicsItemNodeInstance::resetProperty(const QString &name)
//
// if (instance.isQmlGraphicsItem()) {
// Pointer qmlGraphicsItemInstance(instance.QmlGraphicsItemNodeInstance());
-// qmlGraphicsItem()->anchors()->setProperty("horizontalCenter", anchorLineFor(qmlGraphicsItemInstance->qmlGraphicsItem(), anchorLine));
+// anchors()->setProperty("horizontalCenter", anchorLineFor(qmlGraphicsItemInstance->qmlGraphicsItem(), anchorLine));
// }
// } else {
-// if (qmlGraphicsItem()->anchors()->usedAnchors().testFlag(QDeclarativeAnchors::HasHCenterAnchor)) {
-// qmlGraphicsItem()->anchors()->resetHorizontalCenter();
+// if (anchors()->usedAnchors().testFlag(QDeclarativeAnchors::HasHCenterAnchor)) {
+// anchors()->resetHorizontalCenter();
// setPropertyValue("x", modelNode().property("x").value());
// setPropertyValue("width", modelNode().property("width").value());
// }
@@ -418,23 +419,23 @@ void QmlGraphicsItemNodeInstance::resetProperty(const QString &name)
//
// if (instance.isQmlGraphicsItem()) {
// Pointer qmlGraphicsItemInstance(instance.QmlGraphicsItemNodeInstance());
-// qmlGraphicsItem()->anchors()->setProperty("verticalCenter",anchorLineFor(qmlGraphicsItemInstance->qmlGraphicsItem(), anchorLine));
+// anchors()->setProperty("verticalCenter",anchorLineFor(qmlGraphicsItemInstance->qmlGraphicsItem(), anchorLine));
// }
// } else {
-// if (qmlGraphicsItem()->anchors()->usedAnchors().testFlag(QDeclarativeAnchors::HasVCenterAnchor)) {
-// qmlGraphicsItem()->anchors()->resetVerticalCenter();
+// if (anchors()->usedAnchors().testFlag(QDeclarativeAnchors::HasVCenterAnchor)) {
+// anchors()->resetVerticalCenter();
// setPropertyValue("y", modelNode().property("y").value());
// setPropertyValue("height", modelNode().property("height").value());
// }
// }
//
//
-// qmlGraphicsItem()->anchors()->setTopMargin(anchors.margin(AnchorLine::Top));
-// qmlGraphicsItem()->anchors()->setLeftMargin(anchors.margin(AnchorLine::Left));
-// qmlGraphicsItem()->anchors()->setBottomMargin(anchors.margin(AnchorLine::Bottom));
-// qmlGraphicsItem()->anchors()->setRightMargin(anchors.margin(AnchorLine::Right));
-// qmlGraphicsItem()->anchors()->setHorizontalCenterOffset(anchors.margin(AnchorLine::HorizontalCenter));
-// qmlGraphicsItem()->anchors()->setVerticalCenterOffset(anchors.margin(AnchorLine::VerticalCenter));
+// anchors()->setTopMargin(anchors.margin(AnchorLine::Top));
+// anchors()->setLeftMargin(anchors.margin(AnchorLine::Left));
+// anchors()->setBottomMargin(anchors.margin(AnchorLine::Bottom));
+// anchors()->setRightMargin(anchors.margin(AnchorLine::Right));
+// anchors()->setHorizontalCenterOffset(anchors.margin(AnchorLine::HorizontalCenter));
+// anchors()->setVerticalCenterOffset(anchors.margin(AnchorLine::VerticalCenter));
//}
QDeclarativeAnchors::Anchor anchorLineFlagForName(const QString &name)
@@ -504,9 +505,9 @@ QPair<QString, NodeInstance> QmlGraphicsItemNodeInstance::anchor(const QString &
QString targetName;
if (name == "anchors.fill") {
- targetObject = qmlGraphicsItem()->anchors()->fill();
+ targetObject = anchors()->fill();
} else if (name == "anchors.centerIn") {
- targetObject = qmlGraphicsItem()->anchors()->centerIn();
+ targetObject = anchors()->centerIn();
} else {
QDeclarativeProperty metaProperty(object(), name, context());
if (!metaProperty.isValid())
@@ -533,46 +534,49 @@ bool QmlGraphicsItemNodeInstance::hasAnchor(const QString &name) const
return false;
if (name == "anchors.fill")
- return qmlGraphicsItem()->anchors()->fill() != 0;
+ return anchors()->fill() != 0;
if (name == "anchors.centerIn")
- return qmlGraphicsItem()->anchors()->centerIn() != 0;
+ return anchors()->centerIn() != 0;
if (name == "anchors.right")
- return qmlGraphicsItem()->anchors()->right().item != 0;
+ return anchors()->right().item != 0;
if (name == "anchors.top")
- return qmlGraphicsItem()->anchors()->top().item != 0;
+ return anchors()->top().item != 0;
if (name == "anchors.left")
- return qmlGraphicsItem()->anchors()->left().item != 0;
+ return anchors()->left().item != 0;
if (name == "anchors.bottom")
- return qmlGraphicsItem()->anchors()->bottom().item != 0;
+ return anchors()->bottom().item != 0;
if (name == "anchors.horizontalCenter")
- return qmlGraphicsItem()->anchors()->horizontalCenter().item != 0;
+ return anchors()->horizontalCenter().item != 0;
if (name == "anchors.verticalCenter")
- return qmlGraphicsItem()->anchors()->verticalCenter().item != 0;
+ return anchors()->verticalCenter().item != 0;
if (name == "anchors.baseline")
- return qmlGraphicsItem()->anchors()->baseline().item != 0;
+ return anchors()->baseline().item != 0;
- return qmlGraphicsItem()->anchors()->usedAnchors().testFlag(anchorLineFlagForName(name));
+ return anchors()->usedAnchors().testFlag(anchorLineFlagForName(name));
}
bool isAnchoredTo(QDeclarativeItem *fromItem, QDeclarativeItem *toItem)
{
- return fromItem->anchors()->fill() == toItem
- || fromItem->anchors()->centerIn() == toItem
- || fromItem->anchors()->bottom().item == toItem
- || fromItem->anchors()->top().item == toItem
- || fromItem->anchors()->left().item == toItem
- || fromItem->anchors()->right().item == toItem
- || fromItem->anchors()->verticalCenter().item == toItem
- || fromItem->anchors()->horizontalCenter().item == toItem
- || fromItem->anchors()->baseline().item == toItem;
+ Q_ASSERT(dynamic_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(fromItem)));
+ QDeclarativeItemPrivate *fromItemPrivate = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(fromItem));
+ QDeclarativeAnchors *anchors = fromItemPrivate->anchors();
+ return anchors->fill() == toItem
+ || anchors->centerIn() == toItem
+ || anchors->bottom().item == toItem
+ || anchors->top().item == toItem
+ || anchors->left().item == toItem
+ || anchors->right().item == toItem
+ || anchors->verticalCenter().item == toItem
+ || anchors->horizontalCenter().item == toItem
+ || anchors->baseline().item == toItem;
}
bool areChildrenAnchoredTo(QDeclarativeItem *fromItem, QDeclarativeItem *toItem)
@@ -612,8 +616,6 @@ bool QmlGraphicsItemNodeInstance::isAnchoredBy() const
return false;
}
-
-
QDeclarativeItem *QmlGraphicsItemNodeInstance::qmlGraphicsItem() const
{
if (object() == 0)
@@ -622,5 +624,13 @@ QDeclarativeItem *QmlGraphicsItemNodeInstance::qmlGraphicsItem() const
Q_ASSERT(qobject_cast<QDeclarativeItem*>(object()));
return static_cast<QDeclarativeItem*>(object());
}
+
+QDeclarativeAnchors *QmlGraphicsItemNodeInstance::anchors() const
+{
+ Q_ASSERT(dynamic_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(qmlGraphicsItem())));
+ QDeclarativeItemPrivate *itemPrivate = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(qmlGraphicsItem()));
+ return itemPrivate->anchors();
}
-}
+
+} // namespace Internal
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.h b/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.h
index be3bd5dd1bba29fc2477d92e78d51aae83c70f9b..67aa6813516d2c4cb45200ab3186ad78a42f752f 100644
--- a/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.h
+++ b/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.h
@@ -68,6 +68,7 @@ public:
protected:
QmlGraphicsItemNodeInstance(QDeclarativeItem *item, bool hasContent);
QDeclarativeItem *qmlGraphicsItem() const;
+ QDeclarativeAnchors *anchors() const;
void resetHorizontal();
void resetVertical();
diff --git a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
index 2a780de6ffa86c33f29aa34959d5625f897553e0..15f681ea74945335db4bb9b846a797346df524dd 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
@@ -28,22 +28,18 @@
**************************************************************************/
#include "itemlibraryinfo.h"
-#include "model/internalproperty.h"
+#include "nodemetainfo.h"
#include <QSharedData>
-#include <QString>
-#include <QList>
-#include <QtDebug>
-#include <QIcon>
namespace QmlDesigner {
namespace Internal {
-class ItemLibraryInfoData : public QSharedData
+class ItemLibraryEntryData : public QSharedData
{
public:
- ItemLibraryInfoData() : majorVersion(-1), minorVersion(-1)
+ ItemLibraryEntryData() : majorVersion(-1), minorVersion(-1)
{ }
QString name;
QString typeName;
@@ -55,14 +51,31 @@ public:
QList<PropertyContainer> properties;
QString qml;
};
-}
-ItemLibraryInfo::ItemLibraryInfo(const ItemLibraryInfo &other)
+class ItemLibraryInfoPrivate
+{
+public:
+ typedef QSharedPointer<ItemLibraryInfoPrivate> Pointer;
+ typedef QSharedPointer<ItemLibraryInfoPrivate> WeakPointer;
+
+ QMultiHash<NodeMetaInfo, ItemLibraryEntry> itemLibraryInfoHash;
+ QHash<QString, ItemLibraryEntry> itemLibraryInfoHashAll;
+
+ Pointer parentData;
+};
+
+} // namespace Internal
+
+//
+// ItemLibraryEntry
+//
+
+ItemLibraryEntry::ItemLibraryEntry(const ItemLibraryEntry &other)
: m_data(other.m_data)
{
}
-ItemLibraryInfo& ItemLibraryInfo::operator=(const ItemLibraryInfo &other)
+ItemLibraryEntry& ItemLibraryEntry::operator=(const ItemLibraryEntry &other)
{
if (this !=&other)
m_data = other.m_data;
@@ -70,139 +83,237 @@ ItemLibraryInfo& ItemLibraryInfo::operator=(const ItemLibraryInfo &other)
return *this;
}
-void ItemLibraryInfo::setDragIcon(const QIcon &icon)
+void ItemLibraryEntry::setDragIcon(const QIcon &icon)
{
m_data->dragIcon = icon;
}
-QIcon ItemLibraryInfo::dragIcon() const
+QIcon ItemLibraryEntry::dragIcon() const
{
return m_data->dragIcon;
}
-void ItemLibraryInfo::addProperty(const Property &property)
+void ItemLibraryEntry::addProperty(const Property &property)
{
m_data->properties.append(property);
}
-QList<ItemLibraryInfo::Property> ItemLibraryInfo::properties() const
+QList<ItemLibraryEntry::Property> ItemLibraryEntry::properties() const
{
return m_data->properties;
}
-ItemLibraryInfo::ItemLibraryInfo() : m_data(new Internal::ItemLibraryInfoData)
+ItemLibraryEntry::ItemLibraryEntry() : m_data(new Internal::ItemLibraryEntryData)
{
m_data->name.clear();
}
-ItemLibraryInfo::~ItemLibraryInfo()
+ItemLibraryEntry::~ItemLibraryEntry()
{
}
-QString ItemLibraryInfo::name() const
+QString ItemLibraryEntry::name() const
{
return m_data->name;
}
-QString ItemLibraryInfo::typeName() const
+QString ItemLibraryEntry::typeName() const
{
return m_data->typeName;
}
-QString ItemLibraryInfo::qml() const
+QString ItemLibraryEntry::qml() const
{
return m_data->qml;
}
-int ItemLibraryInfo::majorVersion() const
+int ItemLibraryEntry::majorVersion() const
{
return m_data->majorVersion;
}
-int ItemLibraryInfo::minorVersion() const
+int ItemLibraryEntry::minorVersion() const
{
return m_data->minorVersion;
}
-QString ItemLibraryInfo::category() const
+QString ItemLibraryEntry::category() const
{
return m_data->category;
}
-void ItemLibraryInfo::setCategory(const QString &category)
+void ItemLibraryEntry::setCategory(const QString &category)
{
m_data->category = category;
}
-QIcon ItemLibraryInfo::icon() const
+QIcon ItemLibraryEntry::icon() const
{
return m_data->icon;
}
-void ItemLibraryInfo::setName(const QString &name)
+void ItemLibraryEntry::setName(const QString &name)
{
m_data->name = name;
}
-void ItemLibraryInfo::setTypeName(const QString &typeName)
+void ItemLibraryEntry::setTypeName(const QString &typeName)
{
m_data->typeName = typeName;
}
-void ItemLibraryInfo::setIcon(const QIcon &icon)
+void ItemLibraryEntry::setIcon(const QIcon &icon)
{
m_data->icon = icon;
}
-void ItemLibraryInfo::setMajorVersion(int majorVersion)
+void ItemLibraryEntry::setMajorVersion(int majorVersion)
{
m_data->majorVersion = majorVersion;
}
-void ItemLibraryInfo::setMinorVersion(int minorVersion)
+void ItemLibraryEntry::setMinorVersion(int minorVersion)
{
m_data->minorVersion = minorVersion;
}
-void ItemLibraryInfo::setQml(const QString &qml)
+void ItemLibraryEntry::setQml(const QString &qml)
{
m_data->qml = qml;
}
-void ItemLibraryInfo::addProperty(QString &name, QString &type, QString &value)
+void ItemLibraryEntry::addProperty(QString &name, QString &type, QString &value)
{
Property property;
property.set(name, type, value);
addProperty(property);
}
-QDataStream& operator<<(QDataStream& stream, const ItemLibraryInfo& itemLibraryInfo)
+QDataStream& operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibraryEntry)
{
- stream << itemLibraryInfo.name();
- stream << itemLibraryInfo.typeName();
- stream << itemLibraryInfo.majorVersion();
- stream << itemLibraryInfo.minorVersion();
- stream << itemLibraryInfo.icon();
- stream << itemLibraryInfo.category();
- stream << itemLibraryInfo.dragIcon();
- stream << itemLibraryInfo.m_data->properties;
+ stream << itemLibraryEntry.name();
+ stream << itemLibraryEntry.typeName();
+ stream << itemLibraryEntry.majorVersion();
+ stream << itemLibraryEntry.minorVersion();
+ stream << itemLibraryEntry.icon();
+ stream << itemLibraryEntry.category();
+ stream << itemLibraryEntry.dragIcon();
+ stream << itemLibraryEntry.m_data->properties;
return stream;
}
-QDataStream& operator>>(QDataStream& stream, ItemLibraryInfo& itemLibraryInfo)
+QDataStream& operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry)
{
- stream >> itemLibraryInfo.m_data->name;
- stream >> itemLibraryInfo.m_data->typeName;
- stream >> itemLibraryInfo.m_data->majorVersion;
- stream >> itemLibraryInfo.m_data->minorVersion;
- stream >> itemLibraryInfo.m_data->icon;
- stream >> itemLibraryInfo.m_data->category;
- stream >> itemLibraryInfo.m_data->dragIcon;
- stream >> itemLibraryInfo.m_data->properties;
+ stream >> itemLibraryEntry.m_data->name;
+ stream >> itemLibraryEntry.m_data->typeName;
+ stream >> itemLibraryEntry.m_data->majorVersion;
+ stream >> itemLibraryEntry.m_data->minorVersion;
+ stream >> itemLibraryEntry.m_data->icon;
+ stream >> itemLibraryEntry.m_data->category;
+ stream >> itemLibraryEntry.m_data->dragIcon;
+ stream >> itemLibraryEntry.m_data->properties;
return stream;
}
+//
+// ItemLibraryInfo
+//
+
+ItemLibraryInfo::ItemLibraryInfo(const ItemLibraryInfo &other) :
+ m_data(other.m_data)
+{
+}
+
+ItemLibraryInfo::ItemLibraryInfo() :
+ m_data(new Internal::ItemLibraryInfoPrivate())
+{
+}
+
+ItemLibraryInfo::~ItemLibraryInfo()
+{
+}
+
+ItemLibraryInfo& ItemLibraryInfo::operator=(const ItemLibraryInfo &other)
+{
+ m_data = other.m_data;
+ return *this;
+}
+
+bool ItemLibraryInfo::isValid()
+{
+ return m_data;
+}
+ItemLibraryInfo ItemLibraryInfo::createItemLibraryInfo(const ItemLibraryInfo &parentInfo)
+{
+ ItemLibraryInfo info;
+ Q_ASSERT(parentInfo.m_data);
+ info.m_data->parentData = parentInfo.m_data;
+ return info;
}
+
+QList<ItemLibraryEntry> ItemLibraryInfo::entriesForNodeMetaInfo(const NodeMetaInfo &nodeMetaInfo) const
+{
+ QList<ItemLibraryEntry> itemLibraryItems;
+
+ Internal::ItemLibraryInfoPrivate::WeakPointer pointer(m_data);
+ while (pointer) {
+ itemLibraryItems += pointer->itemLibraryInfoHash.values(nodeMetaInfo);
+ pointer = pointer->parentData;
+ }
+ return itemLibraryItems;
+}
+
+ItemLibraryEntry ItemLibraryInfo::entry(const QString &name) const
+{
+ Internal::ItemLibraryInfoPrivate::WeakPointer pointer(m_data);
+ while (pointer) {
+ if (pointer->itemLibraryInfoHashAll.contains(name))
+ return pointer->itemLibraryInfoHashAll.value(name);
+ pointer = pointer->parentData;
+ }
+
+ return ItemLibraryEntry();
+}
+
+
+QList<ItemLibraryEntry> ItemLibraryInfo::entries() const
+{
+ QList<ItemLibraryEntry> list;
+
+ Internal::ItemLibraryInfoPrivate::WeakPointer pointer(m_data);
+ while (pointer) {
+ list += pointer->itemLibraryInfoHashAll.values();
+ pointer = pointer->parentData;
+ }
+ return list;
+}
+
+ItemLibraryEntry ItemLibraryInfo::addItemLibraryEntry(const NodeMetaInfo &nodeMetaInfo,
+ const QString &itemLibraryRepresentationName)
+{
+ ItemLibraryEntry itemLibraryType;
+ itemLibraryType.setName(itemLibraryRepresentationName);
+ itemLibraryType.setTypeName(nodeMetaInfo.typeName());
+ itemLibraryType.setMajorVersion(nodeMetaInfo.majorVersion());
+ itemLibraryType.setMinorVersion(nodeMetaInfo.minorVersion());
+ m_data->itemLibraryInfoHash.insert(nodeMetaInfo, itemLibraryType);
+ m_data->itemLibraryInfoHashAll.insert(itemLibraryRepresentationName, itemLibraryType);
+ return itemLibraryType;
+}
+
+void ItemLibraryInfo::remove(const NodeMetaInfo &info)
+{
+ m_data->itemLibraryInfoHash.remove(info);
+ m_data->itemLibraryInfoHashAll.remove(info.typeName());
+}
+
+void ItemLibraryInfo::clear()
+{
+ m_data->itemLibraryInfoHash.clear();
+ m_data->itemLibraryInfoHashAll.clear();
+}
+
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
index 80a0be8b0f26368c321931adc58a2052c45e83b2..1c79dca045eacd56a235121d85f83270a3149dac 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
@@ -82,9 +82,8 @@ public:
QMultiHash<QString, QString> m_superClassHash; // the list of direct superclasses
QHash<QString, NodeMetaInfo> m_nodeMetaInfoHash;
QHash<QString, EnumeratorMetaInfo> m_enumeratorMetaInfoHash;
- QMultiHash<NodeMetaInfo, ItemLibraryInfo> m_itemLibraryInfoHash;
- QHash<QString, ItemLibraryInfo> m_itemLibraryInfoHashAll;
QHash<QString, QString> m_QtTypesToQmlTypes;
+ ItemLibraryInfo m_itemLibraryInfo;
MetaInfo *m_q;
bool m_isInitialized;
@@ -94,6 +93,8 @@ MetaInfoPrivate::MetaInfoPrivate(MetaInfo *q) :
m_q(q),
m_isInitialized(false)
{
+ if (!m_q->isGlobal())
+ m_itemLibraryInfo = ItemLibraryInfo::createItemLibraryInfo(m_q->global().itemLibraryInfo());
}
void MetaInfoPrivate::clear()
@@ -101,8 +102,7 @@ void MetaInfoPrivate::clear()
m_superClassHash.clear();
m_nodeMetaInfoHash.clear();
m_enumeratorMetaInfoHash.clear();
- m_itemLibraryInfoHash.clear();
- m_itemLibraryInfoHashAll.clear();
+ m_itemLibraryInfo.clear();
m_isInitialized = false;
}
@@ -492,23 +492,6 @@ QList<NodeMetaInfo> MetaInfo::directSuperClasses(const NodeMetaInfo &nodeInfo) c
return superClassList;
}
-QList<ItemLibraryInfo> MetaInfo::itemLibraryRepresentations(const NodeMetaInfo &nodeMetaInfo) const
-{
- QList<ItemLibraryInfo> itemLibraryItems = m_p->m_itemLibraryInfoHash.values(nodeMetaInfo);
- if (!isGlobal())
- itemLibraryItems += global().itemLibraryRepresentations(nodeMetaInfo);
- return itemLibraryItems;
-}
-
-ItemLibraryInfo MetaInfo::itemLibraryRepresentation(const QString &name) const
-{
- if (m_p->m_itemLibraryInfoHashAll.contains(name))
- return m_p->m_itemLibraryInfoHashAll.value(name);
- if (!isGlobal())
- return global().itemLibraryRepresentation(name);
- return ItemLibraryInfo();
-}
-
QString MetaInfo::fromQtTypes(const QString &type) const
{
if (m_p->m_QtTypesToQmlTypes.contains(type))
@@ -517,21 +500,6 @@ QString MetaInfo::fromQtTypes(const QString &type) const
return type;
}
-QStringList MetaInfo::itemLibraryItems() const
-{
- QStringList completeList = m_p->m_nodeMetaInfoHash.keys();
- QStringList finalList;
- foreach (const QString &name, completeList) {
- if (nodeMetaInfo(name).isVisibleToItemLibrary())
- finalList.append(name);
- }
-
- if (!isGlobal())
- finalList += global().itemLibraryItems();
-
- return finalList;
-}
-
/*!
\brief Returns whether className is the same type or a type derived from superClassName.
*/
@@ -574,6 +542,11 @@ EnumeratorMetaInfo MetaInfo::enumerator(const QString &enumeratorName) const
return EnumeratorMetaInfo();
}
+ItemLibraryInfo MetaInfo::itemLibraryInfo() const
+{
+ return m_p->m_itemLibraryInfo;
+}
+
/*!
\brief Access to the global meta information object.
You almost always want to use Model::metaInfo() instead.
@@ -643,8 +616,7 @@ void MetaInfo::removeNodeInfo(NodeMetaInfo &info)
m_p->m_superClassHash.remove(info.typeName());
// TODO: Other types might specify type as parent type
- m_p->m_itemLibraryInfoHash.remove(info);
- m_p->m_itemLibraryInfoHashAll.remove(info.typeName());
+ m_p->m_itemLibraryInfo.remove(info);
} else if (!isGlobal()) {
global().removeNodeInfo(info);
@@ -688,18 +660,6 @@ EnumeratorMetaInfo MetaInfo::addFlag(const QString &enumeratorScope, const QStri
return enumeratorMetaInfo;
}
-ItemLibraryInfo MetaInfo::addItemLibraryInfo(const NodeMetaInfo &nodeMetaInfo, const QString &itemLibraryRepresentationName)
-{
- ItemLibraryInfo itemLibraryInfo;
- itemLibraryInfo.setName(itemLibraryRepresentationName);
- itemLibraryInfo.setTypeName(nodeMetaInfo.typeName());
- itemLibraryInfo.setMajorVersion(nodeMetaInfo.majorVersion());
- itemLibraryInfo.setMinorVersion(nodeMetaInfo.minorVersion());
- m_p->m_itemLibraryInfoHash.insert(nodeMetaInfo, itemLibraryInfo);
- m_p->m_itemLibraryInfoHashAll.insert(itemLibraryRepresentationName, itemLibraryInfo);
- return itemLibraryInfo;
-}
-
bool MetaInfo::isGlobal() const
{
return (this->m_p == s_global.m_p);
@@ -714,4 +674,5 @@ bool operator!=(const MetaInfo &first, const MetaInfo &second)
{
return !(first == second);
}
+
} //namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
index 99dd5c90229a4378e53cea2323522ba576758ce4..6b899b73eb347cb4f573a5d625bf3a753771f1e7 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
@@ -179,16 +179,6 @@ void MetaInfoParser::handleNodeElement(QXmlStreamReader &reader)
nodeMetaInfo.setIsContainer(stringToBool(isContainer));
}
- if (attributes.hasAttribute("showInItemLibrary")) {
- const QString showInItemLibrary = attributes.value("showInItemLibrary").toString();
- nodeMetaInfo.setIsVisibleToItemLibrary(stringToBool(showInItemLibrary));
- }
-
- if (attributes.hasAttribute("category")) {
- const QString category = attributes.value("category").toString();
- nodeMetaInfo.setCategory(category);
- }
-
if (attributes.hasAttribute("icon")) {
const QString iconPath = reader.attributes().value("icon").toString();
nodeMetaInfo.setIcon(QIcon(iconPath));
@@ -200,29 +190,33 @@ void MetaInfoParser::handleNodeElement(QXmlStreamReader &reader)
handleNodeInheritElement(reader, className);
handleAbstractPropertyElement(reader, nodeMetaInfo);
handleAbstractPropertyDefaultValueElement(reader, nodeMetaInfo);
- handleNodeItemLibraryRepresentationElement(reader, className);
+ handleNodeItemLibraryEntryElement(reader, className);
}
}
-void MetaInfoParser::handleNodeItemLibraryRepresentationElement(QXmlStreamReader &reader, const QString & className)
+void MetaInfoParser::handleNodeItemLibraryEntryElement(QXmlStreamReader &reader, const QString & className)
{
- if (reader.isStartElement() && reader.name() == "itemlibraryrepresentation")
+ if (reader.isStartElement() && reader.name() == "itemlibraryentry")
{
QString name = reader.attributes().value("name").toString();
- ItemLibraryInfo ItemLibraryInfo = m_metaInfo.addItemLibraryInfo(m_metaInfo.nodeMetaInfo(className), name);
+ ItemLibraryEntry itemLibraryEntry = m_metaInfo.itemLibraryInfo().addItemLibraryEntry(m_metaInfo.nodeMetaInfo(className), name);
QString iconPath = reader.attributes().value("icon").toString();
if (!iconPath.isEmpty())
- ItemLibraryInfo.setIcon(QIcon(iconPath));
+ itemLibraryEntry.setIcon(QIcon(iconPath));
+
+ QString category = reader.attributes().value("category").toString();
+ if (!category.isEmpty())
+ itemLibraryEntry.setCategory(category);
- while (!reader.atEnd() && !(reader.isEndElement() && reader.name() == "itemlibraryrepresentation")) {
+ while (!reader.atEnd() && !(reader.isEndElement() && reader.name() == "itemlibraryentry")) {
reader.readNext();
- handleItemLibraryInfoPropertyElement(reader, ItemLibraryInfo);
+ handleItemLibraryEntryPropertyElement(reader, itemLibraryEntry);
}
}
}
-void MetaInfoParser::handleNodeInheritElement(QXmlStreamReader &reader, const QString & className)
+void MetaInfoParser::handleNodeInheritElement(QXmlStreamReader &reader, const QString &className)
{
if (reader.isStartElement() && reader.name() == "inherits")
{
@@ -233,7 +227,7 @@ void MetaInfoParser::handleNodeInheritElement(QXmlStreamReader &reader, const QS
}
}
-void MetaInfoParser::handleItemLibraryInfoPropertyElement(QXmlStreamReader &reader, ItemLibraryInfo &ItemLibraryInfo)
+void MetaInfoParser::handleItemLibraryEntryPropertyElement(QXmlStreamReader &reader, ItemLibraryEntry &itemLibraryEntry)
{
if (reader.isStartElement() && reader.name() == "property")
{
@@ -241,7 +235,7 @@ void MetaInfoParser::handleItemLibraryInfoPropertyElement(QXmlStreamReader &read
QString name = attributes.value("name").toString();
QString type = attributes.value("type").toString();
QString value = attributes.value("value").toString();
- ItemLibraryInfo.addProperty(name, type, value);
+ itemLibraryEntry.addProperty(name, type, value);
reader.readNext();
}
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index b63a1a991dfd6a9d10dffb113141f42773511ab0..d4f60bee8ccfa51e21e30d354160732521482fe1 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -62,7 +62,6 @@ public:
NodeMetaInfoData(const MetaInfo &metaInfo) :
metaInfo(metaInfo),
isContainer(false),
- isVisibleToItemLibrary(false),
isFXItem(Unknown),
icon(),
category("misc")
@@ -71,7 +70,6 @@ public:
MetaInfo metaInfo;
QString typeName;
bool isContainer;
- bool isVisibleToItemLibrary;
TristateBoolean isFXItem;
QHash<QString, PropertyMetaInfo> propertyMetaInfoHash;
QIcon icon;
@@ -547,15 +545,6 @@ bool NodeMetaInfo::isContainer() const
return m_data->isContainer;
}
-bool NodeMetaInfo::isVisibleToItemLibrary() const
-{
- if (!isValid()) {
- qWarning() << "NodeMetaInfo is invalid";
- return false;
- }
- return m_data->isVisibleToItemLibrary;
-}
-
void NodeMetaInfo::setIsContainer(bool isContainer)
{
if (!isValid()) {
@@ -565,15 +554,6 @@ void NodeMetaInfo::setIsContainer(bool isContainer)
m_data->isContainer = isContainer;
}
-void NodeMetaInfo::setIsVisibleToItemLibrary(bool isVisibleToItemLibrary)
-{
- if (!isValid()) {
- qWarning() << "NodeMetaInfo is invalid";
- return;
- }
- m_data->isVisibleToItemLibrary = isVisibleToItemLibrary;
-}
-
QIcon NodeMetaInfo::icon() const
{
if (!isValid()) {
@@ -583,15 +563,6 @@ QIcon NodeMetaInfo::icon() const
return m_data->icon;
}
-QString NodeMetaInfo::category() const
-{
- if (!isValid()) {
- qWarning() << "NodeMetaInfo is invalid";
- return QString();
- }
- return m_data->category;
-}
-
void NodeMetaInfo::setIcon(const QIcon &icon)
{
if (!isValid()) {
@@ -601,15 +572,6 @@ void NodeMetaInfo::setIcon(const QIcon &icon)
m_data->icon = icon;
}
-void NodeMetaInfo::setCategory(const QString &category)
-{
- if (!isValid()) {
- qWarning() << "NodeMetaInfo is invalid";
- return;
- }
- m_data->category = category;
-}
-
/*!
\brief Returns whether the type inherits from "QWidget".
diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
index c018d2bbff1c95a1a93951c301aa806c9890643b..8bae3ebba174ab5fbc86fc654f6971589545aae8 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
@@ -42,17 +42,13 @@ enum { debug = false };
QT_BEGIN_NAMESPACE
-// Allow usage of QFileInfo in hash / qSort
+// Allow usage of QFileInfo in qSort
static bool operator<(const QFileInfo &file1, const QFileInfo &file2)
{
return file1.filePath() < file2.filePath();
}
-static uint qHash(const QFileInfo &fileInfo)
-{
- return qHash(fileInfo.filePath());
-}
QT_END_NAMESPACE
@@ -73,11 +69,11 @@ public:
void parseDirectories();
public slots:
- void parseDirectory(const QString &dirPath);
- void parseFile(const QString &filePath);
+ void parseDirectory(const QString &canonicalDirPath);
+ void parseFile(const QString &canonicalFilePath);
public:
- QList<QFileInfo> watchedFiles(const QDir &dirInfo);
+ QList<QFileInfo> watchedFiles(const QString &canonicalDirPath);
void unregisterQmlFile(const QFileInfo &fileInfo, const QString &qualifier);
void registerQmlFile(const QFileInfo &fileInfo, const QString &qualifier, const QDeclarativeDomDocument &document);
@@ -88,7 +84,8 @@ public:
QFileSystemWatcher m_watcher;
- QMultiHash<QFileInfo,QString> m_dirToQualifier;
+ // key: canonical directory path
+ QMultiHash<QString,QString> m_dirToQualifier;
QUrl m_filePath;
@@ -111,8 +108,9 @@ void SubComponentManagerPrivate::addImport(int pos, const QDeclarativeDomImport
if (import.type() == QDeclarativeDomImport::File) {
QFileInfo dirInfo = QFileInfo(m_filePath.resolved(import.uri()).toLocalFile());
if (dirInfo.exists() && dirInfo.isDir()) {
- m_watcher.addPath(dirInfo.filePath());
- m_dirToQualifier.insertMulti(dirInfo, import.qualifier());
+ const QString canonicalDirPath = dirInfo.canonicalFilePath();
+ m_watcher.addPath(canonicalDirPath);
+ m_dirToQualifier.insertMulti(canonicalDirPath, import.qualifier());
}
} else {
// TODO: QDeclarativeDomImport::Library
@@ -126,15 +124,16 @@ void SubComponentManagerPrivate::removeImport(int pos)
const QDeclarativeDomImport import = m_imports.takeAt(pos);
if (import.type() == QDeclarativeDomImport::File) {
- QFileInfo dirInfo = QFileInfo(m_filePath.resolved(import.uri()).toLocalFile());
+ const QFileInfo dirInfo = QFileInfo(m_filePath.resolved(import.uri()).toLocalFile());
+ const QString canonicalDirPath = dirInfo.canonicalFilePath();
- m_dirToQualifier.remove(dirInfo, import.qualifier());
+ m_dirToQualifier.remove(canonicalDirPath, import.qualifier());
- if (!m_dirToQualifier.contains(dirInfo))
- m_watcher.removePath(dirInfo.filePath());
+ if (!m_dirToQualifier.contains(canonicalDirPath))
+ m_watcher.removePath(canonicalDirPath);
- foreach (const QFileInfo &monitoredFile, watchedFiles(dirInfo.filePath())) {
- if (!m_dirToQualifier.contains(dirInfo))
+ foreach (const QFileInfo &monitoredFile, watchedFiles(canonicalDirPath)) {
+ if (!m_dirToQualifier.contains(canonicalDirPath))
m_watcher.removePath(monitoredFile.filePath());
unregisterQmlFile(monitoredFile, import.qualifier());
}
@@ -149,30 +148,30 @@ void SubComponentManagerPrivate::parseDirectories()
const QString file = m_filePath.toLocalFile();
QFileInfo dirInfo = QFileInfo(QFileInfo(file).path());
if (dirInfo.exists() && dirInfo.isDir())
- parseDirectory(dirInfo.filePath());
+ parseDirectory(dirInfo.canonicalFilePath());
}
foreach (const QDeclarativeDomImport &import, m_imports) {
if (import.type() == QDeclarativeDomImport::File) {
QFileInfo dirInfo = QFileInfo(m_filePath.resolved(import.uri()).toLocalFile());
if (dirInfo.exists() && dirInfo.isDir()) {
- parseDirectory(dirInfo.filePath());
+ parseDirectory(dirInfo.canonicalFilePath());
}
}
}
}
-void SubComponentManagerPrivate::parseDirectory(const QString &dirPath)
+void SubComponentManagerPrivate::parseDirectory(const QString &canonicalDirPath)
{
if (debug)
- qDebug() << Q_FUNC_INFO << dirPath;
+ qDebug() << Q_FUNC_INFO << canonicalDirPath;
- QDir dir(dirPath);
+ QDir dir(canonicalDirPath);
dir.setNameFilters(QStringList(QMLFILEPATTERN));
dir.setFilter(QDir::Files | QDir::Readable | QDir::CaseSensitive);
- QList<QFileInfo> monitoredList = watchedFiles(dir);
+ QList<QFileInfo> monitoredList = watchedFiles(canonicalDirPath);
QList<QFileInfo> newList;
foreach (const QFileInfo &qmlFile, dir.entryInfoList()) {
if (QFileInfo(m_filePath.toLocalFile()) == qmlFile) {
@@ -203,7 +202,7 @@ void SubComponentManagerPrivate::parseDirectory(const QString &dirPath)
continue;
}
if (oldFileInfo < newFileInfo) {
- foreach (const QString &qualifier, m_dirToQualifier.value(dirPath))
+ foreach (const QString &qualifier, m_dirToQualifier.value(canonicalDirPath))
unregisterQmlFile(oldFileInfo, qualifier);
m_watcher.removePath(oldFileInfo.filePath());
++oldIter;
@@ -216,7 +215,7 @@ void SubComponentManagerPrivate::parseDirectory(const QString &dirPath)
}
while (oldIter != monitoredList.constEnd()) {
- foreach (const QString &qualifier, m_dirToQualifier.value(dirPath))
+ foreach (const QString &qualifier, m_dirToQualifier.value(canonicalDirPath))
unregisterQmlFile(*oldIter, qualifier);
m_watcher.removePath(oldIter->filePath());
++oldIter;
@@ -231,37 +230,37 @@ void SubComponentManagerPrivate::parseDirectory(const QString &dirPath)
}
}
-void SubComponentManagerPrivate::parseFile(const QString &filePath)
+void SubComponentManagerPrivate::parseFile(const QString &canonicalFilePath)
{
if (debug)
- qDebug() << Q_FUNC_INFO << filePath;
+ qDebug() << Q_FUNC_INFO << canonicalFilePath;
- QFile file(filePath);
+ QFile file(canonicalFilePath);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
return;
}
QDeclarativeDomDocument document;
- if (!document.load(&m_engine, file.readAll(), QUrl::fromLocalFile(filePath))) {
+ if (!document.load(&m_engine, file.readAll(), QUrl::fromLocalFile(canonicalFilePath))) {
// TODO: Put the errors somewhere?
- qWarning() << "Could not load qml file " << filePath;
+ qWarning() << "Could not load qml file " << canonicalFilePath;
return;
}
- QFileInfo dir = QFileInfo(filePath).absolutePath();
+ QString dir = QFileInfo(canonicalFilePath).path();
foreach (const QString &qualifier, m_dirToQualifier.values(dir)) {
- registerQmlFile(filePath, qualifier, document);
+ registerQmlFile(canonicalFilePath, qualifier, document);
}
}
-QList<QFileInfo> SubComponentManagerPrivate::watchedFiles(const QDir &dirInfo)
+// dirInfo must already contain a canonical path
+QList<QFileInfo> SubComponentManagerPrivate::watchedFiles(const QString &canonicalDirPath)
{
QList<QFileInfo> files;
- const QString dirPath = dirInfo.absolutePath();
foreach (const QString &monitoredFile, m_watcher.files()) {
QFileInfo fileInfo(monitoredFile);
- if (fileInfo.dir().absolutePath() == dirPath) {
+ if (fileInfo.dir().absolutePath() == canonicalDirPath) {
files.append(fileInfo);
}
}
@@ -304,10 +303,9 @@ void SubComponentManagerPrivate::registerQmlFile(const QFileInfo &fileInfo, cons
nodeInfo.setQmlFile(fileInfo.filePath());
// Add file components to the library
- nodeInfo.setCategory(tr("QML Components"));
- nodeInfo.setIsVisibleToItemLibrary(true);
+ ItemLibraryEntry itemLibType = m_metaInfo.itemLibraryInfo().addItemLibraryEntry(nodeInfo, componentName);
+ itemLibType.setCategory(tr("QML Components"));
- m_metaInfo.addItemLibraryInfo(nodeInfo, componentName);
m_metaInfo.addNodeInfo(nodeInfo, baseType);
foreach (const QDeclarativeDomDynamicProperty &dynamicProperty, document.rootObject().dynamicProperties()) {
@@ -405,14 +403,14 @@ void SubComponentManager::update(const QUrl &filePath, const QList<QDeclarativeD
//
if (oldDir != newDir) {
if (!oldDir.filePath().isEmpty()) {
- m_d->m_dirToQualifier.remove(oldDir, QString());
- if (!m_d->m_dirToQualifier.contains(oldDir))
+ m_d->m_dirToQualifier.remove(oldDir.canonicalFilePath(), QString());
+ if (!m_d->m_dirToQualifier.contains(oldDir.canonicalFilePath()))
m_d->m_watcher.removePath(oldDir.filePath());
}
if (!newDir.filePath().isEmpty()) {
m_d->m_watcher.addPath(newDir.filePath());
- m_d->m_dirToQualifier.insertMulti(newDir, QString());
+ m_d->m_dirToQualifier.insertMulti(newDir.canonicalFilePath(), QString());
}
}
diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
index 08fa7bb6d25af9d3c8321fcc13acb807d6a1ba54..01c6d2eec178049e1e44408d707b0bc40ec533b6 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
@@ -133,7 +133,7 @@ QmlItemNode QmlModelView::createQmlItemNodeFromImage(const QString &imageName, c
return newNode;
}
-QmlItemNode QmlModelView::createQmlItemNode(const ItemLibraryInfo &itemLibraryRepresentation, const QPointF &position, QmlItemNode parentNode)
+QmlItemNode QmlModelView::createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, const QPointF &position, QmlItemNode parentNode)
{
if (!parentNode.isValid())
parentNode = rootQmlItemNode();
@@ -148,17 +148,17 @@ QmlItemNode QmlModelView::createQmlItemNode(const ItemLibraryInfo &itemLibraryRe
propertyPairList.append(qMakePair(QString("x"), QVariant(round(position.x(), 4))));
propertyPairList.append(qMakePair(QString("y"), QVariant(round(position.y(), 4))));
- foreach (const PropertyContainer &property, itemLibraryRepresentation.properties())
+ foreach (const PropertyContainer &property, itemLibraryEntry.properties())
propertyPairList.append(qMakePair(property.name(), property.value()));
- newNode = createQmlItemNode(itemLibraryRepresentation.typeName(), itemLibraryRepresentation.majorVersion(), itemLibraryRepresentation.minorVersion(), propertyPairList);
+ newNode = createQmlItemNode(itemLibraryEntry.typeName(), itemLibraryEntry.majorVersion(), itemLibraryEntry.minorVersion(), propertyPairList);
parentNode.nodeAbstractProperty("data").reparentHere(newNode);
Q_ASSERT(newNode.isValid());
QString id;
int i = 1;
- QString name(itemLibraryRepresentation.name().toLower());
+ QString name(itemLibraryEntry.name().toLower());
name.remove(QLatin1Char(' '));
do {
id = name + QString::number(i);
diff --git a/src/plugins/qmldesigner/fxplugin/fx.metainfo b/src/plugins/qmldesigner/fxplugin/fx.metainfo
index 4d63e62eb862b31b256febf0f602b6b7ce4752fd..0520af0d2db52929e136ba6283f8d166ddbd4cc0 100644
--- a/src/plugins/qmldesigner/fxplugin/fx.metainfo
+++ b/src/plugins/qmldesigner/fxplugin/fx.metainfo
@@ -1,124 +1,124 @@
<metainfo>
- <node name="Qt/Item" showInItemLibrary="true" category="Qt - Basic" isContainer="true" icon=":/fxplugin/images/item-icon16.png">
+ <node name="Qt/Item" isContainer="true" icon=":/fxplugin/images/item-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="600"/>
<propertyDefaultValue name="height" type="int" defaultValue="400"/>
- <itemlibraryrepresentation name="Item" icon=":/fxplugin/images/item-icon.png">
+ <itemlibraryentry name="Item" category="Qt - Basic" icon=":/fxplugin/images/item-icon.png">
<property name="width" type="int" value="200"/>
<property name="height" type="int" value="200"/>
- </itemlibraryrepresentation>
+ </itemlibraryentry>
</node>
- <node name="Qt/Rectangle" showInItemLibrary="true" category="Qt - Basic" isContainer="true" icon=":/fxplugin/images/rect-icon16.png">
- <itemlibraryrepresentation name="Rectangle" icon=":/fxplugin/images/rect-icon.png">
+ <node name="Qt/Rectangle" category="Qt - Basic" isContainer="true" icon=":/fxplugin/images/rect-icon16.png">
+ <itemlibraryentry name="Rectangle" category="Qt - Basic" icon=":/fxplugin/images/rect-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
<property name="color" type="QColor" value="#ffffff"/>
- </itemlibraryrepresentation>
+ </itemlibraryentry>
</node>
- <node name="Qt/Text" showInItemLibrary="true" category="Qt - Basic" icon=":/fxplugin/images/text-icon16.png">
+ <node name="Qt/Text" icon=":/fxplugin/images/text-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="80"/>
<propertyDefaultValue name="height" type="int" defaultValue="20"/>
- <itemlibraryrepresentation name="Text" icon=":/fxplugin/images/text-icon.png">
+ <itemlibraryentry name="Text" category="Qt - Basic" icon=":/fxplugin/images/text-icon.png">
<property name="width" type="int" value="80"/>
<property name="height" type="int" value="20"/>
<property name="text" type="QString" value="text"/>
- </itemlibraryrepresentation>
+ </itemlibraryentry>
</node>
- <node name="Qt/TextEdit" showInItemLibrary="true" category="Qt - Basic" isContainer="false" icon=":/fxplugin/images/text-edit-icon16.png">
+ <node name="Qt/TextEdit" isContainer="false" icon=":/fxplugin/images/text-edit-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="80"/>
<propertyDefaultValue name="height" type="int" defaultValue="20"/>
- <itemlibraryrepresentation name="Text Edit" icon=":/fxplugin/images/text-edit-icon.png">
+ <itemlibraryentry name="Text Edit" category="Qt - Basic" icon=":/fxplugin/images/text-edit-icon.png">
<property name="width" type="int" value="80"/>
<property name="height" type="int" value="20"/>
<property name="text" type="QString" value="textEdit"/>
- </itemlibraryrepresentation>
+ </itemlibraryentry>
</node>
- <node name="Qt/TextInput" showInItemLibrary="true" category="Qt - Basic" isContainer="false" icon=":/fxplugin/images/text-input-icon16.png">
+ <node name="Qt/TextInput" isContainer="false" icon=":/fxplugin/images/text-input-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="80"/>
<propertyDefaultValue name="height" type="int" defaultValue="20"/>
- <itemlibraryrepresentation name="Text Input" icon=":/fxplugin/images/text-input-icon.png">
+ <itemlibraryentry name="Text Input" category="Qt - Basic" icon=":/fxplugin/images/text-input-icon.png">
<property name="width" type="int" value="80"/>
<property name="height" type="int" value="20"/>
<property name="text" type="QString" value="textInput"/>
- </itemlibraryrepresentation>
+ </itemlibraryentry>
</node>
- <node name="Qt/MouseArea" showInItemLibrary="true" category="Qt - Interaction" icon=":/fxplugin/images/mouse-area-icon16.png">
+ <node name="Qt/MouseArea" icon=":/fxplugin/images/mouse-area-icon16.png">
<inherits name="Item" />
- <itemlibraryrepresentation name="Mouse Area" icon=":/fxplugin/images/mouse-area-icon.png">
+ <itemlibraryentry name="Mouse Area" category="Qt - Interaction" icon=":/fxplugin/images/mouse-area-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
- </itemlibraryrepresentation>
+ </itemlibraryentry>
</node>
- <node name="Qt/Image" showInItemLibrary="true" category="Qt - Basic" isContainer="true" icon=":/fxplugin/images/image-icon16.png">
+ <node name="Qt/Image" isContainer="true" icon=":/fxplugin/images/image-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="200"/>
<propertyDefaultValue name="height" type="int" defaultValue="200"/>
- <itemlibraryrepresentation name="Image" icon=":/fxplugin/images/image-icon.png">
+ <itemlibraryentry name="Image" category="Qt - Basic" icon=":/fxplugin/images/image-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
<property name="source" type="QUrl" value="qrc:/fxplugin/images/template_image.png"/>
- </itemlibraryrepresentation>
+ </itemlibraryentry>
</node>
- <node name="Qt/BorderImage" showInItemLibrary="true" category="Qt - Basic" icon=":/fxplugin/images/border-image-icon16.png">
+ <node name="Qt/BorderImage" icon=":/fxplugin/images/border-image-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="200"/>
<propertyDefaultValue name="height" type="int" defaultValue="200"/>
- <itemlibraryrepresentation name="Border Image" icon=":/fxplugin/images/border-image-icon.png">
+ <itemlibraryentry name="Border Image" category="Qt - Basic" icon=":/fxplugin/images/border-image-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
<property name="source" type="QUrl" value="qrc:/fxplugin/images/template_image.png"/>
- </itemlibraryrepresentation>
+ </itemlibraryentry>
</node>
- <node name="Qt/Flickable" showInItemLibrary="true" category="Qt - Widgets" icon=":/fxplugin/images/flickable-icon16.png">
+ <node name="Qt/Flickable" icon=":/fxplugin/images/flickable-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="300"/>
<propertyDefaultValue name="height" type="int" defaultValue="300"/>
- <itemlibraryrepresentation name="Flickable" icon=":/fxplugin/images/flickable-icon.png">
+ <itemlibraryentry name="Flickable" category="Qt - Widgets" icon=":/fxplugin/images/flickable-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
- </itemlibraryrepresentation>
+ </itemlibraryentry>
</node>
- <node name="Qt/Flipable" showInItemLibrary="true" category="Qt - Widgets" icon=":/fxplugin/images/flipable-icon16.png">
+ <node name="Qt/Flipable" icon=":/fxplugin/images/flipable-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="300"/>
<propertyDefaultValue name="height" type="int" defaultValue="300"/>
- <itemlibraryrepresentation name="Flipable" icon=":/fxplugin/images/flipable-icon.png">
+ <itemlibraryentry name="Flipable" category="Qt - Widgets" icon=":/fxplugin/images/flipable-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
- </itemlibraryrepresentation>
+ </itemlibraryentry>
</node>
- <node name="Qt/GridView" showInItemLibrary="true" category="Qt - Views" icon=":/fxplugin/images/gridview-icon16.png">
- <itemlibraryrepresentation name="Grid View" icon=":/fxplugin/images/gridview-icon.png">
+ <node name="Qt/GridView" icon=":/fxplugin/images/gridview-icon16.png">
+ <itemlibraryentry name="Grid View" category="Qt - Views" icon=":/fxplugin/images/gridview-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
- </itemlibraryrepresentation>
+ </itemlibraryentry>
</node>
- <node name="Qt/ListView" showInItemLibrary="true" category="Qt - Views" icon=":/fxplugin/images/listview-icon16.png">
- <itemlibraryrepresentation name="List View" icon=":/fxplugin/images/listview-icon.png">
+ <node name="Qt/ListView" icon=":/fxplugin/images/listview-icon16.png">
+ <itemlibraryentry name="List View" category="Qt - Views" icon=":/fxplugin/images/listview-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
- </itemlibraryrepresentation>
+ </itemlibraryentry>
</node>
- <node name="Qt/PathView" showInItemLibrary="true" category="Qt - Views" icon=":/fxplugin/images/pathview-icon16.png">
- <itemlibraryrepresentation name="Path View" icon=":/fxplugin/images/pathview-icon.png">
+ <node name="Qt/PathView" icon=":/fxplugin/images/pathview-icon16.png">
+ <itemlibraryentry name="Path View" category="Qt - Views" icon=":/fxplugin/images/pathview-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
- </itemlibraryrepresentation>
+ </itemlibraryentry>
</node>
- <node name="Qt/FocusScope" showInItemLibrary="true" category="Qt - Interaction" icon=":/fxplugin/images/focusscope-icon16.png">
+ <node name="Qt/FocusScope" icon=":/fxplugin/images/focusscope-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="100"/>
<propertyDefaultValue name="height" type="int" defaultValue="100"/>
- <itemlibraryrepresentation name="Focus Scope" icon=":/fxplugin/images/focusscope-icon.png">
+ <itemlibraryentry name="Focus Scope" category="Qt - Interaction" icon=":/fxplugin/images/focusscope-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
- </itemlibraryrepresentation>
+ </itemlibraryentry>
</node>
- <node name="Qt/WebView" showInItemLibrary="true" category="Qt - Widgets" icon=":/fxplugin/images/webview-icon16.png">
+ <node name="Qt/WebView" icon=":/fxplugin/images/webview-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="300"/>
<propertyDefaultValue name="height" type="int" defaultValue="300"/>
- <itemlibraryrepresentation name="Web View" icon=":/fxplugin/images/webview-icon.png">
+ <itemlibraryentry name="Web View" category="Qt - Widgets" icon=":/fxplugin/images/webview-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
<property name="url" type="QString" value="http://www.trolltech.com"/>
- </itemlibraryrepresentation>
+ </itemlibraryentry>
</node>
</metainfo>
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
index b0c2f56aed8febf89c9a53bb87936f51ed6d4fb0..acd19d29a38fda0b14dfbaf5ed4ef9b1b4fcc2cf 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
@@ -124,15 +124,15 @@ void GettingStartedWelcomePageWidget::updateCppExamples(const QString &examplePa
while (!reader.atEnd()) {
switch (reader.readNext()) {
case QXmlStreamReader::StartElement:
- if (reader.name() == "category") {
+ if (reader.name() == QLatin1String("category")) {
QString name = reader.attributes().value(QLatin1String("name")).toString();
- if (name.contains("tutorial"))
+ if (name.contains(QLatin1String("tutorial")))
break;
dirName = reader.attributes().value(QLatin1String("dirname")).toString();
subMenu = menu->addMenu(name);
inExamples = true;
}
- if (inExamples && reader.name() == "example") {
+ if (inExamples && reader.name() == QLatin1String("example")) {
const QChar slash = QLatin1Char('/');
const QString name = reader.attributes().value(QLatin1String("name")).toString();
const QString fn = reader.attributes().value(QLatin1String("filename")).toString();
@@ -152,7 +152,7 @@ void GettingStartedWelcomePageWidget::updateCppExamples(const QString &examplePa
}
break;
case QXmlStreamReader::EndElement:
- if (reader.name() == "category")
+ if (reader.name() == QLatin1String("category"))
inExamples = false;
break;
default:
@@ -161,32 +161,43 @@ void GettingStartedWelcomePageWidget::updateCppExamples(const QString &examplePa
}
}
-void GettingStartedWelcomePageWidget::updateQmlExamples(const QString &examplePath)
+void GettingStartedWelcomePageWidget::updateQmlExamples(const QString &examplePath,
+ const QString &sourcePath)
{
- QDir declarativeDir(examplePath + "/declarative");
-
- if (!declarativeDir.exists())
- return;
-
- ui->qmlExamplesButton->setEnabled(true);;
ui->qmlExamplesButton->setText(tr("Choose an example..."));
-
- QList<QFileInfo> examples = declarativeDir.entryInfoList(QStringList(), QDir::AllDirs|QDir::NoDotAndDotDot, QDir::Name);
-
QMenu *menu = new QMenu(ui->qmlExamplesButton);
ui->qmlExamplesButton->setMenu(menu);
- foreach(const QFileInfo &example, examples) {
- const QString exampleProject = example.absoluteFilePath()+'/'+example.fileName()+QLatin1String(".qmlproject");
- if (QFile::exists(exampleProject)) {
- QAction *exampleAction = menu->addAction(example.fileName());
- connect(exampleAction, SIGNAL(triggered()), SLOT(slotOpenExample()));
- exampleAction->setProperty(ExamplePathPropertyName, exampleProject);
- // FIXME once we have help for QML examples
- // exampleAction->setProperty(HelpPathPropertyName, helpPath);
+ QStringList roots;
+ roots << (examplePath + QLatin1String("/declarative"))
+ << (sourcePath + QLatin1String("/examples/declarative"));
+ QMap<QString, QString> exampleProjects;
+
+ foreach (const QString &root, roots) {
+ QList<QFileInfo> examples = QDir(root).entryInfoList(QStringList(), QDir::AllDirs|QDir::NoDotAndDotDot, QDir::Name);
+ foreach(const QFileInfo &example, examples) {
+ const QString fileName = example.fileName();
+ if (exampleProjects.contains(fileName))
+ continue;
+ const QString exampleProject = example.absoluteFilePath()
+ + QLatin1Char('/') + fileName
+ + QLatin1String(".qmlproject");
+ if (!QFile::exists(exampleProject))
+ continue;
+ exampleProjects.insert(fileName, exampleProject);
}
}
+ QMapIterator<QString, QString> it(exampleProjects);
+ while (it.hasNext()) {
+ it.next();
+ QAction *exampleAction = menu->addAction(it.key());
+ connect(exampleAction, SIGNAL(triggered()), SLOT(slotOpenExample()));
+ exampleAction->setProperty(ExamplePathPropertyName, it.value());
+ // FIXME once we have help for QML examples
+ // exampleAction->setProperty(HelpPathPropertyName, helpPath);
+ }
+ ui->qmlExamplesButton->setEnabled(!exampleProjects.isEmpty());
}
void GettingStartedWelcomePageWidget::updateExamples(const QString &examplePath,
@@ -200,7 +211,7 @@ void GettingStartedWelcomePageWidget::updateExamples(const QString &examplePath,
return;
}
updateCppExamples(examplePath, sourcePath, demoxml);
- updateQmlExamples(examplePath);
+ updateQmlExamples(examplePath, sourcePath);
}
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h
index 872fc52f464b7242efcb6a20e920509f69db7751..5d730953c54881ac7f3eeacf3a2e5c705dafef2b 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h
@@ -64,7 +64,8 @@ private:
void updateCppExamples(const QString &examplePath,
const QString &sourcePath,
const QString &demoXml);
- void updateQmlExamples(const QString &examplePath);
+ void updateQmlExamples(const QString &examplePath,
+ const QString &sourcePath);
Ui::GettingStartedWelcomePageWidget *ui;
int m_currentTip;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index fa50bb1618e85eba0401fb710799ce9900e346d1..ffeb87f1533add5c55a72cb974db18f1d718f44a 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -247,7 +247,7 @@ QString S60DeviceRunConfiguration::packageFileNameWithTargetInfo() const
TargetInformation ti = qt4Target()->qt4Project()->rootProjectNode()->targetInformation(m_proFilePath);
if (!ti.valid)
return QString();
- QString baseFileName = ti.workingDir + QLatin1Char('/') + ti.target;
+ QString baseFileName = ti.buildDir + QLatin1Char('/') + ti.target;
baseFileName += QLatin1Char('_')
+ (isDebug() ? QLatin1String("debug") : QLatin1String("release"))
+ QLatin1Char('-') + symbianPlatform() + QLatin1String(".sis");
@@ -284,7 +284,7 @@ QString S60DeviceRunConfiguration::packageTemplateFileName() const
TargetInformation ti = qt4Target()->qt4Project()->rootProjectNode()->targetInformation(m_proFilePath);
if (!ti.valid)
return QString();
- return ti.workingDir + QLatin1Char('/') + ti.target + QLatin1String("_template.pkg");
+ return ti.buildDir + QLatin1Char('/') + ti.target + QLatin1String("_template.pkg");
}
/* Grep a package file for the '.exe' file. Curently for use on Linux only
@@ -351,7 +351,7 @@ QString S60DeviceRunConfiguration::signedPackage() const
TargetInformation ti = qt4Target()->qt4Project()->rootProjectNode()->targetInformation(m_proFilePath);
if (!ti.valid)
return QString();
- return ti.workingDir + QLatin1Char('/') + ti.target + QLatin1String(".sis");
+ return ti.buildDir + QLatin1Char('/') + ti.target + QLatin1String(".sis");
}
QStringList S60DeviceRunConfiguration::commandLineArguments() const
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 5cc67a80085dd38f4ffd3699f122f12706705703..9db7a03b4a453c35fe8a1542490327948a14ac76 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -1428,7 +1428,8 @@ TargetInformation Qt4ProFileNode::targetInformation(ProFileReader *reader) const
if (!reader)
return result;
- const QString baseDir = buildDir();
+ result.buildDir = buildDir();
+ const QString baseDir = result.buildDir;
// qDebug() << "base build dir is:"<<baseDir;
// Working Directory
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
index 62dec8bba617faf3eb25d63534294bb67637d720..a9585d88379d419fa9ad4c328a43ef7c7666ede9 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qt4nodes.h
@@ -196,12 +196,14 @@ struct TargetInformation
QString workingDir;
QString target;
QString executable;
+ QString buildDir;
bool operator==(const TargetInformation &other) const
{
return workingDir == other.workingDir
&& target == other.target
&& executable == other.executable
- && valid == valid;
+ && valid == valid
+ && buildDir == buildDir;
}
bool operator!=(const TargetInformation &other) const
{
@@ -216,7 +218,8 @@ struct TargetInformation
: valid(other.valid),
workingDir(other.workingDir),
target(other.target),
- executable(other.executable)
+ executable(other.executable),
+ buildDir(other.buildDir)
{
}
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index bcb02ca444a7dc2ad7b0439f4345b8344bcf8a40..4964ec634b428b436afe72375530f8739b0b83fc 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -739,6 +739,89 @@ void BaseTextEditor::gotoBlockEndWithSelection()
}
}
+
+void BaseTextEditor::gotoLineStart()
+{
+ handleHomeKey(false);
+}
+
+void BaseTextEditor::gotoLineStartWithSelection()
+{
+ handleHomeKey(true);
+}
+
+void BaseTextEditor::gotoLineEnd()
+{
+ moveCursor(QTextCursor::EndOfLine);
+}
+
+void BaseTextEditor::gotoLineEndWithSelection()
+{
+ moveCursor(QTextCursor::EndOfLine, QTextCursor::KeepAnchor);
+}
+
+void BaseTextEditor::gotoNextLine()
+{
+ moveCursor(QTextCursor::NextRow);
+}
+
+void BaseTextEditor::gotoNextLineWithSelection()
+{
+ moveCursor(QTextCursor::NextRow, QTextCursor::KeepAnchor);
+}
+
+void BaseTextEditor::gotoPreviousLine()
+{
+ moveCursor(QTextCursor::PreviousRow);
+}
+
+void BaseTextEditor::gotoPreviousLineWithSelection()
+{
+ moveCursor(QTextCursor::PreviousRow, QTextCursor::KeepAnchor);
+}
+
+void BaseTextEditor::gotoPreviousCharacter()
+{
+ moveCursor(QTextCursor::PreviousCharacter);
+}
+
+void BaseTextEditor::gotoPreviousCharacterWithSelection()
+{
+ moveCursor(QTextCursor::PreviousCharacter, QTextCursor::KeepAnchor);
+}
+
+void BaseTextEditor::gotoNextCharacter()
+{
+ moveCursor(QTextCursor::NextCharacter);
+}
+
+void BaseTextEditor::gotoNextCharacterWithSelection()
+{
+ moveCursor(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
+}
+
+void BaseTextEditor::gotoPreviousWord()
+{
+ moveCursor(QTextCursor::PreviousWord);
+}
+
+void BaseTextEditor::gotoPreviousWordWithSelection()
+{
+ moveCursor(QTextCursor::PreviousWord, QTextCursor::KeepAnchor);
+}
+
+void BaseTextEditor::gotoNextWord()
+{
+ moveCursor(QTextCursor::NextWord);
+}
+
+void BaseTextEditor::gotoNextWordWithSelection()
+{
+ moveCursor(QTextCursor::NextWord, QTextCursor::KeepAnchor);
+}
+
+
+
static QTextCursor flippedCursor(const QTextCursor &cursor)
{
QTextCursor flipped = cursor;
@@ -2825,7 +2908,6 @@ static void drawRectBox(QPainter *painter, const QRect &rect, bool start, bool e
grad.setColorAt(0, c.lighter(110));
grad.setColorAt(1, c.lighter(130));
QColor outline = c;
- QRect r = rect;
painter->fillRect(rect, grad);
painter->setPen(outline);
@@ -2977,7 +3059,9 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e)
int boxWidth = collapseBoxWidth(fm);
if (hovered) {
- QRect box = QRect(extraAreaWidth + 1, top, boxWidth - 2, bottom - top);
+ int itop = qRound(top);
+ int ibottom = qRound(bottom);
+ QRect box = QRect(extraAreaWidth + 1, itop, boxWidth - 2, ibottom - itop);
drawRectBox(&painter, box, drawStart, drawEnd, pal);
}
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index af067e777e4fece2c7e73fa62f78bad88fa1fb14..fed0d251d59055d1638962b3c56d9d42cef147c1 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -231,6 +231,23 @@ public slots:
void gotoBlockStartWithSelection();
void gotoBlockEndWithSelection();
+ void gotoLineStart();
+ void gotoLineStartWithSelection();
+ void gotoLineEnd();
+ void gotoLineEndWithSelection();
+ void gotoNextLine();
+ void gotoNextLineWithSelection();
+ void gotoPreviousLine();
+ void gotoPreviousLineWithSelection();
+ void gotoPreviousCharacter();
+ void gotoPreviousCharacterWithSelection();
+ void gotoNextCharacter();
+ void gotoNextCharacterWithSelection();
+ void gotoPreviousWord();
+ void gotoPreviousWordWithSelection();
+ void gotoNextWord();
+ void gotoNextWordWithSelection();
+
void selectBlockUp();
void selectBlockDown();
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
index eeb0b09d9a1fc8885132672bb46be50d0995984d..aa5e9dedf36586f9cffb8b4a7b653c3fcc990c9e 100644
--- a/src/plugins/texteditor/texteditoractionhandler.cpp
+++ b/src/plugins/texteditor/texteditoractionhandler.cpp
@@ -302,6 +302,58 @@ void TextEditorActionHandler::createActions()
command = am->registerAction(m_insertLineBelowAction, Constants::INSERT_LINE_BELOW, m_contextId);
command->setDefaultKeySequence(QKeySequence(tr("Ctrl+Return")));
connect(m_insertLineBelowAction, SIGNAL(triggered()), this, SLOT(insertLineBelow()));
+
+ QAction *a = 0;
+ a = new QAction(tr("Goto Line Start"), this);
+ command = am->registerAction(a, Constants::GOTO_LINE_START, m_contextId);
+ connect(a, SIGNAL(triggered()), this, SLOT(gotoLineStart()));
+ a = new QAction(tr("Goto Line End"), this);
+ command = am->registerAction(a, Constants::GOTO_LINE_END, m_contextId);
+ connect(a, SIGNAL(triggered()), this, SLOT(gotoLineEnd()));
+ a = new QAction(tr("Goto Next Line"), this);
+ command = am->registerAction(a, Constants::GOTO_NEXT_LINE, m_contextId);
+ connect(a, SIGNAL(triggered()), this, SLOT(gotoNextLine()));
+ a = new QAction(tr("Goto Previous Line"), this);
+ command = am->registerAction(a, Constants::GOTO_PREVIOUS_LINE, m_contextId);
+ connect(a, SIGNAL(triggered()), this, SLOT(gotoPreviousLine()));
+ a = new QAction(tr("Goto Previous Character"), this);
+ command = am->registerAction(a, Constants::GOTO_PREVIOUS_CHARACTER, m_contextId);
+ connect(a, SIGNAL(triggered()), this, SLOT(gotoPreviousCharacter()));
+ a = new QAction(tr("Goto Next Character"), this);
+ command = am->registerAction(a, Constants::GOTO_NEXT_CHARACTER, m_contextId);
+ connect(a, SIGNAL(triggered()), this, SLOT(gotoNextCharacter()));
+ a = new QAction(tr("Goto Previous Word"), this);
+ command = am->registerAction(a, Constants::GOTO_PREVIOUS_WORD, m_contextId);
+ connect(a, SIGNAL(triggered()), this, SLOT(gotoPreviousWord()));
+ a = new QAction(tr("Goto Next Word"), this);
+ command = am->registerAction(a, Constants::GOTO_NEXT_WORD, m_contextId);
+ connect(a, SIGNAL(triggered()), this, SLOT(gotoNextWord()));
+
+ a = new QAction(tr("Goto Line Start With Selection"), this);
+ command = am->registerAction(a, Constants::GOTO_LINE_START_WITH_SELECTION, m_contextId);
+ connect(a, SIGNAL(triggered()), this, SLOT(gotoLineStartWithSelection()));
+ a = new QAction(tr("Goto Line End With Selection"), this);
+ command = am->registerAction(a, Constants::GOTO_LINE_END_WITH_SELECTION, m_contextId);
+ connect(a, SIGNAL(triggered()), this, SLOT(gotoLineEndWithSelection()));
+ a = new QAction(tr("Goto Next Line With Selection"), this);
+ command = am->registerAction(a, Constants::GOTO_NEXT_LINE_WITH_SELECTION, m_contextId);
+ connect(a, SIGNAL(triggered()), this, SLOT(gotoNextLineWithSelection()));
+ a = new QAction(tr("Goto Previous Line With Selection"), this);
+ command = am->registerAction(a, Constants::GOTO_PREVIOUS_LINE_WITH_SELECTION, m_contextId);
+ connect(a, SIGNAL(triggered()), this, SLOT(gotoPreviousLineWithSelection()));
+ a = new QAction(tr("Goto Previous Character With Selection"), this);
+ command = am->registerAction(a, Constants::GOTO_PREVIOUS_CHARACTER_WITH_SELECTION, m_contextId);
+ connect(a, SIGNAL(triggered()), this, SLOT(gotoPreviousCharacterWithSelection()));
+ a = new QAction(tr("Goto Next Character With Selection"), this);
+ command = am->registerAction(a, Constants::GOTO_NEXT_CHARACTER_WITH_SELECTION, m_contextId);
+ connect(a, SIGNAL(triggered()), this, SLOT(gotoNextCharacterWithSelection()));
+ a = new QAction(tr("Goto Previous Word With Selection"), this);
+ command = am->registerAction(a, Constants::GOTO_PREVIOUS_WORD_WITH_SELECTION, m_contextId);
+ connect(a, SIGNAL(triggered()), this, SLOT(gotoPreviousWordWithSelection()));
+ a = new QAction(tr("Goto Next Word With Selection"), this);
+ command = am->registerAction(a, Constants::GOTO_NEXT_WORD_WITH_SELECTION, m_contextId);
+ connect(a, SIGNAL(triggered()), this, SLOT(gotoNextWordWithSelection()));
+
}
bool TextEditorActionHandler::supportsAction(const QString & /*id */) const
@@ -467,6 +519,24 @@ FUNCTION(joinLines)
FUNCTION(insertLineAbove)
FUNCTION(insertLineBelow)
+FUNCTION(gotoLineStart)
+FUNCTION(gotoLineStartWithSelection)
+FUNCTION(gotoLineEnd)
+FUNCTION(gotoLineEndWithSelection)
+FUNCTION(gotoNextLine)
+FUNCTION(gotoNextLineWithSelection)
+FUNCTION(gotoPreviousLine)
+FUNCTION(gotoPreviousLineWithSelection)
+FUNCTION(gotoPreviousCharacter)
+FUNCTION(gotoPreviousCharacterWithSelection)
+FUNCTION(gotoNextCharacter)
+FUNCTION(gotoNextCharacterWithSelection)
+FUNCTION(gotoPreviousWord)
+FUNCTION(gotoPreviousWordWithSelection)
+FUNCTION(gotoNextWord)
+FUNCTION(gotoNextWordWithSelection)
+
+
void TextEditorActionHandler::updateCurrentEditor(Core::IEditor *editor)
{
m_currentEditor = 0;
diff --git a/src/plugins/texteditor/texteditoractionhandler.h b/src/plugins/texteditor/texteditoractionhandler.h
index c747bc30fdb1f9cd4c994b8b673cb4306cfe928a..25f2e9febb318147633690d90d97cb945f885e31 100644
--- a/src/plugins/texteditor/texteditoractionhandler.h
+++ b/src/plugins/texteditor/texteditoractionhandler.h
@@ -120,6 +120,24 @@ private slots:
void insertLineBelow();
void updateCurrentEditor(Core::IEditor *editor);
+ void gotoLineStart();
+ void gotoLineStartWithSelection();
+ void gotoLineEnd();
+ void gotoLineEndWithSelection();
+ void gotoNextLine();
+ void gotoNextLineWithSelection();
+ void gotoPreviousLine();
+ void gotoPreviousLineWithSelection();
+ void gotoPreviousCharacter();
+ void gotoPreviousCharacterWithSelection();
+ void gotoNextCharacter();
+ void gotoNextCharacterWithSelection();
+ void gotoPreviousWord();
+ void gotoPreviousWordWithSelection();
+ void gotoNextWord();
+ void gotoNextWordWithSelection();
+
+
private:
QAction *m_undoAction;
QAction *m_redoAction;
diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h
index 2a27a67296db5d0b7b66ae582ba6307dfaf03753..b111121c824ca1a19d5b49d6b52ecdb29481b9cb 100644
--- a/src/plugins/texteditor/texteditorconstants.h
+++ b/src/plugins/texteditor/texteditorconstants.h
@@ -70,6 +70,22 @@ const char * const SELECT_ENCODING = "TextEditor.SelectEncoding";
const char * const REWRAP_PARAGRAPH = "TextEditor.RewrapParagraph";
const char * const GOTO_OPENING_PARENTHESIS = "TextEditor.GotoOpeningParenthesis";
const char * const GOTO_CLOSING_PARENTHESIS = "TextEditor.GotoClosingParenthesis";
+const char * const GOTO_LINE_START = "TextEditor.GotoLineStart";
+const char * const GOTO_LINE_END = "TextEditor.GotoLineEnd";
+const char * const GOTO_NEXT_LINE = "TextEditor.GotoNextLine";
+const char * const GOTO_PREVIOUS_LINE = "TextEditor.GotoPreviousLine";
+const char * const GOTO_PREVIOUS_CHARACTER = "TextEditor.GotoPreviousCharacter";
+const char * const GOTO_NEXT_CHARACTER = "TextEditor.GotoNextCharacter";
+const char * const GOTO_PREVIOUS_WORD = "TextEditor.GotoPreviousWord";
+const char * const GOTO_NEXT_WORD = "TextEditor.GotoNextWord";
+const char * const GOTO_LINE_START_WITH_SELECTION = "TextEditor.GotoLineStartWithSelection";
+const char * const GOTO_LINE_END_WITH_SELECTION = "TextEditor.GotoLineEndWithSelection";
+const char * const GOTO_NEXT_LINE_WITH_SELECTION = "TextEditor.GotoNextLineWithSelection";
+const char * const GOTO_PREVIOUS_LINE_WITH_SELECTION = "TextEditor.GotoPreviousLineWithSelection";
+const char * const GOTO_PREVIOUS_CHARACTER_WITH_SELECTION = "TextEditor.GotoPreviousCharacterWithSelection";
+const char * const GOTO_NEXT_CHARACTER_WITH_SELECTION = "TextEditor.GotoNextCharacterWithSelection";
+const char * const GOTO_PREVIOUS_WORD_WITH_SELECTION = "TextEditor.GotoPreviousWordWithSelection";
+const char * const GOTO_NEXT_WORD_WITH_SELECTION = "TextEditor.GotoNextWordWithSelection";
const char * const C_TEXTEDITOR_MIMETYPE_TEXT = "text/plain";
const char * const C_TEXTEDITOR_MIMETYPE_XML = "application/xml";
diff --git a/src/plugins/welcome/welcomemode.ui b/src/plugins/welcome/welcomemode.ui
index 57d2e986399d5bd8f8179182fdf1071e19bd3e3f..f00d137f2ac1eecf901c798896b5b1ab05a313a3 100644
--- a/src/plugins/welcome/welcomemode.ui
+++ b/src/plugins/welcome/welcomemode.ui
@@ -22,7 +22,7 @@ QToolButton, QPushButton, QComboBox {
font-size: 12px;
}
-*{
+QToolButton, QPushButton, QComboBox, QLabel {
color: black;
}
diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro
index ffd725dfc66105111fc18914302c90587c241305..9052343d92f564825d280cbd94d7eb0d2d03e570 100644
--- a/tests/auto/qml/qmldesigner/coretests/coretests.pro
+++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro
@@ -5,7 +5,7 @@ QT += testlib \
script \
declarative
-include($$CREATORDIR/src/plugins/qmldesigner/core/core.pri)
+include($$CREATORDIR/src/plugins/qmldesigner/designercore/designercore.pri)
include($$CREATORDIR/src/libs/qmljs/qmljs-lib.pri)
HEADERS+=$$CREATORDIR/src/libs/utils/changeset.h
SOURCES+=$$CREATORDIR/src/libs/utils/changeset.cpp
@@ -16,7 +16,7 @@ DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB QTCREATOR_TEST
DEFINES+=QTCREATORDIR=\\\"$$CREATORDIR\\\"
DEPENDPATH += ..
-DEPENDPATH += $$CREATORDIR/src/plugins/qmldesigner/core/include
+DEPENDPATH += $$CREATORDIR/src/plugins/qmldesigner/designercore/include
TARGET = tst_qmldesigner_core