From a2a5a8c5e203fe9d55f9addba1533a30c6f2ba19 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Thu, 10 Jun 2010 18:54:11 +0200 Subject: Doc: Started organizing Symbian platform deployment information. Reviewed-by: Trust Me --- doc/src/deployment/deployment.qdoc | 27 ++++++++-- doc/src/external-resources.qdoc | 10 ++++ doc/src/platforms/symbian-introduction.qdoc | 76 +++++++++++++++++------------ 3 files changed, 78 insertions(+), 35 deletions(-) diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc index 51974af..286c080 100644 --- a/doc/src/deployment/deployment.qdoc +++ b/doc/src/deployment/deployment.qdoc @@ -1472,8 +1472,10 @@ /*! \page deployment-symbian.html \contentspage Deploying Qt Applications + \ingroup qtsymbian + \title Deploying an Application on the Symbian Platform - \title Deploying an Application on the Symbian platform + \section1 Overview Applications are deployed to Symbian devices in signed \c .sis package files. The \c .sis file content is controlled with \c .pkg files. The \c .pkg file contains a set @@ -1483,10 +1485,17 @@ to end-users some changes are needed. This document describes what changes are typically needed and how to implement them. + \section1 Requirements + + Download the latest release of the Smart Installer from + \l{http://get.qt.nokia.com/nokiasmartinstaller/}, and install it on top + of the Qt package. + \section1 Static Linking - Qt for the Symbian platform does currently not support static linking of - Qt libraries. + Qt for the Symbian platform does not currently support static linking of + Qt libraries with application binaries. You will need to build shared + libraries as described below and link your application with them. \section1 Shared Libraries @@ -1532,7 +1541,7 @@ S60 3rd edition FP1, S60 3rd edition FP2 and S60 5th edition devices. Now we are ready to compile the application and create the application - deployment file. Run \c qmake to create Symbian specific makefiles, resources (\.rss) + deployment file. Run \c qmake to create Symbian specific makefiles, resources (\c .rss) and deployment packaging files (\c .pkg). And do build to create the application binaries and resources. @@ -1562,4 +1571,14 @@ For more information about creating a \c .sis file and installing it to device see also \l {The Symbian platform - Introduction to Qt#Installing your own applications}{here}. + \section1 Further Reading + + This document aims to cover the common case for developers who want to + deploy Qt applications on devices using the Smart Installer. It does not + aim to cover every possible way of installing applications, Qt and other + dependencies on a device. + + A wider selection of deployment methods is described in the + \l{Deploying a Qt Application article} on the Symbian Foundation + Developer Wiki. */ diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index 249c10a1..6f22f00 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -427,3 +427,13 @@ \externalpage http://opensource.org/licenses/bsd-license.php \title New and Modified BSD Licenses */ + +/*! + \externalpage http://developer.symbian.org/wiki/index.php/Platform_Security_%28Fundamentals_of_Symbian_C%2B%2B%29#Self-Signed_Applications + \title Symbian Platform Security +*/ + +/*! + \externalpage http://developer.symbian.org/wiki/index.php/Deploying_a_Qt_Application + \title Deploying a Qt Application article +*/ diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc index 6ffc568..9563a8e 100644 --- a/doc/src/platforms/symbian-introduction.qdoc +++ b/doc/src/platforms/symbian-introduction.qdoc @@ -83,12 +83,12 @@ \tableofcontents - \section1 Required tools + \section1 Required Tools See \l{Qt for the Symbian platform Requirements} to see what tools are required to use Qt for the Symbian platform. - \section1 Installing Qt and running demos + \section1 Installing Qt and Running Demos Follow the instructions found in \l{Installing Qt on the Symbian platform from a Binary Package} to learn how to install Qt using a binary package and how to build and run Qt demos. @@ -96,7 +96,7 @@ Follow the instructions found in \l{Installing Qt on the Symbian platform} to learn how to install Qt using using source package and how to build and run the Qt demos. - \section1 Building your own applications + \section1 Building Your Own Applications If you are new to Qt development, have a look at \l{How to Learn Qt}. In general, the difference between developing a @@ -109,12 +109,19 @@ \snippet doc/src/snippets/code/doc_src_symbian-introduction.qdoc 0 For more information on how to use qmake have a look at the \l - {qmake Tutorial}. + {qmake Tutorial}. In particular, see the + \l{qmake Platform Notes#Symbian platform}{qmake Platform Notes} for + details of Symbian-specific build settings. Now you can build the Qt for the Symbian platform application with - standard build tools. By default, running \c make will produce binaries for - the emulator. However, the Symbian platform comes with several alternative - build targets, as shown in the table below: + standard build tools. + + \section2 Alternative Build Targets + + By default, running \c make will produce binaries for the emulator. + However, the Symbian platform comes with several alternative + build targets that can be used to create binaries for target hardware + and deploy them on devices, as shown in the table below: \table \row \o \c debug-winscw \o Build debug binaries for the emulator (default). @@ -144,19 +151,30 @@ To work on your project in Carbide, simply import the \c .pro file by right clicking on the project explorer and executing "Import...". - \section2 Smart Installer + \section1 Running Applications from the Command Line - The Smart Installer makes sure that deployed applications have all the Qt dependencies - they need to run on a device. + The application can be launched on the emulator using \c{make run} command. - Download the latest release of the Smart Installer from \l{http://get.qt.nokia.com/nokiasmartinstaller/}, - and install it on top of the Qt package. + The application can be launched on a device using \c{make runonphone} command. + When this command is invoked, a \c .sis file is first created as if \c{make sis} + command was invoked (see above for details). + \bold{Note:} Running the application on a device using this command requires + \c TRK application to be running on the device. - \section1 Installing your own applications + Additional environment variables that can be utilized with these commands are: + \table + \row \o \c QT_RUN_OPTIONS \o Any command line parameters you wish to pass + to your application. + \row \o \c QT_RUN_ON_PHONE_OPTIONS \o Options for runonphone application. + Execute \c runonphone from command line for + more information about available options. + \c{make runonphone} only. + \endtable + + \section1 Installing Your Own Applications To install your own applications on hardware, you need a signed \c .sis file. - (Refer to the \l{http://developer.symbian.org/wiki/index.php/Platform_Security_%28Fundamentals_of_Symbian_C%2B%2B%29#Self-Signed_Applications} - {Platform Security Article} for more informations about self-signing.) + (Refer to the \l{Symbian Platform Security} article for more informations about self-signing.) The signed \c .sis file can be created with \c make \c sis target. \c sis target is only supported for executables or projects with \c DEPLOYMENT statements. By default the \c sis target will create signed \c .sis file for last build @@ -214,23 +232,19 @@ \snippet doc/src/snippets/code/doc_src_symbian-introduction.qdoc 5 - \section1 Running applications from command line + \section1 Deployment and the Smart Installer - The application can be launched on the emulator using \c{make run} command. + Although some Symbian devices may already have a version of Qt installed + on them, there needs to be a way to ensure that an appropriate version + of Qt is available for your application to use. Rather than deploy the + required Qt libraries with your application, the preferred way to + package Qt applications for deployment is to download and use the Smart + Installer. - The application can be launched on a device using \c{make runonphone} command. - When this command is invoked, a \c .sis file is first created as if \c{make sis} - command was invoked (see above for details). - \bold{Note:} Running the application on a device using this command requires - \c TRK application to be running on the device. + The Smart Installer makes sure that deployed applications have all the + Qt dependencies they need to run on a device, performing the necessary + updates when the user installs the application. - Additional environment variables that can be utilized with these commands are: - \table - \row \o \c QT_RUN_OPTIONS \o Any command line parameters you wish to pass - to your application. - \row \o \c QT_RUN_ON_PHONE_OPTIONS \o Options for runonphone application. - Execute \c runonphone from command line for - more information about available options. - \c{make runonphone} only. - \endtable + More information about deployment can be found in the + \l{Deploying an Application on the Symbian Platform} document. */ -- cgit v0.12 From 4aab0b33e7c34677b530553bb0a5493aca6547a5 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Mon, 28 Jun 2010 18:42:41 +0200 Subject: Doc: Synchronize HTML templates for each language. Reviewed-by: Trust Me --- tools/qdoc3/test/qt-html-templates.qdocconf | 2 +- tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf | 14 +- tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf | 191 +++++++++++++++++++--- 3 files changed, 170 insertions(+), 37 deletions(-) diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 1fb000b..8708f1b 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -160,7 +160,7 @@ HTML.footer = " \n" \ "
\n" \ "
X
\n" \ "
\n" \ - "

\n" \ + "

\n" \ "

\n" \ "
\n" \ "
\n" \ diff --git a/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf b/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf index 027548e..e2abd2a 100644 --- a/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf +++ b/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf @@ -160,19 +160,9 @@ HTML.footer = " \n" \ "
\n" \ "
X
\n" \ "
\n" \ - "

\n" \ + "

\n" \ "

\n" \ "
\n" \ "
\n" \ "
\n" \ - "
\n" \ - "\n" + " \n" diff --git a/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf b/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf index 5fb68cf..e00bef9 100644 --- a/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf @@ -1,25 +1,168 @@ -HTML.stylesheets = classic.css -HTML.postheader = "\n" \ - "\n" \ - "\n" \ - "" \ - "" \ - "
" \ - "" \ - "  " \ - "" \ - "主页 ·" \ - " " \ - "所有类 ·" \ - " " \ - "所有函数 ·" \ - " " \ - "简介" \ - "
" +HTML.stylesheets = style/style.css \ + style/OfflineStyle.css \ + style/style_ie7.css \ + style/style_ie8.css \ + style/style_ie6.css -HTML.footer = "

\n" \ - "\n" \ - "\n" \ - "\n" \ - "\n" \ - "
版权所有 © 2010 诺基亚公司和/或其子公司商标
Qt \\version
" +HTML.postheader = "
\n" \ + "
\n" \ + "
\n" \ + " Home
\n" \ + " Qt Reference Documentation\n" \ + "
\n" \ + "
\n" \ + " \n" \ + "
\n" \ + "
\n" \ + "
\n" \ + " \n" \ + "
\n" \ + "
\n" \ + " \n" \ + "
\n" \ + " \n" \ + "
\n" \ + "
\n" \ + "
\n" \ + "
\n" \ + " \n" \ + "
\n" \ + "
\n" \ + "
\n" \ + "
\n" \ + " Search index:
\n" \ + "
\n" \ + "
\n" \ + "
\n" \ + " \n" \ + "
\n" \ + "
\n" \ + "
\n" \ + "
\n" \ + "

\n" \ + " API Lookup

\n" \ + "
\n" \ + " \n" \ + "
\n" \ + "
\n" \ + "
\n" \ + "

\n" \ + " Qt Topics

\n" \ + "
\n" \ + " \n" \ + "
\n" \ + "
\n" \ + "
\n" \ + "

\n" \ + " Examples

\n" \ + "
\n" \ + " \n" \ + "
\n" \ + "
\n" \ + "
\n" \ + "
\n" \ + "
\n" \ + "
\n" \ + "
    \n" \ + "
  • Home
    • \n" \ + " \n" + +HTML.postpostheader = "
\n" \ + "
\n" \ + "
\n" \ + " \n" \ + "
\n" \ + "
\n" \ + "
\n" + +HTML.footer = " \n" \ + "
\n" \ + " [+] Documentation Feedback
\n" \ + "
\n" \ + "
\n" \ + "
\n" \ + " \n" \ + "
\n" \ + "
\n" \ + "
\n" \ + "

\n" \ + " © 2008-2010 Nokia Corporation and/or its\n" \ + " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ + " in Finland and/or other countries worldwide.

\n" \ + "

\n" \ + " All other trademarks are property of their respective owners. Privacy Policy

\n" \ + "
\n" \ + "
\n" \ + "
X
\n" \ + "
\n" \ + "

\n" \ + "

\n" \ + "
\n" \ + "
\n" \ + "
\n" \ + "
\n" -- cgit v0.12 From 08478207ee9a6563ae63ebcef833925db6426bd8 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Wed, 30 Jun 2010 19:03:53 +0200 Subject: Doc: Made the Gestures Programming document more visible. Reviewed-by: Trust Me --- src/gui/kernel/qevent.cpp | 5 +++++ src/gui/kernel/qgesture.cpp | 28 +++++++++++++++++++++++----- src/gui/kernel/qgesturerecognizer.cpp | 3 +++ 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 92eed33..0c0eabb 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -4281,6 +4281,11 @@ QTouchEvent::TouchPoint &QTouchEvent::TouchPoint::operator=(const QTouchEvent::T QGestureEvent::accept() for each of them, or an event filter consumes the event. + \section1 Further Reading + + For an overview of gesture handling in Qt and information on using gestures + in your applications, see the \l{Gestures Programming} document. + \sa QGesture, QGestureRecognizer, QWidget::grabGesture(), QGraphicsObject::grabGesture() */ diff --git a/src/gui/kernel/qgesture.cpp b/src/gui/kernel/qgesture.cpp index f5688f4..8264422 100644 --- a/src/gui/kernel/qgesture.cpp +++ b/src/gui/kernel/qgesture.cpp @@ -58,6 +58,9 @@ QT_BEGIN_NAMESPACE the QGestureRecognizer object that is registered with the application; see QGestureRecognizer::registerRecognizer(). + For an overview of gesture handling in Qt and information on using gestures + in your applications, see the \l{Gestures Programming} document. + \section1 Gesture Properties The class has a list of properties that can be queried by the user to get @@ -218,7 +221,10 @@ QGesture::GestureCancelPolicy QGesture::gestureCancelPolicy() const \image pangesture.png - \sa {Gestures Programming}, QPinchGesture, QSwipeGesture + For an overview of gesture handling in Qt and information on using gestures + in your applications, see the \l{Gestures Programming} document. + + \sa QPinchGesture, QSwipeGesture */ /*! @@ -313,6 +319,9 @@ void QPanGesture::setAcceleration(qreal value) them closer together or further apart to change the scale factor, zoom, or level of detail of the user interface. + For an overview of gesture handling in Qt and information on using gestures + in your applications, see the \l{Gestures Programming} document. + \image pinchgesture.png Instead of repeatedly applying the same pinching gesture, the user may @@ -321,7 +330,7 @@ void QPanGesture::setAcceleration(qreal value) will continue to be delivered to the target object, containing an instance of QPinchGesture in the Qt::GestureUpdated state. - \sa {Gestures Programming}, QPanGesture, QSwipeGesture + \sa QPanGesture, QSwipeGesture */ /*! @@ -571,7 +580,10 @@ void QPinchGesture::setRotationAngle(qreal value) \image swipegesture.png - \sa {Gestures Programming}, QPanGesture, QPinchGesture + For an overview of gesture handling in Qt and information on using gestures + in your applications, see the \l{Gestures Programming} document. + + \sa QPanGesture, QPinchGesture */ /*! @@ -666,7 +678,10 @@ void QSwipeGesture::setSwipeAngle(qreal value) \brief The QTapGesture class describes a tap gesture made by the user. \ingroup gestures - \sa {Gestures Programming}, QPanGesture, QPinchGesture + For an overview of gesture handling in Qt and information on using gestures + in your applications, see the \l{Gestures Programming} document. + + \sa QPanGesture, QPinchGesture */ /*! @@ -699,7 +714,10 @@ void QTapGesture::setPosition(const QPointF &value) gesture made by the user. \ingroup gestures - \sa {Gestures Programming}, QPanGesture, QPinchGesture + For an overview of gesture handling in Qt and information on using gestures + in your applications, see the \l{Gestures Programming} document. + + \sa QPanGesture, QPinchGesture */ /*! diff --git a/src/gui/kernel/qgesturerecognizer.cpp b/src/gui/kernel/qgesturerecognizer.cpp index 3e23bbf..e0e7784 100644 --- a/src/gui/kernel/qgesturerecognizer.cpp +++ b/src/gui/kernel/qgesturerecognizer.cpp @@ -62,6 +62,9 @@ QT_BEGIN_NAMESPACE need to use this class directly. Instances will be created behind the scenes by the framework. + For an overview of gesture handling in Qt and information on using gestures + in your applications, see the \l{Gestures Programming} document. + \section1 Recognizing Gestures The process of recognizing gestures involves filtering input events sent to specific -- cgit v0.12 From bbc7aa139308ff304f2e4c2611ed57d855d00d80 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Fri, 16 Jul 2010 14:04:08 +0200 Subject: Doc: Fixed name clash. Reviewed-by: Trust Me --- doc/src/examples/qml-examples.qdoc | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc index ce53677..db6e657 100644 --- a/doc/src/examples/qml-examples.qdoc +++ b/doc/src/examples/qml-examples.qdoc @@ -165,7 +165,6 @@ \image qml-layoutitem-example.png */ /*! - \title QGraphicsGridLayout \example declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout This example shows how to use QGraphicsGridLayout to lay out QML items. This is -- cgit v0.12 From 4ed51b7160471ae3a7db1fbb12a8f265ff7c3239 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Fri, 16 Jul 2010 14:06:50 +0200 Subject: Doc: Merged in some of Thomas Zander's suggestions. Reviewed-by: Trust Me --- doc/src/frameworks-technologies/gestures.qdoc | 49 +++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/doc/src/frameworks-technologies/gestures.qdoc b/doc/src/frameworks-technologies/gestures.qdoc index 927df22..f7c8312 100644 --- a/doc/src/frameworks-technologies/gestures.qdoc +++ b/doc/src/frameworks-technologies/gestures.qdoc @@ -60,7 +60,8 @@ \section1 Using Standard Gestures with Widgets Gestures can be enabled for instances of QWidget and QGraphicsObject subclasses. - An object that accepts gesture input is referred to as a \e{target object}. + An object that accepts gesture input is referred to throughout the documentation + as a \e{target object}. To enable a gesture for a target object, call its QWidget::grabGesture() or QGraphicsObject::grabGesture() function with an argument describing the @@ -69,13 +70,57 @@ \snippet examples/gestures/imagegestures/imagewidget.cpp enable gestures - In the above code, the gesture is set up in the constructor of the target object + In the above code, the gestures are set up in the constructor of the target object itself. + \section1 Handling Events + When the user performs a gesture, QGestureEvent events will be delivered to the target object, and these can be handled by reimplementing the QWidget::event() handler function for widgets or QGraphicsItem::sceneEvent() for graphics objects. + As one target object can subscribe to more than one gesture type, the QGestureEvent + can contain more than one QGesture, indicating several possible gestures are active + at the same time. It is then up to the widget to determine how to handle those + multiple gestures and choose if some should be canceled in favor of others. + + Each QGesture contained within a QGestureEvent object can be accepted() or ignored() + individually, or all together. Additionally, you can query the individual QGesture + data objects (the state) using several getters. + + \section2 Standard Procedure for Event Handling + + A QGesture is by default accepted when it arrives at your widget. However, it is good + practice to always explicitly accept or reject a gesture. The general rule is that, if + you accept a gesture, you are using it. If you are ignoring it you are not interested + in it. Ignoring a gesture may mean it gets offered to another target object, or it will + get canceled. + + Each QGesture has several states it goes through; there is a well defined way to change + the state, typically the user input is the cause of state changes (by starting and + stopping interaction, for instance) but the widget can also cause state changes. + + The first time a particular QGesture is delivered to a widget or graphics item, it will + be in the Qt::GestureStarted state. The way you handle the gesture at this point + influences whether you can interact with it later. + + \list + \o Accepting the gesture means the widget acts on the gesture and there will follow + gestures with the Qt::GestureUpdatedstate. + \o Ignoring the gesture will mean the gesture will never be offered to you again. + It will be offered to a parent widget or item as well. + \o Calling setGestureCancelPolicy() on the gesture when it is in its starting state, + and is also accepted can cause other gestures to be canceled. + \endlist + + Using QGesture::CancelAllInContext to cancel a gesture will cause all gestures, in any + state, to be canceled unless they are explicitly accepted. This means that active + gestures on children will get canceled. It also means that gestures delivered in the + same QGestureEvent will get canceled if the widget ignores them. This can be a useful + way to filter out all gestures except the one you are interested in. + + \section2 Example Event Handling + For convenience, the \l{Image Gestures Example} reimplements the general \l{QWidget::}{event()} handler function and delegates gesture events to a specialized gestureEvent() function: -- cgit v0.12 From d59380458cce6fc52b6de91d8380b31d46c3f83f Mon Sep 17 00:00:00 2001 From: David Boddie Date: Fri, 16 Jul 2010 14:09:11 +0200 Subject: Doc: Fixed QML documentation errors. Reviewed-by: Trust Me --- src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp | 2 +- src/declarative/graphicsitems/qdeclarativepathview.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp index 0342c9f..9dcba60 100644 --- a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp @@ -612,7 +612,7 @@ QAction* QDeclarativeWebView::stopAction() const #endif // QT_NO_ACTION /*! - \qmlproperty real WebView::title + \qmlproperty string WebView::title This property holds the title of the web page currently viewed By default, this property contains an empty string. diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp index f4ebd13..1224c73 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp @@ -403,7 +403,7 @@ QDeclarativePathView::~QDeclarativePathView() The model provides a set of data that is used to create the items for the view. For large or dynamic datasets the model is usually provided by a C++ model object. - Models can also be created directly in XML, using the ListModel element. + Models can also be created directly in QML, using the ListModel element. \sa {qmlmodels}{Data Models} */ @@ -627,8 +627,8 @@ void QDeclarativePathViewPrivate::setOffset(qreal o) so as to stay with the current item. The below example demonstrates how to make a simple highlight. Note the use - of the PathView.onPath property to ensure that the highlight is hidden - when flicked off of the path. + of the \l{PathView::onPath}{PathView.onPath} attached property to ensure that + the highlight is hidden when flicked away from the path. \code Component { -- cgit v0.12 From e2fb9c4df301678719cb0cff78838b35435c3b38 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Fri, 16 Jul 2010 14:09:59 +0200 Subject: Doc: Fixed typo. Reviewed-by: Trust Me --- src/xmlpatterns/api/qabstractxmlnodemodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp index 7f2ad9f..0f9760d 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp @@ -1355,7 +1355,7 @@ bool QXmlItem::isNull() const QAbstractXmlNodeModel for its existence, the only way you can create an instance of QXmlNodeModelIndex is by asking the node model to create one for you with QAbstractXmlNodeModel::createIndex(). Since - that function is protected, it is usually a good ide to write a + that function is protected, it is usually a good idea to write a public function that creates a QXmlNodeModelIndex from arguments that are appropriate for your particular node model. -- cgit v0.12 From 8f0e2e8a995f16fe737e538ce6f35e91b5a100b5 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Mon, 26 Jul 2010 14:04:52 +0100 Subject: Clear Qt::WA_OutsideWSRange when making window fullscreen Task-number: QTBUG-10269 Reviewed-by: Jason Barron --- src/gui/kernel/qwidget_s60.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index 46f3254..d06328c 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -1130,8 +1130,10 @@ void QWidget::setWindowState(Qt::WindowStates newstate) const bool cbaVisibilityHint = windowFlags() & Qt::WindowSoftkeysVisibleHint; if (newstate & Qt::WindowFullScreen && !cbaVisibilityHint) { + setAttribute(Qt::WA_OutsideWSRange, false); window->SetExtentToWholeScreen(); } else if (newstate & Qt::WindowMaximized || ((newstate & Qt::WindowFullScreen) && cbaVisibilityHint)) { + setAttribute(Qt::WA_OutsideWSRange, false); TRect maxExtent = qt_QRect2TRect(qApp->desktop()->availableGeometry(this)); window->SetExtent(maxExtent.iTl, maxExtent.Size()); } else { -- cgit v0.12 From f1257358b4432abf874460f58cba73bce17981ab Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Tue, 27 Jul 2010 16:23:52 +0100 Subject: Ensure that window rectangle is updated when CBA visibility changes In S60, there are two pieces of screen furniture, changes in whose visibility or size can affect the size of the Qt application window. These are the status pane, at the top of the screen, and the CBA at the bottom. QSymbianControl listens for changes in status pane visibility and size by implementing MEikStatusPaneObserver. Notifications received via this interface trigger a call to QSymbianControl::handleClientAreaChange() which resizes the control. There is no corresponding interface through which to receive notifications of changes in CBA visibility. This patch introduces a utility function for setting the visibility of both the status pane and CBA, which ensures that the control's rectangle is updated when either one changes. Task-number: QTBUG-5320 Reviewed-by: Jason Barron --- src/gui/kernel/qapplication_s60.cpp | 36 +++++++++++++++++++++++++----------- src/gui/kernel/qt_s60_p.h | 3 +++ src/gui/kernel/qwidget_s60.cpp | 15 +++++---------- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index d5ff792..7dbf4b7 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -102,6 +102,25 @@ QS60Data* qGlobalS60Data() return qt_s60Data(); } +#ifdef Q_WS_S60 +void QS60Data::setStatusPaneAndButtonGroupVisibility(bool statusPaneVisible, bool buttonGroupVisible) +{ + bool buttonGroupVisibilityChanged = false; + if (CEikButtonGroupContainer *const b = buttonGroupContainer()) { + buttonGroupVisibilityChanged = (b->IsVisible() != buttonGroupVisible); + b->MakeVisible(buttonGroupVisible); + } + bool statusPaneVisibilityChanged = false; + if (CEikStatusPane *const s = statusPane()) { + statusPaneVisibilityChanged = (s->IsVisible() != statusPaneVisible); + s->MakeVisible(statusPaneVisible); + } + if (buttonGroupVisibilityChanged && !statusPaneVisibilityChanged) + // Ensure that control rectangle is updated + static_cast(QApplication::activeWindow()->winId())->handleClientAreaChange(); +} +#endif + bool qt_nograb() // application no-grab option { #if defined(QT_DEBUG) @@ -999,17 +1018,12 @@ void QSymbianControl::FocusChanged(TDrawNow /* aDrawNow */) qwidget->d_func()->setWindowTitle_sys(qwidget->windowTitle()); #ifdef Q_WS_S60 // If widget is fullscreen/minimized, hide status pane and button container otherwise show them. - CEikStatusPane *statusPane = S60->statusPane(); - CEikButtonGroupContainer *buttonGroup = S60->buttonGroupContainer(); - TBool visible = !(qwidget->windowState() & (Qt::WindowFullScreen | Qt::WindowMinimized)); - if (statusPane) - statusPane->MakeVisible(visible); - if (buttonGroup) { - // Visibility - const TBool isFullscreen = qwidget->windowState() & Qt::WindowFullScreen; - const TBool cbaVisibilityHint = qwidget->windowFlags() & Qt::WindowSoftkeysVisibleHint; - buttonGroup->MakeVisible(visible || (isFullscreen && cbaVisibilityHint)); - } + const bool visible = !(qwidget->windowState() & (Qt::WindowFullScreen | Qt::WindowMinimized)); + const bool statusPaneVisibility = visible; + const bool isFullscreen = qwidget->windowState() & Qt::WindowFullScreen; + const bool cbaVisibilityHint = qwidget->windowFlags() & Qt::WindowSoftkeysVisibleHint; + const bool buttonGroupVisibility = (visible || (isFullscreen && cbaVisibilityHint)); + S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility); #endif } else if (QApplication::activeWindow() == qwidget->window()) { if (CCoeEnv::Static()->AppUi()->IsDisplayingMenuOrDialog() || S60->menuBeingConstructed) { diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h index bec51b8..bf71062 100644 --- a/src/gui/kernel/qt_s60_p.h +++ b/src/gui/kernel/qt_s60_p.h @@ -148,6 +148,7 @@ public: static inline CAknTitlePane* titlePane(); static inline CAknContextPane* contextPane(); static inline CEikButtonGroupContainer* buttonGroupContainer(); + static void setStatusPaneAndButtonGroupVisibility(bool statusPaneVisible, bool buttonGroupVisible); TTrapHandler *s60InstalledTrapHandler; #endif @@ -226,6 +227,8 @@ private: #ifdef QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER void translateAdvancedPointerEvent(const TAdvancedPointerEvent *event); #endif + +public: void handleClientAreaChange(); private: diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index d06328c..fe0d083 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -1110,15 +1110,10 @@ void QWidget::setWindowState(Qt::WindowStates newstate) // The window decoration visibility has to be changed before doing actual window state // change since in that order the availableGeometry will return directly the right size and // we will avoid unnecessarty redraws - CEikStatusPane *statusPane = S60->statusPane(); - CEikButtonGroupContainer *buttonGroup = S60->buttonGroupContainer(); - TBool visible = !(newstate & (Qt::WindowFullScreen | Qt::WindowMinimized)); - if (statusPane) - statusPane->MakeVisible(visible); - if (buttonGroup) { - // Visibility - buttonGroup->MakeVisible(visible || (isFullscreen && cbaRequested)); - } + const bool visible = !(newstate & (Qt::WindowFullScreen | Qt::WindowMinimized)); + const bool statusPaneVisibility = visible; + const bool buttonGroupVisibility = (visible || (isFullscreen && cbaRequested)); + S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility); #endif // Q_WS_S60 // Ensure the initial size is valid, since we store it as normalGeometry below. @@ -1142,7 +1137,7 @@ void QWidget::setWindowState(Qt::WindowStates newstate) // accurate because it did not consider the status pane. This means that when returning // normal mode after showing the status pane, the geometry would overlap so we should // move it if it never had an explicit position. - if (!wasMoved && statusPane && visible) { + if (!wasMoved && S60->statusPane() && visible) { TPoint tl = static_cast(S60->appUi())->ClientRect().iTl; normalGeometry.setTopLeft(QPoint(tl.iX, tl.iY)); } -- cgit v0.12 From 9a059c53caaf19cd2ff722df6e47870a2843ee43 Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Fri, 30 Jul 2010 11:38:37 +0200 Subject: Fix proxy widgets with the OpenVG paint engine. Proxy widgets use the shared painter functionality and this implies that the paint engine's begin function does not get called for each new widget that gets painted. This causes a problem because the system clip gets modified by QPainter, but the paint engine does not realize that this happened and fails to use the new clip. The result is that you can end up painting outside the intended clip area. The fix is to reimplement the virtual systemStateChanged() function in QVGPaintEnginePrivate and make it call updateScissor() to re-evaluate the clipping flags and update the current clip accordingly. A similar fix was done to the OpenGL paint engine way back in 307c2954. Task-number: QTBUG-12486 Reviewed-by: Rhys Weatherley --- src/openvg/qpaintengine_vg.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index 7de09ce..e368c32 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -120,6 +120,7 @@ private: class QVGPaintEnginePrivate : public QPaintEngineExPrivate { + Q_DECLARE_PUBLIC(QVGPaintEngine) public: // Extra blending modes from VG_KHR_advanced_blending extension. // Use the QT_VG prefix to avoid conflicts with any definitions @@ -150,7 +151,7 @@ public: QT_VG_BLEND_XOR_KHR = 0x2026 }; - QVGPaintEnginePrivate(); + QVGPaintEnginePrivate(QVGPaintEngine *q_ptr); ~QVGPaintEnginePrivate(); void init(); @@ -171,6 +172,7 @@ public: void setBrushTransform(const QBrush& brush, VGMatrixMode mode); void setupColorRamp(const QGradient *grad, VGPaint paint); void setImageOptions(); + void systemStateChanged(); #if !defined(QVG_SCISSOR_CLIP) void ensureMask(QVGPaintEngine *engine, int width, int height); void modifyMask @@ -299,6 +301,9 @@ public: // Clear all lazily-set modes. void clearModes(); + +private: + QVGPaintEngine *q; }; inline void QVGPaintEnginePrivate::setImageMode(VGImageMode mode) @@ -350,7 +355,7 @@ void QVGPaintEnginePrivate::clearModes() imageQuality = (VGImageQuality)0; } -QVGPaintEnginePrivate::QVGPaintEnginePrivate() +QVGPaintEnginePrivate::QVGPaintEnginePrivate(QVGPaintEngine *q_ptr) : q(q_ptr) { init(); } @@ -1452,7 +1457,7 @@ QVGPainterState::~QVGPainterState() } QVGPaintEngine::QVGPaintEngine() - : QPaintEngineEx(*new QVGPaintEnginePrivate) + : QPaintEngineEx(*new QVGPaintEnginePrivate(this)) { } @@ -2995,6 +3000,11 @@ void QVGPaintEnginePrivate::setImageOptions() } } +void QVGPaintEnginePrivate::systemStateChanged() +{ + q->updateScissor(); +} + static void drawVGImage(QVGPaintEnginePrivate *d, const QRectF& r, VGImage vgImg, const QSize& imageSize, const QRectF& sr) -- cgit v0.12 From 4cf313be8d440e2ef9bdb4a586fbcba20c3ee317 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Wed, 28 Jul 2010 14:05:52 +0100 Subject: Added support to Phonon MMF backend for playback of Qt resource files The backend accesses the resource file path via MediaSource::url(). A small patch to Phonon was required to enable this, because by default, Phonon passes a QIODevice, rather than the resource file path, to the backend. The backend uses this path to create a QResource object, through which the memory buffer into which the resource file has been read can be accessed. This buffer is wrapped in a Symbian 8-bit descriptor and passed to the OpenDesL() function of the appropriate MMF client utility API. Task-number: QTBUG-6562 --- src/3rdparty/phonon/mmf/abstractmediaplayer.cpp | 28 ++++++++-- src/3rdparty/phonon/mmf/abstractmediaplayer.h | 6 ++- src/3rdparty/phonon/mmf/abstractplayer.h | 4 +- src/3rdparty/phonon/mmf/abstractvideoplayer.cpp | 6 +++ src/3rdparty/phonon/mmf/abstractvideoplayer.h | 1 + src/3rdparty/phonon/mmf/audioplayer.cpp | 6 +++ src/3rdparty/phonon/mmf/audioplayer.h | 1 + src/3rdparty/phonon/mmf/dummyplayer.cpp | 2 +- src/3rdparty/phonon/mmf/dummyplayer.h | 2 +- src/3rdparty/phonon/mmf/mediaobject.cpp | 71 ++++++++++++++++++++++--- src/3rdparty/phonon/mmf/mediaobject.h | 11 ++-- src/3rdparty/phonon/phonon/mediasource.cpp | 5 ++ 12 files changed, 123 insertions(+), 20 deletions(-) diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp index be2a568..bca0891 100644 --- a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp +++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp @@ -16,6 +16,7 @@ along with this library. If not, see . */ +#include #include #include "abstractmediaplayer.h" @@ -216,9 +217,10 @@ void MMF::AbstractMediaPlayer::doSetTickInterval(qint32 interval) TRACE_EXIT_0(); } -void MMF::AbstractMediaPlayer::open(const MediaSource &source, RFile& file) +void MMF::AbstractMediaPlayer::open() { - TRACE_CONTEXT(AbstractMediaPlayer::setFileSource, EAudioApi); + TRACE_CONTEXT(AbstractMediaPlayer::open, EAudioApi); + const MediaSource source = m_parent->source(); TRACE_ENTRY("state %d source.type %d", privateState(), source.type()); close(); @@ -229,7 +231,9 @@ void MMF::AbstractMediaPlayer::open(const MediaSource &source, RFile& file) switch (source.type()) { case MediaSource::LocalFile: { - symbianErr = openFile(file); + RFile *const file = m_parent->file(); + Q_ASSERT(file); + symbianErr = openFile(*file); if (KErrNone != symbianErr) errorMessage = tr("Error opening file"); break; @@ -237,9 +241,10 @@ void MMF::AbstractMediaPlayer::open(const MediaSource &source, RFile& file) case MediaSource::Url: { const QUrl url(source.url()); - if (url.scheme() == QLatin1String("file")) { - symbianErr = openFile(file); + RFile *const file = m_parent->file(); + Q_ASSERT(file); + symbianErr = openFile(*file); if (KErrNone != symbianErr) errorMessage = tr("Error opening file"); } else { @@ -251,6 +256,19 @@ void MMF::AbstractMediaPlayer::open(const MediaSource &source, RFile& file) break; } + case MediaSource::Stream: { + QResource *const resource = m_parent->resource(); + if (resource && resource->isValid()) { + m_buffer.Set(resource->data(), resource->size()); + symbianErr = openDescriptor(m_buffer); + if (KErrNone != symbianErr) + errorMessage = tr("Error opening resource"); + } else { + errorMessage = tr("Error opening source: resource not valid"); + } + break; + } + // Other source types are handled in MediaObject::createPlayer // Protection against adding new media types and forgetting to update this switch diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.h b/src/3rdparty/phonon/mmf/abstractmediaplayer.h index 7d28caf..e795ecb 100644 --- a/src/3rdparty/phonon/mmf/abstractmediaplayer.h +++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.h @@ -47,7 +47,7 @@ protected: AbstractMediaPlayer(MediaObject *parent, const AbstractPlayer *player); public: - virtual void open(const Phonon::MediaSource&, RFile&); + virtual void open(); // MediaObjectInterface virtual void play(); @@ -70,6 +70,7 @@ protected: virtual int setDeviceVolume(int mmfVolume) = 0; virtual int openFile(RFile& file) = 0; virtual int openUrl(const QString& url) = 0; + virtual int openDescriptor(const TDesC8 &des) = 0; virtual int bufferStatus() const = 0; void updateMetaData(); @@ -123,6 +124,9 @@ private: bool m_prefinishMarkSent; bool m_aboutToFinishSent; + // Used for playback of resource files + TPtrC8 m_buffer; + QMultiMap m_metaData; }; diff --git a/src/3rdparty/phonon/mmf/abstractplayer.h b/src/3rdparty/phonon/mmf/abstractplayer.h index 30d5243..dd98c7c 100644 --- a/src/3rdparty/phonon/mmf/abstractplayer.h +++ b/src/3rdparty/phonon/mmf/abstractplayer.h @@ -26,8 +26,6 @@ along with this library. If not, see . #include "abstractvideooutput.h" -class RFile; - QT_BEGIN_NAMESPACE namespace Phonon @@ -54,7 +52,7 @@ class AbstractPlayer : public QObject public: AbstractPlayer(const AbstractPlayer *player); - virtual void open(const Phonon::MediaSource&, RFile&) = 0; + virtual void open() = 0; virtual void close() = 0; // MediaObjectInterface (implemented) diff --git a/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp b/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp index 9ea4d18..fb20bea 100644 --- a/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp +++ b/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp @@ -144,6 +144,12 @@ int MMF::AbstractVideoPlayer::openUrl(const QString &url) return err; } +int MMF::AbstractVideoPlayer::openDescriptor(const TDesC8 &des) +{ + TRAPD(err, m_player->OpenDesL(des)); + return err; +} + int MMF::AbstractVideoPlayer::bufferStatus() const { int result = 0; diff --git a/src/3rdparty/phonon/mmf/abstractvideoplayer.h b/src/3rdparty/phonon/mmf/abstractvideoplayer.h index d854793..3ff3c75 100644 --- a/src/3rdparty/phonon/mmf/abstractvideoplayer.h +++ b/src/3rdparty/phonon/mmf/abstractvideoplayer.h @@ -66,6 +66,7 @@ public: virtual int setDeviceVolume(int mmfVolume); virtual int openFile(RFile &file); virtual int openUrl(const QString &url); + virtual int openDescriptor(const TDesC8 &des); virtual int bufferStatus() const; virtual void close(); diff --git a/src/3rdparty/phonon/mmf/audioplayer.cpp b/src/3rdparty/phonon/mmf/audioplayer.cpp index f49e898..7c8b9bd 100644 --- a/src/3rdparty/phonon/mmf/audioplayer.cpp +++ b/src/3rdparty/phonon/mmf/audioplayer.cpp @@ -137,6 +137,12 @@ int MMF::AudioPlayer::openUrl(const QString& /*url*/) return 0; } +int MMF::AudioPlayer::openDescriptor(const TDesC8 &des) +{ + TRAPD(err, m_player->OpenDesL(des)); + return err; +} + int MMF::AudioPlayer::bufferStatus() const { int result = 0; diff --git a/src/3rdparty/phonon/mmf/audioplayer.h b/src/3rdparty/phonon/mmf/audioplayer.h index 0eb8bb7..e43cadd 100644 --- a/src/3rdparty/phonon/mmf/audioplayer.h +++ b/src/3rdparty/phonon/mmf/audioplayer.h @@ -67,6 +67,7 @@ typedef CMdaAudioPlayerUtility NativePlayer; virtual int setDeviceVolume(int mmfVolume); virtual int openFile(RFile& file); virtual int openUrl(const QString& url); + virtual int openDescriptor(const TDesC8 &des); virtual int bufferStatus() const; virtual void close(); diff --git a/src/3rdparty/phonon/mmf/dummyplayer.cpp b/src/3rdparty/phonon/mmf/dummyplayer.cpp index d39ef76..ba75b02 100644 --- a/src/3rdparty/phonon/mmf/dummyplayer.cpp +++ b/src/3rdparty/phonon/mmf/dummyplayer.cpp @@ -92,7 +92,7 @@ qint64 MMF::DummyPlayer::totalTime() const return 0; } -void MMF::DummyPlayer::open(const Phonon::MediaSource &, RFile &) +void MMF::DummyPlayer::open() { } diff --git a/src/3rdparty/phonon/mmf/dummyplayer.h b/src/3rdparty/phonon/mmf/dummyplayer.h index 9d45696..5b00411 100644 --- a/src/3rdparty/phonon/mmf/dummyplayer.h +++ b/src/3rdparty/phonon/mmf/dummyplayer.h @@ -57,7 +57,7 @@ public: virtual qint64 totalTime() const; // AbstractPlayer - virtual void open(const Phonon::MediaSource&, RFile&); + virtual void open(); virtual void close(); virtual void doSetTickInterval(qint32 interval); }; diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp index d264377..e16bdf3 100644 --- a/src/3rdparty/phonon/mmf/mediaobject.cpp +++ b/src/3rdparty/phonon/mmf/mediaobject.cpp @@ -34,6 +34,7 @@ along with this library. If not, see . #include "mediaobject.h" #include +#include #include QT_BEGIN_NAMESPACE @@ -52,6 +53,8 @@ using namespace Phonon::MMF; MMF::MediaObject::MediaObject(QObject *parent) : MMF::MediaNode::MediaNode(parent) , m_recognizerOpened(false) , m_nextSourceSet(false) + , m_file(0) + , m_resource(0) { m_player.reset(new DummyPlayer()); @@ -68,7 +71,12 @@ MMF::MediaObject::~MediaObject() TRACE_CONTEXT(MediaObject::~MediaObject, EAudioApi); TRACE_ENTRY_0(); - m_file.Close(); + delete m_resource; + + if (m_file) + m_file->Close(); + delete m_file; + m_fileServer.Close(); m_recognizer.Close(); @@ -122,12 +130,13 @@ MMF::MediaType MMF::MediaObject::fileMediaType const QHBufC fileNameSymbian(QDir::toNativeSeparators(fileName)); - m_file.Close(); - TInt err = m_file.Open(m_fileServer, *fileNameSymbian, EFileRead | EFileShareReadersOnly); + Q_ASSERT(!m_file); + m_file = new RFile; + TInt err = m_file->Open(m_fileServer, *fileNameSymbian, EFileRead | EFileShareReadersOnly); if (KErrNone == err) { TDataRecognitionResult recognizerResult; - err = m_recognizer.RecognizeData(m_file, recognizerResult); + err = m_recognizer.RecognizeData(*m_file, recognizerResult); if (KErrNone == err) { const TPtrC mimeType = recognizerResult.iDataType.Des(); result = Utils::mimeTypeToMediaType(mimeType); @@ -142,6 +151,23 @@ MMF::MediaType MMF::MediaObject::fileMediaType return result; } +MMF::MediaType MMF::MediaObject::bufferMediaType(const uchar *data, qint64 size) +{ + TRACE_CONTEXT(MediaObject::bufferMediaType, EAudioInternal); + MediaType result = MediaTypeUnknown; + if (openRecognizer()) { + TDataRecognitionResult recognizerResult; + const TPtrC8 des(data, size); + const TInt err = m_recognizer.RecognizeData(des, recognizerResult); + if (KErrNone == err) { + const TPtrC mimeType = recognizerResult.iDataType.Des(); + result = Utils::mimeTypeToMediaType(mimeType); + } else { + TRACE("RApaLsSession::RecognizeData error %d", err); + } + } + return result; +} //----------------------------------------------------------------------------- // MediaObjectInterface @@ -228,9 +254,17 @@ void MMF::MediaObject::setSource(const MediaSource &source) void MMF::MediaObject::switchToSource(const MediaSource &source) { + if (m_file) + m_file->Close(); + delete m_file; + m_file = 0; + + delete m_resource; + m_resource = 0; + createPlayer(source); m_source = source; - m_player->open(m_source, m_file); + m_player->open(); emit currentSourceChanged(m_source); } @@ -272,10 +306,25 @@ void MMF::MediaObject::createPlayer(const MediaSource &source) case MediaSource::Invalid: case MediaSource::Disc: - case MediaSource::Stream: errorMessage = tr("Error opening source: type not supported"); break; + case MediaSource::Stream: + { + const QString fileName = source.url().toLocalFile(); + if (fileName.startsWith(QLatin1String(":/")) || fileName.startsWith(QLatin1String("qrc://"))) { + Q_ASSERT(!m_resource); + m_resource = new QResource(fileName); + if (m_resource->isValid()) + mediaType = bufferMediaType(m_resource->data(), m_resource->size()); + else + errorMessage = tr("Error opening source: resource not valid"); + } else { + errorMessage = tr("Error opening source: type not supported"); + } + } + break; + case MediaSource::Empty: TRACE_0("Empty media source"); break; @@ -374,6 +423,16 @@ void MMF::MediaObject::volumeChanged(qreal volume) m_player->volumeChanged(volume); } +RFile* MMF::MediaObject::file() const +{ + return m_file; +} + +QResource* MMF::MediaObject::resource() const +{ + return m_resource; +} + //----------------------------------------------------------------------------- // MediaNode //----------------------------------------------------------------------------- diff --git a/src/3rdparty/phonon/mmf/mediaobject.h b/src/3rdparty/phonon/mmf/mediaobject.h index f15eb21..5399e27 100644 --- a/src/3rdparty/phonon/mmf/mediaobject.h +++ b/src/3rdparty/phonon/mmf/mediaobject.h @@ -33,6 +33,8 @@ along with this library. If not, see . QT_BEGIN_NAMESPACE +class QResource; + namespace Phonon { namespace MMF @@ -87,6 +89,9 @@ public: void setVideoOutput(AbstractVideoOutput* videoOutput); + RFile* file() const; + QResource* resource() const; + public Q_SLOTS: void volumeChanged(qreal volume); void switchToNextSource(); @@ -117,6 +122,7 @@ private: // Audio / video media type recognition MediaType fileMediaType(const QString& fileName); + MediaType bufferMediaType(const uchar *data, qint64 size); // TODO: urlMediaType function static qint64 toMilliSeconds(const TTimeIntervalMicroSeconds &); @@ -132,9 +138,8 @@ private: MediaSource m_nextSource; bool m_nextSourceSet; - // Storing the file handle here to work around KErrInUse error - // from MMF player utility OpenFileL functions - RFile m_file; + RFile* m_file; + QResource* m_resource; QScopedPointer m_player; diff --git a/src/3rdparty/phonon/phonon/mediasource.cpp b/src/3rdparty/phonon/phonon/mediasource.cpp index be22dc3..925ff32 100644 --- a/src/3rdparty/phonon/phonon/mediasource.cpp +++ b/src/3rdparty/phonon/phonon/mediasource.cpp @@ -58,6 +58,11 @@ MediaSource::MediaSource(const QString &filename) d->type = Stream; d->ioDevice = new QFile(filename); d->setStream(new IODeviceStream(d->ioDevice, d->ioDevice)); +#ifdef Q_OS_SYMBIAN + // On Symbian, we need to access the resource buffer directly, rather than + // via QFile indirection + d->url = QUrl::fromLocalFile(fileInfo.absoluteFilePath()); +#endif #else d->type = Invalid; #endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM -- cgit v0.12 From 2e0a41f304e7505602699c9623a96b6174165150 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Wed, 28 Jul 2010 17:12:10 +0100 Subject: Updated tst_mediaobject resource playback test cases * Removed Q_SKIP on Symbian * Divided test into two, to exercise the two possible ways of providing the resource path to Phonon::MediaSource Task-number: QTBUG-6562 --- tests/auto/mediaobject/tst_mediaobject.cpp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index 994057b..99a16db 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -124,7 +124,8 @@ class tst_MediaObject : public QObject void init(); void cleanup(); - void testPlayFromResource(); + void testPlayFromResourceDirect(); + void testPlayFromResourceFile(); void testPlayIllegalFile(); void initTestCase(); void checkForDefaults(); @@ -199,11 +200,22 @@ void tst_MediaObject::stateChanged(Phonon::State newstate, Phonon::State oldstat QWARN(QByteArray(QByteArray(QTest::toString(oldstate)) + " to " + QByteArray(QTest::toString(newstate)))); } -void tst_MediaObject::testPlayFromResource() +void tst_MediaObject::testPlayFromResourceDirect() +{ + MediaObject media; + media.setCurrentSource(Phonon::MediaSource(MEDIA_FILEPATH)); + QVERIFY(media.state() != Phonon::ErrorState); + if (media.state() != Phonon::StoppedState) + QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 10000); + QCOMPARE(media.state(), Phonon::StoppedState); + media.play(); + if (media.state() != Phonon::PlayingState) + QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 10000); + QCOMPARE(media.state(), Phonon::PlayingState); +} + +void tst_MediaObject::testPlayFromResourceFile() { -#ifdef Q_OS_SYMBIAN - QSKIP("Not implemented yet.", SkipAll); -#else QFile file(MEDIA_FILEPATH); MediaObject media; media.setCurrentSource(&file); @@ -215,7 +227,6 @@ void tst_MediaObject::testPlayFromResource() if (media.state() != Phonon::PlayingState) QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 10000); QCOMPARE(media.state(), Phonon::PlayingState); -#endif } void tst_MediaObject::testPlayIllegalFile() -- cgit v0.12 From 7b70dd1d7f5f6819b1aa28647826e2137504de54 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Wed, 28 Jul 2010 14:05:52 +0100 Subject: Added support to Phonon MMF backend for playback of Qt resource files The backend accesses the resource file path via MediaSource::url(). A small patch to Phonon was required to enable this, because by default, Phonon passes a QIODevice, rather than the resource file path, to the backend. The backend uses this path to create a QResource object, through which the memory buffer into which the resource file has been read can be accessed. This buffer is wrapped in a Symbian 8-bit descriptor and passed to the OpenDesL() function of the appropriate MMF client utility API. Playback only works for certain file formats, as the Symbian MIME type recognizer does not always work. For example, playback of an audio WAV resource file works, while playback of an MP3 resource file does not. Task-number: QTBUG-6562 Reviewed-by: Justin McPherson --- src/3rdparty/phonon/mmf/abstractmediaplayer.cpp | 4 ++-- src/3rdparty/phonon/mmf/mediaobject.cpp | 10 +++++++--- src/3rdparty/phonon/phonon/mediasource.cpp | 4 ---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp index bca0891..3702560 100644 --- a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp +++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp @@ -258,13 +258,13 @@ void MMF::AbstractMediaPlayer::open() case MediaSource::Stream: { QResource *const resource = m_parent->resource(); - if (resource && resource->isValid()) { + if (resource) { m_buffer.Set(resource->data(), resource->size()); symbianErr = openDescriptor(m_buffer); if (KErrNone != symbianErr) errorMessage = tr("Error opening resource"); } else { - errorMessage = tr("Error opening source: resource not valid"); + errorMessage = tr("Error opening source: resource not opened"); } break; } diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp index e16bdf3..b476535 100644 --- a/src/3rdparty/phonon/mmf/mediaobject.cpp +++ b/src/3rdparty/phonon/mmf/mediaobject.cpp @@ -315,10 +315,14 @@ void MMF::MediaObject::createPlayer(const MediaSource &source) if (fileName.startsWith(QLatin1String(":/")) || fileName.startsWith(QLatin1String("qrc://"))) { Q_ASSERT(!m_resource); m_resource = new QResource(fileName); - if (m_resource->isValid()) - mediaType = bufferMediaType(m_resource->data(), m_resource->size()); - else + if (m_resource->isValid()) { + if (m_resource->isCompressed()) + errorMessage = tr("Error opening source: resource is compressed"); + else + mediaType = bufferMediaType(m_resource->data(), m_resource->size()); + } else { errorMessage = tr("Error opening source: resource not valid"); + } } else { errorMessage = tr("Error opening source: type not supported"); } diff --git a/src/3rdparty/phonon/phonon/mediasource.cpp b/src/3rdparty/phonon/phonon/mediasource.cpp index 925ff32..8bde565 100644 --- a/src/3rdparty/phonon/phonon/mediasource.cpp +++ b/src/3rdparty/phonon/phonon/mediasource.cpp @@ -58,11 +58,7 @@ MediaSource::MediaSource(const QString &filename) d->type = Stream; d->ioDevice = new QFile(filename); d->setStream(new IODeviceStream(d->ioDevice, d->ioDevice)); -#ifdef Q_OS_SYMBIAN - // On Symbian, we need to access the resource buffer directly, rather than - // via QFile indirection d->url = QUrl::fromLocalFile(fileInfo.absoluteFilePath()); -#endif #else d->type = Invalid; #endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM -- cgit v0.12 From 7f4e72f438362da7b862ea682f36ec959070e1cb Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Mon, 2 Aug 2010 10:09:49 +0100 Subject: Enabled tst_mediaobject::testPlayFromResource on Symbian Task-number: QTBUG-6562 Reviewed-by: Justin McPherson --- tests/auto/mediaobject/tst_mediaobject.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index 99a16db..613a086 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -124,8 +124,7 @@ class tst_MediaObject : public QObject void init(); void cleanup(); - void testPlayFromResourceDirect(); - void testPlayFromResourceFile(); + void testPlayFromResource(); void testPlayIllegalFile(); void initTestCase(); void checkForDefaults(); @@ -200,7 +199,7 @@ void tst_MediaObject::stateChanged(Phonon::State newstate, Phonon::State oldstat QWARN(QByteArray(QByteArray(QTest::toString(oldstate)) + " to " + QByteArray(QTest::toString(newstate)))); } -void tst_MediaObject::testPlayFromResourceDirect() +void tst_MediaObject::testPlayFromResource() { MediaObject media; media.setCurrentSource(Phonon::MediaSource(MEDIA_FILEPATH)); @@ -214,21 +213,6 @@ void tst_MediaObject::testPlayFromResourceDirect() QCOMPARE(media.state(), Phonon::PlayingState); } -void tst_MediaObject::testPlayFromResourceFile() -{ - QFile file(MEDIA_FILEPATH); - MediaObject media; - media.setCurrentSource(&file); - QVERIFY(media.state() != Phonon::ErrorState); - if (media.state() != Phonon::StoppedState) - QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 10000); - QCOMPARE(media.state(), Phonon::StoppedState); - media.play(); - if (media.state() != Phonon::PlayingState) - QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 10000); - QCOMPARE(media.state(), Phonon::PlayingState); -} - void tst_MediaObject::testPlayIllegalFile() { QString filename = QDir::tempPath() + QString("/test.wav"); -- cgit v0.12 From 1c7c6e2326b2f89bdf564cebe89ff6f95c3f17d7 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Mon, 2 Aug 2010 12:10:14 +0100 Subject: Fixed build break on Symbian versions earlier than S^3 The following overload was added in S^3: TInt RApaLsSession::RecognizeData(const TDesC8& aBuffer, TDataRecognitionResult& aDataType) const In order to allow the backend to compile against earlier versions of the platform, this patch calls the RecognizeData overload which taking the same arguments as above, plus a filename (for which KNullDesC is passed). Task-number: QTBUG-6562 Reviewed-by: trustme --- src/3rdparty/phonon/mmf/mediaobject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp index b476535..98326b8 100644 --- a/src/3rdparty/phonon/mmf/mediaobject.cpp +++ b/src/3rdparty/phonon/mmf/mediaobject.cpp @@ -158,7 +158,7 @@ MMF::MediaType MMF::MediaObject::bufferMediaType(const uchar *data, qint64 size) if (openRecognizer()) { TDataRecognitionResult recognizerResult; const TPtrC8 des(data, size); - const TInt err = m_recognizer.RecognizeData(des, recognizerResult); + const TInt err = m_recognizer.RecognizeData(KNullDesC, des, recognizerResult); if (KErrNone == err) { const TPtrC mimeType = recognizerResult.iDataType.Des(); result = Utils::mimeTypeToMediaType(mimeType); -- cgit v0.12 From 88917087b64a014a69d12946a162ab6588e733e6 Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Tue, 3 Aug 2010 10:52:26 +1000 Subject: setUniformValue(QSize) was setting (w,w) not (w,h) Task-number: QTBUG-12591 Reviewed-by: Daniel Pope --- src/opengl/qglshaderprogram.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index bbfc2d5..edbb635 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -1971,7 +1971,7 @@ void QGLShaderProgram::setUniformValue(int location, const QSize& size) Q_D(QGLShaderProgram); Q_UNUSED(d); if (location != -1) { - GLfloat values[4] = {size.width(), size.width()}; + GLfloat values[4] = {size.width(), size.height()}; glUniform2fv(location, 1, values); } } -- cgit v0.12 From bf5c25c4e7571475255e1d9de307913bee228d10 Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Tue, 3 Aug 2010 11:23:37 +1000 Subject: Don't resolve GLSL extensions if no shaders If the GL server is 1.x, but the client is 2.x, then the qt_resolve_glsl_extensions() function was returning true because the functions existed client-side, when it should have returned false because the functionality didn't exist server-side. Task-number: QTBUG-12478 Reviewed-by: Sarah Smith --- src/opengl/qglextensions.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/opengl/qglextensions.cpp b/src/opengl/qglextensions.cpp index c091191..433ccae 100644 --- a/src/opengl/qglextensions.cpp +++ b/src/opengl/qglextensions.cpp @@ -233,6 +233,10 @@ bool qt_resolve_glsl_extensions(QGLContext *ctx) if (glCreateShader) return true; + // Must at least have the FragmentShader extension to continue. + if (!(QGLExtensions::glExtensions() & QGLExtensions::FragmentShader)) + return false; + glCreateShader = (_glCreateShader) ctx->getProcAddress(QLatin1String("glCreateShader")); if (glCreateShader) { glShaderSource = (_glShaderSource) ctx->getProcAddress(QLatin1String("glShaderSource")); -- cgit v0.12 From 3246586d5a98465c38c21f191e9714e821788958 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Tue, 3 Aug 2010 10:17:33 +0100 Subject: Fixed test regression on Mac Mac Phonon backend does not support opening a resource file via the MediaSource(const QString &) overload. The MediaSource(QIODevice *) overload must be used. The Symbian backend, on the other hand, requires the former overload to be used. Task-number: QTBUG-6562 Reviewed-by: trustme --- tests/auto/mediaobject/tst_mediaobject.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index 613a086..6367392 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -202,7 +202,12 @@ void tst_MediaObject::stateChanged(Phonon::State newstate, Phonon::State oldstat void tst_MediaObject::testPlayFromResource() { MediaObject media; +#ifdef Q_OS_SYMBIAN media.setCurrentSource(Phonon::MediaSource(MEDIA_FILEPATH)); +#else + QFile file(MEDIA_FILEPATH); + media.setCurrentSource(&file); +#endif QVERIFY(media.state() != Phonon::ErrorState); if (media.state() != Phonon::StoppedState) QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 10000); -- cgit v0.12 From c7b9ee03339774bd1cae7793d91dad7809be987a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 3 Aug 2010 19:41:55 +0200 Subject: Add QDir::homePath() for the log file in QTestFileLogger in testlib on Symbian, both hardware and emulator. Task-number: QTBUG-12622 Reviewed-by: Shane Kearns --- src/testlib/qtestfilelogger.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/testlib/qtestfilelogger.cpp b/src/testlib/qtestfilelogger.cpp index a5cdc80..9d1ee6a 100644 --- a/src/testlib/qtestfilelogger.cpp +++ b/src/testlib/qtestfilelogger.cpp @@ -44,6 +44,8 @@ #include "QtTest/private/qtestlog_p.h" #include "QtTest/private/qtestresult_p.h" +#include + #include #include @@ -69,11 +71,19 @@ QTestFileLogger::~QTestFileLogger() void QTestFileLogger::init() { char filename[100]; + int index = 0; +#if defined(Q_OS_SYMBIAN) + QByteArray ba(QDir::toNativeSeparators(QString(QDir::homePath()+QDir::separator())).toUtf8()); + index = ba.length(); + QTest::qt_snprintf(filename, sizeof(filename), "%s%s.log", + ba.constData(), QTestResult::currentTestObjectName()); +#else QTest::qt_snprintf(filename, sizeof(filename), "%s.log", QTestResult::currentTestObjectName()); - - // Keep filenames simple - for (uint i = 0; i < sizeof(filename) && filename[i]; ++i) { +#endif + + // Keep filenames simple + for (uint i = index; i < sizeof(filename) && filename[i]; ++i) { char& c = filename[i]; if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-' || c == '.')) { -- cgit v0.12 From 22e95ba2502f893d741b774c37fc8c7bdc4b05c5 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 4 Aug 2010 17:16:33 +0200 Subject: Improving text coordinate rounding in the OpenVG paint engine Commit b0bbabe728fedb8531fc2837403856bd5ed44e1b fixed text blurriness in the OpenVG paint engine by forcing the coordinates of the text items to integer coordinates (for unrotated, unscaled text). That was not yet enough. In addition to the coordinates, also the d->pathTransform in QVGPaintEngine can have a non-integer translation. This patch makes sure that the text item coordinate combined with the translation result in final integer coordinates. Since it is not possible to set an absolute translation of a QTransform (only relative is possible), first dx() is added to p.x(), then after rounding, it is again substracted. Sam for y, but with opposite prefix, since the y-axis in Qt and in transformation matrices are in opposite directions. The ceil stunt (which I cerated by trial and error) was replaced by floor(x + aliasedCoordinateDelta), which *exactly* what other paint engines do. Task-number: QTBUG-12330 Reviewed-by: Jason Barron --- src/openvg/qpaintengine_vg.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index e368c32..318e2b1 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -76,6 +76,9 @@ QT_BEGIN_NAMESPACE #if !defined(QVG_NO_DRAW_GLYPHS) +// use the same rounding as in qrasterizer.cpp (6 bit fixed point) +static const qreal aliasedCoordinateDelta = 0.5 - 0.015625; + Q_DECL_IMPORT extern int qt_defaultDpiX(); Q_DECL_IMPORT extern int qt_defaultDpiY(); @@ -3439,9 +3442,10 @@ void QVGPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem) // Set the transformation to use for drawing the current glyphs. QTransform glyphTransform(d->pathTransform); if (d->transform.type() <= QTransform::TxTranslate) { - // Prevent blurriness of unscaled, unrotated text by using integer coordinates. - // Using ceil(x-0.5) instead of qRound() or int-cast, behave like other paint engines. - glyphTransform.translate(ceil(p.x() - 0.5), ceil(p.y() - 0.5)); + // Prevent blurriness of unscaled, unrotated text by forcing integer coordinates. + glyphTransform.translate( + floor(p.x() + glyphTransform.dx() + aliasedCoordinateDelta) - glyphTransform.dx(), + floor(p.y() - glyphTransform.dy() + aliasedCoordinateDelta) + glyphTransform.dy()); } else { glyphTransform.translate(p.x(), p.y()); } -- cgit v0.12 From eb8c7d19c98d547f89caa1b5866fd2b5e43b32bf Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Thu, 5 Aug 2010 14:36:57 +1000 Subject: Make sure onFocusChanged is correctly emitted for items in a FocusScope. Task-number: QTBUG-12649 Reviewed-by: Martin Jones --- src/declarative/graphicsitems/qdeclarativeitem.cpp | 13 +---- src/gui/graphicsview/qgraphicsitem.cpp | 5 ++ .../tst_qdeclarativefocusscope.cpp | 56 ++++++++++++++++++++++ 3 files changed, 62 insertions(+), 12 deletions(-) diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 50998eb..5b74129 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -2406,18 +2406,7 @@ void QDeclarativeItemPrivate::focusChanged(bool flag) Q_Q(QDeclarativeItem); if (!(flags & QGraphicsItem::ItemIsFocusScope) && parent) emit q->activeFocusChanged(flag); //see also QDeclarativeItemPrivate::subFocusItemChange() - - bool inScope = false; - QGraphicsItem *p = parent; - while (p) { - if (p->flags() & QGraphicsItem::ItemIsFocusScope) { - inScope = true; - break; - } - p = p->parentItem(); - } - if (!inScope) - emit q->focusChanged(flag); + emit q->focusChanged(flag); } /*! \internal */ diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 1626d83..ff3dc1f 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3259,8 +3259,12 @@ void QGraphicsItemPrivate::setFocusHelper(Qt::FocusReason focusReason, bool clim QGraphicsItem *p = parent; while (p) { if (p->flags() & QGraphicsItem::ItemIsFocusScope) { + QGraphicsItem *oldFocusScopeItem = p->d_ptr->focusScopeItem; p->d_ptr->focusScopeItem = q_ptr; if (!p->focusItem() && !focusFromShow) { + if (oldFocusScopeItem) + oldFocusScopeItem->d_ptr->focusScopeItemChange(false); + focusScopeItemChange(true); // If you call setFocus on a child of a focus scope that // doesn't currently have a focus item, then stop. return; @@ -5595,6 +5599,7 @@ void QGraphicsItemPrivate::subFocusItemChange() */ void QGraphicsItemPrivate::focusScopeItemChange(bool isSubFocusItem) { + Q_UNUSED(isSubFocusItem); } /*! diff --git a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp index b0c9c03..b138f61 100644 --- a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp +++ b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp @@ -69,6 +69,7 @@ private slots: void textEdit(); void forceFocus(); void noParentFocus(); + void signalEmission(); }; /* @@ -344,6 +345,61 @@ void tst_qdeclarativefocusscope::noParentFocus() delete view; } +void tst_qdeclarativefocusscope::signalEmission() +{ + QDeclarativeView *view = new QDeclarativeView; + view->setSource(QUrl::fromLocalFile(SRCDIR "/data/signalEmission.qml")); + + QDeclarativeRectangle *item1 = findItem(view->rootObject(), QLatin1String("item1")); + QDeclarativeRectangle *item2 = findItem(view->rootObject(), QLatin1String("item2")); + QDeclarativeRectangle *item3 = findItem(view->rootObject(), QLatin1String("item3")); + QDeclarativeRectangle *item4 = findItem(view->rootObject(), QLatin1String("item4")); + QVERIFY(item1 != 0); + QVERIFY(item2 != 0); + QVERIFY(item3 != 0); + QVERIFY(item4 != 0); + + view->show(); + qApp->setActiveWindow(view); + qApp->processEvents(); + +#ifdef Q_WS_X11 + // to be safe and avoid failing setFocus with window managers + qt_x11_wait_for_window_manager(view); +#endif + + QVariant blue(QColor("blue")); + QVariant red(QColor("red")); + + QVERIFY(view->hasFocus()); + QVERIFY(view->scene()->hasFocus()); + item1->setFocus(true); + QCOMPARE(item1->property("color"), red); + QCOMPARE(item2->property("color"), blue); + QCOMPARE(item3->property("color"), blue); + QCOMPARE(item4->property("color"), blue); + + item2->setFocus(true); + QCOMPARE(item1->property("color"), blue); + QCOMPARE(item2->property("color"), red); + QCOMPARE(item3->property("color"), blue); + QCOMPARE(item4->property("color"), blue); + + item3->setFocus(true); + QCOMPARE(item1->property("color"), blue); + QCOMPARE(item2->property("color"), red); + QCOMPARE(item3->property("color"), red); + QCOMPARE(item4->property("color"), blue); + + item4->setFocus(true); + QCOMPARE(item1->property("color"), blue); + QCOMPARE(item2->property("color"), red); + QCOMPARE(item3->property("color"), blue); + QCOMPARE(item4->property("color"), red); + + delete view; +} + QTEST_MAIN(tst_qdeclarativefocusscope) #include "tst_qdeclarativefocusscope.moc" -- cgit v0.12 From 4ad82cec67ce40dd167be214a2a4dcdcf6236d9d Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Thu, 5 Aug 2010 14:39:52 +1000 Subject: Add missing test file. --- .../qdeclarativefocusscope/data/signalEmission.qml | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 tests/auto/declarative/qdeclarativefocusscope/data/signalEmission.qml diff --git a/tests/auto/declarative/qdeclarativefocusscope/data/signalEmission.qml b/tests/auto/declarative/qdeclarativefocusscope/data/signalEmission.qml new file mode 100644 index 0000000..07601c7 --- /dev/null +++ b/tests/auto/declarative/qdeclarativefocusscope/data/signalEmission.qml @@ -0,0 +1,33 @@ +import Qt 4.7 + +Rectangle { + width: 200 + height: 200 + + FocusScope { + focus: true + Rectangle { + objectName: "item1" + color: "blue" + onFocusChanged: focus ? color = "red" : color = "blue" + } + Rectangle { + objectName: "item2" + color: "blue" + onFocusChanged: focus ? color = "red" : color = "blue" + } + } + + FocusScope { + Rectangle { + objectName: "item3" + color: "blue" + onFocusChanged: focus ? color = "red" : color = "blue" + } + Rectangle { + objectName: "item4" + color: "blue" + onFocusChanged: focus ? color = "red" : color = "blue" + } + } +} -- cgit v0.12 From 4692a507dcdfbc830a0885016b6bd0bab4480bad Mon Sep 17 00:00:00 2001 From: Joona Petrell Date: Wed, 4 Aug 2010 11:42:48 +1000 Subject: Increase maximum heap size of QML Viewer Task-number: QTBUG-12029 Reviewed-by: Martin Jones --- tools/qml/qml.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index efb82d1..d794005 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -35,7 +35,7 @@ maemo5 { symbian { TARGET.UID3 = 0x20021317 include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 + TARGET.EPOCHEAPSIZE = 0x20000 0x4000000 TARGET.CAPABILITY = NetworkServices ReadUserData !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { LIBS += -lsensrvclient -lsensrvutil -- cgit v0.12 From 89e723153b15af5d3acbeb859d4f35bf52f8e250 Mon Sep 17 00:00:00 2001 From: Joona Petrell Date: Thu, 5 Aug 2010 14:03:57 +1000 Subject: Increase drag distance on Symbian to improve finger usability on capacitive screens Task-number: QTBUG-12594 Reviewed-by: Martin Jones --- src/gui/kernel/qapplication.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 3303800..e164baf 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -474,7 +474,7 @@ int qt_antialiasing_threshold = -1; static int drag_time = 500; #ifdef Q_OS_SYMBIAN // The screens are a bit too small to for your thumb when using only 4 pixels drag distance. -static int drag_distance = 8; +static int drag_distance = 12; #else static int drag_distance = 4; #endif -- cgit v0.12 From 563b5891e2f918f901ffefe29872dfac1b9a60e7 Mon Sep 17 00:00:00 2001 From: Joona Petrell Date: Thu, 5 Aug 2010 14:10:43 +1000 Subject: Re-enable script program caching on Symbian (used to be disabled due to crash problems that no longer occur). Task-number: QTBUG-12599 Reviewed-by: Martin Jones --- src/declarative/qml/qdeclarativeexpression.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp index 585fb69..6fc4df0 100644 --- a/src/declarative/qml/qdeclarativeexpression.cpp +++ b/src/declarative/qml/qdeclarativeexpression.cpp @@ -143,16 +143,12 @@ void QDeclarativeExpressionPrivate::init(QDeclarativeContextData *ctxt, void *ex } else { -#if !defined(Q_OS_SYMBIAN) //XXX Why doesn't this work? if (!dd->cachedPrograms.at(progIdx)) { dd->cachedPrograms[progIdx] = new QScriptProgram(expression, url, line); } expressionFunction = evalInObjectScope(ctxt, me, *dd->cachedPrograms.at(progIdx), &expressionContext); -#else - expressionFunction = evalInObjectScope(ctxt, me, expression, &expressionContext); -#endif expressionFunctionMode = ExplicitContext; expressionFunctionValid = true; -- cgit v0.12 From 1ca575eaf7c166f823b82132110ea066be819540 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Thu, 5 Aug 2010 15:10:02 +1000 Subject: Fix warning from whining complier. Task-number: QTBUG-12473 Reviewed-by: Aaron Kennedy --- src/declarative/qml/qdeclarativeprivate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h index b2d7451..cb916bf 100644 --- a/src/declarative/qml/qdeclarativeprivate.h +++ b/src/declarative/qml/qdeclarativeprivate.h @@ -132,6 +132,7 @@ namespace QDeclarativePrivate template class has_attachedPropertiesMethod { + public: typedef int yes_type; typedef char no_type; @@ -139,7 +140,6 @@ namespace QDeclarativePrivate static yes_type check(ReturnType *(*)(QObject *)); static no_type check(...); - public: static bool const value = sizeof(check(&T::qmlAttachedProperties)) == sizeof(yes_type); }; -- cgit v0.12 From a9aaaf30b6c542b5c9e3c1e1681088ab26a530c0 Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Thu, 5 Aug 2010 16:01:56 +1000 Subject: Improve docs on QML Animation page and associated elements Task-number: QTBUG-12666 --- doc/src/declarative/animation.qdoc | 345 +++++++++++++++------ .../snippets/declarative/animation-behavioral.qml | 61 ++++ doc/src/snippets/declarative/animation-easing.qml | 51 +++ .../snippets/declarative/animation-elements.qml | 66 ++++ doc/src/snippets/declarative/animation-groups.qml | 104 +++++++ .../declarative/animation-propertyvaluesource.qml | 51 +++ .../declarative/animation-signalhandler.qml | 55 ++++ .../snippets/declarative/animation-standalone.qml | 63 ++++ .../snippets/declarative/animation-transitions.qml | 62 ++++ doc/src/snippets/declarative/animation.qml | 181 ----------- doc/src/snippets/declarative/transition.qml | 9 +- src/declarative/util/qdeclarativeanimation.cpp | 52 +++- src/declarative/util/qdeclarativebehavior.cpp | 9 +- .../util/qdeclarativesmoothedanimation.cpp | 2 +- .../util/qdeclarativespringanimation.cpp | 3 +- src/declarative/util/qdeclarativestate.cpp | 2 +- src/declarative/util/qdeclarativestategroup.cpp | 4 +- src/declarative/util/qdeclarativetransition.cpp | 21 +- 18 files changed, 843 insertions(+), 298 deletions(-) create mode 100644 doc/src/snippets/declarative/animation-behavioral.qml create mode 100644 doc/src/snippets/declarative/animation-easing.qml create mode 100644 doc/src/snippets/declarative/animation-elements.qml create mode 100644 doc/src/snippets/declarative/animation-groups.qml create mode 100644 doc/src/snippets/declarative/animation-propertyvaluesource.qml create mode 100644 doc/src/snippets/declarative/animation-signalhandler.qml create mode 100644 doc/src/snippets/declarative/animation-standalone.qml create mode 100644 doc/src/snippets/declarative/animation-transitions.qml delete mode 100644 doc/src/snippets/declarative/animation.qml diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc index 401cf16..7416341 100644 --- a/doc/src/declarative/animation.qdoc +++ b/doc/src/declarative/animation.qdoc @@ -29,134 +29,301 @@ \page qdeclarativeanimation.html \title QML Animation -Animation in QML is done by animating properties of objects. Properties of type -real, int, color, rect, point, size, and vector3d can all be animated. -QML supports three main forms of animation: basic property animation, -transitions, and property behaviors. +In QML, animations are created by applying animation objects to object property +values to gradually change them over time. Animation objects are created from +the built-in set of animation elements, which can be used to animate various +types of property values. In addition, animation objects can be applied in +different ways depending on the context in which they are required. + +To create an animation, use an appropriate animation element for the type of +the property that is to be animated, and apply the animation depending on the +type of behavior that is required. This page describes the \l {Types of +Animations} that can be created and the \l {Animation Elements} that are used +to create these animations. + + +\section1 Types of Animations + +An animation is created in different ways depending on the context in which it +is required. Suppose a \l Rectangle's movement - that is, changes in its \c x +or \c y property values - should be animated. The semantics of the animation +differ depending on whether you want to create: + +\list +\o An animation that moves the \l Rectangle as soon as it is created, to a +known position +\o An animation that only triggers when the \l Rectangle is moved by external +sources - for example, when the mouse is clicked, animate the movement to the +mouse position +\o An animation that triggers when a particular signal is received +\o A standalone animation that is not bound to the \l Rectangle's movement, but +instead can be started and stopped from script as required +\o An animation that only triggers during \l{QML States}{state changes} +\endlist + +To support these different types of animation methods, QML provides several +methods for defining an animation. These are: + +\list +\o Creating an \l{Animations as Property Value Sources}{animation using +property value sources}, to immediately animate a specific property +\o Using \l{Behavioral Animations}{behavioral animations}, which are triggered +when a property changes value +\o \l{Animations in a Signal Handler}{Within a signal handler}, to be triggered +when a signal is received +\o As a \l{Standalone Animation}{standalone animation}, that can be +started/stopped from script and can be rebound to different objects +\o Using \l{Transitions}{transitions}, to provide animations between \l{QML +States}{state changes} +\endlist + +These methods are demonstrated below. Notice these examples use +PropertyAnimation, which is one of several QML elements that can be used to +create an animation. See the \l {Animation Elements} section further below for +details. -\tableofcontents -\section1 Basic Property Animation -The simplest form of animation is a \l PropertyAnimation, which can animate all of the property -types listed above. If the property you are animating is a number or color, you can alternatively use -NumberAnimation or ColorAnimation. These elements don't add any additional functionality, -but will help enforce type correctness and are slightly more efficient. +\section2 Animations as Property Value Sources + +An animation is applied as a \l{QDeclarativePropertyValueSource}{property value +source} using the \e Animation \bold on \e Property syntax. Here is a \l +Rectangle whose movement is animated using this method: + +\snippet doc/src/snippets/declarative/animation-propertyvaluesource.qml 0 + +This applies a PropertyAnimation to the \l Rectangle's \c x and \c y properties +to animate from their current values (i.e. zero) to 50, over 1000 milliseconds. +The animation starts as soon as the \l Rectangle is loaded. To animate from +specific values rather than the current \c x and \c y values, set the +PropertyAnimation's \l {PropertyAnimation::}{from} property. + +Specifying an animation as a property value source is useful for animating a +property to a particular value as soon as the object is loaded. + + +\section2 Behavioral Animations + +Often an animation should be applied whenever a particular property value +changes. In these cases, a \l Behavior can be used to specify a default +animation for a property change. Here is an example: + +\snippet doc/src/snippets/declarative/animation-behavioral.qml 0 -A property animation can be specified as a value source using the \e Animation \bold on \e property syntax. This is especially useful -for repeating animations. +This \l Rectangle has \l Behavior objects applied to its \c x and \c y +properties. Whenever these properties change (in this case, when the mouse is +clicked within the parent \l Item), the PropertyAnimation objects defined +within the behaviors will be applied to these properties, thus animating the \l +Rectangle's movement to its new position. Unlike the method of \l {Animations +as Property Value Sources}{defining an animation as a property value source}, +which creates a one-time animation that animates a property to a known value, a +behavioral animation is an animation that is triggered \e {in response to} a +value change. -The following example creates a bouncing effect: -\snippet doc/src/snippets/declarative/animation.qml property-anim-1 +Any changes to these properties will trigger their animations. If \c x or \c y +were bound to other properties, and those properties changed, the animation +would be triggered. The \l{Behavior::}{enabled} property can be used to force a +\l Behavior to only apply under certain circumstances. -\image propanim.gif +Notice that unlike for property value source animations, the +PropertyAnimation's \l {PropertyAnimation::}{from} and \l +{PropertyAnimation::}{to} properties do not need to be defined because these +values are already provided, respectively, by the \l Rectangle's current values +and the new values set in the \c onClicked handler. If these properties were +defined anyway, they would override the default values. + +See the \l {declarative/animation/behaviors}{Behaviors example} for a +demonstration of behavioral animations. + + +\section2 Animations in a Signal Handler + +An animation can be created within a signal handler to be triggered when the +signal is received. For example: + +\snippet doc/src/snippets/declarative/animation-signalhandler.qml 0 + +The PropertyAnimation is triggered when the MouseArea is clicked, animating the +\c x and \c y properties to a value of 50 over 1000 milliseconds. Since the +animation is not bound to a particular object or property, it must define the +\l {PropertyAnimation::}{target} and \l {PropertyAnimation::}{property} (or \l +{PropertyAnimation::}{targets} and \l{PropertyAnimation::}{properties}) values. +The \l {PropertyAnimation::}{to} property is also required to specify the new +\c x and \c y values. + + +\section2 Standalone Animations + +Animations can also be created as ordinary QML objects that are not bound to +any particular objects and properties. An example: + +\snippet doc/src/snippets/declarative/animation-standalone.qml 0 + +A standalone animation is not running by default and must be started explicitly +using the \l {Animation::}{running} property or \l {Animation::}{start()} and +\l {Animation::}{stop()} methods. Since the animation is not bound to a +particular object or property, it must define the \l +{PropertyAnimation::}{target} and \l {PropertyAnimation::}{property} (or \l +{PropertyAnimation::}{targets} and \l{PropertyAnimation::}{properties}) values. +The \l {PropertyAnimation::}{to} property is also required to specify the new +\c x and \c y values. (The \l {PropertyAnimation::}{from} value can optionally +be provided.) + +Standalone animations are useful when an animation is not targeted towards a +single object property and the animation should be explicitly started and +stopped. + + +\section2 Transitions -When you assign an animation as a value source, you do not need to specify \c property -or \c target values; they are automatically selected for you. You do, however, need to specify a \c to value. -An animation specified as a value source will be \c running by default. +Transitions are used to describe the animations to be applied when a \l {QML +States}{state change} occurs. To create a transition, define a \l Transition +object and add it to an item's \l {Item::}{transitions} property. An example: -For example, here is a rectangle that uses a \l NumberAnimation value source to animate the movement -from its current position to an \c x value of 50. The animation starts immediately, and only the \c to -property is required: +\snippet doc/src/snippets/declarative/animation-transitions.qml 0 -\snippet doc/src/snippets/declarative/animation.qml property-anim-2 +When the \l Rectangle changes to the \e moved state, its \c x and \c y property +values are changed by the PropertyChanges object, and the PropertyAnimation +defined within the \l Transition is triggered on these properties. The +animation will not be applied at any time other than during the state change. -A property animation can also be specified as a resource that is manipulated from script. +Notice the example does not set any \l {PropertyAnimation::}{from} and \l +{PropertyAnimation::}{to} values for the PropertyAnimation. As a convenience, +these properties are automatically set to the values of \c x and \c y before +and after the state change, respectively. However, they can be explicitly set +if these values should be overrided. -\snippet doc/src/snippets/declarative/animation.qml property-anim-3 +Also notice the PropertyAnimation does not need to specify a \l +{PropertyAnimation::}{target} object; any \c x or \c y value of any object that +has changed during the state change will be animated. However, the target can +be set if the animation should be restricted to certain objects. -As can be seen, when an animation is used like this (as opposed to as a value source) you will need -to explicitly set the \c target and \c property to animate. This also the only case where -an animation needs to be started explictly by either setting the \c running property to -true or calling the \c start() method. +The top-level animations in a \l Transition are run in parallel. To run them +one after the other, use a SequentialAnimation, as shown below in \l {Grouping +Animations}. -Animations can be joined into a group using SequentialAnimation and ParallelAnimation. +See the \l Transition documentation for more information. -See the \l {declarative/animation/basics}{Animation basics example} for a demonstration of creating and combining multiple animations in QML. -\target state-transitions -\section1 Transitions +\section1 Animation Elements -\l Transition elements describe the animations to perform when \l{qmlstates}{state} changes occur. A transition -can only be triggered by a state change. +To create an animation, choose from one of the built-in QML animation elements. +While the above examples are demonstrated using PropertyAnimation, they could +have used other elements depending on the type of the property to be animated +and whether a single or multiple animations are required. -For example, a \l Transition could describe how an item moves from its initial position to its new position: +All animation elements inherit from the \l Animation element. It is not +possible to create \l Animation objects; instead, this element provides the +essential properties and methods for animation elements. For example, it allows +animations to be started and stopped through the \l {Animation::}{running} +property and the \l{Animation::}{start()} and \l{Animation::}{stop()} methods. +It can also define the number of \l {Animation::}{loops} for an animation. -\snippet doc/src/snippets/declarative/animation.qml transitions-1 -As can be seen, transitions make use of the same basic animation classes introduced above. -In the above example we have specified that we want to animate the \c x and \c y properties, but have not -specified the objects to animate or the \c to values. By default these values are supplied by the framework; -the animation will animate any \c targets whose \c x and \c y have changed, and the \c to values will be those -defined in the end state. You can always supply explicit values to override these implicit values when needed. +\section2 Property Animation Elements -\snippet doc/src/snippets/declarative/animation.qml transitions-2 +PropertyAnimation is the most basic animation element for animating a property. +It can be used to animate \c real, \c int, \c color, \c rect, \c point, \c size, and +\c vector3d properties. It is inherited by NumberAnimation, ColorAnimation, +RotationAnimation and Vector3dAnimation: NumberAnimation provides a more +efficient implementation for animating \c real and \c int properties, and +Vector3dAnimation does the same for \c vector3d properties. ColorAnimation +and RotationAnimation provide more specific attributes for animating color +and rotation changes. -QML transitions have selectors to determine which state changes a transition should apply to. -The following transition will only be triggered when we enter into the \c "details" state. -(The "*" value is a wildcard value that specifies the transition should be applied when changing -from \e any state to the "details" state.) +A ColorAnimation allows color values for the \l {ColorAnimation::}{from} +and \l {ColorAnimation::}{to} properties. The +following animates the rectangle's \l {Rectangle::color} property: -\code -Transition { - from: "*" - to: "details" - ... -} -\endcode +\snippet doc/src/snippets/declarative/animation-elements.qml color -Transitions can happen in parallel, in sequence, or in any combination of the two. By default, the top-level -animations in a transition will happen in parallel. The following example shows a rather complex transition -making use of both sequential and parallel animations: +RotationAnimation allows a rotation's direction to be specified. The following +animates the rectangle's \l {Item::rotation} property: -\snippet doc/src/snippets/declarative/animation.qml transitions-3 +\snippet doc/src/snippets/declarative/animation-elements.qml rotation +In addition, the following specialized animation elements are available: -See \l {declarative/animation/states}{States and Transitions example} for a simple example of how transitions can be applied. +\list +\o SmoothedAnimation: a specialized NumberAnimation that provides smooth +changes in animation when the target value changes +\o SpringAnimation: provides a spring-like animation with specialized +attributes such as \l {SpringAnimation::}{mass}, +\l{SpringAnimation::}{damping} and \l{SpringAnimation::}{epsilon} +\o ParentAnimation: used for animating a parent change (see ParentChange) +\o AnchorAnimation: used for animating an anchor change (see AnchorChanges) +\endlist +See their respective documentation pages for more details. -\section1 Property Behaviors -A property \l {Behavior}{behavior} specifies a default animation to run whenever the property's value changes, regardless -of what caused the change. The \c enabled property can be used to force a \l Behavior -to only apply under certain circumstances. +\section3 Easing + +Any PropertyAnimation-based animations can specify \l +{PropertyAnimation::easing.type}{easing attributes} to control the +easing curve applied when a property value is animated. These control the +effect of the animation on the property value, to provide visual effects like +bounce, acceleration and deceleration. + +For example, this modified version of an \l {Animations as Property Value +Sources}{earlier example} uses \c Easing.OutBounce to create a bouncing effect +when the animation reaches its target value: + +\snippet doc/src/snippets/declarative/animation-easing.qml 0 + +The \l{declarative/animation/easing}{easing example} visually demonstrates each +of the different easing types. + +\section2 Grouping Animations + +Multiple animations can be combined into a single animation using one of the +animation group elements: ParallelAnimation or SequentialAnimation. As their +names suggest, animations in a ParallelAnimation are run at the same time, +while animations in a SequentialAnimation are run one after the other. + +To run multiple animations, define the animations within an animation group. +The following example creates a SequentialAnimation that runs three animations +one after the other: a NumberAnimation, a PauseAnimation and another +NumberAnimation. The SequentialAnimation is applied as a \l{Animations as +Property Value Sources}{property value source animation} on the image's \c y +property, so that the animation starts as soon as the image is loaded, moving +the image up and down: + +\snippet doc/src/snippets/declarative/animation-groups.qml 0 +\image propanim.gif + +Since the SequentialAnimation is applied to the \c y property, the individual +animations within the group are automatically applied to the \c y property as +well; it is not required to set their \l{PropertyAnimation::}{properties} +values to a particular property. -In the following snippet, we specify that we want the \c x position of \c redRect to be animated -whenever it changes. The animation will last 300 milliseconds and use an \l{PropertyAnimation::easing.type}{Easing.InOutQuad} easing curve. +Animation groups can be nested. Here is a rather complex animation making use +of both sequential and parallel animations: -\snippet doc/src/snippets/declarative/animation.qml behavior +\snippet doc/src/snippets/declarative/animation-groups.qml 1 -Like using an animation as a value source, when used in a \l Behavior and animation does not need to specify -a \c target or \c property. +Once individual animations are placed into a SequentialAnimation or +ParallelAnimation, they can no longer be started and stopped independently. The +sequential or parallel animation must be started and stopped as a group. -To trigger this behavior, we could enter a state that changes \c x: +See the \l {declarative/animation/basics}{Animation basics example} for a +demonstration of creating and combining multiple animations in QML. -\qml -State { - name: "myState" - PropertyChanges { - target: redRect - x: 200 - ... - } -} -\endqml -Or, update \c x from a script: -\qml -MouseArea { - .... - onClicked: redRect.x = 24; -} -\endqml +\section2 Other Animation Elements -If \c x were bound to another property, triggering the binding would also trigger the behavior. +In addition, QML provides several other elements useful for animation: -If a state change has a transition animation matching a property with a \l Behavior, the transition animation -will override the \l Behavior for that state change. +\list +\o PauseAnimation: enables pauses during animations +\o ScriptAction: allows JavaScript to be executed during an animation, and can +be used together with StateChangeScript to reused existing scripts +\o PropertyAction: changes a property \e immediately during an animation, +without animating the property change +\endlist -The \l {declarative/animation/behaviors}{Behaviors example} shows how behaviors can be used to provide animations. +See their respective documentation pages for more details. */ diff --git a/doc/src/snippets/declarative/animation-behavioral.qml b/doc/src/snippets/declarative/animation-behavioral.qml new file mode 100644 index 0000000..dc79018 --- /dev/null +++ b/doc/src/snippets/declarative/animation-behavioral.qml @@ -0,0 +1,61 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ +//![0] +import Qt 4.7 + +Item { + width: 100; height: 100 + + Rectangle { + id: rect + width: 100; height: 100 + color: "red" + + Behavior on x { PropertyAnimation { duration: 500 } } + Behavior on y { PropertyAnimation { duration: 500 } } + } + + MouseArea { + anchors.fill: parent + onClicked: { rect.x = mouse.x; rect.y = mouse.y } + } +} +//![0] + diff --git a/doc/src/snippets/declarative/animation-easing.qml b/doc/src/snippets/declarative/animation-easing.qml new file mode 100644 index 0000000..e65c470 --- /dev/null +++ b/doc/src/snippets/declarative/animation-easing.qml @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ +//![0] +import Qt 4.7 + +Rectangle { + width: 100; height: 100 + color: "red" + + PropertyAnimation on x { to: 50; duration: 1000; easing.type: Easing.OutBounce } + PropertyAnimation on y { to: 50; duration: 1000; easing.type: Easing.OutBounce } +} +//![0] + diff --git a/doc/src/snippets/declarative/animation-elements.qml b/doc/src/snippets/declarative/animation-elements.qml new file mode 100644 index 0000000..7cb253e --- /dev/null +++ b/doc/src/snippets/declarative/animation-elements.qml @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ +//![0] +import Qt 4.7 + +Row { + +//![color] +Rectangle { + width: 100; height: 100 + + ColorAnimation on color { from: "red"; to: "yellow"; duration: 1000 } +} +//![color] + +//![rotation] +Item { + width: 300; height: 300 + + Rectangle { + width: 100; height: 100; anchors.centerIn: parent + color: "red" + + RotationAnimation on rotation { to: 90; direction: RotationAnimation.Clockwise } + } +} +//![rotation] + +} diff --git a/doc/src/snippets/declarative/animation-groups.qml b/doc/src/snippets/declarative/animation-groups.qml new file mode 100644 index 0000000..8a8f925 --- /dev/null +++ b/doc/src/snippets/declarative/animation-groups.qml @@ -0,0 +1,104 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ +import Qt 4.7 + +Row { + +//![0] +Rectangle { + id: rect + width: 120; height: 200 + + Image { + id: img + source: "pics/qt.png" + anchors.horizontalCenter: parent.horizontalCenter + y: 0 + + SequentialAnimation on y { + loops: Animation.Infinite + NumberAnimation { to: rect.height - img.height; easing.type: Easing.OutBounce; duration: 2000 } + PauseAnimation { duration: 1000 } + NumberAnimation { to: 0; easing.type: Easing.OutQuad; duration: 1000 } + } + } +} +//![0] + +//![1] +Rectangle { + id: redRect + width: 100; height: 100 + color: "red" + + MouseArea { id: mouseArea; anchors.fill: parent } + + states: State { + name: "pressed"; when: mouseArea.pressed + PropertyChanges { target: redRect; color: "blue"; y: mouseArea.mouseY; width: mouseArea.mouseX } + } + + transitions: Transition { + + SequentialAnimation { + ColorAnimation { duration: 200 } + PauseAnimation { duration: 100 } + + ParallelAnimation { + NumberAnimation { + duration: 500 + easing.type: Easing.OutBounce + targets: redRect + properties: "y" + } + + NumberAnimation { + duration: 800 + easing.type: Easing.InOutQuad + targets: redRect + properties: "width" + } + } + } + } +} +//![1] + +} diff --git a/doc/src/snippets/declarative/animation-propertyvaluesource.qml b/doc/src/snippets/declarative/animation-propertyvaluesource.qml new file mode 100644 index 0000000..ac5f071 --- /dev/null +++ b/doc/src/snippets/declarative/animation-propertyvaluesource.qml @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ +//![0] +import Qt 4.7 + +Rectangle { + width: 100; height: 100 + color: "red" + + PropertyAnimation on x { to: 50; duration: 1000; loops: Animation.Infinite } + PropertyAnimation on y { to: 50; duration: 1000; loops: Animation.Infinite } +} +//![0] + diff --git a/doc/src/snippets/declarative/animation-signalhandler.qml b/doc/src/snippets/declarative/animation-signalhandler.qml new file mode 100644 index 0000000..749596c --- /dev/null +++ b/doc/src/snippets/declarative/animation-signalhandler.qml @@ -0,0 +1,55 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ +//![0] +import Qt 4.7 + +Rectangle { + id: rect + width: 100; height: 100 + color: "red" + + MouseArea { + anchors.fill: parent + onClicked: PropertyAnimation { target: rect; properties: "x,y"; to: 50; duration: 1000 } + } +} + +//![0] + diff --git a/doc/src/snippets/declarative/animation-standalone.qml b/doc/src/snippets/declarative/animation-standalone.qml new file mode 100644 index 0000000..d75fd92 --- /dev/null +++ b/doc/src/snippets/declarative/animation-standalone.qml @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ +//![0] +import Qt 4.7 + +Rectangle { + id: rect + width: 100; height: 100 + color: "red" + + PropertyAnimation { + id: animation + target: rect + properties: "x,y" + duration: 1000 + } + + MouseArea { + anchors.fill: parent + onClicked: { + animation.to = 50; + animation.running = true; + } + } +} +//![0] diff --git a/doc/src/snippets/declarative/animation-transitions.qml b/doc/src/snippets/declarative/animation-transitions.qml new file mode 100644 index 0000000..3265065 --- /dev/null +++ b/doc/src/snippets/declarative/animation-transitions.qml @@ -0,0 +1,62 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ +//![0] +import Qt 4.7 + +Rectangle { + id: rect + width: 100; height: 100 + color: "red" + + MouseArea { + anchors.fill: parent + onClicked: rect.state = "moved" + } + + states: State { + name: "moved" + PropertyChanges { target: rect; x: 50; y: 50 } + } + + transitions: Transition { + PropertyAnimation { properties: "x,y"; duration: 1000 } + } +} +//![0] diff --git a/doc/src/snippets/declarative/animation.qml b/doc/src/snippets/declarative/animation.qml deleted file mode 100644 index 65acd36..0000000 --- a/doc/src/snippets/declarative/animation.qml +++ /dev/null @@ -1,181 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import Qt 4.7 - -Row { - -//![property-anim-1] -Rectangle { - id: rect - width: 120; height: 200 - - Image { - id: img - source: "pics/qt.png" - x: 60 - img.width/2 - y: 0 - - SequentialAnimation on y { - loops: Animation.Infinite - NumberAnimation { to: 200 - img.height; easing.type: Easing.OutBounce; duration: 2000 } - PauseAnimation { duration: 1000 } - NumberAnimation { to: 0; easing.type: Easing.OutQuad; duration: 1000 } - } - } -} -//![property-anim-1] - -//![property-anim-2] -Rectangle { - width: 200; height: 200 - - Rectangle { - color: "red" - width: 50; height: 50 - NumberAnimation on x { to: 50 } - } -} -//![property-anim-2] - - -Item { -//![property-anim-3] -PropertyAnimation { - id: animation - target: image - property: "scale" - from: 1; to: 0.5 -} - -Image { - id: image - source: "pics/qt.png" - MouseArea { - anchors.fill: parent - onPressed: animation.start() - } -} -//![property-anim-3] -} - - -//![transitions-1] -transitions: [ - Transition { - NumberAnimation { - properties: "x,y" - easing.type: Easing.OutBounce - duration: 200 - } - } -] -//![transitions-1] - - -//![transitions-2] -Transition { - from: "*" - to: "MyState" - reversible: true - - SequentialAnimation { - NumberAnimation { - duration: 1000 - easing.type: Easing.OutBounce - - // animate myItem's x and y if they have changed in the state - target: myItem - properties: "x,y" - } - - NumberAnimation { - duration: 1000 - - // animate myItem2's y to 200, regardless of what happens in the state - target: myItem2 - property: "y" - to: 200 - } - } -} -//![transitions-2] - - -//![transitions-3] -Transition { - from: "*" - to: "MyState" - reversible: true - - SequentialAnimation { - ColorAnimation { duration: 1000 } - PauseAnimation { duration: 1000 } - - ParallelAnimation { - NumberAnimation { - duration: 1000 - easing.type: Easing.OutBounce - targets: box1 - properties: "x,y" - } - NumberAnimation { - duration: 1000 - targets: box2 - properties: "x,y" - } - } - } -} -//![transitions-3] - -//![behavior] -Rectangle { - id: redRect - color: "red" - width: 100; height: 100 - - Behavior on x { - NumberAnimation { duration: 300; easing.type: Easing.InOutQuad } - } -} -//![behavior] - -} diff --git a/doc/src/snippets/declarative/transition.qml b/doc/src/snippets/declarative/transition.qml index b884750..098d509 100644 --- a/doc/src/snippets/declarative/transition.qml +++ b/doc/src/snippets/declarative/transition.qml @@ -46,13 +46,18 @@ Rectangle { width: 100; height: 100 color: "red" + MouseArea { + id: mouseArea + anchors.fill: parent + } + states: State { - name: "moved" + name: "moved"; when: mouseArea.pressed PropertyChanges { target: rect; x: 50; y: 50 } } transitions: Transition { - PropertyAnimation { properties: "x,y"; easing.type: Easing.InOutQuad } + NumberAnimation { properties: "x,y"; easing.type: Easing.InOutQuad } } } //![0] diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index 6a9cf95..b901bb3 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -645,12 +645,13 @@ QAbstractAnimation *QDeclarativePauseAnimation::qtAnimation() Like any other animation element, a ColorAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l PropertyAnimation documentation shows a variety of methods + sources. The \l {QML Animation} documentation shows a variety of methods for creating animations. - When used in a transition, ColorAnimation will by default animate - all properties of type color that have changed. If a \l{PropertyAnimation::}{property} - or \l{PropertyAnimation::}{properties} are explicitly set for the animation, + For convenience, when a ColorAnimation is used in a \l Transition, it will + animate any \c color properties that have been modified during the state + change. If a \l{PropertyAnimation::}{property} or + \l{PropertyAnimation::}{properties} are explicitly set for the animation, then those are used instead. \sa {QML Animation}, {declarative/animation/basics}{Animation basics example} @@ -1143,7 +1144,7 @@ void QDeclarativePropertyAction::transition(QDeclarativeStateActions &actions, Like any other animation element, a NumberAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l PropertyAnimation documentation shows a variety of methods + sources. The \l {QML Animation} documentation shows a variety of methods for creating animations. Note that NumberAnimation may not animate smoothly if there are irregular @@ -1244,6 +1245,11 @@ void QDeclarativeNumberAnimation::setTo(qreal t) Vector3dAnimation is a specialized PropertyAnimation that defines an animation to be applied when a Vector3d value changes. + Like any other animation element, a Vector3dAnimation can be applied in a + number of ways, including transitions, behaviors and property value + sources. The \l {QML Animation} documentation shows a variety of methods + for creating animations. + \sa {QML Animation}, {declarative/animation/basics}{Animation basics example} */ @@ -1323,7 +1329,7 @@ void QDeclarativeVector3dAnimation::setTo(QVector3D t) \snippet doc/src/snippets/declarative/rotationanimation.qml 0 - Notice the RotationAnimation did not need to set a \l {RotationAnimation::}{target} + Notice the RotationAnimation did not need to set a \l {PropertyAnimation::}{target} value. As a convenience, when used in a transition, RotationAnimation will rotate all properties named "rotation" or "angle". You can override this by providing your own properties via \l {PropertyAnimation::properties}{properties} or @@ -1331,7 +1337,7 @@ void QDeclarativeVector3dAnimation::setTo(QVector3D t) Like any other animation element, a RotationAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l PropertyAnimation documentation shows a variety of methods + sources. The \l {QML Animation} documentation shows a variety of methods for creating animations. \sa {QML Animation}, {declarative/animation/basics}{Animation basics example} @@ -1554,7 +1560,7 @@ QDeclarativeListProperty QDeclarativeAnimationGro Like any other animation element, a SequentialAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l PropertyAnimation documentation shows a variety of methods + sources. The \l {QML Animation} documentation shows a variety of methods for creating animations. \note Once an animation has been grouped into a SequentialAnimation or @@ -1623,7 +1629,7 @@ void QDeclarativeSequentialAnimation::transition(QDeclarativeStateActions &actio Like any other animation element, a ParallelAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l PropertyAnimation documentation shows a variety of methods + sources. The \l {QML Animation} documentation shows a variety of methods for creating animations. \note Once an animation has been grouped into a SequentialAnimation or @@ -2396,8 +2402,7 @@ void QDeclarativePropertyAnimation::transition(QDeclarativeStateActions &actions \inherits Animation \brief The ParentAnimation element animates changes in parent values. - ParentAnimation defines an animation to applied when a ParentChange - occurs. This allows parent changes to be smoothly animated. + ParentAnimation is used to animate a parent change for an \l Item. For example, the following ParentChange changes \c blueRect to become a child of \c redRect when it is clicked. The inclusion of the @@ -2415,10 +2420,16 @@ void QDeclarativePropertyAnimation::transition(QDeclarativeStateActions &actions to animate the parent change via another item that does not have clipping enabled. Such an item can be set using the \l via property. - By default, when used in a transition, ParentAnimation animates all parent - changes. This can be overridden by setting a specific target item using the + For convenience, when a ParentAnimation is used in a \l Transition, it will + animate any ParentChange that has occurred during the state change. + This can be overridden by setting a specific target item using the \l target property. + Like any other animation element, a ParentAnimation can be applied in a + number of ways, including transitions, behaviors and property value + sources. The \l {QML Animation} documentation shows a variety of methods + for creating animations. + \sa {QML Animation}, {declarative/animation/basics}{Animation basics example} */ @@ -2750,14 +2761,23 @@ QAbstractAnimation *QDeclarativeParentAnimation::qtAnimation() \inherits Animation \brief The AnchorAnimation element animates changes in anchor values. - AnchorAnimation is used to animate an AnchorChange. It will anchor all - anchor changes specified in a \l State. + AnchorAnimation is used to animate an anchor change. In the following snippet we animate the addition of a right anchor to a \l Rectangle: \snippet doc/src/snippets/declarative/anchoranimation.qml 0 - \sa AnchorChanges + For convenience, when an AnchorAnimation is used in a \l Transition, it will + animate any AnchorChanges that have occurred during the state change. + This can be overridden by setting a specific target item using the + \l target property. + + Like any other animation element, an AnchorAnimation can be applied in a + number of ways, including transitions, behaviors and property value + sources. The \l {QML Animation} documentation shows a variety of methods + for creating animations. + + \sa {QML Animation}, AnchorChanges */ QDeclarativeAnchorAnimation::QDeclarativeAnchorAnimation(QObject *parent) diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp index fadb2ae..1e7f81a 100644 --- a/src/declarative/util/qdeclarativebehavior.cpp +++ b/src/declarative/util/qdeclarativebehavior.cpp @@ -84,12 +84,15 @@ public: \snippet doc/src/snippets/declarative/behavior.qml 0 - To run multiple animations within a Behavior, use ParallelAnimation or + Note that a property cannot have more than one assigned Behavior. To provide + multiple animations within a Behavior, use ParallelAnimation or SequentialAnimation. - Note that a property cannot have more than one assigned Behavior. + If a \l{QML States}{state change} has a \l Transition that matches the same property as a + Behavior, the \l Transition animation overrides the Behavior for that + state change. - \sa {Property Behaviors}, {declarative/animation/behaviors}{Behavior example}, QtDeclarative + \sa {QML Animation}, {declarative/animation/behaviors}{Behavior example}, QtDeclarative */ diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp index 727f427..30e1491 100644 --- a/src/declarative/util/qdeclarativesmoothedanimation.cpp +++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp @@ -287,7 +287,7 @@ void QSmoothedAnimation::init() Like any other animation element, a SmoothedAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l PropertyAnimation documentation shows a variety of methods + sources. The \l {QML Animation} documentation shows a variety of methods for creating animations. \sa SpringAnimation, NumberAnimation, {QML Animation}, {declarative/animation/basics}{Animation basics example} diff --git a/src/declarative/util/qdeclarativespringanimation.cpp b/src/declarative/util/qdeclarativespringanimation.cpp index cfc7b8e..6f4ac51 100644 --- a/src/declarative/util/qdeclarativespringanimation.cpp +++ b/src/declarative/util/qdeclarativespringanimation.cpp @@ -228,6 +228,7 @@ void QDeclarativeSpringAnimationPrivate::updateMode() /*! \qmlclass SpringAnimation QDeclarativeSpringAnimation + \inherits Animation \since 4.7 \brief The SpringAnimation element allows a property to track a value in a spring-like motion. @@ -246,7 +247,7 @@ void QDeclarativeSpringAnimationPrivate::updateMode() Like any other animation element, a SpringAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l PropertyAnimation documentation shows a variety of methods + sources. The \l {QML Animation} documentation shows a variety of methods for creating animations. \sa SmoothedAnimation, {QML Animation}, {declarative/animation/basics}{Animation basics example}, {declarative/toys/clocks}{Clocks example} diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index 0d43d21..7a78a2b 100644 --- a/src/declarative/util/qdeclarativestate.cpp +++ b/src/declarative/util/qdeclarativestate.cpp @@ -154,7 +154,7 @@ QDeclarativeStateOperation::QDeclarativeStateOperation(QObjectPrivate &dd, QObje Notice the default state is referred to using an empty string (""). - States are commonly used together with \l {state-transitions}{Transitions} to provide + States are commonly used together with \l {Transitions} to provide animations when state changes occur. \note Setting the state of an object from within another state of the same object is diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp index 67cd12e..1c1e964 100644 --- a/src/declarative/util/qdeclarativestategroup.cpp +++ b/src/declarative/util/qdeclarativestategroup.cpp @@ -112,7 +112,7 @@ public: } \endqml - \sa {qmlstate}{States} {state-transitions}{Transitions}, {QtDeclarative} + \sa {qmlstate}{States} {Transitions}, {QtDeclarative} */ QDeclarativeStateGroup::QDeclarativeStateGroup(QObject *parent) @@ -204,7 +204,7 @@ void QDeclarativeStateGroupPrivate::clear_states(QDeclarativeListProperty QDeclarativeStateGroup::transitionsProperty() { diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp index 582191b..7042d0c 100644 --- a/src/declarative/util/qdeclarativetransition.cpp +++ b/src/declarative/util/qdeclarativetransition.cpp @@ -60,12 +60,25 @@ QT_BEGIN_NAMESPACE For example, the following \l Rectangle has two states: the default state, and an added "moved" state. In the "moved state, the rectangle's position changes - to (50, 50). The added \l Transition specifies that when the rectangle + to (50, 50). The added Transition specifies that when the rectangle changes between the default and the "moved" state, any changes to the \c x and \c y properties should be animated, using an \c Easing.InOutQuad. \snippet doc/src/snippets/declarative/transition.qml 0 + Notice the example does not require \l{PropertyAnimation::}{to} and + \l{PropertyAnimation::}{from} values for the NumberAnimation. As a convenience, + these properties are automatically set to the values of \c x and \c y before + and after the state change; the \c from values are provided by + the current values of \c x and \c y, and the \c to values are provided by + the PropertyChanges object. If you wish, you can provide \l{PropertyAnimation::}{to} and + \l{PropertyAnimation::}{from} values anyway to override the default values. + + By default, a Transition's animations are applied for any state change in the + parent item. The Transition \l {Transition::}{from} and \l {Transition::}{to} + values can be set to restrict the animations to only be applied when changing + from one particular state to another. + To define multiple transitions, specify \l Item::transitions as a list: \qml @@ -78,7 +91,11 @@ QT_BEGIN_NAMESPACE } \endqml - \sa {declarative/animation/states}{states example}, {qmlstates}{States}, {state-transitions}{Transitions}, {QtDeclarative} + If a state change has a Transition that matches the same property as a + \l Behavior, the Transition animation overrides the \l Behavior for that + state change. + + \sa {QML Animation}, {declarative/animation/states}{states example}, {qmlstates}{States}, {QtDeclarative} */ /*! -- cgit v0.12 From dc2f700a006d827db0eaf8d1e01e4d9c7c8c0baa Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Thu, 5 Aug 2010 16:27:56 +1000 Subject: Rename example component file for clarity Task-number: QTBUG-12633 --- .../keyinteraction/focus/Core/ContextMenu.qml | 7 ++ .../keyinteraction/focus/Core/GridMenu.qml | 7 +- .../keyinteraction/focus/Core/ListMenu.qml | 105 +++++++++++++++++++++ .../keyinteraction/focus/Core/ListViews.qml | 102 -------------------- .../declarative/keyinteraction/focus/focus.qml | 11 ++- 5 files changed, 123 insertions(+), 109 deletions(-) create mode 100644 examples/declarative/keyinteraction/focus/Core/ListMenu.qml delete mode 100644 examples/declarative/keyinteraction/focus/Core/ListViews.qml diff --git a/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml b/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml index 15e77de..ba49d14 100644 --- a/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml +++ b/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml @@ -53,6 +53,13 @@ FocusScope { color: "#D1DBBD" focus: true Keys.onRightPressed: mainView.focus = true + + Text { + anchors { top: parent.top; horizontalCenter: parent.horizontalCenter; margins: 30 } + color: "black" + font.pixelSize: 14 + text: "Context Menu" + } } } } diff --git a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml b/examples/declarative/keyinteraction/focus/Core/GridMenu.qml index 19f7235..88840cb 100644 --- a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml +++ b/examples/declarative/keyinteraction/focus/Core/GridMenu.qml @@ -43,7 +43,10 @@ import Qt 4.7 FocusScope { property alias interactive: gridView.interactive - onActiveFocusChanged: if (activeFocus) mainView.state = "" + onActiveFocusChanged: { + if (activeFocus) + mainView.state = "" + } Rectangle { anchors.fill: parent @@ -60,7 +63,7 @@ FocusScope { focus: true model: 12 - KeyNavigation.down: listViews + KeyNavigation.down: listMenu KeyNavigation.left: contextMenu delegate: Item { diff --git a/examples/declarative/keyinteraction/focus/Core/ListMenu.qml b/examples/declarative/keyinteraction/focus/Core/ListMenu.qml new file mode 100644 index 0000000..6100b32 --- /dev/null +++ b/examples/declarative/keyinteraction/focus/Core/ListMenu.qml @@ -0,0 +1,105 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +FocusScope { + clip: true + + onActiveFocusChanged: { + if (activeFocus) + mainView.state = "showListViews" + } + + ListView { + id: list1 + y: activeFocus ? 10 : 40; width: parent.width / 3; height: parent.height - 20 + focus: true + KeyNavigation.up: gridMenu; KeyNavigation.left: contextMenu; KeyNavigation.right: list2 + model: 10; cacheBuffer: 200 + delegate: ListViewDelegate {} + + Behavior on y { + NumberAnimation { duration: 600; easing.type: Easing.OutQuint } + } + } + + ListView { + id: list2 + y: activeFocus ? 10 : 40; x: parseInt(parent.width / 3); width: parent.width / 3; height: parent.height - 20 + KeyNavigation.up: gridMenu; KeyNavigation.left: list1; KeyNavigation.right: list3 + model: 10; cacheBuffer: 200 + delegate: ListViewDelegate {} + + Behavior on y { + NumberAnimation { duration: 600; easing.type: Easing.OutQuint } + } + } + + ListView { + id: list3 + y: activeFocus ? 10 : 40; x: parseInt(2 * parent.width / 3); width: parent.width / 3; height: parent.height - 20 + KeyNavigation.up: gridMenu; KeyNavigation.left: list2 + model: 10; cacheBuffer: 200 + delegate: ListViewDelegate {} + + Behavior on y { + NumberAnimation { duration: 600; easing.type: Easing.OutQuint } + } + } + + Rectangle { width: parent.width; height: 1; color: "#D1DBBD" } + + Rectangle { + y: 1; width: parent.width; height: 10 + gradient: Gradient { + GradientStop { position: 0.0; color: "#3E606F" } + GradientStop { position: 1.0; color: "transparent" } + } + } + + Rectangle { + y: parent.height - 10; width: parent.width; height: 10 + gradient: Gradient { + GradientStop { position: 1.0; color: "#3E606F" } + GradientStop { position: 0.0; color: "transparent" } + } + } +} diff --git a/examples/declarative/keyinteraction/focus/Core/ListViews.qml b/examples/declarative/keyinteraction/focus/Core/ListViews.qml deleted file mode 100644 index 3d6ceab..0000000 --- a/examples/declarative/keyinteraction/focus/Core/ListViews.qml +++ /dev/null @@ -1,102 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt 4.7 - -FocusScope { - clip: true - - onActiveFocusChanged: if (activeFocus) mainView.state = "showListViews" - - ListView { - id: list1 - y: activeFocus ? 10 : 40; width: parent.width / 3; height: parent.height - 20 - focus: true - KeyNavigation.up: gridMenu; KeyNavigation.left: contextMenu; KeyNavigation.right: list2 - model: 10; cacheBuffer: 200 - delegate: ListViewDelegate {} - - Behavior on y { - NumberAnimation { duration: 600; easing.type: Easing.OutQuint } - } - } - - ListView { - id: list2 - y: activeFocus ? 10 : 40; x: parseInt(parent.width / 3); width: parent.width / 3; height: parent.height - 20 - KeyNavigation.up: gridMenu; KeyNavigation.left: list1; KeyNavigation.right: list3 - model: 10; cacheBuffer: 200 - delegate: ListViewDelegate {} - - Behavior on y { - NumberAnimation { duration: 600; easing.type: Easing.OutQuint } - } - } - - ListView { - id: list3 - y: activeFocus ? 10 : 40; x: parseInt(2 * parent.width / 3); width: parent.width / 3; height: parent.height - 20 - KeyNavigation.up: gridMenu; KeyNavigation.left: list2 - model: 10; cacheBuffer: 200 - delegate: ListViewDelegate {} - - Behavior on y { - NumberAnimation { duration: 600; easing.type: Easing.OutQuint } - } - } - - Rectangle { width: parent.width; height: 1; color: "#D1DBBD" } - - Rectangle { - y: 1; width: parent.width; height: 10 - gradient: Gradient { - GradientStop { position: 0.0; color: "#3E606F" } - GradientStop { position: 1.0; color: "transparent" } - } - } - - Rectangle { - y: parent.height - 10; width: parent.width; height: 10 - gradient: Gradient { - GradientStop { position: 1.0; color: "#3E606F" } - GradientStop { position: 0.0; color: "transparent" } - } - } -} diff --git a/examples/declarative/keyinteraction/focus/focus.qml b/examples/declarative/keyinteraction/focus/focus.qml index 56fdffc..9463192 100644 --- a/examples/declarative/keyinteraction/focus/focus.qml +++ b/examples/declarative/keyinteraction/focus/focus.qml @@ -55,27 +55,28 @@ Rectangle { GridMenu { id: gridMenu - width: parent.width; height: 320 + focus: true interactive: parent.activeFocus } - ListViews { - id: listViews + ListMenu { + id: listMenu y: 320; width: parent.width; height: 320 } Rectangle { id: shade anchors.fill: parent - color: "black"; opacity: 0 + color: "black" + opacity: 0 } states: State { name: "showListViews" PropertyChanges { target: gridMenu; y: -160 } - PropertyChanges { target: listViews; y: 160 } + PropertyChanges { target: listMenu; y: 160 } } transitions: Transition { -- cgit v0.12 From 6d290ae51ee928aecb87be57326504aab8d7f177 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Thu, 5 Aug 2010 08:52:33 +0200 Subject: Doc: nesting up orphant pages --- doc/src/overviews.qdoc | 1 + doc/src/widgets-and-layouts/widgets.qdoc | 1 + doc/src/windows-and-dialogs/dialogs.qdoc | 2 ++ 3 files changed, 4 insertions(+) diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index a1773a3..b72df98 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -29,6 +29,7 @@ \page overviews.html \title All Overviews and HOWTOs + \ingroup qt-basic-concepts \generatelist overviews */ diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc index 18b8be1..f2475c2 100644 --- a/doc/src/widgets-and-layouts/widgets.qdoc +++ b/doc/src/widgets-and-layouts/widgets.qdoc @@ -29,6 +29,7 @@ \page widgets-and-layouts.html \title Widgets and Layouts \ingroup qt-gui-concepts + \ingroup qt-basic-concepts \brief The primary elements for designing user interfaces in Qt. \section1 Widgets diff --git a/doc/src/windows-and-dialogs/dialogs.qdoc b/doc/src/windows-and-dialogs/dialogs.qdoc index 6316dc9..74df2aa 100644 --- a/doc/src/windows-and-dialogs/dialogs.qdoc +++ b/doc/src/windows-and-dialogs/dialogs.qdoc @@ -27,11 +27,13 @@ /*! \group standard-dialogs + \ingroup qt-basic-concepts \title Standard Dialog Classes */ /*! \group dialog-classes + \ingroup qt-basic-concepts \title Classes for Building Dialogs */ -- cgit v0.12 From d524da81ee257a6bd67d32d0bc870280a7d5b8a4 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 5 Aug 2010 17:43:52 +1000 Subject: Fix link error when building Bearer application with Qt Mobility QtMobility uses the Qt header when compiling applications which link against Mobility's Bearer library. Therefore QNetworkConfiguration::bearerName() cannot be inline and refer to the new QNetworkConfiguration::bearerTypeName() function (which doesn't exist in Mobility) Task-number: QTBUG-12378 Reviewed-by: Rohan McGovern --- src/network/bearer/qnetworkconfiguration.cpp | 7 +++++++ src/network/bearer/qnetworkconfiguration.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp index 3190a30..60851ac 100644 --- a/src/network/bearer/qnetworkconfiguration.cpp +++ b/src/network/bearer/qnetworkconfiguration.cpp @@ -406,6 +406,13 @@ QList QNetworkConfiguration::children() const This function is deprecated. It is equivalent to calling bearerTypeName(), however bearerType() should be used in preference. */ +QString QNetworkConfiguration::bearerName() const +{ + // This function cannot be inline as it would break Qt Mobility. + // Qt Mobility uses the Qt header as well and since the Mobility Bearer library + // does not provide bearerTypeName() we cannot use an inline function. + return bearerTypeName(); +} /*! Returns the type of bearer used by this network configuration. diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h index d9d36fd..e4f762a 100644 --- a/src/network/bearer/qnetworkconfiguration.h +++ b/src/network/bearer/qnetworkconfiguration.h @@ -120,7 +120,7 @@ public: Purpose purpose() const; // Required to maintain source compatibility with Qt Mobility. - QT_DEPRECATED inline QString bearerName() const { return bearerTypeName(); } + QT_DEPRECATED QString bearerName() const; BearerType bearerType() const; QString bearerTypeName() const; -- cgit v0.12 From a6937c7d8d2253c0f230254eaa2b9c8042972b30 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Thu, 5 Aug 2010 10:00:24 +0200 Subject: Doc: Adding text to GS page --- doc/src/getting-started/gettingstarted.qdoc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc index 145982b..e58305a 100644 --- a/doc/src/getting-started/gettingstarted.qdoc +++ b/doc/src/getting-started/gettingstarted.qdoc @@ -30,7 +30,13 @@ \group gettingStarted - Following is a list. + \section1 + Creating applications using Qt and QML is easy enough once you get started. + To get you started we have created two tutorials creating two similar applications, + but using diiferent approaches. One tutorial implements the user interface using + QML, while the other implements the whole application using traditional Qt. + + Please click on the links below to start the ride. \generatelist{related} */ -- cgit v0.12 From 9423ef31eb40e2bd0209621de1d1caf796ec7501 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 5 Aug 2010 11:24:10 +0200 Subject: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( bbff6182e525fcf58dbc7426a1fbbf8f31588214 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-08-05 David Leong Reviewed by Simon Hausmann. [Qt] Input mode states are not reset after entering a password field https://bugs.webkit.org/show_bug.cgi?id=43530 Input mode hints are not reset if clicking on password elements then clicking on
+ diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp index facee59..14f2362 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp @@ -251,30 +251,37 @@ void tst_QWebView::focusInputTypes() #else QVERIFY(webView->inputMethodHints() == Qt::ImhNone); #endif + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'password' field webView->fireMouseClick(QPoint(20, 60)); QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'tel' field webView->fireMouseClick(QPoint(20, 110)); QVERIFY(webView->inputMethodHints() == Qt::ImhDialableCharactersOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'number' field webView->fireMouseClick(QPoint(20, 160)); QVERIFY(webView->inputMethodHints() == Qt::ImhDigitsOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'email' field webView->fireMouseClick(QPoint(20, 210)); QVERIFY(webView->inputMethodHints() == Qt::ImhEmailCharactersOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'url' field webView->fireMouseClick(QPoint(20, 260)); QVERIFY(webView->inputMethodHints() == Qt::ImhUrlCharactersOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'password' field webView->fireMouseClick(QPoint(20, 60)); QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'text' type webView->fireMouseClick(QPoint(20, 10)); @@ -284,6 +291,18 @@ void tst_QWebView::focusInputTypes() #else QVERIFY(webView->inputMethodHints() == Qt::ImhNone); #endif + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); + + // 'password' field + webView->fireMouseClick(QPoint(20, 60)); + QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); + + qWarning("clicking on text area"); + // 'text area' field + webView->fireMouseClick(QPoint(20, 320)); + QVERIFY(webView->inputMethodHints() == Qt::ImhNone); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); delete webView; -- cgit v0.12 From ab66b692dd2729f8b59410b65940934926e5ee04 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Thu, 5 Aug 2010 11:28:53 +0200 Subject: Doc: Editied version of QML GS --- doc/src/getting-started/gettingstartedqml.qdoc | 46 ++++++++++++-------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc index 2bfb71c..93f6f88 100644 --- a/doc/src/getting-started/gettingstartedqml.qdoc +++ b/doc/src/getting-started/gettingstartedqml.qdoc @@ -32,27 +32,30 @@ \ingroup gettingStarted Welcome to the world of QML - the declarative UI language. In this Getting - Started guide, we will create a simple text editor application using QML. - After reading this guide, you should be ready to develop your own applications - using QML and Qt C++. + Started guide, we create a simple text editor application using QML. + After reading this guide, you should be ready to start developing your own + applications using QML and Qt C++. + \example tutorials/gettingStarted/gsQml + \section1 QML to Build User Interfaces - The application we are building is a simple text editor that will load, save, - and perform some text manipulation. This guide will consist of two parts. The - first part will involve designing the application layout and behaviors using - declarative language in QML. For the second part, file loading and saving will - be implemented using Qt C++. Using - \l {The Meta-Object System}{Qt's Meta-Object System}, we can expose C++ functions - as properties that QML elements can use. Utilizing QML and Qt C++, we can - efficiently decouple the interface logic from the application logic. + Here we are building is a simple text editor that con load, save, + and perform some text manipulation. This guide consists of two parts. The + first part involves designing the application layout and behaviors using + declarative language in QML. For the second part, file loading and saving is + implemented using Qt C++. + Using \l {The Meta-Object System}{Qt's Meta-Object System}, we can expose C++ + functions as properties that QML elements can use. By utilizing QML and Qt C++, + we can efficiently decouple the interface logic from the application logic. \image qml-texteditor5_editmenu.png - To run the QML example code, merely provide the included \l{QML Viewer}{qmlviewer} + To run the QML example code, we merely provide the included \l{QML Viewer}{qmlviewer} tool with the QML file as the argument. The C++ portion of this tutorial assumes that the reader possesses basic knowledge of Qt's compilation procedures. + \omit Tutorial chapters: \list 1 \o \l {Defining a Button and a Menu}{Defining a Button and a Menu} @@ -61,6 +64,7 @@ \o \l {Decorating the Text Editor}{Decorating the Text Editor} \o \l {Extending QML using Qt C++}{Extending QML using Qt C++} \endlist + \endomit \section1 Defining a Button and a Menu @@ -104,7 +108,7 @@ is called \c simplebutton. Anchors may bind to other items' anchors, allowing layout assignments simpler. - We shall save this code as \c SimpleButton.qml. Running qmlviewer with the file as the + We save this code as \c SimpleButton.qml. Running qmlviewer with the file as the argument will display the grey rectangle with a text label. \image qml-texteditor1_simplebutton.png @@ -407,13 +411,9 @@ \image qml-texteditor2_menubar.png - */ - - /*! - \page qml-textEditor3.html - \title Building a Text Editor + \section1 Building a Text Editor - \section1 Declaring a TextArea + \section2 Declaring a TextArea Our text editor is not a text editor if it didn't contain an editable text area. QML's \l {TextEdit}{TextEdit} element allows the declaration of a multi-line @@ -497,12 +497,8 @@ \image qml-texteditor3_texteditor.png - */ - - /*! - \page qml-textEditor4 - \title Decorating the Text Editor - \section1 Implementing a Drawer Interface + \section1 Decorating the Text Editor + \section2 Implementing a Drawer Interface Our text editor looks simple and we need to decorate it. Using QML, we can declare transitions and animate our text editor. Our menu bar is occupying one-third of the -- cgit v0.12 From 2faafdeda4c715a91297b56251773b21a0cac86b Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Thu, 5 Aug 2010 11:33:24 +0200 Subject: Doc: Images for QML GS --- doc/src/images/arrow.png | Bin 0 -> 583 bytes doc/src/images/qml-texteditor1_button.png | Bin 0 -> 1670 bytes doc/src/images/qml-texteditor1_editmenu.png | Bin 0 -> 7358 bytes doc/src/images/qml-texteditor1_filemenu.png | Bin 0 -> 7078 bytes doc/src/images/qml-texteditor1_simplebutton.png | Bin 0 -> 1055 bytes doc/src/images/qml-texteditor2_menubar.png | Bin 0 -> 7975 bytes doc/src/images/qml-texteditor3_textarea.png | Bin 0 -> 10417 bytes doc/src/images/qml-texteditor3_texteditor.png | Bin 0 -> 61353 bytes doc/src/images/qml-texteditor4_texteditor.png | Bin 0 -> 75600 bytes doc/src/images/qml-texteditor5_editmenu.png | Bin 0 -> 31834 bytes doc/src/images/qml-texteditor5_filemenu.png | Bin 0 -> 21688 bytes doc/src/images/qml-texteditor5_newfile.png | Bin 0 -> 92794 bytes 12 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 doc/src/images/arrow.png create mode 100644 doc/src/images/qml-texteditor1_button.png create mode 100644 doc/src/images/qml-texteditor1_editmenu.png create mode 100644 doc/src/images/qml-texteditor1_filemenu.png create mode 100644 doc/src/images/qml-texteditor1_simplebutton.png create mode 100644 doc/src/images/qml-texteditor2_menubar.png create mode 100644 doc/src/images/qml-texteditor3_textarea.png create mode 100644 doc/src/images/qml-texteditor3_texteditor.png create mode 100644 doc/src/images/qml-texteditor4_texteditor.png create mode 100644 doc/src/images/qml-texteditor5_editmenu.png create mode 100644 doc/src/images/qml-texteditor5_filemenu.png create mode 100644 doc/src/images/qml-texteditor5_newfile.png diff --git a/doc/src/images/arrow.png b/doc/src/images/arrow.png new file mode 100644 index 0000000..14978c2 Binary files /dev/null and b/doc/src/images/arrow.png differ diff --git a/doc/src/images/qml-texteditor1_button.png b/doc/src/images/qml-texteditor1_button.png new file mode 100644 index 0000000..aab64bc Binary files /dev/null and b/doc/src/images/qml-texteditor1_button.png differ diff --git a/doc/src/images/qml-texteditor1_editmenu.png b/doc/src/images/qml-texteditor1_editmenu.png new file mode 100644 index 0000000..af8028b Binary files /dev/null and b/doc/src/images/qml-texteditor1_editmenu.png differ diff --git a/doc/src/images/qml-texteditor1_filemenu.png b/doc/src/images/qml-texteditor1_filemenu.png new file mode 100644 index 0000000..ccc008c Binary files /dev/null and b/doc/src/images/qml-texteditor1_filemenu.png differ diff --git a/doc/src/images/qml-texteditor1_simplebutton.png b/doc/src/images/qml-texteditor1_simplebutton.png new file mode 100644 index 0000000..21ce509 Binary files /dev/null and b/doc/src/images/qml-texteditor1_simplebutton.png differ diff --git a/doc/src/images/qml-texteditor2_menubar.png b/doc/src/images/qml-texteditor2_menubar.png new file mode 100644 index 0000000..691a833 Binary files /dev/null and b/doc/src/images/qml-texteditor2_menubar.png differ diff --git a/doc/src/images/qml-texteditor3_textarea.png b/doc/src/images/qml-texteditor3_textarea.png new file mode 100644 index 0000000..95abcd6 Binary files /dev/null and b/doc/src/images/qml-texteditor3_textarea.png differ diff --git a/doc/src/images/qml-texteditor3_texteditor.png b/doc/src/images/qml-texteditor3_texteditor.png new file mode 100644 index 0000000..bdf6957 Binary files /dev/null and b/doc/src/images/qml-texteditor3_texteditor.png differ diff --git a/doc/src/images/qml-texteditor4_texteditor.png b/doc/src/images/qml-texteditor4_texteditor.png new file mode 100644 index 0000000..85d216b Binary files /dev/null and b/doc/src/images/qml-texteditor4_texteditor.png differ diff --git a/doc/src/images/qml-texteditor5_editmenu.png b/doc/src/images/qml-texteditor5_editmenu.png new file mode 100644 index 0000000..7365690 Binary files /dev/null and b/doc/src/images/qml-texteditor5_editmenu.png differ diff --git a/doc/src/images/qml-texteditor5_filemenu.png b/doc/src/images/qml-texteditor5_filemenu.png new file mode 100644 index 0000000..7078022 Binary files /dev/null and b/doc/src/images/qml-texteditor5_filemenu.png differ diff --git a/doc/src/images/qml-texteditor5_newfile.png b/doc/src/images/qml-texteditor5_newfile.png new file mode 100644 index 0000000..e493941 Binary files /dev/null and b/doc/src/images/qml-texteditor5_newfile.png differ -- cgit v0.12 From f13ebf52a0d091c6c72c97d2a13311e1e7c4a5cf Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Thu, 5 Aug 2010 11:46:12 +0200 Subject: Doc: Adding GS QML example files --- .../tutorials/gettingStarted/gsQml/TextEditor.qml | 129 ++++++++++++ .../tutorials/gettingStarted/gsQml/core/Button.qml | 110 ++++++++++ .../gettingStarted/gsQml/core/EditMenu.qml | 111 ++++++++++ .../gettingStarted/gsQml/core/FileDialog.qml | 170 +++++++++++++++ .../gettingStarted/gsQml/core/FileMenu.qml | 232 +++++++++++++++++++++ .../gettingStarted/gsQml/core/MenuBar.qml | 148 +++++++++++++ .../gettingStarted/gsQml/core/TextArea.qml | 86 ++++++++ .../tutorials/gettingStarted/gsQml/core/qmldir | 48 +++++ .../gettingStarted/gsQml/filedialog/cppPlugins.pro | 17 ++ .../gsQml/filedialog/dialogPlugin.cpp | 57 +++++ .../gettingStarted/gsQml/filedialog/dialogPlugin.h | 57 +++++ .../gettingStarted/gsQml/filedialog/directory.cpp | 219 +++++++++++++++++++ .../gettingStarted/gsQml/filedialog/directory.h | 108 ++++++++++ .../gettingStarted/gsQml/filedialog/file.cpp | 57 +++++ .../gettingStarted/gsQml/filedialog/file.h | 67 ++++++ .../gettingStarted/gsQml/filedialog/qmldir | 1 + .../gettingStarted/gsQml/images/arrow.png | Bin 0 -> 583 bytes .../gettingStarted/gsQml/images/qt-logo.png | Bin 0 -> 5149 bytes .../gsQml/pics/qml-texteditor5_editmenu.png | Bin 0 -> 65123 bytes .../gsQml/pics/qml-texteditor5_filemenu.png | Bin 0 -> 21367 bytes .../gsQml/pics/qml-texteditor5_newfile.png | Bin 0 -> 76693 bytes 21 files changed, 1617 insertions(+) create mode 100644 examples/tutorials/gettingStarted/gsQml/TextEditor.qml create mode 100644 examples/tutorials/gettingStarted/gsQml/core/Button.qml create mode 100644 examples/tutorials/gettingStarted/gsQml/core/EditMenu.qml create mode 100644 examples/tutorials/gettingStarted/gsQml/core/FileDialog.qml create mode 100644 examples/tutorials/gettingStarted/gsQml/core/FileMenu.qml create mode 100644 examples/tutorials/gettingStarted/gsQml/core/MenuBar.qml create mode 100644 examples/tutorials/gettingStarted/gsQml/core/TextArea.qml create mode 100644 examples/tutorials/gettingStarted/gsQml/core/qmldir create mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro create mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp create mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h create mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp create mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/directory.h create mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp create mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/file.h create mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/qmldir create mode 100644 examples/tutorials/gettingStarted/gsQml/images/arrow.png create mode 100644 examples/tutorials/gettingStarted/gsQml/images/qt-logo.png create mode 100644 examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png create mode 100644 examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png create mode 100644 examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png diff --git a/examples/tutorials/gettingStarted/gsQml/TextEditor.qml b/examples/tutorials/gettingStarted/gsQml/TextEditor.qml new file mode 100644 index 0000000..6ffdd6d --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/TextEditor.qml @@ -0,0 +1,129 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 +import "core" + +Rectangle{ + id: screen + width: 1000; height: 1000 + property int partition: height/3 + border.width: 1 + border.color: "#DCDCCC" + state: "DRAWER_CLOSED" + + //Item 1: MenuBar on the top portion of the screen + MenuBar{ + id:menuBar + height: screen.partition; width: screen.width + z:1 + } + //Item 2: The editable text area + TextArea{ + id:textArea + y:drawer.height + color: "#3F3F3F" + fontColor: "#DCDCCC" + height: partition*2; width:parent.width + } + //Item 3: The drawer handle + Rectangle{ + id:drawer + height:15; width: parent.width + border.color : "#6A6D6A" + border.width: 1 + z:1 + gradient: Gradient { + GradientStop { position: 0.0; color: "#8C8F8C" } + GradientStop { position: 0.17; color: "#6A6D6A" } + GradientStop { position: 0.77; color: "#3F3F3F" } + GradientStop { position: 1.0; color: "#6A6D6A" } + } + Image{ + id: arrowIcon + source: "images/arrow.png" + anchors.horizontalCenter: parent.horizontalCenter + + Behavior{NumberAnimation{property: "rotation";easing.type: Easing.OutExpo }} + } + + MouseArea{ + id: drawerMouseArea + anchors.fill:parent + hoverEnabled: true + onEntered: parent.border.color = Qt.lighter("#6A6D6A") + onExited: parent.border.color = "#6A6D6A" + onClicked:{ + if (screen.state == "DRAWER_CLOSED"){ + screen.state = "DRAWER_OPEN" + } + else if (screen.state == "DRAWER_OPEN"){ + screen.state = "DRAWER_CLOSED" + } + } + } + } + + states:[ + State{ + name: "DRAWER_OPEN" + PropertyChanges { target: menuBar; y: 0} + PropertyChanges { target: textArea; y: partition + drawer.height} + PropertyChanges { target: drawer; y: partition} + PropertyChanges { target: arrowIcon; rotation: 180} + }, + State{ + name: "DRAWER_CLOSED" + PropertyChanges { target: menuBar; y:-height; } + PropertyChanges { target: textArea; y: drawer.height; height: screen.height - drawer.height} + PropertyChanges { target: drawer; y: 0} + PropertyChanges { target: arrowIcon; rotation: 0} + } + ] + + transitions: [ + Transition{ + to: "*" + NumberAnimation { target: textArea; properties: "y, height"; duration: 100; easing.type:Easing.OutExpo } + NumberAnimation { target: menuBar; properties: "y"; duration: 100;easing.type: Easing.OutExpo } + NumberAnimation { target: drawer; properties: "y"; duration: 100;easing.type: Easing.OutExpo } + } + ] +} diff --git a/examples/tutorials/gettingStarted/gsQml/core/Button.qml b/examples/tutorials/gettingStarted/gsQml/core/Button.qml new file mode 100644 index 0000000..28ae4ec --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/Button.qml @@ -0,0 +1,110 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +import Qt 4.7 + +Rectangle { + + //identifier of the item + id: button + + //these properties act as constants, useable outside this QML file + property int buttonHeight: 75 + property int buttonWidth: 150 + + //attaches to the Text element's text content + property string label + property color textColor: buttonLabel.color + + //the color highlight when the mouse hovers on the rectangle + property color onHoverColor: "lightsteelblue" + property color borderColor: "transparent" + + //buttonColor is set to the button's main color + property color buttonColor: "lightblue" + + property real labelSize: 14 + //set appearance properties + radius:6 + smooth: true + border.width: 2 + border.color: borderColor + width: buttonWidth; height: buttonHeight + + Text{ + id: buttonLabel + anchors.centerIn: parent + text: label //bind the text to the parent's text + color: "#DCDCCC" + font.pointSize: labelSize + } + + //buttonClick() is callable and a signal handler, onButtonClick is automatically created + signal buttonClick() + + //define the clickable area to be the whole rectangle + MouseArea{ + id: buttonMouseArea + anchors.fill: parent //stretch the area to the parent's dimension + onClicked: buttonClick() + + //if true, then onEntered and onExited called if mouse hovers in the mouse area + //if false, a button must be clicked to detect the mouse hover + hoverEnabled: true + + //display a border if the mouse hovers on the button mouse area + onEntered: parent.border.color = onHoverColor + //remove the border if the mouse exits the button mouse area + onExited: parent.border.color = borderColor + + } + + //change the color of the button when pressed + color: buttonMouseArea.pressed ? Qt.darker(buttonColor, 1.5) : buttonColor + //animate the color whenever the color property changes + Behavior on color { ColorAnimation{ duration: 55} } + + //scale the button when pressed + scale: buttonMouseArea.pressed ? 1.1 : 1.00 + //Animate the scale property change + Behavior on scale { NumberAnimation{ duration: 55} } + +} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/core/EditMenu.qml b/examples/tutorials/gettingStarted/gsQml/core/EditMenu.qml new file mode 100644 index 0000000..be9f6a1 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/EditMenu.qml @@ -0,0 +1,111 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +import Qt 4.7 + +Rectangle{ + id: editMenu + height: 480; width:1000 + color: "powderblue" + property color buttonBorderColor: "#7A8182" + property color buttonFillColor: "#61BDCACD" + property string menuName:"Edit" + + gradient: Gradient{ + GradientStop { position: 0.0; color: "#6A7570" } + GradientStop { position: 1.0; color: Qt.darker("#6A7570") } + } + + Rectangle{ + id:actionContainer + color:"transparent" + anchors.centerIn: parent + width: parent.width; height: parent.height / 5 + Row{ + anchors.centerIn: parent + spacing: parent.width/9 + Button{ + id: loadButton + buttonColor: buttonFillColor + label: "Copy" + labelSize:16 + borderColor:buttonBorderColor + height: actionContainer.height + width: actionContainer.width/6 + onButtonClick:textArea.copy() + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + + Button{ + id: saveButton + height: actionContainer.height + width: actionContainer.width/6 + buttonColor: buttonFillColor + label: "Paste" + borderColor:buttonBorderColor + labelSize:16 + onButtonClick:textArea.paste() + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + Button{ + id: exitButton + label: "Select All" + height: actionContainer.height + width: actionContainer.width/6 + labelSize:16 + buttonColor: buttonFillColor + borderColor:buttonBorderColor + onButtonClick:textArea.selectAll() + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + } + } + +} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/core/FileDialog.qml b/examples/tutorials/gettingStarted/gsQml/core/FileDialog.qml new file mode 100644 index 0000000..9948a27 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/FileDialog.qml @@ -0,0 +1,170 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle{ + id:dialog + height: 200 * partition; width: 200 + color: "transparent" + + signal selectChanged() + signal notifyRefresh() + onNotifyRefresh:dirView.model = directory.files + + property string selectedFile + property int selectedIndex: 0 + + Rectangle{ + id: dirBox + radius: 10 + anchors.centerIn:parent + height: parent.height -15; width: parent.width -30 + + Rectangle{ + id:header + height:parent.height*0.1 + width: parent.width + radius:3 + z:1 + gradient: Gradient { + GradientStop { position: 0.0; color: "#8C8F8C" } + GradientStop { position: 0.17; color: "#6A6D6A" } + GradientStop { position: 0.98;color: "#3F3F3F" } + GradientStop { position: 1.0; color: "#0e1B20" } + } + Text{ + height: header.height + anchors.centerIn: header + text: "files:" + color: "lightblue" + font.weight: Font.Light + font.italic: true + } + } + GridView{ + id:dirView + width:parent.width + height:parent.height*.9 + anchors.top: header.bottom + cellWidth: 100 + cellHeight: 75 +// highlight: Rectangle { width:cellWidth; height: cellHeight; color: "lightsteelblue" ;radius: 13} + model: directory.files + delegate: dirDelegate + clip: true + highlightMoveDuration:40 + } + + Component{ + id:dirDelegate + + Rectangle{ + id:file + color: "transparent" + width: GridView.view.cellWidth; height: GridView.view.cellHeight + + Text{ + id:fileName + width: parent.width + anchors.centerIn:parent + text: name + color: "#BDCACD" + font.weight: GridView.view.currentIndex == index ? Font.DemiBold : Font.Normal + font.pointSize: GridView.view.currentIndex == index ? 12 : 10 + elide: Text.ElideMiddle + horizontalAlignment: Text.AlignHCenter + } + Rectangle{ + id:selection + width:parent.width; height:parent.height + anchors.centerIn: parent + radius: 10 + smooth: true + scale: GridView.view.currentIndex == index ? 1 : 0.5 + opacity: GridView.view.currentIndex == index ? 1 : 0 + Text{ + id:overlay + width: parent.width + anchors.centerIn:parent + text: name + color: "#696167" + font.weight: Font.DemiBold + font.pointSize: 12 + smooth:true + elide: Text.ElideMiddle + horizontalAlignment: Text.AlignHCenter + } + Behavior on opacity{ NumberAnimation{ duration: 45} } + Behavior on scale { NumberAnimation{ duration: 45} } + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter("lightsteelblue",1.25) } + GradientStop { position: 0.67; color: Qt.darker("lightsteelblue",1.3) } + } + border.color:"lightsteelblue" + border.width:1 + } + MouseArea{ + id:fileMouseArea + anchors.fill:parent + hoverEnabled: true + + onClicked:{ + GridView.view.currentIndex = index + selectedFile = directory.files[index].name + selectChanged() + } + onEntered:{ + fileName.color = "lightsteelblue" + fileName.font.weight = Font.DemiBold + } + onExited: { + fileName.font.weight = Font.Normal + fileName.color = "#BDCACD" + } + } + } + } + gradient: Gradient{ + GradientStop { position: 0.0; color: "#A5333333" } + GradientStop { position: 1.0; color: "#03333333" } + } + } +} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/core/FileMenu.qml b/examples/tutorials/gettingStarted/gsQml/core/FileMenu.qml new file mode 100644 index 0000000..20d8fd6 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/FileMenu.qml @@ -0,0 +1,232 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle{ + id: fileMenu + height: 480; width:1000 + property color buttonBorderColor: "#7F8487" + property color buttonFillColor: "#8FBDCACD" + property string fileContent:directory.fileContent + + //the menuName is accessible from outside this QML file + property string menuName: "File" + + //used to divide the screen into parts. + property real partition: 1/3 + + color: "#6C646A" + gradient: Gradient{ + GradientStop { position: 0.0; color: "#6C646A" } + GradientStop { position: 1.0; color: Qt.darker("#6A6D6A") } + } + + Directory{ + id:directory + filename: textInput.text + onDirectoryChanged:fileDialog.notifyRefresh() + } + + Rectangle{ + id:actionContainer + + //make this rectangle invisible + color:"transparent" + anchors.left: parent.left + + //the height is a good proportion that creates more space at the top of the column of buttons + width: fileMenu.width * partition; height: fileMenu.height + + Column{ + anchors.centerIn: parent + spacing: parent.height/32 + Button{ + id: saveButton + label: "Save" + borderColor: buttonBorderColor + buttonColor: buttonFillColor + width: actionContainer.width/ 1.3 + height:actionContainer.height / 8 + labelSize:24 + onButtonClick:{ + directory.fileContent = textArea.textContent + directory.filename = textInput.text + directory.saveFile() + } + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + + } + Button{ + id: loadButton + width: actionContainer.width/ 1.3 + height:actionContainer.height/ 8 + buttonColor: buttonFillColor + borderColor: buttonBorderColor + label: "Load" + labelSize:24 + onButtonClick:{ + directory.filename = textInput.text + directory.loadFile() + textArea.textContent = directory.fileContent + } + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + Button{ + id: newButton + width: actionContainer.width/ 1.3 + height:actionContainer.height/ 8 + buttonColor: buttonFillColor + borderColor: buttonBorderColor + label: "New" + labelSize:24 + onButtonClick:{ + textArea.textContent = "" + textInput.text = "" + } + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + + } + Rectangle{ + id: space + width: actionContainer.width/ 1.3 + height:actionContainer.height / 16 + color:"transparent" + } + Button{ + id: exitButton + width: actionContainer.width/ 1.3 + height:actionContainer.height/ 8 + label: "Exit" + labelSize:24 + buttonColor: buttonFillColor + borderColor: buttonBorderColor + onButtonClick:Qt.quit() + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + } + } + + Rectangle{ + id:dialogContainer + + width: 2*fileMenu.width * partition; height: fileMenu.height + anchors.right:parent.right + color:"transparent" + + Column { + anchors.centerIn: parent + spacing: parent.height /640 + FileDialog{ + id:fileDialog + height: 2*dialogContainer.height * partition; width: dialogContainer.width + onSelectChanged: textInput.text = selectedFile + } + + Rectangle{ + id:lowerPartition + height: dialogContainer.height * partition; width: dialogContainer.width + color: "transparent" + + Rectangle{ + id: nameField + gradient: Gradient{ + GradientStop { position: 0.0; color: "#806F6F6F" } + GradientStop { position: 1.0; color: "#136F6F6F" } + } + + radius: 10 + anchors {centerIn:parent; leftMargin: 15; rightMargin: 15; topMargin: 15} + height: parent.height-15; width: parent.width -20 + border {color:"#4A4A4A"; width:1} + + TextInput{ + id: textInput + z:2 + anchors {bottom: parent.bottom; topMargin: 10; horizontalCenter:parent.horizontalCenter} + width: parent.width - 10 + height: parent.height -10 + font.pointSize: 40 + color:"lightsteelblue" + focus:true + } + Text{ + id: textInstruction + anchors.centerIn:parent + text: "Select file name and press save or load" + font {pointSize: 11; weight:Font.Light; italic: true} + color: "lightblue" + z:2 + opacity: (textInput.text == "") ? 1: 0 + } + Text{ + id:fieldLabel + anchors {top: parent.top; left: parent.left} + text: " file name: " + font {pointSize: 11; weight: Font.Light; italic: true} + color: "lightblue" + z:2 + } + MouseArea{ + anchors.centerIn:parent + width: nameField.width; height: nameField.height + onClicked:{ + textInput.text = "" + textInput.focus = true + textInput.forceFocus() + } + } + } + } + } + } +} diff --git a/examples/tutorials/gettingStarted/gsQml/core/MenuBar.qml b/examples/tutorials/gettingStarted/gsQml/core/MenuBar.qml new file mode 100644 index 0000000..c387f5f --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/MenuBar.qml @@ -0,0 +1,148 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle { + id: menuBar + width: 1000; height:300 + color:"transparent" + property color fileColor: "plum" + property color editColor: "powderblue" + + property real partition: 1/10 + + Column{ + anchors.fill: parent + //container for the header and the buttons + z: 1 + Rectangle{ + id: labelList + height:menuBar.height*partition + width: menuBar.width + color: "beige" + gradient: Gradient { + GradientStop { position: 0.0; color: "#8C8F8C" } + GradientStop { position: 0.17; color: "#6A6D6A" } + GradientStop { position: 0.98;color: "#3F3F3F" } + GradientStop { position: 1.0; color: "#0e1B20" } + } + Text{ + height: parent.height + anchors {right: labelRow.left ; verticalCenter: parent.bottom} + text: "menu: " + color: "lightblue" + font {weight: Font.Light; italic: true} + smooth: true + } + + //row displays its children in a vertical row + Row{ + id: labelRow + anchors.centerIn: parent + spacing:40 + Button{ + id: fileButton + height: 20; width: 50 + label: "File" + buttonColor : menuListView.currentIndex == 0? fileColor : Qt.darker(fileColor, 1.5) + scale: menuListView.currentIndex == 0? 1.25: 1 + labelSize: menuListView.currentIndex == 0? 16:12 + radius: 1 + smooth:true + //on a button click, change the list's currently selected item to FileMenu + onButtonClick: menuListView.currentIndex = 0 + gradient: Gradient{ + GradientStop { position: 0.0; color: fileColor } + GradientStop { position: 1.0; color: "#136F6F6F" } + } + } + Button{ + id: editButton + height: 20; width: 50 + buttonColor : menuListView.currentIndex == 1? Qt.darker(editColor, 1.5) : Qt.darker(editColor, 1.9) + scale: menuListView.currentIndex == 1? 1.25: 1 + label: "Edit" + radius: 1 + labelSize: menuListView.currentIndex == 1? 16:12 + smooth:true + //on a button click, change the list's currently selected item to EditMenu + onButtonClick: menuListView.currentIndex = 1 + gradient: Gradient{ + GradientStop { position: 0.0; color: editColor } + GradientStop { position: 1.0; color: "#136F6F6F" } + } + } + } + } + + //list view will display a model according to a delegate + ListView{ + id: menuListView + width:menuBar.width; height: 9*menuBar.height*partition + + //the model contains the data + model: menuListModel + + //control the movement of the menu switching + snapMode: ListView.SnapOneItem + orientation: ListView.Horizontal + boundsBehavior: Flickable.StopAtBounds + flickDeceleration: 5000 + highlightFollowsCurrentItem: true + highlightMoveDuration:240 + highlightRangeMode: ListView.StrictlyEnforceRange + } + } + //a list of visual items already have delegates handling their display + VisualItemModel{ + id: menuListModel + + FileMenu{ + id:fileMenu + width: menuListView.width; height: menuListView.height + color: fileColor + } + EditMenu{ + color: editColor + width: menuListView.width; height: menuListView.height + } + } +} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/core/TextArea.qml b/examples/tutorials/gettingStarted/gsQml/core/TextArea.qml new file mode 100644 index 0000000..3953d9f --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/TextArea.qml @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle{ + id:textArea + + function paste(){ textEdit.paste()} + function copy() { textEdit.copy() } + function selectAll() { textEdit.selectAll() } + + width :400; height:400 + + property color fontColor: "white" + property alias textContent: textEdit.text + Flickable{ + id: flickArea + width: parent.width; height: parent.height + anchors.fill:parent + + boundsBehavior: Flickable.StopAtBounds + flickableDirection: Flickable.HorizontalFlick + interactive: true + //Will move the text Edit area to make the area visible when scrolled with keyboard strokes + function ensureVisible(r){ + if (contentX >= r.x) + contentX = r.x; + else if (contentX+width <= r.x+r.width) + contentX = r.x+r.width-width; + if (contentY >= r.y) + contentY = r.y; + else if (contentY+height <= r.y+r.height) + contentY = r.y+r.height-height; + } + + TextEdit{ + id: textEdit + anchors.fill:parent + width:parent.width; height:parent.height + color:fontColor + focus: true + wrapMode: TextEdit.Wrap + font.pointSize:10 + onCursorRectangleChanged: flickArea.ensureVisible(cursorRectangle) + selectByMouse: true + } + } +} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/core/qmldir b/examples/tutorials/gettingStarted/gsQml/core/qmldir new file mode 100644 index 0000000..1beb5ed --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/qmldir @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +Button ./Button.qml +FileDialog ./FileDialog.qml +TextArea ./TextArea.qml +TextEditor ./TextEditor.qml +EditMenu ./EditMenu.qml +MenuBar ./MenuBar.qml + +plugin FileDialog ../plugins diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro b/examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro new file mode 100644 index 0000000..6247747 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro @@ -0,0 +1,17 @@ +TEMPLATE = lib +CONFIG += qt plugin +QT += declarative + +DESTDIR += ../plugins +OBJECTS_DIR = tmp +MOC_DIR = tmp + +TARGET = FileDialog + +HEADERS += directory.h \ + file.h \ + dialogPlugin.h + +SOURCES += directory.cpp \ + file.cpp \ + dialogPlugin.cpp diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp new file mode 100644 index 0000000..c0132c0 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "dialogPlugin.h" +#include "directory.h" +#include "file.h" +#include + +void DialogPlugin::registerTypes(const char *uri){ + + //register the class Directory into QML as a "Directory" element version 1.0 + qmlRegisterType(uri, 1, 0, "Directory"); + qmlRegisterType(uri,1,0,"File"); + + //qRegisterMetaType > ("QDeclarativeListProperty"); + +} + +//FileDialog is the plugin name (same as the TARGET in the project file) and DialogPlugin is the plugin classs +Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin); \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h new file mode 100644 index 0000000..7f8d3ff --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DIALOGPLUGIN_H +#define DIALOGPLUGIN_H + +#include + +class DialogPlugin : public QDeclarativeExtensionPlugin +{ + Q_OBJECT + + public: + //registerTypes is inherited from QDeclarativeExtensionPlugin + void registerTypes(const char *uri); + +}; + +#endif + diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp new file mode 100644 index 0000000..b3e0256 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp @@ -0,0 +1,219 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "directory.h" +#include + +/* +Directory constructor + +Initialize the saves directory and creates the file list +*/ +Directory::Directory(QObject *parent) : QObject(parent) +{ + + + m_dir.cd( QDir::currentPath()); + + //go to the saved directory. if not found, create save directory + m_saveDir = "saves"; + if (m_dir.cd(m_saveDir) == 0){ + m_dir.mkdir(m_saveDir); + m_dir.cd(m_saveDir); + } + m_filterList << "*.txt"; + + refresh(); +} + +/* +Directory::filesNumber +Return the number of Files +*/ +int Directory:: filesCount() const{ + return m_fileList.size(); +} + +/* +Function called to append data onto list property +*/ +void appendFiles(QDeclarativeListProperty * property, File * file){ + //Do nothing. can't add to a directory using this method +} + +/* +Function called to retrieve file in the list using an index +*/ +File* fileAt(QDeclarativeListProperty * property, int index){ + return static_cast< QList *>(property->data)->at(index); +} + +/* +Returns the number of files in the list +*/ +int filesSize(QDeclarativeListProperty * property){ + return static_cast< QList *>(property->data)->size(); +} + +/* +Function called to empty the list property contents +*/ +void clearFilesPtr(QDeclarativeListProperty *property){ + return static_cast< QList *>(property->data)->clear(); +} + +/* +Returns the list of files as a QDeclarativeListProperty. +*/ +QDeclarativeListProperty Directory::files(){ + + refresh(); +// return QDeclarativeListProperty(this,m_filePtrList); //not recommended in the docs + return QDeclarativeListProperty( this, &m_fileList, &appendFiles, &filesSize, &fileAt, &clearFilesPtr ); +} + +/* +Return te name of the currently selected file +*/ +QString Directory::filename() const{ + return currentFile.name(); +} + +/* +Return the file's content as a string. +*/ +QString Directory::fileContent() const{ + return m_fileContent; +} + +/* +Set the file name of the current file +*/ +void Directory::setFilename(const QString &str){ + if(str != currentFile.name()){ + currentFile.setName(str); + emit filenameChanged(); + } +} + +/* +Set the content of the file as a string +*/ +void Directory::setFileContent(const QString &str){ + if(str != m_fileContent){ + m_fileContent = str; + emit fileContentChanged(); + } +} + +/* +Called from QML to save the file using the filename and file content. +Saving makes sure that the file has a .txt extension. +*/ +void Directory::saveFile(){ + + if(currentFile.name().size() == 0){ + qWarning()<< "Empty filename. no save"; + return; + } + + QString extendedName = currentFile.name(); + if(!currentFile.name().endsWith(".txt")){ + extendedName.append(".txt"); + } + + QFile file( m_dir.filePath(extendedName) ); + if (file.open(QFile::WriteOnly | QFile::Truncate)){ + QTextStream outStream(&file); + outStream << m_fileContent; + } + file.close(); + refresh(); + emit directoryChanged(); +} + +/* +Load the contents of a file. +Only loads files with a .txt extension +*/ +void Directory::loadFile(){ + + m_fileContent.clear(); + QString extendedName = currentFile.name(); + if(!currentFile.name().endsWith(".txt")){ + extendedName.append(".txt"); + } + + QFile file( m_dir.filePath(extendedName) ); + if (file.open(QFile::ReadOnly )){ + QTextStream inStream(&file); + + QString line; + do{ + line = inStream.read(75); + m_fileContent.append(line); + }while (!line .isNull()); + } + file.close(); +} + +/* +Reloads the content of the files list. This is to ensure that the newly +created files are added onto the list. +*/ +void Directory::refresh(){ + m_dirFiles = m_dir.entryList(m_filterList,QDir::Files,QDir::Name); + m_fileList.clear(); + + File * file; + for(int i = 0; i < m_dirFiles.size() ; i ++){ + + file = new File(); + + if(m_dirFiles.at(i).endsWith(".txt")){ + QString name = m_dirFiles.at(i); + file->setName( name.remove(".txt",Qt::CaseSensitive)); + } + else{ + file->setName(m_dirFiles.at(i)); + } + m_fileList.append(file); + } +} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/directory.h b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.h new file mode 100644 index 0000000..bef1a93 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.h @@ -0,0 +1,108 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DIRECTORY_H +#define DIRECTORY_H + +#include "file.h" + +#include +#include +#include +#include +#include + +class Directory : public QObject{ + + Q_OBJECT + + //number of files in the directory + Q_PROPERTY(int filesCount READ filesCount) + + //list property containing file names as QString + Q_PROPERTY(QDeclarativeListProperty files READ files CONSTANT ) + + //file name of the text file to read/write + Q_PROPERTY(QString filename READ filename WRITE setFilename NOTIFY filenameChanged) + + //text content of the file + Q_PROPERTY(QString fileContent READ fileContent WRITE setFileContent NOTIFY fileContentChanged) + + public: + Directory(QObject *parent = 0); + + //properties' read functions + int filesCount() const; + QString filename() const; + QString fileContent() const; + QDeclarativeListProperty files(); + + //properties' write functions + void setFilename(const QString &str); + void setFileContent(const QString &str); + + //accessible from QML + Q_INVOKABLE void saveFile(); + Q_INVOKABLE void loadFile(); + + signals: + void directoryChanged(); + void filenameChanged(); + void fileContentChanged(); + + private: + QDir m_dir; + QStringList m_dirFiles; + File currentFile; + QString m_saveDir; + QStringList m_filterList; + + //contains the file data in QString format + QString m_fileContent; + + //Registered to QML in a plugin. Accessible from QML as a property of Directory + QList m_fileList; + + //refresh content of the directory + void refresh(); +}; + + +#endif diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp new file mode 100644 index 0000000..39a7469 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include "file.h" + +File::File(QObject *parent) : QObject(parent) +{ + m_name = ""; +} + +QString File::name() const{ + return m_name; +} +void File::setName(const QString &str){ + if(str != m_name){ + m_name = str; + emit nameChanged(); + } +} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/file.h b/examples/tutorials/gettingStarted/gsQml/filedialog/file.h new file mode 100644 index 0000000..e4ba429 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/file.h @@ -0,0 +1,67 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef FILE_H +#define FILE_H + + +#include +#include + +class File : public QObject{ + + Q_OBJECT + + Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) + + public: + File(QObject *parent = 0); + + QString name() const; + void setName(const QString &str); + + signals: + void nameChanged(); + + private: + QString m_name; +}; + +#endif \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir b/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir new file mode 100644 index 0000000..c2b27da --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir @@ -0,0 +1 @@ +plugin FileDialog plugins diff --git a/examples/tutorials/gettingStarted/gsQml/images/arrow.png b/examples/tutorials/gettingStarted/gsQml/images/arrow.png new file mode 100644 index 0000000..14978c2 Binary files /dev/null and b/examples/tutorials/gettingStarted/gsQml/images/arrow.png differ diff --git a/examples/tutorials/gettingStarted/gsQml/images/qt-logo.png b/examples/tutorials/gettingStarted/gsQml/images/qt-logo.png new file mode 100644 index 0000000..14ddf2a Binary files /dev/null and b/examples/tutorials/gettingStarted/gsQml/images/qt-logo.png differ diff --git a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png new file mode 100644 index 0000000..27feed5 Binary files /dev/null and b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png differ diff --git a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png new file mode 100644 index 0000000..4d8f9f2 Binary files /dev/null and b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png differ diff --git a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png new file mode 100644 index 0000000..680acfe Binary files /dev/null and b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png differ -- cgit v0.12 From d4dceca5dcd9252e09a421b65b318a7178049cd1 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 5 Aug 2010 11:51:23 +0200 Subject: qdoc: Cleaned up the application option specification and use. The flags allowed on the command line are now: -online (default), -base, -assistant (same as -base), and -creator. If you don't specify one of these, you see a warning in the error output telling you that it didn't find an application flag and that it generated online docs by defualt. --- tools/qdoc3/config.h | 4 +- tools/qdoc3/ditaxmlgenerator.cpp | 1 - tools/qdoc3/htmlgenerator.cpp | 127 +++++++++++++++++++-------------------- tools/qdoc3/htmlgenerator.h | 9 ++- tools/qdoc3/main.cpp | 70 +++++++++------------ 5 files changed, 95 insertions(+), 116 deletions(-) diff --git a/tools/qdoc3/config.h b/tools/qdoc3/config.h index 7665f1a..335a0d6 100644 --- a/tools/qdoc3/config.h +++ b/tools/qdoc3/config.h @@ -143,9 +143,7 @@ class Config #define CONFIG_MACRO "macro" #define CONFIG_NATURALLANGUAGE "naturallanguage" #define CONFIG_OBSOLETELINKS "obsoletelinks" -#define CONFIG_ONLINE "online" -#define CONFIG_OFFLINE "offline" -#define CONFIG_CREATOR "creator" +#define CONFIG_APPLICATION "application" #define CONFIG_OUTPUTDIR "outputdir" #define CONFIG_OUTPUTENCODING "outputencoding" #define CONFIG_OUTPUTLANGUAGE "outputlanguage" diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp index 4789c67..816ab9f 100644 --- a/tools/qdoc3/ditaxmlgenerator.cpp +++ b/tools/qdoc3/ditaxmlgenerator.cpp @@ -440,7 +440,6 @@ void DitaXmlGenerator::initializeGenerator(const Config &config) DITAXMLGENERATOR_GENERATEMACREFS); project = config.getString(CONFIG_PROJECT); - offlineDocs = !config.getBool(CONFIG_ONLINE); projectDescription = config.getString(CONFIG_DESCRIPTION); if (projectDescription.isEmpty() && !project.isEmpty()) projectDescription = project + " Reference Documentation"; diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 723f516..b1a8336 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -219,9 +219,7 @@ HtmlGenerator::HtmlGenerator() inTableHeader(false), numTableRows(0), threeColumnEnumValueTable(true), - offlineDocs(false), - onlineDocs(false), - creatorDocs(true), + application(Online), funcLeftParen("\\S(\\()"), myTree(0), slow(false), @@ -290,11 +288,17 @@ void HtmlGenerator::initializeGenerator(const Config &config) project = config.getString(CONFIG_PROJECT); - onlineDocs = config.getBool(CONFIG_ONLINE); - - offlineDocs = config.getBool(CONFIG_OFFLINE); - - creatorDocs = config.getBool(CONFIG_CREATOR); + QString app = config.getString(CONFIG_APPLICATION); + if (app == "online") + application = Online; + else if (app == "creator") + application = Creator; + else if (app == "assistant") + application = Assistant; + else if (app == "base") + application = Assistant; + else + application = Online; projectDescription = config.getString(CONFIG_DESCRIPTION); if (projectDescription.isEmpty() && !project.isEmpty()) @@ -1811,9 +1815,8 @@ void HtmlGenerator::generateHeader(const QString& title, // Setting some additional style sheet related details depending on configuration (e.g. online/offline) - - if(onlineDocs==true) // onlineDocs is for the web - { + switch (application) { + case Online: // Browser spec styles out() << " \n"; - out() << "\n"; - } - else if (offlineDocs == true) - { - out() << "\n"; - } - else if (creatorDocs == true) - { - out() << "\n"; - } - else - { - out() << "\n"; - } + + switch (application) { + case Online: + out() << " \n"; + out() << " \n"; + out() << "\n"; + break; + case Assistant: + out() << "\n"; + break; + case Creator: + out() << "\n"; + break; + default: + out() << "\n"; + } out() << "\n"; } diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index d92c349..ec79896 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -95,6 +95,11 @@ class HtmlGenerator : public PageGenerator LastSinceType }; + enum Application { + Online, + Assistant, + Creator}; + public: HtmlGenerator(); ~HtmlGenerator(); @@ -294,9 +299,7 @@ class HtmlGenerator : public PageGenerator bool inTableHeader; int numTableRows; bool threeColumnEnumValueTable; - bool onlineDocs; - bool offlineDocs; - bool creatorDocs; + Application application; QString link; QStringList sectionNumber; QRegExp funcLeftParen; diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp index 47a4b67..38b76a4 100644 --- a/tools/qdoc3/main.cpp +++ b/tools/qdoc3/main.cpp @@ -105,8 +105,7 @@ static bool showInternal = false; static bool obsoleteLinks = false; static QStringList defines; static QHash trees; -static QString application = "base"; //application -static bool applicationArg = 0; //if 1, then the argument is provided and it will override the qdocconf file +static QString appArg; // application /*! Find the Tree for language \a lang and return a pointer to it. @@ -194,36 +193,25 @@ static void processQdocconfFile(const QString &fileName) config.load(fileName); /* - Set the application to which qdoc will create the output. - The three applications are: - base: simple, basic html output. Best suited for offline viewing - creator: additional formatting. - online: full-featured online version with search and links to Qt topics - - Note: This will override the offline, online, creator defines. + Set the application to which qdoc will create the output. + The three applications are: + + base or assistant: simple, basic html output + for offline viewing in the Assistant application. + + creator: additional formatting for viewing in + the Creator application. + + online: full-featured online version with search and + links to Qt topics */ - if(applicationArg == false){ - - QString appConfig = config.getString(CONFIG_APPLICATION); - if (!appConfig.isEmpty()){ - application = appConfig; - } - } - if(application == "online"){ - config.setStringList(CONFIG_ONLINE, QStringList("true")); - config.setStringList(CONFIG_OFFLINE, QStringList("false")); - config.setStringList(CONFIG_CREATOR, QStringList("false")); - } - else if(application == "creator"){ - config.setStringList(CONFIG_ONLINE, QStringList("false")); - config.setStringList(CONFIG_OFFLINE, QStringList("true")); - config.setStringList(CONFIG_CREATOR, QStringList("false")); - } - else if(application == "base"){ - config.setStringList(CONFIG_ONLINE, QStringList("false")); - config.setStringList(CONFIG_OFFLINE, QStringList("false")); - config.setStringList(CONFIG_CREATOR, QStringList("true")); + if (appArg.isEmpty()) { + qDebug() << "Warning: Application flag not specified on" + << "command line. Options are -assistant, -creator," + << "and -online (default)."; + appArg = "online"; } + config.setStringList(CONFIG_APPLICATION, QStringList(appArg)); /* Add the defines to the configuration variables. @@ -496,18 +484,14 @@ int main(int argc, char **argv) else if (opt == "-obsoletelinks") { obsoleteLinks = true; } - else if (opt == "-base") { - application = "base"; - applicationArg = true; - } - else if (opt == "-creator") { - application = "creator"; - applicationArg = true; - } - else if (opt == "-online") { - application = "online"; - applicationArg = true; - } + else if (opt == "-base") + appArg = "base"; + else if (opt == "-assistant") + appArg = "assistant"; + else if (opt == "-creator") + appArg = "creator"; + else if (opt == "-online") + appArg = "online"; else { qdocFiles.append(opt); } @@ -522,7 +506,7 @@ int main(int argc, char **argv) Main loop. */ foreach (QString qf, qdocFiles) { - qDebug() << "PROCESSING:" << qf; + //qDebug() << "PROCESSING:" << qf; processQdocconfFile(qf); } -- cgit v0.12 From 7de8a0c487ce6a7f13c2028e93648807ef7d8e8b Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 5 Aug 2010 12:09:01 +0200 Subject: qdoc: Removed three unused config variables. These no longer do anything in qdocconf files: online = false offline = false creator = true --- tools/qdoc3/test/assistant.qdocconf | 3 --- tools/qdoc3/test/designer.qdocconf | 3 --- tools/qdoc3/test/linguist.qdocconf | 3 --- tools/qdoc3/test/qdeclarative.qdocconf | 3 --- tools/qdoc3/test/qmake.qdocconf | 3 --- tools/qdoc3/test/qt-api-only.qdocconf | 3 --- tools/qdoc3/test/qt-build-docs.qdocconf | 3 --- tools/qdoc3/test/qt.qdocconf | 3 --- 8 files changed, 24 deletions(-) diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf index 119a676..8cf5722 100644 --- a/tools/qdoc3/test/assistant.qdocconf +++ b/tools/qdoc3/test/assistant.qdocconf @@ -7,9 +7,6 @@ include(qt-defines.qdocconf) project = Qt Assistant description = Qt Assistant Manual url = http://qt.nokia.com/doc/4.7 -online = false -offline = false -creator = true indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf index 0595417..b1f37dc 100644 --- a/tools/qdoc3/test/designer.qdocconf +++ b/tools/qdoc3/test/designer.qdocconf @@ -7,9 +7,6 @@ include(qt-defines.qdocconf) project = Qt Designer description = Qt Designer Manual url = http://qt.nokia.com/doc/4.7 -online = false -offline = false -creator = true indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf index 7dd57fb..26fb55c 100644 --- a/tools/qdoc3/test/linguist.qdocconf +++ b/tools/qdoc3/test/linguist.qdocconf @@ -7,9 +7,6 @@ include(qt-defines.qdocconf) project = Qt Linguist description = Qt Linguist Manual url = http://qt.nokia.com/doc/4.7 -online = false -offline = false -creator = true indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf index 7628519..80bca29 100644 --- a/tools/qdoc3/test/qdeclarative.qdocconf +++ b/tools/qdoc3/test/qdeclarative.qdocconf @@ -8,9 +8,6 @@ project = Qml description = Qml Reference Documentation url = http://qt.nokia.com/doc/4.7/ qmlonly = true -online = false -offline = false -creator = true edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \ QtXmlPatterns QtTest diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index c666288..f069129 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -7,9 +7,6 @@ include(qt-defines.qdocconf) project = QMake description = QMake Manual url = http://qt.nokia.com/doc/4.7 -online = false -offline = false -creator = true indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index diff --git a/tools/qdoc3/test/qt-api-only.qdocconf b/tools/qdoc3/test/qt-api-only.qdocconf index 7387810..cdd7a7c 100644 --- a/tools/qdoc3/test/qt-api-only.qdocconf +++ b/tools/qdoc3/test/qt-api-only.qdocconf @@ -5,9 +5,6 @@ include(qt-build-docs.qdocconf) # qmake.qdocconf). url = ./ -online = false -offline = false -creator = true # Ensures that the documentation for the tools is not included in the generated # .qhp file. diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index 415457e..bb47b57 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -7,9 +7,6 @@ include(qt-defines.qdocconf) project = Qt description = Qt Reference Documentation url = http://qt.nokia.com/doc/4.7 -online = false -offline = false -creator = true sourceencoding = UTF-8 outputencoding = UTF-8 diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index a5e6578..f78bd38 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -9,9 +9,6 @@ versionsym = version = %VERSION% description = Qt Reference Documentation url = http://qt.nokia.com/doc/4.7 -online = true -offline = false -creator = false sourceencoding = UTF-8 outputencoding = UTF-8 -- cgit v0.12 From f3f95d4282ffbfb307e98d20a166ced4cc982061 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Tue, 22 Jun 2010 13:53:03 +0200 Subject: QXmlPatterns QAbstractDateTime: only parse 3 digits of time fraction the XML Schema dateTime type allows for an unlimited precision of fractial time values; this fails for 4 or more digits when creating a QTime. This patch takes only 3 digits of the time fraction into account, since we cannot store more in a QTime or QDateTime anyway. Reviewed-by: Olivier Goffart Task-number: QTBUG-11559 --- src/xmlpatterns/data/qabstractdatetime.cpp | 2 +- .../files/dateTime-with-microseconds.xml | 1 + .../files/dateTime-with-microseconds.xsd | 12 ++++++++++++ tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp | 6 ++++++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xml create mode 100644 tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xsd diff --git a/src/xmlpatterns/data/qabstractdatetime.cpp b/src/xmlpatterns/data/qabstractdatetime.cpp index 6329fbe..a298698 100644 --- a/src/xmlpatterns/data/qabstractdatetime.cpp +++ b/src/xmlpatterns/data/qabstractdatetime.cpp @@ -163,7 +163,7 @@ QDateTime AbstractDateTime::create(AtomicValue::Ptr &errorMessage, QString msecondsStr(getSafeCapt(mseconds)); if(!msecondsStr.isEmpty()) - msecondsStr = msecondsStr.leftJustified(3, QLatin1Char('0')); + msecondsStr = msecondsStr.leftJustified(3, QLatin1Char('0'), true); const MSecondProperty msecs = msecondsStr.toInt(); if(hour == 24) diff --git a/tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xml b/tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xml new file mode 100644 index 0000000..b17739a --- /dev/null +++ b/tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xml @@ -0,0 +1 @@ +2009-12-16T23:14:10.823218Z diff --git a/tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xsd b/tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xsd new file mode 100644 index 0000000..55557f1 --- /dev/null +++ b/tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xsd @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp b/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp index 3517b5a..092e966 100644 --- a/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp +++ b/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp @@ -216,6 +216,12 @@ void tst_XmlPatternsValidator::xsdSupport_data() const << 0 << (QStringList() << QLatin1String("files/complex-type-including-anonymous-type.xsd")) << QString(); + + QTest::newRow("QTBUG-11559 A schema and instance with a dateTime containing microseconds") + << 0 + << (QStringList() << QLatin1String("files/dateTime-with-microseconds.xml") + << QLatin1String("files/dateTime-with-microseconds.xsd")) + << QString(); } QTEST_MAIN(tst_XmlPatternsValidator) -- cgit v0.12 From 637d207e397c13c09a8dcbd718ee85bce2548e90 Mon Sep 17 00:00:00 2001 From: Frank Osterfeld Date: Thu, 5 Aug 2010 13:42:58 +0200 Subject: QDom: Do not crash on "text" "a:" is not a valid tagname. The function creating the element node notices that and returns 0, but the parser ignores it and continues, and then crashes later when processing the "text". This patch aborts the parsing immediately when creating the element node failed and fixes the crash. Merge-request: 2431 Reviewed-by: Olivier Goffart --- src/xml/dom/qdom.cpp | 6 ++++-- tests/auto/qdom/tst_qdom.cpp | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 1267e7e..662c796 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -7418,8 +7418,10 @@ bool QDomHandler::startElement(const QString& nsURI, const QString&, const QStri n = doc->createElement(qName); } - if (n) - n->setLocation(locator->lineNumber(), locator->columnNumber()); + if (!n) + return false; + + n->setLocation(locator->lineNumber(), locator->columnNumber()); node->appendChild(n); node = n; diff --git a/tests/auto/qdom/tst_qdom.cpp b/tests/auto/qdom/tst_qdom.cpp index 0f6cdaa..8bf7620 100644 --- a/tests/auto/qdom/tst_qdom.cpp +++ b/tests/auto/qdom/tst_qdom.cpp @@ -1776,6 +1776,7 @@ void tst_QDom::crashInSetContent() const QDomImplementation::setInvalidDataPolicy(QDomImplementation::ReturnNullNode); QDomDocument docImport; + QCOMPARE(docImport.setContent(QLatin1String("text"), true), false); QVERIFY(docImport.setContent(QLatin1String(""))); } -- cgit v0.12 From 15505360dc8e8b8f1343bba6fd3e5a9c95718d30 Mon Sep 17 00:00:00 2001 From: Benjamin Poulain Date: Thu, 5 Aug 2010 13:43:19 +0200 Subject: Replace the SSE prologues by a macro Replace the code of the SSE prologue by a macro to avoid copying the prologue everywhere. Reviewed-by: Andreas Kling --- src/corelib/tools/qsimd_p.h | 4 +++- src/gui/painting/qdrawhelper_sse2.cpp | 14 ++++---------- src/gui/painting/qdrawingprimitive_sse2_p.h | 8 ++------ 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index 5ff0f97..a3148fb 100644 --- a/src/corelib/tools/qsimd_p.h +++ b/src/corelib/tools/qsimd_p.h @@ -150,7 +150,9 @@ enum CPUFeatures { Q_CORE_EXPORT uint qDetectCPUFeatures(); -Q_CORE_EXPORT uint qDetectCPUFeatures(); + +#define ALIGNMENT_PROLOGUE_16BYTES(ptr, i, length) \ + for (; i < static_cast(qMin(static_cast(length), ((4 - ((reinterpret_cast(ptr) >> 2) & 0x3)) & 0x3))); ++i) QT_END_NAMESPACE diff --git a/src/gui/painting/qdrawhelper_sse2.cpp b/src/gui/painting/qdrawhelper_sse2.cpp index 7ab9eda..22c0384 100644 --- a/src/gui/painting/qdrawhelper_sse2.cpp +++ b/src/gui/painting/qdrawhelper_sse2.cpp @@ -112,9 +112,7 @@ void qt_blend_rgb32_on_rgb32_sse2(uchar *destPixels, int dbpl, int x = 0; // First, align dest to 16 bytes: - const int offsetToAlignOn16Bytes = (4 - ((reinterpret_cast(dst) >> 2) & 0x3)) & 0x3; - const int prologLength = qMin(w, offsetToAlignOn16Bytes); - for (; x < prologLength; ++x) { + ALIGNMENT_PROLOGUE_16BYTES(dst, x, w) { quint32 s = src[x]; s = BYTE_MUL(s, const_alpha); dst[x] = INTERPOLATE_PIXEL_255(src[x], const_alpha, dst[x], one_minus_const_alpha); @@ -182,12 +180,10 @@ inline int comp_func_Plus_one_pixel(uint d, const uint s) void QT_FASTCALL comp_func_Plus_sse2(uint *dst, const uint *src, int length, uint const_alpha) { int x = 0; - const int offsetToAlignOn16Bytes = (4 - ((reinterpret_cast(dst) >> 2) & 0x3)) & 0x3; - const int prologLength = qMin(length, offsetToAlignOn16Bytes); if (const_alpha == 255) { // 1) Prologue: align destination on 16 bytes - for (; x < prologLength; ++x) + ALIGNMENT_PROLOGUE_16BYTES(dst, x, length) dst[x] = comp_func_Plus_one_pixel(dst[x], src[x]); // 2) composition with SSE2 @@ -208,7 +204,7 @@ void QT_FASTCALL comp_func_Plus_sse2(uint *dst, const uint *src, int length, uin const __m128i oneMinusConstAlpha = _mm_set1_epi16(one_minus_const_alpha); // 1) Prologue: align destination on 16 bytes - for (; x < prologLength; ++x) + ALIGNMENT_PROLOGUE_16BYTES(dst, x, length) dst[x] = comp_func_Plus_one_pixel_const_alpha(dst[x], src[x], const_alpha, one_minus_const_alpha); const __m128i half = _mm_set1_epi16(0x80); @@ -239,9 +235,7 @@ void QT_FASTCALL comp_func_Source_sse2(uint *dst, const uint *src, int length, u int x = 0; // 1) prologue, align on 16 bytes - const int offsetToAlignOn16Bytes = (4 - ((reinterpret_cast(dst) >> 2) & 0x3)) & 0x3; - const int prologLength = qMin(length, offsetToAlignOn16Bytes); - for (; x < prologLength; ++x) + ALIGNMENT_PROLOGUE_16BYTES(dst, x, length) dst[x] = INTERPOLATE_PIXEL_255(src[x], const_alpha, dst[x], ialpha); // 2) interpolate pixels with SSE2 diff --git a/src/gui/painting/qdrawingprimitive_sse2_p.h b/src/gui/painting/qdrawingprimitive_sse2_p.h index 18355c2..d8f6bf5 100644 --- a/src/gui/painting/qdrawingprimitive_sse2_p.h +++ b/src/gui/painting/qdrawingprimitive_sse2_p.h @@ -143,9 +143,7 @@ QT_BEGIN_NAMESPACE int x = 0; \ \ /* First, get dst aligned. */ \ - const int offsetToAlignOn16Bytes = (4 - ((reinterpret_cast(dst) >> 2) & 0x3)) & 0x3;\ - const int prologLength = qMin(length, offsetToAlignOn16Bytes);\ - for (; x < prologLength; ++x) { \ + ALIGNMENT_PROLOGUE_16BYTES(dst, x, length) { \ uint s = src[x]; \ if (s >= 0xff000000) \ dst[x] = s; \ @@ -202,9 +200,7 @@ QT_BEGIN_NAMESPACE { \ int x = 0; \ \ - const int offsetToAlignOn16Bytes = (4 - ((reinterpret_cast(dst) >> 2) & 0x3)) & 0x3;\ - const int prologLength = qMin(length, offsetToAlignOn16Bytes);\ - for (; x < prologLength; ++x) { \ + ALIGNMENT_PROLOGUE_16BYTES(dst, x, length) { \ quint32 s = src[x]; \ if (s != 0) { \ s = BYTE_MUL(s, const_alpha); \ -- cgit v0.12 From 05bb249c2ad3ee15eb205a806f8546c105683096 Mon Sep 17 00:00:00 2001 From: Jiang Jiang Date: Thu, 5 Aug 2010 11:21:03 +0200 Subject: Fix QTextEngine overflow caused by extremely long text Internally, QTextEngine use int to calculate most of the layout data required. If a string longer than 2^24 is passed into either QTextEngine or classes using it (QStackTextEngine, QPainter, QFontMetrics, etc.), overflow will happen because the memory size required to allocate for layout will become too large for int to handle. This patch will prevent these cases and add error handling mechanism for relevant code. Task-number: QT-3658 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/gui/text/qtextengine.cpp | 87 ++++++++++++++++++++++++++++++++------------ src/gui/text/qtextengine_p.h | 14 +++++-- src/gui/text/qtextlayout.cpp | 19 +++++++--- 3 files changed, 87 insertions(+), 33 deletions(-) diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 439f2a4..5670e29 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -923,6 +923,13 @@ void QTextEngine::shapeText(int item) const si.width += glyphs.advances_x[i]; } +static inline bool hasCaseChange(const QScriptItem &si) +{ + return si.analysis.flags == QScriptAnalysis::SmallCaps || + si.analysis.flags == QScriptAnalysis::Uppercase || + si.analysis.flags == QScriptAnalysis::Lowercase; +} + #if defined(Q_WS_WINCE) //TODO // set the glyph attributes heuristically. Assumes a 1 to 1 relationship between chars and glyphs // and no reordering. @@ -1050,14 +1057,15 @@ void QTextEngine::shapeTextWithCE(int item) const if (option.useDesignMetrics()) flags |= DesignMetrics; - attributes(); // pre-initialize char attributes + // pre-initialize char attributes + if (! attributes()) + return; const int len = length(item); int num_glyphs = length(item); const QChar *str = layoutData->string.unicode() + si.position; ushort upperCased[256]; - if (si.analysis.flags == QScriptAnalysis::SmallCaps || si.analysis.flags == QScriptAnalysis::Uppercase - || si.analysis.flags == QScriptAnalysis::Lowercase) { + if (hasCaseChange(si)) { ushort *uc = upperCased; if (len > 256) uc = new ushort[len]; @@ -1071,7 +1079,14 @@ void QTextEngine::shapeTextWithCE(int item) const } while (true) { - ensureSpace(num_glyphs); + if (! ensureSpace(num_glyphs)) { + // If str is converted to uppercase/lowercase form with a new buffer, + // we need to delete that buffer before return for error + const ushort *uc = reinterpret_cast(str); + if (hasCaseChange(si) && uc != upperCased) + delete [] uc; + return; + } num_glyphs = layoutData->glyphLayout.numGlyphs - layoutData->used; QGlyphLayout g = availableGlyphs(&si); @@ -1092,9 +1107,7 @@ void QTextEngine::shapeTextWithCE(int item) const layoutData->used += si.num_glyphs; const ushort *uc = reinterpret_cast(str); - if ((si.analysis.flags == QScriptAnalysis::SmallCaps || si.analysis.flags == QScriptAnalysis::Uppercase - || si.analysis.flags == QScriptAnalysis::Lowercase) - && uc != upperCased) + if (hasCaseChange(si) && uc != upperCased) delete [] uc; } #endif @@ -1133,8 +1146,7 @@ void QTextEngine::shapeTextWithHarfbuzz(int item) const entire_shaper_item.item.bidiLevel = si.analysis.bidiLevel; HB_UChar16 upperCased[256]; // XXX what about making this 4096, so we don't have to extend it ever. - if (si.analysis.flags == QScriptAnalysis::SmallCaps || si.analysis.flags == QScriptAnalysis::Uppercase - || si.analysis.flags == QScriptAnalysis::Lowercase) { + if (hasCaseChange(si)) { HB_UChar16 *uc = upperCased; if (entire_shaper_item.item.length > 256) uc = new HB_UChar16[entire_shaper_item.item.length]; @@ -1156,17 +1168,24 @@ void QTextEngine::shapeTextWithHarfbuzz(int item) const entire_shaper_item.shaperFlags |= HB_ShaperFlag_UseDesignMetrics; entire_shaper_item.num_glyphs = qMax(layoutData->glyphLayout.numGlyphs - layoutData->used, int(entire_shaper_item.item.length)); - ensureSpace(entire_shaper_item.num_glyphs); + if (! ensureSpace(entire_shaper_item.num_glyphs)) { + if (hasCaseChange(si)) + delete [] const_cast(entire_shaper_item.string); + return; + } QGlyphLayout initialGlyphs = availableGlyphs(&si).mid(0, entire_shaper_item.num_glyphs); if (!stringToGlyphs(&entire_shaper_item, &initialGlyphs, font)) { - ensureSpace(entire_shaper_item.num_glyphs); + if (! ensureSpace(entire_shaper_item.num_glyphs)) { + if (hasCaseChange(si)) + delete [] const_cast(entire_shaper_item.string); + return; + } initialGlyphs = availableGlyphs(&si).mid(0, entire_shaper_item.num_glyphs); if (!stringToGlyphs(&entire_shaper_item, &initialGlyphs, font)) { // ############ if this happens there's a bug in the fontengine - if ((si.analysis.flags == QScriptAnalysis::SmallCaps || si.analysis.flags == QScriptAnalysis::Uppercase - || si.analysis.flags == QScriptAnalysis::Lowercase) && entire_shaper_item.string != upperCased) + if (hasCaseChange(si) && entire_shaper_item.string != upperCased) delete [] const_cast(entire_shaper_item.string); return; } @@ -1231,7 +1250,11 @@ void QTextEngine::shapeTextWithHarfbuzz(int item) const remaining_glyphs -= shaper_item.initialGlyphCount; do { - ensureSpace(glyph_pos + shaper_item.num_glyphs + remaining_glyphs); + if (! ensureSpace(glyph_pos + shaper_item.num_glyphs + remaining_glyphs)) { + if (hasCaseChange(si)) + delete [] const_cast(entire_shaper_item.string); + return; + } const QGlyphLayout g = availableGlyphs(&si).mid(glyph_pos); moveGlyphData(g.mid(shaper_item.num_glyphs), g.mid(shaper_item.initialGlyphCount), remaining_glyphs); @@ -1271,8 +1294,7 @@ void QTextEngine::shapeTextWithHarfbuzz(int item) const layoutData->used += si.num_glyphs; - if ((si.analysis.flags == QScriptAnalysis::SmallCaps || si.analysis.flags == QScriptAnalysis::Uppercase) - && entire_shaper_item.string != upperCased) + if (hasCaseChange(si) && entire_shaper_item.string != upperCased) delete [] const_cast(entire_shaper_item.string); } @@ -1317,7 +1339,8 @@ const HB_CharAttributes *QTextEngine::attributes() const return (HB_CharAttributes *) layoutData->memory; itemize(); - ensureSpace(layoutData->string.length()); + if (! ensureSpace(layoutData->string.length())) + return NULL; QVarLengthArray hbScriptItems(layoutData->items.size()); @@ -1864,7 +1887,10 @@ void QTextEngine::justify(const QScriptLine &line) // don't include trailing white spaces when doing justification int line_length = line.length; - const HB_CharAttributes *a = attributes()+line.from; + const HB_CharAttributes *a = attributes(); + if (! a) + return; + a += line.from; while (line_length && a[line_length-1].whiteSpace) --line_length; // subtract one char more, as we can't justfy after the last character @@ -2045,7 +2071,7 @@ QTextEngine::LayoutData::LayoutData() memory_on_stack = false; used = 0; hasBidi = false; - inLayout = false; + layoutState = LayoutEmpty; haveCharAttributes = false; logClustersPtr = 0; available_glyphs = 0; @@ -2079,7 +2105,7 @@ QTextEngine::LayoutData::LayoutData(const QString &str, void **stack_memory, int } used = 0; hasBidi = false; - inLayout = false; + layoutState = LayoutEmpty; haveCharAttributes = false; } @@ -2090,12 +2116,12 @@ QTextEngine::LayoutData::~LayoutData() memory = 0; } -void QTextEngine::LayoutData::reallocate(int totalGlyphs) +bool QTextEngine::LayoutData::reallocate(int totalGlyphs) { Q_ASSERT(totalGlyphs >= glyphLayout.numGlyphs); if (memory_on_stack && available_glyphs >= totalGlyphs) { glyphLayout.grow(glyphLayout.data(), totalGlyphs); - return; + return true; } int space_charAttributes = sizeof(HB_CharAttributes)*string.length()/sizeof(void*) + 1; @@ -2103,7 +2129,14 @@ void QTextEngine::LayoutData::reallocate(int totalGlyphs) int space_glyphs = QGlyphLayout::spaceNeededForGlyphLayout(totalGlyphs)/sizeof(void*) + 2; int newAllocated = space_charAttributes + space_glyphs + space_logClusters; - Q_ASSERT(newAllocated >= allocated); + // These values can be negative if the length of string/glyphs causes overflow, + // we can't layout such a long string all at once, so return false here to + // indicate there is a failure + if (space_charAttributes < 0 || space_logClusters < 0 || space_glyphs < 0 || newAllocated < allocated) { + layoutState = LayoutFailed; + return false; + } + void **newMem = memory; newMem = (void **)::realloc(memory_on_stack ? 0 : memory, newAllocated*sizeof(void *)); Q_CHECK_PTR(newMem); @@ -2124,6 +2157,7 @@ void QTextEngine::LayoutData::reallocate(int totalGlyphs) glyphLayout.grow(reinterpret_cast(m), totalGlyphs); allocated = newAllocated; + return true; } // grow to the new size, copying the existing data to the new layout @@ -2155,7 +2189,7 @@ void QTextEngine::freeMemory() } else { layoutData->used = 0; layoutData->hasBidi = false; - layoutData->inLayout = false; + layoutData->layoutState = LayoutEmpty; layoutData->haveCharAttributes = false; } for (int i = 0; i < lines.size(); ++i) { @@ -2314,6 +2348,9 @@ QString QTextEngine::elidedText(Qt::TextElideMode mode, const QFixed &width, int shape(i); HB_CharAttributes *attributes = const_cast(this->attributes()); + if (!attributes) + return QString(); + unsigned short *logClusters = this->logClusters(&si); QGlyphLayout glyphs = shapedGlyphs(&si); @@ -2385,6 +2422,8 @@ QString QTextEngine::elidedText(Qt::TextElideMode mode, const QFixed &width, int return QString(); const HB_CharAttributes *attributes = this->attributes(); + if (!attributes) + return QString(); if (mode == Qt::ElideRight) { QFixed currentWidth; diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h index e623fa5..4cbe81f 100644 --- a/src/gui/text/qtextengine_p.h +++ b/src/gui/text/qtextengine_p.h @@ -416,6 +416,11 @@ class QTextFormatCollection; class Q_GUI_EXPORT QTextEngine { public: + enum LayoutState { + LayoutEmpty, + InLayout, + LayoutFailed, + }; struct LayoutData { LayoutData(const QString &str, void **stack_memory, int mem_size); LayoutData(); @@ -428,11 +433,11 @@ public: QGlyphLayout glyphLayout; mutable int used; uint hasBidi : 1; - uint inLayout : 1; + uint layoutState : 2; uint memory_on_stack : 1; bool haveCharAttributes; QString string; - void reallocate(int totalGlyphs); + bool reallocate(int totalGlyphs); }; QTextEngine(LayoutData *data); @@ -520,9 +525,10 @@ public: return layoutData->glyphLayout.mid(si->glyph_data_offset, si->num_glyphs); } - inline void ensureSpace(int nGlyphs) const { + inline bool ensureSpace(int nGlyphs) const { if (layoutData->glyphLayout.numGlyphs - layoutData->used < nGlyphs) - layoutData->reallocate((((layoutData->used + nGlyphs)*3/2 + 15) >> 4) << 4); + return layoutData->reallocate((((layoutData->used + nGlyphs)*3/2 + 15) >> 4) << 4); + return true; } void freeMemory(); diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 674064e..5a11c87 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -74,6 +74,8 @@ static inline QFixed leadingSpaceWidth(QTextEngine *eng, const QScriptLine &line int pos = line.length; const HB_CharAttributes *attributes = eng->attributes(); + if (!attributes) + return QFixed(); while (pos > 0 && attributes[line.from + pos - 1].whiteSpace) --pos; return eng->width(line.from + pos, line.length - pos); @@ -601,7 +603,7 @@ bool QTextLayout::cacheEnabled() const void QTextLayout::beginLayout() { #ifndef QT_NO_DEBUG - if (d->layoutData && d->layoutData->inLayout) { + if (d->layoutData && d->layoutData->layoutState == QTextEngine::InLayout) { qWarning("QTextLayout::beginLayout: Called while already doing layout"); return; } @@ -609,7 +611,7 @@ void QTextLayout::beginLayout() d->invalidate(); d->clearLineData(); d->itemize(); - d->layoutData->inLayout = true; + d->layoutData->layoutState = QTextEngine::InLayout; } /*! @@ -618,7 +620,7 @@ void QTextLayout::beginLayout() void QTextLayout::endLayout() { #ifndef QT_NO_DEBUG - if (!d->layoutData || !d->layoutData->inLayout) { + if (!d->layoutData || d->layoutData->layoutState == QTextEngine::LayoutEmpty) { qWarning("QTextLayout::endLayout: Called without beginLayout()"); return; } @@ -627,7 +629,7 @@ void QTextLayout::endLayout() if (l && d->lines.at(l-1).length < 0) { QTextLine(l-1, d).setNumColumns(INT_MAX); } - d->layoutData->inLayout = false; + d->layoutData->layoutState = QTextEngine::LayoutEmpty; if (!d->cacheGlyphs) d->freeMemory(); } @@ -757,11 +759,14 @@ bool QTextLayout::isValidCursorPosition(int pos) const QTextLine QTextLayout::createLine() { #ifndef QT_NO_DEBUG - if (!d->layoutData || !d->layoutData->inLayout) { + if (!d->layoutData || d->layoutData->layoutState == QTextEngine::LayoutEmpty) { qWarning("QTextLayout::createLine: Called without layouting"); return QTextLine(); } #endif + if (d->layoutData->layoutState == QTextEngine::LayoutFailed) + return QTextLine(); + int l = d->lines.size(); if (l && d->lines.at(l-1).length < 0) { QTextLine(l-1, d).setNumColumns(INT_MAX); @@ -1801,6 +1806,8 @@ void QTextLine::layout_helper(int maxGlyphs) Qt::Alignment alignment = eng->option.alignment(); const HB_CharAttributes *attributes = eng->attributes(); + if (!attributes) + return; lbh.currentPosition = line.from; int end = 0; lbh.logClusters = eng->layoutData->logClustersPtr; @@ -1814,6 +1821,8 @@ void QTextLine::layout_helper(int maxGlyphs) if (!current.num_glyphs) { eng->shape(item); attributes = eng->attributes(); + if (!attributes) + return; lbh.logClusters = eng->layoutData->logClustersPtr; } lbh.currentPosition = qMax(line.from, current.position); -- cgit v0.12 From bd1aeaa50c60cffa3e195f3f6aed808f23a5c73c Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Wed, 4 Aug 2010 16:09:04 +0200 Subject: Remove the memory tracking attempt from the runtime graphics system. It has been decided that this logic will not be used by anyone at the moment so let's remove it. This removes an exported (although private) virtual function so breaks binary compatiblity for plugins built with previous versions. Reviewed-by: Jani Hautakangas --- src/gui/kernel/qapplication_s60.cpp | 10 +--- src/gui/kernel/qt_s60_p.h | 2 - src/gui/painting/qgraphicssystem_runtime.cpp | 77 ++-------------------------- src/gui/painting/qgraphicssystem_runtime_p.h | 13 ----- src/s60installs/bwins/QtGuiu.def | 2 +- src/s60installs/eabi/QtGuiu.def | 2 +- 6 files changed, 6 insertions(+), 100 deletions(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index f8734b2..1f6a4ae 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1953,13 +1953,6 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent if (switchToSwRendering) { QRuntimeGraphicsSystem *gs = static_cast(QApplicationPrivate::graphics_system); - - uint memoryUsage = gs->memoryUsage(); - uint memoryForFullscreen = ( S60->screenDepth / 8 ) - * S60->screenWidthInPixels - * S60->screenHeightInPixels; - - S60->memoryLimitForHwRendering = memoryUsage - memoryForFullscreen; gs->setGraphicsSystem(QLatin1String("raster")); } } @@ -1975,8 +1968,7 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent if(QApplicationPrivate::runtime_graphics_system) { QRuntimeGraphicsSystem *gs = static_cast(QApplicationPrivate::graphics_system); - gs->setGraphicsSystem(QLatin1String("openvg"), S60->memoryLimitForHwRendering); - S60->memoryLimitForHwRendering = 0; + gs->setGraphicsSystem(QLatin1String("openvg")); } #endif break; diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h index 7f0c99e..a18ea07 100644 --- a/src/gui/kernel/qt_s60_p.h +++ b/src/gui/kernel/qt_s60_p.h @@ -141,7 +141,6 @@ public: int supportsPremultipliedAlpha : 1; int avkonComponentsSupportTransparency : 1; int menuBeingConstructed : 1; - int memoryLimitForHwRendering; QApplication::QS60MainApplicationFactory s60ApplicationFactory; // typedef'ed pointer type enum ScanCodeState { @@ -291,7 +290,6 @@ inline QS60Data::QS60Data() supportsPremultipliedAlpha(0), avkonComponentsSupportTransparency(0), menuBeingConstructed(0), - memoryLimitForHwRendering(0), s60ApplicationFactory(0) #ifdef Q_OS_SYMBIAN ,s60InstalledTrapHandler(0) diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp index 568f4d7..be04df6 100644 --- a/src/gui/painting/qgraphicssystem_runtime.cpp +++ b/src/gui/painting/qgraphicssystem_runtime.cpp @@ -53,10 +53,8 @@ QT_BEGIN_NAMESPACE static int qt_pixmap_serial = 0; #define READBACK(f) \ - m_graphicsSystem->decreaseMemoryUsage(memoryUsage()); \ f \ - readBackInfo(); \ - m_graphicsSystem->increaseMemoryUsage(memoryUsage()); \ + readBackInfo(); class QDeferredGraphicsSystemChange : public QObject @@ -252,14 +250,6 @@ QPixmapData* QRuntimePixmapData::runtimeData() const return m_data; } -uint QRuntimePixmapData::memoryUsage() const -{ - if(is_null || d == 0) - return 0; - return w * h * (d / 8); -} - - QRuntimeWindowSurface::QRuntimeWindowSurface(const QRuntimeGraphicsSystem *gs, QWidget *window) : QWindowSurface(window), m_windowSurface(0), m_pendingWindowSurface(0), m_graphicsSystem(gs) { @@ -295,9 +285,7 @@ void QRuntimeWindowSurface::flush(QWidget *widget, const QRegion ®ion, void QRuntimeWindowSurface::setGeometry(const QRect &rect) { - m_graphicsSystem->decreaseMemoryUsage(memoryUsage()); m_windowSurface->setGeometry(rect); - m_graphicsSystem->increaseMemoryUsage(memoryUsage()); } bool QRuntimeWindowSurface::scroll(const QRegion &area, int dx, int dy) @@ -330,18 +318,9 @@ QPoint QRuntimeWindowSurface::offset(const QWidget *widget) const return m_windowSurface->offset(widget); } -uint QRuntimeWindowSurface::memoryUsage() const -{ - QPaintDevice *pdev = m_windowSurface->paintDevice(); - if (pdev && pdev->depth() != 0) - return pdev->width() * pdev->height() * (pdev->depth()/8); - - return 0; -} - QRuntimeGraphicsSystem::QRuntimeGraphicsSystem() - : m_memoryUsage(0), m_windowSurfaceDestroyPolicy(DestroyImmediately), - m_graphicsSystem(0), m_graphicsSystemChangeMemoryLimit(0) + : m_windowSurfaceDestroyPolicy(DestroyImmediately), + m_graphicsSystem(0) { QApplicationPrivate::graphics_system_name = QLatin1String("runtime"); QApplicationPrivate::runtime_graphics_system = true; @@ -379,34 +358,15 @@ QWindowSurface *QRuntimeGraphicsSystem::createWindowSurface(QWidget *widget) con rtSurface->m_windowSurface = m_graphicsSystem->createWindowSurface(widget); widget->setWindowSurface(rtSurface); m_windowSurfaces << rtSurface; - increaseMemoryUsage(rtSurface->memoryUsage()); return rtSurface; } -/*! - Sets graphics system when resource memory consumption is under /a memoryUsageLimit. -*/ -void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name, uint memoryUsageLimit) -{ -#ifdef QT_DEBUG - qDebug() << "QRuntimeGraphicsSystem::setGraphicsSystem( "<< name <<", " << memoryUsageLimit << ")"; - qDebug() << " current approximated graphics system memory usage " << memoryUsage() << " bytes"; -#endif - if (memoryUsage() >= memoryUsageLimit) { - m_graphicsSystemChangeMemoryLimit = memoryUsageLimit; - m_pendingGraphicsSystemName = name; - } else { - setGraphicsSystem(name); - } -} - void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name) { if (m_graphicsSystemName == name) return; #ifdef QT_DEBUG qDebug() << "QRuntimeGraphicsSystem::setGraphicsSystem( " << name << " )"; - qDebug() << " current approximated graphics system memory usage "<< memoryUsage() << " bytes"; #endif delete m_graphicsSystem; m_graphicsSystem = QGraphicsSystemFactory::create(name); @@ -414,7 +374,6 @@ void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name) Q_ASSERT(m_graphicsSystem); - m_graphicsSystemChangeMemoryLimit = 0; m_pendingGraphicsSystemName = QString(); for (int i = 0; i < m_pixmapDatas.size(); ++i) { @@ -447,42 +406,12 @@ void QRuntimeGraphicsSystem::removePixmapData(QRuntimePixmapData *pixmapData) co { int index = m_pixmapDatas.lastIndexOf(pixmapData); m_pixmapDatas.removeAt(index); - decreaseMemoryUsage(pixmapData->memoryUsage(), true); } void QRuntimeGraphicsSystem::removeWindowSurface(QRuntimeWindowSurface *windowSurface) const { int index = m_windowSurfaces.lastIndexOf(windowSurface); m_windowSurfaces.removeAt(index); - decreaseMemoryUsage(windowSurface->memoryUsage(), true); -} - -void QRuntimeGraphicsSystem::increaseMemoryUsage(uint amount) const -{ - m_memoryUsage += amount; - - if (m_graphicsSystemChangeMemoryLimit && - m_memoryUsage < m_graphicsSystemChangeMemoryLimit) { - - QRuntimeGraphicsSystem *gs = const_cast(this); - QDeferredGraphicsSystemChange *deferredChange = - new QDeferredGraphicsSystemChange(gs, m_pendingGraphicsSystemName); - deferredChange->launch(); - } -} - -void QRuntimeGraphicsSystem::decreaseMemoryUsage(uint amount, bool persistent) const -{ - m_memoryUsage -= amount; - - if (persistent && m_graphicsSystemChangeMemoryLimit && - m_memoryUsage < m_graphicsSystemChangeMemoryLimit) { - - QRuntimeGraphicsSystem *gs = const_cast(this); - QDeferredGraphicsSystemChange *deferredChange = - new QDeferredGraphicsSystemChange(gs, m_pendingGraphicsSystemName); - deferredChange->launch(); - } } #include "qgraphicssystem_runtime.moc" diff --git a/src/gui/painting/qgraphicssystem_runtime_p.h b/src/gui/painting/qgraphicssystem_runtime_p.h index 7aab89c..d4c9152 100644 --- a/src/gui/painting/qgraphicssystem_runtime_p.h +++ b/src/gui/painting/qgraphicssystem_runtime_p.h @@ -104,8 +104,6 @@ public: virtual QPixmapData *runtimeData() const; - virtual uint memoryUsage() const; - private: const QRuntimeGraphicsSystem *m_graphicsSystem; @@ -131,8 +129,6 @@ public: virtual QPoint offset(const QWidget *widget) const; - virtual uint memoryUsage() const; - QWindowSurface *m_windowSurface; QWindowSurface *m_pendingWindowSurface; @@ -159,7 +155,6 @@ public: void removePixmapData(QRuntimePixmapData *pixmapData) const; void removeWindowSurface(QRuntimeWindowSurface *windowSurface) const; - void setGraphicsSystem(const QString &name, uint memoryUsageLimit); void setGraphicsSystem(const QString &name); QString graphicsSystemName() const { return m_graphicsSystemName; } @@ -170,22 +165,14 @@ public: int windowSurfaceDestroyPolicy() const { return m_windowSurfaceDestroyPolicy; } - uint memoryUsage() const { return m_memoryUsage; } - -private: - - void increaseMemoryUsage(uint amount) const; - void decreaseMemoryUsage(uint amount, bool persistent = false) const; private: - mutable uint m_memoryUsage; int m_windowSurfaceDestroyPolicy; QGraphicsSystem *m_graphicsSystem; mutable QList m_pixmapDatas; mutable QList m_windowSurfaces; QString m_graphicsSystemName; - uint m_graphicsSystemChangeMemoryLimit; QString m_pendingGraphicsSystemName; friend class QRuntimePixmapData; diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index 7844688..90c0878 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -12832,7 +12832,7 @@ EXPORTS ?readBackInfo@QRuntimePixmapData@@QAEXXZ @ 12831 NONAME ; void QRuntimePixmapData::readBackInfo(void) ??_EQRuntimePixmapData@@UAE@I@Z @ 12832 NONAME ; QRuntimePixmapData::~QRuntimePixmapData(unsigned int) ?paintEngine@QRuntimePixmapData@@UBEPAVQPaintEngine@@XZ @ 12833 NONAME ; class QPaintEngine * QRuntimePixmapData::paintEngine(void) const - ?memoryUsage@QRuntimePixmapData@@UBEIXZ @ 12834 NONAME ; unsigned int QRuntimePixmapData::memoryUsage(void) const + ?memoryUsage@QRuntimePixmapData@@UBEIXZ @ 12834 NONAME ABSENT ; unsigned int QRuntimePixmapData::memoryUsage(void) const ?toImage@QRasterPixmapData@@UBE?AVQImage@@ABVQRect@@@Z @ 12835 NONAME ; class QImage QRasterPixmapData::toImage(class QRect const &) const ?fromImageReader@QRasterPixmapData@@UAEXPAVQImageReader@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12836 NONAME ; void QRasterPixmapData::fromImageReader(class QImageReader *, class QFlags) ?fill@QRuntimePixmapData@@UAEXABVQColor@@@Z @ 12837 NONAME ; void QRuntimePixmapData::fill(class QColor const &) diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def index a22b4d9..d8e86bf 100644 --- a/src/s60installs/eabi/QtGuiu.def +++ b/src/s60installs/eabi/QtGuiu.def @@ -12046,7 +12046,7 @@ EXPORTS _ZN18QRuntimePixmapDataD1Ev @ 12045 NONAME _ZN18QRuntimePixmapDataD2Ev @ 12046 NONAME _ZN7QPixmap15fromImageReaderEP12QImageReader6QFlagsIN2Qt19ImageConversionFlagEE @ 12047 NONAME - _ZNK18QRuntimePixmapData11memoryUsageEv @ 12048 NONAME + _ZNK18QRuntimePixmapData11memoryUsageEv @ 12048 NONAME ABSENT _ZNK18QRuntimePixmapData11paintEngineEv @ 12049 NONAME _ZNK18QRuntimePixmapData11runtimeDataEv @ 12050 NONAME _ZNK18QRuntimePixmapData11transformedERK10QTransformN2Qt18TransformationModeE @ 12051 NONAME -- cgit v0.12 From 6ca2fe678740f4830de2388e9b2928813561373c Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 5 Aug 2010 15:13:58 +0200 Subject: Designer: Prevent rich text from being copied into style sheets. Reviewed-by: Lasse Holmstedt Task-number: QTCREATORBUG-1952 --- tools/designer/src/lib/shared/stylesheeteditor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/designer/src/lib/shared/stylesheeteditor.cpp b/tools/designer/src/lib/shared/stylesheeteditor.cpp index b76d700..e809447 100644 --- a/tools/designer/src/lib/shared/stylesheeteditor.cpp +++ b/tools/designer/src/lib/shared/stylesheeteditor.cpp @@ -79,6 +79,7 @@ StyleSheetEditor::StyleSheetEditor(QWidget *parent) : QTextEdit(parent) { setTabStopWidth(fontMetrics().width(QLatin1Char(' '))*4); + setAcceptRichText(false); new CssHighlighter(document()); } -- cgit v0.12 From 13a0378151a5dc67d1dca91dffac573d051c37f8 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 5 Aug 2010 15:32:56 +0200 Subject: Updated WebKit to 413404da27312051bb3ff2cfd0f3fca42aa4b245 || || [Qt] Input mode states are not reset after entering a password field || --- src/3rdparty/webkit/.tag | 2 +- src/3rdparty/webkit/VERSION | 2 +- src/3rdparty/webkit/WebKit/qt/ChangeLog | 17 +++++++++++++++++ .../WebKit/qt/WebCoreSupport/EditorClientQt.cpp | 7 +++++++ .../qt/tests/qwebview/resources/input_types.html | 5 +++-- .../webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp | 19 +++++++++++++++++++ 6 files changed, 48 insertions(+), 4 deletions(-) diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index 718ea9d..fb2703e 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -d6aa024c84f61d0602bef4eef84efaed7cfeefcc +413404da27312051bb3ff2cfd0f3fca42aa4b245 diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 1826cb6..c256434 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - d6aa024c84f61d0602bef4eef84efaed7cfeefcc + 413404da27312051bb3ff2cfd0f3fca42aa4b245 diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index 94aca65..5083ba5 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,20 @@ +2010-08-05 David Leong + + Reviewed by Simon Hausmann. + + [Qt] Input mode states are not reset after entering a password field + https://bugs.webkit.org/show_bug.cgi?id=43530 + + Input mode hints are not reset if clicking on password elements then + clicking on
+ diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp index 5dc5e41..bd19578 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp @@ -264,30 +264,37 @@ void tst_QWebView::focusInputTypes() #else QVERIFY(webView->inputMethodHints() == Qt::ImhNone); #endif + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'password' field webView->fireMouseClick(QPoint(20, 60)); QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'tel' field webView->fireMouseClick(QPoint(20, 110)); QVERIFY(webView->inputMethodHints() == Qt::ImhDialableCharactersOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'number' field webView->fireMouseClick(QPoint(20, 160)); QVERIFY(webView->inputMethodHints() == Qt::ImhDigitsOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'email' field webView->fireMouseClick(QPoint(20, 210)); QVERIFY(webView->inputMethodHints() == Qt::ImhEmailCharactersOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'url' field webView->fireMouseClick(QPoint(20, 260)); QVERIFY(webView->inputMethodHints() == Qt::ImhUrlCharactersOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'password' field webView->fireMouseClick(QPoint(20, 60)); QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'text' type webView->fireMouseClick(QPoint(20, 10)); @@ -297,6 +304,18 @@ void tst_QWebView::focusInputTypes() #else QVERIFY(webView->inputMethodHints() == Qt::ImhNone); #endif + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); + + // 'password' field + webView->fireMouseClick(QPoint(20, 60)); + QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); + + qWarning("clicking on text area"); + // 'text area' field + webView->fireMouseClick(QPoint(20, 320)); + QVERIFY(webView->inputMethodHints() == Qt::ImhNone); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); delete webView; -- cgit v0.12 From c1ce7b4b01c1049c61881bb7d701ed68b92a401b Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 5 Aug 2010 14:56:50 +0200 Subject: qdoc: added application flags in doc.pri and fixed QTBUG-12388 Task-nr: QTBUG-12388 --- doc/doc.pri | 4 ++-- doc/src/index.qdoc | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/doc.pri b/doc/doc.pri index f748f3d..e1efa21 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -19,8 +19,8 @@ $$unixstyle { QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/bin/qdoc3.exe $$DOCS_GENERATION_DEFINES QDOC = $$replace(QDOC, "/", "\\") } -ADP_DOCS_QDOCCONF_FILE = qt-build-docs.qdocconf -QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ +ADP_DOCS_QDOCCONF_FILE = -online qt-build-docs.qdocconf +QT_DOCUMENTATION = ($$QDOC -assistant qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \ (cd $$QT_BUILD_TREE && \ $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \ diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 7efd1e6..6e37e89 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -94,12 +94,14 @@
-- cgit v0.12 From 24c3948e53d7239049f6c2ad43add458bee48902 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 5 Aug 2010 14:59:18 +0200 Subject: qdoc: added application flags in doc.pri and fixed QTBUG-12388 Task-nr: QTBUG-12388 --- doc/src/index.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 6e37e89..fe9b7d4 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -101,7 +101,7 @@
  • Qt qmake
  • Qt Simulator (online)
  • Eclipse Integration (online)
    • -
  • Add-On Products and Services (online)
    • +
  • Add-On Products and Services (online)
  • Virtual Framebuffer
    • -- cgit v0.12 From 205b1b20650839114d319fa381cc500141cdd54e Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 5 Aug 2010 15:17:20 +0200 Subject: qdoc: added application flags in doc.pri and fixed QTBUG-12388 Task-nr: QTBUG-12388 --- doc/src/index.qdoc | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index fe9b7d4..f890aa6 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -109,4 +109,5 @@ \endraw + */ -- cgit v0.12 From 951a4721c58edc0f9cad262cf3679e75fe4d62e6 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 5 Aug 2010 15:46:53 +0200 Subject: qdoc: added application flags in doc.pri and fixed QTBUG-12388 Task-nr: QTBUG-12388 --- doc/src/index.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index f890aa6..6d53abf 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -101,7 +101,7 @@
  • Qt qmake
  • Qt Simulator (online)
  • Eclipse Integration (online)
    • -
  • Add-On Products and Services (online)
    • +
  • Add-On Products and Services (online)
  • Virtual Framebuffer
    • -- cgit v0.12 From b55895cf6164fd479ce6728d6c72e1c4fffd2491 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 5 Aug 2010 15:52:05 +0200 Subject: qdoc: added application flags in doc.pri and fixed QTBUG-12388 Task-nr: QTBUG-12388 --- doc/src/index.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 6d53abf..f890aa6 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -101,7 +101,7 @@
  • Qt qmake
  • Qt Simulator (online)
  • Eclipse Integration (online)
    • -
  • Add-On Products and Services (online)
    • +
  • Add-On Products and Services (online)
  • Virtual Framebuffer
    • -- cgit v0.12 From cb086eb5340c4c41efaf45373aa05c37e8aa974a Mon Sep 17 00:00:00 2001 From: David Boddie Date: Thu, 5 Aug 2010 17:19:48 +0200 Subject: Doc: Fixed qdoc warnings. Reviewed-by: Trust Me --- doc/src/declarative/declarativeui.qdoc | 2 +- doc/src/declarative/qtdeclarative.qdoc | 2 +- doc/src/examples/qml-examples.qdoc | 2 +- doc/src/examples/simpletreemodel.qdoc | 4 +- doc/src/examples/spinboxdelegate.qdoc | 4 +- doc/src/external-resources.qdoc | 2 +- doc/src/index.qdoc | 10 ++--- doc/src/modules.qdoc | 1 - doc/src/overviews.qdoc | 3 +- doc/src/qt-webpages.qdoc | 5 +++ src/dbus/qdbusconnection.cpp | 4 ++ src/declarative/qml/qdeclarativeimageprovider.cpp | 8 ++-- src/declarative/util/qdeclarativeanimation.cpp | 2 +- src/declarative/util/qdeclarativetransition.cpp | 4 +- src/gui/graphicsview/qgraphicsitem.cpp | 18 +++++++++ src/gui/graphicsview/qgraphicstransform.cpp | 21 +++++++++++ src/gui/s60framework/qs60mainapplication.cpp | 6 +++ src/gui/s60framework/qs60mainappui.cpp | 45 +++++++++++++++++++++++ src/network/access/qnetworkrequest.cpp | 20 +++++----- tools/qdoc3/test/qt-html-templates.qdocconf | 7 +--- 20 files changed, 130 insertions(+), 40 deletions(-) diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc index 217e372..42189c0 100644 --- a/doc/src/declarative/declarativeui.qdoc +++ b/doc/src/declarative/declarativeui.qdoc @@ -27,7 +27,7 @@ /*! \title Qt Quick -\page declarativeui.html +\page qtquick.html \brief Qt Quick provides a declarative framework for building highly dynamic, custom user interfaces. diff --git a/doc/src/declarative/qtdeclarative.qdoc b/doc/src/declarative/qtdeclarative.qdoc index 413eb59..b4f4c83 100644 --- a/doc/src/declarative/qtdeclarative.qdoc +++ b/doc/src/declarative/qtdeclarative.qdoc @@ -48,7 +48,7 @@ \endcode For more information on the Qt Declarative module, see the - \l{declarativeui.html}{Qt Quick} documentation. + \l{Qt Quick} documentation. */ diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc index 8d3aa25..0d191c9 100644 --- a/doc/src/examples/qml-examples.qdoc +++ b/doc/src/examples/qml-examples.qdoc @@ -562,7 +562,7 @@ \example declarative/ui-components/dialcontrol This example shows how to create a dial-type control. It combines - \l Image elements with \l Rotation transforms and \l SpringAnimatino behaviors + \l Image elements with \l Rotation transforms and \l SpringAnimation behaviors to produce an interactive speedometer-type dial. \image qml-dialcontrol-example.png diff --git a/doc/src/examples/simpletreemodel.qdoc b/doc/src/examples/simpletreemodel.qdoc index c34f4af..790d5fa 100644 --- a/doc/src/examples/simpletreemodel.qdoc +++ b/doc/src/examples/simpletreemodel.qdoc @@ -32,7 +32,7 @@ The Simple Tree Model example shows how to create a basic, read-only hierarchical model to use with Qt's standard view classes. For a description of simple non-hierarchical list and table models, see the - \l{model-view-programming.html}{Model/View Programming} overview. + \l{Model/View Programming} overview. \image simpletreemodel-example.png @@ -40,7 +40,7 @@ information in a data source, using an abstract model of the data to simplify and standardize the way it is accessed. Simple models represent data as a table of items, and allow views to access this data via an - \l{model-view-model.html}{index-based} system. More generally, models can + \l{Model/View Programming#Models}{index-based} system. More generally, models can be used to represent data in the form of a tree structure by allowing each item to act as a parent to a table of child items. diff --git a/doc/src/examples/spinboxdelegate.qdoc b/doc/src/examples/spinboxdelegate.qdoc index 49e3295..48e4bfa 100644 --- a/doc/src/examples/spinboxdelegate.qdoc +++ b/doc/src/examples/spinboxdelegate.qdoc @@ -42,8 +42,8 @@ \image spinboxdelegate-example.png This concepts behind this example are covered in the - \l{model-view-delegate.html}{Delegate Classes} chapter of the - \l{model-view-programming.html}{Model/View Programming} overview. + \l{Model/View Programming#Delegate Classes}{Delegate Classes} chapter of the + \l{Model/View Programming} overview. \section1 SpinBoxDelegate Class Definition diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index 5c6108a..e901124c 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -416,7 +416,7 @@ /*! \externalpage http://opensource.org/licenses/bsd-license.php - \title BSD License + \title New and Modified BSD Licenses */ /*! diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 7efd1e6..499667c 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -65,7 +65,6 @@
    @@ -94,12 +92,12 @@
    diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index a81bfb2..c51fcad 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -116,7 +116,6 @@ /*! \module QtMultimedia - \page qtmultimedia-module.html \title QtMultimedia Module \contentspage All Modules \previouspage QtCore diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index a1773a3..c7b88cf 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -55,8 +55,7 @@ These pages are about Qt's traditional set of GUI components for building both native look ^ feel and custom UI's for the desktop - environment. Use \l {declarativeui.html} {Qt Quick} for building - UI's for mobile devices. + environment. Use \l{Qt Quick} for building UI's for mobile devices. \generatelist {related} */ diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc index 0c61285..5d9b41b 100644 --- a/doc/src/qt-webpages.qdoc +++ b/doc/src/qt-webpages.qdoc @@ -234,3 +234,8 @@ \externalpage http://qt.gitorious.org \title Public Qt Repository */ + +/*! + \externalpage http://get.qt.nokia.com/nokiasmartinstaller/ + \title Smart Installer +*/ diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index 5cbb8ca..87ee3d1 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -227,6 +227,10 @@ void QDBusConnectionManager::setConnection(const QString &name, QDBusConnectionP \value ExportChildObjects export this object's child objects + \value ExportScriptableInvokables export this object's scriptable methods + \value ExportNonScriptableInvokables export this object's non-scriptable methods + \value ExportAllInvokables export all of this object's methods + \sa registerObject(), QDBusAbstractAdaptor, {usingadaptors.html}{Using adaptors} */ diff --git a/src/declarative/qml/qdeclarativeimageprovider.cpp b/src/declarative/qml/qdeclarativeimageprovider.cpp index 241df87..4743a1b 100644 --- a/src/declarative/qml/qdeclarativeimageprovider.cpp +++ b/src/declarative/qml/qdeclarativeimageprovider.cpp @@ -59,13 +59,13 @@ public: \list \o Loaded using QPixmaps rather than actual image files - \o Loaded asynchronously in a separate thread, if imageType() is \l ImageType::Image + \o Loaded asynchronously in a separate thread, if imageType() is \l{QDeclarativeImageProvider::ImageType}{ImageType::Image} \endlist To specify that an image should be loaded by an image provider, use the \bold {"image:"} scheme for the URL source of the image, followed by the identifiers of the image provider and the requested image. For example: - + \qml Image { source: "image://myimageprovider/image.png" } \endqml @@ -83,7 +83,7 @@ public: and "red", respectively: \snippet examples/declarative/cppextensions/imageprovider/imageprovider-example.qml 0 - + When these images are loaded by QML, it looks for a matching image provider and calls its requestImage() or requestPixmap() method (depending on its imageType()) to load the image. The method is called with the \c id @@ -136,7 +136,7 @@ public: main thread. In this case, if \l {Image::}{asynchronous} is set to \c true, the value is ignored and the image is loaded synchronously. - + \sa QDeclarativeEngine::addImageProvider() */ diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index 6a9cf95..cda7623 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -1323,7 +1323,7 @@ void QDeclarativeVector3dAnimation::setTo(QVector3D t) \snippet doc/src/snippets/declarative/rotationanimation.qml 0 - Notice the RotationAnimation did not need to set a \l {RotationAnimation::}{target} + Notice the RotationAnimation did not need to set a \l target value. As a convenience, when used in a transition, RotationAnimation will rotate all properties named "rotation" or "angle". You can override this by providing your own properties via \l {PropertyAnimation::properties}{properties} or diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp index 582191b..8de6b23 100644 --- a/src/declarative/util/qdeclarativetransition.cpp +++ b/src/declarative/util/qdeclarativetransition.cpp @@ -60,10 +60,10 @@ QT_BEGIN_NAMESPACE For example, the following \l Rectangle has two states: the default state, and an added "moved" state. In the "moved state, the rectangle's position changes - to (50, 50). The added \l Transition specifies that when the rectangle + to (50, 50). The added Transition specifies that when the rectangle changes between the default and the "moved" state, any changes to the \c x and \c y properties should be animated, using an \c Easing.InOutQuad. - + \snippet doc/src/snippets/declarative/transition.qml 0 To define multiple transitions, specify \l Item::transitions as a list: diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 1626d83..2856699 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -7965,6 +7965,24 @@ void QGraphicsItemPrivate::resetHeight() */ /*! + \property QGraphicsObject::children + \since 4.7 + \internal +*/ + +/*! + \property QGraphicsObject::width + \since 4.7 + \internal +*/ + +/*! + \property QGraphicsObject::height + \since 4.7 + \internal +*/ + +/*! \class QAbstractGraphicsShapeItem \brief The QAbstractGraphicsShapeItem class provides a common base for all path items. diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp index 986bee6..27dceb8 100644 --- a/src/gui/graphicsview/qgraphicstransform.cpp +++ b/src/gui/graphicsview/qgraphicstransform.cpp @@ -565,6 +565,27 @@ void QGraphicsRotation::applyTo(QMatrix4x4 *matrix) const \sa QGraphicsRotation::axis */ +/*! + \fn QGraphicsScale::xScaleChanged() + \since 4.7 + + This signal is emitted whenever the \l xScale property changes. +*/ + +/*! + \fn QGraphicsScale::yScaleChanged() + \since 4.7 + + This signal is emitted whenever the \l yScale property changes. +*/ + +/*! + \fn QGraphicsScale::zScaleChanged() + \since 4.7 + + This signal is emitted whenever the \l zScale property changes. +*/ + #include "moc_qgraphicstransform.cpp" QT_END_NAMESPACE diff --git a/src/gui/s60framework/qs60mainapplication.cpp b/src/gui/s60framework/qs60mainapplication.cpp index 0f9367e..185c06f 100644 --- a/src/gui/s60framework/qs60mainapplication.cpp +++ b/src/gui/s60framework/qs60mainapplication.cpp @@ -141,11 +141,17 @@ void QS60MainApplication::PreDocConstructL() QS60MainApplicationBase::PreDocConstructL(); } +/*! + \internal +*/ CDictionaryStore *QS60MainApplication::OpenIniFileLC(RFs &aFs) const { return QS60MainApplicationBase::OpenIniFileLC(aFs); } +/*! + \internal +*/ void QS60MainApplication::NewAppServerL(CApaAppServer *&aAppServer) { QS60MainApplicationBase::NewAppServerL(aAppServer); diff --git a/src/gui/s60framework/qs60mainappui.cpp b/src/gui/s60framework/qs60mainappui.cpp index 40c2d03..72cf577 100644 --- a/src/gui/s60framework/qs60mainappui.cpp +++ b/src/gui/s60framework/qs60mainappui.cpp @@ -281,76 +281,121 @@ void QS60MainAppUi::RestoreMenuL(CCoeControl *menuWindow, TInt resourceId, TMenu } } +/*! + \internal +*/ void QS60MainAppUi::Exit() { QS60MainAppUiBase::Exit(); } +/*! + \internal +*/ void QS60MainAppUi::SetFadedL(TBool aFaded) { QS60MainAppUiBase::SetFadedL(aFaded); } +/*! + \internal +*/ TRect QS60MainAppUi::ApplicationRect() const { return QS60MainAppUiBase::ApplicationRect(); } +/*! + \internal +*/ void QS60MainAppUi::HandleScreenDeviceChangedL() { QS60MainAppUiBase::HandleScreenDeviceChangedL(); } +/*! + \internal +*/ void QS60MainAppUi::HandleApplicationSpecificEventL(TInt aType, const TWsEvent &aEvent) { QS60MainAppUiBase::HandleApplicationSpecificEventL(aType, aEvent); } +/*! + \internal +*/ TTypeUid::Ptr QS60MainAppUi::MopSupplyObject(TTypeUid aId) { return QS60MainAppUiBase::MopSupplyObject(aId); } +/*! + \internal +*/ void QS60MainAppUi::ProcessCommandL(TInt aCommand) { QS60MainAppUiBase::ProcessCommandL(aCommand); } +/*! + \internal +*/ TErrorHandlerResponse QS60MainAppUi::HandleError (TInt aError, const SExtendedError &aExtErr, TDes &aErrorText, TDes &aContextText) { return QS60MainAppUiBase::HandleError(aError, aExtErr, aErrorText, aContextText); } +/*! + \internal +*/ void QS60MainAppUi::HandleViewDeactivation(const TVwsViewId &aViewIdToBeDeactivated, const TVwsViewId &aNewlyActivatedViewId) { QS60MainAppUiBase::HandleViewDeactivation(aViewIdToBeDeactivated, aNewlyActivatedViewId); } +/*! + \internal +*/ void QS60MainAppUi::PrepareToExit() { QS60MainAppUiBase::PrepareToExit(); } +/*! + \internal +*/ void QS60MainAppUi::HandleTouchPaneSizeChange() { QS60MainAppUiBase::HandleTouchPaneSizeChange(); } +/*! + \internal +*/ void QS60MainAppUi::HandleSystemEventL(const TWsEvent &aEvent) { QS60MainAppUiBase::HandleSystemEventL(aEvent); } +/*! + \internal +*/ void QS60MainAppUi::Reserved_MtsmPosition() { QS60MainAppUiBase::Reserved_MtsmPosition(); } +/*! + \internal +*/ void QS60MainAppUi::Reserved_MtsmObject() { QS60MainAppUiBase::Reserved_MtsmObject(); } +/*! + \internal +*/ void QS60MainAppUi::HandleForegroundEventL(TBool aForeground) { QS60MainAppUiBase::HandleForegroundEventL(aForeground); diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index fa592c2..8710cb6 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -174,12 +174,12 @@ QT_BEGIN_NAMESPACE When using this flag with sequential upload data, the ContentLengthHeader header must be set. - \value HttpPipeliningAllowedAttribute + \value HttpPipeliningAllowedAttribute Requests only, type: QVariant::Bool (default: false) Indicates whether the QNetworkAccessManager code is allowed to use HTTP pipelining with this request. - \value HttpPipeliningWasUsedAttribute + \value HttpPipeliningWasUsedAttribute Replies only, type: QVariant::Bool Indicates whether the HTTP pipelining was used for receiving this reply. @@ -200,9 +200,9 @@ QT_BEGIN_NAMESPACE See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information. - \since 4.7 + (This value was introduced in 4.7.) - \value CookieSaveControlAttribute + \value CookieSaveControlAttribute Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic) Indicates whether to save 'Cookie' headers received from the server in reply to the request. @@ -213,9 +213,9 @@ QT_BEGIN_NAMESPACE See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information. - \since 4.7 + (This value was introduced in 4.7.) - \value AuthenticationReuseAttribute + \value AuthenticationReuseAttribute Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic) Indicates whether to use cached authorization credentials in the request, if available. If this is set to QNetworkRequest::Manual and the authentication @@ -228,15 +228,13 @@ QT_BEGIN_NAMESPACE See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information. - \since 4.7 + (This value was introduced in 4.7.) \omitvalue MaximumDownloadBufferSizeAttribute - \since 4.7 - \internal + (This value was introduced in 4.7.) \omitvalue DownloadBufferAttribute - \since 4.7 - \internal + (This value was introduced in 4.7.) \value User Special type. Additional information can be passed in diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index cf15628..089b11f 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -4,9 +4,6 @@ HTML.stylesheets = style/style.css \ style/style_ie8.css \ style/style_ie6.css -HTML.creatorpostheader = "**\n" -HTML.creatorpostpostheader = "***\n" - HTML.postheader = "
    \n" \ "
    \n" \ "
    \n" \ @@ -48,7 +45,7 @@ HTML.postheader = "
    \n" \ "
  • Qt Topics \n" \ "
      \n" \ "
    • Basic Qt architecture
      • \n" \ - "
    • Device UI's & Qt Quick
      • \n" \ + "
    • Device UI's & Qt Quick
      • \n" \ "
    • Desktop UI components
      • \n" \ "
    • Platform-specific info
      • \n" \ "
    • How-To's and Best Practices
      • \n" \ @@ -100,7 +97,7 @@ HTML.postheader = "
      \n" \ "
      \n" \ " \n" \ -- cgit v0.12 From 4bc408c6faade543c76fa0c7b8841ce72c239688 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Thu, 5 Aug 2010 17:24:31 +0200 Subject: Adding a description for the Spectrum Analyzer demo. For QTBUG-12180 Reviewed by: David Boddie --- doc/src/demos/spectrum.qdoc | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 doc/src/demos/spectrum.qdoc diff --git a/doc/src/demos/spectrum.qdoc b/doc/src/demos/spectrum.qdoc new file mode 100644 index 0000000..944f944 --- /dev/null +++ b/doc/src/demos/spectrum.qdoc @@ -0,0 +1,39 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in a +** written agreement between you and Nokia. +** +** GNU Free Documentation License +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of this +** file. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example demos/spectrum + \title Spectrum Analyzer + +This application is a demo which uses the QtMultimedia APIs to capture and +play back PCM audio. While either recording or playback is ongoing, the +application performs real-time level and frequency spectrum analysis, +displaying the results in its main window. + + +*/ + -- cgit v0.12 From a49f2700c6b5c0f5851f9cfab38b5554e9530577 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 5 Aug 2010 17:22:38 +0200 Subject: QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff Task-number: QTBUG-12553 Reviewed-by: Carlos Duclos --- doc/src/widgets-and-layouts/stylesheet.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc index 1390376..977f641 100644 --- a/doc/src/widgets-and-layouts/stylesheet.qdoc +++ b/doc/src/widgets-and-layouts/stylesheet.qdoc @@ -925,7 +925,7 @@ The scroller is styled using the \l{#scroller-sub}{::scroller}. - The tear-off is styled using the \l{#tear-off-sub}{::tear-off}. + The tear-off is styled using the \l{#tearoff-sub}{::tearoff}. See \l{Qt Style Sheets Examples#Customizing QMenu}{Customizing QMenu} for an example. @@ -3337,7 +3337,7 @@ \o The tear indicator of a QTabBar. \row - \o \c ::tear-off \target tear-off-sub + \o \c ::tearoff \target tearoff-sub \o The tear-off indicator of a QMenu. \row -- cgit v0.12 From 8155ee1db55893876165936f4e9d551b45c0f35a Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Thu, 5 Aug 2010 17:45:52 +0200 Subject: Move note on connectToBus() not actually being able to reconnect to connectToBus() documentation, where it belongs. This also fixes some bad English ("make be connected") by means of removing it. Merge-request: 2443 Reviewed-by: Oswald Buddenhagen --- src/dbus/qdbusconnection.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index 5cbb8ca..055fead 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -173,6 +173,9 @@ void QDBusConnectionManager::setConnection(const QString &name, QDBusConnectionP The connection is then torn down using the disconnectFromBus() function. + Once disconnected, calling connectToBus() will not reestablish a + connection, you must create a new QDBusConnection instance. + As a convenience for the two most common connection types, the sessionBus() and systemBus() functions return open connections to the session server daemon and the system server daemon, @@ -853,10 +856,6 @@ QDBusConnectionInterface *QDBusConnection::interface() const /*! Returns true if this QDBusConnection object is connected. - - If it isn't connected, calling connectToBus() on the same - connection name will not make be connected. You need to call the - QDBusConnection constructor again. */ bool QDBusConnection::isConnected() const { -- cgit v0.12 From 0dfc5666d2b615b2c4c0c2f392771b001de9163b Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Thu, 5 Aug 2010 17:45:53 +0200 Subject: Remove useless QString::clear() from QSharedData example snippet. Merge-request: 2443 Reviewed-by: Oswald Buddenhagen --- doc/src/snippets/sharedemployee/employee.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/snippets/sharedemployee/employee.h b/doc/src/snippets/sharedemployee/employee.h index 18b47e0..2c9ba6f 100644 --- a/doc/src/snippets/sharedemployee/employee.h +++ b/doc/src/snippets/sharedemployee/employee.h @@ -48,7 +48,7 @@ class EmployeeData : public QSharedData { public: - EmployeeData() : id(-1) { name.clear(); } + EmployeeData() : id(-1) { } EmployeeData(const EmployeeData &other) : QSharedData(other), id(other.id), name(other.name) { } ~EmployeeData() { } -- cgit v0.12 From ae2e8c0f479e0b4d819023ddcfd6db81dd773bf3 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Fri, 6 Aug 2010 09:38:53 +1000 Subject: Remove some warnings Reviewed-by: Aaron Kennedy --- src/declarative/qml/qdeclarativecompiler.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index ba757fc..2b4a4a5 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -2215,10 +2215,11 @@ bool QDeclarativeCompiler::checkDynamicMeta(QDeclarativeParser::Object *obj) if (propNames.contains(prop.name)) COMPILE_EXCEPTION(&prop, tr("Duplicate property name")); - if (QString::fromUtf8(prop.name).at(0).isUpper()) + QString propName = QString::fromUtf8(prop.name); + if (propName.at(0).isUpper()) COMPILE_EXCEPTION(&prop, tr("Property names cannot begin with an upper case letter")); - if (QDeclarativeEnginePrivate::get(engine)->globalClass->illegalNames().contains(prop.name)) + if (QDeclarativeEnginePrivate::get(engine)->globalClass->illegalNames().contains(propName)) COMPILE_EXCEPTION(&prop, tr("Illegal property name")); propNames.insert(prop.name); @@ -2228,9 +2229,10 @@ bool QDeclarativeCompiler::checkDynamicMeta(QDeclarativeParser::Object *obj) QByteArray name = obj->dynamicSignals.at(ii).name; if (methodNames.contains(name)) COMPILE_EXCEPTION(obj, tr("Duplicate signal name")); - if (QString::fromUtf8(name).at(0).isUpper()) + QString nameStr = QString::fromUtf8(name); + if (nameStr.at(0).isUpper()) COMPILE_EXCEPTION(obj, tr("Signal names cannot begin with an upper case letter")); - if (QDeclarativeEnginePrivate::get(engine)->globalClass->illegalNames().contains(name)) + if (QDeclarativeEnginePrivate::get(engine)->globalClass->illegalNames().contains(nameStr)) COMPILE_EXCEPTION(obj, tr("Illegal signal name")); methodNames.insert(name); } @@ -2238,9 +2240,10 @@ bool QDeclarativeCompiler::checkDynamicMeta(QDeclarativeParser::Object *obj) QByteArray name = obj->dynamicSlots.at(ii).name; if (methodNames.contains(name)) COMPILE_EXCEPTION(obj, tr("Duplicate method name")); - if (QString::fromUtf8(name).at(0).isUpper()) + QString nameStr = QString::fromUtf8(name); + if (nameStr.at(0).isUpper()) COMPILE_EXCEPTION(obj, tr("Method names cannot begin with an upper case letter")); - if (QDeclarativeEnginePrivate::get(engine)->globalClass->illegalNames().contains(name)) + if (QDeclarativeEnginePrivate::get(engine)->globalClass->illegalNames().contains(nameStr)) COMPILE_EXCEPTION(obj, tr("Illegal method name")); methodNames.insert(name); } -- cgit v0.12 From bbd444559359df3e211fedb28d40b175af778030 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Fri, 6 Aug 2010 10:55:23 +1000 Subject: Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. --- src/s60installs/eabi/QtNetworku.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/s60installs/eabi/QtNetworku.def b/src/s60installs/eabi/QtNetworku.def index 6b34a19..2442ee8 100644 --- a/src/s60installs/eabi/QtNetworku.def +++ b/src/s60installs/eabi/QtNetworku.def @@ -1131,7 +1131,7 @@ EXPORTS _ZNK21QNetworkAccessManager13configurationEv @ 1130 NONAME _ZNK21QNetworkAccessManager17networkAccessibleEv @ 1131 NONAME _ZNK21QNetworkAccessManager19activeConfigurationEv @ 1132 NONAME - _ZNK21QNetworkConfiguration10bearerNameEv @ 1133 NONAME ABSENT + _ZNK21QNetworkConfiguration10bearerNameEv @ 1133 NONAME _ZNK21QNetworkConfiguration10identifierEv @ 1134 NONAME _ZNK21QNetworkConfiguration18isRoamingAvailableEv @ 1135 NONAME _ZNK21QNetworkConfiguration4nameEv @ 1136 NONAME -- cgit v0.12 From 97f64280e37f29bdeb92d6de55fac56b1ff37084 Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Fri, 6 Aug 2010 12:11:36 +1000 Subject: Fix index page Task-number: QTBUG-12703 --- doc/src/declarative/declarativeui.qdoc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc index 217e372..1fc9d69 100644 --- a/doc/src/declarative/declarativeui.qdoc +++ b/doc/src/declarative/declarativeui.qdoc @@ -41,11 +41,10 @@ and netbooks. Qt Quick consists of the QtDeclarative C++ module, QML, and the integration of both of these into the Qt Creator IDE. Using the QtDeclarative C++ module, you can load and interact with QML files from your Qt application. -QML is an extension to \l -{http://www.ecma-international.org/publications/standards/Ecma-262.htm} -{JavaScript}, that provides a mechanism to declaratively build an -object tree of \l {QML Elements}{QML elements}. QML improves the -integration between JavaScript and Qt's existing QObject based type +QML provides mechanisms to declaratively build an object tree using +\l {QML Elements}{QML elements}. QML improves the integration between +{http://www.ecma-international.org/publications/standards/Ecma-262.htm}{JavaScript} +and Qt's existing QObject based type system, adds support for automatic \l {Property Binding}{property bindings} and provides \l {Network Transparency}{network transparency} at the language level. @@ -87,11 +86,11 @@ application or to build completely new applications. QML is fully \l \o \l {qdeclarativemodules.html}{Modules} \o \l {Extending types from QML} \o \l {qdeclarativedynamicobjects.html}{Dynamic Object Creation} -\o \l {qmlruntime.html}{The Qt Declarative Runtime} \endlist \section1 Using QML with C++ \list +\o \l {qmlruntime.html}{The Qt Declarative Runtime} \o \l {Using QML in C++ Applications} \o \l {Integrating QML with existing Qt UI code} \o \l {Tutorial: Writing QML extensions with C++} -- cgit v0.12 From 94b1c07c31ab84d30b198cb23291a48f98164827 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Fri, 6 Aug 2010 13:39:10 +1000 Subject: Top-level QML item should not have special focus handling. It's the scene itself that acts as a focus scope, not the top-level item. Task-number: QTBUG-12682 Reviewed-by: Aaron Kennedy --- src/declarative/graphicsitems/qdeclarativeitem.cpp | 11 ++++------- .../qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 5b74129..ff05997 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -3196,8 +3196,7 @@ bool QDeclarativeItem::hasActiveFocus() const { Q_D(const QDeclarativeItem); return focusItem() == this || - (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0) || - (!parentItem() && focusItem() != 0); + (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0); } /*! @@ -3217,10 +3216,8 @@ bool QDeclarativeItem::hasActiveFocus() const } \endqml - For the purposes of this property, the top level item in the scene - is assumed to act like a focus scope, and to always have active focus - when the scene has focus. On a practical level, that means the following - QML will give active focus to \c input on startup. + For the purposes of this property, the scene as a whole is assumed to act like a focus scope. + On a practical level, that means the following QML will give active focus to \c input on startup. \qml Rectangle { @@ -3246,7 +3243,7 @@ bool QDeclarativeItem::hasFocus() const p = p->parentItem(); } - return hasActiveFocus() ? true : (!QGraphicsItem::parentItem() ? true : false); + return hasActiveFocus(); } /*! \internal */ diff --git a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp index b138f61..ec8f048 100644 --- a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp +++ b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp @@ -336,7 +336,7 @@ void tst_qdeclarativefocusscope::noParentFocus() view->setSource(QUrl::fromLocalFile(SRCDIR "/data/chain.qml")); QVERIFY(view->rootObject()); - QVERIFY(view->rootObject()->property("focus1") == true); + QVERIFY(view->rootObject()->property("focus1") == false); QVERIFY(view->rootObject()->property("focus2") == false); QVERIFY(view->rootObject()->property("focus3") == true); QVERIFY(view->rootObject()->property("focus4") == true); -- cgit v0.12 From ea8cf9c20f5b22c88bda1615b8a37013a1efbc3c Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Fri, 6 Aug 2010 15:14:27 +1000 Subject: Revert "Doc: Adding GS QML example files" This reverts commit f13ebf52a0d091c6c72c97d2a13311e1e7c4a5cf. The given example does not meet the autotest requirements for QML examples. These involve that it starts without error messages, and that it follows our naming convention of the start file starting with a lowercase letter. Please run the tests/auto/declarative/examples before pushing new declarative examples. If new examples should be exempted from these checks, add them to the list of exceptions in that autotest. --- .../tutorials/gettingStarted/gsQml/TextEditor.qml | 129 ------------ .../tutorials/gettingStarted/gsQml/core/Button.qml | 110 ---------- .../gettingStarted/gsQml/core/EditMenu.qml | 111 ---------- .../gettingStarted/gsQml/core/FileDialog.qml | 170 --------------- .../gettingStarted/gsQml/core/FileMenu.qml | 232 --------------------- .../gettingStarted/gsQml/core/MenuBar.qml | 148 ------------- .../gettingStarted/gsQml/core/TextArea.qml | 86 -------- .../tutorials/gettingStarted/gsQml/core/qmldir | 48 ----- .../gettingStarted/gsQml/filedialog/cppPlugins.pro | 17 -- .../gsQml/filedialog/dialogPlugin.cpp | 57 ----- .../gettingStarted/gsQml/filedialog/dialogPlugin.h | 57 ----- .../gettingStarted/gsQml/filedialog/directory.cpp | 219 ------------------- .../gettingStarted/gsQml/filedialog/directory.h | 108 ---------- .../gettingStarted/gsQml/filedialog/file.cpp | 57 ----- .../gettingStarted/gsQml/filedialog/file.h | 67 ------ .../gettingStarted/gsQml/filedialog/qmldir | 1 - .../gettingStarted/gsQml/images/arrow.png | Bin 583 -> 0 bytes .../gettingStarted/gsQml/images/qt-logo.png | Bin 5149 -> 0 bytes .../gsQml/pics/qml-texteditor5_editmenu.png | Bin 65123 -> 0 bytes .../gsQml/pics/qml-texteditor5_filemenu.png | Bin 21367 -> 0 bytes .../gsQml/pics/qml-texteditor5_newfile.png | Bin 76693 -> 0 bytes 21 files changed, 1617 deletions(-) delete mode 100644 examples/tutorials/gettingStarted/gsQml/TextEditor.qml delete mode 100644 examples/tutorials/gettingStarted/gsQml/core/Button.qml delete mode 100644 examples/tutorials/gettingStarted/gsQml/core/EditMenu.qml delete mode 100644 examples/tutorials/gettingStarted/gsQml/core/FileDialog.qml delete mode 100644 examples/tutorials/gettingStarted/gsQml/core/FileMenu.qml delete mode 100644 examples/tutorials/gettingStarted/gsQml/core/MenuBar.qml delete mode 100644 examples/tutorials/gettingStarted/gsQml/core/TextArea.qml delete mode 100644 examples/tutorials/gettingStarted/gsQml/core/qmldir delete mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro delete mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp delete mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h delete mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp delete mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/directory.h delete mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp delete mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/file.h delete mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/qmldir delete mode 100644 examples/tutorials/gettingStarted/gsQml/images/arrow.png delete mode 100644 examples/tutorials/gettingStarted/gsQml/images/qt-logo.png delete mode 100644 examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png delete mode 100644 examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png delete mode 100644 examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png diff --git a/examples/tutorials/gettingStarted/gsQml/TextEditor.qml b/examples/tutorials/gettingStarted/gsQml/TextEditor.qml deleted file mode 100644 index 6ffdd6d..0000000 --- a/examples/tutorials/gettingStarted/gsQml/TextEditor.qml +++ /dev/null @@ -1,129 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt 4.7 -import "core" - -Rectangle{ - id: screen - width: 1000; height: 1000 - property int partition: height/3 - border.width: 1 - border.color: "#DCDCCC" - state: "DRAWER_CLOSED" - - //Item 1: MenuBar on the top portion of the screen - MenuBar{ - id:menuBar - height: screen.partition; width: screen.width - z:1 - } - //Item 2: The editable text area - TextArea{ - id:textArea - y:drawer.height - color: "#3F3F3F" - fontColor: "#DCDCCC" - height: partition*2; width:parent.width - } - //Item 3: The drawer handle - Rectangle{ - id:drawer - height:15; width: parent.width - border.color : "#6A6D6A" - border.width: 1 - z:1 - gradient: Gradient { - GradientStop { position: 0.0; color: "#8C8F8C" } - GradientStop { position: 0.17; color: "#6A6D6A" } - GradientStop { position: 0.77; color: "#3F3F3F" } - GradientStop { position: 1.0; color: "#6A6D6A" } - } - Image{ - id: arrowIcon - source: "images/arrow.png" - anchors.horizontalCenter: parent.horizontalCenter - - Behavior{NumberAnimation{property: "rotation";easing.type: Easing.OutExpo }} - } - - MouseArea{ - id: drawerMouseArea - anchors.fill:parent - hoverEnabled: true - onEntered: parent.border.color = Qt.lighter("#6A6D6A") - onExited: parent.border.color = "#6A6D6A" - onClicked:{ - if (screen.state == "DRAWER_CLOSED"){ - screen.state = "DRAWER_OPEN" - } - else if (screen.state == "DRAWER_OPEN"){ - screen.state = "DRAWER_CLOSED" - } - } - } - } - - states:[ - State{ - name: "DRAWER_OPEN" - PropertyChanges { target: menuBar; y: 0} - PropertyChanges { target: textArea; y: partition + drawer.height} - PropertyChanges { target: drawer; y: partition} - PropertyChanges { target: arrowIcon; rotation: 180} - }, - State{ - name: "DRAWER_CLOSED" - PropertyChanges { target: menuBar; y:-height; } - PropertyChanges { target: textArea; y: drawer.height; height: screen.height - drawer.height} - PropertyChanges { target: drawer; y: 0} - PropertyChanges { target: arrowIcon; rotation: 0} - } - ] - - transitions: [ - Transition{ - to: "*" - NumberAnimation { target: textArea; properties: "y, height"; duration: 100; easing.type:Easing.OutExpo } - NumberAnimation { target: menuBar; properties: "y"; duration: 100;easing.type: Easing.OutExpo } - NumberAnimation { target: drawer; properties: "y"; duration: 100;easing.type: Easing.OutExpo } - } - ] -} diff --git a/examples/tutorials/gettingStarted/gsQml/core/Button.qml b/examples/tutorials/gettingStarted/gsQml/core/Button.qml deleted file mode 100644 index 28ae4ec..0000000 --- a/examples/tutorials/gettingStarted/gsQml/core/Button.qml +++ /dev/null @@ -1,110 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -import Qt 4.7 - -Rectangle { - - //identifier of the item - id: button - - //these properties act as constants, useable outside this QML file - property int buttonHeight: 75 - property int buttonWidth: 150 - - //attaches to the Text element's text content - property string label - property color textColor: buttonLabel.color - - //the color highlight when the mouse hovers on the rectangle - property color onHoverColor: "lightsteelblue" - property color borderColor: "transparent" - - //buttonColor is set to the button's main color - property color buttonColor: "lightblue" - - property real labelSize: 14 - //set appearance properties - radius:6 - smooth: true - border.width: 2 - border.color: borderColor - width: buttonWidth; height: buttonHeight - - Text{ - id: buttonLabel - anchors.centerIn: parent - text: label //bind the text to the parent's text - color: "#DCDCCC" - font.pointSize: labelSize - } - - //buttonClick() is callable and a signal handler, onButtonClick is automatically created - signal buttonClick() - - //define the clickable area to be the whole rectangle - MouseArea{ - id: buttonMouseArea - anchors.fill: parent //stretch the area to the parent's dimension - onClicked: buttonClick() - - //if true, then onEntered and onExited called if mouse hovers in the mouse area - //if false, a button must be clicked to detect the mouse hover - hoverEnabled: true - - //display a border if the mouse hovers on the button mouse area - onEntered: parent.border.color = onHoverColor - //remove the border if the mouse exits the button mouse area - onExited: parent.border.color = borderColor - - } - - //change the color of the button when pressed - color: buttonMouseArea.pressed ? Qt.darker(buttonColor, 1.5) : buttonColor - //animate the color whenever the color property changes - Behavior on color { ColorAnimation{ duration: 55} } - - //scale the button when pressed - scale: buttonMouseArea.pressed ? 1.1 : 1.00 - //Animate the scale property change - Behavior on scale { NumberAnimation{ duration: 55} } - -} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/core/EditMenu.qml b/examples/tutorials/gettingStarted/gsQml/core/EditMenu.qml deleted file mode 100644 index be9f6a1..0000000 --- a/examples/tutorials/gettingStarted/gsQml/core/EditMenu.qml +++ /dev/null @@ -1,111 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -import Qt 4.7 - -Rectangle{ - id: editMenu - height: 480; width:1000 - color: "powderblue" - property color buttonBorderColor: "#7A8182" - property color buttonFillColor: "#61BDCACD" - property string menuName:"Edit" - - gradient: Gradient{ - GradientStop { position: 0.0; color: "#6A7570" } - GradientStop { position: 1.0; color: Qt.darker("#6A7570") } - } - - Rectangle{ - id:actionContainer - color:"transparent" - anchors.centerIn: parent - width: parent.width; height: parent.height / 5 - Row{ - anchors.centerIn: parent - spacing: parent.width/9 - Button{ - id: loadButton - buttonColor: buttonFillColor - label: "Copy" - labelSize:16 - borderColor:buttonBorderColor - height: actionContainer.height - width: actionContainer.width/6 - onButtonClick:textArea.copy() - gradient: Gradient { - GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } - GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } - } - } - - Button{ - id: saveButton - height: actionContainer.height - width: actionContainer.width/6 - buttonColor: buttonFillColor - label: "Paste" - borderColor:buttonBorderColor - labelSize:16 - onButtonClick:textArea.paste() - gradient: Gradient { - GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } - GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } - } - } - Button{ - id: exitButton - label: "Select All" - height: actionContainer.height - width: actionContainer.width/6 - labelSize:16 - buttonColor: buttonFillColor - borderColor:buttonBorderColor - onButtonClick:textArea.selectAll() - gradient: Gradient { - GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } - GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } - } - } - } - } - -} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/core/FileDialog.qml b/examples/tutorials/gettingStarted/gsQml/core/FileDialog.qml deleted file mode 100644 index 9948a27..0000000 --- a/examples/tutorials/gettingStarted/gsQml/core/FileDialog.qml +++ /dev/null @@ -1,170 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt 4.7 - -Rectangle{ - id:dialog - height: 200 * partition; width: 200 - color: "transparent" - - signal selectChanged() - signal notifyRefresh() - onNotifyRefresh:dirView.model = directory.files - - property string selectedFile - property int selectedIndex: 0 - - Rectangle{ - id: dirBox - radius: 10 - anchors.centerIn:parent - height: parent.height -15; width: parent.width -30 - - Rectangle{ - id:header - height:parent.height*0.1 - width: parent.width - radius:3 - z:1 - gradient: Gradient { - GradientStop { position: 0.0; color: "#8C8F8C" } - GradientStop { position: 0.17; color: "#6A6D6A" } - GradientStop { position: 0.98;color: "#3F3F3F" } - GradientStop { position: 1.0; color: "#0e1B20" } - } - Text{ - height: header.height - anchors.centerIn: header - text: "files:" - color: "lightblue" - font.weight: Font.Light - font.italic: true - } - } - GridView{ - id:dirView - width:parent.width - height:parent.height*.9 - anchors.top: header.bottom - cellWidth: 100 - cellHeight: 75 -// highlight: Rectangle { width:cellWidth; height: cellHeight; color: "lightsteelblue" ;radius: 13} - model: directory.files - delegate: dirDelegate - clip: true - highlightMoveDuration:40 - } - - Component{ - id:dirDelegate - - Rectangle{ - id:file - color: "transparent" - width: GridView.view.cellWidth; height: GridView.view.cellHeight - - Text{ - id:fileName - width: parent.width - anchors.centerIn:parent - text: name - color: "#BDCACD" - font.weight: GridView.view.currentIndex == index ? Font.DemiBold : Font.Normal - font.pointSize: GridView.view.currentIndex == index ? 12 : 10 - elide: Text.ElideMiddle - horizontalAlignment: Text.AlignHCenter - } - Rectangle{ - id:selection - width:parent.width; height:parent.height - anchors.centerIn: parent - radius: 10 - smooth: true - scale: GridView.view.currentIndex == index ? 1 : 0.5 - opacity: GridView.view.currentIndex == index ? 1 : 0 - Text{ - id:overlay - width: parent.width - anchors.centerIn:parent - text: name - color: "#696167" - font.weight: Font.DemiBold - font.pointSize: 12 - smooth:true - elide: Text.ElideMiddle - horizontalAlignment: Text.AlignHCenter - } - Behavior on opacity{ NumberAnimation{ duration: 45} } - Behavior on scale { NumberAnimation{ duration: 45} } - gradient: Gradient { - GradientStop { position: 0.0; color: Qt.lighter("lightsteelblue",1.25) } - GradientStop { position: 0.67; color: Qt.darker("lightsteelblue",1.3) } - } - border.color:"lightsteelblue" - border.width:1 - } - MouseArea{ - id:fileMouseArea - anchors.fill:parent - hoverEnabled: true - - onClicked:{ - GridView.view.currentIndex = index - selectedFile = directory.files[index].name - selectChanged() - } - onEntered:{ - fileName.color = "lightsteelblue" - fileName.font.weight = Font.DemiBold - } - onExited: { - fileName.font.weight = Font.Normal - fileName.color = "#BDCACD" - } - } - } - } - gradient: Gradient{ - GradientStop { position: 0.0; color: "#A5333333" } - GradientStop { position: 1.0; color: "#03333333" } - } - } -} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/core/FileMenu.qml b/examples/tutorials/gettingStarted/gsQml/core/FileMenu.qml deleted file mode 100644 index 20d8fd6..0000000 --- a/examples/tutorials/gettingStarted/gsQml/core/FileMenu.qml +++ /dev/null @@ -1,232 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt 4.7 - -Rectangle{ - id: fileMenu - height: 480; width:1000 - property color buttonBorderColor: "#7F8487" - property color buttonFillColor: "#8FBDCACD" - property string fileContent:directory.fileContent - - //the menuName is accessible from outside this QML file - property string menuName: "File" - - //used to divide the screen into parts. - property real partition: 1/3 - - color: "#6C646A" - gradient: Gradient{ - GradientStop { position: 0.0; color: "#6C646A" } - GradientStop { position: 1.0; color: Qt.darker("#6A6D6A") } - } - - Directory{ - id:directory - filename: textInput.text - onDirectoryChanged:fileDialog.notifyRefresh() - } - - Rectangle{ - id:actionContainer - - //make this rectangle invisible - color:"transparent" - anchors.left: parent.left - - //the height is a good proportion that creates more space at the top of the column of buttons - width: fileMenu.width * partition; height: fileMenu.height - - Column{ - anchors.centerIn: parent - spacing: parent.height/32 - Button{ - id: saveButton - label: "Save" - borderColor: buttonBorderColor - buttonColor: buttonFillColor - width: actionContainer.width/ 1.3 - height:actionContainer.height / 8 - labelSize:24 - onButtonClick:{ - directory.fileContent = textArea.textContent - directory.filename = textInput.text - directory.saveFile() - } - gradient: Gradient { - GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } - GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } - } - - } - Button{ - id: loadButton - width: actionContainer.width/ 1.3 - height:actionContainer.height/ 8 - buttonColor: buttonFillColor - borderColor: buttonBorderColor - label: "Load" - labelSize:24 - onButtonClick:{ - directory.filename = textInput.text - directory.loadFile() - textArea.textContent = directory.fileContent - } - gradient: Gradient { - GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } - GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } - } - } - Button{ - id: newButton - width: actionContainer.width/ 1.3 - height:actionContainer.height/ 8 - buttonColor: buttonFillColor - borderColor: buttonBorderColor - label: "New" - labelSize:24 - onButtonClick:{ - textArea.textContent = "" - textInput.text = "" - } - gradient: Gradient { - GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } - GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } - } - - } - Rectangle{ - id: space - width: actionContainer.width/ 1.3 - height:actionContainer.height / 16 - color:"transparent" - } - Button{ - id: exitButton - width: actionContainer.width/ 1.3 - height:actionContainer.height/ 8 - label: "Exit" - labelSize:24 - buttonColor: buttonFillColor - borderColor: buttonBorderColor - onButtonClick:Qt.quit() - gradient: Gradient { - GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } - GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } - } - } - } - } - - Rectangle{ - id:dialogContainer - - width: 2*fileMenu.width * partition; height: fileMenu.height - anchors.right:parent.right - color:"transparent" - - Column { - anchors.centerIn: parent - spacing: parent.height /640 - FileDialog{ - id:fileDialog - height: 2*dialogContainer.height * partition; width: dialogContainer.width - onSelectChanged: textInput.text = selectedFile - } - - Rectangle{ - id:lowerPartition - height: dialogContainer.height * partition; width: dialogContainer.width - color: "transparent" - - Rectangle{ - id: nameField - gradient: Gradient{ - GradientStop { position: 0.0; color: "#806F6F6F" } - GradientStop { position: 1.0; color: "#136F6F6F" } - } - - radius: 10 - anchors {centerIn:parent; leftMargin: 15; rightMargin: 15; topMargin: 15} - height: parent.height-15; width: parent.width -20 - border {color:"#4A4A4A"; width:1} - - TextInput{ - id: textInput - z:2 - anchors {bottom: parent.bottom; topMargin: 10; horizontalCenter:parent.horizontalCenter} - width: parent.width - 10 - height: parent.height -10 - font.pointSize: 40 - color:"lightsteelblue" - focus:true - } - Text{ - id: textInstruction - anchors.centerIn:parent - text: "Select file name and press save or load" - font {pointSize: 11; weight:Font.Light; italic: true} - color: "lightblue" - z:2 - opacity: (textInput.text == "") ? 1: 0 - } - Text{ - id:fieldLabel - anchors {top: parent.top; left: parent.left} - text: " file name: " - font {pointSize: 11; weight: Font.Light; italic: true} - color: "lightblue" - z:2 - } - MouseArea{ - anchors.centerIn:parent - width: nameField.width; height: nameField.height - onClicked:{ - textInput.text = "" - textInput.focus = true - textInput.forceFocus() - } - } - } - } - } - } -} diff --git a/examples/tutorials/gettingStarted/gsQml/core/MenuBar.qml b/examples/tutorials/gettingStarted/gsQml/core/MenuBar.qml deleted file mode 100644 index c387f5f..0000000 --- a/examples/tutorials/gettingStarted/gsQml/core/MenuBar.qml +++ /dev/null @@ -1,148 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt 4.7 - -Rectangle { - id: menuBar - width: 1000; height:300 - color:"transparent" - property color fileColor: "plum" - property color editColor: "powderblue" - - property real partition: 1/10 - - Column{ - anchors.fill: parent - //container for the header and the buttons - z: 1 - Rectangle{ - id: labelList - height:menuBar.height*partition - width: menuBar.width - color: "beige" - gradient: Gradient { - GradientStop { position: 0.0; color: "#8C8F8C" } - GradientStop { position: 0.17; color: "#6A6D6A" } - GradientStop { position: 0.98;color: "#3F3F3F" } - GradientStop { position: 1.0; color: "#0e1B20" } - } - Text{ - height: parent.height - anchors {right: labelRow.left ; verticalCenter: parent.bottom} - text: "menu: " - color: "lightblue" - font {weight: Font.Light; italic: true} - smooth: true - } - - //row displays its children in a vertical row - Row{ - id: labelRow - anchors.centerIn: parent - spacing:40 - Button{ - id: fileButton - height: 20; width: 50 - label: "File" - buttonColor : menuListView.currentIndex == 0? fileColor : Qt.darker(fileColor, 1.5) - scale: menuListView.currentIndex == 0? 1.25: 1 - labelSize: menuListView.currentIndex == 0? 16:12 - radius: 1 - smooth:true - //on a button click, change the list's currently selected item to FileMenu - onButtonClick: menuListView.currentIndex = 0 - gradient: Gradient{ - GradientStop { position: 0.0; color: fileColor } - GradientStop { position: 1.0; color: "#136F6F6F" } - } - } - Button{ - id: editButton - height: 20; width: 50 - buttonColor : menuListView.currentIndex == 1? Qt.darker(editColor, 1.5) : Qt.darker(editColor, 1.9) - scale: menuListView.currentIndex == 1? 1.25: 1 - label: "Edit" - radius: 1 - labelSize: menuListView.currentIndex == 1? 16:12 - smooth:true - //on a button click, change the list's currently selected item to EditMenu - onButtonClick: menuListView.currentIndex = 1 - gradient: Gradient{ - GradientStop { position: 0.0; color: editColor } - GradientStop { position: 1.0; color: "#136F6F6F" } - } - } - } - } - - //list view will display a model according to a delegate - ListView{ - id: menuListView - width:menuBar.width; height: 9*menuBar.height*partition - - //the model contains the data - model: menuListModel - - //control the movement of the menu switching - snapMode: ListView.SnapOneItem - orientation: ListView.Horizontal - boundsBehavior: Flickable.StopAtBounds - flickDeceleration: 5000 - highlightFollowsCurrentItem: true - highlightMoveDuration:240 - highlightRangeMode: ListView.StrictlyEnforceRange - } - } - //a list of visual items already have delegates handling their display - VisualItemModel{ - id: menuListModel - - FileMenu{ - id:fileMenu - width: menuListView.width; height: menuListView.height - color: fileColor - } - EditMenu{ - color: editColor - width: menuListView.width; height: menuListView.height - } - } -} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/core/TextArea.qml b/examples/tutorials/gettingStarted/gsQml/core/TextArea.qml deleted file mode 100644 index 3953d9f..0000000 --- a/examples/tutorials/gettingStarted/gsQml/core/TextArea.qml +++ /dev/null @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt 4.7 - -Rectangle{ - id:textArea - - function paste(){ textEdit.paste()} - function copy() { textEdit.copy() } - function selectAll() { textEdit.selectAll() } - - width :400; height:400 - - property color fontColor: "white" - property alias textContent: textEdit.text - Flickable{ - id: flickArea - width: parent.width; height: parent.height - anchors.fill:parent - - boundsBehavior: Flickable.StopAtBounds - flickableDirection: Flickable.HorizontalFlick - interactive: true - //Will move the text Edit area to make the area visible when scrolled with keyboard strokes - function ensureVisible(r){ - if (contentX >= r.x) - contentX = r.x; - else if (contentX+width <= r.x+r.width) - contentX = r.x+r.width-width; - if (contentY >= r.y) - contentY = r.y; - else if (contentY+height <= r.y+r.height) - contentY = r.y+r.height-height; - } - - TextEdit{ - id: textEdit - anchors.fill:parent - width:parent.width; height:parent.height - color:fontColor - focus: true - wrapMode: TextEdit.Wrap - font.pointSize:10 - onCursorRectangleChanged: flickArea.ensureVisible(cursorRectangle) - selectByMouse: true - } - } -} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/core/qmldir b/examples/tutorials/gettingStarted/gsQml/core/qmldir deleted file mode 100644 index 1beb5ed..0000000 --- a/examples/tutorials/gettingStarted/gsQml/core/qmldir +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -Button ./Button.qml -FileDialog ./FileDialog.qml -TextArea ./TextArea.qml -TextEditor ./TextEditor.qml -EditMenu ./EditMenu.qml -MenuBar ./MenuBar.qml - -plugin FileDialog ../plugins diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro b/examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro deleted file mode 100644 index 6247747..0000000 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = lib -CONFIG += qt plugin -QT += declarative - -DESTDIR += ../plugins -OBJECTS_DIR = tmp -MOC_DIR = tmp - -TARGET = FileDialog - -HEADERS += directory.h \ - file.h \ - dialogPlugin.h - -SOURCES += directory.cpp \ - file.cpp \ - dialogPlugin.cpp diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp deleted file mode 100644 index c0132c0..0000000 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "dialogPlugin.h" -#include "directory.h" -#include "file.h" -#include - -void DialogPlugin::registerTypes(const char *uri){ - - //register the class Directory into QML as a "Directory" element version 1.0 - qmlRegisterType(uri, 1, 0, "Directory"); - qmlRegisterType(uri,1,0,"File"); - - //qRegisterMetaType > ("QDeclarativeListProperty"); - -} - -//FileDialog is the plugin name (same as the TARGET in the project file) and DialogPlugin is the plugin classs -Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin); \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h deleted file mode 100644 index 7f8d3ff..0000000 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef DIALOGPLUGIN_H -#define DIALOGPLUGIN_H - -#include - -class DialogPlugin : public QDeclarativeExtensionPlugin -{ - Q_OBJECT - - public: - //registerTypes is inherited from QDeclarativeExtensionPlugin - void registerTypes(const char *uri); - -}; - -#endif - diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp deleted file mode 100644 index b3e0256..0000000 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp +++ /dev/null @@ -1,219 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "directory.h" -#include - -/* -Directory constructor - -Initialize the saves directory and creates the file list -*/ -Directory::Directory(QObject *parent) : QObject(parent) -{ - - - m_dir.cd( QDir::currentPath()); - - //go to the saved directory. if not found, create save directory - m_saveDir = "saves"; - if (m_dir.cd(m_saveDir) == 0){ - m_dir.mkdir(m_saveDir); - m_dir.cd(m_saveDir); - } - m_filterList << "*.txt"; - - refresh(); -} - -/* -Directory::filesNumber -Return the number of Files -*/ -int Directory:: filesCount() const{ - return m_fileList.size(); -} - -/* -Function called to append data onto list property -*/ -void appendFiles(QDeclarativeListProperty * property, File * file){ - //Do nothing. can't add to a directory using this method -} - -/* -Function called to retrieve file in the list using an index -*/ -File* fileAt(QDeclarativeListProperty * property, int index){ - return static_cast< QList *>(property->data)->at(index); -} - -/* -Returns the number of files in the list -*/ -int filesSize(QDeclarativeListProperty * property){ - return static_cast< QList *>(property->data)->size(); -} - -/* -Function called to empty the list property contents -*/ -void clearFilesPtr(QDeclarativeListProperty *property){ - return static_cast< QList *>(property->data)->clear(); -} - -/* -Returns the list of files as a QDeclarativeListProperty. -*/ -QDeclarativeListProperty Directory::files(){ - - refresh(); -// return QDeclarativeListProperty(this,m_filePtrList); //not recommended in the docs - return QDeclarativeListProperty( this, &m_fileList, &appendFiles, &filesSize, &fileAt, &clearFilesPtr ); -} - -/* -Return te name of the currently selected file -*/ -QString Directory::filename() const{ - return currentFile.name(); -} - -/* -Return the file's content as a string. -*/ -QString Directory::fileContent() const{ - return m_fileContent; -} - -/* -Set the file name of the current file -*/ -void Directory::setFilename(const QString &str){ - if(str != currentFile.name()){ - currentFile.setName(str); - emit filenameChanged(); - } -} - -/* -Set the content of the file as a string -*/ -void Directory::setFileContent(const QString &str){ - if(str != m_fileContent){ - m_fileContent = str; - emit fileContentChanged(); - } -} - -/* -Called from QML to save the file using the filename and file content. -Saving makes sure that the file has a .txt extension. -*/ -void Directory::saveFile(){ - - if(currentFile.name().size() == 0){ - qWarning()<< "Empty filename. no save"; - return; - } - - QString extendedName = currentFile.name(); - if(!currentFile.name().endsWith(".txt")){ - extendedName.append(".txt"); - } - - QFile file( m_dir.filePath(extendedName) ); - if (file.open(QFile::WriteOnly | QFile::Truncate)){ - QTextStream outStream(&file); - outStream << m_fileContent; - } - file.close(); - refresh(); - emit directoryChanged(); -} - -/* -Load the contents of a file. -Only loads files with a .txt extension -*/ -void Directory::loadFile(){ - - m_fileContent.clear(); - QString extendedName = currentFile.name(); - if(!currentFile.name().endsWith(".txt")){ - extendedName.append(".txt"); - } - - QFile file( m_dir.filePath(extendedName) ); - if (file.open(QFile::ReadOnly )){ - QTextStream inStream(&file); - - QString line; - do{ - line = inStream.read(75); - m_fileContent.append(line); - }while (!line .isNull()); - } - file.close(); -} - -/* -Reloads the content of the files list. This is to ensure that the newly -created files are added onto the list. -*/ -void Directory::refresh(){ - m_dirFiles = m_dir.entryList(m_filterList,QDir::Files,QDir::Name); - m_fileList.clear(); - - File * file; - for(int i = 0; i < m_dirFiles.size() ; i ++){ - - file = new File(); - - if(m_dirFiles.at(i).endsWith(".txt")){ - QString name = m_dirFiles.at(i); - file->setName( name.remove(".txt",Qt::CaseSensitive)); - } - else{ - file->setName(m_dirFiles.at(i)); - } - m_fileList.append(file); - } -} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/directory.h b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.h deleted file mode 100644 index bef1a93..0000000 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/directory.h +++ /dev/null @@ -1,108 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef DIRECTORY_H -#define DIRECTORY_H - -#include "file.h" - -#include -#include -#include -#include -#include - -class Directory : public QObject{ - - Q_OBJECT - - //number of files in the directory - Q_PROPERTY(int filesCount READ filesCount) - - //list property containing file names as QString - Q_PROPERTY(QDeclarativeListProperty files READ files CONSTANT ) - - //file name of the text file to read/write - Q_PROPERTY(QString filename READ filename WRITE setFilename NOTIFY filenameChanged) - - //text content of the file - Q_PROPERTY(QString fileContent READ fileContent WRITE setFileContent NOTIFY fileContentChanged) - - public: - Directory(QObject *parent = 0); - - //properties' read functions - int filesCount() const; - QString filename() const; - QString fileContent() const; - QDeclarativeListProperty files(); - - //properties' write functions - void setFilename(const QString &str); - void setFileContent(const QString &str); - - //accessible from QML - Q_INVOKABLE void saveFile(); - Q_INVOKABLE void loadFile(); - - signals: - void directoryChanged(); - void filenameChanged(); - void fileContentChanged(); - - private: - QDir m_dir; - QStringList m_dirFiles; - File currentFile; - QString m_saveDir; - QStringList m_filterList; - - //contains the file data in QString format - QString m_fileContent; - - //Registered to QML in a plugin. Accessible from QML as a property of Directory - QList m_fileList; - - //refresh content of the directory - void refresh(); -}; - - -#endif diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp deleted file mode 100644 index 39a7469..0000000 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "file.h" - -File::File(QObject *parent) : QObject(parent) -{ - m_name = ""; -} - -QString File::name() const{ - return m_name; -} -void File::setName(const QString &str){ - if(str != m_name){ - m_name = str; - emit nameChanged(); - } -} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/file.h b/examples/tutorials/gettingStarted/gsQml/filedialog/file.h deleted file mode 100644 index e4ba429..0000000 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/file.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef FILE_H -#define FILE_H - - -#include -#include - -class File : public QObject{ - - Q_OBJECT - - Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) - - public: - File(QObject *parent = 0); - - QString name() const; - void setName(const QString &str); - - signals: - void nameChanged(); - - private: - QString m_name; -}; - -#endif \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir b/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir deleted file mode 100644 index c2b27da..0000000 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir +++ /dev/null @@ -1 +0,0 @@ -plugin FileDialog plugins diff --git a/examples/tutorials/gettingStarted/gsQml/images/arrow.png b/examples/tutorials/gettingStarted/gsQml/images/arrow.png deleted file mode 100644 index 14978c2..0000000 Binary files a/examples/tutorials/gettingStarted/gsQml/images/arrow.png and /dev/null differ diff --git a/examples/tutorials/gettingStarted/gsQml/images/qt-logo.png b/examples/tutorials/gettingStarted/gsQml/images/qt-logo.png deleted file mode 100644 index 14ddf2a..0000000 Binary files a/examples/tutorials/gettingStarted/gsQml/images/qt-logo.png and /dev/null differ diff --git a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png deleted file mode 100644 index 27feed5..0000000 Binary files a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png and /dev/null differ diff --git a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png deleted file mode 100644 index 4d8f9f2..0000000 Binary files a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png and /dev/null differ diff --git a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png deleted file mode 100644 index 680acfe..0000000 Binary files a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png and /dev/null differ -- cgit v0.12 From 59e3430662cfdc3820115a2ff4c0b44829b3d1d4 Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Fri, 6 Aug 2010 16:32:19 +1000 Subject: Fix broken example code Task-number: QTBUG-12705 --- src/declarative/util/qdeclarativepropertymap.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/declarative/util/qdeclarativepropertymap.cpp b/src/declarative/util/qdeclarativepropertymap.cpp index 919727f..6b43040 100644 --- a/src/declarative/util/qdeclarativepropertymap.cpp +++ b/src/declarative/util/qdeclarativepropertymap.cpp @@ -104,22 +104,25 @@ void QDeclarativePropertyMapMetaObject::propertyCreated(int, QMetaPropertyBuilde The following example shows how you might declare data in C++ and then access it in QML. - Setup in C++: + In the C++ file: \code - //create our data + // create our data QDeclarativePropertyMap ownerData; ownerData.insert("name", QVariant(QString("John Smith"))); ownerData.insert("phone", QVariant(QString("555-5555"))); - //expose it to the UI layer - QDeclarativeContext *ctxt = view->rootContext(); - ctxt->setProperty("owner", &data); + // expose it to the UI layer + QDeclarativeView view; + QDeclarativeContext *ctxt = view.rootContext(); + ctxt->setContextProperty("owner", &ownerData); + + view.setSource(QUrl::fromLocalFile("main.qml")); + view.show(); \endcode - Then, in QML: + Then, in \c main.qml: \code - Text { text: owner.name } - Text { text: owner.phone } + Text { text: owner.name + " " + owner.phone } \endcode The binding is dynamic - whenever a key's value is updated, anything bound to that -- cgit v0.12 From 4808151512faef0d78152905885bd3009b89c1a6 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Fri, 6 Aug 2010 09:42:28 +0200 Subject: Changed width of the document. Part of the fix for QTBUG-12180 --- doc/src/demos/spectrum.qdoc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/doc/src/demos/spectrum.qdoc b/doc/src/demos/spectrum.qdoc index 944f944..b720ce1 100644 --- a/doc/src/demos/spectrum.qdoc +++ b/doc/src/demos/spectrum.qdoc @@ -28,12 +28,8 @@ /*! \example demos/spectrum \title Spectrum Analyzer - -This application is a demo which uses the QtMultimedia APIs to capture and -play back PCM audio. While either recording or playback is ongoing, the -application performs real-time level and frequency spectrum analysis, +This application is a demo which uses the QtMultimedia APIs to capture and +play back PCM audio. While either recording or playback is ongoing, the +application performs real-time level and frequency spectrum analysis, displaying the results in its main window. - - */ - -- cgit v0.12 From 7f59bc3c7f13058e2b8fca076072e99136dd4648 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 5 Aug 2010 13:00:36 +0300 Subject: Fix run and runonphone targets for projects that have TARGET with path Sis files are always generated in the pro file directory even if TARGET indicates another target directory. Reviewed-by: axis --- mkspecs/features/symbian/run_on_phone.prf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mkspecs/features/symbian/run_on_phone.prf b/mkspecs/features/symbian/run_on_phone.prf index 818151a..f77369c 100644 --- a/mkspecs/features/symbian/run_on_phone.prf +++ b/mkspecs/features/symbian/run_on_phone.prf @@ -13,23 +13,25 @@ else:!equals(DEPLOYMENT, default_deployment) { equals(GENERATE_RUN_TARGETS, true) { symbian-abld|symbian-sbsv2 { sis_destdir = + sis_file = $$basename(TARGET).sis } else { sis_destdir = $$DESTDIR + sis_file = $${TARGET}.sis !isEmpty(sis_destdir):!contains(sis_destdir, "[/\\\\]$"):sis_destdir = $${sis_destdir}/ contains(QMAKE_HOST.os, "Windows"):sis_destdir = $$replace(sis_destdir, "/", "\\") } contains(SYMBIAN_PLATFORMS, "WINSCW"):contains(TEMPLATE, "app") { run_target.target = run - run_target.commands = call "$${EPOCROOT}epoc32/release/winscw/udeb/$${TARGET}.exe" $(QT_RUN_OPTIONS) + run_target.commands = call "$${EPOCROOT}epoc32/release/winscw/udeb/$$basename(TARGET).exe" $(QT_RUN_OPTIONS) QMAKE_EXTRA_TARGETS += run_target } runonphone_target.target = runonphone runonphone_target.depends = sis - runonphone_target.commands = runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis "$${sis_destdir}$${TARGET}.sis" - contains(TEMPLATE, "app"):runonphone_target.commands += "$${TARGET}.exe" $(QT_RUN_OPTIONS) + runonphone_target.commands = runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis "$${sis_destdir}$${sis_file}" + contains(TEMPLATE, "app"):runonphone_target.commands += "$$basename(TARGET).exe" $(QT_RUN_OPTIONS) QMAKE_EXTRA_TARGETS += runonphone_target } -- cgit v0.12 From 64ca5d3ac1dc1b1e82c409cf011d97ca8f76f6ed Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 5 Aug 2010 14:55:27 +0300 Subject: Fix some autotest deployments to work in case Qt is already deployed Reviewed-by: Shane Kearns --- tests/auto/qdom/qdom.pro | 4 +++- tests/auto/qsvgrenderer/qsvgrenderer.pro | 4 +++- tests/auto/qtextcodec/test/test.pro | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/auto/qdom/qdom.pro b/tests/auto/qdom/qdom.pro index 5434ada..9040b91 100644 --- a/tests/auto/qdom/qdom.pro +++ b/tests/auto/qdom/qdom.pro @@ -9,7 +9,9 @@ wince*|symbian: { addFiles.path = . DEPLOYMENT += addFiles - DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs + wince*|qt_not_deployed { + DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs + } !symbian:DEFINES += SRCDIR=\\\"\\\" } else { diff --git a/tests/auto/qsvgrenderer/qsvgrenderer.pro b/tests/auto/qsvgrenderer/qsvgrenderer.pro index 8cfbcce..0b785e3 100644 --- a/tests/auto/qsvgrenderer/qsvgrenderer.pro +++ b/tests/auto/qsvgrenderer/qsvgrenderer.pro @@ -13,6 +13,8 @@ wince*|symbian { addFiles.path = . DEPLOYMENT += addFiles - DEPLOYMENT_PLUGIN += qsvg + wince*|qt_not_deployed { + DEPLOYMENT_PLUGIN += qsvg + } } diff --git a/tests/auto/qtextcodec/test/test.pro b/tests/auto/qtextcodec/test/test.pro index efa2e85..b85032a 100644 --- a/tests/auto/qtextcodec/test/test.pro +++ b/tests/auto/qtextcodec/test/test.pro @@ -20,7 +20,9 @@ wince*|symbian { addFiles.sources = ../*.txt addFiles.path = . DEPLOYMENT += addFiles - DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs + wince*|qt_not_deployed { + DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs + } } wince*: { -- cgit v0.12 From bba4b0caa9865ee021a3e477e1bb861c56000f68 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 5 Aug 2010 15:53:44 +0300 Subject: Fix duplicate binary names issues in Symbian autotests In Symbian each binary name must be unique as all binaries are stored in the same directory on the device. Some autotests created helper binaries that had same names on different tests, which caused build and installation issues when building entire autotest project tree. Reviewed-by: Shane Kearns --- tests/auto/qfile/qfile.pro | 2 +- tests/auto/qpluginloader/lib/lib.pro | 2 +- tests/auto/qpluginloader/tst/tst.pro | 2 +- tests/auto/qpluginloader/tst_qpluginloader.cpp | 2 +- tests/auto/qtextcodec/qtextcodec.pro | 2 +- tests/auto/qtextcodec/tst_qtextcodec.cpp | 2 ++ tests/auto/qtextstream/qtextstream.pro | 3 ++- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/auto/qfile/qfile.pro b/tests/auto/qfile/qfile.pro index 0383e30..727f660 100644 --- a/tests/auto/qfile/qfile.pro +++ b/tests/auto/qfile/qfile.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -wince*:{ +wince*|symbian:{ SUBDIRS = test } else { SUBDIRS = test stdinprocess diff --git a/tests/auto/qpluginloader/lib/lib.pro b/tests/auto/qpluginloader/lib/lib.pro index 96a9732..ce9bf13 100644 --- a/tests/auto/qpluginloader/lib/lib.pro +++ b/tests/auto/qpluginloader/lib/lib.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += dll CONFIG -= staticlib SOURCES = mylib.c -TARGET = mylib +TARGET = tst_qpluginloaderlib DESTDIR = ../bin QT = core diff --git a/tests/auto/qpluginloader/tst/tst.pro b/tests/auto/qpluginloader/tst/tst.pro index 2de0912..2d757e7 100644 --- a/tests/auto/qpluginloader/tst/tst.pro +++ b/tests/auto/qpluginloader/tst/tst.pro @@ -20,7 +20,7 @@ wince*: { } symbian: { - libDep.sources = mylib.dll + libDep.sources = tst_qpluginloaderlib.dll libDep.path = /sys/bin pluginDep.sources = theplugin.dll pluginDep.path = bin diff --git a/tests/auto/qpluginloader/tst_qpluginloader.cpp b/tests/auto/qpluginloader/tst_qpluginloader.cpp index 705e600..e913cb5 100644 --- a/tests/auto/qpluginloader/tst_qpluginloader.cpp +++ b/tests/auto/qpluginloader/tst_qpluginloader.cpp @@ -169,7 +169,7 @@ void tst_QPluginLoader::errorString() QCOMPARE(loader.errorString(), unknown); } { - QPluginLoader loader( sys_qualifiedLibraryName("mylib")); //not a plugin + QPluginLoader loader( sys_qualifiedLibraryName("tst_qpluginloaderlib")); //not a plugin bool loaded = loader.load(); #ifdef SHOW_ERRORS qDebug() << loader.errorString(); diff --git a/tests/auto/qtextcodec/qtextcodec.pro b/tests/auto/qtextcodec/qtextcodec.pro index 0bcf067..6cb13a9 100644 --- a/tests/auto/qtextcodec/qtextcodec.pro +++ b/tests/auto/qtextcodec/qtextcodec.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs SUBDIRS = test -!wince*:SUBDIRS += echo +!wince*:!symbian:SUBDIRS += echo diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index 0946c93..cc41591 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -1946,6 +1946,8 @@ void tst_QTextCodec::toLocal8Bit() { #ifdef QT_NO_PROCESS QSKIP("This test requires QProcess", SkipAll); +#elif defined(Q_OS_SYMBIAN) + QSKIP("This test requires streams support in QProcess", SkipAll); #else QProcess process; process.start("echo/echo"); diff --git a/tests/auto/qtextstream/qtextstream.pro b/tests/auto/qtextstream/qtextstream.pro index 8346d7f..a2dcc81 100644 --- a/tests/auto/qtextstream/qtextstream.pro +++ b/tests/auto/qtextstream/qtextstream.pro @@ -1,5 +1,6 @@ TEMPLATE = subdirs -SUBDIRS = test stdinProcess readAllStdinProcess readLineStdinProcess +SUBDIRS = test +!symbian: SUBDIRS += stdinProcess readAllStdinProcess readLineStdinProcess -- cgit v0.12 From f732113f45a918fcb39ed073f82bcf0de5b455b2 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 6 Aug 2010 10:40:16 +0300 Subject: Added $$MW_LAYER_SYSTEMINCLUDE to some autotests These autotests couldn't find e32svr.h in Symbian^3 env because that header has moved. Reviewed-by: TrustMe --- tests/auto/qfileinfo/qfileinfo.pro | 1 + tests/auto/qlocale/test/test.pro | 2 ++ tests/auto/qsslsocket/qsslsocket.pro | 1 + 3 files changed, 4 insertions(+) diff --git a/tests/auto/qfileinfo/qfileinfo.pro b/tests/auto/qfileinfo/qfileinfo.pro index ef5ed22..30656e2 100644 --- a/tests/auto/qfileinfo/qfileinfo.pro +++ b/tests/auto/qfileinfo/qfileinfo.pro @@ -16,6 +16,7 @@ wince*:|symbian: { symbian { TARGET.CAPABILITY=AllFiles LIBS *= -lefsrv + INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE # Needed for e32svr.h in S^3 envs } # support for running test from shadow build directory diff --git a/tests/auto/qlocale/test/test.pro b/tests/auto/qlocale/test/test.pro index e33d0fe..6512e19 100644 --- a/tests/auto/qlocale/test/test.pro +++ b/tests/auto/qlocale/test/test.pro @@ -37,3 +37,5 @@ symbian:contains(S60_VERSION,3.2) { "$${LITERAL_HASH}endif" MMP_RULES += custom_paged_rule } + +symbian: INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE # Needed for e32svr.h in S^3 envs diff --git a/tests/auto/qsslsocket/qsslsocket.pro b/tests/auto/qsslsocket/qsslsocket.pro index 3557fc8..accfa89 100644 --- a/tests/auto/qsslsocket/qsslsocket.pro +++ b/tests/auto/qsslsocket/qsslsocket.pro @@ -29,6 +29,7 @@ wince* { certFiles.sources = certs ssl.tar.gz certFiles.path = . DEPLOYMENT += certFiles + INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE # Needed for e32svr.h in S^3 envs } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } -- cgit v0.12 From 339270016bd8805b081f0b4ff550906a6bcfec5b Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Fri, 6 Aug 2010 10:09:16 +0300 Subject: Register window types for Symbian system effects Set the purpose of the window (dialog/popup/child window etc...). Notify WServ when modal window is shown/hidden Notify WServ when temporary surface deallocation happens. Notify WServ when the application is going to shutdown. Task-number: QT-2027 Reviewed-by: Jason Barron --- src/gui/kernel/qapplication.h | 3 ++ src/gui/kernel/qapplication_p.h | 1 + src/gui/kernel/qapplication_s60.cpp | 58 ++++++++++++++++++++++++++++++++++++- 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h index 799d4c2..0242582 100644 --- a/src/gui/kernel/qapplication.h +++ b/src/gui/kernel/qapplication.h @@ -412,6 +412,9 @@ private: #if defined(QT_RX71_MULTITOUCH) Q_PRIVATE_SLOT(d_func(), void _q_readRX71MultiTouchEvents()) #endif +#if defined(Q_OS_SYMBIAN) + Q_PRIVATE_SLOT(d_func(), void _q_aboutToQuit()) +#endif }; QT_END_NAMESPACE diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index 53205b5..8dc16e0 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -519,6 +519,7 @@ public: int symbianHandleCommand(const QSymbianEvent *symbianEvent); int symbianResourceChange(const QSymbianEvent *symbianEvent); + void _q_aboutToQuit(); #endif #if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined (Q_WS_QWS) || defined(Q_WS_MAC) void sendSyntheticEnterLeave(QWidget *widget); diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 1f6a4ae..52f0db6 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -87,6 +87,10 @@ #include #include +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS +#include +#endif + QT_BEGIN_NAMESPACE // Goom Events through Window Server @@ -372,7 +376,7 @@ void QSymbianControl::ConstructL(bool isWindowOwning, bool desktop) { if (!desktop) { - if (isWindowOwning or !qwidget->parentWidget()) + if (isWindowOwning || !qwidget->parentWidget()) CreateWindowL(S60->windowGroup()); else /** @@ -395,6 +399,34 @@ void QSymbianControl::ConstructL(bool isWindowOwning, bool desktop) DrawableWindow()->SetPointerGrab(ETrue); } + +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + if (OwnsWindow()) { + TTfxWindowPurpose windowPurpose(ETfxPurposeNone); + switch (qwidget->windowType()) { + case Qt::Dialog: + windowPurpose = ETfxPurposeDialogWindow; + break; + case Qt::Popup: + windowPurpose = ETfxPurposePopupWindow; + break; + case Qt::Tool: + windowPurpose = ETfxPurposeToolWindow; + break; + case Qt::ToolTip: + windowPurpose = ETfxPurposeToolTipWindow; + break; + case Qt::SplashScreen: + windowPurpose = ETfxPurposeSplashScreenWindow; + break; + default: + windowPurpose = (isWindowOwning || !qwidget->parentWidget()) + ? ETfxPurposeWindow : ETfxPurposeChildWindow; + break; + } + Window().SetPurpose(windowPurpose); + } +#endif } QSymbianControl::~QSymbianControl() @@ -1483,6 +1515,10 @@ void qt_init(QApplicationPrivate * /* priv */, int) systemFont.setFamily(systemFont.defaultFamily()); QApplicationPrivate::setSystemFont(systemFont); +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + QObject::connect(qApp, SIGNAL(aboutToQuit()), qApp, SLOT(_q_aboutToQuit())); +#endif + /* ### Commented out for now as parameter handling not needed in SOS(yet). Code below will break testlib with -o flag int argc = priv->argc; @@ -1572,6 +1608,9 @@ bool QApplicationPrivate::modalState() void QApplicationPrivate::enterModal_sys(QWidget *widget) { +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + S60->wsSession().SendEffectCommand(ETfxCmdAppModalModeEnter); +#endif if (widget) { static_cast(widget->effectiveWinId())->FadeBehindPopup(ETrue); // Modal partial screen dialogs (like queries) capture pointer events. @@ -1587,6 +1626,9 @@ void QApplicationPrivate::enterModal_sys(QWidget *widget) void QApplicationPrivate::leaveModal_sys(QWidget *widget) { +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + S60->wsSession().SendEffectCommand(ETfxCmdAppModalModeExit); +#endif if (widget) { static_cast(widget->effectiveWinId())->FadeBehindPopup(EFalse); // ### FixMe: Add specialized behaviour for fullscreen modal dialogs @@ -1883,6 +1925,9 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent break; QRefCountedWidgetBackingStore &backingStore = window->d_func()->maybeTopData()->backingStore; if (visChangedEvent->iFlags & TWsVisibilityChangedEvent::ENotVisible) { +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + S60->wsSession().SendEffectCommand(ETfxCmdDeallocateLayer); +#endif // Decrement backing store reference count backingStore.deref(); // In order to ensure that any resources used by the window surface @@ -1893,6 +1938,9 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent // Increment backing store reference count backingStore.ref(); } else { +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + S60->wsSession().SendEffectCommand(ETfxCmdRestoreLayer); +#endif // Create backing store with an initial reference count of 1 backingStore.create(window); backingStore.ref(); @@ -2268,6 +2316,14 @@ void QApplication::restoreOverrideCursor() #endif // QT_NO_CURSOR +void QApplicationPrivate::_q_aboutToQuit() +{ +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + // Send the shutdown tfx command + S60->wsSession().SendEffectCommand(ETfxCmdAppShutDown); +#endif +} + QS60ThreadLocalData::QS60ThreadLocalData() { CCoeEnv *env = CCoeEnv::Static(); -- cgit v0.12 From eb6d70eeeaaafb748a5fca38f6f033136aadf148 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 6 Aug 2010 10:26:48 +0200 Subject: Test we do not have compiler warnings in our headers with more options I removed some statics because else the test could not be run several times Reviewed-by: Andreas Kling --- tests/auto/compilerwarnings/tst_compilerwarnings.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp index 82c327a..8d344d8 100644 --- a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp +++ b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp @@ -114,6 +114,9 @@ void tst_CompilerWarnings::warnings_data() QTest::addColumn("cflags"); QTest::newRow("standard") << QStringList(); + QTest::newRow("warn deprecated, fast plus, no debug") << (QStringList() << "-DQT_DEPRECATED_WARNINGS" + << "-DQT_USE_FAST_OPERATOR_PLUS" << "-DQT_NU_DEBUG" << "-DQT_NO_DEBUG_STREAM" << "-DQT_NO_WARNING_OUTPUT"); + QTest::newRow("no deprecated, no keywords") << (QStringList() << "-DQT_NO_DEPRECATED" << "-DQT_NO_KEYWORDS"); #if 0 #ifdef Q_WS_QWS @@ -136,14 +139,14 @@ void tst_CompilerWarnings::warnings() QSKIP("gcc 3.x outputs too many bogus warnings", SkipAll); #endif - static QString tmpFile; + /*static*/ QString tmpFile; if (tmpFile.isEmpty()) { QTemporaryFile tmpQFile; tmpQFile.open(); tmpFile = tmpQFile.fileName(); tmpQFile.close(); } - static QString tmpSourceFile; + /*static*/ QString tmpSourceFile; bool openResult = true; const QString tmpBaseName("XXXXXX-test.cpp"); QString templatePath = QDir::temp().absoluteFilePath(tmpBaseName); -- cgit v0.12 From 033b53a02fb02c5aec412e3d87ad9661110c6e6e Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 6 Aug 2010 10:31:20 +0200 Subject: compilation with QT_NO_DEPRECATED Reviewed-by: Andreas Kling --- src/network/bearer/qnetworkconfiguration.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h index d9d36fd..02f9cb6 100644 --- a/src/network/bearer/qnetworkconfiguration.h +++ b/src/network/bearer/qnetworkconfiguration.h @@ -120,7 +120,9 @@ public: Purpose purpose() const; // Required to maintain source compatibility with Qt Mobility. +#ifdef QT_DEPRECATED QT_DEPRECATED inline QString bearerName() const { return bearerTypeName(); } +#endif BearerType bearerType() const; QString bearerTypeName() const; -- cgit v0.12 From e4acfde1ecfa6d4ae4e8d093e20e085a4b8d8c44 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Fri, 6 Aug 2010 11:09:02 +0200 Subject: Adding Getting Started files. Auto test passes. --- .../tutorials/gettingStarted/gsQml/core/button.qml | 108 ++++++++++ .../gettingStarted/gsQml/core/editMenu.qml | 105 ++++++++++ .../gettingStarted/gsQml/core/fileDialog.qml | 163 +++++++++++++++ .../gettingStarted/gsQml/core/fileMenu.qml | 232 +++++++++++++++++++++ .../gettingStarted/gsQml/core/menuBar.qml | 147 +++++++++++++ .../tutorials/gettingStarted/gsQml/core/qmldir | 49 +++++ .../gettingStarted/gsQml/core/textArea.qml | 87 ++++++++ .../gettingStarted/gsQml/filedialog/cppPlugins.pro | 17 ++ .../gsQml/filedialog/dialogPlugin.cpp | 54 +++++ .../gettingStarted/gsQml/filedialog/dialogPlugin.h | 57 +++++ .../gettingStarted/gsQml/filedialog/directory.cpp | 224 ++++++++++++++++++++ .../gettingStarted/gsQml/filedialog/directory.h | 107 ++++++++++ .../gettingStarted/gsQml/filedialog/file.cpp | 57 +++++ .../gettingStarted/gsQml/filedialog/file.h | 67 ++++++ .../gettingStarted/gsQml/filedialog/qmldir | 1 + .../gettingStarted/gsQml/images/arrow.png | Bin 0 -> 583 bytes .../gsQml/pics/qml-texteditor5_editmenu.png | Bin 0 -> 65123 bytes .../gsQml/pics/qml-texteditor5_filemenu.png | Bin 0 -> 21367 bytes .../gsQml/pics/qml-texteditor5_newfile.png | Bin 0 -> 76693 bytes .../tutorials/gettingStarted/gsQml/texteditor.qml | 128 ++++++++++++ 20 files changed, 1603 insertions(+) create mode 100644 examples/tutorials/gettingStarted/gsQml/core/button.qml create mode 100644 examples/tutorials/gettingStarted/gsQml/core/editMenu.qml create mode 100644 examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml create mode 100644 examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml create mode 100644 examples/tutorials/gettingStarted/gsQml/core/menuBar.qml create mode 100644 examples/tutorials/gettingStarted/gsQml/core/qmldir create mode 100644 examples/tutorials/gettingStarted/gsQml/core/textArea.qml create mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro create mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp create mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h create mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp create mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/directory.h create mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp create mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/file.h create mode 100644 examples/tutorials/gettingStarted/gsQml/filedialog/qmldir create mode 100644 examples/tutorials/gettingStarted/gsQml/images/arrow.png create mode 100644 examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png create mode 100644 examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png create mode 100644 examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png create mode 100644 examples/tutorials/gettingStarted/gsQml/texteditor.qml diff --git a/examples/tutorials/gettingStarted/gsQml/core/button.qml b/examples/tutorials/gettingStarted/gsQml/core/button.qml new file mode 100644 index 0000000..dd5dcad --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/button.qml @@ -0,0 +1,108 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +import Qt 4.7 + +Rectangle { + //identifier of the item + id: button + + //these properties act as constants, useable outside this QML file + property int buttonHeight: 75 + property int buttonWidth: 150 + + //attaches to the Text element's text content + property string label + property color textColor: buttonLabel.color + + //the color highlight when the mouse hovers on the rectangle + property color onHoverColor: "lightsteelblue" + property color borderColor: "transparent" + + //buttonColor is set to the button's main color + property color buttonColor: "lightblue" + + property real labelSize: 14 + + //set appearance properties + radius: 6 + smooth: true + border { width: 2; color: borderColor } + width: buttonWidth; height: buttonHeight + + Text { + id: buttonLabel + anchors.centerIn: parent + text: label //bind the text to the parent's text + color: "#DCDCCC" + font.pointSize: labelSize + } + + //buttonClick() is callable and a signal handler, onButtonClick is automatically created + signal buttonClick() + + //define the clickable area to be the whole rectangle + MouseArea { + id: buttonMouseArea + anchors.fill: parent //stretch the area to the parent's dimension + onClicked: buttonClick() + + //if true, then onEntered and onExited called if mouse hovers in the mouse area + //if false, a button must be clicked to detect the mouse hover + hoverEnabled: true + + //display a border if the mouse hovers on the button mouse area + onEntered: parent.border.color = onHoverColor + //remove the border if the mouse exits the button mouse area + onExited: parent.border.color = borderColor + } + + //change the color of the button when pressed + color: buttonMouseArea.pressed ? Qt.darker(buttonColor, 1.5) : buttonColor + //animate the color whenever the color property changes + Behavior on color { ColorAnimation{ duration: 55 } } + + //scale the button when pressed + scale: buttonMouseArea.pressed ? 1.1 : 1.00 + //Animate the scale property change + Behavior on scale { NumberAnimation{ duration: 55 } } + +} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml b/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml new file mode 100644 index 0000000..7f47d9f --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml @@ -0,0 +1,105 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +import Qt 4.7 + +Rectangle { + id: editMenu + height: 480; width:1000 + color: "powderblue" + property color buttonBorderColor: "#7A8182" + property color buttonFillColor: "#61BDCACD" + property string menuName:"Edit" + gradient: Gradient { + GradientStop { position: 0.0; color: "#6A7570" } + GradientStop { position: 1.0; color: Qt.darker("#6A7570") } + } + + Rectangle { + id:actionContainer + color:"transparent" + anchors.centerIn: parent + width: parent.width; height: parent.height / 5 + Row { + anchors.centerIn: parent + spacing: parent.width/9 + Button { + id: loadButton + buttonColor: buttonFillColor + label: "Copy" + labelSize: 16 + borderColor: buttonBorderColor + height: actionContainer.height; width: actionContainer.width/6 + onButtonClick: textArea.copy() + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + Button { + id: saveButton + height: actionContainer.height; width: actionContainer.width/6 + buttonColor: buttonFillColor + label: "Paste" + borderColor: buttonBorderColor + labelSize: 16 + onButtonClick: textArea.paste() + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + Button { + id: exitButton + label: "Select All" + height: actionContainer.height; width: actionContainer.width/6 + labelSize: 16 + buttonColor: buttonFillColor + borderColor:buttonBorderColor + onButtonClick: textArea.selectAll() + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + } + } +} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml b/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml new file mode 100644 index 0000000..425f717 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml @@ -0,0 +1,163 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle { + id:dialog + height: 200 * partition; width: 200 + color: "transparent" + + signal selectChanged() + signal notifyRefresh() + onNotifyRefresh:dirView.model = directory.files + + property string selectedFile + property int selectedIndex: 0 + + Rectangle { + id: dirBox + radius: 10 + anchors.centerIn:parent + height: parent.height -15; width: parent.width -30 + + Rectangle { + id:header + height: parent.height*0.1; width: parent.width + radius:3 + z:1 + gradient: Gradient { + GradientStop { position: 0.0; color: "#8C8F8C" } + GradientStop { position: 0.17; color: "#6A6D6A" } + GradientStop { position: 0.98;color: "#3F3F3F" } + GradientStop { position: 1.0; color: "#0e1B20" } + } + Text { + height: header.height; anchors.centerIn: header + text: "files:" + color: "lightblue" + font.weight: Font.Light + font.italic: true + } + } + GridView { + id:dirView + width:parent.width; height:parent.height*.9 + anchors.top: header.bottom + cellWidth: 100; cellHeight: 75 + model: directory.files + delegate: dirDelegate + clip: true + highlightMoveDuration: 40 + } + Component { + id: dirDelegate + Rectangle { + id:file + color: "transparent" + width: GridView.view.cellWidth; height: GridView.view.cellHeight + + Text { + id:fileName + width: parent.width + anchors.centerIn: parent + text: name + color: "#BDCACD" + font.weight: GridView.view.currentIndex == index ? Font.DemiBold : Font.Normal + font.pointSize: GridView.view.currentIndex == index ? 12 : 10 + elide: Text.ElideMiddle + horizontalAlignment: Text.AlignHCenter + } + Rectangle { + id: selection + width: parent.width; height: parent.height + anchors.centerIn: parent + radius: 10 + smooth: true + scale: GridView.view.currentIndex == index ? 1 : 0.5 + opacity: GridView.view.currentIndex == index ? 1 : 0 + Text { + id: overlay + width: parent.width + anchors.centerIn: parent + text: name + color: "#696167" + font.weight: Font.DemiBold + font.pointSize: 12 + smooth: true + elide: Text.ElideMiddle + horizontalAlignment: Text.AlignHCenter + } + Behavior on opacity { NumberAnimation{ duration: 45 } } + Behavior on scale { NumberAnimation{ duration: 45 } } + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter("lightsteelblue",1.25) } + GradientStop { position: 0.67; color: Qt.darker("lightsteelblue",1.3) } + } + border.color: "lightsteelblue" + border.width: 1 + } + MouseArea { + id:fileMouseArea + anchors.fill:parent + hoverEnabled: true + + onClicked: { + GridView.view.currentIndex = index + selectedFile = directory.files[index].name + selectChanged() + } + onEntered: { + fileName.color = "lightsteelblue" + fileName.font.weight = Font.DemiBold + } + onExited: { + fileName.font.weight = Font.Normal + fileName.color = "#BDCACD" + } + } + } + } + gradient: Gradient { + GradientStop { position: 0.0; color: "#A5333333" } + GradientStop { position: 1.0; color: "#03333333" } + } + } +} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml b/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml new file mode 100644 index 0000000..afe48c7 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml @@ -0,0 +1,232 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle { + id: fileMenu + height: 480; width:1000 + property color buttonBorderColor: "#7F8487" + property color buttonFillColor: "#8FBDCACD" + property string fileContent:directory.fileContent + + //the menuName is accessible from outside this QML file + property string menuName: "File" + + //used to divide the screen into parts. + property real partition: 1/3 + + color: "#6C646A" + gradient: Gradient { + GradientStop { position: 0.0; color: "#6C646A" } + GradientStop { position: 1.0; color: Qt.darker("#6A6D6A") } + } + + Directory { + id:directory + filename: textInput.text + onDirectoryChanged:fileDialog.notifyRefresh() + } + + Rectangle { + id:actionContainer + + //make this rectangle invisible + color:"transparent" + anchors.left: parent.left + + //the height is a good proportion that creates more space at the top of + //the column of buttons + width: fileMenu.width * partition; height: fileMenu.height + + Column { + anchors.centerIn: parent + spacing: parent.height/32 + Button { + id: saveButton + label: "Save" + borderColor: buttonBorderColor + buttonColor: buttonFillColor + width: actionContainer.width/ 1.3 + height:actionContainer.height / 8 + labelSize:24 + onButtonClick: { + directory.fileContent = textArea.textContent + directory.filename = textInput.text + directory.saveFile() + } + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + Button { + id: loadButton + width: actionContainer.width/ 1.3 + height:actionContainer.height/ 8 + buttonColor: buttonFillColor + borderColor: buttonBorderColor + label: "Load" + labelSize:24 + onButtonClick:{ + directory.filename = textInput.text + directory.loadFile() + textArea.textContent = directory.fileContent + } + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + Button { + id: newButton + width: actionContainer.width/ 1.3 + height: actionContainer.height/ 8 + buttonColor: buttonFillColor + borderColor: buttonBorderColor + label: "New" + labelSize: 24 + onButtonClick:{ + textArea.textContent = "" + textInput.text = "" + } + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + + } + Rectangle { + id: space + width: actionContainer.width/ 1.3 + height: actionContainer.height / 16 + color: "transparent" + } + Button { + id: exitButton + width: actionContainer.width/ 1.3 + height: actionContainer.height/ 8 + label: "Exit" + labelSize: 24 + buttonColor: buttonFillColor + borderColor: buttonBorderColor + onButtonClick: Qt.quit() + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + } + } + Rectangle { + id:dialogContainer + + width: 2*fileMenu.width * partition; height: fileMenu.height + anchors.right:parent.right + color: "transparent" + + Column { + anchors.centerIn: parent + spacing: parent.height /640 + FileDialog { + id:fileDialog + height: 2*dialogContainer.height * partition + width: dialogContainer.width + onSelectChanged: textInput.text = selectedFile + } + + Rectangle { + id:lowerPartition + height: dialogContainer.height * partition; width: dialogContainer.width + color: "transparent" + + Rectangle { + id: nameField + gradient: Gradient { + GradientStop { position: 0.0; color: "#806F6F6F" } + GradientStop { position: 1.0; color: "#136F6F6F" } + } + radius: 10 + anchors { centerIn:parent; leftMargin: 15; rightMargin: 15; topMargin: 15 } + height: parent.height-15 + width: parent.width -20 + border { color: "#4A4A4A"; width:1 } + + TextInput { + id: textInput + z:2 + anchors { bottom: parent.bottom; topMargin: 10; horizontalCenter: parent.horizontalCenter } + width: parent.width - 10 + height: parent.height -10 + font.pointSize: 40 + color: "lightsteelblue" + focus: true + } + Text { + id: textInstruction + anchors.centerIn: parent + text: "Select file name and press save or load" + font {pointSize: 11; weight: Font.Light; italic: true} + color: "lightblue" + z: 2 + opacity: (textInput.text == "") ? 1 : 0 + } + Text { + id:fieldLabel + anchors { top: parent.top; left: parent.left } + text: " file name: " + font { pointSize: 11; weight: Font.Light; italic: true } + color: "lightblue" + z:2 + } + MouseArea { + anchors.centerIn:parent + width: nameField.width; height: nameField.height + onClicked: { + textInput.text = "" + textInput.focus = true + textInput.forceFocus() + } + } + } + } + } + } +} diff --git a/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml b/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml new file mode 100644 index 0000000..0695772 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml @@ -0,0 +1,147 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle { + id: menuBar + width: 1000; height:300 + color:"transparent" + property color fileColor: "plum" + property color editColor: "powderblue" + + property real partition: 1/10 + + Column { + anchors.fill: parent + //container for the header and the buttons + z: 1 + Rectangle { + id: labelList + height:menuBar.height*partition + width: menuBar.width + color: "beige" + gradient: Gradient { + GradientStop { position: 0.0; color: "#8C8F8C" } + GradientStop { position: 0.17; color: "#6A6D6A" } + GradientStop { position: 0.98;color: "#3F3F3F" } + GradientStop { position: 1.0; color: "#0e1B20" } + } + Text { + height: parent.height + anchors { right: labelRow.left ; verticalCenter: parent.bottom } + text: "menu: " + color: "lightblue" + font { weight: Font.Light; italic: true } + smooth: true + } + //row displays its children in a vertical row + Row { + id: labelRow + anchors.centerIn: parent + spacing:40 + Button { + id: fileButton + height: 20; width: 50 + label: "File" + buttonColor : menuListView.currentIndex == 0? fileColor : Qt.darker(fileColor, 1.5) + scale: menuListView.currentIndex == 0? 1.25: 1 + labelSize: menuListView.currentIndex == 0? 16:12 + radius: 1 + smooth:true + //on a button click, change the list's currently selected item to FileMenu + onButtonClick: menuListView.currentIndex = 0 + gradient: Gradient { + GradientStop { position: 0.0; color: fileColor } + GradientStop { position: 1.0; color: "#136F6F6F" } + } + } + Button { + id: editButton + height: 20; width: 50 + buttonColor : menuListView.currentIndex == 1? Qt.darker(editColor, 1.5) : Qt.darker(editColor, 1.9) + scale: menuListView.currentIndex == 1? 1.25: 1 + label: "Edit" + radius: 1 + labelSize: menuListView.currentIndex == 1? 16:12 + smooth:true + //on a button click, change the list's currently selected item to EditMenu + onButtonClick: menuListView.currentIndex = 1 + gradient: Gradient { + GradientStop { position: 0.0; color: editColor } + GradientStop { position: 1.0; color: "#136F6F6F" } + } + } + } + } + + //list view will display a model according to a delegate + ListView { + id: menuListView + width:menuBar.width; height: 9*menuBar.height*partition + + //the model contains the data + model: menuListModel + + //control the movement of the menu switching + snapMode: ListView.SnapOneItem + orientation: ListView.Horizontal + boundsBehavior: Flickable.StopAtBounds + flickDeceleration: 5000 + highlightFollowsCurrentItem: true + highlightMoveDuration:240 + highlightRangeMode: ListView.StrictlyEnforceRange + } + } + //a list of visual items already have delegates handling their display + VisualItemModel { + id: menuListModel + + FileMenu { + id:fileMenu + width: menuListView.width; height: menuListView.height + color: fileColor + } + EditMenu { + color: editColor + width: menuListView.width; height: menuListView.height + } + } +} diff --git a/examples/tutorials/gettingStarted/gsQml/core/qmldir b/examples/tutorials/gettingStarted/gsQml/core/qmldir new file mode 100644 index 0000000..08575cc --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/qmldir @@ -0,0 +1,49 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +Button ./button.qml +FileDialog ./fileDialog.qml +TextArea ./textArea.qml +TextEditor ./textEditor.qml +EditMenu ./editMenu.qml +MenuBar ./menuBar.qml +FileMenu ./fileMenu.qml + +plugin FileDialog ../plugins diff --git a/examples/tutorials/gettingStarted/gsQml/core/textArea.qml b/examples/tutorials/gettingStarted/gsQml/core/textArea.qml new file mode 100644 index 0000000..6d3d214 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/core/textArea.qml @@ -0,0 +1,87 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle { + id:textArea + + function paste() { textEdit.paste() } + function copy() { textEdit.copy() } + function selectAll() { textEdit.selectAll() } + + width :400; height:400 + + property color fontColor: "white" + property alias textContent: textEdit.text + Flickable { + id: flickArea + width: parent.width; height: parent.height + anchors.fill:parent + + boundsBehavior: Flickable.StopAtBounds + flickableDirection: Flickable.HorizontalFlick + interactive: true + //Will move the text Edit area to make the area visible when + //scrolled with keyboard strokes + function ensureVisible(r) { + if (contentX >= r.x) + contentX = r.x; + else if (contentX+width <= r.x+r.width) + contentX = r.x+r.width-width; + if (contentY >= r.y) + contentY = r.y; + else if (contentY+height <= r.y+r.height) + contentY = r.y+r.height-height; + } + + TextEdit { + id: textEdit + anchors.fill:parent + width:parent.width; height:parent.height + color:fontColor + focus: true + wrapMode: TextEdit.Wrap + font.pointSize:10 + onCursorRectangleChanged: flickArea.ensureVisible(cursorRectangle) + selectByMouse: true + } + } +} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro b/examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro new file mode 100644 index 0000000..d85787d --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro @@ -0,0 +1,17 @@ +TEMPLATE = lib +CONFIG += qt plugin +QT += declarative + +DESTDIR += ../plugins +OBJECTS_DIR = tmp +MOC_DIR = tmp + +TARGET = FileDialog + +HEADERS += directory.h \ + file.h \ + dialogPlugin.h + +SOURCES += directory.cpp \ + file.cpp \ + dialogPlugin.cpp diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp new file mode 100644 index 0000000..e3a82dc --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "dialogPlugin.h" +#include "directory.h" +#include "file.h" +#include + +void DialogPlugin::registerTypes(const char *uri) +{ + //register the class Directory into QML as a "Directory" element version 1.0 + qmlRegisterType(uri, 1, 0, "Directory"); + qmlRegisterType(uri,1,0,"File"); +} + +//FileDialog is the plugin name (same as the TARGET in the project file) and DialogPlugin is the plugin classs +Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin); \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h new file mode 100644 index 0000000..c345641 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DIALOGPLUGIN_H +#define DIALOGPLUGIN_H + +#include + +class DialogPlugin : public QDeclarativeExtensionPlugin +{ + Q_OBJECT + + public: + //registerTypes is inherited from QDeclarativeExtensionPlugin + void registerTypes(const char *uri); + +}; + +#endif + diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp new file mode 100644 index 0000000..c46a65b --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp @@ -0,0 +1,224 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "directory.h" +#include + +/* +Directory constructor + +Initialize the saves directory and creates the file list +*/ +Directory::Directory(QObject *parent) : QObject(parent) +{ + m_dir.cd( QDir::currentPath() ); + + //go to the saved directory. if not found, create save directory + m_saveDir = "saves"; + if ( m_dir.cd(m_saveDir) == 0 ) { + m_dir.mkdir(m_saveDir); + m_dir.cd(m_saveDir); + } + m_filterList << "*.txt"; + refresh(); +} + +/* +Directory::filesNumber +Return the number of Files +*/ +int Directory::filesCount() const +{ + return m_fileList.size(); +} + +/* +Function called to append data onto list property +*/ +void appendFiles(QDeclarativeListProperty * property, File * file) +{ + Q_UNUSED(property); + Q_UNUSED(file); + //Do nothing. can't add to a directory using this method +} + +/* +Function called to retrieve file in the list using an index +*/ +File* fileAt(QDeclarativeListProperty * property, int index) +{ + return static_cast< QList *>(property->data)->at(index); +} + +/* +Returns the number of files in the list +*/ +int filesSize(QDeclarativeListProperty * property) +{ + return static_cast< QList *>(property->data)->size(); +} + +/* +Function called to empty the list property contents +*/ +void clearFilesPtr(QDeclarativeListProperty *property) +{ + return static_cast< QList *>(property->data)->clear(); +} + +/* +Returns the list of files as a QDeclarativeListProperty. +*/ +QDeclarativeListProperty Directory::files() +{ + refresh(); + return QDeclarativeListProperty( this, &m_fileList, &appendFiles, &filesSize, &fileAt, &clearFilesPtr ); +} + +/* +Return the name of the currently selected file +*/ +QString Directory::filename() const +{ + return currentFile.name(); +} + +/* +Return the file's content as a string. +*/ +QString Directory::fileContent() const +{ + return m_fileContent; +} + +/* +Set the file name of the current file +*/ +void Directory::setFilename(const QString &str) +{ + if( str != currentFile.name() ) { + currentFile.setName(str); + emit filenameChanged(); + } +} + +/* +Set the content of the file as a string +*/ +void Directory::setFileContent(const QString &str) +{ + if(str != m_fileContent){ + m_fileContent = str; + emit fileContentChanged(); + } +} + +/* +Called from QML to save the file using the filename and file content. +Saving makes sure that the file has a .txt extension. +*/ +void Directory::saveFile() +{ + if(currentFile.name().size() == 0){ + qWarning()<< "Empty filename. no save"; + return; + } + QString extendedName = currentFile.name(); + if(!currentFile.name().endsWith(".txt")){ + extendedName.append(".txt"); + } + QFile file( m_dir.filePath(extendedName) ); + if ( file.open(QFile::WriteOnly | QFile::Truncate) ) { + QTextStream outStream(&file); + outStream << m_fileContent; + } + file.close(); + refresh(); + emit directoryChanged(); +} + +/* +Load the contents of a file. +Only loads files with a .txt extension +*/ +void Directory::loadFile() +{ + m_fileContent.clear(); + QString extendedName = currentFile.name(); + if( !currentFile.name().endsWith(".txt") ) { + extendedName.append(".txt"); + } + + QFile file( m_dir.filePath(extendedName) ); + if ( file.open(QFile::ReadOnly ) ) { + QTextStream inStream(&file); + + QString line; + do { + line = inStream.read(75); + m_fileContent.append(line); + } while ( !line.isNull() ) ; + } + file.close(); +} + +/* +Reloads the content of the files list. This is to ensure that the newly +created files are added onto the list. +*/ +void Directory::refresh() +{ + m_dirFiles = m_dir.entryList(m_filterList,QDir::Files,QDir::Name); + m_fileList.clear(); + + File * file; + for(int i = 0; i < m_dirFiles.size() ; i ++) { + file = new File(); + + if( m_dirFiles.at(i).endsWith(".txt") ) { + QString name = m_dirFiles.at(i); + file->setName( name.remove(".txt",Qt::CaseSensitive) ); + } + else { + file->setName(m_dirFiles.at(i)); + } + m_fileList.append(file); + } +} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/directory.h b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.h new file mode 100644 index 0000000..0dc388a --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.h @@ -0,0 +1,107 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DIRECTORY_H +#define DIRECTORY_H + +#include "file.h" + +#include +#include +#include +#include +#include + +class Directory : public QObject { + + Q_OBJECT + + //number of files in the directory + Q_PROPERTY(int filesCount READ filesCount) + + //list property containing file names as QString + Q_PROPERTY(QDeclarativeListProperty files READ files CONSTANT ) + + //file name of the text file to read/write + Q_PROPERTY(QString filename READ filename WRITE setFilename NOTIFY filenameChanged) + + //text content of the file + Q_PROPERTY(QString fileContent READ fileContent WRITE setFileContent NOTIFY fileContentChanged) + + public: + Directory(QObject *parent = 0); + + //properties' read functions + int filesCount() const; + QString filename() const; + QString fileContent() const; + QDeclarativeListProperty files(); + + //properties' write functions + void setFilename(const QString &str); + void setFileContent(const QString &str); + + //accessible from QML + Q_INVOKABLE void saveFile(); + Q_INVOKABLE void loadFile(); + + signals: + void directoryChanged(); + void filenameChanged(); + void fileContentChanged(); + + private: + QDir m_dir; + QStringList m_dirFiles; + File currentFile; + QString m_saveDir; + QStringList m_filterList; + + //contains the file data in QString format + QString m_fileContent; + + //Registered to QML in a plugin. Accessible from QML as a property of Directory + QList m_fileList; + + //refresh content of the directory + void refresh(); +}; + +#endif diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp new file mode 100644 index 0000000..ccf762c --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include "file.h" + +File::File(QObject *parent) : QObject(parent) +{ + m_name = ""; +} + +QString File::name() const{ + return m_name; +} +void File::setName(const QString &str){ + if(str != m_name){ + m_name = str; + emit nameChanged(); + } +} \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/file.h b/examples/tutorials/gettingStarted/gsQml/filedialog/file.h new file mode 100644 index 0000000..606f374 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/file.h @@ -0,0 +1,67 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef FILE_H +#define FILE_H + + +#include +#include + +class File : public QObject{ + + Q_OBJECT + + Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) + + public: + File(QObject *parent = 0); + + QString name() const; + void setName(const QString &str); + + signals: + void nameChanged(); + + private: + QString m_name; +}; + +#endif \ No newline at end of file diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir b/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir new file mode 100644 index 0000000..c2b27da --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir @@ -0,0 +1 @@ +plugin FileDialog plugins diff --git a/examples/tutorials/gettingStarted/gsQml/images/arrow.png b/examples/tutorials/gettingStarted/gsQml/images/arrow.png new file mode 100644 index 0000000..14978c2 Binary files /dev/null and b/examples/tutorials/gettingStarted/gsQml/images/arrow.png differ diff --git a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png new file mode 100644 index 0000000..27feed5 Binary files /dev/null and b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png differ diff --git a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png new file mode 100644 index 0000000..4d8f9f2 Binary files /dev/null and b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png differ diff --git a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png new file mode 100644 index 0000000..680acfe Binary files /dev/null and b/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png differ diff --git a/examples/tutorials/gettingStarted/gsQml/texteditor.qml b/examples/tutorials/gettingStarted/gsQml/texteditor.qml new file mode 100644 index 0000000..3bd9d55 --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/texteditor.qml @@ -0,0 +1,128 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 +import "core" + +Rectangle { + id: screen + width: 1000; height: 1000 + property int partition: height/3 + border { width: 1; color: "#DCDCCC"} + state: "DRAWER_CLOSED" + + //Item 1: MenuBar on the top portion of the screen + MenuBar { + id:menuBar + height: screen.partition; width: screen.width + z: 1 + } + + //Item 2: The editable text area + TextArea { + id: textArea + y: drawer.height + color: "#3F3F3F" + fontColor: "#DCDCCC" + height: partition*2; width:parent.width + } + + //Item 3: The drawer handle + Rectangle { + id: drawer + height: 15; width: parent.width + border { color : "#6A6D6A"; width: 1 } + z: 1 + gradient: Gradient { + GradientStop { position: 0.0; color: "#8C8F8C" } + GradientStop { position: 0.17; color: "#6A6D6A" } + GradientStop { position: 0.77; color: "#3F3F3F" } + GradientStop { position: 1.0; color: "#6A6D6A" } + } + Image { + id: arrowIcon + source: "images/arrow.png" + anchors.horizontalCenter: parent.horizontalCenter + Behavior{ NumberAnimation { property: "rotation"; easing.type: Easing.OutExpo } } + } + + MouseArea { + id: drawerMouseArea + anchors.fill: parent + hoverEnabled: true + onEntered: parent.border.color = Qt.lighter("#6A6D6A") + onExited: parent.border.color = "#6A6D6A" + onClicked: { + if (screen.state == "DRAWER_CLOSED") { + screen.state = "DRAWER_OPEN" + } + else if (screen.state == "DRAWER_OPEN"){ + screen.state = "DRAWER_CLOSED" + } + } + } + } + + states:[ + State { + name: "DRAWER_OPEN" + PropertyChanges { target: menuBar; y: 0} + PropertyChanges { target: textArea; y: partition + drawer.height} + PropertyChanges { target: drawer; y: partition} + PropertyChanges { target: arrowIcon; rotation: 180} + }, + State { + name: "DRAWER_CLOSED" + PropertyChanges { target: menuBar; y:-height; } + PropertyChanges { target: textArea; y: drawer.height; height: screen.height - drawer.height } + PropertyChanges { target: drawer; y: 0 } + PropertyChanges { target: arrowIcon; rotation: 0 } + } + ] + + transitions: [ + Transition { + to: "*" + NumberAnimation { target: textArea; properties: "y, height"; duration: 100; easing.type:Easing.OutExpo } + NumberAnimation { target: menuBar; properties: "y"; duration: 100; easing.type: Easing.OutExpo } + NumberAnimation { target: drawer; properties: "y"; duration: 100; easing.type: Easing.OutExpo } + } + ] +} -- cgit v0.12 From a273f6fb0b2410da772e7759125f955da9a5e19c Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 6 Aug 2010 11:52:41 +0200 Subject: doc: Fixed some missing images. Task-nr: QTBUG-8246 --- doc/src/examples/imagegestures.qdoc | 2 -- doc/src/getting-started/examples.qdoc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/src/examples/imagegestures.qdoc b/doc/src/examples/imagegestures.qdoc index 57479d8..3d4e467 100644 --- a/doc/src/examples/imagegestures.qdoc +++ b/doc/src/examples/imagegestures.qdoc @@ -32,8 +32,6 @@ This example shows how to enable gestures for a widget and use gesture input to perform actions. - \image imagegestures-example.png Screenshot of the Image Gestures example. - We use two classes to create the user interface for the application: \c MainWidget and \c ImageWidget. The \c MainWidget class is simply used as a container for the \c ImageWidget class, which we will configure to accept gesture input. Since we diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index b2895ba..1bf86e5 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -529,7 +529,7 @@ \title OpenVG Examples \brief Accessing OpenVG from Qt - \image openvg-examples.png + \image opengl-examples.png Qt provides support for integration with OpenVG implementations on platforms with suitable drivers. -- cgit v0.12 From 6b61a2787759673f246493453c0809d24c9d6ae5 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Fri, 6 Aug 2010 10:56:44 +0100 Subject: Make input methods work correctly with Symbian^3 FEP in numeric mode Enable alphanumeric modes to use EAknEditorFlagUseSCTNumericCharmap flag so that all symbols are shown when you press the * key when the FEP is in portrait mode (traditional 4x3 mobile phone keypad emulation) Enable text input mode as well as numeric input mode for ImhFormattedNumbersOnly or ImhDialableCharactersOnly, as the '*' key on the virtual keypad does not work to launch the symbols menu otherwise. Task-number: QT-3681 Reviewed-by: Jason Barron --- src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index 999edda..cd05e38 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -359,10 +359,10 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) commitTemporaryPreeditString(); - bool numbersOnly = hints & ImhDigitsOnly || hints & ImhFormattedNumbersOnly - || hints & ImhDialableCharactersOnly; - bool noOnlys = !(numbersOnly || hints & ImhUppercaseOnly - || hints & ImhLowercaseOnly); + bool numbersOnly = (hints & ImhDigitsOnly) || (hints & ImhFormattedNumbersOnly) + || (hints & ImhDialableCharactersOnly); + bool noOnlys = !(numbersOnly || (hints & ImhUppercaseOnly) + || (hints & ImhLowercaseOnly)); TInt flags; Qt::InputMethodHints oldHints = hints; @@ -388,8 +388,7 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) hints |= ImhPreferLowercase; } else if (hints & ImhUppercaseOnly) { hints |= ImhPreferUppercase; - } else if (hints & ImhDigitsOnly || hints & ImhFormattedNumbersOnly - || hints & ImhDialableCharactersOnly) { + } else if (numbersOnly) { hints |= ImhPreferNumbers; } } @@ -406,6 +405,11 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) if (numbersOnly) { flags |= EAknEditorNumericInputMode; } + if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 + && ((hints & ImhFormattedNumbersOnly) || (hints & ImhDialableCharactersOnly)) { + //workaround - the * key does not launch the symbols menu, making it impossible to use these modes unless text mode is enabled. + flags |= EAknEditorTextInputMode; + } if (hints & ImhUppercaseOnly || hints & ImhLowercaseOnly) { flags |= EAknEditorTextInputMode; } @@ -456,6 +460,9 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) if (hints & ImhNoPredictiveText || hints & ImhHiddenText) { flags |= EAknEditorFlagNoT9; } + // if alphanumeric input, then make all symbols available in numeric mode too. + if (!numbersOnly) + flags |= EAknEditorFlagUseSCTNumericCharmap; m_fepState->SetFlags(flags); ReportAknEdStateEvent(MAknEdStateObserver::EAknEdwinStateFlagsUpdate); -- cgit v0.12 From fb6aa3b0769c33685ad38a13fe5ad0ca48679a93 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 6 Aug 2010 12:18:00 +0200 Subject: doc: Fixed some S60 qdoc errors. --- src/gui/s60framework/qs60mainapplication.cpp | 9 ++++++ src/gui/s60framework/qs60mainappui.cpp | 45 ++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/src/gui/s60framework/qs60mainapplication.cpp b/src/gui/s60framework/qs60mainapplication.cpp index 0f9367e..5d4c54e 100644 --- a/src/gui/s60framework/qs60mainapplication.cpp +++ b/src/gui/s60framework/qs60mainapplication.cpp @@ -136,16 +136,25 @@ TFileName QS60MainApplication::ResourceFileName() const return KNullDesC(); } +/*! + \internal +*/ void QS60MainApplication::PreDocConstructL() { QS60MainApplicationBase::PreDocConstructL(); } +/*! + \internal +*/ CDictionaryStore *QS60MainApplication::OpenIniFileLC(RFs &aFs) const { return QS60MainApplicationBase::OpenIniFileLC(aFs); } +/*! + \internal +*/ void QS60MainApplication::NewAppServerL(CApaAppServer *&aAppServer) { QS60MainApplicationBase::NewAppServerL(aAppServer); diff --git a/src/gui/s60framework/qs60mainappui.cpp b/src/gui/s60framework/qs60mainappui.cpp index 40c2d03..ea9dbb3 100644 --- a/src/gui/s60framework/qs60mainappui.cpp +++ b/src/gui/s60framework/qs60mainappui.cpp @@ -281,76 +281,121 @@ void QS60MainAppUi::RestoreMenuL(CCoeControl *menuWindow, TInt resourceId, TMenu } } +/*! + \internal +*/ void QS60MainAppUi::Exit() { QS60MainAppUiBase::Exit(); } +/*! + \internal +*/ void QS60MainAppUi::SetFadedL(TBool aFaded) { QS60MainAppUiBase::SetFadedL(aFaded); } +/*! + \internal +*/ TRect QS60MainAppUi::ApplicationRect() const { return QS60MainAppUiBase::ApplicationRect(); } +/*! + \internal +*/ void QS60MainAppUi::HandleScreenDeviceChangedL() { QS60MainAppUiBase::HandleScreenDeviceChangedL(); } +/*! + \internal +*/ void QS60MainAppUi::HandleApplicationSpecificEventL(TInt aType, const TWsEvent &aEvent) { QS60MainAppUiBase::HandleApplicationSpecificEventL(aType, aEvent); } +/*! + \internal +*/ TTypeUid::Ptr QS60MainAppUi::MopSupplyObject(TTypeUid aId) { return QS60MainAppUiBase::MopSupplyObject(aId); } +/*! + \internal +*/ void QS60MainAppUi::ProcessCommandL(TInt aCommand) { QS60MainAppUiBase::ProcessCommandL(aCommand); } +/*! + \internal +*/ TErrorHandlerResponse QS60MainAppUi::HandleError (TInt aError, const SExtendedError &aExtErr, TDes &aErrorText, TDes &aContextText) { return QS60MainAppUiBase::HandleError(aError, aExtErr, aErrorText, aContextText); } +/*! + \internal +*/ void QS60MainAppUi::HandleViewDeactivation(const TVwsViewId &aViewIdToBeDeactivated, const TVwsViewId &aNewlyActivatedViewId) { QS60MainAppUiBase::HandleViewDeactivation(aViewIdToBeDeactivated, aNewlyActivatedViewId); } +/*! + \internal +*/ void QS60MainAppUi::PrepareToExit() { QS60MainAppUiBase::PrepareToExit(); } +/*! + \internal +*/ void QS60MainAppUi::HandleTouchPaneSizeChange() { QS60MainAppUiBase::HandleTouchPaneSizeChange(); } +/*! + \internal +*/ void QS60MainAppUi::HandleSystemEventL(const TWsEvent &aEvent) { QS60MainAppUiBase::HandleSystemEventL(aEvent); } +/*! + \internal +*/ void QS60MainAppUi::Reserved_MtsmPosition() { QS60MainAppUiBase::Reserved_MtsmPosition(); } +/*! + \internal +*/ void QS60MainAppUi::Reserved_MtsmObject() { QS60MainAppUiBase::Reserved_MtsmObject(); } +/*! + \internal +*/ void QS60MainAppUi::HandleForegroundEventL(TBool aForeground) { QS60MainAppUiBase::HandleForegroundEventL(aForeground); -- cgit v0.12 From 30d6f7ed29a2a5723387768cfe82a807a2724b8b Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 6 Aug 2010 12:31:48 +0200 Subject: doc: Fixed some qdoc errors. --- src/gui/graphicsview/qgraphicsitem.cpp | 15 +++++++++++++++ src/gui/graphicsview/qgraphicstransform.cpp | 18 ++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index ff3dc1f..e1e27d2 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -7758,6 +7758,21 @@ void QGraphicsItemPrivate::resetHeight() } /*! + \property QGraphicsObject::children + \internal +*/ + +/*! + \property QGraphicsObject::width + \internal +*/ + +/*! + \property QGraphicsObject::height + \internal +*/ + +/*! \property QGraphicsObject::parent \brief the parent of the item diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp index 986bee6..7b69317 100644 --- a/src/gui/graphicsview/qgraphicstransform.cpp +++ b/src/gui/graphicsview/qgraphicstransform.cpp @@ -345,6 +345,24 @@ void QGraphicsScale::applyTo(QMatrix4x4 *matrix) const */ /*! + \fn QGraphicsScale::xScaleChanged() + + QGraphicsScale emits this signal when its xScale changes. +*/ + +/*! + \fn QGraphicsScale::yScaleChanged() + + QGraphicsScale emits this signal when its yScale changes. +*/ + +/*! + \fn QGraphicsScale::zScaleChanged() + + QGraphicsScale emits this signal when its zScale changes. +*/ + +/*! \fn QGraphicsScale::scaleChanged() This signal is emitted whenever the xScale, yScale, or zScale -- cgit v0.12 From 0210bbbd7bf8254be5f7f19f524068cd39fc34c2 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Fri, 6 Aug 2010 13:18:24 +0300 Subject: Use ARGB32 premultiplied backing store format in Symbian^3 raster paint engine for translucent windows. Task-number: QTBUG-12710 Reviewed-by: Jason Barron --- src/gui/kernel/qapplication_s60.cpp | 3 ++- src/gui/painting/qwindowsurface_s60.cpp | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 52f0db6..a14b1a7 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1087,7 +1087,8 @@ void QSymbianControl::Draw(const TRect& controlRect) const break; case QWExtra::ZeroFill: - if (Window().DisplayMode() == EColor16MA) { + if (Window().DisplayMode() == EColor16MA + || Window().DisplayMode() == Q_SYMBIAN_ECOLOR16MAP) { gc.SetBrushStyle(CGraphicsContext::ESolidBrush); gc.SetDrawMode(CGraphicsContext::EDrawModeWriteAlpha); gc.SetBrushColor(TRgb::Color16MA(0)); diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp index 477bd93..8bac1f5 100644 --- a/src/gui/painting/qwindowsurface_s60.cpp +++ b/src/gui/painting/qwindowsurface_s60.cpp @@ -67,10 +67,14 @@ QS60WindowSurface::QS60WindowSurface(QWidget* widget) TDisplayMode mode = S60->screenDevice()->DisplayMode(); bool isOpaque = qt_widget_private(widget)->isOpaque; - if (mode == EColor16MA && isOpaque) - mode = EColor16MU; // Faster since 16MU -> 16MA is typically accelerated - else if (mode == EColor16MU && !isOpaque) - mode = EColor16MA; // Try for transparency anyway + if (isOpaque) { + mode = EColor16MU; + } else { + if (QSysInfo::symbianVersion() >= QSysInfo::SV_SF_3) + mode = Q_SYMBIAN_ECOLOR16MAP; // Symbian^3 WServ has support for ARGB32_PRE + else + mode = EColor16MA; // Symbian prior to Symbian^3 sw accelerates EColor16MA + } // We create empty CFbsBitmap here -> it will be resized in setGeometry CFbsBitmap *bitmap = q_check_ptr(new CFbsBitmap); // CBase derived object needs check on new -- cgit v0.12 From d2a52ba7d5fa48632d6f0092da8db97188993252 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Fri, 6 Aug 2010 11:38:18 +0100 Subject: Test code for input method hints A simple test application to set any combination of input method hints on a QLineEdit widget. This makes it easier to debug when the original report relies on webkit. Task-number: QT-3681 Reviewed-by: Miikka Heikkinen --- tests/manual/inputmethodhints/inputmethodhints.cpp | 99 +++++++++++++++ tests/manual/inputmethodhints/inputmethodhints.h | 63 ++++++++++ tests/manual/inputmethodhints/inputmethodhints.pro | 13 ++ tests/manual/inputmethodhints/inputmethodhints.ui | 138 +++++++++++++++++++++ tests/manual/inputmethodhints/main.cpp | 53 ++++++++ 5 files changed, 366 insertions(+) create mode 100644 tests/manual/inputmethodhints/inputmethodhints.cpp create mode 100644 tests/manual/inputmethodhints/inputmethodhints.h create mode 100644 tests/manual/inputmethodhints/inputmethodhints.pro create mode 100644 tests/manual/inputmethodhints/inputmethodhints.ui create mode 100644 tests/manual/inputmethodhints/main.cpp diff --git a/tests/manual/inputmethodhints/inputmethodhints.cpp b/tests/manual/inputmethodhints/inputmethodhints.cpp new file mode 100644 index 0000000..0c00b8d --- /dev/null +++ b/tests/manual/inputmethodhints/inputmethodhints.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "inputmethodhints.h" + +inputmethodhints::inputmethodhints(QWidget *parent) + : QMainWindow(parent) +{ + ui.setupUi(this); + connect(ui.cbDialableOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbDigitsOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbEmailOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbFormattedNumbersOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbHiddenText, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbLowercaseOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbNoAutoUppercase, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbNoPredictiveText, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbPreferLowercase, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbPreferNumbers, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbPreferUpperCase, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbUppercaseOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbUrlOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); +} + +inputmethodhints::~inputmethodhints() +{ + +} + +void inputmethodhints::checkboxChanged(int) +{ + int flags = 0; + if (ui.cbDialableOnly->isChecked()) + flags |= Qt::ImhDialableCharactersOnly; + if (ui.cbDigitsOnly->isChecked()) + flags |= Qt::ImhDigitsOnly; + if (ui.cbEmailOnly->isChecked()) + flags |= Qt::ImhEmailCharactersOnly; + if (ui.cbFormattedNumbersOnly->isChecked()) + flags |= Qt::ImhFormattedNumbersOnly; + if (ui.cbHiddenText->isChecked()) + flags |= Qt::ImhHiddenText; + if (ui.cbLowercaseOnly->isChecked()) + flags |= Qt::ImhLowercaseOnly; + if (ui.cbNoAutoUppercase->isChecked()) + flags |= Qt::ImhNoAutoUppercase; + if (ui.cbNoPredictiveText->isChecked()) + flags |= Qt::ImhNoPredictiveText; + if (ui.cbPreferLowercase->isChecked()) + flags |= Qt::ImhPreferLowercase; + if (ui.cbPreferNumbers->isChecked()) + flags |= Qt::ImhPreferNumbers; + if (ui.cbPreferUpperCase->isChecked()) + flags |= Qt::ImhPreferUppercase; + if (ui.cbUppercaseOnly->isChecked()) + flags |= Qt::ImhUppercaseOnly; + if (ui.cbUrlOnly->isChecked()) + flags |= Qt::ImhUrlCharactersOnly; + ui.lineEdit->clear(); + ui.lineEdit->setInputMethodHints(Qt::InputMethodHints(flags)); +} diff --git a/tests/manual/inputmethodhints/inputmethodhints.h b/tests/manual/inputmethodhints/inputmethodhints.h new file mode 100644 index 0000000..988a4be --- /dev/null +++ b/tests/manual/inputmethodhints/inputmethodhints.h @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef INPUTMETHODHINTS_H +#define INPUTMETHODHINTS_H + +#include +#include "ui_tst_inputmethodhints.h" + +class inputmethodhints : public QMainWindow +{ + Q_OBJECT + +public: + inputmethodhints(QWidget *parent = 0); + ~inputmethodhints(); + +public slots: + void checkboxChanged(int); + +private: + Ui::MainWindow ui; +}; + +#endif // INPUTMETHODHINTS_H diff --git a/tests/manual/inputmethodhints/inputmethodhints.pro b/tests/manual/inputmethodhints/inputmethodhints.pro new file mode 100644 index 0000000..7298ec6 --- /dev/null +++ b/tests/manual/inputmethodhints/inputmethodhints.pro @@ -0,0 +1,13 @@ +TEMPLATE = app +TARGET = tst_inputmethodhints + +QT += core \ + gui + +HEADERS += inputmethodhints.h +SOURCES += main.cpp \ + inputmethodhints.cpp +FORMS += inputmethodhints.ui +RESOURCES += + +symbian:TARGET.UID3 = 0xE4938ABC diff --git a/tests/manual/inputmethodhints/inputmethodhints.ui b/tests/manual/inputmethodhints/inputmethodhints.ui new file mode 100644 index 0000000..d0dc01d --- /dev/null +++ b/tests/manual/inputmethodhints/inputmethodhints.ui @@ -0,0 +1,138 @@ + + + MainWindow + + + + 0 + 0 + 360 + 640 + + + + MainWindow + + + + + + + 1 + + + + behaviour + + + + + + ImhHiddenText + + + + + + + ImhNoAutoUppercase + + + + + + + ImhPreferNumbers + + + + + + + ImhPreferUppercase + + + + + + + ImhPreferLowercase + + + + + + + ImhNoPredictiveText + + + + + + + + restrictions + + + + + + ImhDigitsOnly + + + + + + + ImhFormattedNumbersOnly + + + + + + + ImhUppercaseOnly + + + + + + + ImhLowercaseOnly + + + + + + + ImhDialableCharactersOnly + + + + + + + ImhEmailCharactersOnly + + + + + + + ImhUrlCharactersOnly + + + + + + + + + + + + + + + + diff --git a/tests/manual/inputmethodhints/main.cpp b/tests/manual/inputmethodhints/main.cpp new file mode 100644 index 0000000..022bf3f --- /dev/null +++ b/tests/manual/inputmethodhints/main.cpp @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "inputmethodhints.h" + +#include +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + inputmethodhints w; + w.showMaximized(); + return a.exec(); +} -- cgit v0.12 From e4c144db1cde192745a198160a01fca1416fe855 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Fri, 6 Aug 2010 12:00:54 +0100 Subject: fix compile error Task-number: QT-3681 Reviewed-by: Trust Me --- src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index cd05e38..ae51b1c 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -406,7 +406,7 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) flags |= EAknEditorNumericInputMode; } if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 - && ((hints & ImhFormattedNumbersOnly) || (hints & ImhDialableCharactersOnly)) { + && ((hints & ImhFormattedNumbersOnly) || (hints & ImhDialableCharactersOnly))) { //workaround - the * key does not launch the symbols menu, making it impossible to use these modes unless text mode is enabled. flags |= EAknEditorTextInputMode; } -- cgit v0.12 From 8521d8d32235ad5b59088121ea7b4e9ce69adfaa Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 6 Aug 2010 13:02:59 +0200 Subject: doc: Fixed some qdoc errors. --- src/network/access/qnetworkrequest.cpp | 43 ++++++++++++---------------------- tools/qdoc3/generator.cpp | 7 ++++-- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index fa592c2..38cae8b 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -105,7 +105,8 @@ QT_BEGIN_NAMESPACE /*! \enum QNetworkRequest::Attribute - + \since 4.7 + Attribute codes for the QNetworkRequest and QNetworkReply. Attributes are extra meta-data that are used to control the @@ -186,34 +187,28 @@ QT_BEGIN_NAMESPACE \value CustomVerbAttribute Requests only, type: QVariant::ByteArray - Holds the value for the custom HTTP verb to send (destined for usage - of other verbs than GET, POST, PUT and DELETE). This verb is set - when calling QNetworkAccessManager::sendCustomRequest(). + Holds the value for the custom HTTP verb to send (destined for usage + of other verbs than GET, POST, PUT and DELETE). This verb is set + when calling QNetworkAccessManager::sendCustomRequest(). \value CookieLoadControlAttribute - Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic) - Indicates whether to send 'Cookie' headers in the request. - - This attribute is set to false by QtWebKit when creating a cross-origin - XMLHttpRequest where withCredentials has not been set explicitly to true by the - Javascript that created the request. - - See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information. - - \since 4.7 + Requests only, type: QVariant::Int (default: + QNetworkRequest::Automatic) Indicates whether to send 'Cookie' + headers in the request. This attribute is set to false by + QtWebKit when creating a cross-origin XMLHttpRequest where + withCredentials has not been set explicitly to true by the + Javascript that created the request. See + \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag} + {here} for more information. \value CookieSaveControlAttribute Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic) Indicates whether to save 'Cookie' headers received from the server in reply to the request. - This attribute is set to false by QtWebKit when creating a cross-origin XMLHttpRequest where withCredentials has not been set explicitly to true by the Javascript that created the request. - - See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information. - - \since 4.7 + See \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag} {here} for more information. \value AuthenticationReuseAttribute Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic) @@ -221,22 +216,14 @@ QT_BEGIN_NAMESPACE if available. If this is set to QNetworkRequest::Manual and the authentication mechanism is 'Basic' or 'Digest', Qt will not send an an 'Authorization' HTTP header with any cached credentials it may have for the request's URL. - This attribute is set to QNetworkRequest::Manual by QtWebKit when creating a cross-origin XMLHttpRequest where withCredentials has not been set explicitly to true by the Javascript that created the request. - - See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information. - - \since 4.7 + See \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag} {here} for more information. \omitvalue MaximumDownloadBufferSizeAttribute - \since 4.7 - \internal \omitvalue DownloadBufferAttribute - \since 4.7 - \internal \value User Special type. Additional information can be passed in diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp index 24219a1..7f39be2 100644 --- a/tools/qdoc3/generator.cpp +++ b/tools/qdoc3/generator.cpp @@ -1068,8 +1068,11 @@ void Generator::generateSince(const Node *node, CodeMarker *marker) Text text; text << Atom::ParaLeft << "This " - << typeString(node) - << " was introduced in "; + << typeString(node); + if (node->type() == Node::Enum) + text << " was introduced or modified in "; + else + text << " was introduced in "; if (project.isEmpty()) text << "version"; else -- cgit v0.12 From fc4e9d15d4b85ade770cf92c10258a556fafa698 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 6 Aug 2010 13:12:25 +0200 Subject: doc: Fixed some qdoc errors. --- src/dbus/qdbusconnection.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index 055fead..e1fcb36 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -212,6 +212,7 @@ void QDBusConnectionManager::setConnection(const QString &name, QDBusConnectionP \value ExportScriptableSlots export this object's scriptable slots \value ExportScriptableSignals export this object's scriptable signals \value ExportScriptableProperties export this object's scriptable properties + \value ExportScriptableInvokables export this object's scriptable invokables \value ExportScriptableContents shorthand form for ExportScriptableSlots | ExportScriptableSignals | ExportScriptableProperties @@ -219,6 +220,7 @@ void QDBusConnectionManager::setConnection(const QString &name, QDBusConnectionP \value ExportNonScriptableSlots export this object's non-scriptable slots \value ExportNonScriptableSignals export this object's non-scriptable signals \value ExportNonScriptableProperties export this object's non-scriptable properties + \value ExportNonScriptableInvokables export this object's non-scriptable invokables \value ExportNonScriptableContents shorthand form for ExportNonScriptableSlots | ExportNonScriptableSignals | ExportNonScriptableProperties @@ -226,10 +228,9 @@ void QDBusConnectionManager::setConnection(const QString &name, QDBusConnectionP \value ExportAllSlots export all of this object's slots \value ExportAllSignals export all of this object's signals \value ExportAllProperties export all of this object's properties + \value ExportAllInvokables export all of this object's invokables \value ExportAllContents export all of this object's contents - \value ExportChildObjects export this object's child objects - \sa registerObject(), QDBusAbstractAdaptor, {usingadaptors.html}{Using adaptors} */ -- cgit v0.12 From 1f32f4013ab9178e8434bff847013a84491fe516 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Fri, 6 Aug 2010 13:32:29 +0200 Subject: Removed duplicate case for const variable snippet. Reviewer: David Boddie Task number: QTBUG-10411 --- doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp index 088e043..0bd5fdf 100644 --- a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp +++ b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp @@ -87,14 +87,9 @@ void myFunction(bool useSubClass) // is equivalent to: const QScopedPointer p(new QWidget()); - QWidget *const p = new QWidget(); - // is equivalent to: - const QScopedPointer p(new QWidget()); - const QWidget *p = new QWidget(); // is equivalent to: QScopedPointer p(new QWidget()); - //! [2] //! [3] -- cgit v0.12 From 5988d0dfcca6374f7bc06bad3ec9e3a3b8ebc22f Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 6 Aug 2010 12:44:12 +0300 Subject: Rename Symbian generated mmp/mk files to include target in filename Mmp and mk files previously contained UID3 as unique identifier in the filename. However, this was not particularly useful for building subprojects in massive project trees such as Qt, as it was difficult to remember UID for each subproject. Now with intuitive naming of mmps, it is possible to build a subproject like this: sbs -c armv6_urel -p qtcore_dll.mmp Task-number: QTBUG-12715 Reviewed-by: Jason Barron --- qmake/generators/symbian/symmake.cpp | 33 +++++++++++++------------------ qmake/generators/symbian/symmake.h | 2 ++ qmake/generators/symbian/symmake_abld.cpp | 9 ++------- qmake/generators/symbian/symmake_abld.h | 2 +- 4 files changed, 19 insertions(+), 27 deletions(-) diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index ff58270..cf6bd13 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -241,13 +241,8 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t) writeMkFile(wrapperFileName, false); - QString shortProFilename = project->projectFile(); - shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString("")); - shortProFilename.replace(Option::pro_ext, QString("")); - - QString mmpFilename = Option::output_dir + QLatin1Char('/') + shortProFilename + QLatin1Char('_') - + uid3 + Option::mmp_ext; - writeMmpFile(mmpFilename, symbianLangCodes); + QString absoluteMmpFileName = Option::output_dir + QLatin1Char('/') + mmpFileName; + writeMmpFile(absoluteMmpFileName, symbianLangCodes); if (targetType == TypeExe) { if (!project->isActiveConfig("no_icon")) { @@ -281,6 +276,15 @@ void SymbianMakefileGenerator::init() project->values("MAKEFILE") += BLD_INF_FILENAME; // .mmp + mmpFileName = fixedTarget; + if (targetType == TypeExe) + mmpFileName.append("_exe"); + else if (targetType == TypeDll || targetType == TypePlugin) + mmpFileName.append("_dll"); + else if (targetType == TypeLib) + mmpFileName.append("_lib"); + mmpFileName.append(Option::mmp_ext); + initMmpVariables(); uid2 = project->first("TARGET.UID2"); @@ -480,7 +484,7 @@ void SymbianMakefileGenerator::writeMmpFileHeader(QTextStream &t) t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl; t << "// This file is generated by qmake and should not be modified by the" << endl; t << "// user." << endl; - t << "// Name : " << escapeFilePath(fileFixify(project->projectFile().remove(project->projectFile().length() - 4, 4))) << Option::mmp_ext << endl; + t << "// Name : " << mmpFileName << endl; t << "// ==============================================================================" << endl << endl; } @@ -890,8 +894,6 @@ void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploy // Add includes of subdirs bld.inf files - QString mmpfilename = escapeFilePath(fileFixify(project->projectFile())); - mmpfilename = mmpfilename.replace(mmpfilename.lastIndexOf("."), 4, Option::mmp_ext); QString currentPath = qmake_getpwd(); QDir directory(currentPath); @@ -973,15 +975,8 @@ void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploy t << endl << mmpTag << endl << endl; writeBldInfMkFilePart(t, addDeploymentExtension); - if (targetType != TypeSubdirs) { - QString shortProFilename = project->projectFile(); - shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString("")); - shortProFilename.replace(Option::pro_ext, QString("")); - - QString mmpFilename = shortProFilename + QString("_") + uid3 + Option::mmp_ext; - - t << mmpFilename << endl; - } + if (targetType != TypeSubdirs) + t << mmpFileName << endl; userItems = userBldInfRules.value(mmpTag); foreach(QString item, userItems) diff --git a/qmake/generators/symbian/symmake.h b/qmake/generators/symbian/symmake.h index 9853790..a1a8e88 100644 --- a/qmake/generators/symbian/symmake.h +++ b/qmake/generators/symbian/symmake.h @@ -59,6 +59,7 @@ class SymbianMakefileGenerator : public MakefileGenerator, public SymbianCommonG protected: QString platform; QString uid2; + QString mmpFileName; QMap sources; QMap systeminclude; QMap library; @@ -78,6 +79,7 @@ protected: QString generateUID3(); void initMmpVariables(); + void generateMmpFileName(); void handleMmpRulesOverrides(QString &checkString, bool &inResourceBlock, QStringList &restrictedMmpKeywords, diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index d60528b..c896ac6 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -70,10 +70,6 @@ SymbianAbldMakefileGenerator::~SymbianAbldMakefileGenerator() { } void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, bool deploymentOnly) { - QString gnuMakefileName = QLatin1String("Makefile_") + uid3; - removeEpocSpecialCharacters(gnuMakefileName); - gnuMakefileName.append(".mk"); - QFile ft(gnuMakefileName); if (ft.open(QIODevice::WriteOnly)) { generatedFiles << ft.fileName(); @@ -471,9 +467,8 @@ void SymbianAbldMakefileGenerator::writeBldInfMkFilePart(QTextStream& t, bool ad // Normally emulator deployment gets done via regular makefile, but since subdirs // do not get that, special deployment only makefile is generated for them if needed. if (targetType != TypeSubdirs || addDeploymentExtension) { - QString gnuMakefileName = QLatin1String("Makefile_") + uid3; - removeEpocSpecialCharacters(gnuMakefileName); - gnuMakefileName.append(".mk"); + gnuMakefileName = QLatin1String("Makefile_") + fileInfo(mmpFileName).completeBaseName() + + QLatin1String(".mk"); t << "gnumakefile " << gnuMakefileName << endl; } } diff --git a/qmake/generators/symbian/symmake_abld.h b/qmake/generators/symbian/symmake_abld.h index f998b28..214e0c5 100644 --- a/qmake/generators/symbian/symmake_abld.h +++ b/qmake/generators/symbian/symmake_abld.h @@ -58,7 +58,7 @@ protected: virtual void appendAbldTempDirs(QStringList& sysincspaths, QString includepath); bool writeDeploymentTargets(QTextStream &t, bool isRom); - + QString gnuMakefileName; public: SymbianAbldMakefileGenerator(); -- cgit v0.12 From 0df2adc66a72aeed79906e86527f80b337b32ab1 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Fri, 6 Aug 2010 13:34:53 +0200 Subject: Doc: Fixing validation bugs --- tools/qdoc3/test/qt-html-templates.qdocconf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index cf15628..94c8f47 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -12,7 +12,7 @@ HTML.postheader = "
      \n" \ "
      \n" \ " Home
      \n" \ " Qt Reference Documentation\n" \ - "
      \n" \ + "
      \n" \ "
      \n" \ " \n" \ "
      \n" \ @@ -41,7 +41,7 @@ HTML.postheader = "
      \n" \ "
    • Function index
      • \n" \ "
    • Modules
      • \n" \ "
    • Namespaces
      • \n" \ - "
    • Global stuff
      • \n" \ + "
    • Global Declarations
      • \n" \ "
    • QML elements
      • \n" \ "
    \n" \ "
    • \n" \ @@ -149,6 +149,7 @@ HTML.footer = " \n" \ " \n" \ "
    \n" \ "
    \n" \ + "
    \n" \ "
    \n" \ "

    \n" \ " © 2008-2010 Nokia Corporation and/or its\n" \ @@ -161,8 +162,8 @@ HTML.footer = " \n" \ "

    \n" \ "
    X
    \n" \ " \n" \ - "

    Thank you for giving your feedback.

    Make sure it is related to this specific page. For more general bugs and \n" \ - " requests, please use the Qt Bug Tracker.

    \n" \ + "

    Thank you for giving your feedback.

    Make sure it is related to this specific page. For more general bugs and \n" \ + " requests, please use the Qt Bug Tracker.

    \n" \ "

    \n" \ "

    \n" \ " \n" \ -- cgit v0.12 From 2118f407b02654e9e3c6706647e8b9b711e8982b Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 6 Aug 2010 14:30:42 +0200 Subject: doc: Re-introduced next/previous page links in the footer. Task-Nr: QTBUG-12278 --- tools/qdoc3/htmlgenerator.cpp | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index b1a8336..d23b41e 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1878,6 +1878,61 @@ void HtmlGenerator::generateHeader(const QString& title, break; } + navigationLinks.clear(); + + if (node && !node->links().empty()) { + QPair linkPair; + QPair anchorPair; + const Node *linkNode; + + if (node->links().contains(Node::PreviousLink)) { + linkPair = node->links()[Node::PreviousLink]; + linkNode = findNodeForTarget(linkPair.first, node, marker); + if (!linkNode || linkNode == node) + anchorPair = linkPair; + else + anchorPair = anchorForNode(linkNode); + + out() << " \n"; + + navigationLinks += "[Previous: "; + if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty()) + navigationLinks += protect(anchorPair.second); + else + navigationLinks += protect(linkPair.second); + navigationLinks += "]\n"; + } + if (node->links().contains(Node::NextLink)) { + linkPair = node->links()[Node::NextLink]; + linkNode = findNodeForTarget(linkPair.first, node, marker); + if (!linkNode || linkNode == node) + anchorPair = linkPair; + else + anchorPair = anchorForNode(linkNode); + + out() << " \n"; + + navigationLinks += "[Next: "; + if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty()) + navigationLinks += protect(anchorPair.second); + else + navigationLinks += protect(linkPair.second); + navigationLinks += "]\n"; + } + if (node->links().contains(Node::StartLink)) { + linkPair = node->links()[Node::StartLink]; + linkNode = findNodeForTarget(linkPair.first, node, marker); + if (!linkNode || linkNode == node) + anchorPair = linkPair; + else + anchorPair = anchorForNode(linkNode); + out() << " \n"; + } + } + #if 0 // Removed for new doc format. MWS if (node && !node->links().empty()) out() << "

    \n" << navigationLinks << "

    \n"; -- cgit v0.12 From 065cc163d7848131dcfd8bb210c8590b6cd11991 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Wed, 30 Jun 2010 21:47:37 +0200 Subject: Some french translations Reviewed-by: gabi --- tools/linguist/phrasebooks/french.qph | 22 +- translations/assistant_fr.ts | 220 - translations/designer_fr.ts | 1437 +---- translations/linguist_fr.ts | 412 -- translations/qt_fr.ts | 10775 ++++++++++++++++++-------------- translations/qt_help_fr.ts | 158 +- 6 files changed, 6251 insertions(+), 6773 deletions(-) diff --git a/tools/linguist/phrasebooks/french.qph b/tools/linguist/phrasebooks/french.qph index 9e1a580..47cb306 100644 --- a/tools/linguist/phrasebooks/french.qph +++ b/tools/linguist/phrasebooks/french.qph @@ -801,7 +801,7 @@ Redo - Annuler Annuler + Rétablir region selection @@ -1111,10 +1111,6 @@ &Édition - &Redo - Re&faire - - debugger débogueur @@ -1438,4 +1434,20 @@ &Debug &Déboguer + + Slider + Barre de défilement + + + &Restore + &Restaurer + + + &Move + &Déplacer + + + New + Créer + diff --git a/translations/assistant_fr.ts b/translations/assistant_fr.ts index 4c6c5a0..e8f5fd1 100644 --- a/translations/assistant_fr.ts +++ b/translations/assistant_fr.ts @@ -4,7 +4,6 @@ AboutDialog - &Close &Fermer @@ -12,19 +11,16 @@ AboutLabel - Warning Avertissement - Unable to launch external application. Impossible d'ouvrir l'application externe. - OK OK @@ -32,46 +28,34 @@ BookmarkDialog - Add Bookmark Ajouter un signet - Bookmark: Signet : - Add in Folder: Ajouter dans le dossier : - + + - New Folder Nouveau dossier - - - - - Bookmarks Signets - Delete Folder Supprimer le dossier - Rename Folder Renommer le dossier @@ -79,23 +63,18 @@ BookmarkManager - Bookmarks Signets - Remove Suppression - You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? Vous allez supprimer un dossier, ceci va aussi<br>supprimer son contenu. Voulez-vous continuer ? - - New Folder Nouveau dossier @@ -103,47 +82,38 @@ BookmarkWidget - Delete Folder Supprimer le dossier - Rename Folder Renommer le dossier - Show Bookmark Afficher le signet - Show Bookmark in New Tab Afficher le signet dans un nouvel onglet - Delete Bookmark Supprimer le signet - Rename Bookmark Renommer le signet - Filter: Filtre : - Add Ajouter - Remove Retirer @@ -151,48 +121,38 @@ CentralWidget - Add new page Créer une nouvelle page - Close current page Fermer la page courante - Print Document Imprimer le document - - unknown inconnu - Add New Page Créer une nouvelle page - Close This Page Fermer cette page - Close Other Pages Fermer les autres pages - Add Bookmark for this Page... Ajouter un signet pour cette page... - Search Recherche @@ -200,12 +160,10 @@ ContentWindow - Open Link Ouvrir le lien - Open Link in New Tab Ouvrir le lien dans un nouvel onglet @@ -213,12 +171,10 @@ FilterNameDialogClass - Add Filter Name Ajouter un filtre - Filter Name: Nom du filtre : @@ -226,27 +182,22 @@ FindWidget - Previous Précédent - Next Suivant - Case Sensitive Sensible à la casse - Whole words Mots complets - <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Recherche à partir du début @@ -254,27 +205,22 @@ FontPanel - Font Police - &Writing system &Système d'écriture - &Family &Famille - &Style &Style - &Point size &Taille en points @@ -282,39 +228,32 @@ HelpViewer - Open Link in New Tab Ouvrir le lien dans un nouvel onglet - <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>Erreur 404...</title><div align="center"><br><br><h1>La page n'a pas pu être trouvée</h1><br><h3>'%1'</h3></div> - Help Aide - Unable to launch external application. Impossible de lancer l'application externe. - OK OK - Copy &Link Location Copier l'&adresse cible - Open Link in New Tab Ctrl+LMB LMB? ← ouais exactement pareil... Ouvrir dans un nouvel onglet Ctrl+clic gauche @@ -323,17 +262,14 @@ IndexWindow - &Look for: &Rechercher : - Open Link Ouvrir le lien - Open Link in New Tab Ouvrir le lien dans un nouvel onglet @@ -341,97 +277,74 @@ InstallDialog - - Install Documentation Installer la documentation - Available Documentation: Documentation disponible : - Install Installer - Cancel Annuler - Close Fermer - Installation Path: Chemin d'installation : - ... … - Downloading documentation info... Téléchargement des informations de la documentation… - Download canceled. Téléchargement annulé. - - - Done. Terminé. - The file %1 already exists. Do you want to overwrite it? Le fichier %1 existe déjà. Voulez-vous l'écraser ? - Unable to save the file %1: %2. Impossible de sauver le fichier %1 : %2. - Downloading %1... Téléchargement de %1 en cours… - - - Download failed: %1. Échec du téléchargement : %1. - Documentation info file is corrupt! Le fichier d'information de documentation est corrompu ! - Download failed: Downloaded file is corrupted. Échec du téléchargement : le fichier téléchargé est corrompu. - Installing documentation %1... Installation de la documentation %1… - Error while installing documentation: %1 Erreur durant l'installation de la documentation : @@ -441,304 +354,239 @@ MainWindow - - Index Index - - Contents Sommaire - - Bookmarks Signets - - - Qt Assistant Qt Assistant - - Unfiltered Non-filtré - Looking for Qt Documentation... Recherche la documentation de Qt… - &File &Fichier - Page Set&up... &Mise en page… - Print Preview... Aperçu avant impression… - &Print... &Imprimer… - New &Tab Nouvel ongle&t - &Close Tab &Fermer l'onglet - &Quit &Quitter - &Edit &Édition - &Copy selected Text &Copier le texte selectionné - &Find in Text... &Rechercher dans le texte… - &Find &Rechercher - Find &Next Rechercher le suiva&nt - Find &Previous Rechercher le &précédent - Preferences... Préférences… - &View &Affichage - Zoom &in Zoom &avant - Zoom &out Zoom a&rrière - Normal &Size &Taille normale - Ctrl+0 Ctrl+0 - ALT+C ALT+C - ALT+I ALT+I - ALT+O ALT+O - Search Recherche - ALT+S ALT+S - &Go A&ller - &Home &Accueil - ALT+Home ALT+Home - &Back &Précédent - &Forward &Suivant - Sync with Table of Contents Synchroniser la table des matières - Sync Rafraîchir - Next Page Page suivante - Ctrl+Alt+Right Ctrl+Alt+Right - Previous Page Page précédente - Ctrl+Alt+Left Ctrl+Alt+Left - &Bookmarks Si&gnets - Add Bookmark... Ajouter un signet… - CTRL+D CTRL+D - &Help Ai&de - About... À propos… - Navigation Toolbar Barre d'outils de navigation - &Window &Fenêtre - Zoom Zoom - Minimize Minimiser - Ctrl+M Ctrl+M - Toolbars Barres d'outils - Filter Toolbar Barre d'outils de filtrage - Filtered by: Filtre : - Address Toolbar Barre d'outils d'adresse - Address: Adresse : - Could not find the associated content item. what is item in this context? ← same question here Impossible de trouver l'élément de contenu associé. - About %1 À propos de %1 - Updating search index Mise à jour de l'index de recherche @@ -746,48 +594,38 @@ PreferencesDialog - - Add Documentation Ajouter de la documentation - Qt Compressed Help Files (*.qch) Fichiers d'aide Qt compressés (*.qch) - The namespace %1 is already registered! L'espace de nom %1 existe déjà ! - The specified file is not a valid Qt Help File! Le fichier spécifié n'est pas un fichier d'aide Qt valide ! - Remove Documentation Supprimer la documentation - Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. Certains documents ouverts dans Assistant ont des références vers la documentation que vous allez supprimer. Supprimer la documentation fermera ces documents. - Cancel Annuler - OK OK - Use custom settings Utiliser des paramètres personnalisés @@ -795,118 +633,95 @@ PreferencesDialogClass - Preferences Préférences - Fonts Polices - Font settings: Configuration des polices : - Browser Navigateur - Application Application - Filters Filtres - Filter: Filtre : - Attributes: Attributs : - 1 1 - Add Ajouter - Remove Supprimer - Documentation Documentation - Registered Documentation: documentation enregistrée ? ← je préfère référencée pour les deux... Documentation référencée : - Add... Ajouter… - Options Options - On help start: Au démarrage : - Show my home page Afficher ma page d'accueil - Show a blank page Afficher une page blanche - Show my tabs from last session Afficher mes onglets de la dernière session - Homepage Page d'accueil - Current Page Page courante - Blank Page Page blanche - Restore to default Restaurer les valeurs par défaut @@ -914,69 +729,50 @@ QObject - The specified collection file does not exist! Le fichier de collection spécifié n'existe pas ! - Missing collection file! Fichier de collection manquant ! - Invalid URL! URL invalide ! - Missing URL! URL manquante ! - - - Unknown widget: %1 Widget inconnu : %1 - - - Missing widget! Widget manquant ! - - The specified Qt help file does not exist! Le fichier d'aide Qt spécifié n'existe pas ! - - Missing help file! Fichier d'aide manquant ! - Missing filter argument! Argument de filtre manquant ! - Unknown option: %1 Option inconnue : %1 - - Qt Assistant Qt Assistant - Could not register documentation file %1 @@ -989,17 +785,14 @@ Raison : %2 - Documentation successfully registered. Documentation enregistrée avec succès. - Documentation successfully unregistered. Documentation retirée avec succès. - Could not unregister documentation file %1 @@ -1012,12 +805,10 @@ Raison : %2 - Cannot load sqlite database driver! Impossible de charger le driver de la base de données sqlite ! - The specified collection file could not be read! Le fichier de collection spécifié ne peut pas être lu ! @@ -1025,12 +816,10 @@ Raison : RemoteControl - Debugging Remote Control Débogage du contrôle à distance - Received Command: %1 %2 Commande reçue : %1 %2 @@ -1038,22 +827,18 @@ Raison : SearchWidget - &Copy &Copier - Copy &Link Location Copier &l'adresse du lien - Open Link in New Tab Ouvrir le lien dans un nouvel onglet - Select All Sélectionner tout @@ -1061,27 +846,22 @@ Raison : TopicChooser - Choose Topic Choisir le domaine - &Topics &Domaines - &Display &Afficher - &Close &Fermer - Choose a topic for <b>%1</b>: Choisir le domaine pour <b>%1</b> : diff --git a/translations/designer_fr.ts b/translations/designer_fr.ts index bfdbb73..175d5c5 100644 --- a/translations/designer_fr.ts +++ b/translations/designer_fr.ts @@ -4,27 +4,22 @@ AbstractFindWidget - &Previous &Précédent - &Next &Suivant - &Case sensitive &Sensible à la casse - Whole &words M&ots complets - <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/shared/images/wrap.png">&nbsp;Recherche à partir du début @@ -32,17 +27,14 @@ AddLinkDialog - Insert Link Insérer lien - Title: Titre : - URL: URL : @@ -50,7 +42,6 @@ AppFontDialog - Additional Fonts Polices additionnelles @@ -58,38 +49,31 @@ AppFontManager - '%1' is not a file. '%1' n'est pas un fichier. - The font file '%1' does not have read permissions. Le fichier de la police '%1' n'a pas les permissions de lecture. - The font file '%1' is already loaded. Le fichier de la police '%1' est déjà chargé. - The font file '%1' could not be loaded. passé composé plutôt Le fichier de la police '%1' n'a pas pu chargé. - '%1' is not a valid font id. '%1' n'est pas un identifiant de police valide. - There is no loaded font matching the id '%1'. Il n'y a pas de police chargée correspondant à l'identifiant '%1'. - The font '%1' (%2) could not be unloaded. La police '%1' (%2) ne peut pas être déchargée. @@ -97,53 +81,43 @@ AppFontWidget - Fonts Polices - Add font files Ajouter des fichiers de polices - Remove current font file Retirer le fichier de police courant - Remove all font files Retirer tous les fichiers de polices - Add Font Files Ajouter des fichiers de polices - Font files (*.ttf) Fichier de polices (*.ttf) - Error Adding Fonts Erreur dans l'ajout de polices - Error Removing Fonts s/de/des/ pour être cohérent avec le suivant... Erreur lors de la suppression des polices - Remove Fonts Retirer les polices - Would you like to remove all fonts? Voulez-vous supprimer toutes les polices ? @@ -151,12 +125,10 @@ AppearanceOptionsWidget - Form Formulaire - User Interface Mode Mode de l'interface utilisateur @@ -164,17 +136,14 @@ AssistantClient - Unable to send request: Assistant is not responding. Impossible d'envoyer la requête : Assistant ne répond pas. - The binary '%1' does not exist. Le binaire '%1' n'existe pas. - Unable to launch assistant (%1). Impossible de démarrer Assistant (%1). @@ -182,93 +151,75 @@ BrushPropertyManager - No brush Pas de pinceau - Solid c'est plutôt continu ou "trait continu" pour moi Trait continu - Dense 1 Dense 1 - Dense 2 Dense 2 - Dense 3 Dense 3 - Dense 4 Dense 4 - Dense 5 Dense 5 - Dense 6 Dense 6 - Dense 7 Dense 7 - Horizontal Horizontal - Vertical Vertical - Cross Croix - Backward diagonal Diagonale arrière - Forward diagonal Diagonale avant - Crossing diagonal Diagonale croisée - Style Style - Color Couleur - [%1, %2] [%1, %2] @@ -276,353 +227,276 @@ Command - - Change signal Modifier le signal - - Change slot Modifier le slot - Change signal-slot connection Modfier la connection signal-slot - Change sender expéditeur/source Modifier l'envoyeur - Change receiver destinataire++/cible? Modifier le destinataire - Create button group Créer un groupe de boutons - Break button group Dissocier le groupe de bouton - Break button group '%1' Dissossier le groupe de bouton '%1' - Add buttons to group Ajouter les boutons au groupe - - Add '%1' to '%2' Command description for adding buttons to a QButtonGroup Ajouter '%1' à '%2' - Remove buttons from group Retirer les boutons du groupe - Remove '%1' from '%2' Command description for removing buttons from a QButtonGroup Retirer '%1' de '%2' - Add connection Ajouter une connexion - Adjust connection Réajuster les connexions - Delete connections Supprimer les connexions - Change source Modifier la source - Change target Modifier la cible - Morph %1/'%2' into %3 MorphWidgetCommand description Transformer %1/'%2' en %3 - Insert '%1' Insérer '%1' - Change Z-order of '%1' l'ordre de '%1' sur l'axe z? profondeur ? Modifier la profondeur de '%1' - Raise '%1' Élever '%1' - Lower '%1' Abaisser '%1' - Delete '%1' Supprimer '%1' - Reparent '%1' Reparenter '%1' - Promote to custom widget Promouvoir en widget personnalisé - Demote from custom widget Annuler la promotion en widget personnalisé - Lay out using grid Mettre en page à l'aide d'une grille - Lay out vertically Mettre en page verticalement - Lay out horizontaly + Mettre en page horizontalement + + + Lay out horizontally Mettre en page horizontalement - Break layout Casser la mise en page - Simplify Grid Layout Simplifier la mise en page en grille - - - Move Page Déplacer la page - - - - Delete Page Supprimer la page - - Page Page - - - - Insert Page Insérer une page - Change Tab order Modifier l'ordre des tabulations - Create Menu Bar Créer une barre de menu - Delete Menu Bar Supprimer la barre de menu - Create Status Bar Créer une barre d'état - Delete Status Bar Supprimer la barre d'état - Add Tool Bar Ajouter une barre d'outil - Add Dock Window Ajouter une fenêtre ancrable - Adjust Size of '%1' Ajuster les dimensions de '%1' - Change Form Layout Item Geometry Modifier la géométrie de l'élément de formulaire - Change Layout Item Geometry Modifier la géométrie de l'élément de mise en page - Delete Subwindow Supprimer la sous-fenêtre - page page - Insert Subwindow Insérer une sous-fenêtre - subwindow sous-fenêtre - Subwindow Sous fenêtre - Change Table Contents Modifier le contenu de la table - Change Tree Contents Modifier le contenu de l'arbre - - Add action Ajouter une action - - Remove action Supprimer l'action - Add menu Ajouter un menu - Remove menu Supprimer le menu - Create submenu Créer une sous-fenêtre - Delete Tool Bar Supprimer la barre d'outils - Change layout of '%1' from %2 to %3 Modifier la mise en page de '%1' de %2 à %3 - Set action text Définir le texte de l'action - Insert action Insérer action - - Move action Déplacer action - Change Title Modifier le titre - Insert Menu Insérer menu - Changed '%1' of '%2' Modifier '%1' de '%2' - Changed '%1' of %n objects Modifier '%1' de %n objet @@ -630,12 +504,10 @@ - Reset '%1' of '%2' Réinitialiser '%1' de '%2' - Reset '%1' of %n objects Réinitialiser '%1' de %n objet @@ -643,12 +515,10 @@ - Add dynamic property '%1' to '%2' Ajouter la propriété dynamique '%1' à '%2' - Add dynamic property '%1' to %n objects Ajouter la propriété dynamique '%1' à %n objet @@ -656,12 +526,10 @@ - Remove dynamic property '%1' from '%2' Supprimer la propriété dynamique '%1' de '%2' - Remove dynamic property '%1' from %n objects Supprimer la propriété dynamique '%1' de %n objet @@ -669,12 +537,10 @@ - Change script Modifier le script - Change signals/slots Modifier signaux/slots @@ -682,24 +548,18 @@ ConnectDialog - Configure Connection Configurer connexion - - GroupBox GroupBox - - Edit... Éditer... - Show signals and slots inherited from QWidget Afficher les signaux et slots hérités de QWidget @@ -707,17 +567,14 @@ ConnectionDelegate - <object> <objet> - <signal> <signal> - <slot> <slot> @@ -725,19 +582,16 @@ DPI_Chooser - Standard (96 x 96) Embedded device standard screen resolution Standard (96 x 96) - Greenphone (179 x 185) Embedded device screen resolution Greenphone (179 x 185) - High (192 x 192) Embedded device high definition screen resolution "haute resolution" would be missleading @@ -747,89 +601,72 @@ Designer - Qt Designer Qt Designer - This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. Ce fichier contient des ressorts de premier niveau. <br>Ils ne sont <b>PAS</b> sauvegardé dans le formulaire. - Perhaps you forgot to create a layout? Peut-être avez-vous oublié de créer un layout ? - Invalid UI file: The root element <ui> is missing. Fichier UI invalide. L'élément racine <ui> est manquant. - An error has occurred while reading the UI file at line %1, column %2: %3 Une erreur est survenue lors de la lecture du fichier UI à la ligne %1, colonne %2: %3 - This file cannot be read because it was created using %1. Ce fichier ne peut pas être lu car il a été créé à l'aide de %1. - This file was created using Designer from Qt-%1 and cannot be read. Ce fichier a été créé à l'aide du Designer de Qt-%1 et ne peut être lu. - The converted file could not be read. Le fichier converti ne peut pas être lu. - This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. Ce fichier a été créé par le Designer de Qt-%1 et sera converti au nouveau format par Qt Designer. - The old form has not been touched, but you will have to save the form under a new name. L'ancienne interface n'a pas été modifiée, vous devez sauvergarder l'interface sous un nouveau nom. - This file was created using Designer from Qt-%1 and could not be read: %2 Le fichier a été créé à l'aide de Designer de Qt-%1 et ne peut pas être lu : %2 - Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. Veuillez le faire passer par <b>uic3&nbsp;-convert</b> pour le convertir au format de fichier de Qt 4. - This file cannot be read because the extra info extension failed to load. Ce fichier ne peut pas être lu car les informations d'extension n'ont pu être chargées. - Unable to launch %1. Impossible de lancer %1. - %1 timed out. %1 est arrivé à échéance. - Custom Widgets Widgets personnalisés - Promoted Widgets Widgets promus @@ -837,12 +674,10 @@ DesignerMetaEnum - %1 is not a valid enumeration value of '%2'. %1 n'est pas une valeur d'énumeration valide de '%2'. - '%1' could not be converted to an enumeration value of type '%2'. '%1' ne peut pas être converti en une valeur d'énumération de type '%2'. @@ -850,7 +685,6 @@ DesignerMetaFlags - '%1' could not be converted to a flag value of type '%2'. '%1' ne peut pas être converti en un drapeau de type '%2'. @@ -858,13 +692,11 @@ DeviceProfile - '%1' is not a number. Reading a number for an embedded device profile '%1' n'est pas un nombre. - An invalid tag <%1> was encountered. La balise invalide <%1> a été rencontré. @@ -872,27 +704,22 @@ DeviceProfileDialog - &Family &Famille - &Point Size &Taille en points - Style Style - Device DPI PPP/DPI de l'appareil - Name Nom @@ -900,57 +727,46 @@ DeviceSkin - The image file '%1' could not be loaded. Le fichier image '%1' n'a pas pu être chargé. - The skin directory '%1' does not contain a configuration file. Le repertoire de revêtement '%1' ne contient pas un fichier de configuration. - The skin configuration file '%1' could not be opened. Le fichier de configuration de revêtement '%1' ne peut pas être ouvert. - The skin configuration file '%1' could not be read: %2 Le fichier de configuration de revêtement '%1' ne peut pas être lu: %2 - Syntax error: %1 Erreur de syntaxe : %1 - The skin "up" image file '%1' does not exist. Le fichier image "up" de revêtement '%1' n'existe pas. - The skin "down" image file '%1' does not exist. Le fichier image "down" de revêtement '%1' n'existe pas. - The skin "closed" image file '%1' does not exist. Le fichier image "closed" de revêtement '%1' n'existe pas. - The skin cursor image file '%1' does not exist. Le fichier image de revêtement '%1' n'existe pas. - Syntax error in area definition: %1 Erreur de syntaxe dans la zone de définition : %1 - Mismatch in number of areas, expected %1, got %2. Incohérence dans le nombre de zones, %1 attendu, %2 reçu. @@ -958,7 +774,6 @@ EmbeddedOptionsControl - <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description <html><table><tr><td><b>Police</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Résolution</b></td><td>%4 x %5</td></tr></table></html> @@ -967,13 +782,11 @@ EmbeddedOptionsPage - Embedded Design Tab in preferences dialog Design pour appareil mobile - Device Profiles EmbeddedOptionsControl group box" Profils des appareils @@ -982,27 +795,22 @@ FontPanel - Font Police - &Writing system &Système d'écriture - &Family &Famille - &Style &Style - &Point size &Taille en points @@ -1010,22 +818,18 @@ FontPropertyManager - PreferDefault PreferDefault - NoAntialias NoAntialias - PreferAntialias PreferAntialias - Antialiasing Antialiasing @@ -1033,13 +837,11 @@ FormBuilder - Invalid stretch value for '%1': '%2' Parsing layout stretch values Valeur d'extension invalide pour '%1' : '%2' - Invalid minimum size for '%1': '%2' Parsing grid layout minimum size values Taille minimum invalide pour '%1' : '%2' @@ -1048,28 +850,23 @@ FormEditorOptionsPage - %1 % %1 % - Preview Zoom Zoom de visualisation - Default Zoom Zoom par défaut - Forms Tab in preferences dialog Formulaires - Default Grid Grille par défaut @@ -1077,38 +874,31 @@ FormLayoutRowDialog - Add Form Layout Row Ajouter une ligne de mise en page au formulaire - &Label text: &Texte du label : - Field &type: &Type du champ : - &Field name: &Nom du champ : - &Buddy: copain c'est un peu beaucoup ptet &Copain : - &Row: &Ligne : - Label &name: &Nom du label : @@ -1116,12 +906,10 @@ FormWindow - Unexpected element <%1> Element inattendu : <%1> - Error while pasting clipboard contents at line %1, column %2: %3 Erreur lors du collage du contenu du presse-papier à la ligne %1, colonne %2 : %3 @@ -1129,62 +917,50 @@ FormWindowSettings - Form Settings Configuration du formulaire - Layout &Default Mise en page par &défaut - &Spacing: &Espacements : - &Margin: &Marge : - &Layout Function &Fonction de mise en page - Ma&rgin: Ma&rge : - Spa&cing: Espa&cement : - &Pixmap Function Fonction de &pixmap - &Include Hints Indication d'&include - Grid Grille - Embedded Design Design pour appareil mobile - &Author &Auteur @@ -1192,7 +968,6 @@ IconSelector - All Pixmaps ( Tous les pixmaps ( @@ -1200,7 +975,6 @@ ItemPropertyBrowser - XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser XX Icon Selected off @@ -1209,33 +983,27 @@ MainWindowBase - Main Not currently used (main tool bar) Principal - File Fichier - Edit Édition - Tools Outils - Form Formulaire - Qt Designer Qt Designer @@ -1243,52 +1011,42 @@ NewForm - Show this Dialog on Startup Afficher cette boîte de dialogue au démarrage - C&reate C&réer - Recent Récent - New Form Nouveau formulaire - &Close &Fermer - &Open... &Ouvrir... - &Recent Forms &Formulaires récents - Read error Erreur de lecture - A temporary form file could not be created in %1. Un fichier temporaire de formulaire n'a pas pu être créé dans %1. - The temporary form file %1 could not be written. Le fichier temporaire de formulaire %1 n'a pas pu être écrit. @@ -1296,22 +1054,18 @@ ObjectInspectorModel - Object Objet - Class Classe - separator séparateur - <noname> <sans nom> @@ -1319,12 +1073,10 @@ ObjectNameDialog - Change Object Name Modifier le nom de l'objet - Object Name Nom de l'objet @@ -1332,12 +1084,10 @@ PluginDialog - Plugin Information Information du plugin - 1 1 @@ -1345,7 +1095,6 @@ PreferencesDialog - Preferences Préférences @@ -1353,34 +1102,26 @@ PreviewConfigurationWidget - Form Formulaire - Print/Preview Configuration Configuration d'impression/prévisualisation - Style Style - Style sheet Feuille de style - - - ... ... - Device skin Revêtement de l'appareil @@ -1388,7 +1129,6 @@ PromotionModel - Not used Usage of promoted widgets Non utilisé @@ -1397,8 +1137,6 @@ Q3WizardContainer - - Page Page @@ -1406,59 +1144,48 @@ QAbstractFormBuilder - Unexpected element <%1> Élément imprévu <%1> - An error has occurred while reading the UI file at line %1, column %2: %3 Une erreur s'est produite lors de la lecture du fichier UI à la ligne %1, colonne %2 : %3 - Invalid UI file: The root element <ui> is missing. Fichier UI invalide : l'élément racine <ui> est manquant. - The creation of a widget of the class '%1' failed. La création d'un widget de la classe '%1' a échoué. - Attempt to add child that is not of class QWizardPage to QWizard. Tentative d'ajout d'enfant qui n'est pas de la classe QWizardPage à QWizard. - Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. This indicates an inconsistency in the ui-file. Tentative d'ajout d'un layout au widget '%1' (%2) qui a déjà un layout dont le type n'est pas boîte %3. Ceci indique une incohérence dans le fichier ui. - Empty widget item in %1 '%2'. Widget vide dans %1 '%2'. - Flags property are not supported yet. Les propriétés de type drapeau ne sont pas supportées. - While applying tab stops: The widget '%1' could not be found. Lors de l'application des arrêts de tabulation : le widget '%1' ne peut pas être trouvé. - Invalid QButtonGroup reference '%1' referenced by '%2'. Référence invalide '%1' à QButtonGroup, référencé par '%2'. - This version of the uitools library is linked without script support. Cette version de la bibliothèque uitools n'a pas le support des scripts. @@ -1466,12 +1193,10 @@ Ceci indique une incohérence dans le fichier ui. QAxWidgetPlugin - ActiveX control Control ActiveX - ActiveX control widget Widget control ActiveX @@ -1479,22 +1204,18 @@ Ceci indique une incohérence dans le fichier ui. QAxWidgetTaskMenu - Set Control Définir le contrôle - Reset Control Réinitialiser le contrôle - Licensed Control Contrôle licencié - The control requires a design-time license Le contrôle requiert une license par interface @@ -1502,67 +1223,54 @@ Ceci indique une incohérence dans le fichier ui. QCoreApplication - %1 is not a promoted class. %1 n'est pas une classe promue. - The base class %1 is invalid. La classe de base %1 est invalide. - The class %1 already exists. La classe %1 existe déjà. - Promoted Widgets Widgets promus - The class %1 cannot be removed La classe %1 ne peut pas être retirée - The class %1 cannot be removed because it is still referenced. La classe %1 ne peut pas être retirée car elle est toujours référencée. - The class %1 cannot be renamed La classe %1 ne peut pas être renommée - The class %1 cannot be renamed to an empty name. La classe %1 ne peut pas être renommé avec un nom vide. - There is already a class named %1. Une classe existe déjà avec le nom %1. - Cannot set an empty include file. Impossible de créer un fichier include vide. - Exception at line %1: %2 Exception à la ligne %1 : %2 - Unknown error Erreur inconnue - An error occurred while running the script for %1: %2 Script: %3 Une erreur s'est produite lors de l'exécution du script de %1 : %2 @@ -1572,17 +1280,14 @@ Script : %3 QDesigner - %1 - warning Avertissement - %1 - Qt Designer Qt Designer - This application cannot be used for the Console edition of Qt Cette application ne peut pas être utilisée avec l'édition console de Qt @@ -1590,228 +1295,178 @@ Script : %3 QDesignerActions - Saved %1. %1 sauvé. - %1 already exists. Do you want to replace it? %1 existe déjà. Voulez-vous le remplacer ? - Edit Widgets Éditer les widgets - &New... &Nouveau... - &Open... &Ouvrir... - &Save &Enregistrer - Save &As... Enregistrer &sous... - Save A&ll Enregistrer &tout - Save As &Template... Sauver comme &modèle... - - &Close &Fermer - Save &Image... Enregistrer &image... - &Print... Im&primer... - &Quit &Quitter - View &Code... &Visualizer le code... - &Minimize &Minimiser - Bring All to Front Amener tout au premier plan - Preferences... Préférences... - Additional Fonts... Polices additionnelles... - ALT+CTRL+S ALT+CTRL+S - CTRL+SHIFT+S CTRL+SHIFT+S - CTRL+R CTRL+R - CTRL+M CTRL+M - Qt Designer &Help &Aide de Qt Designer - Current Widget Help Aide du widget courant - What's New in Qt Designer? Quoi de neuf dans Qt Designer ? - About Plugins À propos des plugins - - About Qt Designer À propos de Qt Designer - About Qt À propos de Qt - Clear &Menu Réinitialiser le &menu - &Recent Forms Formulaires &récents - - Open Form Ouvrir le formulaire - - - Designer UI files (*.%1);;All Files (*) Fichier UI de Qt Designer (*.%1);;Tous les fichiers(*) - - Save Form As Enregistrer le formulaire sous - Designer Designer - Feature not implemented yet! Cette fonctionnalité n'est pas encore implémentée ! - Code generation failed La génération du code à échoué - Read error Erreur de lecture - %1 Do you want to update the file location or generate a new form? %1 Voulez vous mettre à jour l'emplacement du fichier ou générer un nouveau formulaire ? - &Update &Mettre à jour - &New Form &Nouveau formulaire - - Save Form? Sauver le formulaire ? - Could not open file Impossible d'ouvrir le fichier - The file %1 could not be opened. Reason: %2 Would you like to retry or select a different file? @@ -1820,17 +1475,14 @@ Raison : %2 Voulez-vous réessayer ou sélectionner un fichier différent ? - Select New File Sélectionner un nouveau fichier - Could not write file Impossible d'écrire le fichier - It was not possible to write the entire file %1 to disk. Reason:%2 Would you like to retry? @@ -1839,65 +1491,50 @@ Raison : %2 Voulez-vous réessayer ? - - Assistant Assistant - &Close Preview &Fermer la prévisualisation - - The backup file %1 could not be written. Le fichier de backup %1 n'a pas pu être écrit. - The backup directory %1 could not be created. Le dossier de backup %1 n'a pas pu être créé. - The temporary backup directory %1 could not be created. Le dossier temporaire de backup %1 n'a pas pu être créé. - Preview failed La prévisualisation a échoué - Image files (*.%1) Fichiers image (*.%1) - - Save Image Sauver image - Saved image %1. Image %1 sauvée. - The file %1 could not be written. Le fichier %1 n'a pas pu être écrit. - Please close all forms to enable the loading of additional fonts. Veuillez fermer tous les formulaires pour activer le chargement de polices additionnelles. - Printed %1. Impression de %1 terminée. @@ -1905,7 +1542,6 @@ Voulez-vous réessayer ? QDesignerAppearanceOptionsPage - Appearance Tab in preferences dialog Apparence @@ -1914,17 +1550,14 @@ Voulez-vous réessayer ? QDesignerAppearanceOptionsWidget - Docked Window Fenêtre ancrable - Multiple Top-Level Windows Fenêtres multiples - Toolwindow Font Police des fenêtre d'outils @@ -1932,22 +1565,18 @@ Voulez-vous réessayer ? QDesignerAxWidget - Reset control Réinitialiser les contrôles - Set control Définir les contrôles - Control loaded Contrôle chargé - A COM exception occurred when executing a meta call of type %1, index %2 of "%3". Une exception COM a été levée lors de l'execution du meta-appel de type %1, indice %2 de "%3". @@ -1955,17 +1584,14 @@ Voulez-vous réessayer ? QDesignerFormBuilder - Script errors occurred: Erreurs du script : - The preview failed to build. La construction de la prévisualisation a échoué. - Designer Designer @@ -1973,22 +1599,18 @@ Voulez-vous réessayer ? QDesignerFormWindow - %1 - %2[*] %1 - %2[*] - Save Form? Enregistrer le formulaire ? - Do you want to save the changes to this document before closing? Voulez-vous enregistrer les changements de ce document avant de le fermer ? - If you don't save, your changes will be lost. Si vous ne sauvegardez pas, les changements seront perdus. @@ -1996,38 +1618,30 @@ Voulez-vous réessayer ? QDesignerMenu - Type Here Taper ici - Add Separator Ajouter séparateur - Insert separator Insérer séparateur - Remove separator Retirer séparateur - Remove action '%1' Supprimer l'action '%1' - - Add separator Ajouter séparateur - Insert action Insérer action @@ -2035,22 +1649,18 @@ Voulez-vous réessayer ? QDesignerMenuBar - Type Here Taper ici - Remove Menu '%1' Supprimer menu '%1' - Remove Menu Bar Supprimer barre de menu - Menu Menu @@ -2058,37 +1668,30 @@ Voulez-vous réessayer ? QDesignerPluginManager - An XML error was encountered when parsing the XML of the custom widget %1: %2 Une erreur XML a été rencontrée lors de l'analyse grammaticale du XML provenant du widget personnalisé %1 : %2 - A required attribute ('%1') is missing. Un attribut obligatoire ('%1') est manquant. - An invalid property specification ('%1') was encountered. Supported types: %2 Une spécification invalide de propriété ('%1') a été rencontrée. Types supportés : %2 - '%1' is not a valid string property specification. '%1' n'est pas une spécification valide de propriété chaîne de caractères. - The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. Le XML du widget personnalisé %1 ne contient aucun des éléments <widget> ou <ui>. - The class attribute for the class %1 is missing. L'attribut de classe est manquant pour la classe %1. - The class attribute for the class %1 does not match the class name %2. L'attribut de classe pour la classe %1 ne correspond pas au nom de la classe %2. @@ -2096,7 +1699,6 @@ Voulez-vous réessayer ? QDesignerPropertySheet - Dynamic Properties Propriétés dynamiques @@ -2104,31 +1706,26 @@ Voulez-vous réessayer ? QDesignerResource - The layout type '%1' is not supported, defaulting to grid. Le type de layout '%1' n'est pas supporté, replacement par une grille. - The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. L'extension du widget '%1' (%2) a retourné un widget non géré par Designer '%3' (%4) lors de la requête pour la page #%5. Les pages du conteneur ne devraient être ajoutées que par spécification dans le XML retourné par la méthode domXml() du widget personnalisé. - Unexpected element <%1> Parsing clipboard contents Élément inattendu <%1> - Error while pasting clipboard contents at line %1, column %2: %3 Parsing clipboard contents Erreur lors du collage du contenu du presse-papier à la ligne %1, colonne %2 : %3 - Error while pasting clipboard contents: The root element <ui> is missing. Parsing clipboard contents Erreur lors du collage du contenu du presse-papier. L'élément racine <ui> est manquant. @@ -2137,12 +1734,10 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QDesignerSharedSettings - The template path %1 could not be created. Le chemin du modèle %1 n'a pas pu être créé. - An error has been encountered while parsing device profile XML: %1 Une erreur a été rencontrée lors de l'analyse grammaticale du XML du profil de l'appareil : %1 @@ -2150,33 +1745,27 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QDesignerToolWindow - Property Editor Éditeur de propriétés - Action Editor Éditeur d'actions - Object Inspector Inspecteur d'objet - Resource Browser plural Explorateur de ressources - Signal/Slot Editor Éditeur de signaux et slots - Widget Box Boîte de widget @@ -2184,62 +1773,50 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QDesignerWorkbench - &File &Fichier - Edit Édition - F&orm F&ormulaire - Preview in Prévisualisation avec - &View Afficha&ge - &Settings &Configuration - &Window Fe&nêtre - &Help &Aide - Toolbars Barre d'outils - Widget Box Boîte de widget - Save Forms? Enregistrer les formulaires ? - There are %n forms with unsaved changes. Do you want to review these changes before quitting? Il y a %n formulaire avec des changements non-enregistrés. Voulez-vous vérifier les changements avant de quitter? @@ -2247,37 +1824,30 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans - If you do not review your documents, all your changes will be lost. Si vous ne vérifiez pas vos documents, tous les changements seront perdus. - Discard Changes Abandonner les changements - Review Changes Vérifier les changements - Backup Information Informations de sauvegarde - The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? La dernière session de Designer n'a pas été fermée correctement. Des fichiers de sauvegarde existent. Voulez-vous les charger ? - The file <b>%1</b> could not be opened. Le fichier <b>%1</b> n'a pas pu être ouvert. - The file <b>%1</b> is not a valid Designer UI file. Le fichier <b>%1</b> n'est pas un fichier valide d'UI de Designer. @@ -2285,92 +1855,82 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QFormBuilder - An empty class name was passed on to %1 (object name: '%2'). Empty class name passed to widget factory method Un nom de classe vide a été passé à %1 (nom d'objet '%2'). - QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. QFormBuilder n'a pas pu créer le widget personnalisé de classe '%1'; passage à la classe de base '%2'. - QFormBuilder was unable to create a widget of the class '%1'. QFormBuilder n'a pas pu créer un widget de classe '%1'. - The layout type `%1' is not supported. Le type de layout '%1' n'est pas supporté. - The set-type property %1 could not be read. Le type du setteur de propriété %1 n'a pas pu être lu. - The enumeration-type property %1 could not be read. Le type d'énumeration de propriété %1 n'a pas pu être lu. - Reading properties of the type %1 is not supported yet. La lecture des propriétés de type %1 n'est pas supporté. - The property %1 could not be written. The type %2 is not supported yet. La propriété %1 ne peut pas être écrite. Le type %2 n'est pas encore supporté. + + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. + la valeur d'énumération '%1' est invalide. La valeur par défaut '%2' sera utilisée à la place. + + + The flag-value '%1' is invalid. Zero will be used instead. + Le drapeau '%1' est invalide. Zero sera utilisé à la place. + QStackedWidgetEventFilter - Previous Page Page précédente - Next Page Page suivante - Delete Supprimer - Before Current Page Avant la page courante - After Current Page Après la page courante - Change Page Order... Modifier l'ordre des pages... - Change Page Order Modifier l'ordre des pages - Page %1 of %2 Page %1 de %2 - - Insert Page Insérer page @@ -2378,12 +1938,10 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QStackedWidgetPreviewEventFilter - Go to previous page of %1 '%2' (%3/%4). Aller à la page précédente de %1 '%2' (%3/%4). - Go to next page of %1 '%2' (%3/%4). Aller à la page suivante de %1 '%2' (%3/%4). @@ -2391,28 +1949,22 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QTabWidgetEventFilter - Delete Supprimer - Before Current Page Avant la page courante - After Current Page Après la page courante - Page %1 of %2 Page %1 de %2 - - Insert Page Insérer page @@ -2420,37 +1972,30 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QToolBoxHelper - Delete Page Supprimer page - Before Current Page Avant la page courante - After Current Page Après la page courante - Change Page Order... Modifier l'ordre des pages... - Change Page Order Modifier l'ordre de pages - Page %1 of %2 Page %1 de %2 - Insert Page Insérer page @@ -2458,15 +2003,10 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtBoolEdit - - - True Vrai - - False Faux @@ -2474,12 +2014,10 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtBoolPropertyManager - True Vrai - False Faux @@ -2487,7 +2025,6 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtCharEdit - Clear Char Effacer caractère @@ -2495,7 +2032,6 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtColorEditWidget - ... ... @@ -2503,22 +2039,18 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtColorPropertyManager - Red Rouge - Green Vert - Blue Bleu - Alpha Alpha @@ -2526,97 +2058,78 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtCursorDatabase - Arrow Flèche - Up Arrow Flèche vers le haut - Cross Croix - Wait Attendre - IBeam IBeam - Size Vertical Redimensionner verticalement - Size Horizontal Redimensionner horizontalement - Size Backslash Redimensionner diagonale droite - Size Slash Redimensionner diagonale gauche - Size All Redimensionner - Blank Vide - Split Vertical Scinder verticalement - Split Horizontal Scinder horizontalement - Pointing Hand Pointeur index - Forbidden Interdit - Open Hand Main ouverte - Closed Hand Main fermée - What's This Qu'est-ce que c'est ? - Busy Occupé @@ -2624,12 +2137,10 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtFontEditWidget - ... ... - Select Font Selectionner police @@ -2637,37 +2148,30 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtFontPropertyManager - Family Famille - Point Size Taille en points - Bold Gras - Italic Italique - Underline Souligné - Strikeout Barré - Kerning Crénage @@ -2675,7 +2179,6 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtGradientDialog - Edit Gradient Modifier le gradient @@ -2683,316 +2186,242 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtGradientEditor - Form Formulaire - Gradient Editor Éditeur de gradient - 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. Cette zone montre une prévisualisation du gradient édité. Elle permet aussi d'éditer les paramètres spécifiques au type de gradient tel que les points de départ et d'arrivée, le rayon, etc. par glisser-déposer. - 1 1 - 2 2 - 3 3 - 4 4 - 5 5 - Gradient Stops Editor Éditeur de point d'arrêt du gradient - 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. Cette zone vous permet d'éditer les points d'arrêt du gardient. Double-cliquez sur un point d'arrêt existant pour le dupliquer. Double-cliquez à l'exterieur d'un point d'arrêt pour en créer un nouveau. Glissez-déposez un point pour le repositionner. Utilisez le bouton droit de la souris pour afficher le menu contextuel avec des actions supplémentaires. - Zoom Zoom - - Reset Zoom Réinitialiser le zoom - Position Position - - - Hue Teinte - H T - - Saturation Saturation - S S - Sat Sat - - Value Valeur - V V - Val Val - - - Alpha Alpha - A A - Type Type - Spread Étendue - Color Couleur - Current stop's color Couleur du point d'arrêt courant - Show HSV specification Montrer les spécifications TSV/HSV - HSV TSV/HSV - Show RGB specification Affichier les spécifications RGB - RGB RGB - Current stop's position Position du point d'arrêt courant - % % - Zoom In Zoomer - Zoom Out Dézoomer - Toggle details extension Inverser les détails d'exention - > > - Linear Type Type linéaire - - - - - - ... ... - Radial Type Type radial - Conical Type Type conique - Pad Spread Étendue par remplissage - Repeat Spread Étendue par répétition - Reflect Spread Étendue par réflexion - Start X X de départ - Start Y Y de départ - Final X X de fin - Final Y Y de fin - - Central X X central - - Central Y Y central - Focal X X focal - Focal Y Y focal - Radius Rayon - Angle Angle - Linear Linéaire - Radial Radial - Conical Conique - Pad Remplissage - Repeat Répéter - Reflect Réflexion @@ -3000,37 +2429,30 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtGradientStopsWidget - New Stop Nouveau point d'arrêt - Delete Supprimer - Flip All Tout renverser - Select All Tout sélectionner - Zoom In Zoomer - Zoom Out Dézoomer - Reset Zoom Réinitialiser le zoom @@ -3038,46 +2460,34 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtGradientView - Gradient View Vue du gradient - - New... Nouveau... - - Edit... Éditer... - - Rename Renommer - - Remove Retirer - Grad Gradient - Remove Gradient Retirer gradient - Are you sure you want to remove the selected gradient? Êtes-vous sûr de vouloir supprimer le gradient sélectionné ? @@ -3085,7 +2495,6 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtGradientViewDialog - Select Gradient Sélectionner gradient @@ -3093,7 +2502,6 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtKeySequenceEdit - Clear Shortcut Effacer les racourcis @@ -3101,17 +2509,14 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtLocalePropertyManager - %1, %2 %1, %2 - Language Langue - Country Pays @@ -3119,17 +2524,14 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtPointFPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3137,17 +2539,14 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtPointPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3155,12 +2554,10 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtPropertyBrowserUtils - [%1, %2, %3] (%4) [%1, %2, %3] (%4) - [%1, %2] [%1, %2] @@ -3168,27 +2565,22 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtRectFPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - X X - Y Y - Width Largeur - Height Hauteur @@ -3196,27 +2588,22 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtRectPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - X X - Y Y - Width Largeur - Height Hauteur @@ -3224,175 +2611,134 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtResourceEditorDialog - Dialog Dialogue - New File Nouveau fichier - - N N - Remove File Supprimer fichier - - R S - I - New Resource Nouvelle ressource - A A - Remove Resource or File Supprimer ressource ou fichier - %1 already exists. Do you want to replace it? %1 existe déjà. Voulez-vous le remplacer ? - The file does not appear to be a resource file; element '%1' was found where '%2' was expected. Le fichier n'est pas un fichier ressource; l'élément '%1' a été trouvé à la place de %2. - %1 [read-only] %1 [lecture seule] - - %1 [missing] %1 [manquant] - <no prefix> <pas de préfixe> - - New Resource File Nouveau fichier de ressource - - Resource files (*.qrc) Fichier de ressource (*.qrc) - Import Resource File Importer fichier de ressource - newPrefix newPrefix - <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> <p><b>Avertissement :</b> le fichier</p><p>%1</p><p>est en dehors du répertoire parent du fichier de ressource courant.</p> - <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> <p>Pour résoudre le problème, appuyez sur :</p><table><tr><th align="left">Copier</th><td>Pour copier le fichier dans le répertoire parent du fichier de ressource.</td></tr><tr><th align="left">Copier sous...</th><td>Pour copier le fichier ressource dans un sous-répertoire du répertoire parent du fichier de ressource.</td></tr><tr><th align="left">Conserver</th><td>pour conserver l'emplacement courant.</td></tr></table> - Add Files Ajouter fichiers - Incorrect Path Chemin incorrect - - - - Copy Copier - Copy As... Copier sous... - Keep Conserver - Skip Passer - Clone Prefix Cloner le préfixe - Enter the suffix which you want to add to the names of the cloned files. This could for example be a language extension like "_de". Entrez le suffixe que vous voulez ajouter aux noms des fichiers clonés. Ceci peut être une extension de langue par exemple, comme "_fr'. - - Copy As Copier sous - <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> <p>Le fichier sélectionné</p><p>%1</p><p>est en dehors du répertoire du fichier de ressource courant :</p><p>%2</p><p>Veuillez sélectionner un chemin dans le répertoire courant.</p> - Could not overwrite %1. Impossible d'écraser %1. - Could not copy %1 to @@ -3403,108 +2749,84 @@ vers %2 - A parse error occurred at line %1, column %2 of %3: %4 Une erreur d'analyse grammaticale est apparue à la ligne %1, colonne %2 de %3 : %4 - Save Resource File Enregistrer le fichier de ressource - Could not write %1: %2 Impossible d'écrire %1 : %2 - Edit Resources Éditer les ressources - New... Nouveau... - Open... Ouvrir... - Open Resource File Ouvrir fichier de ressource - - Remove Retirer - - Move Up Vers le Haut - - Move Down Vers le Bas - - Add Prefix Ajouter préfixe - Add Files... Ajouter fichiers... - Change Prefix Modifier le préfixe - Change Language Modifier la langue - Change Alias Modifier l'alias - Clone Prefix... Cloner le préfixe... - Prefix / Path Préfixe / chemin - Language / Alias Langue / Alias - <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> <html><p><b>Avertissement:</b> Des problèmes sont apparus lors du rafraichissement des données des ressources :</p><pre>%1</pre></html> - Resource Warning Avertissement relatif aux ressources @@ -3512,24 +2834,20 @@ vers QtResourceView - Size: %1 x %2 %3 Taille : %1 x %2 %3 - Edit Resources... Éditer ressources... - Reload Recharger - Copy Path Copier le chemin @@ -3537,7 +2855,6 @@ vers QtResourceViewDialog - Select Resource Séléctionner ressource @@ -3545,17 +2862,14 @@ vers QtSizeFPropertyManager - %1 x %2 %1 x %2 - Width Largeur - Height Hauteur @@ -3563,33 +2877,26 @@ vers QtSizePolicyPropertyManager - - <Invalid> <Invalide> - [%1, %2, %3, %4] [%1, %2, %3, %4] - Horizontal Policy Politique horizontale - Vertical Policy Politique verticale - Horizontal Stretch Étirement horizontal - Vertical Stretch Étirement vertical @@ -3597,17 +2904,14 @@ vers QtSizePropertyManager - %1 x %2 %1 x %2 - Width Largeur - Height Hauteur @@ -3615,107 +2919,86 @@ vers QtToolBarDialog - Customize Toolbars Personnaliser les barres d'outils - 1 1 - Actions Actions - Toolbars Barres d'outils - Add new toolbar Ajouter une nouvelle barre d'outils - New Nouveau - Remove selected toolbar Supprimer la barre d'outils sélectionnée - Remove Supprimer - Rename toolbar Renommer la barre d'outils - Rename Renommer - Move action up Déplacer l'action vers le haut - Up Monter - Remove action from toolbar Retirer l'action de la barre d'outils - <- <- - Add action to toolbar Ajouter l'action à la barre d'outil - -> -> - Move action down Déplacer l'action vers le bas - Down Descendre - Current Toolbar Actions Actions de la barre d'outils courante - Custom Toolbar Barre d'outils personnalisée - < S E P A R A T O R > < S É P A R A T E U R > @@ -3723,12 +3006,10 @@ vers QtTreePropertyBrowser - Property Propriété - Value Valeur @@ -3736,64 +3017,52 @@ vers SaveFormAsTemplate - Save Form As Template Enregistrer le formulaire comme un modèle - &Name: &Nom : - &Category: &Catégorie : - Add path... Ajouter chemin... - Template Exists Le modèle existe - A template with the name %1 already exists. Do you want overwrite the template? Un modèle existe déjà avec le nom %1. Voulez-vous le remplacer ? - Overwrite Template Remplacer modèle - Open Error Erreur d'ouverture - There was an error opening template %1 for writing. Reason: %2 Une erreur s'est produite à l'ouverture du modèle %1 en écriture. Raison : %2 - Write Error Erreur d'écriture - There was an error writing the template %1 to disk. Reason: %2 Une erreur s'est produite lors de l'écriture du modèle %1 sur le disque. Raison : %2 - Pick a directory to save templates in Sélectionner le dossier dans lequel le modèle sera enregistré @@ -3801,7 +3070,6 @@ Voulez-vous le remplacer ? ScriptErrorDialog - An error occurred while running the scripts for "%1": Une erreur est apparue lors de l'execution des scripts de "%1" : @@ -3811,22 +3079,18 @@ Voulez-vous le remplacer ? SelectSignalDialog - Go to slot Aller au slot - Select signal Sélectionner signal - signal signal - class classe @@ -3834,7 +3098,6 @@ Voulez-vous le remplacer ? SignalSlotConnection - SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) ENVOYER(%1), SIGNAL(%2), RECEVEUR(%3), SLOT(%4) @@ -3842,37 +3105,26 @@ Voulez-vous le remplacer ? SignalSlotDialogClass - Signals and slots Signaux et slots - Slots Slots - - Add Ajouter - - - - ... ... - - Delete Supprimer - Signals Signaux @@ -3880,12 +3132,10 @@ Voulez-vous le remplacer ? Spacer - Horizontal Spacer '%1', %2 x %3 Ressort horizontal '%1', %2 x %3 - Vertical Spacer '%1', %2 x %3 Ressort vertical '%1', %2 x %3 @@ -3893,7 +3143,6 @@ Voulez-vous le remplacer ? TemplateOptionsPage - Template Paths Tab in preferences dialog Chemins des modèles @@ -3902,32 +3151,42 @@ Voulez-vous le remplacer ? ToolBarManager - Configure Toolbars... Configurer les barres d'outils... - Window Fenêtre - Help Aide - Style Style - Dock views Ancrer les vues - + File + Fichier + + + Edit + Édition + + + Tools + Outils + + + Form + Formulaire + + Toolbars Barres d'outils @@ -3935,22 +3194,18 @@ Voulez-vous le remplacer ? VersionDialog - <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>Version %2 - Qt Designer Qt Designer - <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> <br/>Qt Designer est une interface de création d'interface graphique pour les applications Qt.<br/> - %1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). %1<br/>Copyright (C) 2010 Nokia Corporation et/ou ses filiales. @@ -3958,7 +3213,6 @@ Voulez-vous le remplacer ? WidgetDataBase - The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. Le fichier contient un widget personnalisé '%1' dont la classe de base (%2) est différente de l'entrée dans la base de données de widget (%3). La base de données de widget n'a pas été modifiée. @@ -3966,87 +3220,70 @@ Voulez-vous le remplacer ? qdesigner_internal::ActionEditor - New... Nouveau... - Edit... Éditer... - Go to slot... Aller au slot... - Copy Copier - Cut Couper - Paste Coller - Select all Tout sélectionner - Delete Supprimer - Actions Actions - Configure Action Editor Configurer l'éditeur d'action - Icon View Vue en icônes - Detailed View Vue détaillée - New action Nouvelle action - Edit action Editer action - Remove action '%1' Supprimer action '%1' - Remove actions Supprimer les actions - Used In Utilisé dans @@ -4054,32 +3291,26 @@ Voulez-vous le remplacer ? qdesigner_internal::ActionModel - Name Nom - Used Utilisé - Text Texte - Shortcut Raccourci - Checkable Vérifiable - ToolTip Info-bulle @@ -4087,27 +3318,22 @@ Voulez-vous le remplacer ? qdesigner_internal::BrushManagerProxy - The element '%1' is missing the required attribute '%2'. L'attribut requis '%2' est manquant pour l'élément '%1'. - Empty brush name encountered. Un nom vide de pinceau a été rencontré. - An unexpected element '%1' was encountered. L'élément inattendu '%1' a été rencontré. - An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 Une erreur est apparue lors de la lecture du fichier '%1' de définition des pinceaux à la ligne %2, colonne %3: %4 - An error occurred when reading the resource file '%1' at line %2, column %3: %4 Une erreur est survenue lors de la lecture du fichier de ressource '%1' à la ligne %2, colonne %3 : %4 @@ -4115,17 +3341,14 @@ Voulez-vous le remplacer ? qdesigner_internal::BuddyEditor - Add buddy Ajouter un copain - Remove buddies Supprimer les copains - Remove %n buddies Supprimer %n copain @@ -4133,7 +3356,6 @@ Voulez-vous le remplacer ? - Add %n buddies Ajouter %n copain @@ -4141,7 +3363,6 @@ Voulez-vous le remplacer ? - Set automatically Définir automatiquement @@ -4149,7 +3370,6 @@ Voulez-vous le remplacer ? qdesigner_internal::BuddyEditorPlugin - Edit Buddies Éditer les copains @@ -4157,7 +3377,6 @@ Voulez-vous le remplacer ? qdesigner_internal::BuddyEditorTool - Edit Buddies Éditer les copains @@ -4165,12 +3384,10 @@ Voulez-vous le remplacer ? qdesigner_internal::ButtonGroupMenu - Select members Sélectionner les membres - Break Casser @@ -4178,32 +3395,26 @@ Voulez-vous le remplacer ? qdesigner_internal::ButtonTaskMenu - Assign to button group Assigner au groupe de boutons - Button group Groupe de boutons - New button group Nouveau groupe de boutons - Change text... Modifier le texte... - None Aucun - Button group '%1' Groupe de boutons '%1' @@ -4211,57 +3422,46 @@ Voulez-vous le remplacer ? qdesigner_internal::CodeDialog - Save... Enregistrer... - Copy All Tout copier - &Find in Text... &Rechercher dans le texte... - A temporary form file could not be created in %1. Un fichier temporaire de formulaire n'a pas pu être créé dans %1. - The temporary form file %1 could not be written. Le fichier temporaire de formulaire %1 n'a pas pu être écrit. - %1 - [Code] %1 - [Code] - Save Code Enregistrer le code - Header Files (*.%1) Fichiers headers (*.%1) - The file %1 could not be opened: %2 Le fichier %1 ne peut pas être ouvert : %2 - The file %1 could not be written: %2 Le fichier %1 ne peut pas être écrit : %2 - %1 - Error %1 - Erreur @@ -4269,7 +3469,6 @@ Voulez-vous le remplacer ? qdesigner_internal::ColorAction - Text Color Couleur du texte @@ -4277,12 +3476,10 @@ Voulez-vous le remplacer ? qdesigner_internal::ComboBoxTaskMenu - Edit Items... Éditer les éléments... - Change Combobox Contents Modifier le contenu du Combobox @@ -4290,7 +3487,6 @@ Voulez-vous le remplacer ? qdesigner_internal::CommandLinkButtonTaskMenu - Change description... Modifier la description... @@ -4298,17 +3494,14 @@ Voulez-vous le remplacer ? qdesigner_internal::ConnectionEdit - Select All Tout sélectionner - Deselect All Désélectionner tout - Delete Supprimer @@ -4316,52 +3509,42 @@ Voulez-vous le remplacer ? qdesigner_internal::ConnectionModel - Sender Émetteur - Signal Signal - Receiver Receveur - Slot Slot - <sender> <émetteur> - <signal> <signal> - <receiver> <receveur> - <slot> <slot> - The connection already exists!<br>%1 La connexion existe déjà !<br>%1 - Signal and Slot Editor Éditeur de signaux et slots @@ -4369,42 +3552,34 @@ Voulez-vous le remplacer ? qdesigner_internal::ContainerWidgetTaskMenu - Delete Supprimer - Insert Insérer - Insert Page Before Current Page Insérer la page avant la page courante - Insert Page After Current Page Insérer la page après la page courante - Add Subwindow Ajouter sous-fenêtre - Subwindow Sous fenêtre - Page Page - Page %1 of %2 Page %1 de %2 @@ -4412,18 +3587,15 @@ Voulez-vous le remplacer ? qdesigner_internal::DPI_Chooser - System (%1 x %2) System resolution Système (%1 x %2) - User defined Défini par l'utilisateur - x DPI X/Y separator x @@ -4432,49 +3604,38 @@ Voulez-vous le remplacer ? qdesigner_internal::DesignerPropertyManager - - AlignLeft AlignementGauche - AlignHCenter AlignementCentreH - AlignRight AlignementDroite - AlignJustify AlignementJustifié - AlignTop AlignementSommet - - AlignVCenter AlignementCentreV - AlignBottom AlignementDessous - %1, %2 %1, %2 - Customized (%n roles) Personnalisé (%n rôle) @@ -4482,76 +3643,59 @@ Voulez-vous le remplacer ? - Inherited pour la palette Héritée - Horizontal Horizontal - Vertical Vertical - Normal Off Arrêt normal - Normal On Marche normal - Disabled Off Arrêt désactivé - Disabled On Marche désactivé - Active Off Arrêt activé - Active On Marche activé - Selected Off Arrêt sélectionné - Selected On Marche sélectionné - - translatable Traduisible - - disambiguation désambiguation - - comment commentaire @@ -4559,48 +3703,38 @@ Voulez-vous le remplacer ? qdesigner_internal::DeviceProfileDialog - Device Profiles (*.%1) Profils d'appareil (*.%1) - Default Par défaut - Save Profile Enregistrer le profil - Save Profile - Error Enregistrer le profile - Erreur - Unable to open the file '%1' for writing: %2 Impossible d'ouvrir le fichier '%1' en écriture : %2 - Open profile Ouvrir profil - - Open Profile - Error Ouvrir profil - Erreur - Unable to open the file '%1' for reading: %2 Impossible d'ouvrir le fichier '%1' en lecture : %2 - '%1' is not a valid profile: %2 '%1' n'est pas un profil valide : %2 @@ -4608,57 +3742,46 @@ Voulez-vous le remplacer ? qdesigner_internal::Dialog - Dialog Boîte de dialogue - StringList Liste de chaîne de caractères - New String Nouvelle chaîne de caractères - &New &Nouveau - Delete String Supprimer la chaîne de caractères - &Delete &Supprimer - &Value: &Valeur : - Move String Up Déplacer la chaîne de caractères vers le haut - Up Vers le haut - Move String Down Déplacer la chaîne de caractères vers le bas - Down Vers le bas @@ -4666,52 +3789,42 @@ Voulez-vous le remplacer ? qdesigner_internal::EmbeddedOptionsControl - None Aucun - Add a profile Ajouter un profil - Edit the selected profile Éditer le profile sélectionné - Delete the selected profile Supprimer le profil sélectionné - Add Profile Ajouter profil - New profile Nouveau profil - Edit Profile Éditer profil - Delete Profile Supprimer profil - Would you like to delete the profile '%1'? Voulez-vous supprimer le profil '%1' ? - Default Par défaut @@ -4719,20 +3832,25 @@ Voulez-vous le remplacer ? qdesigner_internal::FilterWidget - <Filter> - <Filtre> + <Filtre> + + + Filter + Filtre + + + Clear text + Effacer le texte qdesigner_internal::FormEditor - Resource File Changed Fichier de ressource modifié - The file "%1" has changed outside Designer. Do you want to reload it? Le fichier "%1" a été modifié en dehors de Designer. Voulez-vous le recharger ? @@ -4740,7 +3858,6 @@ Voulez-vous le remplacer ? qdesigner_internal::FormLayoutMenu - Add form layout row... Ajouter une ligne au layout du formulaire... @@ -4748,33 +3865,30 @@ Voulez-vous le remplacer ? qdesigner_internal::FormWindow - Edit contents Éditer le contenu - F2 F2 - Insert widget '%1' Insérer le widget '%1' - Resize Redimensionner - - Key Move Déplacement au clavier + + Key Resize + Redimensionnement au clavier + - Paste %n action(s) Coller %n action @@ -4782,7 +3896,6 @@ Voulez-vous le remplacer ? - Paste %n widget(s) Coller %n widget @@ -4790,53 +3903,42 @@ Voulez-vous le remplacer ? - Paste (%1 widgets, %2 actions) Coller (%1 widgets, %2 actions) - Cannot paste widgets. Designer could not find a container without a layout to paste into. Impossible de coller les widgets. Designer n'a pas trouvé de conteneur sans layout pour coller. - Break the layout of the container you want to paste into, select this container and then paste again. Retirez le layout du conteneur dans lequel vous voulez coller, sélectionnez ce conteneur et collez à nouveau. - Paste error Erreur de collage - Raise widgets Élever widgets - Lower widgets Descendre widgets - Select Ancestor Sélectionner les ancêtres - Lay out Mettre en page - - Drop widget Supprimer widget - A QMainWindow-based form does not contain a central widget. Un formulaire basé sur QMainWindow ne contenant pas de widget central. @@ -4844,12 +3946,10 @@ Voulez-vous le remplacer ? qdesigner_internal::FormWindowBase - Delete '%1' Supprimer '%1' - Delete Supprimer @@ -4857,200 +3957,167 @@ Voulez-vous le remplacer ? qdesigner_internal::FormWindowManager - Cu&t Co&uper - Cuts the selected widgets and puts them on the clipboard Coupe les widgets sélectionnés et les place dans le presse-papiers - &Copy Cop&ier - Copies the selected widgets to the clipboard Copie les widgets sélectionnés dans le presse-papiers - &Paste C&oller - Pastes the clipboard's contents Colle le contenu du presse-papiers - &Delete &Supprimer - Deletes the selected widgets Supprime les widgets sélectionnés - Select &All Tout &sélectionner - Selects all widgets Sélectionne tous les widgets - Bring to &Front Amener au premier &plan - - Raises the selected widgets Élève les widgets sélectionnés - Send to &Back Placer en &arrière plan - - Lowers the selected widgets Descend les widgets sélectionnés - Adjust &Size Ajuster les &dimensions - Adjusts the size of the selected widget Ajuster les dimensions du widget sélectionné - Lay Out &Horizontally Mettre en page &horizontalement - - Lays out the selected widgets horizontaly + Lays out the selected widgets horizontally Mettre en page horizontalement les widgets sélectionnés - + Lays out the selected widgets horizontally in a splitter + Met en page les widgets sélectionnés horizontalement à l'aide d'un séparateur + + + Lays out the selected widgets horizontaly + Mettre en page horizontalement les widgets sélectionnés + + Lay Out &Vertically Mettre en page &verticalement - Lays out the selected widgets vertically Mettre en page verticalement les widgets sélectionnés - Lay Out in a &Form Layout Mettre en page dans un layout de &formulaire - Lays out the selected widgets in a form layout Mettre en page les widgets sélectionnés dans un layout de formulaire - Lay Out in a &Grid Mettre en page dans une &grille - Lays out the selected widgets in a grid Mettre en page les widgets sélectionnés dans une grille - Lay Out Horizontally in S&plitter Mettre en page horizontalement avec un sé&parateur - Lays out the selected widgets horizontaly in a splitter - Met en page les widgets sélectionnés horizontalement à l'aide d'un séparateur + Met en page les widgets sélectionnés horizontalement à l'aide d'un séparateur - Lay Out Vertically in Sp&litter Mettre en page verticalement avec un sépa&rateur - Lays out the selected widgets vertically in a splitter Met en page les widgets sélectionnés verticalement à l'aide d'un séparateur - &Break Layout &Casser la mise en page - Breaks the selected layout Retire le layout sélectionné - Si&mplify Grid Layout Si&mplifier le layout de grille - Removes empty columns and rows Supprime les lignes et colonnes vides - &Preview... &Prévisualisation... - Preview current form Prévisualise le formulaire courant - Form &Settings... Paramètres du &formulaire... - Break Layout Casser la mise en page - Adjust Size Ajuster les dimensions - Could not create form preview Title of warning message box Impossible de créer la prévisualisation du formulaire - Form Settings - %1 Paramètres du formulaire - %1 @@ -5058,12 +4125,10 @@ Voulez-vous le remplacer ? qdesigner_internal::FormWindowSettings - None Aucun - Device Profile: %1 Profil de périphérique : %1 @@ -5071,38 +4136,30 @@ Voulez-vous le remplacer ? qdesigner_internal::GridPanel - Form Formulaire - Grid Grille - Visible Visible - Grid &X Grille &X - - Snap Grille aimantée - Reset Réinitialisé - Grid &Y Grille &Y @@ -5110,7 +4167,6 @@ Voulez-vous le remplacer ? qdesigner_internal::GroupBoxTaskMenu - Change title... Modifier le titre... @@ -5118,7 +4174,6 @@ Voulez-vous le remplacer ? qdesigner_internal::HtmlTextEdit - Insert HTML entity Insérer une entité HTML @@ -5126,92 +4181,74 @@ Voulez-vous le remplacer ? qdesigner_internal::IconSelector - The pixmap file '%1' cannot be read. Le fichier pixmap '%1' ne peut pas être lu. - The file '%1' does not appear to be a valid pixmap file: %2 Le fichier '%1' n'est pas un fichier de pixmap valide : %2 - The file '%1' could not be read: %2 Le fichier '%1' ne peut pas être lu : %2 - Choose a Pixmap Choisissez un pixmap - Pixmap Read Error Erreur de lecture de pixmap - ... ... - Normal Off Arrêt normal - Normal On Marche normal - Disabled Off Arrêt désactivé - Disabled On Marche désactivé - Active Off Arrêt activé - Active On Marche activé - Selected Off Arrêt sélectionné - Selected On Marche sélectionné - Choose Resource... Choisir ressource... - Choose File... Choisir un fichier... - Reset Réinitialiser - Reset All Réinitialisé tout @@ -5219,58 +4256,46 @@ Voulez-vous le remplacer ? qdesigner_internal::ItemListEditor - Items List Liste d'éléments - New Item Nouvel élément - &New &Nouveau - Delete Item Supprimer élément - &Delete &Supprimer - Move Item Up Déplacer l'élément vers le haut - U Monter - Move Item Down Déplacer l'élément vers le bas - D Descendre - - Properties &>> Propriétés &>> - Properties &<< Propriétés &<< @@ -5278,12 +4303,10 @@ Voulez-vous le remplacer ? qdesigner_internal::LabelTaskMenu - Change rich text... Modifier texte riche... - Change plain text... Modifier texte simple... @@ -5291,7 +4314,6 @@ Voulez-vous le remplacer ? qdesigner_internal::LanguageResourceDialog - Choose Resource Choisir ressource @@ -5299,7 +4321,6 @@ Voulez-vous le remplacer ? qdesigner_internal::LineEditTaskMenu - Change text... Modifier texte... @@ -5307,17 +4328,14 @@ Voulez-vous le remplacer ? qdesigner_internal::ListWidgetEditor - New Item Nouvel élément - Edit List Widget Éditer le widget de liste - Edit Combobox Éditer le Combobox @@ -5325,12 +4343,10 @@ Voulez-vous le remplacer ? qdesigner_internal::ListWidgetTaskMenu - Edit Items... Éditer les éléments... - Change List Contents Modifier le contenu de la liste @@ -5338,22 +4354,18 @@ Voulez-vous le remplacer ? qdesigner_internal::MdiContainerWidgetTaskMenu - Next Subwindow Sous-fenêtre suivante - Previous Subwindow Sous-fenêtre précédente - Tile Côte à côte - Cascade Cascade @@ -5361,7 +4373,6 @@ Voulez-vous le remplacer ? qdesigner_internal::MenuTaskMenu - Remove Supprimer @@ -5369,7 +4380,6 @@ Voulez-vous le remplacer ? qdesigner_internal::MorphMenu - Morph into Transformer en @@ -5377,43 +4387,34 @@ Voulez-vous le remplacer ? qdesigner_internal::NewActionDialog - New Action... Nouvelle action... - &Text: &Texte : - Object &name: &Nom de l'objet : - &Icon: &Icône : - Shortcut: Raccourci : - Checkable: Peut être cochée : - ToolTip: Info-bulle : - - ... ... @@ -5421,39 +4422,32 @@ Voulez-vous le remplacer ? qdesigner_internal::NewDynamicPropertyDialog - Create Dynamic Property Créer une propriété dynamique - Property Name Nom de la propriété - horizontalSpacer Espaceur horizontal - Property Type Type de la propriété - Set Property Name Définir le nom de la propriété - The current object already has a property named '%1'. Please select another, unique one. L'objet courant possède déjà une propriété nommée '%1'. Veuillez-sélectionner un autre nom. - The '_q_' prefix is reserved for the Qt library. Please select another name. Le préfixe «_q_» est réservé pour la bibliothèque Qt. @@ -5463,83 +4457,67 @@ Veuillez sélectionner un autre nom. qdesigner_internal::NewFormWidget - 0 0 - Choose a template for a preview Choisir un modèle pour la prévisualisation - Embedded Design Design pour appareil mobile - Device: Appareil : - Screen Size: Dimensions de l'écran : - Default size Dimensions par défaut - QVGA portrait (240x320) QVGA portrait (240x320) - QVGA landscape (320x240) QVGA paysage (320x240) - VGA portrait (480x640) VGA portrait (480x640) - VGA landscape (640x480) VGA paysage (640x480) - Widgets New Form Dialog Categories Widgets - Custom Widgets Widgets personnalisé - None Aucun - Error loading form Erreur de chargement du formulaire - Unable to open the form template file '%1': %2 Impossible d'ouvrir le fichier de modèle de formulaire '%1' : %2 - Internal error: No template selected. Erreur interne : aucun modèle sélectionné. @@ -5547,37 +4525,30 @@ Veuillez sélectionner un autre nom. qdesigner_internal::NewPromotedClassPanel - Add Ajouter - New Promoted Class Nouvelle classe promue - Base class name: Nom de la classe de base : - Promoted class name: Nom de la classe promue : - Header file: Fichier d'en-tête : - Global include En-tête global - Reset Réinitialiser @@ -5585,7 +4556,10 @@ Veuillez sélectionner un autre nom. qdesigner_internal::ObjectInspector - + Change Current Page + Modifier la page courante + + &Find in Text... &Rechercher dans le texte... @@ -5593,40 +4567,33 @@ Veuillez sélectionner un autre nom. qdesigner_internal::ObjectInspector::ObjectInspectorPrivate - Change Current Page - Modifier la page courante + Modifier la page courante qdesigner_internal::OrderDialog - Change Page Order Modifier l'ordre des pages - Page Order Ordre des pages - Move page up Déplacer la page vers le haut - Move page down Déplacer la page vers le bas - Index %1 (%2) Indice %1 (%2) - %1 %2 %1 %2 @@ -5634,47 +4601,38 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PaletteEditor - Edit Palette Éditer la palette - Tune Palette Ajuster la palette - Show Details Afficher les détails - Compute Details Calculer les détails - Quick Rapide - Preview Prévisualisation - Disabled Désactivé - Inactive Inactif - Active Actif @@ -5682,7 +4640,6 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PaletteEditorButton - Change Palette Modifier la palette @@ -5690,22 +4647,18 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PaletteModel - Color Role Rôle de la couleur - Active Actif - Inactive Inactif - Disabled Désactivé @@ -5713,28 +4666,22 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PixmapEditor - Choose Resource... Choisir ressource... - Choose File... Choisir fichier... - Copy Path Chemin de copie - Paste Path Chemin de collage - - ... ... @@ -5742,7 +4689,6 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PlainTextEditorDialog - Edit text Éditer le texte @@ -5750,37 +4696,30 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PluginDialog - Components Composants - Plugin Information Information sur les plugins - Refresh Rafraîchir - Scan for newly installed custom widget plugins. Recherche des plugins personnalisés récemment installés. - Qt Designer couldn't find any plugins Qt Designer n'a trouvé aucun plugin - Qt Designer found the following plugins Qt Designer a trouvé les plugins suivants - New custom widget plugins have been found. De nouveaux plugins de widgets ont été trouvés. @@ -5788,7 +4727,6 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PreviewActionGroup - %1 Style Style %1 @@ -5796,50 +4734,38 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PreviewConfigurationWidget - Default Par défaut - None Aucun - Browse... Parcourir... - - - qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate - Load Custom Device Skin Charger le revêtement d'appareil personnalisé - All QVFB Skins (*.%1) Tous les revêtements QVFB (*.%1) - %1 - Duplicate Skin %1 - Revêtement doublon - The skin '%1' already exists. Le revêtement '%1' existe déjà. - %1 - Error - %1 - -Erreur + %1 - Erreur - %1 is not a valid skin directory: %2 %1 n'est pas un répertoire de revêtements valide : @@ -5847,26 +4773,51 @@ Veuillez sélectionner un autre nom. + qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate + + Load Custom Device Skin + Charger le revêtement d'appareil personnalisé + + + All QVFB Skins (*.%1) + Tous les revêtements QVFB (*.%1) + + + %1 - Duplicate Skin + %1 - Revêtement doublon + + + The skin '%1' already exists. + Le revêtement '%1' existe déjà. + + + %1 - Error + %1 - -Erreur + + + %1 is not a valid skin directory: +%2 + %1 n'est pas un répertoire de revêtements valide : +%2 + + + qdesigner_internal::PreviewDeviceSkin - &Portrait &Portrait - Landscape (&CCW) Rotate form preview counter-clockwise Paysage (&dans le sens horaire) - &Landscape (CW) Rotate form preview clockwise Paysage (&dans le sens anti-horaire) - &Close &Fermer @@ -5874,7 +4825,6 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PreviewManager - %1 - [Preview] %1 - [prévisualisation] @@ -5882,7 +4832,6 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PreviewMdiArea - The moose in the noose ate the goose who was loose. Palette editor background @@ -5893,57 +4842,46 @@ je préfère les mines de Pompéi. qdesigner_internal::PreviewWidget - Preview Window Fenêtre de prévisualisation - LineEdit LineEdit - ComboBox ComboBox - PushButton PushButton - ButtonGroup2 ButtonGroup2 - CheckBox1 CheckBox1 - CheckBox2 CheckBox2 - ButtonGroup ButtonGroup - RadioButton1 RadioButton1 - RadioButton2 RadioButton2 - RadioButton3 BoutonRadio1 @@ -5951,22 +4889,18 @@ je préfère les mines de Pompéi. qdesigner_internal::PromotionModel - Name Nom - Header file Fichier d'en-tête - Global include En-tête global - Usage Usage @@ -5974,27 +4908,22 @@ je préfère les mines de Pompéi. qdesigner_internal::PromotionTaskMenu - Promoted widgets... Widgets promus... - Promote to ... Promouvoir en... - Change signals/slots... Modifier signaux/slots... - Promote to Promouvoir en - Demote to %1 Rétrograder en %1 @@ -6002,57 +4931,46 @@ je préfère les mines de Pompéi. qdesigner_internal::PropertyEditor - Add Dynamic Property... Ajouter une propriété dynamique... - Remove Dynamic Property Supprimer la propriété dynamique - Sorting Tri - Color Groups Groupes de couleur - Tree View Vue arborescente - Drop Down Button View - Liste déroulante + Liste déroulante - String... Chaîne de caractères... - Bool... Booléen... - Other... Autre... - Configure Property Editor Configurer l'éditeur de propriétés - Object: %1 Class: %2 Objet : %1 @@ -6062,7 +4980,6 @@ Classe : %2 qdesigner_internal::PropertyLineEdit - Insert line break Insérer saut de ligne @@ -6070,27 +4987,22 @@ Classe : %2 qdesigner_internal::QDesignerPromotionDialog - Promoted Widgets Widgets promus - Promoted Classes Classes promues - Promote Promouvoir - Change signals/slots... Modifier signaux/slots... - %1 - Error %1 - Erreur @@ -6098,22 +5010,18 @@ Classe : %2 qdesigner_internal::QDesignerResource - Loading qrc file Chargement du fichier qrc - The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> Le fichier qrc spécifié <p><b>%1</b></p><p>n'a pas pu être trouvé. Voulez-vous mettre à jour l'emplacement du fichier?</p> - New location for %1 Nouvel emplacement pour %1 - Resource files (*.qrc) Fichier de ressource (*.qrc) @@ -6121,112 +5029,90 @@ Classe : %2 qdesigner_internal::QDesignerTaskMenu - Change objectName... Modifier objectName... - Change toolTip... Modifier toolTip... - Change whatsThis... Modifier whatsThis... - Change styleSheet... Modifier la feuille de style... - Create Menu Bar Créer une barre de menus - Add Tool Bar Ajouter une barre d'outils - Create Status Bar Créer une barre de status - Remove Status Bar Supprimer la barre de status - Change script... Modifier le script... - Change signals/slots... Modifier signaux/slots... - Go to slot... Aller au slot... - Size Constraints Contrainte de taille - Set Minimum Width Définir la largeur minimum - Set Minimum Height Définir la hauteur minimum - Set Minimum Size Définir la taille minimum - Set Maximum Width Définir la largeur maximum - Set Maximum Height Définir la hauteur maximum - Set Maximum Size Définir la taille maximum - Edit ToolTip Éditer l'info-bulle - Edit WhatsThis Éditer «Qu'est-ce» - no signals available Aucun signal disponible - Set size constraint on %n widget(s) Définir les contraintes de dimensions sur %n widget @@ -6237,40 +5123,32 @@ Classe : %2 qdesigner_internal::QDesignerWidgetBox - An error has been encountered at line %1 of %2: %3 Une erreur a été rencontrée à la ligne %1 de %2 : %3 - Unexpected element <%1> encountered when parsing for <widget> or <ui> L'élément inattendu <%1> a été rencontré lors de l'analyse des élements <widget> et <ui> - Unexpected end of file encountered when parsing widgets. Fin de fichier inattendue lors de l'analyse grammaticale des widgets. - A widget element could not be found. Un élement de widget n'a pas pu être trouvé. - - Unexpected element <%1> Élément <%1> inattendu - A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 %5 Une erreur d'analyse grammaticale est apparue à la ligne %1, colonne %2 du code XML spécifiant le widget %3 : %4 %5 - The XML code specified for the widget %1 does not contain any widget elements. %2 Le code XML spécifié pour le widget %1 ne contient aucun élément widget. @@ -6280,73 +5158,58 @@ Classe : %2 qdesigner_internal::QtGradientStopsController - H T - S S - V V - - Hue Teinte - Sat Sat - Val Val - Saturation Saturation - Value Valeur - R R - G V - B B - Red Rouge - Green Vert - Blue Bleu @@ -6354,27 +5217,22 @@ Classe : %2 qdesigner_internal::RichTextEditorDialog - Edit text Éditer le texte - Rich Text Texte riche - Source Source - &OK &OK - &Cancel &Annuler @@ -6382,72 +5240,58 @@ Classe : %2 qdesigner_internal::RichTextEditorToolBar - Bold Gras - CTRL+B CTRL+B - Italic Italique - CTRL+I CTRL+I - Underline Souligné - CTRL+U CTRL+U - Left Align Aligner à gauche - Center Centrer - Right Align Aligner à droite - Justify Justifier - Superscript Exposant - Subscript Indice - Insert &Link Insérer &lien - Insert &Image Insérer &image @@ -6455,17 +5299,14 @@ Classe : %2 qdesigner_internal::ScriptDialog - Edit script Éditer le script - <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. <html>Entrez un snippet de code Qt Script à exécuter lors du chargement du formulaire.<br>Le widget et ses enfants sont accessibles via les variables <i>widget</i> et <i>childWidgets</i>, respectivement. - Syntax error Erreur de syntaxe @@ -6473,7 +5314,6 @@ Classe : %2 qdesigner_internal::ScriptErrorDialog - Script errors Erreurs de script @@ -6481,23 +5321,18 @@ Classe : %2 qdesigner_internal::SignalSlotDialog - There is already a slot with the signature '%1'. Un slot existe déjà avec la signature '%1'. - There is already a signal with the signature '%1'. Un signal existe déjà avec la signature '%1'. - %1 - Duplicate Signature %1 - Signature double - - Signals/Slots of %1 Signaux/slots de %1 @@ -6505,12 +5340,10 @@ Classe : %2 qdesigner_internal::SignalSlotEditorPlugin - Edit Signals/Slots Éditer signaux/slots - F4 F4 @@ -6518,7 +5351,6 @@ Classe : %2 qdesigner_internal::SignalSlotEditorTool - Edit Signals/Slots Éditer signaux/slots @@ -6526,7 +5358,6 @@ Classe : %2 qdesigner_internal::StatusBarTaskMenu - Remove Supprimer @@ -6534,7 +5365,6 @@ Classe : %2 qdesigner_internal::StringListEditorButton - Change String List Modifier la liste de chaîne de caractères @@ -6542,38 +5372,30 @@ Classe : %2 qdesigner_internal::StyleSheetEditorDialog - - Valid Style Sheet Feuille de style valide - Add Resource... Ajouter ressource... - Add Gradient... Ajouter gradient... - Add Color... Ajouter couleur... - Add Font... Ajouter police... - Edit Style Sheet Éditer feuille de style - Invalid Style Sheet Feuille de style invalide @@ -6581,27 +5403,22 @@ Classe : %2 qdesigner_internal::TabOrderEditor - Start from Here Démarrer à partir d'ici - Restart Redémarrer - Tab Order List... Ordre de la liste de tabulation... - Tab Order List Ordre de la liste de tabulation - Tab Order Ordre des tabulations @@ -6609,7 +5426,6 @@ Classe : %2 qdesigner_internal::TabOrderEditorPlugin - Edit Tab Order Éditer l'ordre des tabulations @@ -6617,7 +5433,6 @@ Classe : %2 qdesigner_internal::TabOrderEditorTool - Edit Tab Order Éditer l'ordre des tabulations @@ -6625,48 +5440,38 @@ Classe : %2 qdesigner_internal::TableWidgetEditor - Edit Table Widget Éditer le widget de table - &Items &Éléments - Table Items Éléments de la table - - Properties &>> Propriétés &>> - New Column Nouvelle colonne - New Row Nouvelle ligne - &Columns &Colonne - &Rows &Lignes - Properties &<< Propriétés &<< @@ -6674,7 +5479,6 @@ Classe : %2 qdesigner_internal::TableWidgetTaskMenu - Edit Items... Éditer les éléments... @@ -6682,23 +5486,18 @@ Classe : %2 qdesigner_internal::TemplateOptionsWidget - Form Formulaire - Additional Template Paths Chemins de modèles additionnels - - ... ... - Pick a directory to save templates in Choisir un répertoire où enregistrer les modèles @@ -6706,22 +5505,18 @@ Classe : %2 qdesigner_internal::TextEditTaskMenu - Edit HTML Éditer le HTML - Change HTML... Modifier le HTML... - Edit Text Éditer le texte - Change Plain Text... Modifier le texte simple... @@ -6729,22 +5524,18 @@ Classe : %2 qdesigner_internal::TextEditor - Choose Resource... Choisir ressource... - Choose File... Choisir fichier... - ... ... - Choose a File Choisir un fichier @@ -6752,27 +5543,22 @@ Classe : %2 qdesigner_internal::ToolBarEventFilter - Insert Separator before '%1' Insérer un séparateur avant '%1' - Append Separator Ajouter un séparateur à la fin - Remove action '%1' Supprimer l'action '%1' - Remove Toolbar '%1' Supprimer la barre d'outils '%1' - Insert Separator Insérer un séparateur @@ -6780,125 +5566,98 @@ Classe : %2 qdesigner_internal::TreeWidgetEditor - Edit Tree Widget Éditer un widget d'arborescence - &Items &Éléments - Tree Items Élément de l'arbre - 1 1 - - New Item Nouvel élément - &New &Nouveau - - New Subitem Nouveau sous-élément - New &Subitem Nouveau &sous-élément - Delete Item Supprimer l'élément - &Delete &Supprimer - Move Item Left (before Parent Item) Déplacer l'élément à gauche (avant l'élément parent) - L G - Move Item Right (as a First Subitem of the Next Sibling Item) Déplacer l'élément sur la droite (comme un premier sous-élément de l'élément à droite) - R D - Move Item Up Déplacer l'élément vers le haut - U H - Move Item Down Déplacer l'élément vers le bas - D B - - Properties &>> Propriétés &>> - New Column Nouvelle colonne - &Columns &Colonnes - Per column properties Propriétés par colonnes - Common properties Propritétés de colonnes - Properties &<< Propriétés &<< @@ -6906,7 +5665,6 @@ Classe : %2 qdesigner_internal::TreeWidgetTaskMenu - Edit Items... Éditer les éléments... @@ -6914,7 +5672,6 @@ Classe : %2 qdesigner_internal::WidgetBox - Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. Avertissement : La création du widget a échoué dans la boîte de widget. Ceci peut être causé par un code XML invalide d'un widget personnalisé. @@ -6922,42 +5679,34 @@ Classe : %2 qdesigner_internal::WidgetBoxTreeWidget - Scratchpad bloc-notes - Custom Widgets Widgets personnalisés - Expand all Tout étendre - Collapse all Tout replier - List View Vue de liste - Icon View Vue en icônes - Remove Supprimer - Edit name Éditer le nom @@ -6965,7 +5714,6 @@ Classe : %2 qdesigner_internal::WidgetDataBase - A custom widget plugin whose class name (%1) matches that of an existing class has been found. Un plugin de widgets personnalisés dont un nom de classe (%1) correspond à une classe existante à été trouvé. @@ -6973,7 +5721,6 @@ Classe : %2 qdesigner_internal::WidgetEditorTool - Edit Widgets Éditer les widgets @@ -6981,34 +5728,28 @@ Classe : %2 qdesigner_internal::WidgetFactory - The custom widget factory registered for widgets of class %1 returned 0. La fabrique (factory) de widget personnalisé, enregistrée pour les widgets de classe %1, a retourné 0. - A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. Une discordance de nom de classe est apparue lors de la création d'un nouveau widget à l'aide de la fabrique de widget personnalisé enregistrée pour la classe %1. La fabrique a retourné un widget de classe %2. - %1 Widget %1 Widget - The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. Le conteneur '%1' de la page courante (%2) n'a pas pu être déterminé lors de la création du layout. Ceci indique une incohérence dans le fichier ui, probablement un layout étant construit sur un widget conteneur. - Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. This indicates an inconsistency in the ui-file. Temptative d'ajout d'un layout sur le widget '%1' (%2) qui a déjà un layout non pris en charge de type %3. Ceci indique une inconsistance dans le fichier ui. - Cannot create style '%1'. Impossible de créer le style '%1'. @@ -7016,12 +5757,10 @@ Ceci indique une inconsistance dans le fichier ui. qdesigner_internal::WizardContainerWidgetTaskMenu - Next Suivant - Back Précédent @@ -7029,7 +5768,6 @@ Ceci indique une inconsistance dans le fichier ui. qdesigner_internal::ZoomMenu - %1 % Zoom factor %1 % @@ -7038,7 +5776,6 @@ Ceci indique une inconsistance dans le fichier ui. qdesigner_internal::ZoomablePreviewDeviceSkin - &Zoom &Zoom diff --git a/translations/linguist_fr.ts b/translations/linguist_fr.ts index 873adb7..5b98904 100644 --- a/translations/linguist_fr.ts +++ b/translations/linguist_fr.ts @@ -4,7 +4,6 @@ - (New Entry) @@ -12,7 +11,6 @@ AboutDialog - Qt Linguist @@ -20,89 +18,72 @@ BatchTranslationDialog - Batch Translation of '%1' - Qt Linguist - Searching, please wait... - &Cancel - Linguist batch translator - Batch translated %n entries - Qt Linguist - Batch Translation - Options - Set translated entries to finished - Retranslate entries with existing translation - Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked. - Translate also finished entries - Phrase book preference - Move up - Move down - The batch translator will search through the selected phrase books in the order given above. - &Run - Cancel @@ -110,38 +91,31 @@ DataModel - <qt>Duplicate messages found in '%1': - <p>[more duplicates omitted] - <p>* Context: %1<br>* Source: %2 - <br>* Comment: %3 - Linguist does not know the plural rules for '%1'. Will assume a single universal form. - Cannot create '%2': %1 - Universal Form @@ -149,37 +123,30 @@ Will assume a single universal form. ErrorsView - Accelerator possibly superfluous in translation. - Accelerator possibly missing in translation. - Translation does not end with the same punctuation as the source text. - A phrase book suggestion for '%1' was ignored. - Translation does not refer to the same place markers as in the source text. - Translation does not contain the necessary %n place marker. - Unknown error @@ -187,98 +154,79 @@ Will assume a single universal form. FindDialog - Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog - This window allows you to search for some text in the translation source file. - Type in the text to search for. - Options - Source texts are searched when checked. - Translations are searched when checked. - Texts such as 'TeX' and 'tex' are considered as different when checked. - Comments and contexts are searched when checked. - Find - &Find what: - &Source texts - &Translations - &Match case - &Comments - Ignore &accelerators - Click here to find the next occurrence of the text you typed in. - Find Next - Click here to close this window. - Cancel @@ -286,7 +234,6 @@ Will assume a single universal form. LRelease - Generated %n translation(s) (%1 finished and %2 unfinished) @@ -294,7 +241,6 @@ Will assume a single universal form. - Ignored %n untranslated source text(s) @@ -305,1121 +251,868 @@ Will assume a single universal form. MainWindow - MainWindow - &Phrases - &Close Phrase Book - &Edit Phrase Book - &Print Phrase Book - V&alidation - &View - Vie&ws - &Toolbars - &Help - &Translation - &File - &Edit - &Open... - Open a Qt translation source file (TS file) for editing - Ctrl+O - E&xit - Close this window and exit. - Ctrl+Q - - &Save - Save changes made to this Qt translation source file - Previous unfinished item. - Move to the previous unfinished item. - Next unfinished item. - Move to the next unfinished item. - Move to previous item. - Move to the previous item. - Next item. - Move to the next item. - Mark item as done and move to the next unfinished item. - Mark this item as done and move to the next unfinished item. - Copy from source text - Toggle the validity check of accelerators. - Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. - Toggle the validity check of ending punctuation. - Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. - Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. - Toggle the validity check of place markers. - Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. - Open Read-O&nly... - &Save All - Ctrl+S - - - Save &As... - Save As... - Save changes made to this Qt translation source file into a new file. - &Release - Create a Qt message file suitable for released applications from the current message file. - &Print... - Ctrl+P - &Undo - Recently Opened &Files - Save - Print a list of all the translation units in the current translation source file. - Undo the last editing operation performed on the current translation. - Ctrl+Z - &Redo - Redo an undone editing operation performed on the translation. - Ctrl+Y - Cu&t - Copy the selected translation text to the clipboard and deletes it. - Ctrl+X - &Copy - Copy the selected translation text to the clipboard. - Ctrl+C - &Paste - Paste the clipboard text into the translation. - Ctrl+V - Select &All - Select the whole translation text. - Ctrl+A - &Find... - Search for some text in the translation source file. - Ctrl+F - Find &Next - Continue the search where it was left. - F3 - &Prev Unfinished - Close - &Close All - Ctrl+W - Ctrl+K - &Next Unfinished - P&rev - Ctrl+Shift+K - Ne&xt - &Done and Next - Copies the source text into the translation field. - Ctrl+B - &Accelerators - &Ending Punctuation - &Phrase matches - Toggle checking that phrase suggestions are used. - Place &Marker Matches - &New Phrase Book... - Create a new phrase book. - Ctrl+N - &Open Phrase Book... - Open a phrase book to assist translation. - Ctrl+H - &Reset Sorting - Sort the items back in the same order as in the message file. - &Display guesses - Set whether or not to display translation guesses. - &Statistics - Display translation statistics. - &Manual - F1 - About Qt Linguist - About Qt - Display information about the Qt toolkit by Trolltech. - &What's This? - What's This? - Enter What's This? mode. - Shift+F1 - &Search And Translate... - Replace the translation on all entries that matches the search source text. - - &Batch Translation... - Batch translate all entries using the information in the phrase books. - - - Release As... - Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the .ts file. - This is the application's main window. - Source text - - Index - - Context - Items - This panel lists the source contexts. - Strings - Phrases and guesses - Sources and Forms - Warnings - MOD status bar: file(s) modified - Loading... - - Loading File - Qt Linguist - The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? - The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? - %n translation unit(s) loaded. - Related files (%1);; - Open Translation Files - - File saved. - - - Release - Qt message files for released applications (*.qm) All files (*) - - File created. - - Printing... - Context: %1 - finished - unresolved - obsolete - - Printing... (page %1) - - Printing completed - - Printing aborted - Search wrapped. - - - - - - - - - - Qt Linguist - - Cannot find the string '%1'. - Search And Translate in '%1' - Qt Linguist - - - Translate - Qt Linguist - Translated %n entry(s) - No more occurrences of '%1'. Start over? - Create New Phrase Book - Qt phrase books (*.qph) All files (*) - Phrase book created. - Open Phrase Book - Qt phrase books (*.qph);;All files (*) - %n phrase(s) loaded. - - - Add to phrase book - No appropriate phrasebook found. - Adding entry to phrasebook %1 - Select phrase book to add to - Unable to launch Qt Assistant (%1) - Version %1 - <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> - Do you want to save the modified files? - Do you want to save '%1'? - Qt Linguist[*] - %1[*] - Qt Linguist - - No untranslated translation units left. - &Window - Minimize - Ctrl+M - Display the manual for %1. - Display information about %1. - &Save '%1' - Save '%1' &As... - Release '%1' - Release '%1' As... - &Close '%1' - - &Close - Save All - - &Release All - Close All - Translation File &Settings for '%1'... - &Batch Translation of '%1'... - Search And &Translate in '%1'... - Search And &Translate... - - File - - Edit - - Translation - - Validation - - Help - Cannot read from phrase book '%1'. - Close this phrase book. - Enables you to add, modify, or delete entries in this phrase book. - Print the entries in this phrase book. - Cannot create phrase book '%1'. - Do you want to save phrase book '%1'? - All - Open/Refresh Form &Preview - Form Preview Tool - F5 - - Translation File &Settings... - &Add to Phrase Book - Ctrl+T - Ctrl+J - Ctrl+Shift+J @@ -1427,92 +1120,74 @@ All files (*) MessageEditor - German - Japanese - French - Polish - Chinese - This whole panel allows you to view and edit the translation of some source text. - Source text - This area shows the source text. - Source text (Plural) - This area shows the plural form of the source text. - Developer comments - This area shows a comment that may guide you, and the context in which the text occurs. - Here you can enter comments for your own use. They have no effect on the translated applications. - %1 translation (%2) - This is where you can enter or modify the translation of the above source text. - %1 translation - %1 translator comments - '%1' Line: %2 @@ -1521,22 +1196,18 @@ Line: %2 MessageModel - Completion status for %1 - <file header> - <context comment> - <unnamed context> @@ -1544,7 +1215,6 @@ Line: %2 MsgEdit - This is the right panel of the main window. @@ -1553,108 +1223,87 @@ Line: %2 PhraseBookBox - Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. - %1[*] - Qt Linguist - Qt Linguist - Cannot save phrase book '%1'. - Edit Phrase Book - This window allows you to add, modify, or delete entries in a phrase book. - &Translation: - This is the phrase in the target language corresponding to the source phrase. - S&ource phrase: - This is a definition for the source phrase. - This is the phrase in the source language. - &Definition: - Click here to add the phrase to the phrase book. - &New Entry - Click here to remove the entry from the phrase book. - &Remove Entry - Settin&gs... - Click here to save the changes made. - &Save - Click here to close this window. - Close @@ -1662,17 +1311,14 @@ Line: %2 PhraseModel - Source phrase - Translation - Definition @@ -1680,22 +1326,18 @@ Line: %2 PhraseView - Insert - Edit - Guess (%1) - Guess @@ -1703,83 +1345,62 @@ Line: %2 QObject - Compiled Qt translations - Translation files (%1);; - All files (*) - - - - - - - Qt Linguist - C++ source files - Java source files - GNU Gettext localization files - Qt Script source files - Qt translation sources (format 1.1) - Qt translation sources (format 2.0) - Qt translation sources (latest format) - Qt Designer form files - Qt Jambi form files - XLIFF localization files - Qt Linguist 'Phrase Book' @@ -1787,17 +1408,14 @@ Line: %2 SourceCodeView - <i>Source code not available</i> - <i>File %1 not available</i> - <i>File %1 not readable</i> @@ -1805,42 +1423,34 @@ Line: %2 Statistics - Statistics - Translation - Source - 0 - Words: - Characters: - Characters (with spaces): - Close @@ -1848,7 +1458,6 @@ Line: %2 TrWindow - This is the application's main window. @@ -1857,72 +1466,58 @@ Line: %2 TranslateDialog - This window allows you to search for some text in the translation source file. - Type in the text to search for. - Find &source text: - &Translate to: - Search options - Texts such as 'TeX' and 'tex' are considered as different when checked. - Match &case - Mark new translation as &finished - Click here to find the next occurrence of the text you typed in. - Find Next - Translate - Translate All - Click here to close this window. - Cancel @@ -1930,33 +1525,26 @@ Line: %2 TranslationSettingsDialog - Any Country - - Settings for '%1' - Qt Linguist - Source language - Language - Country/Region - Target language diff --git a/translations/qt_fr.ts b/translations/qt_fr.ts index 77feab6..2a4135b 100644 --- a/translations/qt_fr.ts +++ b/translations/qt_fr.ts @@ -2,59 +2,18 @@ - MAC_APPLICATION_MENU - - - Services - Services - - - - Hide %1 - Masquer %1 - - - - Hide Others - Masquer les autres - - - - Show All - Tout afficher - - - - Preferences... - Préférences… - - - - Quit %1 - Quitter %1 - - - - About %1 - À propos de %1 - - - AudioOutput - <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> - <html>Le périphérique audio <b>%1</b> ne fonctionne pas.<br/>Utilisation de <b>%2</b>.</html> + <html>Le périphérique audio <b>%1</b> ne fonctionne pas.<br/>Utilisation de <b>%2</b>.</html> - <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> - <html>Utilisation de <b>%1</b><br/>qui vient de devenir disponible et a une plus grande priorité.</html> + <html>Utilisation de <b>%1</b><br/>qui vient de devenir disponible et a une plus grande priorité.</html> - Revert back to device '%1' - Utilisation de '%1' + Utilisation de '%1' @@ -107,6 +66,48 @@ + FakeReply + + Fake error ! + Fausse erreur! + + + Invalid URL + URL non valide + + + + MAC_APPLICATION_MENU + + Services + Services + + + Hide %1 + Masquer %1 + + + Hide Others + Masquer les autres + + + Show All + Tout afficher + + + Preferences... + Préférences… + + + Quit %1 + Quitter %1 + + + About %1 + À propos de %1 + + + MainWindow Print @@ -200,6 +201,25 @@ so on. + Phonon::AudioOutput + + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> + <html>Le périphérique audio <b>%1</b> ne fonctionne pas.<br/>Repli sur <b>%2</b>.</html> + + + <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> + <html>Basculement vers le périphérique audio <b>%1</b><br/>qui vient juste d'être disponible et dont le niveau de préférence est plus élevé.</html> + + + Revert back to device '%1' + Revenir au périphérique '%1' + + + <html>Switching to the audio playback device <b>%1</b><br/>which has higher preference or is specifically configured for this stream.</html> + <html>Basculement vers le périphérique audio <b>%1</b><br/>dont le niveau de préférence est plus élevé ou qui est spécifiquement configuré pour ce flux.</html> + + + Phonon::Gstreamer::Backend Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. @@ -217,12 +237,11 @@ Le support audio et vidéo est désactivé Phonon::Gstreamer::MediaObject - Cannot start playback. Check your Gstreamer installation and make sure you have libgstreamer-plugins-base installed. - Impossible de démarrer la lecture. Verifiez votre installation de Gstreamer et assurez-vous d'avoir installé libgstreamer-plugins-base. + Impossible de démarrer la lecture. Verifiez votre installation de Gstreamer et assurez-vous d'avoir installé libgstreamer-plugins-base. Unknown media format: %1 @@ -257,6 +276,15 @@ have libgstreamer-plugins-base installed. Impossible de charger la source + Missing codec helper script assistant. + ??? + Assistant de script d'aide au codec manquant. + + + Plugin codec installation failed for codec: %0 + Échec de l'installation du plugin pour le codec : %0 + + A required codec is missing. You need to install the following codec(s) to play this content: %0 Un codec requis est manquant. Vous devez installer le codec suivant pour jouer le contenu: %0 @@ -292,9278 +320,10613 @@ d'avoir installé libgstreamer-plugins-base. - Phonon::VolumeSlider + Phonon::MMF - Volume: %1% - Volume: %1% + Audio Output + Sortie audio - Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% - Utilisez le slider pour ajuster le volume. La position la plus à gauche est 0%, la plus à droite est %1% + The audio output device + Périphérique audio de sortie - Muted - Son coupé + No error + Aucune erreur - - - Q3Accel - %1, %2 not defined - La séquence %1, %2 n'est pas définie + Not found + Introuvable - Ambiguous %1 not handled - Séquence ambiguë %1 non traitée + Out of memory + Mémoire insuffisante - - - Q3DataTable - True - Vrai + Not supported + Non supporté - False - Faux + Overflow + Dépassement - Insert - Insérer + Underflow + Soupassement - Update - Actualiser + Already exists + Existe déjà - Delete - Supprimer + Path not found + Chemin introuvable - - - Q3FileDialog - Copy or Move a File - Copie ou déplace un fichier + In use + Utilisé - Read: %1 - Lecture : %1 + Not ready + Pas prêt - Write: %1 - Écriture : %1 + Access denied + Accès refusé - Cancel - Annuler + Could not connect + Connexion impossible - All Files (*) - Tous les fichiers (*) + Disconnected + Déconnecté - Name - Nom + Permission denied + Autorisation refusée - Size - Taille + Insufficient bandwidth + Bande passante insuffisante - Type - Type + Network unavailable + Réseau non disponible - Date - Date + Network communication error + Erreur de communication réseau - Attributes - Attributs + Streaming not supported + Streaming non supporté - &OK - &OK + Server alert + Alerte serveur - Look &in: - Chercher &dans : + Invalid protocol + Protocole non valide - File &name: - &Nom de fichier : + Invalid URL + URL non valide - File &type: - &Type de fichier : + Multicast error + Erreur multicast - Back - Précédent (historique) + Proxy server error + Erreur du serveur proxy - One directory up - Aller au dossier parent + Proxy server not supported + Serveur proxy non supporté - Create New Folder - Créer un nouveau dossier + Audio output error + Erreur de sortie audio - List View - Affichage liste + Video output error + Erreur de sortie vidéo - Detail View - Affichage détaillé + Decoder error + Erreur du décodeur - Preview File Info - Informations du fichier prévisualisé + Audio or video components could not be played + Les composants audio ou vidéo n'ont pas pu être lus - Preview File Contents - Contenu du fichier prévisualisé + DRM error + Erreur GDN - Read-write - Lecture-écriture + Unknown error (%1) + Erreur inconnue (%1) + + + Phonon::MMF::AbstractMediaPlayer - Read-only - Lecture seule + Not ready to play + Pas prêt pour lecture - Write-only - Écriture seule + Error opening file + Erreur lors de l'ouverture du fichier - Inaccessible - Inaccessible + Error opening URL + Erreur lors de l'ouverture de l'URL - Symlink to File - Lien symbolique vers un fichier + Setting volume failed + Le réglage du volume a échoué - Symlink to Directory - Lien symbolique vers un dossier + Loading clip failed + Échec de l'ouverture du clip - Symlink to Special - Lien symbolique vers un fichier spécial + Playback complete + Lecture terminée + + + Phonon::MMF::AbstractVideoPlayer - File - Fichier + Pause failed + La mise en pause a échoué - Dir - Dossier + Seek failed + La recherche a échoué - Special - Fichier spécial + Getting position failed + L'obtention de la position a échoué - Open - Ouvrir + Opening clip failed + L'ouverture du clip a échoué + + + Phonon::MMF::AudioEqualizer - Save As - Enregistrer sous + %1 Hz + %1 Hz + + + Phonon::MMF::AudioPlayer - &Open - &Ouvrir + Getting position failed + L'obtention de la position a échoué - &Save - &Enregistrer + Opening clip failed + L'ouverture du clip a échoué + + + Phonon::MMF::DsaVideoPlayer - &Rename - &Renommer + Video display error + Erreur de l'affichage vidéo + + + Phonon::MMF::EffectFactory - &Delete - Suppri&mer + Enabled + Activé + + + Phonon::MMF::EnvironmentalReverb - R&eload - R&echarger + Decay HF ratio (%) + DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime. + Ratio HF du déclin (%) - Sort by &Name - Trier par &nom + Decay time (ms) + DecayTime: Time over which reverberation is diminished. + Temps de déclin (ms) - Sort by &Size - Trier par ta&ille + Density (%) + Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value. + Densité (%) - Sort by &Date - Trier par &date + Diffusion (%) + Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value. + Diffusion (%) - &Unsorted - &Non trié + Reflections delay (ms) + ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection. + Délai réflexions (ms) - Sort - Tri + Reflections level (mB) + ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude. + Niveau réflexions (mB) - Show &hidden files - Afficher les fic&hiers cachés + Reverb delay (ms) + ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation. + Délai de réverbération (ms) - the file - le fichier + Reverb level (mB) + ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude. + Niveau de réverbération (mB) - the directory - le dossier + Room HF level + RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound. + Niveau HF pièce - the symlink - le lien symbolique + Room level (mB) + RoomLevel: Master volume control for all reflected sound. + Niveau pièce (mB) + + + Phonon::MMF::MediaObject - Delete %1 - Supprimer %1 + Error opening source: type not supported + Erreur lors de l'ouverture de la source: type non supporté - <qt>Are you sure you wish to delete %1 "%2"?</qt> - <qt>Voulez-vous vraiment supprimer %1 "%2" ?</qt> + Error opening source: media type could not be determined + Erreur lors de l'ouverture de la source: type de média non déterminé + + + Phonon::MMF::StereoWidening - &Yes - &Oui + Level (%) + Niveau (%) + + + Phonon::MMF::SurfaceVideoPlayer - &No - &Non + Video display error + Erreur de l'affichage vidéo + + + Phonon::MMF::VideoPlayer - New Folder 1 - Nouveau dossier 1 + Pause failed + La mise en pause a échoué - New Folder - Nouveau dossier + Seek failed + La recherche a échoué - New Folder %1 - Nouveau dossier %1 + Getting position failed + L'obtention de la position a échoué - Find Directory - Chercher dans le dossier + Opening clip failed + L'ouverture du clip a échoué - Directories - Dossiers + Buffering clip failed + La mise en mémoire tampon du clip a échoué - Directory: - Dossier : + Video display error + Erreur de l'affichage vidéo + + + Phonon::VolumeSlider - Error - Erreur + Volume: %1% + Volume: %1% - %1 -File not found. -Check path and filename. - %1 -Impossible de trouver le fichier. -Vérifier le chemin et le nom du fichier. + Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% + Utilisez le slider pour ajuster le volume. La position la plus à gauche est 0%, la plus à droite est %1% - All Files (*.*) - Tous les fichiers (*.*) + Muted + Son coupé + + + Q3Accel - Open - Ouvrir + %1, %2 not defined + La séquence %1, %2 n'est pas définie - Select a Directory - Sélectionner un dossier + Ambiguous %1 not handled + Séquence ambiguë %1 non traitée - Q3LocalFs - - Could not read directory -%1 - Impossible de lire le dossier -%1 - + Q3DataTable - Could not create directory -%1 - Impossible de créer le dossier -%1 + True + Vrai - Could not remove file or directory -%1 - Impossible de supprimer le fichier ou dossier -%1 + False + Faux - Could not rename -%1 -to -%2 - Impossible de renommer -%1 -en -%2 + Insert + Insérer - Could not open -%1 - Impossible d'ouvrir -%1 + Update + Actualiser - Could not write -%1 - Impossible d'écrire -%1 + Delete + Supprimer - Q3MainWindow + Q3FileDialog - Line up - Aligner + Copy or Move a File + Copie ou déplace un fichier - Customize... - Personnaliser... + Read: %1 + Lecture : %1 - - - Q3NetworkProtocol - Operation stopped by the user - Opération interrompue par l'utilisateur + Write: %1 + Écriture : %1 - - - Q3ProgressDialog Cancel Annuler - - - Q3TabDialog - OK - OK + All Files (*) + Tous les fichiers (*) - Apply - Appliquer + Name + Nom - Help - Aide + Size + Taille - Defaults - Par défaut + Type + Type - Cancel - Annuler + Date + Date - - - Q3TextEdit - &Undo - &Annuler + Attributes + Attributs - &Redo - &Rétablir + &OK + &OK - Cu&t - Co&uper + Look &in: + Chercher &dans : - &Copy - Cop&ier + File &name: + &Nom de fichier : - &Paste - Co&ller + File &type: + &Type de fichier : - Clear - Effacer + Back + Précédent (historique) - Select All - Tout sélectionner + One directory up + Aller au dossier parent - - - Q3TitleBar - System - Système + Create New Folder + Créer un nouveau dossier - Restore up - Restaurer en haut + List View + Affichage liste - Minimize - Réduire + Detail View + Affichage détaillé - Restore down - Restaurer en bas + Preview File Info + Informations du fichier prévisualisé - Maximize - Maximiser + Preview File Contents + Contenu du fichier prévisualisé - Close - Fermer + Read-write + Lecture-écriture - Contains commands to manipulate the window - Contient des commandes pour manipuler la fenêtre + Read-only + Lecture seule - - Puts a minimized back to normal - Rend à une fenêtre minimisée son aspect normal + Write-only + Écriture seule - Moves the window out of the way - Déplace la fenêtre à l'écart + Inaccessible + Inaccessible - Puts a maximized window back to normal - Rend à une fenêtre minimisée son aspect normal + Symlink to File + Lien symbolique vers un fichier - Makes the window full screen - Affiche la fenêtre en plein écran + Symlink to Directory + Lien symbolique vers un dossier - Closes the window - Ferme la fenêtre + Symlink to Special + Lien symbolique vers un fichier spécial - Displays the name of the window and contains controls to manipulate it - Affiche le nom de la fenêtre et contient des contrôles pour la manipuler + File + Fichier - Puts a minimized window back to normal - Rend à une fenêtre minimisée son aspect normal + Dir + Dossier - - - Q3ToolBar - More... - Reste... + Special + Fichier spécial - - - Q3UrlOperator - The protocol `%1' is not supported - Le protocole '%1' n'est pas géré + Open + Ouvrir - The protocol `%1' does not support listing directories - Le protocole `%1' ne permet pas de lister les fichiers d'un dossier + Save As + Enregistrer sous - The protocol `%1' does not support creating new directories - Le protocole `%1' ne permet pas de créer de nouveaux dossiers + &Open + &Ouvrir - The protocol `%1' does not support removing files or directories - Le protocole `%1' ne permet pas de supprimer des fichiers ou des dossiers + &Save + &Enregistrer - The protocol `%1' does not support renaming files or directories - Le protocole `%1' ne permet pas de renommer des fichiers ou des dossiers + &Rename + &Renommer - The protocol `%1' does not support getting files - Le protocole `%1' ne permet pas de recevoir des fichiers + &Delete + Suppri&mer - The protocol `%1' does not support putting files - Le protocole `%1' ne permet pas d'envoyer des fichiers + R&eload + R&echarger - The protocol `%1' does not support copying or moving files or directories - Le protocole `%1' ne permet pas de copier ou de déplacer des fichiers + Sort by &Name + Trier par &nom - (unknown) - (inconnu) + Sort by &Size + Trier par ta&ille - - - Q3Wizard - &Cancel - &Annuler + Sort by &Date + Trier par &date - < &Back - < &Précédent + &Unsorted + &Non trié - &Next > - &Suivant > + Sort + Tri - &Finish - &Terminer + Show &hidden files + Afficher les fic&hiers cachés - &Help - &Aide + the file + le fichier - - - QAbstractSocket - Host not found - Hôte introuvable + the directory + le dossier - Connection refused - Connexion refusée + the symlink + le lien symbolique - Connection timed out - Connexion expirée + Delete %1 + Supprimer %1 - Operation on socket is not supported - Opération sur socket non supportée + <qt>Are you sure you wish to delete %1 "%2"?</qt> + <qt>Voulez-vous vraiment supprimer %1 "%2" ?</qt> - Socket operation timed out - Opération socket expirée + &Yes + &Oui - Socket is not connected - Le socket n'est pas connecté + &No + &Non - Network unreachable - Réseau impossible à rejoindre + New Folder 1 + Nouveau dossier 1 - - - QAbstractSpinBox - &Step up - &Augmenter + New Folder + Nouveau dossier - Step &down - &Diminuer + New Folder %1 + Nouveau dossier %1 - &Select All - Tout &sélectionner + Find Directory + Chercher dans le dossier - - - QApplication - - QT_LAYOUT_DIRECTION - Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. - LTR + Directories + Dossiers - Executable '%1' requires Qt %2, found Qt %3. - L'exécutable '%1' requiert Qt %2 (Qt %3 présent). + Directory: + Dossier : - Incompatible Qt Library Error - Erreur : bibliothèque Qt incompatible + Error + Erreur - Activate - Activer + %1 +File not found. +Check path and filename. + %1 +Impossible de trouver le fichier. +Vérifier le chemin et le nom du fichier. - Activates the program's main window - Active la fenêtre principale du programme + All Files (*.*) + Tous les fichiers (*.*) - QT_LAYOUT_DIRECTION - LTR + Open + Ouvrir - - - QAxSelect - Select ActiveX Control - Sélectionner un contrôle ActiveX + Select a Directory + Sélectionner un dossier + + + Q3LocalFs - OK - OK + Could not read directory +%1 + Impossible de lire le dossier +%1 - &Cancel - &Annuler + Could not create directory +%1 + Impossible de créer le dossier +%1 - COM &Object: - &Objet COM : + Could not remove file or directory +%1 + Impossible de supprimer le fichier ou dossier +%1 - - - QCheckBox - Uncheck - Décocher + Could not rename +%1 +to +%2 + Impossible de renommer +%1 +en +%2 - Check - Cocher + Could not open +%1 + Impossible d'ouvrir +%1 - Toggle - Changer + Could not write +%1 + Impossible d'écrire +%1 - QColorDialog + Q3MainWindow - Hu&e: - &Teinte : + Line up + Aligner - &Sat: - &Saturation : + Customize... + Personnaliser... + + + Q3NetworkProtocol - &Val: - &Valeur : + Operation stopped by the user + Opération interrompue par l'utilisateur + + + Q3ProgressDialog - &Red: - &Rouge : + Cancel + Annuler + + + Q3TabDialog - &Green: - &Vert : + OK + OK - Bl&ue: - Ble&u : + Apply + Appliquer - A&lpha channel: - Canal a&lpha : + Help + Aide - Select Color - Sélectionner une couleur + Defaults + Par défaut - &Basic colors - Couleurs de &base + Cancel + Annuler + + + Q3TextEdit - &Custom colors - &Couleurs personnalisées + &Undo + &Annuler - &Define Custom Colors >> - Définir des &couleurs personnalisées >> + &Redo + &Rétablir - OK - OK + Cu&t + Co&uper - Cancel - Annuler + &Copy + Cop&ier - &Add to Custom Colors - &Ajouter aux couleurs personnalisées + &Paste + Co&ller - Select color - Sélection d'une couleur + Clear + Effacer + + + Select All + Tout sélectionner - QComboBox + Q3TitleBar - Open - Ouvrir + System + Système - False - Faux + Restore up + Restaurer en haut - True - Vrai + Minimize + Réduire - Close - Fermer + Restore down + Restaurer en bas - - - QCoreApplication - %1: permission denied - QSystemSemaphore - %1: permission refusée + Maximize + Maximiser - %1: already exists - QSystemSemaphore - %1: existe déjà + Close + Fermer - %1: doesn't exists - QSystemSemaphore - %1: n'existe pas + Contains commands to manipulate the window + Contient des commandes pour manipuler la fenêtre - %1: out of resources - QSystemSemaphore - %1: plus de ressources disponibles + Puts a minimized back to normal + Rend à une fenêtre minimisée son aspect normal - %1: unknown error %2 - QSystemSemaphore - %1: erreur inconnue %2 + Moves the window out of the way + Déplace la fenêtre à l'écart - - %1: key is empty - QSystemSemaphore - %1: clé vide + Puts a maximized window back to normal + Rend à une fenêtre minimisée son aspect normal - - %1: unable to make key - QSystemSemaphore - %1: impossible de créer la clé + Makes the window full screen + Affiche la fenêtre en plein écran - - %1: ftok failed - QSystemSemaphore - %1: ftok a échoué + Closes the window + Ferme la fenêtre - %1: key is empty - %1: clé vide + Displays the name of the window and contains controls to manipulate it + Affiche le nom de la fenêtre et contient des contrôles pour la manipuler - %1: unable to make key - %1: impossible de créer la clé + Puts a minimized window back to normal + Rend à une fenêtre minimisée son aspect normal + + + Q3ToolBar - %1: ftok failed - %1: ftok a échoué + More... + Reste... + + + Q3UrlOperator - %1: already exists - %1: existe déjà + The protocol `%1' is not supported + Le protocole '%1' n'est pas géré - %1: does not exist - %1: n'existe pas + The protocol `%1' does not support listing directories + Le protocole `%1' ne permet pas de lister les fichiers d'un dossier - %1: out of resources - %1: plus de ressources disponibles + The protocol `%1' does not support creating new directories + Le protocole `%1' ne permet pas de créer de nouveaux dossiers - %1: unknown error %2 - %1: erreur inconnue %2 + The protocol `%1' does not support removing files or directories + Le protocole `%1' ne permet pas de supprimer des fichiers ou des dossiers - - - QDB2Driver - Unable to connect - Incapable d'établir une connexion + The protocol `%1' does not support renaming files or directories + Le protocole `%1' ne permet pas de renommer des fichiers ou des dossiers - Unable to commit transaction - Incapable de soumettre la transaction + The protocol `%1' does not support getting files + Le protocole `%1' ne permet pas de recevoir des fichiers - Unable to rollback transaction - Incapable d'annuler la transaction + The protocol `%1' does not support putting files + Le protocole `%1' ne permet pas d'envoyer des fichiers - Unable to set autocommit - Impossible d'activer l'auto-soumission + The protocol `%1' does not support copying or moving files or directories + Le protocole `%1' ne permet pas de copier ou de déplacer des fichiers - - - QDB2Result - Unable to execute statement - Impossible d'exécuter la requête + (unknown) + (inconnu) + + + Q3Wizard - Unable to prepare statement - Impossible de prépare la requête + &Cancel + &Annuler - Unable to bind variable - Impossible d'attacher la variable + < &Back + < &Précédent - Unable to fetch record %1 - Impossible de récupérer l'enregistrement %1 + &Next > + &Suivant > - Unable to fetch next - Impossible de récupérer le suivant + &Finish + &Terminer - Unable to fetch first - Impossible de récupérer le premier + &Help + &Aide - QDateTimeEdit + QAbstractSocket - AM - AM + Host not found + Hôte introuvable - am - am + Connection refused + Connexion refusée - PM - PM + Connection timed out + Connexion expirée - pm - pm + Operation on socket is not supported + Opération sur socket non supportée - - - QDial - QDial - QDial + Socket operation timed out + Opération socket expirée - SpeedoMeter - Tachymètre + Socket is not connected + Le socket n'est pas connecté - SliderHandle - Poignée + Network unreachable + Réseau impossible à rejoindre - QDialog - - What's This? - Qu'est-ce que c'est ? - + QAbstractSpinBox - Done - Terminer + &Step up + &Augmenter - - - QDialogButtonBox - OK - OK + Step &down + &Diminuer - Save - Enregistrer + &Select All + Tout &sélectionner + + + QAccessibleButton - &Save - Enregi&strer + Press + Appuyer + + + QApplication - Open - Ouvrir + QT_LAYOUT_DIRECTION + Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. + LTR - Cancel - Annuler + Executable '%1' requires Qt %2, found Qt %3. + L'exécutable '%1' requiert Qt %2 (Qt %3 présent). - &Cancel - &Annuler + Incompatible Qt Library Error + Erreur : bibliothèque Qt incompatible - Close - Fermer + Activate + Activer - &Close - &Fermer + Activates the program's main window + Active la fenêtre principale du programme - Apply - Appliquer + QT_LAYOUT_DIRECTION + LTR + + + QAxSelect - Reset - Réinitialiser + Select ActiveX Control + Sélectionner un contrôle ActiveX - Help - Aide + OK + OK - Don't Save - Ne pas enregistrer + &Cancel + &Annuler - Discard - Ne pas enregistrer + COM &Object: + &Objet COM : + + + QCheckBox - &Yes - &Oui + Uncheck + Décocher - Yes to &All - Oui à &tout + Check + Cocher - &No - &Non + Toggle + Changer + + + QColorDialog - N&o to All - Non à to&ut + Hu&e: + &Teinte : - Save All - Tout Enregistrer + &Sat: + &Saturation : - Abort - Abandonner + &Val: + &Valeur : - Retry - Réessayer + &Red: + &Rouge : - Ignore - Ignorer + &Green: + &Vert : - Restore Defaults - Restaurer les valeurs par défaut + Bl&ue: + Ble&u : - Close without Saving - Fermer sans enregistrer + A&lpha channel: + Canal a&lpha : - &OK - &OK + Select Color + Sélectionner une couleur - - - QDirModel - Name - Nom + &Basic colors + Couleurs de &base - Size - Taille + &Custom colors + &Couleurs personnalisées - - Kind - Match OS X Finder - Type + &Define Custom Colors >> + Définir des &couleurs personnalisées >> - - Type - All other platforms - Type + OK + OK - Date Modified - Dernière Modification + Cancel + Annuler - Kind - Type + &Add to Custom Colors + &Ajouter aux couleurs personnalisées - Type - Type + Select color + Sélection d'une couleur - QDockWidget + QComboBox - Close - Fermer + Open + Ouvrir - Dock - Attacher + False + Faux - Float - Détacher + True + Vrai + + + Close + Fermer - QDoubleSpinBox + QCoreApplication - More - Plus + %1: permission denied + QSystemSemaphore + %1: permission refusée - Less - Moins + %1: already exists + QSystemSemaphore + %1 : existe déjà - - - QErrorMessage - &Show this message again - &Afficher ce message de nouveau + %1: doesn't exists + QSystemSemaphore + %1: n'existe pas - &OK - &OK + %1: does not exist + QSystemSemaphore + %1 : n'existe pas - Debug Message: - Message de débogage: + %1: out of resources + QSystemSemaphore + %1 : plus de ressources disponibles - Warning: - Avertissement: + %1: unknown error %2 + QSystemSemaphore + %1 : erreur inconnue %2 - Fatal Error: - Erreur fatale: + %1: key is empty + QSystemSemaphore + %1 : clé vide - - - QFile - Destination file exists - Le fichier destination existe + %1: unable to make key + QSystemSemaphore + %1 : impossible de créer la clé - Cannot remove source file - Impossible de supprimer le fichier source + %1: ftok failed + QSystemSemaphore + %1 : ftok a échoué - Cannot open %1 for input - Impossible d'ouvrir %1 pour lecture + %1: key is empty + %1: clé vide - Cannot open for output - Impossible d'ouvrir pour écriture + %1: unable to make key + %1: impossible de créer la clé - Failure to write block - Impossible d'écrire un bloc + %1: ftok failed + %1: ftok a échoué - Cannot create %1 for output - Impossible de créer %1 pour écriture + %1: already exists + %1: existe déjà - Will not rename sequential file using block copy - Ne renommera pas le fichier séquentiel avec la copie bloc + %1: does not exist + %1: n'existe pas + + + %1: out of resources + %1: plus de ressources disponibles + + + %1: unknown error %2 + %1: erreur inconnue %2 - QFileDialog + QDB2Driver - Back - Précédent (historique) + Unable to connect + Incapable d'établir une connexion - List View - Affichage liste + Unable to commit transaction + Incapable de soumettre la transaction - Detail View - Affichage détaillé + Unable to rollback transaction + Incapable d'annuler la transaction - Open - Ouvrir + Unable to set autocommit + Impossible d'activer l'auto-soumission + + + QDB2Result - &Open - &Ouvrir + Unable to execute statement + Impossible d'exécuter la requête - &Save - &Enregistrer + Unable to prepare statement + Impossible de prépare la requête - &Rename - &Renommer + Unable to bind variable + Impossible d'attacher la variable - &Delete - Suppri&mer + Unable to fetch record %1 + Impossible de récupérer l'enregistrement %1 - Show &hidden files - Afficher les fic&hiers cachés + Unable to fetch next + Impossible de récupérer le suivant - Directories - Dossiers + Unable to fetch first + Impossible de récupérer le premier + + + QDateTimeEdit - Recent Places - Emplacements récents + AM + AM - All Files (*) - Tous les fichiers (*) + am + am - %1 already exists. -Do you want to replace it? - Le fichier %1 existe déjà. Voulez-vous l'écraser ? + PM + PM - %1 -File not found. -Please verify the correct file name was given. - %1 -Fichier introuvable. -Veuillez vérifier que le nom du fichier est correct. + pm + pm + + + QDeclarativeAbstractAnimation - My Computer - Poste de travail + Cannot animate non-existent property "%1" + Impossible d'animer la propriété inexistante "%1" - Parent Directory - Dossier parent + Cannot animate read-only property "%1" + Impossible d'animer la propriété en lecture seule "%1" - Files of type: - Fichiers de type : + Animation is an abstract class + L'animation est une classe abstraite + + + QDeclarativeAnchorAnimation - Directory: - Dossier : + Cannot set a duration of < 0 + Impossible de sélectionner une durée négative + + + QDeclarativeAnchors - -File not found. -Please verify the correct file name was given - -Fichier introuvable. -Veuillez vérifier que le nom du fichier est correct + Possible anchor loop detected on fill. + Boucle potentielle dans les ancres détectée pour le remplissage. - %1 -Directory not found. -Please verify the correct directory name was given. - %1 -Dossier introuvable. -Veuillez vérifier que le nom du dossier est correct. + Possible anchor loop detected on centerIn. + Boucle potentielle dans les ancres détectée pour le centrage. - '%1' is write protected. -Do you want to delete it anyway? - '%1' est protégé en écriture. -Voulez-vous quand même le supprimer ? + Cannot anchor to an item that isn't a parent or sibling. + Impossible d'ancrer à un élément qui n'est pas un parent ou partage le même parent. - Are sure you want to delete '%1'? - Etes-vous sûr de vouloir supprimer '%1' ? + Possible anchor loop detected on vertical anchor. + Boucle potentielle dans les ancres détectée pour l'ancre verticale. - Could not delete directory. - Impossible de supprimer le dossier. + Possible anchor loop detected on horizontal anchor. + Boucle potentielle dans les ancres détectée pour l'ancre horizontale. - All Files (*.*) - Tous les fichiers (*.*) + Cannot specify left, right, and hcenter anchors. + Impossible de spécifier à la fois une ancre gauche, droite et hcenter. - Save As - Enregistrer sous + Cannot anchor to a null item. + impossible d'ancrer à un élément nul. - Drive - Unité + Cannot anchor a horizontal edge to a vertical edge. + Impossible d'ancrer un bord horizontal à un bord vertical. - File - Fichier + Cannot anchor item to self. + Impossible d'ancrer l'élément à lui même. - Unknown - Inconnu + Cannot specify top, bottom, and vcenter anchors. + Impossible de spécifier à la fois une ancre haut, bas et vcenter. - Find Directory - Chercher dans le dossier + Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors. + L'ancre baseline ne peut pas etre combinée à l'usage des ancres haut, bas ou vcenter. - Show - Montrer + Cannot anchor a vertical edge to a horizontal edge. + Impossible d'ancrer un bord vertical à un bord horizontal. + + + QDeclarativeAnimatedImage - Forward - Successeur + Qt was built without support for QMovie + Qt a été compilé sans support de QMovie + + + QDeclarativeBehavior - New Folder - Nouveau dossier + Cannot change the animation assigned to a Behavior. + Impossible de changer l'animation affectée à un comportement. + + + QDeclarativeBinding - &New Folder - &Nouveau dossier + Binding loop detected for property "%1" + Boucle détectée dans l'affectation pour la propriété "%1" + + + QDeclarativeCompiledBindings - &Choose - &Choisir + Binding loop detected for property "%1" + + + + QDeclarativeCompiler - Remove - Supprimer + Invalid property assignment: "%1" is a read-only property + Affectation de propriété invalide : "%1"est une propriété en lecture seule - File &name: - &Nom de fichier : + Invalid property assignment: unknown enumeration + Affectation de propriété invalide : énumération inconnue - Look in: - Voir dans: + Invalid property assignment: string expected + Affectation de propriété invalide : chaîne attendue - Create New Folder - Créer un nouveau dossier + Invalid property assignment: url expected + Affectation de propriété invalide : url attendue - File Folder - Fichier Dossier + Invalid property assignment: unsigned int expected + Affectation de propriété invalide : unsigned int attendu - Folder - Dossier + Invalid property assignment: int expected + Affectation de propriété invalide : int attendu - Alias - Alias + Invalid property assignment: float expected + Affectation de propriété invalide : float attendu - Shortcut - Raccourci + Invalid property assignment: double expected + Affectation de propriété invalide : double attendu - - - QFileSystemModel - %1 TB - %1 To + Invalid property assignment: color expected + Affectation de propriété invalide : couleur attendue - %1 GB - %1 Go + Invalid property assignment: date expected + Affectation de propriété invalide : date attendue - %1 MB - %1 Mo + Invalid property assignment: time expected + Affectation de propriété invalide : heure attendue - %1 KB - %1 Ko + Invalid property assignment: datetime expected + Affectation de propriété invalide : date et heure attendues - %1 bytes - %1 octets + Invalid property assignment: point expected + Affectation de propriété invalide : point attendu - Invalid filename - Nom de fichier invalide + Invalid property assignment: size expected + Affectation de propriété invalide : taille attendue - <b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks. - <b>Le nom "%1" ne peut pas être utilisé.</b><p>Essayez un autre nom avec moins de caractères ou sans ponctuation. + Invalid property assignment: rect expected + Affectation de propriété invalide : rectangle attendu - Name - Nom + Invalid property assignment: boolean expected + Affectation de propriété invalide : booléen attendu - Size - Taille + Invalid property assignment: 3D vector expected + Affectation de propriété invalide : vecteur 3D attendu - - Kind - Match OS X Finder - Type + Invalid property assignment: unsupported type "%1" + Affectation de propriété invalide : type "%1" non supporté - - Type - All other platforms - Type + Element is not creatable. + Impossible de créer l'élément. - Date Modified - Dernière modification + Component elements may not contain properties other than id + - My Computer - Mon ordinateur + Invalid component id specification + L'ID de composant spécifiée n'est pas valide - Computer - Ordinateur + id is not unique + l'ID n'est pas unique - Kind - Type + Invalid component body specification + - Type - Type + Component objects cannot declare new properties. + - %1 byte(s) - %1 octet(s) + Component objects cannot declare new signals. + - - - QFontDatabase - Normal - Normal + Component objects cannot declare new functions. + - Bold - Gras + Cannot create empty component specification + - Demi Bold - Semi Gras + Incorrectly specified signal assignment + - Black - Noir + Cannot assign a value to a signal (expecting a script to be run) + - Demi - Demi + Empty signal assignment + - Light - Léger + Empty property assignment + - Italic - Italique + Attached properties cannot be used here + - Oblique - Oblique + Non-existent attached object + - Any - Tous + Invalid attached object assignment + - Latin - Latin + Cannot assign to non-existent default property + - Greek - Grec + Cannot assign to non-existent property "%1" + - Cyrillic - Cyrillique + Invalid use of namespace + - Armenian - Arménien + Not an attached property name + - Hebrew - Hébreu + Invalid use of id property + - Arabic - Arabe + Property has already been assigned a value + - Syriac - Syriaque + Invalid grouped property access + - Thaana - Thaana + Cannot assign a value directly to a grouped property + - Devanagari - Devanagari + Invalid property use + - Bengali - Bengali + Property assignment expected + - Gurmukhi - Gurmukhi + Single property assignment expected + - Gujarati - Gujarati + Unexpected object assignment + - Oriya - Oriya + Cannot assign object to list + - Tamil - Tamil + Can only assign one binding to lists + - Telugu - Telugu + Cannot assign primitives to lists + - Kannada - Kannada + Cannot assign multiple values to a script property + - Malayalam - Malayalam + Invalid property assignment: script expected + - Sinhala - Sinhala + Cannot assign object to property + - Thai - Thaï + "%1" cannot operate on "%2" + - Lao - Lao/Laotien sont corrects - Lao + Duplicate default property + - Tibetan - Tibétain + Duplicate property name + - Myanmar - Myanmar/Birman sont corrects mais Myanmar semble plus adapté pour la langue écrite - Myanmar + Property names cannot begin with an upper case letter + - Georgian - Géorgien + Duplicate signal name + - Khmer - Khmer + Signal names cannot begin with an upper case letter + - Simplified Chinese - Chinois Simplifié + Duplicate method name + - Traditional Chinese - Chinois Traditionnel + Method names cannot begin with an upper case letter + - Japanese - Japonais + Property value set multiple times + - Korean - Coréen + Invalid property nesting + - Vietnamese - Vietnamien + Cannot override FINAL property + - Symbol - Symbole + Invalid property type + Type de propriété invalide - Ogham - Ogham + Invalid empty ID + ID vide non valide - Runic - Runique + IDs cannot start with an uppercase letter + - N'Ko - N'Ko + IDs must start with a letter or underscore + - - - QFontDialog - &Font - &Police + IDs must contain only letters, numbers, and underscores + - Font st&yle - St&yle de police + ID illegally masks global JavaScript property + - &Size - &Taille + No property alias location + - Effects - Effets + Invalid alias location + - Stri&keout - &Barré + Invalid alias reference. An alias reference must be specified as <id> or <id>.<property> + - &Underline - &Souligné + Invalid alias reference. Unable to find id "%1" + + + + QDeclarativeComponent - Sample - Exemple + Invalid empty URL + + + + QDeclarativeCompositeTypeManager - Select Font - Choisir une police + Resource %1 unavailable + - Wr&iting System - &Système d'écriture + Namespace %1 cannot be used as a type + + + + %1 %2 + %1% {1 %2?} + + + Type %1 unavailable + - QFtp + QDeclarativeConnections - Host %1 found - Hôte %1 trouvé + Cannot assign to non-existent property "%1" + - Host found - Hôte trouvé + Connections: nested objects not allowed + - Connected to host %1 - Connecté à l'hôte %1 + Connections: syntax error + - Connected to host - Connecté à l'hôte + Connections: script expected + + + + QDeclarativeEngine - Connection to %1 closed - Connexion à %1 arrêtée + executeSql called outside transaction() + - Connection closed - Connexion arrêtée + Read-only Transaction + - Host %1 not found - Hôte %1 introuvable + Version mismatch: expected %1, found %2 + - Connection refused to host %1 - Connexion à l'hôte %1 refusée + SQL transaction failed + - Connection timed out to host %1 - Connexion expirée vers l'hôte %1 + transaction: missing callback + - Unknown error - Erreur inconnue + SQL: database version mismatch + + + + QDeclarativeFlipable - Connecting to host failed: -%1 - Échec de la connexion à l'hôte -%1 + front is a write-once property + - Login failed: -%1 - Échec du login: -%1 + back is a write-once property + + + + QDeclarativeImportDatabase - Listing directory failed: -%1 - Échec du listage du dossier : -%1 + module "%1" definition "%2" not readable + - Changing directory failed: -%1 - Échec du changement de dossier : -%1 + plugin cannot be loaded for module "%1": %2 + - Downloading file failed: -%1 - Échec du téléchargement du fichier : -%1 + module "%1" plugin "%2" not found + - Uploading file failed: -%1 - Échec du télédéchargement : -%1 + module "%1" version %2.%3 is not installed + - Removing file failed: -%1 - Échec de la suppression d'un fichier : -%1 + module "%1" is not installed + - Creating directory failed: -%1 - Échec de la création d'un dossier : -%1 + "%1": no such directory + - Removing directory failed: -%1 - Échec de la suppression d'un dossier : -%1 + import "%1" has no qmldir and no namespace + - Not connected - Non connecté + - %1 is not a namespace + - Connection refused for data connection - Connexion donnée refusée + - nested namespaces not allowed + - - - QHostInfo - Unknown error - Erreur inconnue + local directory + - - - QHostInfoAgent - Host not found - Hôte introuvable + is ambiguous. Found in %1 and in %2 + - Unknown address type - Adresse de type inconnu + is ambiguous. Found in %1 in version %2.%3 and %4.%5 + - Unknown error - Erreur inconnue + is instantiated recursively + - No host name given - Aucun nom d'hôte n'a été donné + is not a type + + + + QDeclarativeKeyNavigationAttached - Invalid hostname - Nom d'hôte non valide + KeyNavigation is only available via attached properties + - QHttp + QDeclarativeKeysAttached - Connection refused - Connexion refusée + Keys is only available via attached properties + + + + QDeclarativeListModel - Host %1 not found - Hôte %1 introuvable + remove: index %1 out of range + - Wrong content length - Longueur du contenu invalide + insert: value is not an object + - HTTP request failed - Échec de la requête HTTP + insert: index %1 out of range + - Host %1 found - Hôte %1 trouvé + move: out of range + - Host found - Hôte trouvé + append: value is not an object + - Connected to host %1 - Connecté à l'hôte %1 + set: value is not an object + - Connected to host - Connecté à l'hôte + set: index %1 out of range + - Connection to %1 closed - Connexion à %1 arrêtée + ListElement: cannot contain nested elements + - Connection closed - Connexion arrêtée + ListElement: cannot use reserved "id" property + - Unknown error - Erreur inconnue + ListElement: cannot use script for property value + - Request aborted - Requête interrompue + ListModel: undefined property '%1' + + + + QDeclarativeLoader - No server set to connect to - Aucun serveur spécifié + Loader does not support loading non-visual elements. + + + + QDeclarativeParentAnimation - Server closed connection unexpectedly - Connexion interrompue par le serveur + Unable to preserve appearance under complex transform + - Invalid HTTP response header - Entête de réponse HTTP invalide + Unable to preserve appearance under non-uniform scale + - Unknown authentication method - Méthode d'authentification inconnue + Unable to preserve appearance under scale of 0 + + + + QDeclarativeParentChange - Invalid HTTP chunked body - Fragment HTTP invalide + Unable to preserve appearance under complex transform + - Error writing response to device - Erreur lors de l'écriture de la réponse + Unable to preserve appearance under non-uniform scale + - Proxy authentication required - Le proxy requiert une authentification + Unable to preserve appearance under scale of 0 + + + + QDeclarativeParser - Authentication required - Authentification requise + Illegal unicode escape sequence + - Proxy requires authentication - Le proxy requiert une authentification + Illegal character + - Host requires authentication - L'hôte requiert une authentification + Unclosed string at end of line + - Data corrupted - Données corrompues + Illegal escape squence + - Unknown protocol specified - Protocole spécifié inconnu + Unclosed comment at end of file + - SSL handshake failed - le handshake SSL a échoué + Illegal syntax for exponential number + - Connection refused (or timed out) - Connexion refusée (ou délai expiré) + Identifier cannot start with numeric literal + - HTTPS connection requested but SSL support not compiled in - Connexion HTTPS requise mais le support SSL n'est pas compilé + Unterminated regular expression literal + - - - QHttpSocketEngine - Did not receive HTTP response from proxy - Pas de réponse HTTP de la part du proxy + Invalid regular expression flag '%0' + - Error parsing authentication request from proxy - Erreur dans le reqête d'authentification reçue du proxy + Unterminated regular expression backslash sequence + - Authentication required - Authentification requise + Unterminated regular expression class + - Proxy denied connection - Le Proxy a rejeté la connexion + Syntax error + - Error communicating with HTTP proxy - Erreur de communication avec le proxy HTTP + Unexpected token `%1' + - Proxy server not found - Serveur proxy introuvable + Expected token `%1' + - Proxy connection refused - Connexion au proxy refusée + Property value set multiple times + - Proxy server connection timed out - La connexion au serveur proxy a expiré + Expected type name + - Proxy connection closed prematurely - La connexion au serveur proxy a été fermée prématurément + Invalid import qualifier ID + - - - QIBaseDriver - Error opening database - Erreur d'ouverture de la base de données + Reserved name "Qt" cannot be used as an qualifier + - Could not start transaction - La transaction n'a pas pu être démarrée + Script import qualifiers must be unique. + - Unable to commit transaction - Incapable de soumettre la transaction + Script import requires a qualifier + - Unable to rollback transaction - Incapable d'annuler la transaction + Library import requires a version + - - - QIBaseResult - Unable to create BLOB - Impossible de créer un BLOB + Expected parameter type + - Unable to write BLOB - Impossible d'écrire le BLOB + Invalid property type modifier + - Unable to open BLOB - Impossible d'ouvrir le BLOB + Unexpected property type modifier + - Unable to read BLOB - Impossible de lire le BLOB + Expected property type + - Could not find array - Impossible de trouver le tableau + Readonly not yet supported + - Could not get array data - Impossible de trouver le tableau de données + JavaScript declaration outside Script element + + + + QDeclarativePauseAnimation - Could not get query info - Impossible d'avoir les informations sur la requête + Cannot set a duration of < 0 + + + + QDeclarativePixmapCache - Could not start transaction - Impossible de démarrer la transaction + Error decoding: %1: %2 + - Unable to commit transaction - Incapable de soumettre la transaction + Failed to get image from provider: %1 + - Could not allocate statement - Impossible d'allouer la requête + Cannot open: %1 + - Could not prepare statement - Impossible de préparer la requête + Unknown Error loading %1 + + + + QDeclarativePropertyAnimation - Could not describe input statement - Impossible de décrire la requête + Cannot set a duration of < 0 + + + + QDeclarativePropertyChanges - Could not describe statement - Impossible de décrire la requête + PropertyChanges does not support creating state-specific objects. + - Unable to close statement - Impossible de fermer la requête + Cannot assign to non-existent property "%1" + - Unable to execute query - Impossible d'exécuter la requête + Cannot assign to read-only property "%1" + + + + QDeclarativeTextInput - Could not fetch next item - Impossible de récuperer l'élément suivant + Could not load cursor delegate + - Could not get statement info - Impossible d'avoir les informations sur la requête + Could not instantiate cursor delegate + - QIODevice + QDeclarativeVME - Permission denied - Accès refusé + Unable to create object of type %1 + - Too many open files - Trop de fichiers ouverts simultanément + Cannot assign value %1 to property %2 + - No such file or directory - Aucun fichier ou dossier de ce nom + Cannot assign object type %1 with no default method + - No space left on device - Aucun espace disponible sur le périphérique + Cannot connect mismatched signal/slot %1 %vs. %2 + - Unknown error - Erreur inconnue + Cannot assign an object to signal property %1 + - - - QInputContext - XIM - XIM + Cannot assign object to list + - XIM input method - Méthode d'entrée XIM + Cannot assign object to interface property + - Windows input method - Méthode d'entrée Windows + Unable to create attached object + - Mac OS X input method - Méthode d'entrée Mac OS X + Cannot set properties on %1 as it is null + + + + QDeclarativeVisualDataModel - FEP - Processeur frontal + Delegate component must be Item type. + + + + QDeclarativeXmlListModel - S60 FEP input method - Méthode de saisie processeur frontal S60 + Qt was built without support for xmlpatterns + - QInputDialog + QDeclarativeXmlListModelRole - Enter a value: - Entrer une valeur : + An XmlRole query must not start with '/' + - QLibrary + QDeclarativeXmlRoleList - QLibrary::load_sys: Cannot load %1 (%2) - QLibrary::load_sys: Impossible de charger %1 (%2) + An XmlListModel query must start with '/' or "//" + + + + QDial - QLibrary::unload_sys: Cannot unload %1 (%2) - QLibrary::unload_sys: Impossible de décharger %1 (%2) + QDial + QDial - QLibrary::resolve_sys: Symbol "%1" undefined in %2 (%3) - QLibrary::resolve_sys: Symbole "%1" non défini dans %2 (%3) + SpeedoMeter + Tachymètre - Could not mmap '%1': %2 - Impossible d'établir la projection en mémoire de '%1' : %2 + SliderHandle + Poignée + + + QDialog - Plugin verification data mismatch in '%1' - Données de vérification du plugin différente dans '%1' + What's This? + Qu'est-ce que c'est ? - Could not unmap '%1': %2 - Impossible de supprimer la projection en mémoire de '%1' : %2 + Done + Terminer + + + QDialogButtonBox - The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5] - Le plugin '%1' utilise une bibliothèque Qt incompatible. (%2.%3.%4) [%5] + OK + OK - The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3" - Le plugin '%1' utilise une bibliothèque Qt incompatible. Clé attendue "%2", reçue "%3" + Save + Enregistrer - Unknown error - Erreur inconnue + &Save + Enregi&strer - The shared library was not found. - La bibliothèque partagée est introuvable. + Open + Ouvrir - The file '%1' is not a valid Qt plugin. - Le fichier '%1' n'est pas un plugin Qt valide. + Cancel + Annuler - The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.) - Le plugin '%1' utilise une bibliothèque Qt incompatible. (Il est impossible de mélanger des bibliothèques 'debug' et 'release'.) + &Cancel + &Annuler - Cannot load library %1: %2 - Impossible de charger la bibliothèque %1 : %2 + Close + Fermer - Cannot unload library %1: %2 - Impossible de décharger la bibliothèque %1 : %2 + &Close + &Fermer - Cannot resolve symbol "%1" in %2: %3 - Impossible de résoudre le symbole "%1" dans %2 : %3 + Apply + Appliquer - - - QLineEdit - Select All - Tout sélectionner + Reset + Réinitialiser - &Undo - &Annuler + Help + Aide - &Redo - &Rétablir + Don't Save + Ne pas enregistrer - Cu&t - Co&uper + Discard + Ne pas enregistrer - &Copy - Cop&ier + &Yes + &Oui - &Paste - Co&ller + Yes to &All + Oui à &tout - Delete - Supprimer + &No + &Non - - - QLocalServer - %1: Name error - %1: Erreur de nom + N&o to All + Non à to&ut - %1: Permission denied - %1: Permission refusée + Save All + Tout Enregistrer - %1: Address in use - %1: Address déjà utilisée + Abort + Abandonner - %1: Unknown error %2 - %1: Erreur inconnue %2 + Retry + Réessayer - - - QLocalSocket - %1: Connection refused - %1: Connexion refusée + Ignore + Ignorer - %1: Remote closed - %1: Connexion fermée + Restore Defaults + Restaurer les valeurs par défaut - %1: Invalid name - %1: Nom invalide + Close without Saving + Fermer sans enregistrer - %1: Socket access error - %1: Erreur d'accès au socket + &OK + &OK + + + QDirModel - %1: Socket resource error - %1: Erreur de ressource du socket + Name + Nom - %1: Socket operation timed out - %1: L'opération socket a expiré + Size + Taille - %1: Datagram too large - %1: Datagramme trop grand + Kind + Match OS X Finder + Type - %1: Connection error - %1: Erreur de connexion + Type + All other platforms + Type - %1: The socket operation is not supported - %1: L'opération n'est pas supportée + Date Modified + Dernière Modification - %1: Unknown error - %1 : erreur inconnue + Kind + Type - %1: Unknown error %2 - %1: Erreur inconnue %2 + Type + Type - QMYSQLDriver + QDockWidget - Unable to open database ' - Impossible d'ouvrir la base de données ' + Close + Fermer - Unable to connect - Impossible d'établir une connexion + Dock + Attacher - Unable to begin transaction - Impossible de démarrer la transaction + Float + Détacher + + + QDoubleSpinBox - Unable to commit transaction - Impossible de soumettre la transaction + More + Plus - Unable to rollback transaction - Impossible d'annuler la transaction + Less + Moins - QMYSQLResult + QErrorMessage - Unable to fetch data - Impossible de récuperer des données + &Show this message again + &Afficher ce message de nouveau - Unable to execute query - Impossible d'exécuter la requête + &OK + &OK - Unable to store result - Impossible de stocker le résultat + Debug Message: + Message de débogage: - Unable to prepare statement - Impossible de préparer l'instruction + Warning: + Avertissement: - Unable to reset statement - Impossible de réinitialiser l'instruction + Fatal Error: + Erreur fatale: + + + QFile - Unable to bind value - Impossible d'attacher la valeur + Destination file exists + Le fichier destination existe - Unable to execute statement - Impossible d'exécuter la requête + Cannot remove source file + Impossible de supprimer le fichier source - Unable to bind outvalues - Impossible d'attacher les valeurs de sortie + Cannot open %1 for input + Impossible d'ouvrir %1 pour lecture - Unable to store statement results - Impossible de stocker les résultats de la requête + Cannot open for output + Impossible d'ouvrir pour écriture - Unable to execute next query - Impossible d'exécuterla prochaine requête + Failure to write block + Impossible d'écrire un bloc - Unable to store next result - Impossible de stocker le prochain résultat + Cannot create %1 for output + Impossible de créer %1 pour écriture - - - QMdiArea - (Untitled) - (Sans titre) + Will not rename sequential file using block copy + Ne renommera pas le fichier séquentiel avec la copie bloc - QMdiSubWindow + QFileDialog - %1 - [%2] - %1 - [%2] + Back + Précédent (historique) - Close - Fermer + List View + Affichage liste - Minimize - Réduire + Detail View + Affichage détaillé - Restore Down - Restaurer en bas + Open + Ouvrir - &Restore - &Restaurer + &Open + &Ouvrir - &Move - &Déplacer + &Save + &Enregistrer - &Size - &Taille + &Rename + &Renommer - Mi&nimize - Réd&uire + &Delete + Suppri&mer - Ma&ximize - Ma&ximiser + Show &hidden files + Afficher les fic&hiers cachés - Stay on &Top - &Rester au premier plan - + Directories + Dossiers + - &Close - &Fermer + Recent Places + Emplacements récents - - [%1] - - [%1] + All Files (*) + Tous les fichiers (*) - Maximize - Maximiser + %1 already exists. +Do you want to replace it? + Le fichier %1 existe déjà. Voulez-vous l'écraser ? - Unshade - Restaurer + %1 +File not found. +Please verify the correct file name was given. + %1 +Fichier introuvable. +Veuillez vérifier que le nom du fichier est correct. - Shade - Ombrer + My Computer + Poste de travail - Restore - Restaurer + Parent Directory + Dossier parent - Help - Aide + Files of type: + Fichiers de type : - Menu - Menu + Directory: + Dossier : - - - QMenu - Close - Fermer + +File not found. +Please verify the correct file name was given + +Fichier introuvable. +Veuillez vérifier que le nom du fichier est correct - Open - Ouvrir + %1 +Directory not found. +Please verify the correct directory name was given. + %1 +Dossier introuvable. +Veuillez vérifier que le nom du dossier est correct. - Execute - Exécuter + '%1' is write protected. +Do you want to delete it anyway? + '%1' est protégé en écriture. +Voulez-vous quand même le supprimer ? - - - QMenuBar - About - A propos + Are sure you want to delete '%1'? + Etes-vous sûr de vouloir supprimer '%1' ? - Config - Configuration + Could not delete directory. + Impossible de supprimer le dossier. - Preference - Préférence + All Files (*.*) + Tous les fichiers (*.*) - Options - Options + Save As + Enregistrer sous - Setting - Paramètre + Drive + Unité - Setup - Réglage + File + Fichier - Quit - Quitter + File Folder + Match Windows Explorer + Fichier Dossier - Exit - Quitter + Folder + All other platforms + Dossier - About %1 - A propos de %1 + Alias + Mac OS X Finder + Alias - About Qt - À propos de Qt + Shortcut + All other platforms + Raccourci - Preferences - Préférences + Unknown + Inconnu - Quit %1 - Quitter %1 + Find Directory + Chercher dans le dossier - Actions - Actions + Show + Afficher - - - QMessageBox - OK - OK + Forward + Successeur - About Qt - À propos de Qt + New Folder + Nouveau dossier - Help - Aide + &New Folder + &Nouveau dossier - <p>This program uses Qt version %1.</p> - <p>Ce programme utilise la version %1 de Qt.</p> + &Choose + &Choisir - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qt.nokia.com/">qt.nokia.com/</a> for more information.</p> - <h3>A propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'applications multi-platformes.</p><p>Qt fournit la portabilité du code source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et toutes les variantes commerciales majeures d'Unix. Qt est aussi disponible pour les systèmes embarqués sous le nom Qtopia Core.</p><p>Qt est un produit de Trolltech. <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> + Remove + Supprimer - Show Details... - Montrer les détails... + File &name: + &Nom de fichier : - Hide Details... - Cacher les détails... + Look in: + Voir dans: - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - <h3>À propos de Qt</h3><p>Ce programme utilise Qt version %1.</p><p>Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.</p><p>Qt fournit une portabilité source unique pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés tels que Qt pour Embedded Linux et Qt pour Windows CE.</p><p>Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.</p><p>Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.</p><p>Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.</p><p>Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.</p><p>Veuillez consulter<a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> pour un aperçu des concessions de licences Qt.</p><p>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</p><p>Qt est un produit Nokia. Voir <a href="http://qt.nokia.com/">qt.nokia.com</a> pour de plus amples informations.</p> + Create New Folder + Créer un nouveau dossier - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - <h3>A propos de Qt</h3>%1<p>Qt est un framework de développement d'applications multi-plateforme.</p><p>Qt fournit la portabilité du code source surMS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, et toutes les variantes majeures d'Unix. Qt est aussi disponible pour l'embarqué avec Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt est un produit de Nokia. Allez à <a href="http://qt.nokia.com/">qt.nokia.com</a> pour plus d'informations.</p> + File Folder + Fichier Dossier - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qt.nokia.com/company/model/">qt.nokia.com/company/model/</a> for an overview of Qt licensing.</p> - <p>Ce programme utilise Qt Open Source Edition version %1.</p><p>Qt Open Source Edition est prévu pour le développement d'applications Open Source. Vous devez avoir un license commerciale de Qt pour développer des applications propiétaires (Closed Source).</p><p>Vous pouvez aller sur <a href="http://qt.nokia.com/company/model/">qt.nokia.com/company/model/</a> pour plus d'informations sur les licenses Qt.</p> + Folder + Dossier - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt Embedded.</p><p>Qt is a Trolltech product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - <h3>A propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'application multi-plateforme.</p><p>Qt fournit la portabilité de votre source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, toutes les variantes majeures d'Unix. Qt est aussi disponible pour les périphériques embarqués avec Qt Embedded.</p><p>Qt est un produit de Trolltech. Voir <a href="http://qt.nokia.com/">qt.nokia.com</a> pour plus d'informations.</p> + Alias + Alias - <h3>About Qt</h3><p>This program uses Qt version %1.</p> - <h3>À propos de Qt</h3><p>Ce programme utilise Qt version %1.</p> + Shortcut + Raccourci - <p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - <p>Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.</p><p>Qt fournit une portabilité source unique pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés tels que Qt pour Embedded Linux et Qt pour Windows CE.</p><p>Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.</p><p>Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.</p><p>Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.</p><p>Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.</p><p>Veuillez consulter<a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> pour un aperçu des concessions de licences Qt.</p><p>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</p><p>Qt est un produit Nokia. Voir <a href="http://qt.nokia.com/">qt.nokia.com</a> pour de plus amples informations.</p> + Go back + Précédent - - - QMultiInputContext - Select IM - Sélectionner IM + Go forward + Suivant - - - QMultiInputContextPlugin - Multiple input method switcher - Sélectionneur de méthode de saisie + Go to the parent directory + Dossier parent - Multiple input method switcher that uses the context menu of the text widgets - Sélectionneur de méthode de saisie qui utilise le menu contextuel des widgets de texte + Create a New Folder + Créer un nouveau dossier - - - QNativeSocketEngine - The remote host closed the connection - L'hôte distant a fermé la connexion + Change to list view mode + Affichage liste - Network operation timed out - L'opération réseau a expiré + Change to detail view mode + Affichage détaillé + + + QFileSystemModel - Out of resources - Manque de ressources + %1 TB + %1 To - Unsupported socket operation - Opération socket non supportée + %1 GB + %1 Go - Protocol type not supported - Protocol non géré + %1 MB + %1 Mo - Invalid socket descriptor - Descripteur de socket invalide + %1 KB + %1 Ko - Network unreachable - Réseau impossible à rejoindre + %1 bytes + %1 octets - Permission denied - Accès refusé + Invalid filename + Nom de fichier invalide - Connection timed out - Connexion expirée + <b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks. + <b>Le nom "%1" ne peut pas être utilisé.</b><p>Essayez un autre nom avec moins de caractères ou sans ponctuation. - Connection refused - Connexion refusée + Name + Nom - The bound address is already in use - L'adresse liée est déjà en usage + Size + Taille - The address is not available - L'adresse n'est pas disponible + Kind + Match OS X Finder + Type - The address is protected - L'adresse est protégée + Type + All other platforms + Type - Unable to send a message - Impossible d'envoyer un message + Date Modified + Dernière modification - Unable to receive a message - Impossible de recevoir un message + My Computer + Poste de travail - Unable to write - Impossible d'écrire + Computer + Ordinateur - Network error - Erreur réseau - - - Another socket is already listening on the same port - Un autre socket écoute déjà sur le même port - - - Unable to initialize non-blocking socket - Impossible d'initialiser le socket asynchrone + Kind + Type - Unable to initialize broadcast socket - Impossible d'initialiser le socket broadcast + Type + Type - Attempt to use IPv6 socket on a platform with no IPv6 support - Tentative d'utiliser un socket IPv6 sur une plateforme qui ne supporte pas IPv6 + %1 byte(s) + %1 octet(s) + + + QFontDatabase - Host unreachable - Hôte inaccessible + Normal + Normal - Datagram was too large to send - Le datagramme était trop grand pour être envoyé + Bold + Gras - Operation on non-socket - Operation sur non-socket + Demi Bold + Semi Gras - Unknown error - Erreur inconnue + Black + Noir - The proxy type is invalid for this operation - Le type de proxy est invalide pour cette opération + Demi + Demi - - - QNetworkAccessCacheBackend - Error opening %1 - Erreur lors de l'ouverture de %1 + Light + Léger - - - QNetworkAccessFileBackend - Request for opening non-local file %1 - Requête d'ouverture de fichier distant %1 + Italic + Italique - Error opening %1: %2 - Erreur lors de l'ouverture de %1 : %2 + Oblique + Oblique - Write error writing to %1: %2 - Erreur d'écriture de %1 : %2 + Any + Tous - Cannot open %1: Path is a directory - Impossible d'ouvrir %1 : le chemin est un dossier + Latin + Latin - Read error reading from %1: %2 - Erreur de lecture de %1 : %2 + Greek + Grec - - - QNetworkAccessFtpBackend - No suitable proxy found - Aucun proxy trouvé + Cyrillic + Cyrillique - Cannot open %1: is a directory - Impossible d'ouvrir %1 : le chemin est un dossier + Armenian + Arménien - Logging in to %1 failed: authentication required - Connexion à %1 a échoué : authentification requise + Hebrew + Hébreu - Error while downloading %1: %2 - Erreur lors du téléchargement de %1 : %2 + Arabic + Arabe - Error while uploading %1: %2 - Erreur lors de l'envoi de %1 : %2 + Syriac + Syriaque - - - QNetworkAccessHttpBackend - No suitable proxy found - Aucun proxy trouvé + Thaana + Thaana - - - QNetworkReply - Error downloading %1 - server replied: %2 - Erreur lors du téléchargement de %1 - le serveur a répondu: %2 + Devanagari + Devanagari - Protocol "%1" is unknown - Le protocole "%1" est inconnu + Bengali + Bengali - - - QNetworkReplyImpl - Operation canceled - Opération annulée + Gurmukhi + Gurmukhi - - - QOCIDriver - Unable to logon - Impossible d'ouvrir une session + Gujarati + Gujarati - - Unable to initialize - QOCIDriver - L'initialisation a échoué + Oriya + Oriya - Unable to begin transaction - Impossible de démarrer la transaction + Tamil + Tamil - Unable to commit transaction - Impossible d'enregistrer la transaction + Telugu + Telugu - Unable to rollback transaction - Impossible d'annuler la transaction + Kannada + Kannada - Unable to initialize - L'initialisation a échoué + Malayalam + Malayalam - - - QOCIResult - Unable to bind column for batch execute - Impossible d'attacher la colonne pour une execution batch + Sinhala + Sinhala - Unable to execute batch statement - Impossible d'exécuter l'instruction batch + Thai + Thaï - Unable to goto next - Impossible de passer au suivant + Lao + Lao/Laotien sont corrects + Lao - Unable to alloc statement - Impossible d'allouer la requête + Tibetan + Tibétain - Unable to prepare statement - Impossible de préparer la requête + Myanmar + Myanmar/Birman sont corrects mais Myanmar semble plus adapté pour la langue écrite + Myanmar - Unable to bind value - Impossible d'attacher la valeur + Georgian + Géorgien - Unable to execute select statement - Impossible d'exéctuer la requête select + Khmer + Khmer - Unable to execute statement - Impossible d'exéctuer la requête + Simplified Chinese + Chinois Simplifié - Unable to get statement type - Impossible d'obtenir le type de la requête + Traditional Chinese + Chinois Traditionnel - - - QODBCDriver - Unable to connect - Incapable d'établir une connexion + Japanese + Japonais - - Unable to connect - Driver doesn't support all needed functionality - Impossible de se connecter - Le pilote ne supporte pas toutes les fonctionnalités nécessaires + Korean + Coréen - Unable to disable autocommit - Impossible de désactiver l'autocommit + Vietnamese + Vietnamien - Unable to commit transaction - Incapable de soumettre la transaction + Symbol + Symbole - Unable to rollback transaction - Incapable d'annuler la transaction + Ogham + Ogham - Unable to enable autocommit - Impossible d'activer l'autocommit + Runic + Runique - Unable to connect - Driver doesn't support all functionality required - Impossible de se connecter - Le pilote ne supporte pas toutes les fonctionnalités nécessaires + N'Ko + N'Ko - QODBCResult + QFontDialog - QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration - QODBCResult::reset: Impossible d'utiliser 'SQL_CURSOR_STATIC' comme attribut de requête. Veuillez vérifier la configuration de votre pilote ODBC + &Font + &Police - Unable to execute statement - Impossible d'exéctuer la requête + Font st&yle + St&yle de police - Unable to fetch next - Impossible de récupérer le suivant + &Size + &Taille - Unable to prepare statement - Impossible de préparer la requête + Effects + Effets - Unable to bind variable - Impossible d'attacher la variable + Stri&keout + &Barré - Unable to fetch last - Impossible de récupérer le dernier + &Underline + &Souligné - Unable to fetch - Impossible de récupérer + Sample + Exemple - Unable to fetch first - Impossible de récupérer le premier + Select Font + Choisir une police - Unable to fetch previous - Impossible de récupérer le précedent - + Wr&iting System + &Système d'écriture + - QObject - - - Home - Début - + QFtp - Operation not supported on %1 - Opération non supportée sur %1 + Host %1 found + Hôte %1 trouvé - Invalid URI: %1 - URI invalide : %1 + Host found + Hôte trouvé - - Write error writing to %1: %2 - Erreur d'écriture sur %1 : %2 + Connected to host %1 + Connecté à l'hôte %1 - - Read error reading from %1: %2 - Erreur de lecture sur %1 : %2 + Connected to host + Connecté à l'hôte - Socket error on %1: %2 - Erreur de socket sur %1 : %2 + Connection to %1 closed + Connexion à %1 arrêtée - Remote host closed the connection prematurely on %1 - L'hôte distant a fermé sa connexion de façon prématurée sur %1 + Connection closed + Connexion arrêtée - - Protocol error: packet of size 0 received - Erreur de protocole: paquet de taille 0 reçu + Host %1 not found + Hôte %1 introuvable - No host name given - Nom d'hôte manquant + Connection refused to host %1 + Connexion à l'hôte %1 refusée - Invalid hostname - Nom d'hôte non valide + Connection timed out to host %1 + Connexion expirée vers l'hôte %1 - - - QPPDOptionsModel - Name - Nom + Unknown error + Erreur inconnue - Value - Valeur + Connecting to host failed: +%1 + Échec de la connexion à l'hôte +%1 - - - QPSQLDriver - Unable to connect - Impossible d'établir une connexion + Login failed: +%1 + Échec du login: +%1 - Could not begin transaction - Impossible de démarrer la transaction + Listing directory failed: +%1 + Échec du listage du dossier : +%1 - Could not commit transaction - Impossible de soumettre la transaction + Changing directory failed: +%1 + Échec du changement de dossier : +%1 - Could not rollback transaction - Impossible d'annuler la transaction + Downloading file failed: +%1 + Échec du téléchargement du fichier : +%1 - Unable to subscribe - Impossible de s'inscrire + Uploading file failed: +%1 + Échec du télédéchargement : +%1 - Unable to unsubscribe - Impossible de se désinscrire + Removing file failed: +%1 + Échec de la suppression d'un fichier : +%1 - - - QPSQLResult - Unable to create query - Impossible de créer la requête + Creating directory failed: +%1 + Échec de la création d'un dossier : +%1 - Unable to prepare statement - Impossible de préparer la requête + Removing directory failed: +%1 + Échec de la suppression d'un dossier : +%1 - - - QPageSetupWidget - Centimeters (cm) - Centimètres (cm) + Not connected + Non connecté - Millimeters (mm) - Millimètres (mm) + Connection refused for data connection + Connexion donnée refusée + + + QGstreamerPlayerSession - Inches (in) - Pouces (in) + Unable to play %1 + Impossible de lire %1 + + + QHostInfo - Points (pt) - Points (pts) + Unknown error + Erreur inconnue - Form - Formulaire + No host name given + Aucun nom d'hôte n'a été donné + + + QHostInfoAgent - Paper - Papier + Host not found + Hôte introuvable - Page size: - Dimensions : + Unknown address type + Adresse de type inconnu - Width: - Largeur : + Unknown error + Erreur inconnue - Height: - Hauteur : + No host name given + Aucun nom d'hôte n'a été donné - Paper source: - Source du papier : + Invalid hostname + Nom d'hôte non valide + + + QHttp - Orientation - Orientation + Connection refused + Connexion refusée - Portrait - Portrait + Host %1 not found + Hôte %1 introuvable - Landscape - Paysage + Wrong content length + Longueur du contenu invalide - Reverse landscape - Paysage inversé + HTTP request failed + Échec de la requête HTTP - Reverse portrait - Portrait inversé + Host %1 found + Hôte %1 trouvé - Margins - Marges + Host found + Hôte trouvé - top margin - marge haute + Connected to host %1 + Connecté à l'hôte %1 - left margin - marge gauche + Connected to host + Connecté à l'hôte - right margin - marge droite + Connection to %1 closed + Connexion à %1 arrêtée - bottom margin - marge basse + Connection closed + Connexion arrêtée - - - QPluginLoader Unknown error Erreur inconnue - The plugin was not loaded. - Le plugin n'a pas été chargé. + Request aborted + Requête interrompue - - - QPrintDialog - locally connected - connecté en local + No server set to connect to + Aucun serveur spécifié - unknown - inconnu + Server closed connection unexpectedly + Connexion interrompue par le serveur - OK - OK + Invalid HTTP response header + Entête de réponse HTTP invalide - Cancel - Annuler + Unknown authentication method + Méthode d'authentification inconnue - Print in color if available - Imprimer en couleur si possible + Invalid HTTP chunked body + Fragment HTTP invalide - Print all - Imprimer tout + Error writing response to device + Erreur lors de l'écriture de la réponse - Print range - Imprimer la sélection + Proxy authentication required + Le proxy requiert une authentification - Print last page first - Imprimer d'abord la dernière page + Authentication required + Authentification requise - Number of copies: - Nombre de copies : + Proxy requires authentication + Le proxy requiert une authentification - Paper format - Format du papier + Host requires authentication + L'hôte requiert une authentification - Portrait - Portrait + Data corrupted + Données corrompues - Landscape - Paysage + Unknown protocol specified + Protocole spécifié inconnu - A0 (841 x 1189 mm) - A0 (841 x 1189 mm) + SSL handshake failed + le handshake SSL a échoué - A1 (594 x 841 mm) - A1 (594 x 841 mm) + Connection refused (or timed out) + Connexion refusée (ou délai expiré) - A2 (420 x 594 mm) - A2 (420 x 594 mm) + HTTPS connection requested but SSL support not compiled in + Connexion HTTPS requise mais le support SSL n'est pas compilé + + + QHttpSocketEngine - A3 (297 x 420 mm) - A3 (297 x 420 mm) + Did not receive HTTP response from proxy + Pas de réponse HTTP de la part du proxy - A5 (148 x 210 mm) - A5 (148 x 210 mm) + Error parsing authentication request from proxy + Erreur dans le reqête d'authentification reçue du proxy - A6 (105 x 148 mm) - A6 (105 x 148 mm) + Authentication required + Authentification requise - A7 (74 x 105 mm) - A7 (74 x 105 mm) + Proxy denied connection + Le Proxy a rejeté la connexion - A8 (52 x 74 mm) - A8 (52 x 74 mm) + Error communicating with HTTP proxy + Erreur de communication avec le proxy HTTP - A9 (37 x 52 mm) - A9 (37 x 52 mm) + Proxy server not found + Serveur proxy introuvable - B0 (1000 x 1414 mm) - B0 (1000 x 1414 mm) + Proxy connection refused + Connexion au proxy refusée - B1 (707 x 1000 mm) - B1 (707 x 1000 mm) + Proxy server connection timed out + La connexion au serveur proxy a expiré - B2 (500 x 707 mm) - B2 (500 x 707 mm) + Proxy connection closed prematurely + La connexion au serveur proxy a été fermée prématurément + + + QIBaseDriver - B3 (353 x 500 mm) - B3 (353 x 500 mm) + Error opening database + Erreur d'ouverture de la base de données - B4 (250 x 353 mm) - B4 (250 x 353 mm) + Could not start transaction + La transaction n'a pas pu être démarrée - B6 (125 x 176 mm) - B6 (125 x 176 mm) + Unable to commit transaction + Incapable de soumettre la transaction - B7 (88 x 125 mm) - B7 (88 x 125 mm) + Unable to rollback transaction + Incapable d'annuler la transaction + + + QIBaseResult - B8 (62 x 88 mm) - B8 (62 x 88 mm) + Unable to create BLOB + Impossible de créer un BLOB - B9 (44 x 62 mm) - B9 (44 x 62 mm) + Unable to write BLOB + Impossible d'écrire le BLOB - B10 (31 x 44 mm) - B10 (31 x 44 mm) + Unable to open BLOB + Impossible d'ouvrir le BLOB - C5E (163 x 229 mm) - C5E (163 x 229 mm) + Unable to read BLOB + Impossible de lire le BLOB - DLE (110 x 220 mm) - DLE (110 x 220 mm) + Could not find array + Impossible de trouver le tableau - Folio (210 x 330 mm) - Folio (210 x 330 mm) + Could not get array data + Impossible de trouver le tableau de données - Ledger (432 x 279 mm) - Ledger (432 x 279 mm) + Could not get query info + Impossible d'avoir les informations sur la requête - Tabloid (279 x 432 mm) - Tabloïde (279 x 432 mm) + Could not start transaction + Impossible de démarrer la transaction - US Common #10 Envelope (105 x 241 mm) - US Common #10 Envelope (105 x 241 mm) + Unable to commit transaction + Incapable de soumettre la transaction - Aliases: %1 - Alias : %1 + Could not allocate statement + Impossible d'allouer la requête - A4 (210 x 297 mm, 8.26 x 11.7 inches) - A4 (210 x 297 mm) + Could not prepare statement + Impossible de préparer la requête - B5 (176 x 250 mm, 6.93 x 9.84 inches) - B5 (176 x 250 mm) + Could not describe input statement + Impossible de décrire la requête - Executive (7.5 x 10 inches, 191 x 254 mm) - Executive (7,5 x 10 pouces, 191 x 254 mm) + Could not describe statement + Impossible de décrire la requête - Legal (8.5 x 14 inches, 216 x 356 mm) - Legal (8.5 x 14 pouces, 216 x 356 mm) + Unable to close statement + Impossible de fermer la requête - Letter (8.5 x 11 inches, 216 x 279 mm) - Letter (8,5 x 11 pouces, 216 x 279 mm) + Unable to execute query + Impossible d'exécuter la requête - Print selection - Imprimer la sélection + Could not fetch next item + Impossible de récuperer l'élément suivant - Page size: - Dimensions : + Could not get statement info + Impossible d'avoir les informations sur la requête + + + QIODevice - Orientation: - Orientation : + Permission denied + Accès refusé - Paper source: - Source du papier : + Too many open files + Trop de fichiers ouverts simultanément - Print - Impr écran + No such file or directory + Aucun fichier ou dossier de ce nom - File - Fichier + No space left on device + Aucun espace disponible sur le périphérique - Printer - Imprimante + Unknown error + Erreur inconnue + + + QInputContext - Print To File ... - Imprimer dans un fichier... + XIM + XIM - Print dialog - Fenêtre d'impression + XIM input method + Méthode d'entrée XIM - Size: - Taille : + Windows input method + Méthode d'entrée Windows - Properties - Propriétés + Mac OS X input method + Méthode d'entrée Mac OS X - Printer info: - Informations sur l'imprimante : + FEP + Processeur frontal - Browse - Parcourir + S60 FEP input method + Méthode de saisie processeur frontal S60 + + + QInputDialog - Print to file - Imprimer dans un fichier + Enter a value: + Entrer une valeur : + + + QLibrary - Pages from - Pages + QLibrary::load_sys: Cannot load %1 (%2) + QLibrary::load_sys: Impossible de charger %1 (%2) - to - à + QLibrary::unload_sys: Cannot unload %1 (%2) + QLibrary::unload_sys: Impossible de décharger %1 (%2) - Selection - Sélection + QLibrary::resolve_sys: Symbol "%1" undefined in %2 (%3) + QLibrary::resolve_sys: Symbole "%1" non défini dans %2 (%3) - Copies - Copies + Could not mmap '%1': %2 + Impossible d'établir la projection en mémoire de '%1' : %2 - Collate - Assembler + Plugin verification data mismatch in '%1' + Données de vérification du plugin différente dans '%1' - Other - Autre + Could not unmap '%1': %2 + Impossible de supprimer la projection en mémoire de '%1' : %2 - Double side printing - Impression recto verso + The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5] + Le plugin '%1' utilise une bibliothèque Qt incompatible. (%2.%3.%4) [%5] - File %1 is not writable. -Please choose a different file name. - Impossible d'écrire dans le fichier %1. -Veuillez choisir un nom de fichier différent. + The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3" + Le plugin '%1' utilise une bibliothèque Qt incompatible. Clé attendue "%2", reçue "%3" - %1 already exists. -Do you want to overwrite it? - %1 existe. -Voulez-vous l'écraser ? + Unknown error + Erreur inconnue - File exists - Le fichier existe + The shared library was not found. + La bibliothèque partagée est introuvable. - <qt>Do you want to overwrite it?</qt> - <qt>voulez-vous l'écraser ?</qt> + The file '%1' is not a valid Qt plugin. + Le fichier '%1' n'est pas un plugin Qt valide. - %1 is a directory. -Please choose a different file name. - %1 est un dossier. -Veuillez choisir un nom de fichier différent. + The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.) + Le plugin '%1' utilise une bibliothèque Qt incompatible. (Il est impossible de mélanger des bibliothèques 'debug' et 'release'.) - A0 - + Cannot load library %1: %2 + Impossible de charger la bibliothèque %1 : %2 - A1 - + Cannot unload library %1: %2 + Impossible de décharger la bibliothèque %1 : %2 - A2 - + Cannot resolve symbol "%1" in %2: %3 + Impossible de résoudre le symbole "%1" dans %2 : %3 + + + QLineEdit - A3 - + Select All + Tout sélectionner - A4 - + &Undo + &Annuler - A5 - + &Redo + &Rétablir - A6 - + Cu&t + Co&uper - A7 - + &Copy + Cop&ier - A8 - + &Paste + Co&ller - A9 - + Delete + Supprimer + + + QLocalServer - B0 - + %1: Name error + %1: Erreur de nom - B1 - + %1: Permission denied + %1: Permission refusée - B2 - + %1: Address in use + %1: Address déjà utilisée - B3 - + %1: Unknown error %2 + %1: Erreur inconnue %2 + + + QLocalSocket - B4 - + %1: Connection refused + %1: Connexion refusée - B5 - + %1: Remote closed + %1: Connexion fermée - B6 - + %1: Invalid name + %1: Nom invalide - B7 - + %1: Socket access error + %1: Erreur d'accès au socket - B8 - + %1: Socket resource error + %1: Erreur de ressource du socket - B9 - + %1: Socket operation timed out + %1: L'opération socket a expiré - B10 - + %1: Datagram too large + %1: Datagramme trop grand - C5E - + %1: Connection error + %1: Erreur de connexion - DLE - + %1: The socket operation is not supported + %1: L'opération n'est pas supportée - Executive - + %1: Unknown error + %1 : erreur inconnue - Folio - + %1: Unknown error %2 + %1: Erreur inconnue %2 + + + QMYSQLDriver - Ledger - + Unable to open database ' + Impossible d'ouvrir la base de données ' - Legal - + Unable to connect + Impossible d'établir une connexion - Letter - + Unable to begin transaction + Impossible de démarrer la transaction - Tabloid - + Unable to commit transaction + Impossible de soumettre la transaction - US Common #10 Envelope - + Unable to rollback transaction + Impossible d'annuler la transaction + + + QMYSQLResult - Custom - Personnalisé + Unable to fetch data + Impossible de récuperer des données - &Options >> - + Unable to execute query + Impossible d'exécuter la requête - &Print - Im&primer + Unable to store result + Impossible de stocker le résultat - &Options << - + Unable to prepare statement + Impossible de préparer l'instruction - Print to File (PDF) - Imprimer dans un fichier (PDF) + Unable to reset statement + Impossible de réinitialiser l'instruction - Print to File (Postscript) - Imprimer dans un fichier (PostScript) + Unable to bind value + Impossible d'attacher la valeur - Local file - Fichier local + Unable to execute statement + Impossible d'exécuter la requête - Write %1 file - Ecriture du fichier %1 + Unable to bind outvalues + Impossible d'attacher les valeurs de sortie - The 'From' value cannot be greater than the 'To' value. - La valeur 'de' ne peut pas être plus grande que la valeur 'à'. + Unable to store statement results + Impossible de stocker les résultats de la requête - - - QPrintPreviewDialog - %1% - %1% + Unable to execute next query + Impossible d'exécuterla prochaine requête - Print Preview - Aperçu avant impression + Unable to store next result + Impossible de stocker le prochain résultat + + + QMdiArea - Next page - Page suivante + (Untitled) + (Sans titre) + + + QMdiSubWindow - Previous page - Page précédente + %1 - [%2] + %1 - [%2] - First page - Première page + Close + Fermer - Last page - Dernière page + Minimize + Réduire - Fit width - Ajuster la largeur + Restore Down + Restaurer en bas - Fit page - Ajuster la page + &Restore + &Restaurer - Zoom in - Zoom avant + &Move + &Déplacer - Zoom out - Zoom arrière + &Size + &Taille - Portrait - Portrait + Mi&nimize + Réd&uire - Landscape - Paysage + Ma&ximize + Ma&ximiser - Show single page - Afficher une seule page + Stay on &Top + &Rester au premier plan - Show facing pages - Afficher deux pages + &Close + &Fermer - Show overview of all pages - Afficher un aperçu de toutes les pages + - [%1] + - [%1] - Print - Impr écran + Maximize + Maximiser - Page setup - Configuration de la page + Unshade + Restaurer - Close - Fermer + Shade + Ombrer - Export to PDF - Exporter vers PDF + Restore + Restaurer - Export to PostScript - Exporter vers PostScript + Help + Aide - Page Setup - Configuration de la page + Menu + Menu - QPrintPropertiesDialog + QMediaPlayer - PPD Properties - Propriétés PPD + The QMediaPlayer object does not have a valid service + Pas de service valide pour l'objet QMediaPlayer + + + QMediaPlaylist - Save - Enregistrer + Could not add items to read only playlist. + Impossible d'ajouter des éléments à une liste de lecture en lecture seule. - OK - OK + Playlist format is not supported + Le format de liste de lecture n'est pas supporté + + + The file could not be accessed. + Impossible d'accéder au fichier. + + + Playlist format is not supported. + - QPrintPropertiesWidget + QMenu - Form - Formulaire + Close + Fermer - Page - + Open + Ouvrir - Advanced - Avancé + Execute + Exécuter - QPrintSettingsOutput - - Form - Formulaire - + QMenuBar - Copies - Copies + About + A propos - Print range - Imprimer la sélection + Config + Configuration - Print all - Imprimer tout + Preference + Préférence - Pages from - Pages + Options + Options - to - à + Setting + Paramètre - Selection - Sélection + Setup + Réglage - Output Settings - Paramètres de sortie + Quit + Quitter - Copies: - Copies : + Exit + Quitter - Collate - Assembler + About %1 + A propos de %1 - Reverse - Inverse + About Qt + À propos de Qt - Options - Options + Preferences + Préférences - Color Mode - Mode de couleur + Quit %1 + Quitter %1 - Color - Couleur + Actions + Actions + + + QMessageBox - Grayscale - Dégradé de gris + OK + OK - Duplex Printing - Impression en duplex + About Qt + À propos de Qt - None - Aucun + Help + Aide - Long side - Côté long + <p>This program uses Qt version %1.</p> + <p>Ce programme utilise la version %1 de Qt.</p> - Short side - Côté court + <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qt.nokia.com/">qt.nokia.com/</a> for more information.</p> + <h3>A propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'applications multi-platformes.</p><p>Qt fournit la portabilité du code source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et toutes les variantes commerciales majeures d'Unix. Qt est aussi disponible pour les systèmes embarqués sous le nom Qtopia Core.</p><p>Qt est un produit de Trolltech. <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - - - QPrintWidget - Form - Formulaire + Show Details... + Montrer les détails... - Printer - Imprimante + Hide Details... + Cacher les détails... - &Name: - &Nom : + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> + <h3>À propos de Qt</h3><p>Ce programme utilise Qt version %1.</p><p>Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.</p><p>Qt fournit une portabilité source unique pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés tels que Qt pour Embedded Linux et Qt pour Windows CE.</p><p>Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.</p><p>Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.</p><p>Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.</p><p>Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.</p><p>Veuillez consulter<a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> pour un aperçu des concessions de licences Qt.</p><p>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</p><p>Qt est un produit Nokia. Voir <a href="http://qt.nokia.com/">qt.nokia.com</a> pour de plus amples informations.</p> - P&roperties - P&ropriétés + <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> + <h3>A propos de Qt</h3>%1<p>Qt est un framework de développement d'applications multi-plateforme.</p><p>Qt fournit la portabilité du code source surMS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, et toutes les variantes majeures d'Unix. Qt est aussi disponible pour l'embarqué avec Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt est un produit de Nokia. Allez à <a href="http://qt.nokia.com/">qt.nokia.com</a> pour plus d'informations.</p> - Location: - Emplacement : + <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qt.nokia.com/company/model/">qt.nokia.com/company/model/</a> for an overview of Qt licensing.</p> + <p>Ce programme utilise Qt Open Source Edition version %1.</p><p>Qt Open Source Edition est prévu pour le développement d'applications Open Source. Vous devez avoir un license commerciale de Qt pour développer des applications propiétaires (Closed Source).</p><p>Vous pouvez aller sur <a href="http://qt.nokia.com/company/model/">qt.nokia.com/company/model/</a> pour plus d'informations sur les licenses Qt.</p> - Preview - Prévisualisation + <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt Embedded.</p><p>Qt is a Trolltech product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> + <h3>A propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'application multi-plateforme.</p><p>Qt fournit la portabilité de votre source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, toutes les variantes majeures d'Unix. Qt est aussi disponible pour les périphériques embarqués avec Qt Embedded.</p><p>Qt est un produit de Trolltech. Voir <a href="http://qt.nokia.com/">qt.nokia.com</a> pour plus d'informations.</p> - Type: - Type : + <h3>About Qt</h3><p>This program uses Qt version %1.</p> + <h3>À propos de Qt</h3><p>Ce programme utilise Qt version %1.</p> - Output &file: - &Fichier de sortie: + <p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> + <p>Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.</p><p>Qt fournit une portabilité source unique pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés tels que Qt pour Embedded Linux et Qt pour Windows CE.</p><p>Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.</p><p>Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.</p><p>Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.</p><p>Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.</p><p>Veuillez consulter<a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> pour un aperçu des concessions de licences Qt.</p><p>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</p><p>Qt est un produit Nokia. Voir <a href="http://qt.nokia.com/">qt.nokia.com</a> pour de plus amples informations.</p> + + + QMultiInputContext - ... - + Select IM + Sélectionner IM - QProcess + QMultiInputContextPlugin - Could not open input redirection for reading - Impossible d'ouvrir la redirection d'entrée en lecture + Multiple input method switcher + Sélectionneur de méthode de saisie - Could not open output redirection for writing - Impossible d'ouvrir la redirection de sortie pour écriture + Multiple input method switcher that uses the context menu of the text widgets + Sélectionneur de méthode de saisie qui utilise le menu contextuel des widgets de texte + + + QNativeSocketEngine - Resource error (fork failure): %1 - Erreur de ressouce (fork) : %1 + The remote host closed the connection + L'hôte distant a fermé la connexion - Process operation timed out - Operation de processus a expiré + Network operation timed out + L'opération réseau a expiré - Error reading from process - Erreur de lecture du processus + Out of resources + Manque de ressources - Error writing to process - Erreur d"écriture vers le processus + Unsupported socket operation + Opération socket non supportée - Process crashed - Le processus à planté + Protocol type not supported + Protocol non géré - No program defined - Aucun programme défini + Invalid socket descriptor + Descripteur de socket invalide - - Process failed to start - Le processus n'a pas démarré + Network unreachable + Réseau impossible à rejoindre - Process failed to start: %1 - Le démarrage du processus a échoué: %1 + Permission denied + Accès refusé - - - QProgressDialog - Cancel - Annuler + Connection timed out + Connexion expirée - - - QPushButton - Open - Ouvrir + Connection refused + Connexion refusée - - - QRadioButton - Check - Cocher + The bound address is already in use + L'adresse liée est déjà en usage - - - QRegExp - no error occurred - aucune erreur ne s'est produite + The address is not available + L'adresse n'est pas disponible - disabled feature used - option désactivée + The address is protected + L'adresse est protégée - bad char class syntax - syntaxe invalide pour classe de caractère + Unable to send a message + Impossible d'envoyer un message - bad lookahead syntax - syntaxe invalide pour lookahead + Unable to receive a message + Impossible de recevoir un message - bad repetition syntax - syntaxe invalide pour répétition + Unable to write + Impossible d'écrire - invalid octal value - valeur octale invalide + Network error + Erreur réseau - missing left delim - délémiteur gauche manquant + Another socket is already listening on the same port + Un autre socket écoute déjà sur le même port - unexpected end - fin impromptue + Unable to initialize non-blocking socket + Impossible d'initialiser le socket asynchrone - met internal limit - rencontré limite interne - - - invalid interval - intervalle non valide + Unable to initialize broadcast socket + Impossible d'initialiser le socket broadcast - invalid category - catégorie non valide + Attempt to use IPv6 socket on a platform with no IPv6 support + Tentative d'utiliser un socket IPv6 sur une plateforme qui ne supporte pas IPv6 - - - QSQLite2Driver - - Error to open database - Erreur à l'ouverture de la base de données + Host unreachable + Hôte inaccessible - Unable to begin transaction - Impossible de démarrer la transaction + Datagram was too large to send + Le datagramme était trop grand pour être envoyé - Unable to commit transaction - Impossible de soumettre la transaction + Operation on non-socket + Operation sur non-socket - - Unable to rollback Transaction - Impossible d'annuler la transaction + Unknown error + Erreur inconnue - Error opening database - Erreur lors de l'ouverture de la base de données + The proxy type is invalid for this operation + Le type de proxy est invalide pour cette opération + + + QNetworkAccessCacheBackend - Unable to rollback transaction - Impossible de répéter la transaction + Error opening %1 + Erreur lors de l'ouverture de %1 - QSQLite2Result + QNetworkAccessDataBackend - Unable to fetch results - Impossible de récupérer les résultats + Operation not supported on %1 + Opération non supportée sur %1 - Unable to execute statement - Impossible d'exécuter la requête + Invalid URI: %1 + URI invalide : %1 - QSQLiteDriver + QNetworkAccessDebugPipeBackend - Error opening database - Erreur lors de l'ouverture de la base de données + Write error writing to %1: %2 + Erreur lors de l'écriture dans %1: %2 - Error closing database - Erreur lors de la fermeture de la base de données + Socket error on %1: %2 + Erreur de socket sur %1 : %2 - Unable to begin transaction - Impossible de démarrer la transaction + Remote host closed the connection prematurely on %1 + L'hôte distant a fermé sa connexion de façon prématurée sur %1 + + + + QNetworkAccessFileBackend + + Request for opening non-local file %1 + Requête d'ouverture de fichier distant %1 - Unable to commit transaction - Incapable de soumettre la transaction + Error opening %1: %2 + Erreur lors de l'ouverture de %1 : %2 - Unable to roll back transaction - Impossible d'annuler la transaction + Write error writing to %1: %2 + Erreur d'écriture de %1 : %2 - Unable to rollback transaction - Impossible d'annuler la transaction + Cannot open %1: Path is a directory + Impossible d'ouvrir %1 : le chemin est un dossier - - - QSQLiteResult - Unable to fetch row - Impossible de récupérer la rangée + Read error reading from %1: %2 + Erreur de lecture de %1 : %2 + + + QNetworkAccessFtpBackend - Unable to execute statement - Impossible d'exécuter la requête + No suitable proxy found + Aucun proxy trouvé - Unable to reset statement - Impossible de réinitialiser la requête + Cannot open %1: is a directory + Impossible d'ouvrir %1 : le chemin est un dossier - Unable to bind parameters - Impossible d'attacher les paramètres + Logging in to %1 failed: authentication required + Connexion à %1 a échoué : authentification requise - Parameter count mismatch - Nombre de paramètres incorrect + Error while downloading %1: %2 + Erreur lors du téléchargement de %1 : %2 - No query - Pas de requête + Error while uploading %1: %2 + Erreur lors de l'envoi de %1 : %2 - QScrollBar + QNetworkAccessHttpBackend - Scroll here - Défiler jusqu'ici + No suitable proxy found + Aucun proxy trouvé + + + QNetworkAccessManager - Left edge - Extrême gauche + Network access is disabled. + L'accès au réseau est désactivé. + + + QNetworkReply - Top - En haut + Error downloading %1 - server replied: %2 + Erreur lors du téléchargement de %1 - le serveur a répondu: %2 - Right edge - Extrême droite + Protocol "%1" is unknown + Le protocole "%1" est inconnu - Bottom - En bas + Network session error. + Erreur de session réseau. - Page left - Page précédente + Temporary network failure. + Erreur réseau temporaire. + + + QNetworkReplyImpl - Page up - Page précédente + Operation canceled + Opération annulée + + + QNetworkSession - Page right - Page suivante + Invalid configuration. + Configuration invalide. + + + QNetworkSessionPrivateImpl - Page down - Page suivante + Roaming error + Erreur de roaming - Scroll left - Défiler vers la gauche + Session aborted by user or system + Session annulée par l'utilisateur ou le système - Scroll up - Défiler vers le haut + Unidentified Error + Erreur inconnue - Scroll right - Défiler vers la droite + Unknown session error. + Erreur de session inconnue. - Scroll down - Défiler vers le bas + The session was aborted by the user or system. + la session a été annulée par l'utilisateur ou le système. - Line up - Aligner + The requested operation is not supported by the system. + L'opération requise n'est pas suportée par le système. - Position - Position + The specified configuration cannot be used. + La configuration spécifiée ne peut être utilisée. - Line down - Aligner en-bas + Roaming was aborted or is not possible. + Le roaming a été annulé ou est impossible. - QSharedMemory + QOCIDriver - %1: unable to set key on lock - %1 : impossible d'affecter la clé au verrou + Unable to logon + Impossible d'ouvrir une session - %1: create size is less then 0 - %1 : taille de création est inférieur à 0 + Unable to initialize + QOCIDriver + L'initialisation a échoué - %1: unable to lock - %1 : impossible de vérrouiller + Unable to begin transaction + Impossible de démarrer la transaction - %1: unable to unlock - %1 : impossible de déverrouiller + Unable to commit transaction + Impossible d'enregistrer la transaction - %1: permission denied - %1 : permission refusée + Unable to rollback transaction + Impossible d'annuler la transaction - %1: already exists - %1 : existe déjà + Unable to initialize + L'initialisation a échoué + + + QOCIResult - %1: doesn't exists - %1 : n'existe pas + Unable to bind column for batch execute + Impossible d'attacher la colonne pour une execution batch - %1: out of resources - %1 : plus de ressources disponibles + Unable to execute batch statement + Impossible d'exécuter l'instruction batch - %1: unknown error %2 - %1 : erreur inconnue %2 + Unable to goto next + Impossible de passer au suivant - %1: key is empty - %1 : clé vide + Unable to alloc statement + Impossible d'allouer la requête - - %1: unix key file doesn't exists - %1 : le fichier de clé unix n'existe pas + Unable to prepare statement + Impossible de préparer la requête - %1: ftok failed - %1 : ftok a échoué + Unable to bind value + Impossible d'attacher la valeur - %1: unable to make key - %1 : impossible de créer la clé + Unable to execute select statement + Impossible d'exéctuer la requête select - %1: system-imposed size restrictions - %1 : le système impose des restrictions sur la taille + Unable to execute statement + Impossible d'exéctuer la requête - %1: not attached - %1 : non attaché + Unable to get statement type + Impossible d'obtenir le type de la requête + + + QODBCDriver - %1: invalid size - %1 : taille invalide + Unable to connect + Incapable d'établir une connexion - %1: key error - %1 : erreur de clé + Unable to connect - Driver doesn't support all needed functionality + Impossible de se connecter - Le pilote ne supporte pas toutes les fonctionnalités nécessaires - %1: size query failed - %1 : la requête de taille a échoué + Unable to disable autocommit + Impossible de désactiver l'autocommit - %1: doesn't exist - %1: n'existe pas + Unable to commit transaction + Incapable de soumettre la transaction - %1: UNIX key file doesn't exist - %1: le fichier de clés UNIX n'existe pas + Unable to rollback transaction + Incapable d'annuler la transaction - - - QShortcut - Space - Espace + Unable to enable autocommit + Impossible d'activer l'autocommit - Esc - Échap + Unable to connect - Driver doesn't support all functionality required + Impossible de se connecter - Le pilote ne supporte pas toutes les fonctionnalités nécessaires + + + QODBCResult - Tab - Tab + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration + QODBCResult::reset: Impossible d'utiliser 'SQL_CURSOR_STATIC' comme attribut de requête. Veuillez vérifier la configuration de votre pilote ODBC - Backtab - Tab arr + Unable to execute statement + Impossible d'exéctuer la requête - Backspace - Effacement + Unable to fetch next + Impossible de récupérer le suivant - Return - Retour + Unable to prepare statement + Impossible de préparer la requête - Enter - Entrée + Unable to bind variable + Impossible d'attacher la variable - Ins - Inser + Unable to fetch last + Impossible de récupérer le dernier - Del - Suppr + Unable to fetch + Impossible de récupérer - Pause - Pause + Unable to fetch first + Impossible de récupérer le premier - Print - Impr écran + Unable to fetch previous + Impossible de récupérer le précedent + + + QObject - SysReq - Syst + Home + Début - Home - Début + Operation not supported on %1 + Opération non supportée sur %1 - End - Fin + Invalid URI: %1 + URI invalide : %1 - Left - Gauche + Write error writing to %1: %2 + Erreur d'écriture sur %1 : %2 - Up - Haut + Read error reading from %1: %2 + Erreur de lecture sur %1 : %2 - Right - Droite + Socket error on %1: %2 + Erreur de socket sur %1 : %2 - Down - Bas + Remote host closed the connection prematurely on %1 + L'hôte distant a fermé sa connexion de façon prématurée sur %1 - PgUp - Page préc + Protocol error: packet of size 0 received + Erreur de protocole: paquet de taille 0 reçu - PgDown - Page suiv + No host name given + Nom d'hôte manquant - CapsLock - Verr maj + Invalid hostname + Nom d'hôte non valide - NumLock - Verr num + PulseAudio Sound Server + Serveur de son PulseAudio - ScrollLock - Arrêt défil + "%1" duplicates a previous role name and will be disabled. + "%1" est un doublon d'un nom de role existant et sera désactivé. - Menu - Menu + invalid query: "%1" + Requête invalide : "%1" + + + QPPDOptionsModel - Help - Aide + Name + Nom - Back - Précédent (historique) + Value + Valeur + + + QPSQLDriver - Forward - Successeur (historique) + Unable to connect + Impossible d'établir une connexion - Stop - Stop + Could not begin transaction + Impossible de démarrer la transaction - Refresh - Rafraîchir + Could not commit transaction + Impossible de soumettre la transaction - Volume Down - Volume bas + Could not rollback transaction + Impossible d'annuler la transaction - Volume Mute - Volume muet + Unable to subscribe + Impossible de s'inscrire - Volume Up - Volume haut - + Unable to unsubscribe + Impossible de se désinscrire + + + QPSQLResult - Bass Boost - Graves fort + Unable to create query + Impossible de créer la requête - Bass Up - Graves haut + Unable to prepare statement + Impossible de préparer la requête + + + QPageSetupWidget - Bass Down - Graves bas + Centimeters (cm) + Centimètres (cm) - Treble Up - Aigus haut + Millimeters (mm) + Millimètres (mm) - Treble Down - Aigus bas + Inches (in) + Pouces (in) - Media Play - Média démarrer + Points (pt) + Points (pts) - Media Stop - Média arrêt + Form + Formulaire - Media Previous - Média précédent + Paper + Papier - Media Next - Média suivant + Page size: + Dimensions : - Media Record - Média enregistrer + Width: + Largeur : - Favorites - Préférés + Height: + Hauteur : - Search - Recherche + Paper source: + Source du papier : - Standby - Attente + Orientation + Orientation - Open URL - Ouvrir URL + Portrait + Portrait - Launch Mail - Lancer courrier + Landscape + Paysage - Launch Media - Lancer média + Reverse landscape + Paysage inversé - Launch (0) - Lancer (0) + Reverse portrait + Portrait inversé - Launch (1) - Lancer (1) + Margins + Marges - Launch (2) - Lancer (2) + top margin + marge haute - Launch (3) - Lancer (3) + left margin + marge gauche - Launch (4) - Lancer (4) + right margin + marge droite - Launch (5) - Lancer (5) + bottom margin + marge basse + + + QPluginLoader - Launch (6) - Lancer (6) + Unknown error + Erreur inconnue - Launch (7) - Lancer (7) + The plugin was not loaded. + Le plugin n'a pas été chargé. + + + QPrintDialog - Launch (8) - Lancer (8) + locally connected + connecté en local - Launch (9) - Lancer (9) + unknown + inconnu - Launch (A) - Lancer (A) + OK + OK - Launch (B) - Lancer (B) + Cancel + Annuler - Launch (C) - Lancer (C) + Print in color if available + Imprimer en couleur si possible - Launch (D) - Lancer (D) + Print all + Imprimer tout - Launch (E) - Lancer (E) - - - Launch (F) - Lancer (F) + Print range + Imprimer la sélection - Print Screen - Capture d'écran + Print last page first + Imprimer d'abord la dernière page - Page Up - Page haut + Number of copies: + Nombre de copies : - Page Down - Page bas + Paper format + Format du papier - Caps Lock - Verr Maj + Portrait + Portrait - Num Lock - Verr num + Landscape + Paysage - Number Lock - Verrouillage numérique + A0 (841 x 1189 mm) + A0 (841 x 1189 mm) - Scroll Lock - Arrêt défilement + A1 (594 x 841 mm) + A1 (594 x 841 mm) - Insert - Insérer + A2 (420 x 594 mm) + A2 (420 x 594 mm) - Delete - Supprimer + A3 (297 x 420 mm) + A3 (297 x 420 mm) - Escape - Échapement + A5 (148 x 210 mm) + A5 (148 x 210 mm) - System Request - Système + A6 (105 x 148 mm) + A6 (105 x 148 mm) - Select - Sélectionner + A7 (74 x 105 mm) + A7 (74 x 105 mm) - Yes - Oui + A8 (52 x 74 mm) + A8 (52 x 74 mm) - No - Non + A9 (37 x 52 mm) + A9 (37 x 52 mm) - Context1 - Contexte1 + B0 (1000 x 1414 mm) + B0 (1000 x 1414 mm) - Context2 - Contexte2 + B1 (707 x 1000 mm) + B1 (707 x 1000 mm) - Context3 - Contexte3 + B2 (500 x 707 mm) + B2 (500 x 707 mm) - Context4 - Contexte4 + B3 (353 x 500 mm) + B3 (353 x 500 mm) - Call - Appeler + B4 (250 x 353 mm) + B4 (250 x 353 mm) - Hangup - Raccrocher + B6 (125 x 176 mm) + B6 (125 x 176 mm) - Flip - Retourner + B7 (88 x 125 mm) + B7 (88 x 125 mm) - Ctrl - Ctrl + B8 (62 x 88 mm) + B8 (62 x 88 mm) - Shift - Maj + B9 (44 x 62 mm) + B9 (44 x 62 mm) - Alt - Alt + B10 (31 x 44 mm) + B10 (31 x 44 mm) - Meta - Méta + C5E (163 x 229 mm) + C5E (163 x 229 mm) - + - + + DLE (110 x 220 mm) + DLE (110 x 220 mm) - F%1 - F%1 + Folio (210 x 330 mm) + Folio (210 x 330 mm) - Home Page - Page d'accueil + Ledger (432 x 279 mm) + Ledger (432 x 279 mm) - Monitor Brightness Up - Augmenter la luminosité du moniteur + Tabloid (279 x 432 mm) + Tabloïde (279 x 432 mm) - Monitor Brightness Down - Baisser la luminosité du moniteur + US Common #10 Envelope (105 x 241 mm) + US Common #10 Envelope (105 x 241 mm) - Keyboard Light On/Off - Avec/sans lumière clavier + Print current page + Imprimer la page courante - Keyboard Brightness Up - Augmenter la luminosité du clavier + Aliases: %1 + Alias : %1 - Keyboard Brightness Down - Baisser la luminosité du clavier + A4 (210 x 297 mm, 8.26 x 11.7 inches) + A4 (210 x 297 mm) - Power Off - Couper l'alimentation + B5 (176 x 250 mm, 6.93 x 9.84 inches) + B5 (176 x 250 mm) - Wake Up - Réveiller + Executive (7.5 x 10 inches, 191 x 254 mm) + Executive (7,5 x 10 pouces, 191 x 254 mm) - Eject - Éjecter + Legal (8.5 x 14 inches, 216 x 356 mm) + Legal (8.5 x 14 pouces, 216 x 356 mm) - Screensaver - Économiseur d'écran + Letter (8.5 x 11 inches, 216 x 279 mm) + Letter (8,5 x 11 pouces, 216 x 279 mm) - WWW - WWW + Print selection + Imprimer la sélection - Sleep - Dormir + Page size: + Dimensions : - LightBulb - Ampoule + Orientation: + Orientation : - Shop - Magasin + Paper source: + Source du papier : - History - Historique + Print + Imprimer - Add Favorite - Ajouter favori + File + Fichier - Hot Links - Liens chauds + Printer + Imprimante - Adjust Brightness - Régler la luminosité + Print To File ... + Imprimer dans un fichier... - Finance - Finances + Print dialog + Fenêtre d'impression - Community - Communauté + Size: + Taille : - Audio Rewind - Audio arrière + Properties + Propriétés - Back Forward - Retour avant + Printer info: + Informations sur l'imprimante : - Application Left - Application gauche + Browse + Parcourir - Application Right - Application droite + Print to file + Imprimer dans un fichier - Book - Livre + Pages from + Pages - CD - CD + to + à - Calculator - Calculatrice + Selection + Sélection - Clear - Effacer + Copies + Copies - Clear Grab - Effacer la prise + Collate + Assembler - Close - Fermer + Other + Autre - Copy - Copier + Double side printing + Impression recto verso - Cut - Couper + File %1 is not writable. +Please choose a different file name. + Impossible d'écrire dans le fichier %1. +Veuillez choisir un nom de fichier différent. - Display - Affichage + %1 already exists. +Do you want to overwrite it? + %1 existe. +Voulez-vous l'écraser ? - DOS - DOS + File exists + Le fichier existe - Documents - Documents + <qt>Do you want to overwrite it?</qt> + <qt>voulez-vous l'écraser ?</qt> - Spreadsheet - Feuille de calcul + %1 is a directory. +Please choose a different file name. + %1 est un dossier. +Veuillez choisir un nom de fichier différent. - Browser - Navigateur + A0 + - Game - Jeu + A1 + - Go - Aller + A2 + - iTouch - iTouch + A3 + - Logoff - Fermer une session + A4 + - Market - Marché + A5 + - Meeting - Réunion + A6 + - Keyboard Menu - Menu du clavier + A7 + - Menu PB - Menu PB + A8 + - My Sites - Mes sites + A9 + - News - Actualités + B0 + - Home Office - Bureau à domicile + B1 + - Option - Option + B2 + - Paste - Coller + B3 + - Phone - Téléphone + B4 + - Reply - Répondre + B5 + - Reload - Recharger + B6 + - Rotate Windows - Faire tourner la fenêtre + B7 + - Rotation PB - Rotation PB + B8 + - Rotation KB - Rotation KB + B9 + - Save - Enregistrer + B10 + - Send - Envoyer + C5E + - Spellchecker - Correcteur orthographique + DLE + - Split Screen - Partager l'écran + Executive + - Support - Supporter + Folio + - Task Panel - Panneau de tâches + Ledger + - Terminal - Terminal + Legal + - Tools - Outils + Letter + - Travel - Voyager + Tabloid + - Video - Vidéo + US Common #10 Envelope + - Word Processor - Traitement de texte + Custom + Personnalisé - XFer - XFer + &Options >> + - Zoom In - Agrandir + &Print + Im&primer - Zoom Out - Rétrécir + &Options << + - Away - Absent + Print to File (PDF) + Imprimer dans un fichier (PDF) - Messenger - Messagerie instantanée + Print to File (Postscript) + Imprimer dans un fichier (PostScript) - WebCam - Webcaméra + Local file + Fichier local - Mail Forward - Faire suivre l'e-mail + Write %1 file + Ecriture du fichier %1 - Pictures - Images + The 'From' value cannot be greater than the 'To' value. + La valeur 'de' ne peut pas être plus grande que la valeur 'à'. + + + QPrintPreviewDialog - Music - Musique + %1% + %1% - Battery - Batterie + Print Preview + Aperçu avant impression - Bluetooth - Bluetooth + Next page + Page suivante - Wireless - Sans fil + Previous page + Page précédente - Ultra Wide Band - Bande ultralarge + First page + Première page - Audio Forward - Audio avant + Last page + Dernière page - Audio Repeat - Audio répéter + Fit width + Ajuster la largeur - Audio Random Play - Audio lecture aléatoire + Fit page + Ajuster la page - Subtitle - Sous-titre + Zoom in + Zoom avant - Audio Cycle Track - Audio répéter la piste + Zoom out + Zoom arrière - Time - Heure + Portrait + Portrait - View - Afficher + Landscape + Paysage - Top Menu - Haut du menu + Show single page + Afficher une seule page - Suspend - Suspendre + Show facing pages + Afficher deux pages - Hibernate - Hiberner + Show overview of all pages + Afficher un aperçu de toutes les pages - - - QSlider - Page left - Page précédente + Print + Imprimer - Page up - Page précédente + Page setup + Mise en page - Position - Position + Close + Fermer - Page right - Page suivante + Export to PDF + Exporter vers PDF - Page down - Page suivante + Export to PostScript + Exporter vers PostScript + + + Page Setup + Mise en page - QSocks5SocketEngine + QPrintPropertiesDialog - Connection to proxy refused - Connexion au proxy refusée + PPD Properties + Propriétés PPD - Connection to proxy closed prematurely - connexion au proxy fermée prématurément - - - Proxy host not found - Hôte proxy introuvable + Save + Enregistrer - Connection to proxy timed out - Connexion au proxy expirée + OK + OK + + + QPrintPropertiesWidget - Proxy authentication failed - L'authentification proxy a échoué + Form + Formulaire - Proxy authentication failed: %1 - L'authentification proxy a échoué : %1 + Page + - SOCKS version 5 protocol error - Erreur de protocole SOCKS version 5 + Advanced + Avancé + + + QPrintSettingsOutput - General SOCKSv5 server failure - Erreur générale du serveur SOCKSv5 + Form + Formulaire - Connection not allowed by SOCKSv5 server - Connexion refusée par le serveur SOCKSv5 + Copies + Copies - TTL expired - TTL expiré + Print range + Imprimer la sélection - SOCKSv5 command not supported - Commande SOCKSv5 non supportée + Print all + Imprimer tout - Address type not supported - Type d'adresse non supporté + Pages from + Pages - Unknown SOCKSv5 proxy error code 0x%1 - Erreur proxy SOCKSv5 inconnue : 0x%1 + to + à - Socks5 timeout error connecting to socks server - Erreur d'expiration socks5 lors de l'établissement d'une connexion au serveur socks + Selection + Sélection - Network operation timed out - L'opération réseau a expiré + Output Settings + Paramètres de sortie - - - QSpinBox - More - Plus + Copies: + Copies : - Less - Moins + Collate + Assembler - - - QSql - Delete - Supprimer + Reverse + Inverse - Delete this record? - Supprimer cet enregistrement ? + Options + Options - Yes - Oui + Color Mode + Mode de couleur - No - Non + Color + Couleur - Insert - Insérer + Grayscale + Dégradé de gris - Update - Actualiser + Duplex Printing + Impression en duplex - Save edits? - Enregistrer les modifications ? + None + Aucun - Cancel - Annuler + Long side + Côté long - Confirm - Confirmer + Short side + Côté court - Cancel your edits? - Annuler vos modifications ? + Current Page + Page courante - QSslSocket + QPrintWidget - Unable to write data: %1 - Impossible d'écrire les données : %1 + Form + Formulaire - Error while reading: %1 - Erreur lors de la lecture : %1 + Printer + Imprimante - Error during SSL handshake: %1 - Erreur lors de la poignée de main SSL : %1 + &Name: + &Nom : - Error creating SSL context (%1) - Erreur lors de la création du contexte SSL (%1) + P&roperties + P&ropriétés - Invalid or empty cipher list (%1) - La list de chiffrements est invalide ou vide (%1) + Location: + Emplacement : - Error creating SSL session, %1 - Erreur lors de la création de la session SSL, %1 + Preview + Prévisualisation - Error creating SSL session: %1 - Erreur lors de la création de la session SSL : %1 + Type: + Type : - Cannot provide a certificate with no key, %1 - Impossible de fournir un certificat sans clé, %1 + Output &file: + &Fichier de sortie: - Error loading local certificate, %1 - Erreur lors du chargement du certificat local, %1 + ... + + + + QProcess - Error loading private key, %1 - Erreur lors du chargement de la clé privée, %1 + Could not open input redirection for reading + Impossible d'ouvrir la redirection d'entrée en lecture - Private key do not certificate public key, %1 - La clé privée ne certifie pas la clé publique, %1 + Could not open output redirection for writing + Impossible d'ouvrir la redirection de sortie pour écriture - - Private key does not certificate public key, %1 - La clé privée ne certifie pas la clé publique, %1 + Resource error (fork failure): %1 + Erreur de ressouce (fork) : %1 - Unable to decrypt data: %1 - Impossible de décrypter les données: %1 + Process operation timed out + Operation de processus a expiré - Private key does not certify public key, %1 - La clé privée ne certifie pas la clé publique, %1 + Error reading from process + Erreur de lecture du processus - No error - Aucune erreur + Error writing to process + Erreur d"écriture vers le processus - The issuer certificate could not be found - Le certificat de l'émetteur est introuvable + Process crashed + Le processus à planté - The certificate signature could not be decrypted - La signature du certificat n'a pas pu être vérifiée + No program defined + Aucun programme défini - The public key in the certificate could not be read - La clé publique du certificat n'a pas pu être lue + Process failed to start + Le processus n'a pas démarré - The signature of the certificate is invalid - La signature du certificat n'est pas valide + Process failed to start: %1 + Le démarrage du processus a échoué: %1 + + + QProgressDialog - The certificate is not yet valid - Le certificat n'est pas encore valide + Cancel + Annuler + + + QPushButton - The certificate has expired - Le certificat a expiré + Open + Ouvrir + + + QRadioButton - The certificate's notBefore field contains an invalid time - Le champ pasAvant du certificat inclut une heure non valide + Check + Cocher + + + QRegExp - The certificate's notAfter field contains an invalid time - Le champ pasAprès du certificat inclut une heure non valide + no error occurred + aucune erreur ne s'est produite - The certificate is self-signed, and untrusted - Le certificat n'est pas sécurisé car auto-signé + disabled feature used + option désactivée - The root certificate of the certificate chain is self-signed, and untrusted - Le certificat racine de la chaîne de certificats n'est pas sécurisé car signé automatiquement + bad char class syntax + syntaxe invalide pour classe de caractère - The issuer certificate of a locally looked up certificate could not be found - Le certificat de l'émetteur d'un certificat converti localement est introuvable + bad lookahead syntax + syntaxe invalide pour lookahead - No certificates could be verified - Aucun certificat n'a pu être vérifié + bad repetition syntax + syntaxe invalide pour répétition - One of the CA certificates is invalid - L'un des certificats CA n'est pas valide + invalid octal value + valeur octale invalide - The basicConstraints path length parameter has been exceeded - Le paramètre de longueur du chemin basicConstraints a été dépassé + missing left delim + délémiteur gauche manquant - The supplied certificate is unsuitable for this purpose - Le certificat fourni ne convient pas pour cet objectif + unexpected end + fin impromptue - The root CA certificate is not trusted for this purpose - Le certificat CA racine n'est pas sécurisé pour cet objectif + met internal limit + rencontré limite interne - The root CA certificate is marked to reject the specified purpose - Le certificat CA racine est marqué pour rejeter l'objectif spécifié - - - The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate - Le certificat de l'émetteur candidat actuel a été rejeté car le nom de son sujet ne correspondait pas au nom de l'émetteur du certificat actuel - - - The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate - Le certificat de l'émetteur candidat actuel a été rejeté car le nom de son sujet et son numéro de série étaient présents et ne correspondaient pas à l'identifiant de la clé d'autorité du certificat actuel - - - The peer did not present any certificate - Le poste ne contient aucun certificat - - - The host name did not match any of the valid hosts for this certificate - Le nom d'hôte ne correspondait à aucun des hôtes valides pour ce certificat + invalid interval + intervalle non valide - Unknown error - Erreur inconnue + invalid category + catégorie non valide - QSystemSemaphore + QSQLite2Driver - %1: out of resources - %1: plus de ressources disponibles + Error to open database + Erreur à l'ouverture de la base de données - %1: permission denied - %1: permission refusée + Unable to begin transaction + Impossible de démarrer la transaction - %1: already exists - %1 : existe déjà + Unable to commit transaction + Impossible de soumettre la transaction - %1: does not exist - %1 : n'existe pas + Unable to rollback Transaction + Impossible d'annuler la transaction - %1: unknown error %2 - %1: erreur inconnue %2 + Error opening database + Erreur lors de l'ouverture de la base de données + + + Unable to rollback transaction + Impossible de répéter la transaction - QTDSDriver + QSQLite2Result - Unable to open connection - Impossible d'ouvrir la connexion + Unable to fetch results + Impossible de récupérer les résultats - Unable to use database - Impossible d'utiliser la base de données + Unable to execute statement + Impossible d'exécuter la requête - QTabBar + QSQLiteDriver - Scroll Left - Défiler vers la gauche + Error opening database + Erreur lors de l'ouverture de la base de données - Scroll Right - Défiler vers la droite + Error closing database + Erreur lors de la fermeture de la base de données - - - QTcpServer - Socket operation unsupported - Operation socket non supportée + Unable to begin transaction + Impossible de démarrer la transaction - Operation on socket is not supported - Opération sur le socket non supportée + Unable to commit transaction + Incapable de soumettre la transaction - - - QTextControl - &Undo - &Annuler + Unable to roll back transaction + Impossible d'annuler la transaction - &Redo - &Répéter + Unable to rollback transaction + Impossible d'annuler la transaction + + + QSQLiteResult - Cu&t - Co&uper + Unable to fetch row + Impossible de récupérer la rangée - &Copy - Cop&ier + Unable to execute statement + Impossible d'exécuter la requête - Copy &Link Location - Copier l'adresse du &lien + Unable to reset statement + Impossible de réinitialiser la requête - &Paste - Co&ller + Unable to bind parameters + Impossible d'attacher les paramètres - Delete - Supprimer + Parameter count mismatch + Nombre de paramètres incorrect - Select All - Tout sélectionner + No query + Pas de requête - QToolButton + QScriptBreakpointsModel - Press - Presser + ID + Identifiant - Open - Ouvrir + Location + Lieu - - - QUdpSocket - This platform does not support IPv6 - Cette plateforme ne supporte pas IPv6 + Condition + Condition - - - QUndoGroup - Undo - Annuler + Ignore-count + Comptes d'ignorés - Redo - Répéter + Single-shot + Un seul tir - - - QUndoModel - <empty> - <vide> + Hit-count + Compte de coups - QUndoStack + QScriptBreakpointsWidget - Undo - Annuler + New + Créer - Redo - Répéter + Delete + Supprimer - QUnicodeControlCharacterMenu + QScriptDebugger - LRM Left-to-right mark - LRM Left-to-right mark + Go to Line + Aller à la ligne - RLM Right-to-left mark - RLM Right-to-left mark + Line: + Ligne: - ZWJ Zero width joiner - ZWJ Zero width joiner + Interrupt + Interrompre - ZWNJ Zero width non-joiner - ZWNJ Zero width non-joiner + Shift+F5 + Shift+F5 - ZWSP Zero width space - ZWSP Zero width space + Continue + Continuer - LRE Start of left-to-right embedding - LRE Start of left-to-right embedding + F5 + F5 - RLE Start of right-to-left embedding - RLE Start of right-to-left embedding + Step Into + Pas à pas détaillé - LRO Start of left-to-right override - LRO Start of left-to-right override + F11 + F11 - RLO Start of right-to-left override - RLO Start of right-to-left override + Step Over + Pas à pas principal - PDF Pop directional formatting - PDF Pop directional formatting + F10 + F10 - Insert Unicode control character - Insérer caractère de contrôle Unicode + Step Out + Pas à pas sortant - - - QWebFrame - Request cancelled - Requête annulée + Shift+F11 + Shift+F11 - Request blocked - Requête bloquée + Run to Cursor + Exécuter au curseur - Cannot show URL - Impossible d'afficher l'URL + Ctrl+F10 + Ctrl+F10 - - Frame load interruped by policy change - Chargement de la frame interrompu par un changement de configuration + Run to New Script + Exécuter au nouveau script - Cannot show mimetype - Impossible d'afficher le mimetype + Toggle Breakpoint + Basculer le point d'arrêt - File does not exist - Le fichier n'existe pas + F9 + F9 - Frame load interrupted by policy change - Chargement du cadre interrompue par le changement de stratégie + Clear Debug Output + Effacer les résultats du débogage - - - QWebPage - - Submit - default label for Submit buttons in forms on web pages - Soumettre + Clear Error Log + Effacer le journal d'erreurs - - Submit - Submit (input element) alt text for <input> elements with no alt, title, or value - Soumettre + Clear Console + Effacer la console - - Reset - default label for Reset buttons in forms on web pages - Réinitialiser + &Find in Script... + &Chercher dans le script... - Searchable Index - text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' - Index recherchable + Ctrl+F + Ctrl+F - - Choose File - title for file button used in HTML forms - Choisir le fichier + Find &Next + Résultat &suivant + + + F3 + F3 + + + Find &Previous + Chercher &précédent + + + Shift+F3 + Shift+F3 + + + Ctrl+G + Ctrl+G + + + Debug + Déboguer + + + + QScriptDebuggerCodeFinderWidget + + Close + Fermer + + + Previous + Précédent + + + Next + Suivant + + + Case Sensitive + Sensible à la casse + + + Whole words + Mots complets + + + <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped + <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;La recherche est revenue au début + + + + QScriptDebuggerLocalsModel + + Name + Nom + + + Value + Valeur + + + + QScriptDebuggerStackModel + + Level + Niveau + + + Name + Nom + + + Location + Lieu + + + + QScriptEdit + + Toggle Breakpoint + Basculer le point d'arrêt + + + Disable Breakpoint + Désactiver le point d'arrêt + + + Enable Breakpoint + Activer le point d'arrêt + + + Breakpoint Condition: + Condition du point d'arrêt: + + + + QScriptEngineDebugger + + Loaded Scripts + Scripts chargés + + + Breakpoints + Points d'arrêt + + + Stack + Empiler + + + Locals + Locaux + + + Console + Console + + + Debug Output + Résultats du débogage + + + Error Log + Journal d'erreurs + + + Search + Chercher + + + View + Affichage + + + Qt Script Debugger + Débogueur de script Qt + + + + QScriptNewBreakpointWidget + + Close + Fermer + + + + QScrollBar + + Scroll here + Défiler jusqu'ici + + + Left edge + Extrême gauche + + + Top + En haut + + + Right edge + Extrême droite + + + Bottom + En bas + + + Page left + Page précédente + + + Page up + Page précédente + + + Page right + Page suivante + + + Page down + Page suivante + + + Scroll left + Défiler vers la gauche + + + Scroll up + Défiler vers le haut + + + Scroll right + Défiler vers la droite + + + Scroll down + Défiler vers le bas + + + Line up + Aligner + + + Position + Position + + + Line down + Aligner en-bas + + + + QSharedMemory + + %1: unable to set key on lock + %1 : impossible d'affecter la clé au verrou + + + %1: create size is less then 0 + %1 : taille de création est inférieur à 0 + + + %1: unable to lock + %1 : impossible de vérrouiller + + + %1: unable to unlock + %1 : impossible de déverrouiller + + + %1: permission denied + %1 : permission refusée + + + %1: already exists + %1 : existe déjà + + + %1: doesn't exists + %1 : n'existe pas + + + %1: out of resources + %1 : plus de ressources disponibles + + + %1: unknown error %2 + %1 : erreur inconnue %2 + + + %1: key is empty + %1 : clé vide + + + %1: unix key file doesn't exists + %1 : le fichier de clé unix n'existe pas + + + %1: ftok failed + %1 : ftok a échoué + + + %1: unable to make key + %1 : impossible de créer la clé + + + %1: system-imposed size restrictions + %1 : le système impose des restrictions sur la taille + + + %1: not attached + %1 : non attaché + + + %1: invalid size + %1 : taille invalide + + + %1: key error + %1 : erreur de clé + + + %1: size query failed + %1 : la requête de taille a échoué + + + %1: doesn't exist + %1: n'existe pas + + + %1: UNIX key file doesn't exist + %1: le fichier de clés UNIX n'existe pas + + + + QShortcut + + Space + This and all following "incomprehensible" strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used. + Espace + + + Esc + Échap + + + Tab + Tab + + + Backtab + Tab arr + + + Backspace + Effacement + + + Return + Retour + + + Enter + Entrée + + + Ins + Inser + + + Del + Suppr + + + Pause + Pause + + + Print + Imprimer + + + SysReq + Syst + + + Home + Début + + + End + Fin + + + Left + Gauche + + + Up + Haut + + + Right + Droite + + + Down + Bas + + + PgUp + Page préc + + + PgDown + Page suiv + + + CapsLock + Verr maj + + + NumLock + Verr num + + + ScrollLock + Arrêt défil + + + Menu + Menu + + + Help + Aide + + + Back + Précédent (historique) + + + Forward + Successeur (historique) + + + Stop + Arrêter + + + Refresh + Rafraîchir + + + Volume Down + Volume bas + + + Volume Mute + Volume muet + + + Volume Up + Volume haut + + + + Bass Boost + Graves fort + + + Bass Up + Graves haut + + + Bass Down + Graves bas + + + Treble Up + Aigus haut + + + Treble Down + Aigus bas + + + Media Play + Média démarrer + + + Media Stop + Média arrêt + + + Media Previous + Média précédent + + + Media Next + Média suivant + + + Media Record + Média enregistrer + + + Favorites + Préférés + + + Search + Recherche + + + Standby + Attente + + + Open URL + Ouvrir URL + + + Launch Mail + Lancer courrier + + + Launch Media + Lancer média + + + Launch (0) + Lancer (0) + + + Launch (1) + Lancer (1) + + + Launch (2) + Lancer (2) + + + Launch (3) + Lancer (3) + + + Launch (4) + Lancer (4) + + + Launch (5) + Lancer (5) + + + Launch (6) + Lancer (6) + + + Launch (7) + Lancer (7) + + + Launch (8) + Lancer (8) + + + Launch (9) + Lancer (9) + + + Launch (A) + Lancer (A) + + + Launch (B) + Lancer (B) + + + Launch (C) + Lancer (C) + + + Launch (D) + Lancer (D) + + + Launch (E) + Lancer (E) + + + Launch (F) + Lancer (F) + + + Print Screen + Capture d'écran + + + Page Up + Page haut + + + Page Down + Page bas + + + Caps Lock + Verr Maj + + + Num Lock + Verr num + + + Number Lock + Verrouillage numérique + + + Scroll Lock + Arrêt défilement + + + Insert + Insérer + + + Delete + Supprimer + + + Escape + Échapement + + + System Request + Système + + + Select + Sélectionner + + + Yes + Oui + + + No + Non + + + Context1 + Contexte1 + + + Context2 + Contexte2 + + + Context3 + Contexte3 + + + Context4 + Contexte4 + + + Call + Button to start a call (note: a separate button is used to end the call) + Appeler + + + Hangup + Button to end a call (note: a separate button is used to start the call) + Raccrocher + + + Toggle Call/Hangup + Button that will hang up if we're in call, or make a call if we're not. + Décrocher/Raccrocher + + + Flip + Retourner + + + Voice Dial + Button to trigger voice dialling + Commande vocale + + + Last Number Redial + Button to redial the last number called + Bis + + + Camera Shutter + Button to trigger the camera shutter (take a picture) + Déclencheur appareil photo + + + Camera Focus + Button to focus the camera + Focus appareil photo + + + Kanji + + + + Muhenkan + + + + Henkan + + + + Romaji + + + + Hiragana + + + + Katakana + + + + Hiragana Katakana + + + + Zenkaku + + + + Hankaku + + + + Zenkaku Hankaku + + + + Touroku + + + + Massyo + + + + Kana Lock + + + + Kana Shift + + + + Eisu Shift + + + + Eisu toggle + + + + Code input + + + + Multiple Candidate + Candidat multiple + + + Previous Candidate + Candidat précédent + + + Hangul + + + + Hangul Start + Hangul début + + + Hangul End + Hangul Fin + + + Hangul Hanja + + + + Hangul Jamo + + + + Hangul Romaja + + + + Hangul Jeonja + + + + Hangul Banja + + + + Hangul PreHanja + + + + Hangul PostHanja + + + + Hangul Special + + + + Ctrl + Ctrl + + + Shift + Maj + + + Alt + Alt + + + Meta + Méta + + + + + + + + + F%1 + F%1 + + + Home Page + Page d'accueil + + + Media Pause + Media player pause button + Média pause + + + Toggle Media Play/Pause + Media player button to toggle between playing and paused + Média Lecture/Pause + + + Monitor Brightness Up + Augmenter la luminosité du moniteur + + + Monitor Brightness Down + Baisser la luminosité du moniteur + + + Keyboard Light On/Off + Avec/sans lumière clavier + + + Keyboard Brightness Up + Augmenter la luminosité du clavier + + + Keyboard Brightness Down + Baisser la luminosité du clavier + + + Power Off + Couper l'alimentation + + + Wake Up + Réveiller + + + Eject + Éjecter + + + Screensaver + Économiseur d'écran + + + WWW + WWW + + + Sleep + Dormir + + + LightBulb + Ampoule + + + Shop + Magasin + + + History + Historique + + + Add Favorite + Ajouter favori + + + Hot Links + Liens chauds + + + Adjust Brightness + Régler la luminosité + + + Finance + Finances + + + Community + Communauté + + + Audio Rewind + Audio arrière + + + Back Forward + Retour avant + + + Application Left + Application gauche + + + Application Right + Application droite + + + Book + Livre + + + CD + CD + + + Calculator + Calculatrice + + + Clear + Effacer + + + Clear Grab + Effacer la prise + + + Close + Fermer + + + Copy + Copier + + + Cut + Couper + + + Display + Affichage + + + DOS + DOS + + + Documents + Documents + + + Spreadsheet + Feuille de calcul + + + Browser + Navigateur + + + Game + Jeu + + + Go + Aller + + + iTouch + iTouch + + + Logoff + Fermer une session + + + Market + Marché + + + Meeting + Réunion + + + Keyboard Menu + Menu du clavier + + + Menu PB + Menu PB + + + My Sites + Mes sites + + + News + Actualités + + + Home Office + Bureau à domicile + + + Option + Option + + + Paste + Coller + + + Phone + Téléphone + + + Reply + Répondre + + + Reload + Recharger + + + Rotate Windows + Faire tourner la fenêtre + + + Rotation PB + Rotation PB + + + Rotation KB + Rotation KB + + + Save + Enregistrer + + + Send + Envoyer + + + Spellchecker + Correcteur orthographique + + + Split Screen + Partager l'écran + + + Support + Supporter + + + Task Panel + Panneau de tâches + + + Terminal + Terminal + + + Tools + Outils + + + Travel + Voyager + + + Video + Vidéo + + + Word Processor + Traitement de texte + + + XFer + XFer + + + Zoom In + Agrandir + + + Zoom Out + Rétrécir + + + Away + Absent + + + Messenger + Messagerie instantanée + + + WebCam + Webcaméra + + + Mail Forward + Faire suivre l'e-mail + + + Pictures + Images + + + Music + Musique + + + Battery + Batterie + + + Bluetooth + Bluetooth + + + Wireless + Sans fil + + + Ultra Wide Band + Bande ultralarge + + + Audio Forward + Audio avant + + + Audio Repeat + Audio répéter + + + Audio Random Play + Audio lecture aléatoire + + + Subtitle + Sous-titre + + + Audio Cycle Track + Audio répéter la piste + + + Time + Heure + + + View + Affichage + + + Top Menu + Haut du menu + + + Suspend + Suspendre + + + Hibernate + Hiberner + + + + QSlider + + Page left + Page précédente + + + Page up + Page précédente + + + Position + Position + + + Page right + Page suivante + + + Page down + Page suivante + + + + QSocks5SocketEngine + + Connection to proxy refused + Connexion au proxy refusée + + + Connection to proxy closed prematurely + connexion au proxy fermée prématurément + + + Proxy host not found + Hôte proxy introuvable + + + Connection to proxy timed out + Connexion au proxy expirée + + + Proxy authentication failed + L'authentification proxy a échoué + + + Proxy authentication failed: %1 + L'authentification proxy a échoué : %1 + + + SOCKS version 5 protocol error + Erreur de protocole SOCKS version 5 + + + General SOCKSv5 server failure + Erreur générale du serveur SOCKSv5 + + + Connection not allowed by SOCKSv5 server + Connexion refusée par le serveur SOCKSv5 + + + TTL expired + TTL expiré + + + SOCKSv5 command not supported + Commande SOCKSv5 non supportée + + + Address type not supported + Type d'adresse non supporté + + + Unknown SOCKSv5 proxy error code 0x%1 + Erreur proxy SOCKSv5 inconnue : 0x%1 + + + Socks5 timeout error connecting to socks server + Erreur d'expiration socks5 lors de l'établissement d'une connexion au serveur socks + + + Network operation timed out + L'opération réseau a expiré + + + + QSoftKeyManager + + Ok + OK + + + Select + Sélectionner + + + Done + Terminer + + + Options + Options + + + Cancel + Annuler - - No file selected - text to display in file button used in HTML forms when no file is selected - Pas de fichier sélectionné + Exit + Quitter + + + QSpinBox - - Open in New Window - Open in New Window context menu item - Ouvrir dans une Nouvelle Fenêtre + More + Plus - - Save Link... - Download Linked File context menu item - Enregistrer le lien... + Less + Moins + + + QSql - - Copy Link - Copy Link context menu item - Copier le lien + Delete + Supprimer - - Open Image - Open Image in New Window context menu item - Ouvrir l'image + Delete this record? + Supprimer cet enregistrement ? - - Save Image - Download Image context menu item - Enregistrer l'image + Yes + Oui - - Copy Image - Copy Link context menu item - Copier l'image + No + Non - - Open Frame - Open Frame in New Window context menu item - Ouvrir le cadre + Insert + Insérer - - Copy - Copy context menu item - Copier + Update + Actualiser - - Go Back - Back context menu item - Précédent + Save edits? + Enregistrer les modifications ? - - Go Forward - Forward context menu item - Suivant + Cancel + Annuler - - Stop - Stop context menu item - Stop + Confirm + Confirmer - - Reload - Reload context menu item - Recharger + Cancel your edits? + Annuler vos modifications ? + + + QSslSocket - - Cut - Cut context menu item - Couper + Unable to write data: %1 + Impossible d'écrire les données : %1 - - Paste - Paste context menu item - Coller + Error while reading: %1 + Erreur lors de la lecture : %1 - - No Guesses Found - No Guesses Found context menu item - Pas de candidat trouvés + Error during SSL handshake: %1 + Erreur lors de la poignée de main SSL : %1 - - Ignore - Ignore Spelling context menu item - Ignorer + Error creating SSL context (%1) + Erreur lors de la création du contexte SSL (%1) - - Add To Dictionary - Learn Spelling context menu item - Ajouter au dictionnaire + Invalid or empty cipher list (%1) + La list de chiffrements est invalide ou vide (%1) - - Search The Web - Search The Web context menu item - Chercher sur le Web + Error creating SSL session, %1 + Erreur lors de la création de la session SSL, %1 - - Look Up In Dictionary - Look Up in Dictionary context menu item - Chercher dans le dictionnaire + Error creating SSL session: %1 + Erreur lors de la création de la session SSL : %1 - - Open Link - Open Link context menu item - Ouvrir le lien + Cannot provide a certificate with no key, %1 + Impossible de fournir un certificat sans clé, %1 - - Ignore - Ignore Grammar context menu item - Ignorer + Error loading local certificate, %1 + Erreur lors du chargement du certificat local, %1 - - Spelling - Spelling and Grammar context sub-menu item - Orthographe + Error loading private key, %1 + Erreur lors du chargement de la clé privée, %1 - - Show Spelling and Grammar - menu item title - Afficher Orthographe et Grammaire + Private key do not certificate public key, %1 + La clé privée ne certifie pas la clé publique, %1 - - Hide Spelling and Grammar - menu item title - Cacher Orthographe et Grammaire + Private key does not certificate public key, %1 + La clé privée ne certifie pas la clé publique, %1 - - Check Spelling - Check spelling context menu item - Vérifier l'orthographe + Unable to decrypt data: %1 + Impossible de décrypter les données: %1 - - Check Spelling While Typing - Check spelling while typing context menu item - Vérifier l'orthographe pendant la saisie + Private key does not certify public key, %1 + La clé privée ne certifie pas la clé publique, %1 - - Check Grammar With Spelling - Check grammar with spelling context menu item - Vérifier la grammaire en même temps que l'orthographe + No error + Aucune erreur - - Fonts - Font context sub-menu item - Polices + The issuer certificate could not be found + Le certificat de l'émetteur est introuvable - - Bold - Bold context menu item - Gras + The certificate signature could not be decrypted + La signature du certificat n'a pas pu être vérifiée - - Italic - Italic context menu item - Italique + The public key in the certificate could not be read + La clé publique du certificat n'a pas pu être lue - - Underline - Underline context menu item - Souligné + The signature of the certificate is invalid + La signature du certificat n'est pas valide - - Outline - Outline context menu item - Contour + The certificate is not yet valid + Le certificat n'est pas encore valide - - Direction - Writing direction context sub-menu item - + The certificate has expired + Le certificat a expiré - - Text Direction - Text direction context sub-menu item - Orientation du texte + The certificate's notBefore field contains an invalid time + Le champ pasAvant du certificat inclut une heure non valide - - Default - Default writing direction context menu item - Défaut + The certificate's notAfter field contains an invalid time + Le champ pasAprès du certificat inclut une heure non valide - - LTR - Left to Right context menu item - De la gauche vers la droite + The certificate is self-signed, and untrusted + Le certificat n'est pas sécurisé car auto-signé - - RTL - Right to Left context menu item - De la droite vers la gauche + The root certificate of the certificate chain is self-signed, and untrusted + Le certificat racine de la chaîne de certificats n'est pas sécurisé car signé automatiquement - - Inspect - Inspect Element context menu item - Inspecter + The issuer certificate of a locally looked up certificate could not be found + Le certificat de l'émetteur d'un certificat converti localement est introuvable - - No recent searches - Label for only item in menu that appears when clicking on the search field image, when no searches have been performed - Pas de recherche récente + No certificates could be verified + Aucun certificat n'a pu être vérifié - - Recent searches - label for first item in the menu that appears when clicking on the search field image, used as embedded menu title - Recherches récentes + One of the CA certificates is invalid + L'un des certificats CA n'est pas valide - - Clear recent searches - menu item in Recent Searches menu that empties menu's contents - Effacer les recherches récentes + The basicConstraints path length parameter has been exceeded + Le paramètre de longueur du chemin basicConstraints a été dépassé - - Unknown - Unknown filesize FTP directory listing item - Inconnu + The supplied certificate is unsuitable for this purpose + Le certificat fourni ne convient pas pour cet objectif - - %1 (%2x%3 pixels) - Title string for images - %1 (%2x%3 pixels) + The root CA certificate is not trusted for this purpose + Le certificat CA racine n'est pas sécurisé pour cet objectif + + + The root CA certificate is marked to reject the specified purpose + Le certificat CA racine est marqué pour rejeter l'objectif spécifié + + + The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate + Le certificat de l'émetteur candidat actuel a été rejeté car le nom de son sujet ne correspondait pas au nom de l'émetteur du certificat actuel + + + The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate + Le certificat de l'émetteur candidat actuel a été rejeté car le nom de son sujet et son numéro de série étaient présents et ne correspondaient pas à l'identifiant de la clé d'autorité du certificat actuel + + + The peer did not present any certificate + Le poste ne contient aucun certificat + + + The host name did not match any of the valid hosts for this certificate + Le nom d'hôte ne correspondait à aucun des hôtes valides pour ce certificat + + + Unknown error + Erreur inconnue + + + + QStateMachine + + Missing initial state in compound state '%1' + État initial manquant dans l'état composé '%1' - Web Inspector - %2 - Inspecteur Web - %2 + Missing default state in history state '%1' + État par défaut manquant dans l'état de l'historique '%1' - Bad HTTP request - Requête HTTP erronée + No common ancestor for targets and source of transition from state '%1' + Aucun ancêtre commun pour les cibles et la source de transition de l'état '%1' - - This is a searchable index. Enter search keywords: - text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' - Ceci est un index. Veuillez saisir les mots-clé : + Unknown error + Erreur inconnue + + + QSystemSemaphore - Scroll here - Défiler jusqu'ici + %1: out of resources + %1: plus de ressources disponibles - Left edge - À gauche + %1: permission denied + %1: permission refusée - Top - Haut + %1: already exists + %1 : existe déjà - Right edge - À droite + %1: does not exist + %1 : n'existe pas - Bottom - En bas + %1: unknown error %2 + %1: erreur inconnue %2 + + + QTDSDriver - Page left - Page gauche + Unable to open connection + Impossible d'ouvrir la connexion - Page up - Page haut + Unable to use database + Impossible d'utiliser la base de données + + + QTabBar - Page right - Page droite + Scroll Left + Défiler vers la gauche - Page down - Page bas + Scroll Right + Défiler vers la droite + + + QTcpServer - Scroll left - Défiler vers la gauche + Socket operation unsupported + Operation socket non supportée - Scroll up - Défiler vers le haut + Operation on socket is not supported + Opération sur le socket non supportée + + + QTextControl - Scroll right - Défiler vers la droite + &Undo + &Annuler - Scroll down - Défiler vers le bas + &Redo + &Rétablir - - - %n file(s) - number of chosen file - - %n fichier - %n fichiers - + + Cu&t + Co&uper - JavaScript Alert - %1 - Alerte JavaScript - %1 + &Copy + Cop&ier - JavaScript Confirm - %1 - Confirmation JavaScript - %1 + Copy &Link Location + Copier l'adresse du &lien - JavaScript Prompt - %1 - Invite JavaScript - %1 + &Paste + Co&ller - Move the cursor to the next character - Déplacer le curseur au caractère suivant + Delete + Supprimer - Move the cursor to the previous character - Déplacer le curseur au caractère précédent + Select All + Tout sélectionner + + + QToolButton - Move the cursor to the next word - Déplacer le curseur au mot suivant + Press + Appuyer - Move the cursor to the previous word - Déplacer le curseur au mot précédent + Open + Ouvrir + + + QUdpSocket - Move the cursor to the next line - Déplacer le curseur à la ligne suivante + This platform does not support IPv6 + Cette plateforme ne supporte pas IPv6 + + + QUndoGroup - Move the cursor to the previous line - Déplacer le curseur à la ligne précédente + Undo + Annuler - Move the cursor to the start of the line - Déplacer le curseur en début de ligne + Redo + Rétablir + + + QUndoModel - Move the cursor to the end of the line - Déplacer le curseur en fin de ligne + <empty> + <vide> + + + QUndoStack - Move the cursor to the start of the block - Déplacer le curseur au début du paragraphe + Undo + Annuler - Move the cursor to the end of the block - Déplacer le curseur à la fin du paragraphe + Redo + Rétablir + + + QUnicodeControlCharacterMenu - Move the cursor to the start of the document - Déplacer le curseur en début de document + LRM Left-to-right mark + LRM Left-to-right mark - Move the cursor to the end of the document - Déplacer le curseur en fin de document + RLM Right-to-left mark + RLM Right-to-left mark - Select all - Tout sélectionner + ZWJ Zero width joiner + ZWJ Zero width joiner - Select to the next character - Sélectionner jusqu'au caractère suivant + ZWNJ Zero width non-joiner + ZWNJ Zero width non-joiner - Select to the previous character - Sélectionner jusqu'au caractère précédent + ZWSP Zero width space + ZWSP Zero width space - Select to the next word - Sélectionner jusqu'au mot suivant + LRE Start of left-to-right embedding + LRE Start of left-to-right embedding - Select to the previous word - Sélectionner jusqu'au mot précédent + RLE Start of right-to-left embedding + RLE Start of right-to-left embedding - Select to the next line - Sélectionner jusqu'à la ligne suivante + LRO Start of left-to-right override + LRO Start of left-to-right override - Select to the previous line - Sélectionner jusqu'à la ligne précédente + RLO Start of right-to-left override + RLO Start of right-to-left override - Select to the start of the line - Sélectionner jusqu'en début de ligne + PDF Pop directional formatting + PDF Pop directional formatting - Select to the end of the line - Sélectionner jusqu'en fin de ligne + Insert Unicode control character + Insérer caractère de contrôle Unicode + + + QWebFrame - Select to the start of the block - Sélectionner jusqu'au début du paragraphe + Request cancelled + Requête annulée - Select to the end of the block - Sélectionner jusqu'à la fin du paragraphe + Request blocked + Requête bloquée - Select to the start of the document - Sélectionner jusqu'au début du document + Cannot show URL + Impossible d'afficher l'URL - Select to the end of the document - Sélectionner jusqu'à la fin du document + Frame load interruped by policy change + Chargement de la frame interrompu par un changement de configuration - Delete to the start of the word - Supprimer jusqu'au début du mot + Cannot show mimetype + Impossible d'afficher le mimetype - Delete to the end of the word - Supprimer jusqu'à la fin du mot + File does not exist + Le fichier n'existe pas - Insert a new paragraph - Insérer un nouveau paragraphe + Frame load interrupted by policy change + Chargement du cadre interrompue par le changement de stratégie + + + QWebPage - Insert a new line - Insérer une nouvelle ligne + Submit + default label for Submit buttons in forms on web pages + Soumettre Submit + Submit (input element) alt text for <input> elements with no alt, title, or value Soumettre Reset + default label for Reset buttons in forms on web pages Réinitialiser + Searchable Index + text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' + Index recherchable + + Choose File + title for file button used in HTML forms Choisir le fichier No file selected + text to display in file button used in HTML forms when no file is selected Pas de fichier sélectionné Open in New Window + Open in New Window context menu item Ouvrir dans une Nouvelle Fenêtre Save Link... - Enregistrer la cible du lien... + Download Linked File context menu item + Enregistrer le lien... Copy Link + Copy Link context menu item Copier le lien Open Image + Open Image in New Window context menu item Ouvrir l'image Save Image + Download Image context menu item Enregistrer l'image Copy Image + Copy Link context menu item Copier l'image Open Frame + Open Frame in New Window context menu item Ouvrir le cadre Copy + Copy context menu item Copier Go Back + Back context menu item Précédent Go Forward + Forward context menu item Suivant Stop - Stop + Stop context menu item + Arrêter Reload + Reload context menu item Recharger Cut + Cut context menu item Couper Paste + Paste context menu item Coller No Guesses Found + No Guesses Found context menu item Pas de candidat trouvés Ignore + Ignore Spelling context menu item Ignorer Add To Dictionary + Learn Spelling context menu item Ajouter au dictionnaire Search The Web + Search The Web context menu item Chercher sur le Web Look Up In Dictionary + Look Up in Dictionary context menu item Chercher dans le dictionnaire Open Link + Open Link context menu item Ouvrir le lien + Ignore + Ignore Grammar context menu item + Ignorer + + Spelling + Spelling and Grammar context sub-menu item Orthographe Show Spelling and Grammar + menu item title Afficher Orthographe et Grammaire Hide Spelling and Grammar + menu item title Cacher Orthographe et Grammaire Check Spelling + Check spelling context menu item Vérifier l'orthographe Check Spelling While Typing + Check spelling while typing context menu item Vérifier l'orthographe pendant la saisie Check Grammar With Spelling + Check grammar with spelling context menu item Vérifier la grammaire en même temps que l'orthographe Fonts + Font context sub-menu item Polices Bold + Bold context menu item Gras Italic + Italic context menu item Italique Underline + Underline context menu item Souligné Outline + Outline context menu item Contour Direction - Direction + Writing direction context sub-menu item + Text Direction + Text direction context sub-menu item Orientation du texte Default - Défaut + Default writing direction context menu item + Par défaut Left to Right + Left to Right context menu item Gauche à droite Right to Left + Right to Left context menu item Droite à gauche Loading... + Media controller status message when the media is loading Chargement... Live Broadcast + Media controller status message when watching a live broadcast Diffusion en direct Audio Element + Media controller element Élément audio Video Element + Media controller element Élément vidéo Mute Button + Media controller element Bouton de désactivation du son Unmute Button + Media controller element Bouton de réactivation du son Play Button + Media controller element Bouton de lecture Pause Button + Media controller element Bouton de pause Slider + Media controller element Barre de défilement Slider Thumb + Media controller element Curseur de la barre de défilement Rewind Button + Media controller element Bouton de retour en arrière Return to Real-time Button + Media controller element Bouton de retour au temps réel Elapsed Time + Media controller element Temps écoulé Remaining Time + Media controller element Durée restante Status Display + Media controller element Affichage de l'état Fullscreen Button + Media controller element Bouton de plein écran Seek Forward Button + Media controller element Bouton de recherche avant Seek Back Button + Media controller element Bouton de recherche arrière Audio element playback controls and status display + Media controller element Commandes de lecture et affichage de l'état de l'élément audio Video element playback controls and status display + Media controller element Commandes de lecture et affichage de l'état de l'élément vidéo Mute audio tracks + Media controller element Couper le son des pistes audio Unmute audio tracks + Media controller element Réactiver le son des pistes audio Begin playback + Media controller element Commencer la lecture Pause playback + Media controller element Pause lecture Movie time scrubber - Épurateur de la durée du film + Media controller element + Balayeur de durée du film Movie time scrubber thumb - Case de défilement de l'épurateur de la durée du film + Media controller element + Case de défilement du balayeur de la durée du film Rewind movie + Media controller element Rembobiner le film Return streaming movie to real-time + Media controller element Ramener le film en streaming en temps réel Current movie time - Durée du film actuel + Media controller element + Durée du film en cours Remaining movie time + Media controller element Durée de film restante Current movie status + Media controller element État du film actuel Play movie in full-screen mode + Media controller element Regarder le film en mode plein écran Seek quickly back + Media controller element Recherche rapide arrière Seek quickly forward + Media controller element Recherche rapide avant Indefinite time + Media time description Durée indéfinie %1 days %2 hours %3 minutes %4 seconds + Media time description %1 jours %2 heures %3 minutes %4 secondes %1 hours %2 minutes %3 seconds + Media time description %1 heures %2 minutes %3 secondes %1 minutes %2 seconds + Media time description %1 minutes %2 secondes %1 seconds + Media time description %1 secondes + LTR + Left to Right context menu item + De la gauche vers la droite + + + RTL + Right to Left context menu item + De la droite vers la gauche + + Inspect + Inspect Element context menu item Inspecter No recent searches + Label for only item in menu that appears when clicking on the search field image, when no searches have been performed Pas de recherche récente Recent searches + label for first item in the menu that appears when clicking on the search field image, used as embedded menu title Recherches récentes Clear recent searches + menu item in Recent Searches menu that empties menu's contents Effacer les recherches récentes + Missing Plug-in + Label text to be used when a plug-in is missing + Plug-in manquant + + Unknown + Unknown filesize FTP directory listing item Inconnu %1 (%2x%3 pixels) + Title string for images %1 (%2x%3 pixels) - This is a searchable index. Enter search keywords: - Ceci est un index. Veuillez saisir les mots-clé : - - - %n file(s) - - - - - - JavaScript Problem - %1 - Problème de JavaScript - %1 - - - The script on this page appears to have a problem. Do you want to stop the script? - Le script de cette page semble avoir un problème. Souhaitez-vous arrêter le script? - - - Paste and Match Style - Coller et suivre le style - - - Remove formatting - Retirer la mise en forme - - - Strikethrough - Barré - - - Subscript - Indice + Web Inspector - %2 + Inspecteur Web - %2 - Superscript - Exposant + Redirection limit reached + Limite de redirection atteinte - Insert Bulleted List - Insérer une liste à puces + Bad HTTP request + Requête HTTP erronée - Insert Numbered List - Insérer une liste numérotée + This is a searchable index. Enter search keywords: + text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' + Ceci est un index. Veuillez saisir les mots-clé : - Indent - Retrait + Scroll here + Défiler jusqu'ici - Outdent - Retrait négatif + Left edge + À gauche - Center - Centré + Top + Haut - Justify - Justifié + Right edge + À droite - Align Left - Aligner à gauche + Bottom + En bas - Align Right - Aligner à droite + Page left + Page gauche - - - QWhatsThisAction - What's This? - Qu'est-ce que c'est ? + Page up + Page haut - - - QWidget - * - + Page right + Page droite - - - QWizard - Go Back - Précédent + Page down + Page bas - Continue - Continuer + Scroll left + Défiler vers la gauche - Commit - si il s'agit de commit au même sens que git... (en même temps se marier en cliquant... ?!!?!) - Soumettre + Scroll up + Défiler vers le haut - Done - Terminer + Scroll right + Défiler vers la droite - Quit - Quitter + Scroll down + Défiler vers le bas - - Help - Aide + + %n file(s) + number of chosen file + + %n fichier + %n fichiers + - < &Back - < &Précédent + JavaScript Alert - %1 + Alerte JavaScript - %1 - &Finish - &Terminer + JavaScript Confirm - %1 + Confirmation JavaScript - %1 - Cancel - Annuler + JavaScript Prompt - %1 + Invite JavaScript - %1 - &Help - &Aide + Move the cursor to the next character + Déplacer le curseur au caractère suivant - &Next - &Suivant > + Move the cursor to the previous character + Déplacer le curseur au caractère précédent - &Next > - &Suivant > + Move the cursor to the next word + Déplacer le curseur au mot suivant - - - QWorkspace - &Restore - &Restaurer + Move the cursor to the previous word + Déplacer le curseur au mot précédent - &Move - &Déplacer + Move the cursor to the next line + Déplacer le curseur à la ligne suivante - &Size - &Taille + Move the cursor to the previous line + Déplacer le curseur à la ligne précédente - Mi&nimize - Réd&uire + Move the cursor to the start of the line + Déplacer le curseur en début de ligne - Ma&ximize - Ma&ximiser + Move the cursor to the end of the line + Déplacer le curseur en fin de ligne - &Close - &Fermer + Move the cursor to the start of the block + Déplacer le curseur au début du paragraphe - Stay on &Top - Rester au &premier plan + Move the cursor to the end of the block + Déplacer le curseur à la fin du paragraphe - Minimize - Réduire + Move the cursor to the start of the document + Déplacer le curseur en début de document - Restore Down - Restaurer en bas + Move the cursor to the end of the document + Déplacer le curseur en fin de document - Close - Fermer + Select all + Tout sélectionner - Sh&ade - Enrou&ler + Select to the next character + Sélectionner jusqu'au caractère suivant - %1 - [%2] - %1 - [%2] + Select to the previous character + Sélectionner jusqu'au caractère précédent - &Unshade - Dér&ouler + Select to the next word + Sélectionner jusqu'au mot suivant - - - QXml - no error occurred - aucune erreur ne s'est produite + Select to the previous word + Sélectionner jusqu'au mot précédent - error triggered by consumer - + Select to the next line + Sélectionner jusqu'à la ligne suivante - unexpected end of file - + Select to the previous line + Sélectionner jusqu'à la ligne précédente - more than one document type definition - + Select to the start of the line + Sélectionner jusqu'en début de ligne - error occurred while parsing element - + Select to the end of the line + Sélectionner jusqu'en fin de ligne - tag mismatch - + Select to the start of the block + Sélectionner jusqu'au début du paragraphe - error occurred while parsing content - + Select to the end of the block + Sélectionner jusqu'à la fin du paragraphe - unexpected character - + Select to the start of the document + Sélectionner jusqu'au début du document - invalid name for processing instruction - + Select to the end of the document + Sélectionner jusqu'à la fin du document - version expected while reading the XML declaration - + Delete to the start of the word + Supprimer jusqu'au début du mot - wrong value for standalone declaration - + Delete to the end of the word + Supprimer jusqu'à la fin du mot - error occurred while parsing document type definition - + Insert a new paragraph + Insérer un nouveau paragraphe - letter is expected - + Insert a new line + Insérer une nouvelle ligne - error occurred while parsing comment - + Submit + Soumettre - error occurred while parsing reference - + Reset + Réinitialiser - internal general entity reference not allowed in DTD - + Choose File + Choisir le fichier - external parsed general entity reference not allowed in attribute value - + No file selected + Pas de fichier sélectionné - external parsed general entity reference not allowed in DTD - + Open in New Window + Ouvrir dans une Nouvelle Fenêtre - unparsed entity reference in wrong context - + Save Link... + Enregistrer la cible du lien... - recursive entities - + Copy Link + Copier le lien - error in the text declaration of an external entity - + Open Image + Ouvrir l'image - encoding declaration or standalone declaration expected while reading the XML declaration - + Save Image + Enregistrer l'image - standalone declaration expected while reading the XML declaration - + Copy Image + Copier l'image - - - QXmlStream - Extra content at end of document. - + Open Frame + Ouvrir le cadre - Invalid entity value. - + Copy + Copier - Invalid XML character. - + Go Back + Précédent - Sequence ']]>' not allowed in content. - + Go Forward + Suivant - Namespace prefix '%1' not declared - + Stop + Stop - Attribute redefined. - + Reload + Recharger - Unexpected character '%1' in public id literal. - + Cut + Couper - Invalid XML version string. - + Paste + Coller - Unsupported XML version. - + No Guesses Found + Pas de candidat trouvés - %1 is an invalid encoding name. - + Ignore + Ignorer - Encoding %1 is unsupported - + Add To Dictionary + Ajouter au dictionnaire - Invalid XML encoding name. - Encodage XML invalide. + Search The Web + Chercher sur le Web - Standalone accepts only yes or no. - + Look Up In Dictionary + Chercher dans le dictionnaire - Invalid attribute in XML declaration. - + Open Link + Ouvrir le lien - Premature end of document. - + Spelling + Orthographe - Invalid document. - + Show Spelling and Grammar + Afficher Orthographe et Grammaire - Expected - + Hide Spelling and Grammar + Cacher Orthographe et Grammaire - , but got ' - + Check Spelling + Vérifier l'orthographe - Unexpected ' - + Check Spelling While Typing + Vérifier l'orthographe pendant la saisie - Expected character data. - + Check Grammar With Spelling + Vérifier la grammaire en même temps que l'orthographe - Recursive entity detected. - + Fonts + Polices - Start tag expected. - + Bold + Gras - XML declaration not at start of document. - + Italic + Italique - NDATA in parameter entity declaration. - + Underline + Souligné - %1 is an invalid processing instruction name. - + Outline + Contour - Invalid processing instruction name. - + Direction + Direction - Illegal namespace declaration. - + Text Direction + Orientation du texte - Invalid XML name. - + Default + Défaut - Opening and ending tag mismatch. - + Left to Right + Gauche à droite - Reference to unparsed entity '%1'. - + Right to Left + Droite à gauche - Entity '%1' not declared. - + Loading... + Chargement... - Reference to external entity '%1' in attribute value. - + Live Broadcast + Diffusion en direct - Invalid character reference. - + Audio Element + Élément audio - Encountered incorrectly encoded content. - + Video Element + Élément vidéo - The standalone pseudo attribute must appear after the encoding. - + Mute Button + Bouton de désactivation du son - %1 is an invalid PUBLIC identifier. - + Unmute Button + Bouton de réactivation du son - - - QtXmlPatterns - - An %1-attribute with value %2 has already been declared. - Un attribute %1 avec la valeur %2 est déjà déclaré. + Play Button + Bouton de lecture - - An %1-attribute must have a valid %2 as value, which %3 isn't. - Un attribute %1 doit avoir un %2 valide, %3 ne l'a pas. + Pause Button + Bouton de pause - Network timeout. - Le réseau ne répond pas. + Slider + Barre de défilement - Element %1 can't be serialized because it appears outside the document element. - L'élément %1 ne peut pas être sérialisé parce qu'il est hors de l'élément document. + Slider Thumb + Curseur de la barre de défilement - Attribute element %1 can't be serialized because it appears at the top level. - L'élément attribute %1 ne peut pas être sérialisé parce qu'il apparaît comme racine. + Rewind Button + Bouton de retour en arrière - Year %1 is invalid because it begins with %2. - L'année %1 est invalide parce qu'elle commence par %2. + Return to Real-time Button + Bouton de retour au temps réel - Day %1 is outside the range %2..%3. - Le jour %1 est hors de l'intervalle %2..%3. + Elapsed Time + Temps écoulé - Month %1 is outside the range %2..%3. - Le mois %1 est hors de l'intervalle %2..%3. + Remaining Time + Durée restante - Overflow: Can't represent date %1. - Overflow: ne peut pas représenter la date %1. + Status Display + Affichage de l'état - Day %1 is invalid for month %2. - Jour %1 est invalide pour le mois %2. + Fullscreen Button + Bouton de plein écran - Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; - L'heure 24:%1:%2.%3 est invalide. L'heure est 24 mais les minutes, seconndes et millisecondes ne sont pas à 0; + Seek Forward Button + Bouton de recherche avant - Time %1:%2:%3.%4 is invalid. - L'heure %1:%2:%3.%4 est invalide. + Seek Back Button + Bouton de recherche arrière - Overflow: Date can't be represented. - Overflow : la date ne peut pas être représentée. + Audio element playback controls and status display + Commandes de lecture et affichage de l'état de l'élément audio - At least one component must be present. - Au moins un composant doit être présent. + Video element playback controls and status display + Commandes de lecture et affichage de l'état de l'élément vidéo - At least one time component must appear after the %1-delimiter. - Au moins un composant doit apparaître après le délimiteur %1. + Mute audio tracks + Couper le son des pistes audio - - No operand in an integer division, %1, can be %2. - Pas d'opérande dans une division entière, %1, peut être %2. + Unmute audio tracks + Réactiver le son des pistes audio - - The first operand in an integer division, %1, cannot be infinity (%2). - Le premier opérande dans une division entière, %1, ne peut être infini (%2). + Begin playback + Commencer la lecture - - The second operand in a division, %1, cannot be zero (%2). - Le second opérande dans une division, %1, ne peut être nul (%2). + Pause playback + Pause lecture - %1 is not a valid value of type %2. - %1 n'est pas une valeur valide du type %2. + Movie time scrubber + Épurateur de la durée du film - When casting to %1 from %2, the source value cannot be %3. - En castant de %2 vers %1, la valeur source ne peut pas être %3. + Movie time scrubber thumb + Case de défilement de l'épurateur de la durée du film - Integer division (%1) by zero (%2) is undefined. - Division entière (%1) par zéro (%2) indéfinie. + Rewind movie + Rembobiner le film - Division (%1) by zero (%2) is undefined. - Division (%1) par zéro (%2) indéfinie. + Return streaming movie to real-time + Ramener le film en streaming en temps réel - Modulus division (%1) by zero (%2) is undefined. - Module division (%1) par zéro (%2) indéfinie. + Current movie time + Durée du film actuel - Dividing a value of type %1 by %2 (not-a-number) is not allowed. - Diviser une valeur du type %1 par %2 (not-a-number) est interdit. + Remaining movie time + Durée de film restante - Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed. - Diviser une valeur de type %1 par %2 ou %3 (plus ou moins zéro) est interdit. + Current movie status + État du film actuel - Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed. - La multiplication d'une valeur du type %1 par %2 ou %3 (plus ou moins infini) est interdite. + Play movie in full-screen mode + Regarder le film en mode plein écran - A value of type %1 cannot have an Effective Boolean Value. - Une valeur de type %1 ne peut pas avoir une Effective Boolean Value. + Seek quickly back + Recherche rapide arrière - Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - Effective Boolean Value ne peut être calculée pour une séquence contenant deux ou plus valeurs atomiques. + Seek quickly forward + Recherche rapide avant - Value %1 of type %2 exceeds maximum (%3). - La valeur %1 de type %2 excède le maximum (%3). + Indefinite time + Durée indéfinie - Value %1 of type %2 is below minimum (%3). - La valeur %1 de type %2 est inférieur au minimum (%3). + %1 days %2 hours %3 minutes %4 seconds + %1 jours %2 heures %3 minutes %4 secondes - A value of type %1 must contain an even number of digits. The value %2 does not. - Une valeur de type %1 doit contenir un nombre pair de chiffre. La valeur %2 n'est pas conforme. + %1 hours %2 minutes %3 seconds + %1 heures %2 minutes %3 secondes - %1 is not valid as a value of type %2. - %1 n'est pas une valeur valide de type %2. + %1 minutes %2 seconds + %1 minutes %2 secondes - Operator %1 cannot be used on type %2. - L'opérateur %1 ne peut pas être utilisé pour le type %2. + %1 seconds + %1 secondes - Operator %1 cannot be used on atomic values of type %2 and %3. - L'opérateur %1 ne peut pas être utilisé pour des valeurs atomiques de type %2 ou %3. + Inspect + Inspecter - The namespace URI in the name for a computed attribute cannot be %1. - L'URI de namespace dans le nom d'un attribut calculé ne peut pas être %1. + No recent searches + Pas de recherche récente - The name for a computed attribute cannot have the namespace URI %1 with the local name %2. - Le nom d'un attribut calculé ne peut pas avoir l'URI de namespace %1 avec le nom local %2. + Recent searches + Recherches récentes - Type error in cast, expected %1, received %2. - Erreur de type lors du cast, attendu %1 mais reçu %2. + Clear recent searches + Effacer les recherches récentes - When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed. - En castant vers %1 ou des types dérivés, la valeur source doit être du même type ou une chaîne. Le type %2 n'est pas autorisé. + Unknown + Inconnu - - No casting is possible with %1 as the target type. - Aucun cast n'est possible avec %1 comme type de destination. + %1 (%2x%3 pixels) + %1 (%2x%3 pixels) - - It is not possible to cast from %1 to %2. - Il est impossible de caster de %1 en %2. + This is a searchable index. Enter search keywords: + Ceci est un index. Veuillez saisir les mots-clé : - - Casting to %1 is not possible because it is an abstract type, and can therefore never be instantiated. - Caster vers %1 est impossible parce que c'est un type abstrait qui ne peut donc être instancié. + JavaScript Problem - %1 + Problème de JavaScript - %1 - - It's not possible to cast the value %1 of type %2 to %3 - I lest impossible de caster la valeur %1 de type %2 en %3 + The script on this page appears to have a problem. Do you want to stop the script? + Le script de cette page semble avoir un problème. Souhaitez-vous arrêter le script? - - Failure when casting from %1 to %2: %3 - Echec en castant de %1 ver %2 : %3 + Paste and Match Style + Coller et suivre le style - A comment cannot contain %1 - Un commentaire ne peut pas contenir %1 + Remove formatting + Retirer la mise en forme - A comment cannot end with a %1. - Un commentaire ne peut pas finir par %1. + Strikethrough + Barré - - No comparisons can be done involving the type %1. - Aucune comparaison ne peut être faite avec le type %1. + Subscript + Indice - - Operator %1 is not available between atomic values of type %2 and %3. - L'opérateur %1 n'est pas disponible entre valeurs atomiques de type %2 et %3. + Superscript + Exposant - An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - Un noeuds attribut ne peut être un fils d'un noeuds document. C'est pourquoi l'attribut %1 est mal placé. + Insert Bulleted List + Insérer une liste à puces - A library module cannot be evaluated directly. It must be imported from a main module. - Un module de bibliothèque ne peut pas être évalué directement. Il doit être importé d'un module principal. + Insert Numbered List + Insérer une liste numérotée - No template by name %1 exists. - Aucun template nommé %1 n'existe. + Indent + Retrait - A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. - Une valeur de type %1 ne peut être un prédicat. Un prédicat doit être de type numérique ou un Effective Boolean Value. + Outdent + Retrait négatif - A positional predicate must evaluate to a single numeric value. - Un prédicat de position doit être évalué en une unique valeur numérique. + Center + Centré - - The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. - Le nom de destination dans une instruction de traitement ne peut être %1. %2 est invalide. + Justify + Justifié - %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. - %1 n'est pas un nom de destination valide dans une instruction de traitement. Ce doit être une valeur %2, par ex. %3. + Align Left + Aligner à gauche - The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - La dernière étape dans un chemin doit contenir soit des noeuds soit des valeurs atomiques. Cela ne peut pas être un mélange des deux. + Align Right + Aligner à droite + + + QWhatsThisAction - The data of a processing instruction cannot contain the string %1 - Les données d'une instruction de traitement ne peut contenir la chaîne %1 + What's This? + Qu'est-ce que c'est ? + + + QWidget - No namespace binding exists for the prefix %1 - Aucun lien de namespace n'existe pour le préfixe %1 + * + + + + QWizard - No namespace binding exists for the prefix %1 in %2 - Aucun lien de namespace n'existe pour le préfixe %1 dans %2 + Go Back + Précédent - %1 is an invalid %2 - %1 est un ivalide %2 + Continue + Continuer - - %1 takes at most %n argument(s). %2 is therefore invalid. - - %1 prend au maximum %n argument. %2 est donc invalide. - %1 prend au maximum %n arguments. %2 est donc invalide. - + + Commit + si il s'agit de commit au même sens que git... (en même temps se marier en cliquant... ?!!?!) + Soumettre - - %1 requires at least %n argument(s). %2 is therefore invalid. - - %1 requiert au moins %n argument. %2 est donc invalide. - %1 requiert au moins %n arguments. %2 est donc invalide. - + + Done + Terminer - The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. - Le premier argument de %1 ne peut être du type %2. Il doit être de type numérique, xs:yearMonthDuration ou xs:dayTimeDuration. + Quit + Quitter - The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. - Le premier argument de %1 ne peut être du type %2. Il doit être de type %3, %4 ou %5. + Help + Aide - The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. - Le deuxième argument de %1 ne peut être du type %2. Il doit être de type %3, %4 ou %5. + < &Back + < &Précédent - %1 is not a valid XML 1.0 character. - %1 n'est pas un caractère XML 1.0 valide. + &Finish + &Terminer - - The first argument to %1 cannot be of type %2. - Le premier argument de %1 ne peut être du type %2. + Cancel + Annuler - If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - Si les deux valeurs ont des décalages de zone, elle doivent avoir le même. %1 et %2 sont différents. + &Help + &Aide - %1 was called. - %1 a été appelé. + &Next + &Suivant > - %1 must be followed by %2 or %3, not at the end of the replacement string. - %1 doit être suivi par %2 ou %3, et non à la fin de la chaîne de remplacement. + &Next > + &Suivant > + + + QWorkspace - In the replacement string, %1 must be followed by at least one digit when not escaped. - Dans la chaîne de remplacement, %1 doit être suivi par au moins un chiffre s'il n'est pas échappé. + &Restore + &Restaurer - In the replacement string, %1 can only be used to escape itself or %2, not %3 - Dans la chaîne de remplacement, %1 peut seulement être utilisé pour échapper lui-même ou %2 mais pas %3 + &Move + &Déplacer - %1 matches newline characters - %1 correspond à des caractères de saut de ligne + &Size + &Taille - %1 and %2 match the start and end of a line. - %1 et %2 correspondent au début et à la fin d'une ligne. + Mi&nimize + Réd&uire - Matches are case insensitive - Les correspondances ne sont pas sensibles à la casse + Ma&ximize + Ma&ximiser - Whitespace characters are removed, except when they appear in character classes - Les blancs sont supprimés excepté quand ils apparaissent dans les classes de caractère + &Close + &Fermer - %1 is an invalid regular expression pattern: %2 - %1 est un modèle d'expression régulière invalide: %2 + Stay on &Top + Rester au &premier plan - %1 is an invalid flag for regular expressions. Valid flags are: - %1 est un flag invalide pour des expressions régulières. Les flags valides sont : + Minimize + Réduire - If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. - Si le premier argument est une sequence vide ou un chaîne vide (sans namespace), un préfixe ne peut être spécifié. Le préfixe %1 a été spécifié. + Restore Down + Restaurer en bas - It will not be possible to retrieve %1. - Il sera impossible de récupérer %1. + Close + Fermer - The root node of the second argument to function %1 must be a document node. %2 is not a document node. - Le noeuds racine du deuxième argument à la fonction %1 doit être un noeuds document. %2 n'est pas un document. + Sh&ade + Enrou&ler - The default collection is undefined - I'l n'y a pas de collection par défaut + %1 - [%2] + %1 - [%2] - %1 cannot be retrieved - %1 ne peut pas être récupéré + &Unshade + Dér&ouler + + + QXml - The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - Le forme de normalisation %1 n'est pas supportée. Les formes supportées sont %2, %3, %4 et %5, et aucun, ie. une chaîne vide (pas de normalisation). + no error occurred + aucune erreur ne s'est produite - A zone offset must be in the range %1..%2 inclusive. %3 is out of range. - Un décalage de zone doit être dans l'intervalle %1..%2 inclus. %3 est hors de l'intervalle. + error triggered by consumer + Erreur déclenchée par le consommateur - %1 is not an whole number of minutes. - %1 n'est pas un nombre complet de minutes. + unexpected end of file + Fin de fichier inattendue - Required cardinality is %1; got cardinality %2. - La cardinalité requise est %1; reçu %2. + more than one document type definition + plus d'une définition de type de docuement - The item %1 did not match the required type %2. - L'item %1 ne correspond pas au type requis %2. + error occurred while parsing element + une erreur s'est produite pendant l'analyse syntaxique de l'élement - %1 is an unknown schema type. - %1 est un type de schema inconnu. + tag mismatch + tag incongru - Only one %1 declaration can occur in the query prolog. - Seulement une déclaration %1 peut intervenir lors du prologue de la requête. + error occurred while parsing content + une erreur s'est produite pendant l'analyse syntaxique du contenu - The initialization of variable %1 depends on itself - L'initialisation de la variable %1 dépend d'elle-même + unexpected character + caractère inattendu - - No variable by name %1 exists - Aucun variable nommée %1 existe + invalid name for processing instruction + nom d'instruction invalide - The variable %1 is unused - La variable %1 est inutilisée + version expected while reading the XML declaration + Une version est attendue dans la déclaration XML - Version %1 is not supported. The supported XQuery version is 1.0. - La version %1 n'est pas supportée. La version de XQuery supportée est 1.0. + wrong value for standalone declaration + Valeur incorrecte pour une déclaration autonome - The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2. - L'encodage %1 est invalide. Il doit contenir uniquement des caractères latins, sans blanc et doit être conforme à l'expression régulière %2. + error occurred while parsing document type definition + une erreur s'est produite pendant l'analyse syntaxique de la définition du type de document - No function with signature %1 is available - Aucune fonction avec la signature %1 n'est disponible + letter is expected + une lettre est attendue - A default namespace declaration must occur before function, variable, and option declarations. - Un déclaration de namespace par défaut doit être placée avant toute fonction, variable ou declaration d'option. + error occurred while parsing comment + une erreur s'est produite pendant l'analyse syntaxique du commentaire - Namespace declarations must occur before function, variable, and option declarations. - Les declarations de namespace doivent être placées avant tout fonction, variable ou déclaration d'option. + error occurred while parsing reference + une erreur s'est produite pendant l'analyse syntaxique d'une référence - Module imports must occur before function, variable, and option declarations. - Les imports de module doivent être placés avant tout fonction, variable ou déclaration d'option. + internal general entity reference not allowed in DTD + - It is not possible to redeclare prefix %1. - Il est impossible de redéclarer le préfixe %1. + external parsed general entity reference not allowed in attribute value + - Only the prefix %1 can be declared to bind the namespace %2. By default, it is already bound to the prefix %1. - Seul le préfixe %1 peut être déclaré pour lié le namespace %2. Par défaut, il est déjà lié au préfixe %1. + external parsed general entity reference not allowed in DTD + - Prefix %1 is already declared in the prolog. - Le préfixe %1 est déjà déclaré dans le prologue. + unparsed entity reference in wrong context + - The name of an option must have a prefix. There is no default namespace for options. - Le nom d'une option doit avoir un préfixe. Il n'y a pas de namespace par défaut pour les options. + recursive entities + - The Schema Import feature is not supported, and therefore %1 declarations cannot occur. - La fonctionnalité "Schema Import" n'est pas supportée et les déclarations %1 ne peuvent donc intervenir. + error in the text declaration of an external entity + - The target namespace of a %1 cannot be empty. - Le namespace cible d'un %1 ne peut être vide. + encoding declaration or standalone declaration expected while reading the XML declaration + - The module import feature is not supported - La fonctionnalité "module import" n'est pas supportée + standalone declaration expected while reading the XML declaration + + + + QXmlPatternistCLI - A variable by name %1 has already been declared in the prolog. - Une variable du nom %1 a déjà été déclarée dans le prologue. + Warning in %1, at line %2, column %3: %4 + Avertissement dans %1, à la ligne %2, colonne %3: %4 - - No value is available for the external variable by name %1. - Aucune valeur n'est disponible pour la variable externe %1. + Warning in %1: %2 + Avertissement dans %1: %2 - The namespace for a user defined function cannot be empty(try the predefined prefix %1 which exists for cases like this) - Le namespace d'une fonction définie par l'utilisateur ne peut être vide (essayez le préfixe prédéfini %1 qui existe pour ce genre de cas) + Unknown location + Lieu inconnu - - A construct was encountered which only is allowed in XQuery. - Construct n'est autorisé que dans XQuery. + Error %1 in %2, at line %3, column %4: %5 + Erreur %1 dans %2, à la ligne %3, colonne %4: %5 - - A template by name %1 has already been declared. - Un template nommé %1 a déjà été déclaré. + Error %1 in %2: %3 + Erreur %1 dans %2: %3 + + + QXmlStream - The keyword %1 cannot occur with any other mode name. - Le mot-clé %1 ne peut pas apparaître avec un autre nom de mode. + Extra content at end of document. + - - The value of attribute %1 must of type %2, which %3 isn't. - La valeur de l'attribut %1 doit être du type %2, %3 n'en est pas. + Invalid entity value. + - - The prefix %1 can not be bound. By default, it is already bound to the namespace %2. - Le préfixe %1 ne peut être lié. Par défault, il est déjà lié au namespace %2. + Invalid XML character. + - - A variable by name %1 has already been declared. - Une variable nommée %1 a déjà été déclarée. + Sequence ']]>' not allowed in content. + - A stylesheet function must have a prefixed name. - Une fonction de feuille de style doit avoir un nom préfixé. + Namespace prefix '%1' not declared + - The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this) - Le namespace d'une fonction utilisateur ne peut pas être vide (essayez le préfixe prédéfini %1 qui existe pour ce genre de cas) + Attribute redefined. + - The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases. - Le namespace %1 est réservé; c'est pourquoi les fonctions définies par l'utilisateur ne peuvent l'utiliser. Essayez le préfixe prédéfini %2 qui existe pour ces cas. + Unexpected character '%1' in public id literal. + - The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2 - Le namespace d'une fonction utilisateur dans un module de bibliothèque doit être équivalent au namespace du module. En d'autres mots, il devrait être %1 au lieu de %2 + Invalid XML version string. + - A function already exists with the signature %1. - Une fonction avec la signature %1 existe déjà. + Unsupported XML version. + - No external functions are supported. All supported functions can be used directly, without first declaring them as external - Les fonctions externes ne sont pas supportées. Toutes les fonctions supportées peuvent êter utilisées directement sans les déclarer préalablement comme externes + %1 is an invalid encoding name. + - - An argument by name %1 has already been declared. Every argument name must be unique. - Un argument nommé %1 a déjà été déclaré. Chaque nom d'argument doit être unique. + Encoding %1 is unsupported + - When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal. - Quand la fonction %1 est utilisée pour vérifier la correspondance dans un pattern, l'argument doit être une référence de variable ou une chaîne de caractères. + Invalid XML encoding name. + Encodage XML invalide. - In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching. - Dans un pattern XSL-T, le premier argument à la fonction %1 doit être une chaîne de caractères quand utilisé pour correspondance. + Standalone accepts only yes or no. + - In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching. - Dans un pattern XSL-T, le premier argument à la fonction %1 doit être un litéral ou une référence de variable. + Invalid attribute in XML declaration. + - In an XSL-T pattern, function %1 cannot have a third argument. - Dans un pattern XSL-T, la fonction %1 ne peut pas avoir de 3e argument. + Premature end of document. + - In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching. - Dans un pattern XSL-T, seules les fonctions %1 et %2 (pas %3) peuvent être utilisées pour le matching. + Invalid document. + - In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can. - Dans un pattern XSL-T, l'axe %1 ne peut pas être utilisé, seulement %2 ou %3 le peuvent. + Expected + - %1 is an invalid template mode name. - %1 est un nom de mode de template invalide. + , but got ' + - The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide. - Le nom d'une variable liée dans un expression for doit être different de la variable positionnelle. Les deux variables appelées %1 sont en conflit. + Unexpected ' + - The Schema Validation Feature is not supported. Hence, %1-expressions may not be used. - La fonctionnalité "Schema Validation" n'est pas supportée. Les expressions %1 ne seront pas utilisées. + Expected character data. + - None of the pragma expressions are supported. Therefore, a fallback expression must be present - Aucune des expressions pragma n'est supportée. Une expression par défault doit être présente + Recursive entity detected. + - Each name of a template parameter must be unique; %1 is duplicated. - Chaque nom d'un paramètre ede template doit être unique; %1 est dupliqué. + Start tag expected. + - The %1-axis is unsupported in XQuery - L'axe %1 n'est pas supporté dans XQuery + XML declaration not at start of document. + - %1 is not a valid name for a processing-instruction. - %1 n'est pas un nom valide pour une instruction de traitement. + NDATA in parameter entity declaration. + - %1 is not a valid numeric literal. - %1 n'est pas une valeur numérique valide. + %1 is an invalid processing instruction name. + - - No function by name %1 is available. - La fonction %1 n'est pas disponible. + Invalid processing instruction name. + - The namespace URI cannot be the empty string when binding to a prefix, %1. - L'URI de namespace ne peut être une chaîne vide quand on le lie à un préfixe, %1. + Illegal namespace declaration. + - %1 is an invalid namespace URI. - %1 est un URI de namespace invalide. + Invalid XML name. + - It is not possible to bind to the prefix %1 - Il est impossible de se lier au préfixe %1 + Opening and ending tag mismatch. + - Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared). - Le namespace %1 peut seulement être lié à %2 (et doit être pré-déclaré). + Reference to unparsed entity '%1'. + - Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared). - Le préfixe %1 peut seulement être lié à %2 (et doit être prédéclaré). + Entity '%1' not declared. + - Two namespace declaration attributes have the same name: %1. - Deux attributs de déclarations de namespace ont le même nom : %1. + Reference to external entity '%1' in attribute value. + - The namespace URI must be a constant and cannot use enclosed expressions. - L'URI de namespace doit être une constante et ne peut contenir d'expressions. + Invalid character reference. + - - An attribute by name %1 has already appeared on this element. - Un attribute nommé %1 existe déjà pour cet élément. + Encountered incorrectly encoded content. + - A direct element constructor is not well-formed. %1 is ended with %2. - Un constructeur direct d'élément est mal-formé. %1 est terminé par %2. + The standalone pseudo attribute must appear after the encoding. + - The name %1 does not refer to any schema type. - Le nom %1 ne se réfère à aucun type de schema. + %1 is an invalid PUBLIC identifier. + + + + QtXmlPatterns - %1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works. - %1 est une type complexe. Caster vers des types complexes n'est pas possible. Cependant, caster vers des types atomiques comme %2 marche. + An %1-attribute with value %2 has already been declared. + Un attribute %1 avec la valeur %2 est déjà déclaré. - %1 is not an atomic type. Casting is only possible to atomic types. - %1 n'est pas un type atomique. Il est uniquement possible de caster vers des types atomiques. + An %1-attribute must have a valid %2 as value, which %3 isn't. + Un attribute %1 doit avoir un %2 valide, %3 ne l'a pas. - %1 is not a valid name for a processing-instruction. Therefore this name test will never match. - %1 n'est pas un nom valide pour une instruction de traitement. C'est pourquoi ce test de nom ne réussira jamais. + Network timeout. + Le réseau ne répond pas. - %1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported. - %1 n'est pas dans les déclaration d'attribut in-scope. La fonctionnalité d'inport de schéma n'est pas supportée. + Element %1 can't be serialized because it appears outside the document element. + L'élément %1 ne peut pas être sérialisé parce qu'il est hors de l'élément document. - The name of an extension expression must be in a namespace. - Le nom d'une expression d'extension doit être dans un namespace. + Attribute element %1 can't be serialized because it appears at the top level. + L'élément attribute %1 ne peut pas être sérialisé parce qu'il apparaît comme racine. - empty - vide + Year %1 is invalid because it begins with %2. + L'année %1 est invalide parce qu'elle commence par %2. - zero or one - zéro ou un + Day %1 is outside the range %2..%3. + Le jour %1 est hors de l'intervalle %2..%3. - exactly one - exactement un + Month %1 is outside the range %2..%3. + Le mois %1 est hors de l'intervalle %2..%3. - one or more - un ou plus + Overflow: Can't represent date %1. + Overflow: ne peut pas représenter la date %1. - zero or more - zéro ou plus + Day %1 is invalid for month %2. + Jour %1 est invalide pour le mois %2. - Required type is %1, but %2 was found. - Le type requis est %1, mais %2 a été reçu. + Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; + L'heure 24:%1:%2.%3 est invalide. L'heure est 24 mais les minutes, seconndes et millisecondes ne sont pas à 0; - Promoting %1 to %2 may cause loss of precision. - La Promotion de %1 vers %2 peut causer un perte de précision. + Time %1:%2:%3.%4 is invalid. + L'heure %1:%2:%3.%4 est invalide. - The focus is undefined. - Le focus est indéfini. + Overflow: Date can't be represented. + Overflow : la date ne peut pas être représentée. - It's not possible to add attributes after any other kind of node. - Il est impossible d'ajouter des attributs après un autre type de noeuds. + At least one component must be present. + Au moins un composant doit être présent. - An attribute by name %1 has already been created. - Un attribute de nom %1 a déjà été créé. + At least one time component must appear after the %1-delimiter. + Au moins un composant doit apparaître après le délimiteur %1. - Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - Seule le Unicode CodepointCollation est supporté (%1), %2 n'est pas supporté. + No operand in an integer division, %1, can be %2. + Pas d'opérande dans une division entière, %1, peut être %2. - %1 is not a whole number of minutes. - %1 n'est pas un nombre entier de minutes. + The first operand in an integer division, %1, cannot be infinity (%2). + Le premier opérande dans une division entière, %1, ne peut être infini (%2). - Attribute %1 can't be serialized because it appears at the top level. - L'attribut %1 ne peut pas être sérialisé car il apparaît à la racine. + The second operand in a division, %1, cannot be zero (%2). + Le second opérande dans une division, %1, ne peut être nul (%2). - %1 is an unsupported encoding. - %1 est un encodage non supporté. + %1 is not a valid value of type %2. + %1 n'est pas une valeur valide du type %2. - %1 contains octets which are disallowed in the requested encoding %2. - %1 contient 'octets', qui n'est pas autorisé pour l'encodage %2. + When casting to %1 from %2, the source value cannot be %3. + En castant de %2 vers %1, la valeur source ne peut pas être %3. - The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character. - Le codepoint %1 dans %2 et utilisant l'encodage %3 est un caractère XML invalide. + Integer division (%1) by zero (%2) is undefined. + Division entière (%1) par zéro (%2) indéfinie. - Ambiguous rule match. - Corresonpdance aux règles ambigüe. + Division (%1) by zero (%2) is undefined. + Division (%1) par zéro (%2) indéfinie. - In a namespace constructor, the value for a namespace value cannot be an empty string. - Dans un cosntructeur de namespace, la valeur pour un namespace ne peut pas être une chaîne vide. + Modulus division (%1) by zero (%2) is undefined. + Module division (%1) par zéro (%2) indéfinie. - In a namespace constructor, the value for a namespace cannot be an empty string. - Dans un constructeur d'espace de noms, la valeur pour un espace de noms ne peut pas être une chaîne vide. + Dividing a value of type %1 by %2 (not-a-number) is not allowed. + Diviser une valeur du type %1 par %2 (not-a-number) est interdit. - The prefix must be a valid %1, which %2 is not. - Le préfixe doit être un valide %1; %2 n'e l'est pas. + Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed. + Diviser une valeur de type %1 par %2 ou %3 (plus ou moins zéro) est interdit. - The prefix %1 cannot be bound. - Le préfixe %1 ne peut être lié. + Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed. + La multiplication d'une valeur du type %1 par %2 ou %3 (plus ou moins infini) est interdite. - Only the prefix %1 can be bound to %2 and vice versa. - Seul le préfixe %1 peut être lié à %2, et vice versa. + A value of type %1 cannot have an Effective Boolean Value. + Une valeur de type %1 ne peut pas avoir une valeur booléene effective. - - Circularity detected - Circularité détectée + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. + Effective Boolean Value ne peut être calculée pour une séquence contenant deux ou plus valeurs atomiques. - The parameter %1 is required, but no corresponding %2 is supplied. - Le paramètre %1 est requis, mais aucun %2 correspondant n'est fourni. + Value %1 of type %2 exceeds maximum (%3). + La valeur %1 de type %2 excède le maximum (%3). - The parameter %1 is passed, but no corresponding %2 exists. - Le paramètre %1 est passé mais aucun %2 correspondant n'existe. + Value %1 of type %2 is below minimum (%3). + La valeur %1 de type %2 est inférieur au minimum (%3). - The URI cannot have a fragment - L'URI ne peut pas avoir de fragments + A value of type %1 must contain an even number of digits. The value %2 does not. + Une valeur de type %1 doit contenir un nombre pair de chiffre. La valeur %2 n'est pas conforme. - Element %1 is not allowed at this location. - L'élément %1 n'est pas autorisé à cet emplacement. + %1 is not valid as a value of type %2. + %1 n'est pas une valeur valide de type %2. - Text nodes are not allowed at this location. - Les noeuds de texte ne sont pas autorisés à cet emplacement. + Operator %1 cannot be used on type %2. + L'opérateur %1 ne peut pas être utilisé pour le type %2. - Parse error: %1 - Erreur: %1 + Operator %1 cannot be used on atomic values of type %2 and %3. + L'opérateur %1 ne peut pas être utilisé pour des valeurs atomiques de type %2 ou %3. - The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. - La valeur de l'attribut de version XSL-T doit être du type %1, et non %2. + The namespace URI in the name for a computed attribute cannot be %1. + L'URI de namespace dans le nom d'un attribut calculé ne peut pas être %1. - Running an XSL-T 1.0 stylesheet with a 2.0 processor. - Lancement d'une feuille de style XSL-T 1.0 avec un processeur 2.0. + The name for a computed attribute cannot have the namespace URI %1 with the local name %2. + Le nom d'un attribut calculé ne peut pas avoir l'URI de namespace %1 avec le nom local %2. - Unknown XSL-T attribute %1. - Attribut XSL-T inconnu : %1. + Type error in cast, expected %1, received %2. + Erreur de type lors du cast, attendu %1 mais reçu %2. - Attribute %1 and %2 are mutually exclusive. - Les attributs %1 et %2 sont mutuellement exclusifs. + When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed. + En castant vers %1 ou des types dérivés, la valeur source doit être du même type ou une chaîne. Le type %2 n'est pas autorisé. - In a simplified stylesheet module, attribute %1 must be present. - Dans un module de feuille de style simplifié, l'attribut %1 doit être présent. + No casting is possible with %1 as the target type. + Aucun cast n'est possible avec %1 comme type de destination. - If element %1 has no attribute %2, it cannot have attribute %3 or %4. - Si l'élément %1 n'a pas d'attribut %2, il ne peut pas avoir d'attribut %3 ou %4. + It is not possible to cast from %1 to %2. + Il est impossible de caster de %1 en %2. - Element %1 must have at least one of the attributes %2 or %3. - L'élement %1 doit avoir au moins un des attributs %2 ou %3. + Casting to %1 is not possible because it is an abstract type, and can therefore never be instantiated. + Caster vers %1 est impossible parce que c'est un type abstrait qui ne peut donc être instancié. - At least one mode must be specified in the %1-attribute on element %2. - Au moins un mode doit être spécifié dans l'attribut %1 sur l'élément %2. + It's not possible to cast the value %1 of type %2 to %3 + I lest impossible de caster la valeur %1 de type %2 en %3 - - Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. - L'attribut %1 ne peut pas apparaître sur l'élément %2. Seuls les attributs standard le peuvent. + Failure when casting from %1 to %2: %3 + Echec en castant de %1 ver %2 : %3 - - Attribute %1 cannot appear on the element %2. Only %3 is allowed, and the standard attributes. - L'attribut %1 ne peut pas apparaître sur l'élément %2. Seul %3 est autorisé, ainsi que les attributs standard. + A comment cannot contain %1 + Un commentaire ne peut pas contenir %1 - - Attribute %1 cannot appear on the element %2. Allowed is %3, %4, and the standard attributes. - L'attribut %1 ne peut pas apparaître sur l'élément %2. Seuls %3, %4 et les attributs standard le sont. + A comment cannot end with a %1. + Un commentaire ne peut pas finir par %1. - - Attribute %1 cannot appear on the element %2. Allowed is %3, and the standard attributes. - L'attribut %1 ne peut pas apparaître sur l'élément %2. Seul %3 et les attributs standard le sont. + No comparisons can be done involving the type %1. + Aucune comparaison ne peut être faite avec le type %1. - - XSL-T attributes on XSL-T elements must be in the null namespace, not in the XSL-T namespace which %1 is. - Les attributs XSL-T sur des éléments XSL-T doivent être dans le namespace null, et pas dans %1. + Operator %1 is not available between atomic values of type %2 and %3. + L'opérateur %1 n'est pas disponible entre valeurs atomiques de type %2 et %3. - - The attribute %1 must appear on element %2. - L'attribut %1 doit apparaître sur l'élément %2. + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. + Un noeuds attribut ne peut être un fils d'un noeuds document. C'est pourquoi l'attribut %1 est mal placé. - - The element with local name %1 does not exist in XSL-T. - L'élément avec le nom local %1 n'existe pas dans XSL-T. + A library module cannot be evaluated directly. It must be imported from a main module. + Un module de bibliothèque ne peut pas être évalué directement. Il doit être importé d'un module principal. - Element %1 must come last. - L'élément %1 doit être le dernier. + No template by name %1 exists. + Aucun template nommé %1 n'existe. - At least one %1-element must occur before %2. - Au moins un élément %1 doit être placé avant %2. + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. + Une valeur de type %1 ne peut être un prédicat. Un prédicat doit être de type numérique ou un Effective Boolean Value. - Only one %1-element can appear. - Seulement un élément %1 peut apparaître. + A positional predicate must evaluate to a single numeric value. + Un prédicat de position doit être évalué en une unique valeur numérique. - At least one %1-element must occur inside %2. - Au moins un élément %1 doit apparaître dans %2. + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. + Le nom de destination dans une instruction de traitement ne peut être %1. %2 est invalide. - When attribute %1 is present on %2, a sequence constructor cannot be used. - Quand l'attribut %1 est présent sur %2, un constructeur de séquence ne peut pas être utilisé. + %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. + %1 n'est pas un nom de destination valide dans une instruction de traitement. Ce doit être une valeur %2, par ex. %3. - Element %1 must have either a %2-attribute or a sequence constructor. - L'élément %1 doit avoir un attribut %2 ou un constructeur de séquence. + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. + La dernière étape dans un chemin doit contenir soit des noeuds soit des valeurs atomiques. Cela ne peut pas être un mélange des deux. - When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor. - Quand un paramètre est requis, un valeur par défault ne peut pas être fournie par un attribute %1 ou un constructeur de séquence. + The data of a processing instruction cannot contain the string %1 + Les données d'une instruction de traitement ne peut contenir la chaîne %1 - Element %1 cannot have children. - L'élément %1 ne peut pas avoir de fils. + No namespace binding exists for the prefix %1 + Aucun lien de namespace n'existe pour le préfixe %1 - Element %1 cannot have a sequence constructor. - L'élément %1 ne peut pas avoir un constructuer de séquence. + No namespace binding exists for the prefix %1 in %2 + Aucun lien de namespace n'existe pour le préfixe %1 dans %2 - The attribute %1 cannot appear on %2, when it is a child of %3. - L'attribut %1 ne peut pas apparaître sur %2 quand il est fils de %3. + %1 is an invalid %2 + %1 est un ivalide %2 - - A parameter in a function cannot be declared to be a tunnel. - Un paramètre de fonction ne peut pas être déclaré comme un tunnel. + + %1 takes at most %n argument(s). %2 is therefore invalid. + + %1 prend au maximum %n argument. %2 est donc invalide. + %1 prend au maximum %n arguments. %2 est donc invalide. + + + + %1 requires at least %n argument(s). %2 is therefore invalid. + + %1 requiert au moins %n argument. %2 est donc invalide. + %1 requiert au moins %n arguments. %2 est donc invalide. + - This processor is not Schema-aware and therefore %1 cannot be used. - Ce processeur ne comprend pas les Schemas. C'est pourquoi %1 ne peut pas être utilisé. + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. + Le premier argument de %1 ne peut être du type %2. Il doit être de type numérique, xs:yearMonthDuration ou xs:dayTimeDuration. - Top level stylesheet elements must be in a non-null namespace, which %1 isn't. - Les élément d'une feuille de style de haut niveau doivent être dans un namespace non nul; %1 ne l'est pas. + The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. + Le premier argument de %1 ne peut être du type %2. Il doit être de type %3, %4 ou %5. - The value for attribute %1 on element %2 must either be %3 or %4, not %5. - La valeur de l'attribut %1 de l'élement %2 doit être %3 ou %4, et pas %5. + The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. + Le deuxième argument de %1 ne peut être du type %2. Il doit être de type %3, %4 ou %5. - Attribute %1 cannot have the value %2. - L'attribut %1 ne peut avoir la valeur %2. + %1 is not a valid XML 1.0 character. + %1 n'est pas un caractère XML 1.0 valide. - The attribute %1 can only appear on the first %2 element. - L'attribute %1 peut seulement apparaître sur le premier élément %2. + The first argument to %1 cannot be of type %2. + Le premier argument de %1 ne peut être du type %2. - At least one %1 element must appear as child of %2. - Au moins un élément %1 doit apparaître comme fils de %2. + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. + Si les deux valeurs ont des décalages de zone, elle doivent avoir le même. %1 et %2 sont différents. - A template with name %1 has already been declared. - Un template nommé %1 a déjà été déclaré. + %1 was called. + %1 a été appelé. - The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid. - Le nom de destination dans une instruction de traitement ne peut être %1. %2 est invalide. + %1 must be followed by %2 or %3, not at the end of the replacement string. + %1 doit être suivi par %2 ou %3, et non à la fin de la chaîne de remplacement. - No variable with name %1 exists - Aucune variable nommée %1 n'existe + In the replacement string, %1 must be followed by at least one digit when not escaped. + Dans la chaîne de remplacement, %1 doit être suivi par au moins un chiffre s'il n'est pas échappé. - The value of attribute %1 must be of type %2, which %3 isn't. - La valeur de l'attribut %1 doit être du type %2, %3 n'en est pas. + In the replacement string, %1 can only be used to escape itself or %2, not %3 + Dans la chaîne de remplacement, %1 peut seulement être utilisé pour échapper lui-même ou %2 mais pas %3 - The prefix %1 cannot be bound. By default, it is already bound to the namespace %2. - Le préfixe %1 ne peut être lié. Par défault, il est déjà lié au namespace %2. + %1 matches newline characters + %1 correspond à des caractères de saut de ligne - A variable with name %1 has already been declared. - Une variable nommée %1 a déjà été déclarée. + %1 and %2 match the start and end of a line. + %1 et %2 correspondent au début et à la fin d'une ligne. - No value is available for the external variable with name %1. - Aucune valeur n'est disponible pour la variable externe %1. + Matches are case insensitive + Les correspondances ne sont pas sensibles à la casse - An argument with name %1 has already been declared. Every argument name must be unique. - Un argument nommé %1 a déjà été déclaré. Chaque nom d'argument doit être unique. + Whitespace characters are removed, except when they appear in character classes + Les blancs sont supprimés excepté quand ils apparaissent dans les classes de caractère + + + %1 is an invalid regular expression pattern: %2 + %1 est un modèle d'expression régulière invalide: %2 - No function with name %1 is available. - Aucune fonction nommée %1 n'est disponible. + %1 is an invalid flag for regular expressions. Valid flags are: + %1 est un flag invalide pour des expressions régulières. Les flags valides sont : - W3C XML Schema identity constraint selector - + If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. + Si le premier argument est une sequence vide ou un chaîne vide (sans namespace), un préfixe ne peut être spécifié. Le préfixe %1 a été spécifié. - W3C XML Schema identity constraint field - + It will not be possible to retrieve %1. + Il sera impossible de récupérer %1. - A construct was encountered which is disallowed in the current language(%1). - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. + Le noeuds racine du deuxième argument à la fonction %1 doit être un noeuds document. %2 n'est pas un document. - An attribute with name %1 has already appeared on this element. - Un attribute nommé %1 existe déjà pour cet élément. + The default collection is undefined + I'l n'y a pas de collection par défaut - %1 has inheritance loop in its base type %2. - + %1 cannot be retrieved + %1 ne peut pas être récupéré - Circular inheritance of base type %1. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). + Le forme de normalisation %1 n'est pas supportée. Les formes supportées sont %2, %3, %4 et %5, et aucun, ie. une chaîne vide (pas de normalisation). - Circular inheritance of union %1. - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. + Un décalage de zone doit être dans l'intervalle %1..%2 inclus. %3 est hors de l'intervalle. - %1 is not allowed to derive from %2 by restriction as the latter defines it as final. - + %1 is not an whole number of minutes. + %1 n'est pas un nombre complet de minutes. - %1 is not allowed to derive from %2 by extension as the latter defines it as final. - + Required cardinality is %1; got cardinality %2. + La cardinalité requise est %1; reçu %2. - Base type of simple type %1 cannot be complex type %2. - + The item %1 did not match the required type %2. + L'item %1 ne correspond pas au type requis %2. - Simple type %1 cannot have direct base type %2. - + %1 is an unknown schema type. + %1 est un type de schema inconnu. - Simple type %1 is not allowed to have base type %2. - + Only one %1 declaration can occur in the query prolog. + Seulement une déclaration %1 peut intervenir lors du prologue de la requête. - Simple type %1 can only have simple atomic type as base type. - + The initialization of variable %1 depends on itself + L'initialisation de la variable %1 dépend d'elle-même - Simple type %1 cannot derive from %2 as the latter defines restriction as final. - + No variable by name %1 exists + Aucun variable nommée %1 existe - Variety of item type of %1 must be either atomic or union. - + The variable %1 is unused + La variable %1 est inutilisée - Variety of member types of %1 must be atomic. - + Version %1 is not supported. The supported XQuery version is 1.0. + La version %1 n'est pas supportée. La version de XQuery supportée est 1.0. - %1 is not allowed to derive from %2 by list as the latter defines it as final. - + The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2. + L'encodage %1 est invalide. Il doit contenir uniquement des caractères latins, sans blanc et doit être conforme à l'expression régulière %2. - Simple type %1 is only allowed to have %2 facet. - + No function with signature %1 is available + Aucune fonction avec la signature %1 n'est disponible - Base type of simple type %1 must have variety of type list. - + A default namespace declaration must occur before function, variable, and option declarations. + Un déclaration de namespace par défaut doit être placée avant toute fonction, variable ou declaration d'option. - Base type of simple type %1 has defined derivation by restriction as final. - + Namespace declarations must occur before function, variable, and option declarations. + Les declarations de namespace doivent être placées avant tout fonction, variable ou déclaration d'option. - Item type of base type does not match item type of %1. - + Module imports must occur before function, variable, and option declarations. + Les imports de module doivent être placés avant tout fonction, variable ou déclaration d'option. - Simple type %1 contains not allowed facet type %2. - + It is not possible to redeclare prefix %1. + Il est impossible de redéclarer le préfixe %1. - %1 is not allowed to derive from %2 by union as the latter defines it as final. - + Only the prefix %1 can be declared to bind the namespace %2. By default, it is already bound to the prefix %1. + Seul le préfixe %1 peut être déclaré pour lié le namespace %2. Par défaut, il est déjà lié au préfixe %1. - %1 is not allowed to have any facets. - + Prefix %1 is already declared in the prolog. + Le préfixe %1 est déjà déclaré dans le prologue. - Base type %1 of simple type %2 must have variety of union. - + The name of an option must have a prefix. There is no default namespace for options. + Le nom d'une option doit avoir un préfixe. Il n'y a pas de namespace par défaut pour les options. - Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute. - + The Schema Import feature is not supported, and therefore %1 declarations cannot occur. + La fonctionnalité "Schema Import" n'est pas supportée et les déclarations %1 ne peuvent donc intervenir. - Member type %1 cannot be derived from member type %2 of %3's base type %4. - + The target namespace of a %1 cannot be empty. + Le namespace cible d'un %1 ne peut être vide. - Derivation method of %1 must be extension because the base type %2 is a simple type. - + The module import feature is not supported + La fonctionnalité "module import" n'est pas supportée - Complex type %1 has duplicated element %2 in its content model. - + A variable by name %1 has already been declared in the prolog. + Une variable du nom %1 a déjà été déclarée dans le prologue. - Complex type %1 has non-deterministic content. - + No value is available for the external variable by name %1. + Aucune valeur n'est disponible pour la variable externe %1. - Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3. - + The namespace for a user defined function cannot be empty(try the predefined prefix %1 which exists for cases like this) + Le namespace d'une fonction définie par l'utilisateur ne peut être vide (essayez le préfixe prédéfini %1 qui existe pour ce genre de cas) - Content model of complex type %1 is not a valid extension of content model of %2. - + A construct was encountered which only is allowed in XQuery. + Construct n'est autorisé que dans XQuery. - Complex type %1 must have simple content. - + A template by name %1 has already been declared. + Un template nommé %1 a déjà été déclaré. - Complex type %1 must have the same simple type as its base class %2. - + The keyword %1 cannot occur with any other mode name. + Le mot-clé %1 ne peut pas apparaître avec un autre nom de mode. - Complex type %1 cannot be derived from base type %2%3. - + The value of attribute %1 must of type %2, which %3 isn't. + La valeur de l'attribut %1 doit être du type %2, %3 n'en est pas. - Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3. - + The prefix %1 can not be bound. By default, it is already bound to the namespace %2. + Le préfixe %1 ne peut être lié. Par défault, il est déjà lié au namespace %2. - Complex type %1 with simple content cannot be derived from complex base type %2. - + A variable by name %1 has already been declared. + Une variable nommée %1 a déjà été déclarée. - Item type of simple type %1 cannot be a complex type. - + A stylesheet function must have a prefixed name. + Une fonction de feuille de style doit avoir un nom préfixé. - Member type of simple type %1 cannot be a complex type. - + The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this) + Le namespace d'une fonction utilisateur ne peut pas être vide (essayez le préfixe prédéfini %1 qui existe pour ce genre de cas) - %1 is not allowed to have a member type with the same name as itself. - + The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases. + Le namespace %1 est réservé; c'est pourquoi les fonctions définies par l'utilisateur ne peuvent l'utiliser. Essayez le préfixe prédéfini %2 qui existe pour ces cas. - %1 facet collides with %2 facet. - + The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2 + Le namespace d'une fonction utilisateur dans un module de bibliothèque doit être équivalent au namespace du module. En d'autres mots, il devrait être %1 au lieu de %2 - %1 facet must have the same value as %2 facet of base type. - + A function already exists with the signature %1. + Une fonction avec la signature %1 existe déjà. - %1 facet must be equal or greater than %2 facet of base type. - + No external functions are supported. All supported functions can be used directly, without first declaring them as external + Les fonctions externes ne sont pas supportées. Toutes les fonctions supportées peuvent êter utilisées directement sans les déclarer préalablement comme externes - %1 facet must be less than or equal to %2 facet of base type. - + An argument by name %1 has already been declared. Every argument name must be unique. + Un argument nommé %1 a déjà été déclaré. Chaque nom d'argument doit être unique. - %1 facet contains invalid regular expression - + When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal. + Quand la fonction %1 est utilisée pour vérifier la correspondance dans un pattern, l'argument doit être une référence de variable ou une chaîne de caractères. - Unknown notation %1 used in %2 facet. - + In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching. + Dans un pattern XSL-T, le premier argument à la fonction %1 doit être une chaîne de caractères quand utilisé pour correspondance. - %1 facet contains invalid value %2: %3. - + In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching. + Dans un pattern XSL-T, le premier argument à la fonction %1 doit être un litéral ou une référence de variable. - %1 facet cannot be %2 or %3 if %4 facet of base type is %5. - + In an XSL-T pattern, function %1 cannot have a third argument. + Dans un pattern XSL-T, la fonction %1 ne peut pas avoir de 3e argument. - %1 facet cannot be %2 if %3 facet of base type is %4. - + In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching. + Dans un pattern XSL-T, seules les fonctions %1 et %2 (pas %3) peuvent être utilisées pour le matching. - %1 facet must be less than or equal to %2 facet. - + In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can. + Dans un pattern XSL-T, l'axe %1 ne peut pas être utilisé, seulement %2 ou %3 le peuvent. - %1 facet must be less than %2 facet of base type. - + %1 is an invalid template mode name. + %1 est un nom de mode de template invalide. - %1 facet and %2 facet cannot appear together. - + The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide. + Le nom d'une variable liée dans un expression for doit être different de la variable positionnelle. Les deux variables appelées %1 sont en conflit. - %1 facet must be greater than %2 facet of base type. - + The Schema Validation Feature is not supported. Hence, %1-expressions may not be used. + La fonctionnalité "Schema Validation" n'est pas supportée. Les expressions %1 ne seront pas utilisées. - %1 facet must be less than %2 facet. - + None of the pragma expressions are supported. Therefore, a fallback expression must be present + Aucune des expressions pragma n'est supportée. Une expression par défault doit être présente - %1 facet must be greater than or equal to %2 facet of base type. - + Each name of a template parameter must be unique; %1 is duplicated. + Chaque nom d'un paramètre ede template doit être unique; %1 est dupliqué. - Simple type contains not allowed facet %1. - + The %1-axis is unsupported in XQuery + L'axe %1 n'est pas supporté dans XQuery - %1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list. - + %1 is not a valid name for a processing-instruction. + %1 n'est pas un nom valide pour une instruction de traitement. - Only %1 and %2 facets are allowed when derived by union. - + %1 is not a valid numeric literal. + %1 n'est pas une valeur numérique valide. - %1 contains %2 facet with invalid data: %3. - + No function by name %1 is available. + La fonction %1 n'est pas disponible. - Attribute group %1 contains attribute %2 twice. - + The namespace URI cannot be the empty string when binding to a prefix, %1. + L'URI de namespace ne peut être une chaîne vide quand on le lie à un préfixe, %1. - Attribute group %1 contains two different attributes that both have types derived from %2. - + %1 is an invalid namespace URI. + %1 est un URI de namespace invalide. - Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3. - + It is not possible to bind to the prefix %1 + Il est impossible de se lier au préfixe %1 - Complex type %1 contains attribute %2 twice. - + Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared). + Le namespace %1 peut seulement être lié à %2 (et doit être pré-déclaré). - Complex type %1 contains two different attributes that both have types derived from %2. - + Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared). + Le préfixe %1 peut seulement être lié à %2 (et doit être prédéclaré). - Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3. - + Two namespace declaration attributes have the same name: %1. + Deux attributs de déclarations de namespace ont le même nom : %1. - Element %1 is not allowed to have a value constraint if its base type is complex. - + The namespace URI must be a constant and cannot use enclosed expressions. + L'URI de namespace doit être une constante et ne peut contenir d'expressions. - Element %1 is not allowed to have a value constraint if its type is derived from %2. - + An attribute by name %1 has already appeared on this element. + Un attribute nommé %1 existe déjà pour cet élément. - Value constraint of element %1 is not of elements type: %2. - + A direct element constructor is not well-formed. %1 is ended with %2. + Un constructeur direct d'élément est mal-formé. %1 est terminé par %2. - Element %1 is not allowed to have substitution group affiliation as it is no global element. - + The name %1 does not refer to any schema type. + Le nom %1 ne se réfère à aucun type de schema. - Type of element %1 cannot be derived from type of substitution group affiliation. - + %1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works. + %1 est une type complexe. Caster vers des types complexes n'est pas possible. Cependant, caster vers des types atomiques comme %2 marche. - Value constraint of attribute %1 is not of attributes type: %2. - + %1 is not an atomic type. Casting is only possible to atomic types. + %1 n'est pas un type atomique. Il est uniquement possible de caster vers des types atomiques. - Attribute %1 has value constraint but has type derived from %2. - + %1 is not a valid name for a processing-instruction. Therefore this name test will never match. + %1 n'est pas un nom valide pour une instruction de traitement. C'est pourquoi ce test de nom ne réussira jamais. - %1 attribute in derived complex type must be %2 like in base type. - + %1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported. + %1 n'est pas dans les déclaration d'attribut in-scope. La fonctionnalité d'inport de schéma n'est pas supportée. - Attribute %1 in derived complex type must have %2 value constraint like in base type. - + The name of an extension expression must be in a namespace. + Le nom d'une expression d'extension doit être dans un namespace. - Attribute %1 in derived complex type must have the same %2 value constraint like in base type. - + empty + vide - Attribute %1 in derived complex type must have %2 value constraint. - + zero or one + zéro ou un - processContent of base wildcard must be weaker than derived wildcard. - + exactly one + exactement un - Element %1 exists twice with different types. - + one or more + un ou plus - Particle contains non-deterministic wildcards. - + zero or more + zéro ou plus - Base attribute %1 is required but derived attribute is not. - + Required type is %1, but %2 was found. + Le type requis est %1, mais %2 a été reçu. - Type of derived attribute %1 cannot be validly derived from type of base attribute. - + Promoting %1 to %2 may cause loss of precision. + La Promotion de %1 vers %2 peut causer un perte de précision. - Value constraint of derived attribute %1 does not match value constraint of base attribute. - + The focus is undefined. + Le focus est indéfini. - Derived attribute %1 does not exist in the base definition. - + It's not possible to add attributes after any other kind of node. + Il est impossible d'ajouter des attributs après un autre type de noeuds. - Derived attribute %1 does not match the wildcard in the base definition. - + An attribute by name %1 has already been created. + Un attribute de nom %1 a déjà été créé. - Base attribute %1 is required but missing in derived definition. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. + Seule le Unicode CodepointCollation est supporté (%1), %2 n'est pas supporté. - Derived definition contains an %1 element that does not exists in the base definition - + %1 is not a whole number of minutes. + %1 n'est pas un nombre entier de minutes. - Derived wildcard is not a subset of the base wildcard. - + Attribute %1 can't be serialized because it appears at the top level. + L'attribut %1 ne peut pas être sérialisé car il apparaît à la racine. - %1 of derived wildcard is not a valid restriction of %2 of base wildcard - + %1 is an unsupported encoding. + %1 est un encodage non supporté. - Attribute %1 from base type is missing in derived type. - + %1 contains octets which are disallowed in the requested encoding %2. + %1 contient 'octets', qui n'est pas autorisé pour l'encodage %2. - Type of derived attribute %1 differs from type of base attribute. - + The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character. + Le codepoint %1 dans %2 et utilisant l'encodage %3 est un caractère XML invalide. - Base definition contains an %1 element that is missing in the derived definition - + Ambiguous rule match. + Corresonpdance aux règles ambigüe. - %1 references unknown %2 or %3 element %4. - + In a namespace constructor, the value for a namespace value cannot be an empty string. + Dans un cosntructeur de namespace, la valeur pour un namespace ne peut pas être une chaîne vide. - %1 references identity constraint %2 that is no %3 or %4 element. - + In a namespace constructor, the value for a namespace cannot be an empty string. + Dans un constructeur d'espace de noms, la valeur pour un espace de noms ne peut pas être une chaîne vide. - %1 has a different number of fields from the identity constraint %2 that it references. - + The prefix must be a valid %1, which %2 is not. + Le préfixe doit être un valide %1; %2 n'e l'est pas. - Base type %1 of %2 element cannot be resolved. - + The prefix %1 cannot be bound. + Le préfixe %1 ne peut être lié. - Item type %1 of %2 element cannot be resolved. - + Only the prefix %1 can be bound to %2 and vice versa. + Seul le préfixe %1 peut être lié à %2, et vice versa. - Member type %1 of %2 element cannot be resolved. - + Circularity detected + Circularité détectée - Type %1 of %2 element cannot be resolved. - + The parameter %1 is required, but no corresponding %2 is supplied. + Le paramètre %1 est requis, mais aucun %2 correspondant n'est fourni. - Base type %1 of complex type cannot be resolved. - + The parameter %1 is passed, but no corresponding %2 exists. + Le paramètre %1 est passé mais aucun %2 correspondant n'existe. - %1 cannot have complex base type that has a %2. - + The URI cannot have a fragment + L'URI ne peut pas avoir de fragments - Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type. - + Element %1 is not allowed at this location. + L'élément %1 n'est pas autorisé à cet emplacement. - Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model. - + Text nodes are not allowed at this location. + Les noeuds de texte ne sont pas autorisés à cet emplacement. - Type of %1 element must be a simple type, %2 is not. - + Parse error: %1 + Erreur: %1 - Substitution group %1 of %2 element cannot be resolved. - + The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. + La valeur de l'attribut de version XSL-T doit être du type %1, et non %2. - Substitution group %1 has circular definition. - + Running an XSL-T 1.0 stylesheet with a 2.0 processor. + Lancement d'une feuille de style XSL-T 1.0 avec un processeur 2.0. - Duplicated element names %1 in %2 element. - + Unknown XSL-T attribute %1. + Attribut XSL-T inconnu : %1. - Reference %1 of %2 element cannot be resolved. - + Attribute %1 and %2 are mutually exclusive. + Les attributs %1 et %2 sont mutuellement exclusifs. - Circular group reference for %1. - + In a simplified stylesheet module, attribute %1 must be present. + Dans un module de feuille de style simplifié, l'attribut %1 doit être présent. - %1 element is not allowed in this scope - + If element %1 has no attribute %2, it cannot have attribute %3 or %4. + Si l'élément %1 n'a pas d'attribut %2, il ne peut pas avoir d'attribut %3 ou %4. - %1 element cannot have %2 attribute with value other than %3. - + Element %1 must have at least one of the attributes %2 or %3. + L'élement %1 doit avoir au moins un des attributs %2 ou %3. - %1 element cannot have %2 attribute with value other than %3 or %4. - + At least one mode must be specified in the %1-attribute on element %2. + Au moins un mode doit être spécifié dans l'attribut %1 sur l'élément %2. - %1 or %2 attribute of reference %3 does not match with the attribute declaration %4. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. + L'attribut %1 ne peut pas apparaître sur l'élément %2. Seuls les attributs standard le peuvent. - Attribute group %1 has circular reference. - + Attribute %1 cannot appear on the element %2. Only %3 is allowed, and the standard attributes. + L'attribut %1 ne peut pas apparaître sur l'élément %2. Seul %3 est autorisé, ainsi que les attributs standard. - %1 attribute in %2 must have %3 use like in base type %4. - + Attribute %1 cannot appear on the element %2. Allowed is %3, %4, and the standard attributes. + L'attribut %1 ne peut pas apparaître sur l'élément %2. Seuls %3, %4 et les attributs standard le sont. - Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2. - + Attribute %1 cannot appear on the element %2. Allowed is %3, and the standard attributes. + L'attribut %1 ne peut pas apparaître sur l'élément %2. Seul %3 et les attributs standard le sont. - %1 has attribute wildcard but its base type %2 has not. - + XSL-T attributes on XSL-T elements must be in the null namespace, not in the XSL-T namespace which %1 is. + Les attributs XSL-T sur des éléments XSL-T doivent être dans le namespace null, et pas dans %1. - Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible. - + The attribute %1 must appear on element %2. + L'attribut %1 doit apparaître sur l'élément %2. - Enumeration facet contains invalid content: {%1} is not a value of type %2. - + The element with local name %1 does not exist in XSL-T. + L'élément avec le nom local %1 n'existe pas dans XSL-T. - Namespace prefix of qualified name %1 is not defined. - + Element %1 must come last. + L'élément %1 doit être le dernier. - %1 element %2 is not a valid restriction of the %3 element it redefines: %4. - + At least one %1-element must occur before %2. + Au moins un élément %1 doit être placé avant %2. - Empty particle cannot be derived from non-empty particle. - + Only one %1-element can appear. + Seulement un élément %1 peut apparaître. - Derived particle is missing element %1. - + At least one %1-element must occur inside %2. + Au moins un élément %1 doit apparaître dans %2. - Derived element %1 is missing value constraint as defined in base particle. - + When attribute %1 is present on %2, a sequence constructor cannot be used. + Quand l'attribut %1 est présent sur %2, un constructeur de séquence ne peut pas être utilisé. - Derived element %1 has weaker value constraint than base particle. - + Element %1 must have either a %2-attribute or a sequence constructor. + L'élément %1 doit avoir un attribut %2 ou un constructeur de séquence. - Fixed value constraint of element %1 differs from value constraint in base particle. - + When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor. + Quand un paramètre est requis, un valeur par défault ne peut pas être fournie par un attribute %1 ou un constructeur de séquence. - Derived element %1 cannot be nillable as base element is not nillable. - + Element %1 cannot have children. + L'élément %1 ne peut pas avoir de fils. - Block constraints of derived element %1 must not be more weaker than in the base element. - + Element %1 cannot have a sequence constructor. + L'élément %1 ne peut pas avoir un constructuer de séquence. - Simple type of derived element %1 cannot be validly derived from base element. - + The attribute %1 cannot appear on %2, when it is a child of %3. + L'attribut %1 ne peut pas apparaître sur %2 quand il est fils de %3. - Complex type of derived element %1 cannot be validly derived from base element. - + A parameter in a function cannot be declared to be a tunnel. + Un paramètre de fonction ne peut pas être déclaré comme un tunnel. - Element %1 is missing in derived particle. - + This processor is not Schema-aware and therefore %1 cannot be used. + Ce processeur ne comprend pas les Schemas. C'est pourquoi %1 ne peut pas être utilisé. - Element %1 does not match namespace constraint of wildcard in base particle. - + Top level stylesheet elements must be in a non-null namespace, which %1 isn't. + Les élément d'une feuille de style de haut niveau doivent être dans un namespace non nul; %1 ne l'est pas. - Wildcard in derived particle is not a valid subset of wildcard in base particle. - + The value for attribute %1 on element %2 must either be %3 or %4, not %5. + La valeur de l'attribut %1 de l'élement %2 doit être %3 ou %4, et pas %5. - processContent of wildcard in derived particle is weaker than wildcard in base particle. - + Attribute %1 cannot have the value %2. + L'attribut %1 ne peut avoir la valeur %2. - Derived particle allows content that is not allowed in the base particle. - + The attribute %1 can only appear on the first %2 element. + L'attribute %1 peut seulement apparaître sur le premier élément %2. - Can not process unknown element %1, expected elements are: %2. - + At least one %1 element must appear as child of %2. + Au moins un élément %1 doit apparaître comme fils de %2. - Element %1 is not allowed in this scope, possible elements are: %2. - + A template with name %1 has already been declared. + Un template nommé %1 a déjà été déclaré. - Child element is missing in that scope, possible child elements are: %1. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid. + Le nom de destination dans une instruction de traitement ne peut être %1. %2 est invalide. - Document is not a XML schema. - + No variable with name %1 exists + Aucune variable nommée %1 n'existe - %1 attribute of %2 element contains invalid content: {%3} is not a value of type %4. - + The value of attribute %1 must be of type %2, which %3 isn't. + La valeur de l'attribut %1 doit être du type %2, %3 n'en est pas. - %1 attribute of %2 element contains invalid content: {%3}. - + The prefix %1 cannot be bound. By default, it is already bound to the namespace %2. + Le préfixe %1 ne peut être lié. Par défault, il est déjà lié au namespace %2. - Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema. - + A variable with name %1 has already been declared. + Une variable nommée %1 a déjà été déclarée. - Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema. - + No value is available for the external variable with name %1. + Aucune valeur n'est disponible pour la variable externe %1. - %1 element is not allowed to have the same %2 attribute value as the target namespace %3. - + An argument with name %1 has already been declared. Every argument name must be unique. + Un argument nommé %1 a déjà été déclaré. Chaque nom d'argument doit être unique. - %1 element without %2 attribute is not allowed inside schema without target namespace. - + No function with name %1 is available. + Aucune fonction nommée %1 n'est disponible. - %1 element is not allowed inside %2 element if %3 attribute is present. + W3C XML Schema identity constraint selector - %1 element has neither %2 attribute nor %3 child element. + W3C XML Schema identity constraint field - %1 element with %2 child element must not have a %3 attribute. + A construct was encountered which is disallowed in the current language(%1). - %1 attribute of %2 element must be %3 or %4. - + An attribute with name %1 has already appeared on this element. + Un attribute nommé %1 existe déjà pour cet élément. - %1 attribute of %2 element must have a value of %3. + %1 has inheritance loop in its base type %2. - %1 attribute of %2 element must have a value of %3 or %4. + Circular inheritance of base type %1. - %1 element must not have %2 and %3 attribute together. + Circular inheritance of union %1. - Content of %1 attribute of %2 element must not be from namespace %3. + %1 is not allowed to derive from %2 by restriction as the latter defines it as final. - %1 attribute of %2 element must not be %3. + %1 is not allowed to derive from %2 by extension as the latter defines it as final. - %1 attribute of %2 element must have the value %3 because the %4 attribute is set. + Base type of simple type %1 cannot be complex type %2. - Specifying use='prohibited' inside an attribute group has no effect. + Simple type %1 cannot have direct base type %2. - %1 element must have either %2 or %3 attribute. + Simple type %1 is not allowed to have base type %2. - %1 element must have either %2 attribute or %3 or %4 as child element. + Simple type %1 can only have simple atomic type as base type. - %1 element requires either %2 or %3 attribute. + Simple type %1 cannot derive from %2 as the latter defines restriction as final. - Text or entity references not allowed inside %1 element + Variety of item type of %1 must be either atomic or union. - %1 attribute of %2 element must contain %3, %4 or a list of URIs. + Variety of member types of %1 must be atomic. - %1 element is not allowed in this context. + %1 is not allowed to derive from %2 by list as the latter defines it as final. - %1 attribute of %2 element has larger value than %3 attribute. + Simple type %1 is only allowed to have %2 facet. - Prefix of qualified name %1 is not defined. + Base type of simple type %1 must have variety of type list. - %1 attribute of %2 element must either contain %3 or the other values. + Base type of simple type %1 has defined derivation by restriction as final. - Component with ID %1 has been defined previously. + Item type of base type does not match item type of %1. - Element %1 already defined. + Simple type %1 contains not allowed facet type %2. - Attribute %1 already defined. + %1 is not allowed to derive from %2 by union as the latter defines it as final. - Type %1 already defined. + %1 is not allowed to have any facets. - Attribute group %1 already defined. + Base type %1 of simple type %2 must have variety of union. - Element group %1 already defined. + Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute. - Notation %1 already defined. + Member type %1 cannot be derived from member type %2 of %3's base type %4. - Identity constraint %1 already defined. + Derivation method of %1 must be extension because the base type %2 is a simple type. - Duplicated facets in simple type %1. + Complex type %1 has duplicated element %2 in its content model. - %1 is not valid according to %2. + Complex type %1 has non-deterministic content. - String content does not match the length facet. + Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3. - String content does not match the minLength facet. + Content model of complex type %1 is not a valid extension of content model of %2. - String content does not match the maxLength facet. + Complex type %1 must have simple content. - String content does not match pattern facet. + Complex type %1 must have the same simple type as its base class %2. - String content is not listed in the enumeration facet. + Complex type %1 cannot be derived from base type %2%3. - Signed integer content does not match the maxInclusive facet. + Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3. - Signed integer content does not match the maxExclusive facet. + Complex type %1 with simple content cannot be derived from complex base type %2. - Signed integer content does not match the minInclusive facet. + Item type of simple type %1 cannot be a complex type. - Signed integer content does not match the minExclusive facet. + Member type of simple type %1 cannot be a complex type. - Signed integer content is not listed in the enumeration facet. + %1 is not allowed to have a member type with the same name as itself. - Signed integer content does not match pattern facet. + %1 facet collides with %2 facet. - Signed integer content does not match in the totalDigits facet. + %1 facet must have the same value as %2 facet of base type. - Unsigned integer content does not match the maxInclusive facet. + %1 facet must be equal or greater than %2 facet of base type. - Unsigned integer content does not match the maxExclusive facet. + %1 facet must be less than or equal to %2 facet of base type. - Unsigned integer content does not match the minInclusive facet. + %1 facet contains invalid regular expression - Unsigned integer content does not match the minExclusive facet. + Unknown notation %1 used in %2 facet. - Unsigned integer content is not listed in the enumeration facet. + %1 facet contains invalid value %2: %3. - Unsigned integer content does not match pattern facet. + %1 facet cannot be %2 or %3 if %4 facet of base type is %5. - Unsigned integer content does not match in the totalDigits facet. + %1 facet cannot be %2 if %3 facet of base type is %4. - Double content does not match the maxInclusive facet. + %1 facet must be less than or equal to %2 facet. - Double content does not match the maxExclusive facet. + %1 facet must be less than %2 facet of base type. - Double content does not match the minInclusive facet. + %1 facet and %2 facet cannot appear together. - Double content does not match the minExclusive facet. + %1 facet must be greater than %2 facet of base type. - Double content is not listed in the enumeration facet. + %1 facet must be less than %2 facet. - Double content does not match pattern facet. + %1 facet must be greater than or equal to %2 facet of base type. - Decimal content does not match in the fractionDigits facet. + Simple type contains not allowed facet %1. - Decimal content does not match in the totalDigits facet. + %1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list. - Date time content does not match the maxInclusive facet. + Only %1 and %2 facets are allowed when derived by union. - Date time content does not match the maxExclusive facet. + %1 contains %2 facet with invalid data: %3. - Date time content does not match the minInclusive facet. + Attribute group %1 contains attribute %2 twice. - Date time content does not match the minExclusive facet. + Attribute group %1 contains two different attributes that both have types derived from %2. - Date time content is not listed in the enumeration facet. + Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3. - Date time content does not match pattern facet. + Complex type %1 contains attribute %2 twice. - Duration content does not match the maxInclusive facet. + Complex type %1 contains two different attributes that both have types derived from %2. - Duration content does not match the maxExclusive facet. + Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3. - Duration content does not match the minInclusive facet. + Element %1 is not allowed to have a value constraint if its base type is complex. - Duration content does not match the minExclusive facet. + Element %1 is not allowed to have a value constraint if its type is derived from %2. - Duration content is not listed in the enumeration facet. + Value constraint of element %1 is not of elements type: %2. - Duration content does not match pattern facet. + Element %1 is not allowed to have substitution group affiliation as it is no global element. - Boolean content does not match pattern facet. + Type of element %1 cannot be derived from type of substitution group affiliation. - Binary content does not match the length facet. + Value constraint of attribute %1 is not of attributes type: %2. - Binary content does not match the minLength facet. + Attribute %1 has value constraint but has type derived from %2. - Binary content does not match the maxLength facet. + %1 attribute in derived complex type must be %2 like in base type. - Binary content is not listed in the enumeration facet. + Attribute %1 in derived complex type must have %2 value constraint like in base type. - Invalid QName content: %1. + Attribute %1 in derived complex type must have the same %2 value constraint like in base type. - QName content is not listed in the enumeration facet. + Attribute %1 in derived complex type must have %2 value constraint. - QName content does not match pattern facet. + processContent of base wildcard must be weaker than derived wildcard. - Notation content is not listed in the enumeration facet. + Element %1 exists twice with different types. - List content does not match length facet. + Particle contains non-deterministic wildcards. - List content does not match minLength facet. + Base attribute %1 is required but derived attribute is not. - List content does not match maxLength facet. + Type of derived attribute %1 cannot be validly derived from type of base attribute. - List content is not listed in the enumeration facet. + Value constraint of derived attribute %1 does not match value constraint of base attribute. - List content does not match pattern facet. + Derived attribute %1 does not exist in the base definition. - Union content is not listed in the enumeration facet. + Derived attribute %1 does not match the wildcard in the base definition. - Union content does not match pattern facet. + Base attribute %1 is required but missing in derived definition. - Data of type %1 are not allowed to be empty. + Derived definition contains an %1 element that does not exists in the base definition - Element %1 is missing child element. + Derived wildcard is not a subset of the base wildcard. - There is one IDREF value with no corresponding ID: %1. + %1 of derived wildcard is not a valid restriction of %2 of base wildcard - Loaded schema file is invalid. + Attribute %1 from base type is missing in derived type. - %1 contains invalid data. + Type of derived attribute %1 differs from type of base attribute. - xsi:schemaLocation namespace %1 has already appeared earlier in the instance document. + Base definition contains an %1 element that is missing in the derived definition - xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute. + %1 references unknown %2 or %3 element %4. - No schema defined for validation. + %1 references identity constraint %2 that is no %3 or %4 element. - No definition for element %1 available. + %1 has a different number of fields from the identity constraint %2 that it references. - Specified type %1 is not known to the schema. + Base type %1 of %2 element cannot be resolved. - Element %1 is not defined in this scope. + Item type %1 of %2 element cannot be resolved. - Declaration for element %1 does not exist. + Member type %1 of %2 element cannot be resolved. - Element %1 contains invalid content. + Type %1 of %2 element cannot be resolved. - Element %1 is declared as abstract. + Base type %1 of complex type cannot be resolved. - Element %1 is not nillable. + %1 cannot have complex base type that has a %2. - Attribute %1 contains invalid data: %2 + Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type. - Element contains content although it is nillable. + Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model. - Fixed value constraint not allowed if element is nillable. + Type of %1 element must be a simple type, %2 is not. - Element %1 cannot contain other elements, as it has a fixed content. + Substitution group %1 of %2 element cannot be resolved. - Specified type %1 is not validly substitutable with element type %2. + Substitution group %1 has circular definition. - Complex type %1 is not allowed to be abstract. + Duplicated element names %1 in %2 element. - Element %1 contains not allowed attributes. + Reference %1 of %2 element cannot be resolved. - Element %1 contains not allowed child element. + Circular group reference for %1. - Content of element %1 does not match its type definition: %2. + %1 element is not allowed in this scope - Content of element %1 does not match defined value constraint. + %1 element cannot have %2 attribute with value other than %3. - Element %1 contains not allowed child content. + %1 element cannot have %2 attribute with value other than %3 or %4. - Element %1 contains not allowed text content. + %1 or %2 attribute of reference %3 does not match with the attribute declaration %4. - Element %1 is missing required attribute %2. + Attribute group %1 has circular reference. - Attribute %1 does not match the attribute wildcard. + %1 attribute in %2 must have %3 use like in base type %4. - Declaration for attribute %1 does not exist. + Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2. - Element %1 contains two attributes of type %2. + %1 has attribute wildcard but its base type %2 has not. - Attribute %1 contains invalid content. + Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible. - Element %1 contains unknown attribute %2. + Enumeration facet contains invalid content: {%1} is not a value of type %2. - Content of attribute %1 does not match its type definition: %2. + Namespace prefix of qualified name %1 is not defined. - Content of attribute %1 does not match defined value constraint. + %1 element %2 is not a valid restriction of the %3 element it redefines: %4. - Non-unique value found for constraint %1. + Empty particle cannot be derived from non-empty particle. - Key constraint %1 contains absent fields. + Derived particle is missing element %1. - Key constraint %1 contains references nillable element %2. + Derived element %1 is missing value constraint as defined in base particle. - No referenced value found for key reference %1. + Derived element %1 has weaker value constraint than base particle. - More than one value found for field %1. + Fixed value constraint of element %1 differs from value constraint in base particle. - Field %1 has no simple type. + Derived element %1 cannot be nillable as base element is not nillable. - ID value '%1' is not unique. + Block constraints of derived element %1 must not be more weaker than in the base element. - '%1' attribute contains invalid QName content: %2. + Simple type of derived element %1 cannot be validly derived from base element. - - - VolumeSlider - - Muted - Muet + Complex type of derived element %1 cannot be validly derived from base element. + - - - Volume: %1% - Volume : %1% + Element %1 is missing in derived particle. + - - - WebCore::PlatformScrollbar - Scroll here - Défiler jusqu'ici + Element %1 does not match namespace constraint of wildcard in base particle. + - Left edge - Extrême gauche + Wildcard in derived particle is not a valid subset of wildcard in base particle. + - Top - En haut + processContent of wildcard in derived particle is weaker than wildcard in base particle. + - Right edge - Extrême droite + Derived particle allows content that is not allowed in the base particle. + - Bottom - En bas + Can not process unknown element %1, expected elements are: %2. + - Page left - Page précédente + Element %1 is not allowed in this scope, possible elements are: %2. + - Page up - Page précédente + Child element is missing in that scope, possible child elements are: %1. + - Page right - Page suivante + Document is not a XML schema. + - Page down - Page suivante + %1 attribute of %2 element contains invalid content: {%3} is not a value of type %4. + - Scroll left - Défiler vers la gauche + %1 attribute of %2 element contains invalid content: {%3}. + - Scroll up - Défiler vers le haut + Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema. + - Scroll right - Défiler vers la droite + Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema. + - Scroll down - Défiler vers le bas + %1 element is not allowed to have the same %2 attribute value as the target namespace %3. + - - - FakeReply - Fake error ! - Fausse erreur! + %1 element without %2 attribute is not allowed inside schema without target namespace. + - Invalid URL - URL non valide + %1 element is not allowed inside %2 element if %3 attribute is present. + - - - Phonon::AudioOutput - <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> - <html>Le périphérique audio <b>%1</b> ne fonctionne pas.<br/>Repli sur <b>%2</b>.</html> + %1 element has neither %2 attribute nor %3 child element. + - <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> - <html>Basculement vers le périphérique audio <b>%1</b><br/>qui vient juste d'être disponible et dont le niveau de préférence est plus élevé.</html> + %1 element with %2 child element must not have a %3 attribute. + - Revert back to device '%1' - Revenir au périphérique '%1' + %1 attribute of %2 element must be %3 or %4. + - - - Phonon::MMF - Audio Output - Sortie audio + %1 attribute of %2 element must have a value of %3. + - The audio output device - Périphérique audio de sortie + %1 attribute of %2 element must have a value of %3 or %4. + - No error - Aucune erreur + %1 element must not have %2 and %3 attribute together. + - Not found - Introuvable + Content of %1 attribute of %2 element must not be from namespace %3. + - Out of memory - Mémoire insuffisante + %1 attribute of %2 element must not be %3. + - Not supported - Non supporté + %1 attribute of %2 element must have the value %3 because the %4 attribute is set. + - Overflow - Dépassement + Specifying use='prohibited' inside an attribute group has no effect. + - Underflow - Soupassement + %1 element must have either %2 or %3 attribute. + - Already exists - Existe déjà + %1 element must have either %2 attribute or %3 or %4 as child element. + - Path not found - Chemin introuvable + %1 element requires either %2 or %3 attribute. + - In use - Utilisé + Text or entity references not allowed inside %1 element + - Not ready - Pas prêt + %1 attribute of %2 element must contain %3, %4 or a list of URIs. + - Access denied - Accès refusé + %1 element is not allowed in this context. + - Could not connect - Connexion impossible + %1 attribute of %2 element has larger value than %3 attribute. + - Disconnected - Déconnecté + Prefix of qualified name %1 is not defined. + - Permission denied - Autorisation refusée + %1 attribute of %2 element must either contain %3 or the other values. + - Insufficient bandwidth - Bande passante insuffisante + Component with ID %1 has been defined previously. + - Network unavailable - Réseau non disponible + Element %1 already defined. + - Network communication error - Erreur de communication réseau + Attribute %1 already defined. + - Streaming not supported - Streaming non supporté + Type %1 already defined. + - Server alert - Alerte serveur + Attribute group %1 already defined. + - Invalid protocol - Protocole non valide + Element group %1 already defined. + - Invalid URL - URL non valide + Notation %1 already defined. + - Multicast error - Erreur multicast + Identity constraint %1 already defined. + - Proxy server error - Erreur du serveur proxy + Duplicated facets in simple type %1. + - Proxy server not supported - Serveur proxy non supporté + %1 is not valid according to %2. + - Audio output error - Erreur de sortie audio + String content does not match the length facet. + - Video output error - Erreur de sortie vidéo + String content does not match the minLength facet. + - Decoder error - Erreur du décodeur + String content does not match the maxLength facet. + - Audio or video components could not be played - Les composants audio ou vidéo n'ont pas pu être lus + String content does not match pattern facet. + - DRM error - Erreur GDN + String content is not listed in the enumeration facet. + - Unknown error (%1) - Erreur inconnue (%1) + Signed integer content does not match the maxInclusive facet. + - - - Phonon::MMF::AbstractMediaPlayer - Not ready to play - Pas prêt pour lecture + Signed integer content does not match the maxExclusive facet. + - Error opening file - Erreur lors de l'ouverture du fichier + Signed integer content does not match the minInclusive facet. + - Error opening URL - Erreur lors de l'ouverture de l'URL + Signed integer content does not match the minExclusive facet. + - Setting volume failed - Le réglage du volume a échoué + Signed integer content is not listed in the enumeration facet. + - Playback complete - Lecture terminée + Signed integer content does not match pattern facet. + - - - Phonon::MMF::AudioEqualizer - %1 Hz - %1 Hz + Signed integer content does not match in the totalDigits facet. + - - - Phonon::MMF::AudioPlayer - Getting position failed - L'obtention de la position a échoué + Unsigned integer content does not match the maxInclusive facet. + - Opening clip failed - L'ouverture du clip a échoué + Unsigned integer content does not match the maxExclusive facet. + - - - Phonon::MMF::EffectFactory - Enabled - Activé + Unsigned integer content does not match the minInclusive facet. + - - - Phonon::MMF::EnvironmentalReverb - Decay HF ratio (%) - Ratio HF du déclin (%) + Unsigned integer content does not match the minExclusive facet. + - Decay time (ms) - Temps de déclin (ms) + Unsigned integer content is not listed in the enumeration facet. + - Density (%) - Densité (%) + Unsigned integer content does not match pattern facet. + - Diffusion (%) - Diffusion (%) + Unsigned integer content does not match in the totalDigits facet. + - Reflections delay (ms) - Délai réflexions (ms) + Double content does not match the maxInclusive facet. + - Reflections level (mB) - Niveau réflexions (mB) + Double content does not match the maxExclusive facet. + - Reverb delay (ms) - Délai de réverbération (ms) + Double content does not match the minInclusive facet. + - Reverb level (mB) - Niveau de réverbération (mB) + Double content does not match the minExclusive facet. + - Room HF level - Niveau HF pièce + Double content is not listed in the enumeration facet. + - Room level (mB) - Niveau pièce (mB) + Double content does not match pattern facet. + - - - Phonon::MMF::MediaObject - Error opening source: type not supported - Erreur lors de l'ouverture de la source: type non supporté + Decimal content does not match in the fractionDigits facet. + - Error opening source: media type could not be determined - Erreur lors de l'ouverture de la source: type de média non déterminé + Decimal content does not match in the totalDigits facet. + - - - Phonon::MMF::StereoWidening - Level (%) - Niveau (%) + Date time content does not match the maxInclusive facet. + - - - Phonon::MMF::VideoPlayer - Pause failed - La mise en pause a échoué + Date time content does not match the maxExclusive facet. + - Seek failed - La recherche a échoué + Date time content does not match the minInclusive facet. + - Getting position failed - L'obtention de la position a échoué + Date time content does not match the minExclusive facet. + - Opening clip failed - L'ouverture du clip a échoué + Date time content is not listed in the enumeration facet. + - Buffering clip failed - La mise en mémoire tampon du clip a échoué + Date time content does not match pattern facet. + - Video display error - Erreur de l'affichage vidéo + Duration content does not match the maxInclusive facet. + - - - QAccessibleButton - Press - Appuyer + Duration content does not match the maxExclusive facet. + - - - QNetworkAccessDebugPipeBackend - Write error writing to %1: %2 - Erreur lors de l'écriture dans %1: %2 + Duration content does not match the minInclusive facet. + - - - QScriptBreakpointsModel - ID - Identifiant + Duration content does not match the minExclusive facet. + - Location - Lieu + Duration content is not listed in the enumeration facet. + - Condition - Condition + Duration content does not match pattern facet. + - Ignore-count - Comptes d'ignorés + Boolean content does not match pattern facet. + - Single-shot - Un seul tir + Binary content does not match the length facet. + - Hit-count - Compte de coups + Binary content does not match the minLength facet. + - - - QScriptBreakpointsWidget - New - Créer + Binary content does not match the maxLength facet. + - Delete - Supprimer + Binary content is not listed in the enumeration facet. + - - - QScriptDebugger - Go to Line - Aller à la ligne + Invalid QName content: %1. + - Line: - Ligne: + QName content is not listed in the enumeration facet. + - Interrupt - Interrompre + QName content does not match pattern facet. + - Shift+F5 - Shift+F5 + Notation content is not listed in the enumeration facet. + - Continue - Continuer + List content does not match length facet. + - F5 - F5 + List content does not match minLength facet. + - Step Into - Pas à pas détaillé + List content does not match maxLength facet. + - F11 - F11 + List content is not listed in the enumeration facet. + - Step Over - Pas à pas principal + List content does not match pattern facet. + - F10 - F10 + Union content is not listed in the enumeration facet. + - Step Out - Pas à pas sortant + Union content does not match pattern facet. + - Shift+F11 - Shift+F11 + Data of type %1 are not allowed to be empty. + - Run to Cursor - Exécuter au curseur + Element %1 is missing child element. + - Ctrl+F10 - Ctrl+F10 + There is one IDREF value with no corresponding ID: %1. + - Run to New Script - Exécuter au nouveau script + Loaded schema file is invalid. + - Toggle Breakpoint - Basculer le point d'arrêt + %1 contains invalid data. + - F9 - F9 + xsi:schemaLocation namespace %1 has already appeared earlier in the instance document. + - Clear Debug Output - Effacer les résultats du débogage + xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute. + - Clear Error Log - Effacer le journal d'erreurs + No schema defined for validation. + - Clear Console - Effacer la console + No definition for element %1 available. + - &Find in Script... - &Chercher dans le script... + Specified type %1 is not known to the schema. + - Ctrl+F - Ctrl+F + Element %1 is not defined in this scope. + - Find &Next - Résultat &suivant + Declaration for element %1 does not exist. + - F3 - F3 + Element %1 contains invalid content. + - Find &Previous - Chercher &précédent + Element %1 is declared as abstract. + - Shift+F3 - Shift+F3 + Element %1 is not nillable. + - Ctrl+G - Ctrl+G + Attribute %1 contains invalid data: %2 + - Debug - Déboguer + Element contains content although it is nillable. + - - - QScriptDebuggerCodeFinderWidget - Close - Fermer + Fixed value constraint not allowed if element is nillable. + - Previous - Précédent + Element %1 cannot contain other elements, as it has a fixed content. + - Next - Suivant + Specified type %1 is not validly substitutable with element type %2. + - Case Sensitive - Sensible à la casse + Complex type %1 is not allowed to be abstract. + - Whole words - Mots entiers + Element %1 contains not allowed attributes. + - <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped - <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;La recherche est revenue au début + Element %1 contains not allowed child element. + - - - QScriptDebuggerLocalsModel - Name - Nom + Content of element %1 does not match its type definition: %2. + - Value - Valeur + Content of element %1 does not match defined value constraint. + - - - QScriptDebuggerStackModel - Level - Niveau + Element %1 contains not allowed child content. + - Name - Nom + Element %1 contains not allowed text content. + - Location - Lieu + Element %1 is missing required attribute %2. + - - - QScriptEdit - Toggle Breakpoint - Basculer le point d'arrêt + Attribute %1 does not match the attribute wildcard. + - Disable Breakpoint - Désactiver le point d'arrêt + Declaration for attribute %1 does not exist. + - Enable Breakpoint - Activer le point d'arrêt + Element %1 contains two attributes of type %2. + - Breakpoint Condition: - Condition du point d'arrêt: + Attribute %1 contains invalid content. + - - - QScriptEngineDebugger - Loaded Scripts - Scripts chargés + Element %1 contains unknown attribute %2. + - Breakpoints - Points d'arrêt + Content of attribute %1 does not match its type definition: %2. + - Stack - Empiler + Content of attribute %1 does not match defined value constraint. + - Locals - Locaux + Non-unique value found for constraint %1. + - Console - Console + Key constraint %1 contains absent fields. + - Debug Output - Résultats du débogage + Key constraint %1 contains references nillable element %2. + - Error Log - Journal d'erreurs + No referenced value found for key reference %1. + - Search - Chercher + More than one value found for field %1. + - View - Afficher + Field %1 has no simple type. + - Qt Script Debugger - Débogueur de script Qt + ID value '%1' is not unique. + - - - QScriptNewBreakpointWidget - Close - Fermer + '%1' attribute contains invalid QName content: %2. + - QSoftKeyManager + VolumeSlider - Ok - OK + Muted + Muet - Select - Sélectionner + Volume: %1% + Volume : %1% + + + WebCore::PlatformScrollbar - Done - Terminer + Scroll here + Défiler jusqu'ici - Options - Options + Left edge + Extrême gauche - Cancel - Annuler + Top + En haut - Exit - Quitter + Right edge + Extrême droite - - - QStateMachine - Missing initial state in compound state '%1' - État initial manquant dans l'état composé '%1' + Bottom + En bas - Missing default state in history state '%1' - État par défaut manquant dans l'état de l'historique '%1' + Page left + Page précédente - No common ancestor for targets and source of transition from state '%1' - Aucun ancêtre commun pour les cibles et la source de transition de l'état '%1' + Page up + Page précédente - Unknown error - Erreur inconnue + Page right + Page suivante - - - QXmlPatternistCLI - Warning in %1, at line %2, column %3: %4 - Avertissement dans %1, à la ligne %2, colonne %3: %4 + Page down + Page suivante - Warning in %1: %2 - Avertissement dans %1: %2 + Scroll left + Défiler vers la gauche - Unknown location - Lieu inconnu + Scroll up + Défiler vers le haut - Error %1 in %2, at line %3, column %4: %5 - Erreur %1 dans %2, à la ligne %3, colonne %4: %5 + Scroll right + Défiler vers la droite - Error %1 in %2: %3 - Erreur %1 dans %2: %3 + Scroll down + Défiler vers le bas diff --git a/translations/qt_help_fr.ts b/translations/qt_help_fr.ts index 3835d10..f0cabc2 100644 --- a/translations/qt_help_fr.ts +++ b/translations/qt_help_fr.ts @@ -4,27 +4,22 @@ QCLuceneResultWidget - Search Results Résultats de la recherche - Note: Note : - The search results may not be complete since the documentation is still being indexed! Les résultats de la recherche risquent d'être incomplets car l'indexation de la documentation est en cours ! - Your search did not match any documents. Votre recherche ne correspond à aucun document. - (The reason for this might be that the documentation is still being indexed.) (Il est possible que cela soit dû au fait que la documentation est en cours d'indexation.) @@ -32,80 +27,64 @@ QHelpCollectionHandler - The collection file '%1' is not set up yet! Le fichier de collection '%1' n'est pas encore chargé ! - Cannot load sqlite database driver! driver ? Chargement du pilote de base de données sqlite impossible ! - - Cannot open collection file: %1 collection ? Impossible d'ouvrir le fichier collection : %1 - Cannot create tables in file %1! Impossible de créer les tables dans le fichier : %1 ! - The collection file '%1' already exists! Le fichier collection '%1' existe déjà ! - Cannot create directory: %1 Impossible de créer le répertoire : %1 - Cannot copy collection file: %1 Impossible de copier le fichier collection : %1 - Unknown filter '%1'! Filtre '%1' inconnu ! - Cannot register filter %1! Impossible d'enregistrer le filtre %1 ! - Cannot open documentation file %1! Impossible d'ouvrir le fichier de documentation %1 ! - Invalid documentation file '%1'! Fichier de documentation invalide : '%1' ! - The namespace %1 was not registered! L'espace de noms '%1' n'était pas référencé ! - Namespace %1 already exists! L'espace de noms %1 existe déjà ! - Cannot register namespace '%1'! Impossible d'enregistrer l'espace de noms '%1' ! - Cannot open database '%1' to optimize! Impossible d'ouvrir la base de données à optimiser '%1' ! @@ -113,7 +92,6 @@ QHelpDBReader - Cannot open database '%1' '%2': %3 The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string Impossible d'ouvrir la base de données '%1' '%2' : %3 @@ -122,7 +100,10 @@ QHelpEngineCore - + Cannot open documentation file %1: %2! + Impossible d'ouvrir le fichier de documentation %1 : %2 ! + + The specified namespace does not exist! L'espace de noms spécifié n'existe pas ! @@ -130,182 +111,210 @@ QHelpEngineCorePrivate - Cannot open documentation file %1: %2! - Impossible d'ouvrir le fichier de documentation %1 : %2 ! + Impossible d'ouvrir le fichier de documentation %1 : %2 ! QHelpGenerator - Invalid help data! Données d'aide invalides ! - No output file name specified! Aucun nom de fichier de sortie spécifié ! - The file %1 cannot be overwritten! Le fichier %1 ne peut être écrasé ! - Building up file structure... Construction de la structure de fichiers en cours… - Cannot open data base file %1! Impossible d'ouvrir le fichier de base de données %1 ! - Cannot register namespace %1! Impossible d'enregistrer l'espace de noms %1 ! - Insert custom filters... Insértion des filtres personnalisés… - Insert help data for filter section (%1 of %2)... ??? Insertion des données d'aide pour la section filtre (%1 de %2)… - Documentation successfully generated. Documentation générée avec succès. - Some tables already exist! Certaines tables existent déjà ! - Cannot create tables! Impossible de créer les tables ! - Cannot register virtual folder! Impossible d'enregistrer le dossier virtuel ! - Insert files... Insertion des fichiers... - The referenced file %1 must be inside or within a subdirectory of (%2). Skipping it. Le fichier référencé %1 doit être dans le dossier (%2) ou un de ses sous-dossiers. Fichier non pris en compte. - The file %1 does not exist! Skipping it. Le fichier %1 n'existe pas ! Fichier non pris en compte. - Cannot open file %1! Skipping it. Impossible d'ouvrir le fichier %1 ! Fichier non pris en compte. - The filter %1 is already registered! Le filtre %1 est déjà enregistré ! - Cannot register filter %1! Impossible d'enregistrer le filtre %1 ! - Insert indices... Insertion des index… - Insert contents... insertion du contenu… - Cannot insert contents! Impossible d'insérer le contenu ! - Cannot register contents! Impossible de référencer le contenu ! + + File '%1' does not exist. + Le fichier '%1' n'existe pas. + + + File '%1' cannot be opened. + Le fichier '%1' ne peut être ouvert. + + + File '%1' contains an invalid link to file '%2' + Le fichier '%1' contient un lien invalide vers le fichier '%2' + + + Invalid links in HTML files. + Liens invalides dans les fichiers HTML. + + + + QHelpProject + + Unknown token. + Identificateur inconnu. + + + Unknown token. Expected "QtHelpProject"! + Identificateur inconnu. "QtHelpProject" attendu ! + + + Error in line %1: %2 + Erreur à la ligne %1 : %2 + + + Virtual folder has invalid syntax. + Syntaxe invalide pour le dossier virtuel. + + + Namespace has invalid syntax. + Syntaxe invalide pour l'espace de noms. + + + Missing namespace in QtHelpProject. + Espace de noms manquant dans QtHelpProject. + + + Missing virtual folder in QtHelpProject + Dossier virtuel manquant dans QtHelpProject + + + Missing attribute in keyword at line %1. + Attribut manquant pour le mot clé à la ligne %1. + + + The input file %1 could not be opened! + Le fichier source %1 n'a pas pu être ouvert ! + QHelpSearchQueryWidget - Search for: Rechercher : - Previous search Recherche précédente - Next search Recherche suivante - Search Recherche - Advanced search Recherche avancée - words <B>similar</B> to: mots <B>semblables</B> à : - <B>without</B> the words: <B>sans</B> les mots : - with <B>exact phrase</B>: avec la <B>phrase exacte</B> : - with <B>all</B> of the words: avec <B>tous</B> les mots : - with <B>at least one</B> of the words: avec <B>au moins un</B> des mots : QHelpSearchResultWidget + + %1 - %2 of %n Hits + + %1 - %2 de %n résultat + %1 - %2 de %n résultats + + - 0 - 0 of 0 Hits 0 - 0 de 0 résultats @@ -313,63 +322,52 @@ QHelpSearchResultWidgetPrivate - %1 - %2 of %3 Hits - %1 - %2 de %3 résultats + %1 - %2 de %3 résultats QObject - Untitled - Sans titre + Sans titre - Unknown token. contexte peu clair... - Identificateur inconnu. + Identificateur inconnu. - Unknown token. Expected "QtHelpProject"! - Identificateur inconnu. "QtHelpProject" attendu ! + Identificateur inconnu. "QtHelpProject" attendu ! - Error in line %1: %2 - Erreur à la ligne %1 : %2 + Erreur à la ligne %1 : %2 - A virtual folder must not contain a '/' character! - Un dossier virtuel ne doit pas contenir le caractère '/' ! + Un dossier virtuel ne doit pas contenir le caractère '/' ! - A namespace must not contain a '/' character! - Un espace de noms ne doit pas contenir le caractère '/' ! + Un espace de noms ne doit pas contenir le caractère '/' ! - Missing namespace in QtHelpProject. - Espace de noms manquant dans QtHelpProject. + Espace de noms manquant dans QtHelpProject. - Missing virtual folder in QtHelpProject - Dossier virtuel manquant dans QtHelpProject + Dossier virtuel manquant dans QtHelpProject - Missing attribute in keyword at line %1. - Attribut manquant pour le mot clé à la ligne %1. + Attribut manquant pour le mot clé à la ligne %1. - The input file %1 could not be opened! - Le fichier source %1 n'a pas pu être ouvert ! + Le fichier source %1 n'a pas pu être ouvert ! -- cgit v0.12 From 4fd04190ab3800fde261293acd4bcf11cf449dee Mon Sep 17 00:00:00 2001 From: qCaro Date: Thu, 1 Jul 2010 14:50:18 +0200 Subject: Some more french translations. Reviewed-by: Pierre --- translations/qt_fr.ts | 307 +++++++++++++++++++++++++------------------------- 1 file changed, 156 insertions(+), 151 deletions(-) diff --git a/translations/qt_fr.ts b/translations/qt_fr.ts index 2a4135b..56a9e0e 100644 --- a/translations/qt_fr.ts +++ b/translations/qt_fr.ts @@ -1706,7 +1706,7 @@ en Component elements may not contain properties other than id - + Les éléments du composant ne peuvent pas contenir des propriétés autres que id Invalid component id specification @@ -1718,167 +1718,167 @@ en Invalid component body specification - + Le corps de la spécification du composant n'est pas valide Component objects cannot declare new properties. - + Les objets composants ne peuvent pas déclarer de nouvelles propriétés. Component objects cannot declare new signals. - + Les objets composants ne peuvent pas déclarer de nouveaux signaux. Component objects cannot declare new functions. - + Les objets composants ne peuvent pas déclarer de nouvelles fonctions. Cannot create empty component specification - + Impossible de créer une spécification du composant vide Incorrectly specified signal assignment - + L'affectation du signal est ncorrectement spécifiée Cannot assign a value to a signal (expecting a script to be run) - + Impossible d'assigner une valeur à un signal (celà exige d'éxécuter un script) Empty signal assignment - + Signal d'affectation vide Empty property assignment - + Propriété d'affectation vide Attached properties cannot be used here - + La configuration spécifiée ne peut être utilisée.ici Non-existent attached object - + Objet attaché non existant Invalid attached object assignment - + L'affectation de l'objet attaché est invalide Cannot assign to non-existent default property - + Impossible d'attacher à une propriété par défaut non existante Cannot assign to non-existent property "%1" - + Impossible d'attacher à une propriété non existante "%1" Invalid use of namespace - + Utilisation invalide d'espace de noms Not an attached property name - + Ce n'est pas un nom de propriété attachée Invalid use of id property - + Utilisation invalide de la propriété id Property has already been assigned a value - + Une valeur a déjà été attribuée à la propriété Invalid grouped property access - + Accès invalide à une propriété groupée Cannot assign a value directly to a grouped property - + Impossible d'assigner directement une valeur à une propriété groupée Invalid property use - + La propriété utilisée est invalide Property assignment expected - + Propriété d'affectation attendue Single property assignment expected - + Une seule propriété d'affectation est attendue Unexpected object assignment - + Affectation d'objet innatendue Cannot assign object to list - + Impossible d'assigner un objet à une liste Can only assign one binding to lists - + Un seul lien peut être assigné à des listes Cannot assign primitives to lists - + Impossible d'assigner des primitives à des listes Cannot assign multiple values to a script property - + Impossible d'assigner plusieurs valeurs à une propriété de script Invalid property assignment: script expected - + Propriété d'affectation invalide: script attendu Cannot assign object to property - + Impossible d'assigner un objet à une propriété "%1" cannot operate on "%2" - + "%1" ne peut pas fonctionner sur "%2" Duplicate default property - + Propriété par défaut en double Duplicate property name - + Nom de propriété en double Property names cannot begin with an upper case letter - + Les noms des propriétés ne peuvent pas commencer par une majuscule Duplicate signal name - + Nom de signal en double Signal names cannot begin with an upper case letter - + Les noms de signaux ne peuvent pas commencer par une majuscule Duplicate method name - + Nom de méthode en double Method names cannot begin with an upper case letter - + Les noms des méthodes ne peuvent pas commencer par une majuscule Property value set multiple times - + Valeur de propriété attribuée plusieurs fois Invalid property nesting - + Propriété d'emboîtement invalide Cannot override FINAL property - + Impossible de remplacer la propriété FINAL Invalid property type @@ -1890,177 +1890,178 @@ en IDs cannot start with an uppercase letter - + Les IDs ne peuvent pas commencer par une majuscule IDs must start with a letter or underscore - + Les IDs doivent commencer par une lettre ou un souligné IDs must contain only letters, numbers, and underscores - + Les IDs ne peuvent contenir que des lettres, des nombres ou des soulignés ID illegally masks global JavaScript property - + ID masque illégalement la propriété JavaScript globale No property alias location - + ?? + La propriété de l'alias n'a pas d'emplacement Invalid alias location - + Emplacement d'alias invalide Invalid alias reference. An alias reference must be specified as <id> or <id>.<property> - + Référence d'alias invalide. La référence d'alias doit être spécifiée comme <id> ou <id>.<property> Invalid alias reference. Unable to find id "%1" - + Référence d'alias invalide. Impossible de trouver l'id "%1" QDeclarativeComponent Invalid empty URL - + URL vide non valide QDeclarativeCompositeTypeManager Resource %1 unavailable - + La ressource %1 n'est pas disponible Namespace %1 cannot be used as a type - + L'espace de noms %1 ne peut pas être utilisé comme un type %1 %2 - %1% {1 %2?} + %1 %2 Type %1 unavailable - + Le type %1 n'est pas disponible QDeclarativeConnections Cannot assign to non-existent property "%1" - + Imposible d'assigner à la propriété inexistante "%1" Connections: nested objects not allowed - + Connexions: les éléments imbriqués ne sont pas autorisés Connections: syntax error - + Connexions: erreur de syntaxe Connections: script expected - + Connexions: script attendu QDeclarativeEngine executeSql called outside transaction() - + executeSql a été 1.appelé en dehors de transaction() Read-only Transaction - + Transaction en lecture seule Version mismatch: expected %1, found %2 - + Version incompatible:%1 attendue, %2 trouvée SQL transaction failed - + la transaction SQL a échouée transaction: missing callback - + transaction: le rappel est absent SQL: database version mismatch - + SQL: la version de la base de données est incompatible QDeclarativeFlipable front is a write-once property - + avant est une propriété à écriture unique back is a write-once property - + arrière est une propriété à écriture unique QDeclarativeImportDatabase module "%1" definition "%2" not readable - + La définition "%2" du module "%1% n'est pas lisible plugin cannot be loaded for module "%1": %2 - + Impossible de charger le plugin pour le module "%1": %2 module "%1" plugin "%2" not found - + Le plugin "%2" du module "%1" n'a pas été trouvé module "%1" version %2.%3 is not installed - + la version %2.%3 du module "%1" n'est pas installée module "%1" is not installed - + le module "%1" n'est pas installé "%1": no such directory - + "%1": le répertoire n'existe pas import "%1" has no qmldir and no namespace - + l'importation "%1" n'a pas de qmldir ni d'espace de noms - %1 is not a namespace - + - %1 n'est pas un espace de noms - nested namespaces not allowed - + - les espaces de noms imbriqués ne sont pas autorisés local directory - + répertoire local is ambiguous. Found in %1 and in %2 - + est ambigu. Trouvé dans %1 et dans %2 is ambiguous. Found in %1 in version %2.%3 and %4.%5 - + est ambigu. Trouvé dans %1 dans les versions %2.%3 et %4.%5 is instantiated recursively - + est instancié récursivement is not a type - + n'est pas un type @@ -2074,328 +2075,332 @@ en QDeclarativeKeysAttached Keys is only available via attached properties - + Keys, a verifier + Keys est disponible uniquement via les propriétés attachées QDeclarativeListModel remove: index %1 out of range - + supprimer: l'inder %1 est hors de la plage de valeurs admissible insert: value is not an object - + insérer: une valeur n'est pas un objet insert: index %1 out of range - + insérer: l'inder %1 est hors de la plage de valeurs admissible move: out of range - + Déplacer: hors de la plage de valeurs admissible append: value is not an object - + ajouter: une valeur n'est pas un objet set: value is not an object - + attribuer: une valeur n'est pas un objet set: index %1 out of range - + attribuer: l'index %1 est hors de la plage de valeurs admissible ListElement: cannot contain nested elements - + ListElement: ne peut pas contenir des éléments imbriqués ListElement: cannot use reserved "id" property - + ListElement: ne peut pas utiliser la propriété réservée "id" ListElement: cannot use script for property value - + ListElement: ne peut pas utiliser script comme valeur pour une propriété ListModel: undefined property '%1' - + ListModel: propriété indéfinie '%1' QDeclarativeLoader Loader does not support loading non-visual elements. - + Le chargeur n'est pas compatible avec le chargement d'éléments non-visuels. QDeclarativeParentAnimation Unable to preserve appearance under complex transform - + Impossible de conserver l'aspect lors d'une transformation complexe Unable to preserve appearance under non-uniform scale - + Impossible de conserver l'aspect lors d'une mise à l'échelle non uniforme Unable to preserve appearance under scale of 0 - + Impossible de conserver l'aspect lors d'une mise à l'échelle égale à 0 QDeclarativeParentChange Unable to preserve appearance under complex transform - + Impossible de conserver l'aspect lors d'une transformation complexe Unable to preserve appearance under non-uniform scale - + Impossible de conserver l'aspect lors d'une mise à l'échelle non uniforme Unable to preserve appearance under scale of 0 - + Impossible de conserver l'aspect lors d'une mise à l'échelle égale à 0 QDeclarativeParser Illegal unicode escape sequence - + séquence d'échappement unicode illégale Illegal character - + caractère illégal Unclosed string at end of line - + chaîne de caractères non fermée en fin de ligne Illegal escape squence - + séquence d'échappement illégale Unclosed comment at end of file - + commentaire non fermé en fin de ligne Illegal syntax for exponential number - + syntaxe illégale pour un nombre exponentiel Identifier cannot start with numeric literal - + ??? + impossible de commencer un identifiant par un littéral numérique Unterminated regular expression literal - + littéral non terminé pour l'expression régulière Invalid regular expression flag '%0' - + drapeau '%0' invalid pour l'expression régulière Unterminated regular expression backslash sequence - + séquence antislash non terminée pour l'expression régulière Unterminated regular expression class - + class non terminé pour l'expression régulière Syntax error - + Erreur de syntaxe Unexpected token `%1' - + jeton inattendu '%1' Expected token `%1' - + jeton attendu '%1' Property value set multiple times - + valeur de propriété attribuée à plusieurs reprises Expected type name - + Nom de type attendu Invalid import qualifier ID - + qualificatif ID d'importation invalide Reserved name "Qt" cannot be used as an qualifier - + "Qt" est un nom réservé et ne peut pas être utilisé comme qualificatif Script import qualifiers must be unique. - + ?? + Les qualificatifs d'importation de script doivent être uniques. Script import requires a qualifier - + L'importation de script exige un qualificatif Library import requires a version - + L'importation de bibliothèque exige une version Expected parameter type - + Type de paramètre attendu Invalid property type modifier - + Modificateur invalide pour le type de propriété Unexpected property type modifier - + Modificateur innatendu pour le type de propriété Expected property type - + Type de propriété attendue Readonly not yet supported - + La lecture seule n'est pas encore implémentée JavaScript declaration outside Script element - + Déclaration JavaScript en edhors de l'élément Script QDeclarativePauseAnimation Cannot set a duration of < 0 - + Impossible d'attribuer une durée < 0 QDeclarativePixmapCache Error decoding: %1: %2 - + Erreur de décodage: %1: %2 Failed to get image from provider: %1 - + Impossible d'obtenir l'image du fournisseur: %1 Cannot open: %1 - + Impossible d'ouvrir: %1 Unknown Error loading %1 - + Erreur de chargement inconnue: %1 QDeclarativePropertyAnimation Cannot set a duration of < 0 - + Impossible d'attribuer une durée < 0 QDeclarativePropertyChanges PropertyChanges does not support creating state-specific objects. - + PropertyChanges n'est pas compatible avec la création d'objets spécifiques à un état. Cannot assign to non-existent property "%1" - + Ne peut pas assigner à la propriété inexistante "%1" Cannot assign to read-only property "%1" - + Ne peut pas assigner à la propriété en lecture seule "%1" QDeclarativeTextInput Could not load cursor delegate - + Impossible de charger le curseur délégué Could not instantiate cursor delegate - + Impossible d'instancier le curseur délégué QDeclarativeVME Unable to create object of type %1 - + Impossible de créer un objet de type %1 Cannot assign value %1 to property %2 - + Impossible d'assigner la valeur %1 à la propriété %2 Cannot assign object type %1 with no default method - + Impossible d'assigner un objet de type %1 sans méthode défaut Cannot connect mismatched signal/slot %1 %vs. %2 - + le vs a confirmer + Impossible de connecter le signal/slot %1 %vs. %2 pour cause d'incompatibilité Cannot assign an object to signal property %1 - + NImpossible d'assigner un objet à la propriété %1 d'un signal Cannot assign object to list - + Impossible d'assigner un objet à une liste Cannot assign object to interface property - + Impossible d'assigner un objet à la propriété d'une interface Unable to create attached object - + Impossible de créer un object attaché Cannot set properties on %1 as it is null - + Impossible d'attribuer les propriétés à %1 car ce dernier est nul QDeclarativeVisualDataModel Delegate component must be Item type. - + Un composant délégué doit être de type Item. QDeclarativeXmlListModel Qt was built without support for xmlpatterns - + Qt a été généré sans support pour xmlpatterns QDeclarativeXmlListModelRole An XmlRole query must not start with '/' - + Une requête XmlRole ne doit pas commencer par '/' QDeclarativeXmlRoleList An XmlListModel query must start with '/' or "//" - + Une requête XmlListModel doit commencer par '/' ou "//" -- cgit v0.12 From 209c017333fea9827fd20c7f8d23721bd8a6ee43 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Tue, 13 Jul 2010 11:22:38 +0200 Subject: Translation work for 4.7 validating and adding some french translations. Plus all the fixes from Gabriel's extensive review. Doc: Fix a typo Reviewed-by: gabi --- src/gui/widgets/qcombobox.cpp | 2 +- tools/linguist/phrasebooks/french.qph | 40 + translations/assistant_fr.ts | 577 +++++++++++++- translations/designer_fr.ts | 1397 ++++++++++++++++++++++++++++++++- translations/linguist_fr.ts | 619 +++++++++++++-- translations/qt_fr.ts | 793 ++++++++++--------- translations/qt_help_fr.ts | 89 ++- 7 files changed, 3003 insertions(+), 514 deletions(-) diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index dcc328f..917a325 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -910,7 +910,7 @@ QComboBox::QComboBox(bool rw, QWidget *parent, const char *name) interaction. The highlighted() signal is emitted when the user highlights an item in the combobox popup list. All three signals exist in two versions, one with a QString argument and one with an - \c int argument. If the user selectes or highlights a pixmap, only + \c int argument. If the user selects or highlights a pixmap, only the \c int signals are emitted. Whenever the text of an editable combobox is changed the editTextChanged() signal is emitted. diff --git a/tools/linguist/phrasebooks/french.qph b/tools/linguist/phrasebooks/french.qph index 47cb306..1884ed3 100644 --- a/tools/linguist/phrasebooks/french.qph +++ b/tools/linguist/phrasebooks/french.qph @@ -1450,4 +1450,44 @@ New Créer + + Play + Lecture + + + Slider + Barre de défilement + + + &Restore + &Restaurer + + + &Move + &Déplacer + + + New + Créer + + + Play + Lecture + + + &Redo + &Refaire + + + Raised + Bombé + + + Sunken + Enfoncé + + + Run: + Exécution : + diff --git a/translations/assistant_fr.ts b/translations/assistant_fr.ts index e8f5fd1..e117663 100644 --- a/translations/assistant_fr.ts +++ b/translations/assistant_fr.ts @@ -4,6 +4,7 @@ AboutDialog + &Close &Fermer @@ -11,51 +12,129 @@ AboutLabel + Warning Avertissement + Unable to launch external application. Impossible d'ouvrir l'application externe. + OK OK + Assistant + + + Error registering documentation file '%1': %2 + Erreur lors de l'enregistrement du fichier de documentation '%1' : %2 + + + + Error: %1 + Erreur : %1 + + + + Could not register documentation file +%1 + +Reason: +%2 + Impossible d'enregistrer le fichier de documentation +%1 + +Raison : +%2 + + + + Documentation successfully registered. + Documentation enregistrée avec succès. + + + + Could not unregister documentation file +%1 + +Reason: +%2 + Impossible de retirer le fichier de documentation +%1 + +Raison : +%2 + + + + Documentation successfully unregistered. + Documentation retirée avec succès. + + + + Error reading collection file '%1': %2. + Erreur lors de la lecture du fichier de collection '%1' : %2. + + + + Error creating collection file '%1': %2. + Erreur lors de la création du fichier de collection '%1' : %2. + + + + Error reading collection file '%1': %2 + Erreur lors de la lecture du fichier de collection '%1' : %2 + + + + Cannot load sqlite database driver! + Impossible de charger le driver de la base de données sqlite ! + + + BookmarkDialog + Add Bookmark Ajouter un signet + Bookmark: Signet : + Add in Folder: Ajouter dans le dossier : + + + + New Folder Nouveau dossier Bookmarks - Signets + Signets Delete Folder - Supprimer le dossier + Supprimer le dossier + Rename Folder Renommer le dossier @@ -64,106 +143,360 @@ BookmarkManager Bookmarks - Signets + Signets + + + + Untitled + Sans titre + Remove Suppression + You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? Vous allez supprimer un dossier, ceci va aussi<br>supprimer son contenu. Voulez-vous continuer ? + + Manage Bookmarks... + Gestion des signets... + + + + Add Bookmark... + Ajouter un signet... + + + + Ctrl+D + Ctrl+D + + + + Delete Folder + Supprimer le dossier + + + + Rename Folder + Renommer le dossier + + + + Show Bookmark + Afficher le signet + + + + Show Bookmark in New Tab + Afficher le signet dans un nouvel onglet + + + + Delete Bookmark + Supprimer le signet + + + + Rename Bookmark + Renommer le signet + + New Folder - Nouveau dossier + Nouveau dossier - BookmarkWidget + BookmarkManagerWidget + + + Manage Bookmarks + Gestion des signets + + + + Search: + Recherche : + + + + + Remove + Supprimer + + + + Import and Backup + Importation et sauvegarde + + + + + OK + OK + + + + Import... + Importer... + + + + Export... + Exporter... + + + + Open File + Ouvrir un fichier + + + + Files (*.xbel) + Fichiers (*.xbel) + + + + Save File + Enregistrer le fichier + + + + Qt Assistant + Qt Assistant + + + + Unable to save bookmarks. + Impossible de sauvegarder les signets. + + + + You are goingto delete a Folder, this will also<br> remove it's content. Are you sure to continue? + Vous êtes sur le point de supprimer un dossier, ceci supprimera<br> également son contenu. Voulez-vous continuer ? + + + Delete Folder Supprimer le dossier + Rename Folder Renommer le dossier + Show Bookmark Afficher le signet + Show Bookmark in New Tab Afficher le signet dans un nouvel onglet + Delete Bookmark Supprimer le signet + Rename Bookmark Renommer le signet + + + BookmarkModel + + + Name + Nom + + + + Address + Adresse + + + Bookmarks Menu + Menu signets + + + + BookmarkWidget + + Delete Folder + Supprimer le dossier + + + Rename Folder + Renommer le dossier + + + Show Bookmark + Afficher le signet + + + Show Bookmark in New Tab + Afficher le signet dans un nouvel onglet + + + Delete Bookmark + Supprimer le signet + + + Rename Bookmark + Renommer le signet + + + Filter: Filtre : + Add Ajouter + Remove Retirer + + + Bookmarks + Signets + CentralWidget + Add new page Créer une nouvelle page + Close current page Fermer la page courante + Print Document Imprimer le document + + unknown inconnu + Add New Page Créer une nouvelle page + Close This Page Fermer cette page + Close Other Pages Fermer les autres pages + Add Bookmark for this Page... Ajouter un signet pour cette page... + Search Recherche + CmdLineParser + + + Unknown option: %1 + Option inconnue : %1 + + + + The collection file '%1' does not exist. + Le fichier de collection '%1' n'existe pas. + + + + Missing collection file. + Fichier de collection manquant. + + + + Invalid URL '%1'. + URL invalide '%1'. + + + + Missing URL. + URL manquante. + + + + Unknown widget: %1 + Widget inconnu : %1 + + + + Missing widget. + Widget manquant. + + + + The Qt help file '%1' does not exist. + Le fichier d'aide Qt '%1' n'existe pas. + + + + Missing help file. + Fichier d'aide manquant. + + + + Missing filter argument. + Argument de filtre manquant. + + + + Error + Erreur + + + + Notice + Avertissement + + + ContentWindow + Open Link Ouvrir le lien + Open Link in New Tab Ouvrir le lien dans un nouvel onglet @@ -171,10 +504,12 @@ FilterNameDialogClass + Add Filter Name Ajouter un filtre + Filter Name: Nom du filtre : @@ -182,22 +517,26 @@ FindWidget + Previous Précédent + Next Suivant + Case Sensitive Sensible à la casse Whole words - Mots complets + Mots complets + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Recherche à partir du début @@ -205,22 +544,27 @@ FontPanel + Font Police + &Writing system &Système d'écriture + &Family &Famille + &Style &Style + &Point size &Taille en points @@ -228,32 +572,42 @@ HelpViewer + Open Link in New Tab Ouvrir le lien dans un nouvel onglet + + <title>about:blank</title> + y'a t'il une autre traduction dans Firefox & cie ? + <title>about:blank</title> + + + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>Erreur 404...</title><div align="center"><br><br><h1>La page n'a pas pu être trouvée</h1><br><h3>'%1'</h3></div> Help - Aide + Aide Unable to launch external application. - Impossible de lancer l'application externe. + Impossible de lancer l'application externe. OK - OK + OK + Copy &Link Location Copier l'&adresse cible + Open Link in New Tab Ctrl+LMB LMB? ← ouais exactement pareil... Ouvrir dans un nouvel onglet Ctrl+clic gauche @@ -262,14 +616,17 @@ IndexWindow + &Look for: &Rechercher : + Open Link Ouvrir le lien + Open Link in New Tab Ouvrir le lien dans un nouvel onglet @@ -277,74 +634,97 @@ InstallDialog + + Install Documentation Installer la documentation + Available Documentation: Documentation disponible : + Install Installer + Cancel Annuler + Close Fermer + Installation Path: Chemin d'installation : + ... - … + ... + Downloading documentation info... - Téléchargement des informations de la documentation… + Téléchargement des informations de la documentation... + Download canceled. Téléchargement annulé. + + + Done. Terminé. + The file %1 already exists. Do you want to overwrite it? Le fichier %1 existe déjà. Voulez-vous l'écraser ? + Unable to save the file %1: %2. Impossible de sauver le fichier %1 : %2. + Downloading %1... - Téléchargement de %1 en cours… + Téléchargement de %1 en cours... + + + Download failed: %1. Échec du téléchargement : %1. + Documentation info file is corrupt! Le fichier d'information de documentation est corrompu ! + Download failed: Downloaded file is corrupted. Échec du téléchargement : le fichier téléchargé est corrompu. + Installing documentation %1... - Installation de la documentation %1… + Installation de la documentation %1... + Error while installing documentation: %1 Erreur durant l'installation de la documentation : @@ -354,239 +734,310 @@ MainWindow + + Index Index + + Contents Sommaire + + Bookmarks Signets + + + Qt Assistant Qt Assistant Unfiltered - Non-filtré + Non-filtré + Looking for Qt Documentation... - Recherche la documentation de Qt… + Recherche la documentation de Qt... + &File &Fichier + Page Set&up... - &Mise en page… + &Mise en page... + Print Preview... - Aperçu avant impression… + Aperçu avant impression... + &Print... - &Imprimer… + &Imprimer... + New &Tab Nouvel ongle&t + &Close Tab &Fermer l'onglet + &Quit &Quitter + + CTRL+Q + CTRL+Q + + + &Edit &Édition + &Copy selected Text &Copier le texte selectionné + &Find in Text... - &Rechercher dans le texte… + &Rechercher dans le texte... + &Find &Rechercher + Find &Next Rechercher le suiva&nt + Find &Previous Rechercher le &précédent + Preferences... - Préférences… + Préférences... + &View &Affichage + Zoom &in Zoom &avant + Zoom &out Zoom a&rrière + Normal &Size &Taille normale + Ctrl+0 Ctrl+0 + ALT+C ALT+C + ALT+I ALT+I + ALT+O ALT+O + Search Recherche + ALT+S ALT+S + &Go A&ller + &Home &Accueil + ALT+Home ALT+Home + &Back &Précédent + &Forward &Suivant + Sync with Table of Contents Synchroniser la table des matières + Sync Rafraîchir + Next Page Page suivante + Ctrl+Alt+Right Ctrl+Alt+Right + Previous Page Page précédente + Ctrl+Alt+Left Ctrl+Alt+Left + &Bookmarks Si&gnets + + Could not register file '%1': %2 + Impossible d'enregistrer le fichier '%1' : %2 + + Add Bookmark... - Ajouter un signet… + Ajouter un signet... CTRL+D - CTRL+D + CTRL+D + &Help Ai&de + About... - À propos… + À propos... + Navigation Toolbar Barre d'outils de navigation + &Window &Fenêtre + Zoom Zoom + Minimize Minimiser + Ctrl+M Ctrl+M + Toolbars Barres d'outils + Filter Toolbar Barre d'outils de filtrage + Filtered by: Filtre : + Address Toolbar Barre d'outils d'adresse + Address: Adresse : + Could not find the associated content item. what is item in this context? ← same question here Impossible de trouver l'élément de contenu associé. + About %1 À propos de %1 + Updating search index Mise à jour de l'index de recherche @@ -594,38 +1045,48 @@ PreferencesDialog + + Add Documentation Ajouter de la documentation + Qt Compressed Help Files (*.qch) Fichiers d'aide Qt compressés (*.qch) + The namespace %1 is already registered! L'espace de nom %1 existe déjà ! + The specified file is not a valid Qt Help File! Le fichier spécifié n'est pas un fichier d'aide Qt valide ! + Remove Documentation Supprimer la documentation + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. Certains documents ouverts dans Assistant ont des références vers la documentation que vous allez supprimer. Supprimer la documentation fermera ces documents. + Cancel Annuler + OK OK + Use custom settings Utiliser des paramètres personnalisés @@ -633,95 +1094,118 @@ PreferencesDialogClass + Preferences Préférences + Fonts Polices + Font settings: Configuration des polices : + Browser Navigateur + Application Application + Filters Filtres + Filter: Filtre : + Attributes: Attributs : + 1 1 + Add Ajouter + Remove Supprimer + Documentation Documentation + Registered Documentation: documentation enregistrée ? ← je préfère référencée pour les deux... Documentation référencée : + Add... - Ajouter… + Ajouter... + Options Options + On help start: Au démarrage : + Show my home page Afficher ma page d'accueil + Show a blank page Afficher une page blanche + Show my tabs from last session Afficher mes onglets de la dernière session + Homepage Page d'accueil + Current Page Page courante + Blank Page Page blanche + Restore to default Restaurer les valeurs par défaut @@ -730,47 +1214,47 @@ QObject The specified collection file does not exist! - Le fichier de collection spécifié n'existe pas ! + Le fichier de collection spécifié n'existe pas ! Missing collection file! - Fichier de collection manquant ! + Fichier de collection manquant ! Invalid URL! - URL invalide ! + URL invalide ! Missing URL! - URL manquante ! + URL manquante ! Unknown widget: %1 - Widget inconnu : %1 + Widget inconnu : %1 Missing widget! - Widget manquant ! + Widget manquant ! The specified Qt help file does not exist! - Le fichier d'aide Qt spécifié n'existe pas ! + Le fichier d'aide Qt spécifié n'existe pas ! Missing help file! - Fichier d'aide manquant ! + Fichier d'aide manquant ! Missing filter argument! - Argument de filtre manquant ! + Argument de filtre manquant ! Unknown option: %1 - Option inconnue : %1 + Option inconnue : %1 Qt Assistant - Qt Assistant + Qt Assistant Could not register documentation file @@ -778,7 +1262,7 @@ Reason: %2 - Impossible d'enregistrer le fichier de documentation + Impossible d'enregistrer le fichier de documentation %1 Raison : @@ -786,11 +1270,11 @@ Raison : Documentation successfully registered. - Documentation enregistrée avec succès. + Documentation enregistrée avec succès. Documentation successfully unregistered. - Documentation retirée avec succès. + Documentation retirée avec succès. Could not unregister documentation file @@ -798,7 +1282,7 @@ Raison : Reason: %2 - Impossible d'enregistrer le fichier de documentation + Impossible d'enregistrer le fichier de documentation %1 Raison : @@ -806,20 +1290,22 @@ Raison : Cannot load sqlite database driver! - Impossible de charger le driver de la base de données sqlite ! + Impossible de charger le driver de la base de données sqlite ! The specified collection file could not be read! - Le fichier de collection spécifié ne peut pas être lu ! + Le fichier de collection spécifié ne peut pas être lu ! RemoteControl + Debugging Remote Control Débogage du contrôle à distance + Received Command: %1 %2 Commande reçue : %1 %2 @@ -827,18 +1313,22 @@ Raison : SearchWidget + &Copy &Copier + Copy &Link Location Copier &l'adresse du lien + Open Link in New Tab Ouvrir le lien dans un nouvel onglet + Select All Sélectionner tout @@ -846,22 +1336,27 @@ Raison : TopicChooser + Choose Topic Choisir le domaine + &Topics &Domaines + &Display &Afficher + &Close &Fermer + Choose a topic for <b>%1</b>: Choisir le domaine pour <b>%1</b> : diff --git a/translations/designer_fr.ts b/translations/designer_fr.ts index 175d5c5..9bf3810 100644 --- a/translations/designer_fr.ts +++ b/translations/designer_fr.ts @@ -4,22 +4,27 @@ AbstractFindWidget + &Previous &Précédent + &Next &Suivant + &Case sensitive &Sensible à la casse + Whole &words M&ots complets + <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/shared/images/wrap.png">&nbsp;Recherche à partir du début @@ -27,14 +32,17 @@ AddLinkDialog + Insert Link Insérer lien + Title: Titre : + URL: URL : @@ -42,6 +50,7 @@ AppFontDialog + Additional Fonts Polices additionnelles @@ -49,31 +58,38 @@ AppFontManager + '%1' is not a file. '%1' n'est pas un fichier. + The font file '%1' does not have read permissions. Le fichier de la police '%1' n'a pas les permissions de lecture. + The font file '%1' is already loaded. Le fichier de la police '%1' est déjà chargé. + The font file '%1' could not be loaded. passé composé plutôt Le fichier de la police '%1' n'a pas pu chargé. + '%1' is not a valid font id. '%1' n'est pas un identifiant de police valide. + There is no loaded font matching the id '%1'. Il n'y a pas de police chargée correspondant à l'identifiant '%1'. + The font '%1' (%2) could not be unloaded. La police '%1' (%2) ne peut pas être déchargée. @@ -81,43 +97,53 @@ AppFontWidget + Fonts Polices + Add font files Ajouter des fichiers de polices + Remove current font file Retirer le fichier de police courant + Remove all font files Retirer tous les fichiers de polices + Add Font Files Ajouter des fichiers de polices + Font files (*.ttf) Fichier de polices (*.ttf) + Error Adding Fonts Erreur dans l'ajout de polices + Error Removing Fonts s/de/des/ pour être cohérent avec le suivant... Erreur lors de la suppression des polices + Remove Fonts Retirer les polices + Would you like to remove all fonts? Voulez-vous supprimer toutes les polices ? @@ -125,10 +151,12 @@ AppearanceOptionsWidget + Form Formulaire + User Interface Mode Mode de l'interface utilisateur @@ -136,14 +164,17 @@ AssistantClient + Unable to send request: Assistant is not responding. Impossible d'envoyer la requête : Assistant ne répond pas. + The binary '%1' does not exist. Le binaire '%1' n'existe pas. + Unable to launch assistant (%1). Impossible de démarrer Assistant (%1). @@ -151,75 +182,93 @@ BrushPropertyManager + No brush Pas de pinceau + Solid c'est plutôt continu ou "trait continu" pour moi Trait continu + Dense 1 Dense 1 + Dense 2 Dense 2 + Dense 3 Dense 3 + Dense 4 Dense 4 + Dense 5 Dense 5 + Dense 6 Dense 6 + Dense 7 Dense 7 + Horizontal Horizontal + Vertical Vertical + Cross Croix + Backward diagonal Diagonale arrière + Forward diagonal Diagonale avant + Crossing diagonal Diagonale croisée + Style Style + Color Couleur + [%1, %2] [%1, %2] @@ -227,120 +276,151 @@ Command + + Change signal Modifier le signal + + Change slot Modifier le slot + Change signal-slot connection Modfier la connection signal-slot + Change sender expéditeur/source Modifier l'envoyeur + Change receiver destinataire++/cible? Modifier le destinataire + Create button group Créer un groupe de boutons + Break button group Dissocier le groupe de bouton + Break button group '%1' Dissossier le groupe de bouton '%1' + Add buttons to group Ajouter les boutons au groupe + + Add '%1' to '%2' Command description for adding buttons to a QButtonGroup Ajouter '%1' à '%2' + Remove buttons from group Retirer les boutons du groupe + Remove '%1' from '%2' Command description for removing buttons from a QButtonGroup Retirer '%1' de '%2' + Add connection Ajouter une connexion + Adjust connection Réajuster les connexions + Delete connections Supprimer les connexions + Change source Modifier la source + Change target Modifier la cible + Morph %1/'%2' into %3 MorphWidgetCommand description Transformer %1/'%2' en %3 + Insert '%1' Insérer '%1' + Change Z-order of '%1' l'ordre de '%1' sur l'axe z? profondeur ? Modifier la profondeur de '%1' + Raise '%1' Élever '%1' + Lower '%1' Abaisser '%1' + Delete '%1' Supprimer '%1' + Reparent '%1' Reparenter '%1' + Promote to custom widget Promouvoir en widget personnalisé + Demote from custom widget Annuler la promotion en widget personnalisé + Lay out using grid Mettre en page à l'aide d'une grille + Lay out vertically Mettre en page verticalement @@ -349,154 +429,204 @@ Mettre en page horizontalement + Lay out horizontally Mettre en page horizontalement + Break layout Casser la mise en page + Simplify Grid Layout Simplifier la mise en page en grille + + + Move Page Déplacer la page + + + + Delete Page Supprimer la page + + Page Page + + + + Insert Page Insérer une page + Change Tab order Modifier l'ordre des tabulations + Create Menu Bar Créer une barre de menu + Delete Menu Bar Supprimer la barre de menu + Create Status Bar Créer une barre d'état + Delete Status Bar Supprimer la barre d'état + Add Tool Bar Ajouter une barre d'outil + Add Dock Window Ajouter une fenêtre ancrable + Adjust Size of '%1' Ajuster les dimensions de '%1' + Change Form Layout Item Geometry Modifier la géométrie de l'élément de formulaire + Change Layout Item Geometry Modifier la géométrie de l'élément de mise en page + Delete Subwindow Supprimer la sous-fenêtre + page page + Insert Subwindow Insérer une sous-fenêtre + subwindow sous-fenêtre + Subwindow Sous fenêtre + Change Table Contents Modifier le contenu de la table + Change Tree Contents Modifier le contenu de l'arbre + + Add action Ajouter une action + + Remove action Supprimer l'action + Add menu Ajouter un menu + Remove menu Supprimer le menu + Create submenu Créer une sous-fenêtre + Delete Tool Bar Supprimer la barre d'outils + Change layout of '%1' from %2 to %3 Modifier la mise en page de '%1' de %2 à %3 + Set action text Définir le texte de l'action + Insert action Insérer action + + Move action Déplacer action + Change Title Modifier le titre + Insert Menu Insérer menu + Changed '%1' of '%2' Modifier '%1' de '%2' + Changed '%1' of %n objects Modifier '%1' de %n objet @@ -504,10 +634,12 @@ + Reset '%1' of '%2' Réinitialiser '%1' de '%2' + Reset '%1' of %n objects Réinitialiser '%1' de %n objet @@ -515,10 +647,12 @@ + Add dynamic property '%1' to '%2' Ajouter la propriété dynamique '%1' à '%2' + Add dynamic property '%1' to %n objects Ajouter la propriété dynamique '%1' à %n objet @@ -526,10 +660,12 @@ + Remove dynamic property '%1' from '%2' Supprimer la propriété dynamique '%1' de '%2' + Remove dynamic property '%1' from %n objects Supprimer la propriété dynamique '%1' de %n objet @@ -537,10 +673,12 @@ + Change script Modifier le script + Change signals/slots Modifier signaux/slots @@ -548,18 +686,22 @@ ConnectDialog + Configure Connection Configurer connexion + GroupBox GroupBox + Edit... Éditer... + Show signals and slots inherited from QWidget Afficher les signaux et slots hérités de QWidget @@ -567,14 +709,17 @@ ConnectionDelegate + <object> <objet> + <signal> <signal> + <slot> <slot> @@ -582,16 +727,19 @@ DPI_Chooser + Standard (96 x 96) Embedded device standard screen resolution Standard (96 x 96) + Greenphone (179 x 185) Embedded device screen resolution Greenphone (179 x 185) + High (192 x 192) Embedded device high definition screen resolution "haute resolution" would be missleading @@ -601,72 +749,89 @@ Designer + Qt Designer Qt Designer + This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. Ce fichier contient des ressorts de premier niveau. <br>Ils ne sont <b>PAS</b> sauvegardé dans le formulaire. + Perhaps you forgot to create a layout? Peut-être avez-vous oublié de créer un layout ? + Invalid UI file: The root element <ui> is missing. Fichier UI invalide. L'élément racine <ui> est manquant. + An error has occurred while reading the UI file at line %1, column %2: %3 - Une erreur est survenue lors de la lecture du fichier UI à la ligne %1, colonne %2: %3 + Une erreur est survenue lors de la lecture du fichier UI à la ligne %1, colonne %2 : %3 + This file cannot be read because it was created using %1. Ce fichier ne peut pas être lu car il a été créé à l'aide de %1. + This file was created using Designer from Qt-%1 and cannot be read. Ce fichier a été créé à l'aide du Designer de Qt-%1 et ne peut être lu. + The converted file could not be read. Le fichier converti ne peut pas être lu. + This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. Ce fichier a été créé par le Designer de Qt-%1 et sera converti au nouveau format par Qt Designer. + The old form has not been touched, but you will have to save the form under a new name. L'ancienne interface n'a pas été modifiée, vous devez sauvergarder l'interface sous un nouveau nom. + This file was created using Designer from Qt-%1 and could not be read: %2 Le fichier a été créé à l'aide de Designer de Qt-%1 et ne peut pas être lu : %2 + Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. Veuillez le faire passer par <b>uic3&nbsp;-convert</b> pour le convertir au format de fichier de Qt 4. + This file cannot be read because the extra info extension failed to load. Ce fichier ne peut pas être lu car les informations d'extension n'ont pu être chargées. + Unable to launch %1. Impossible de lancer %1. + %1 timed out. %1 est arrivé à échéance. + Custom Widgets Widgets personnalisés + Promoted Widgets Widgets promus @@ -674,10 +839,12 @@ DesignerMetaEnum + %1 is not a valid enumeration value of '%2'. %1 n'est pas une valeur d'énumeration valide de '%2'. + '%1' could not be converted to an enumeration value of type '%2'. '%1' ne peut pas être converti en une valeur d'énumération de type '%2'. @@ -685,6 +852,7 @@ DesignerMetaFlags + '%1' could not be converted to a flag value of type '%2'. '%1' ne peut pas être converti en un drapeau de type '%2'. @@ -692,11 +860,13 @@ DeviceProfile + '%1' is not a number. Reading a number for an embedded device profile '%1' n'est pas un nombre. + An invalid tag <%1> was encountered. La balise invalide <%1> a été rencontré. @@ -704,22 +874,27 @@ DeviceProfileDialog + &Family &Famille + &Point Size &Taille en points + Style Style + Device DPI PPP/DPI de l'appareil + Name Nom @@ -727,46 +902,57 @@ DeviceSkin + The image file '%1' could not be loaded. Le fichier image '%1' n'a pas pu être chargé. + The skin directory '%1' does not contain a configuration file. Le repertoire de revêtement '%1' ne contient pas un fichier de configuration. + The skin configuration file '%1' could not be opened. Le fichier de configuration de revêtement '%1' ne peut pas être ouvert. + The skin configuration file '%1' could not be read: %2 - Le fichier de configuration de revêtement '%1' ne peut pas être lu: %2 + Le fichier de configuration de revêtement '%1' ne peut pas être lu : %2 + Syntax error: %1 Erreur de syntaxe : %1 + The skin "up" image file '%1' does not exist. Le fichier image "up" de revêtement '%1' n'existe pas. + The skin "down" image file '%1' does not exist. Le fichier image "down" de revêtement '%1' n'existe pas. + The skin "closed" image file '%1' does not exist. Le fichier image "closed" de revêtement '%1' n'existe pas. + The skin cursor image file '%1' does not exist. Le fichier image de revêtement '%1' n'existe pas. + Syntax error in area definition: %1 Erreur de syntaxe dans la zone de définition : %1 + Mismatch in number of areas, expected %1, got %2. Incohérence dans le nombre de zones, %1 attendu, %2 reçu. @@ -774,6 +960,7 @@ EmbeddedOptionsControl + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description <html><table><tr><td><b>Police</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Résolution</b></td><td>%4 x %5</td></tr></table></html> @@ -782,11 +969,13 @@ EmbeddedOptionsPage + Embedded Design Tab in preferences dialog Design pour appareil mobile + Device Profiles EmbeddedOptionsControl group box" Profils des appareils @@ -795,22 +984,27 @@ FontPanel + Font Police + &Writing system &Système d'écriture + &Family &Famille + &Style &Style + &Point size &Taille en points @@ -818,18 +1012,22 @@ FontPropertyManager + PreferDefault PreferDefault + NoAntialias NoAntialias + PreferAntialias PreferAntialias + Antialiasing Antialiasing @@ -837,36 +1035,51 @@ FormBuilder + Invalid stretch value for '%1': '%2' - Parsing layout stretch values + Parsing layout stretch values +---------- +Parsing layout stretch values +---------- +Parsing layout stretch values Valeur d'extension invalide pour '%1' : '%2' + Invalid minimum size for '%1': '%2' - Parsing grid layout minimum size values + Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values Taille minimum invalide pour '%1' : '%2' FormEditorOptionsPage + %1 % %1 % + Preview Zoom Zoom de visualisation + Default Zoom Zoom par défaut + Forms Tab in preferences dialog Formulaires + Default Grid Grille par défaut @@ -874,31 +1087,38 @@ FormLayoutRowDialog + Add Form Layout Row Ajouter une ligne de mise en page au formulaire + &Label text: &Texte du label : + Field &type: &Type du champ : + &Field name: &Nom du champ : + &Buddy: copain c'est un peu beaucoup ptet &Copain : + &Row: &Ligne : + Label &name: &Nom du label : @@ -906,10 +1126,12 @@ FormWindow + Unexpected element <%1> Element inattendu : <%1> + Error while pasting clipboard contents at line %1, column %2: %3 Erreur lors du collage du contenu du presse-papier à la ligne %1, colonne %2 : %3 @@ -917,50 +1139,62 @@ FormWindowSettings + Form Settings Configuration du formulaire + Layout &Default Mise en page par &défaut + &Spacing: &Espacements : + &Margin: &Marge : + &Layout Function &Fonction de mise en page + Ma&rgin: Ma&rge : + Spa&cing: Espa&cement : + &Pixmap Function Fonction de &pixmap + &Include Hints Indication d'&include + Grid Grille + Embedded Design Design pour appareil mobile + &Author &Auteur @@ -968,6 +1202,7 @@ IconSelector + All Pixmaps ( Tous les pixmaps ( @@ -975,6 +1210,7 @@ ItemPropertyBrowser + XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser XX Icon Selected off @@ -983,27 +1219,33 @@ MainWindowBase + Main Not currently used (main tool bar) Principal + File Fichier + Edit Édition + Tools Outils + Form Formulaire + Qt Designer Qt Designer @@ -1011,42 +1253,52 @@ NewForm + Show this Dialog on Startup Afficher cette boîte de dialogue au démarrage + C&reate C&réer + Recent Récent + New Form Nouveau formulaire + &Close &Fermer + &Open... &Ouvrir... + &Recent Forms &Formulaires récents + Read error Erreur de lecture + A temporary form file could not be created in %1. Un fichier temporaire de formulaire n'a pas pu être créé dans %1. + The temporary form file %1 could not be written. Le fichier temporaire de formulaire %1 n'a pas pu être écrit. @@ -1054,18 +1306,22 @@ ObjectInspectorModel + Object Objet + Class Classe + separator séparateur + <noname> <sans nom> @@ -1073,10 +1329,12 @@ ObjectNameDialog + Change Object Name Modifier le nom de l'objet + Object Name Nom de l'objet @@ -1084,10 +1342,12 @@ PluginDialog + Plugin Information Information du plugin + 1 1 @@ -1095,6 +1355,7 @@ PreferencesDialog + Preferences Préférences @@ -1102,26 +1363,32 @@ PreviewConfigurationWidget + Form Formulaire + Print/Preview Configuration Configuration d'impression/prévisualisation + Style Style + Style sheet Feuille de style + ... ... + Device skin Revêtement de l'appareil @@ -1129,6 +1396,7 @@ PromotionModel + Not used Usage of promoted widgets Non utilisé @@ -1137,6 +1405,8 @@ Q3WizardContainer + + Page Page @@ -1144,48 +1414,59 @@ QAbstractFormBuilder + Unexpected element <%1> Élément imprévu <%1> + An error has occurred while reading the UI file at line %1, column %2: %3 Une erreur s'est produite lors de la lecture du fichier UI à la ligne %1, colonne %2 : %3 + Invalid UI file: The root element <ui> is missing. Fichier UI invalide : l'élément racine <ui> est manquant. + The creation of a widget of the class '%1' failed. La création d'un widget de la classe '%1' a échoué. + Attempt to add child that is not of class QWizardPage to QWizard. Tentative d'ajout d'enfant qui n'est pas de la classe QWizardPage à QWizard. + Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. This indicates an inconsistency in the ui-file. Tentative d'ajout d'un layout au widget '%1' (%2) qui a déjà un layout dont le type n'est pas boîte %3. Ceci indique une incohérence dans le fichier ui. + Empty widget item in %1 '%2'. Widget vide dans %1 '%2'. + Flags property are not supported yet. Les propriétés de type drapeau ne sont pas supportées. + While applying tab stops: The widget '%1' could not be found. Lors de l'application des arrêts de tabulation : le widget '%1' ne peut pas être trouvé. + Invalid QButtonGroup reference '%1' referenced by '%2'. Référence invalide '%1' à QButtonGroup, référencé par '%2'. + This version of the uitools library is linked without script support. Cette version de la bibliothèque uitools n'a pas le support des scripts. @@ -1193,10 +1474,12 @@ Ceci indique une incohérence dans le fichier ui. QAxWidgetPlugin + ActiveX control Control ActiveX + ActiveX control widget Widget control ActiveX @@ -1204,18 +1487,22 @@ Ceci indique une incohérence dans le fichier ui. QAxWidgetTaskMenu + Set Control Définir le contrôle + Reset Control Réinitialiser le contrôle + Licensed Control Contrôle licencié + The control requires a design-time license Le contrôle requiert une license par interface @@ -1223,54 +1510,67 @@ Ceci indique une incohérence dans le fichier ui. QCoreApplication + %1 is not a promoted class. %1 n'est pas une classe promue. + The base class %1 is invalid. La classe de base %1 est invalide. + The class %1 already exists. La classe %1 existe déjà. + Promoted Widgets Widgets promus + The class %1 cannot be removed La classe %1 ne peut pas être retirée + The class %1 cannot be removed because it is still referenced. La classe %1 ne peut pas être retirée car elle est toujours référencée. + The class %1 cannot be renamed La classe %1 ne peut pas être renommée + The class %1 cannot be renamed to an empty name. La classe %1 ne peut pas être renommé avec un nom vide. + There is already a class named %1. Une classe existe déjà avec le nom %1. + Cannot set an empty include file. Impossible de créer un fichier include vide. + Exception at line %1: %2 Exception à la ligne %1 : %2 + Unknown error Erreur inconnue + An error occurred while running the script for %1: %2 Script: %3 Une erreur s'est produite lors de l'exécution du script de %1 : %2 @@ -1280,14 +1580,17 @@ Script : %3 QDesigner + %1 - warning Avertissement - %1 + Qt Designer Qt Designer + This application cannot be used for the Console edition of Qt Cette application ne peut pas être utilisée avec l'édition console de Qt @@ -1295,178 +1598,228 @@ Script : %3 QDesignerActions + Saved %1. %1 sauvé. + %1 already exists. Do you want to replace it? %1 existe déjà. Voulez-vous le remplacer ? + Edit Widgets Éditer les widgets + &New... &Nouveau... + &Open... &Ouvrir... + &Save &Enregistrer + Save &As... Enregistrer &sous... + Save A&ll Enregistrer &tout + Save As &Template... Sauver comme &modèle... + + &Close &Fermer + Save &Image... Enregistrer &image... + &Print... Im&primer... + &Quit &Quitter + View &Code... &Visualizer le code... + &Minimize &Minimiser + Bring All to Front Amener tout au premier plan + Preferences... Préférences... + Additional Fonts... Polices additionnelles... + ALT+CTRL+S ALT+CTRL+S + CTRL+SHIFT+S CTRL+SHIFT+S + CTRL+R CTRL+R + CTRL+M CTRL+M + Qt Designer &Help &Aide de Qt Designer + Current Widget Help Aide du widget courant + What's New in Qt Designer? Quoi de neuf dans Qt Designer ? + About Plugins À propos des plugins + + About Qt Designer À propos de Qt Designer + About Qt À propos de Qt + Clear &Menu Réinitialiser le &menu + &Recent Forms Formulaires &récents + + Open Form Ouvrir le formulaire + + + Designer UI files (*.%1);;All Files (*) Fichier UI de Qt Designer (*.%1);;Tous les fichiers(*) + + Save Form As Enregistrer le formulaire sous + Designer Designer + Feature not implemented yet! Cette fonctionnalité n'est pas encore implémentée ! + Code generation failed La génération du code à échoué + Read error Erreur de lecture + %1 Do you want to update the file location or generate a new form? %1 Voulez vous mettre à jour l'emplacement du fichier ou générer un nouveau formulaire ? + &Update &Mettre à jour + &New Form &Nouveau formulaire + + Save Form? Sauver le formulaire ? + Could not open file Impossible d'ouvrir le fichier + The file %1 could not be opened. Reason: %2 Would you like to retry or select a different file? @@ -1475,14 +1828,17 @@ Raison : %2 Voulez-vous réessayer ou sélectionner un fichier différent ? + Select New File Sélectionner un nouveau fichier + Could not write file Impossible d'écrire le fichier + It was not possible to write the entire file %1 to disk. Reason:%2 Would you like to retry? @@ -1491,50 +1847,65 @@ Raison : %2 Voulez-vous réessayer ? + + Assistant Assistant + &Close Preview &Fermer la prévisualisation + + The backup file %1 could not be written. Le fichier de backup %1 n'a pas pu être écrit. + The backup directory %1 could not be created. Le dossier de backup %1 n'a pas pu être créé. + The temporary backup directory %1 could not be created. Le dossier temporaire de backup %1 n'a pas pu être créé. + Preview failed La prévisualisation a échoué + Image files (*.%1) Fichiers image (*.%1) + + Save Image Sauver image + Saved image %1. Image %1 sauvée. + The file %1 could not be written. Le fichier %1 n'a pas pu être écrit. + Please close all forms to enable the loading of additional fonts. Veuillez fermer tous les formulaires pour activer le chargement de polices additionnelles. + Printed %1. Impression de %1 terminée. @@ -1542,6 +1913,7 @@ Voulez-vous réessayer ? QDesignerAppearanceOptionsPage + Appearance Tab in preferences dialog Apparence @@ -1550,14 +1922,17 @@ Voulez-vous réessayer ? QDesignerAppearanceOptionsWidget + Docked Window Fenêtre ancrable + Multiple Top-Level Windows Fenêtres multiples + Toolwindow Font Police des fenêtre d'outils @@ -1565,18 +1940,22 @@ Voulez-vous réessayer ? QDesignerAxWidget + Reset control Réinitialiser les contrôles + Set control Définir les contrôles + Control loaded Contrôle chargé + A COM exception occurred when executing a meta call of type %1, index %2 of "%3". Une exception COM a été levée lors de l'execution du meta-appel de type %1, indice %2 de "%3". @@ -1584,14 +1963,17 @@ Voulez-vous réessayer ? QDesignerFormBuilder + Script errors occurred: Erreurs du script : + The preview failed to build. La construction de la prévisualisation a échoué. + Designer Designer @@ -1599,18 +1981,22 @@ Voulez-vous réessayer ? QDesignerFormWindow + %1 - %2[*] %1 - %2[*] + Save Form? Enregistrer le formulaire ? + Do you want to save the changes to this document before closing? Voulez-vous enregistrer les changements de ce document avant de le fermer ? + If you don't save, your changes will be lost. Si vous ne sauvegardez pas, les changements seront perdus. @@ -1618,30 +2004,38 @@ Voulez-vous réessayer ? QDesignerMenu + Type Here Taper ici + Add Separator Ajouter séparateur + Insert separator Insérer séparateur + Remove separator Retirer séparateur + Remove action '%1' Supprimer l'action '%1' + + Add separator Ajouter séparateur + Insert action Insérer action @@ -1649,18 +2043,22 @@ Voulez-vous réessayer ? QDesignerMenuBar + Type Here Taper ici + Remove Menu '%1' Supprimer menu '%1' + Remove Menu Bar Supprimer barre de menu + Menu Menu @@ -1668,30 +2066,37 @@ Voulez-vous réessayer ? QDesignerPluginManager + An XML error was encountered when parsing the XML of the custom widget %1: %2 Une erreur XML a été rencontrée lors de l'analyse grammaticale du XML provenant du widget personnalisé %1 : %2 + A required attribute ('%1') is missing. Un attribut obligatoire ('%1') est manquant. + An invalid property specification ('%1') was encountered. Supported types: %2 Une spécification invalide de propriété ('%1') a été rencontrée. Types supportés : %2 + '%1' is not a valid string property specification. '%1' n'est pas une spécification valide de propriété chaîne de caractères. + The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. Le XML du widget personnalisé %1 ne contient aucun des éléments <widget> ou <ui>. + The class attribute for the class %1 is missing. L'attribut de classe est manquant pour la classe %1. + The class attribute for the class %1 does not match the class name %2. L'attribut de classe pour la classe %1 ne correspond pas au nom de la classe %2. @@ -1699,6 +2104,7 @@ Voulez-vous réessayer ? QDesignerPropertySheet + Dynamic Properties Propriétés dynamiques @@ -1706,26 +2112,31 @@ Voulez-vous réessayer ? QDesignerResource + The layout type '%1' is not supported, defaulting to grid. Le type de layout '%1' n'est pas supporté, replacement par une grille. + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. L'extension du widget '%1' (%2) a retourné un widget non géré par Designer '%3' (%4) lors de la requête pour la page #%5. Les pages du conteneur ne devraient être ajoutées que par spécification dans le XML retourné par la méthode domXml() du widget personnalisé. + Unexpected element <%1> Parsing clipboard contents Élément inattendu <%1> + Error while pasting clipboard contents at line %1, column %2: %3 Parsing clipboard contents Erreur lors du collage du contenu du presse-papier à la ligne %1, colonne %2 : %3 + Error while pasting clipboard contents: The root element <ui> is missing. Parsing clipboard contents Erreur lors du collage du contenu du presse-papier. L'élément racine <ui> est manquant. @@ -1734,10 +2145,12 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QDesignerSharedSettings + The template path %1 could not be created. Le chemin du modèle %1 n'a pas pu être créé. + An error has been encountered while parsing device profile XML: %1 Une erreur a été rencontrée lors de l'analyse grammaticale du XML du profil de l'appareil : %1 @@ -1745,27 +2158,33 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QDesignerToolWindow + Property Editor Éditeur de propriétés + Action Editor Éditeur d'actions + Object Inspector Inspecteur d'objet + Resource Browser plural Explorateur de ressources + Signal/Slot Editor Éditeur de signaux et slots + Widget Box Boîte de widget @@ -1773,50 +2192,62 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QDesignerWorkbench + &File &Fichier + Edit Édition + F&orm F&ormulaire + Preview in Prévisualisation avec + &View Afficha&ge + &Settings &Configuration + &Window Fe&nêtre + &Help &Aide + Toolbars Barre d'outils + Widget Box Boîte de widget + Save Forms? Enregistrer les formulaires ? + There are %n forms with unsaved changes. Do you want to review these changes before quitting? Il y a %n formulaire avec des changements non-enregistrés. Voulez-vous vérifier les changements avant de quitter? @@ -1824,30 +2255,37 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans + If you do not review your documents, all your changes will be lost. Si vous ne vérifiez pas vos documents, tous les changements seront perdus. + Discard Changes Abandonner les changements + Review Changes Vérifier les changements + Backup Information Informations de sauvegarde + The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? La dernière session de Designer n'a pas été fermée correctement. Des fichiers de sauvegarde existent. Voulez-vous les charger ? + The file <b>%1</b> could not be opened. Le fichier <b>%1</b> n'a pas pu être ouvert. + The file <b>%1</b> is not a valid Designer UI file. Le fichier <b>%1</b> n'est pas un fichier valide d'UI de Designer. @@ -1855,43 +2293,57 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QFormBuilder + An empty class name was passed on to %1 (object name: '%2'). - Empty class name passed to widget factory method + Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method Un nom de classe vide a été passé à %1 (nom d'objet '%2'). + QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. QFormBuilder n'a pas pu créer le widget personnalisé de classe '%1'; passage à la classe de base '%2'. + QFormBuilder was unable to create a widget of the class '%1'. QFormBuilder n'a pas pu créer un widget de classe '%1'. + The layout type `%1' is not supported. Le type de layout '%1' n'est pas supporté. + The set-type property %1 could not be read. Le type du setteur de propriété %1 n'a pas pu être lu. + The enumeration-type property %1 could not be read. Le type d'énumeration de propriété %1 n'a pas pu être lu. + Reading properties of the type %1 is not supported yet. La lecture des propriétés de type %1 n'est pas supporté. + The property %1 could not be written. The type %2 is not supported yet. La propriété %1 ne peut pas être écrite. Le type %2 n'est pas encore supporté. + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. la valeur d'énumération '%1' est invalide. La valeur par défaut '%2' sera utilisée à la place. + The flag-value '%1' is invalid. Zero will be used instead. Le drapeau '%1' est invalide. Zero sera utilisé à la place. @@ -1899,38 +2351,48 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QStackedWidgetEventFilter + Previous Page Page précédente + Next Page Page suivante + Delete Supprimer + Before Current Page Avant la page courante + After Current Page Après la page courante + Change Page Order... Modifier l'ordre des pages... + Change Page Order Modifier l'ordre des pages + Page %1 of %2 Page %1 de %2 + + Insert Page Insérer page @@ -1938,10 +2400,12 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QStackedWidgetPreviewEventFilter + Go to previous page of %1 '%2' (%3/%4). Aller à la page précédente de %1 '%2' (%3/%4). + Go to next page of %1 '%2' (%3/%4). Aller à la page suivante de %1 '%2' (%3/%4). @@ -1949,22 +2413,28 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QTabWidgetEventFilter + Delete Supprimer + Before Current Page Avant la page courante + After Current Page Après la page courante + Page %1 of %2 Page %1 de %2 + + Insert Page Insérer page @@ -1972,30 +2442,37 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QToolBoxHelper + Delete Page Supprimer page + Before Current Page Avant la page courante + After Current Page Après la page courante + Change Page Order... Modifier l'ordre des pages... + Change Page Order Modifier l'ordre de pages + Page %1 of %2 Page %1 de %2 + Insert Page Insérer page @@ -2003,10 +2480,15 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtBoolEdit + + + True Vrai + + False Faux @@ -2014,10 +2496,12 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtBoolPropertyManager + True Vrai + False Faux @@ -2025,6 +2509,7 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtCharEdit + Clear Char Effacer caractère @@ -2032,6 +2517,7 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtColorEditWidget + ... ... @@ -2039,18 +2525,22 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtColorPropertyManager + Red Rouge + Green Vert + Blue Bleu + Alpha Alpha @@ -2058,78 +2548,97 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtCursorDatabase + Arrow Flèche + Up Arrow Flèche vers le haut + Cross Croix + Wait Attendre + IBeam IBeam + Size Vertical Redimensionner verticalement + Size Horizontal Redimensionner horizontalement + Size Backslash Redimensionner diagonale droite + Size Slash Redimensionner diagonale gauche + Size All Redimensionner + Blank Vide + Split Vertical Scinder verticalement + Split Horizontal Scinder horizontalement + Pointing Hand Pointeur index + Forbidden Interdit + Open Hand Main ouverte + Closed Hand Main fermée + What's This Qu'est-ce que c'est ? + Busy Occupé @@ -2137,10 +2646,12 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtFontEditWidget + ... ... + Select Font Selectionner police @@ -2148,30 +2659,37 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtFontPropertyManager + Family Famille + Point Size Taille en points + Bold Gras + Italic Italique + Underline Souligné + Strikeout Barré + Kerning Crénage @@ -2179,6 +2697,7 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtGradientDialog + Edit Gradient Modifier le gradient @@ -2186,242 +2705,304 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtGradientEditor + Form Formulaire + Gradient Editor Éditeur de gradient + 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. Cette zone montre une prévisualisation du gradient édité. Elle permet aussi d'éditer les paramètres spécifiques au type de gradient tel que les points de départ et d'arrivée, le rayon, etc. par glisser-déposer. + 1 1 + 2 2 + 3 3 + 4 4 + 5 5 + Gradient Stops Editor Éditeur de point d'arrêt du gradient + 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. Cette zone vous permet d'éditer les points d'arrêt du gardient. Double-cliquez sur un point d'arrêt existant pour le dupliquer. Double-cliquez à l'exterieur d'un point d'arrêt pour en créer un nouveau. Glissez-déposez un point pour le repositionner. Utilisez le bouton droit de la souris pour afficher le menu contextuel avec des actions supplémentaires. + Zoom Zoom + Reset Zoom Réinitialiser le zoom + Position Position + Hue Teinte + H T + Saturation Saturation + S S + Sat Sat + Value Valeur + V V + Val Val + Alpha Alpha + A A + Type Type + Spread Étendue + Color Couleur + Current stop's color Couleur du point d'arrêt courant + Show HSV specification Montrer les spécifications TSV/HSV + HSV TSV/HSV + Show RGB specification Affichier les spécifications RGB + RGB RGB + Current stop's position Position du point d'arrêt courant + % % + Zoom In Zoomer + Zoom Out Dézoomer + Toggle details extension Inverser les détails d'exention + > > + Linear Type Type linéaire + ... ... + Radial Type Type radial + Conical Type Type conique + Pad Spread Étendue par remplissage + Repeat Spread Étendue par répétition + Reflect Spread Étendue par réflexion + Start X X de départ + Start Y Y de départ + Final X X de fin + Final Y Y de fin + + Central X X central + + Central Y Y central + Focal X X focal + Focal Y Y focal + Radius Rayon + Angle Angle + Linear Linéaire + Radial Radial + Conical Conique + Pad Remplissage + Repeat Répéter + Reflect Réflexion @@ -2429,30 +3010,37 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtGradientStopsWidget + New Stop Nouveau point d'arrêt + Delete Supprimer + Flip All Tout renverser + Select All Tout sélectionner + Zoom In Zoomer + Zoom Out Dézoomer + Reset Zoom Réinitialiser le zoom @@ -2460,34 +3048,46 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtGradientView + Gradient View Vue du gradient + + New... Nouveau... + + Edit... Éditer... + + Rename Renommer + + Remove Retirer + Grad Gradient + Remove Gradient Retirer gradient + Are you sure you want to remove the selected gradient? Êtes-vous sûr de vouloir supprimer le gradient sélectionné ? @@ -2495,6 +3095,8 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtGradientViewDialog + + Select Gradient Sélectionner gradient @@ -2502,6 +3104,7 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtKeySequenceEdit + Clear Shortcut Effacer les racourcis @@ -2509,14 +3112,17 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtLocalePropertyManager + %1, %2 %1, %2 + Language Langue + Country Pays @@ -2524,14 +3130,17 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtPointFPropertyManager + (%1, %2) (%1, %2) + X X + Y Y @@ -2539,14 +3148,17 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtPointPropertyManager + (%1, %2) (%1, %2) + X X + Y Y @@ -2554,10 +3166,12 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtPropertyBrowserUtils + [%1, %2, %3] (%4) [%1, %2, %3] (%4) + [%1, %2] [%1, %2] @@ -2565,22 +3179,27 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtRectFPropertyManager + [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] + X X + Y Y + Width Largeur + Height Hauteur @@ -2588,22 +3207,27 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtRectPropertyManager + [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] + X X + Y Y + Width Largeur + Height Hauteur @@ -2611,134 +3235,173 @@ Les pages du conteneur ne devraient être ajoutées que par spécification dans QtResourceEditorDialog + Dialog Dialogue + New File Nouveau fichier + N N + Remove File Supprimer fichier + R S + I + New Resource Nouvelle ressource + A A + Remove Resource or File Supprimer ressource ou fichier + %1 already exists. Do you want to replace it? %1 existe déjà. Voulez-vous le remplacer ? + The file does not appear to be a resource file; element '%1' was found where '%2' was expected. Le fichier n'est pas un fichier ressource; l'élément '%1' a été trouvé à la place de %2. + %1 [read-only] %1 [lecture seule] + + %1 [missing] %1 [manquant] + <no prefix> <pas de préfixe> + + New Resource File Nouveau fichier de ressource + + Resource files (*.qrc) Fichier de ressource (*.qrc) + Import Resource File Importer fichier de ressource + newPrefix newPrefix + <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> <p><b>Avertissement :</b> le fichier</p><p>%1</p><p>est en dehors du répertoire parent du fichier de ressource courant.</p> + <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> <p>Pour résoudre le problème, appuyez sur :</p><table><tr><th align="left">Copier</th><td>Pour copier le fichier dans le répertoire parent du fichier de ressource.</td></tr><tr><th align="left">Copier sous...</th><td>Pour copier le fichier ressource dans un sous-répertoire du répertoire parent du fichier de ressource.</td></tr><tr><th align="left">Conserver</th><td>pour conserver l'emplacement courant.</td></tr></table> + Add Files Ajouter fichiers + Incorrect Path Chemin incorrect + + + + Copy Copier + Copy As... Copier sous... + Keep Conserver + Skip Passer + Clone Prefix Cloner le préfixe + Enter the suffix which you want to add to the names of the cloned files. This could for example be a language extension like "_de". Entrez le suffixe que vous voulez ajouter aux noms des fichiers clonés. Ceci peut être une extension de langue par exemple, comme "_fr'. + + Copy As Copier sous + <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> <p>Le fichier sélectionné</p><p>%1</p><p>est en dehors du répertoire du fichier de ressource courant :</p><p>%2</p><p>Veuillez sélectionner un chemin dans le répertoire courant.</p> + Could not overwrite %1. Impossible d'écraser %1. + Could not copy %1 to @@ -2749,84 +3412,108 @@ vers %2 + A parse error occurred at line %1, column %2 of %3: %4 Une erreur d'analyse grammaticale est apparue à la ligne %1, colonne %2 de %3 : %4 + Save Resource File Enregistrer le fichier de ressource + Could not write %1: %2 Impossible d'écrire %1 : %2 + Edit Resources Éditer les ressources + New... Nouveau... + Open... Ouvrir... + Open Resource File Ouvrir fichier de ressource + + Remove Retirer + + Move Up Vers le Haut + + Move Down Vers le Bas + + Add Prefix Ajouter préfixe + Add Files... Ajouter fichiers... + Change Prefix Modifier le préfixe + Change Language Modifier la langue + Change Alias Modifier l'alias + Clone Prefix... Cloner le préfixe... + Prefix / Path Préfixe / chemin + Language / Alias Langue / Alias + <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> <html><p><b>Avertissement:</b> Des problèmes sont apparus lors du rafraichissement des données des ressources :</p><pre>%1</pre></html> + Resource Warning Avertissement relatif aux ressources @@ -2834,20 +3521,24 @@ vers QtResourceView + Size: %1 x %2 %3 Taille : %1 x %2 %3 + Edit Resources... Éditer ressources... + Reload Recharger + Copy Path Copier le chemin @@ -2855,6 +3546,7 @@ vers QtResourceViewDialog + Select Resource Séléctionner ressource @@ -2862,14 +3554,17 @@ vers QtSizeFPropertyManager + %1 x %2 %1 x %2 + Width Largeur + Height Hauteur @@ -2877,26 +3572,33 @@ vers QtSizePolicyPropertyManager + + <Invalid> <Invalide> + [%1, %2, %3, %4] [%1, %2, %3, %4] + Horizontal Policy Politique horizontale + Vertical Policy Politique verticale + Horizontal Stretch Étirement horizontal + Vertical Stretch Étirement vertical @@ -2904,14 +3606,17 @@ vers QtSizePropertyManager + %1 x %2 %1 x %2 + Width Largeur + Height Hauteur @@ -2919,86 +3624,107 @@ vers QtToolBarDialog + Customize Toolbars Personnaliser les barres d'outils + 1 1 + Actions Actions + Toolbars Barres d'outils + Add new toolbar Ajouter une nouvelle barre d'outils + New Nouveau + Remove selected toolbar Supprimer la barre d'outils sélectionnée + Remove Supprimer + Rename toolbar Renommer la barre d'outils + Rename Renommer + Move action up Déplacer l'action vers le haut + Up Monter + Remove action from toolbar Retirer l'action de la barre d'outils + <- <- + Add action to toolbar Ajouter l'action à la barre d'outil + -> -> + Move action down Déplacer l'action vers le bas + Down Descendre + Current Toolbar Actions Actions de la barre d'outils courante + Custom Toolbar Barre d'outils personnalisée + < S E P A R A T O R > < S É P A R A T E U R > @@ -3006,10 +3732,12 @@ vers QtTreePropertyBrowser + Property Propriété + Value Valeur @@ -3017,52 +3745,64 @@ vers SaveFormAsTemplate + Save Form As Template Enregistrer le formulaire comme un modèle + &Name: &Nom : + &Category: &Catégorie : + Add path... Ajouter chemin... + Template Exists Le modèle existe + A template with the name %1 already exists. Do you want overwrite the template? Un modèle existe déjà avec le nom %1. Voulez-vous le remplacer ? + Overwrite Template Remplacer modèle + Open Error Erreur d'ouverture + There was an error opening template %1 for writing. Reason: %2 Une erreur s'est produite à l'ouverture du modèle %1 en écriture. Raison : %2 + Write Error Erreur d'écriture + There was an error writing the template %1 to disk. Reason: %2 Une erreur s'est produite lors de l'écriture du modèle %1 sur le disque. Raison : %2 + Pick a directory to save templates in Sélectionner le dossier dans lequel le modèle sera enregistré @@ -3070,6 +3810,7 @@ Voulez-vous le remplacer ? ScriptErrorDialog + An error occurred while running the scripts for "%1": Une erreur est apparue lors de l'execution des scripts de "%1" : @@ -3079,18 +3820,22 @@ Voulez-vous le remplacer ? SelectSignalDialog + Go to slot Aller au slot + Select signal Sélectionner signal + signal signal + class classe @@ -3098,6 +3843,7 @@ Voulez-vous le remplacer ? SignalSlotConnection + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) ENVOYER(%1), SIGNAL(%2), RECEVEUR(%3), SLOT(%4) @@ -3105,26 +3851,32 @@ Voulez-vous le remplacer ? SignalSlotDialogClass + Signals and slots Signaux et slots + Slots Slots + Add Ajouter + ... ... + Delete Supprimer + Signals Signaux @@ -3132,10 +3884,12 @@ Voulez-vous le remplacer ? Spacer + Horizontal Spacer '%1', %2 x %3 Ressort horizontal '%1', %2 x %3 + Vertical Spacer '%1', %2 x %3 Ressort vertical '%1', %2 x %3 @@ -3143,6 +3897,7 @@ Voulez-vous le remplacer ? TemplateOptionsPage + Template Paths Tab in preferences dialog Chemins des modèles @@ -3151,42 +3906,52 @@ Voulez-vous le remplacer ? ToolBarManager + Configure Toolbars... Configurer les barres d'outils... + Window Fenêtre + Help Aide + Style Style + Dock views Ancrer les vues + File Fichier + Edit Édition + Tools Outils + Form Formulaire + Toolbars Barres d'outils @@ -3194,25 +3959,78 @@ Voulez-vous le remplacer ? VersionDialog + <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>Version %2 + Qt Designer Qt Designer + <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> <br/>Qt Designer est une interface de création d'interface graphique pour les applications Qt.<br/> + %1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). %1<br/>Copyright (C) 2010 Nokia Corporation et/ou ses filiales. + VideoPlayerTaskMenu + + + Available Mime Types + Types MIME disponibles + + + + Display supported mime types... + Afficher les types MIME supportés... + + + + Load... + Ouvrir... + + + + Play + Lecture + + + + Pause + Pause + + + + Stop + Arrêter + + + + Choose Video Player Media Source + Choisir une source de média pour le lecteur video + + + + An error has occurred in '%1': %2 + Une erreur s'est produite dans '%1' : %2 + + + + Video Player Error + Erreur du lecteur video + + + WidgetDataBase + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. Le fichier contient un widget personnalisé '%1' dont la classe de base (%2) est différente de l'entrée dans la base de données de widget (%3). La base de données de widget n'a pas été modifiée. @@ -3220,70 +4038,87 @@ Voulez-vous le remplacer ? qdesigner_internal::ActionEditor + New... Nouveau... + Edit... Éditer... + Go to slot... Aller au slot... + Copy Copier + Cut Couper + Paste Coller + Select all Tout sélectionner + Delete Supprimer + Actions Actions + Configure Action Editor Configurer l'éditeur d'action + Icon View Vue en icônes + Detailed View Vue détaillée + New action Nouvelle action + Edit action Editer action + Remove action '%1' Supprimer action '%1' + Remove actions Supprimer les actions + Used In Utilisé dans @@ -3291,26 +4126,32 @@ Voulez-vous le remplacer ? qdesigner_internal::ActionModel + Name Nom + Used Utilisé + Text Texte + Shortcut Raccourci + Checkable Vérifiable + ToolTip Info-bulle @@ -3318,22 +4159,27 @@ Voulez-vous le remplacer ? qdesigner_internal::BrushManagerProxy + The element '%1' is missing the required attribute '%2'. L'attribut requis '%2' est manquant pour l'élément '%1'. + Empty brush name encountered. Un nom vide de pinceau a été rencontré. + An unexpected element '%1' was encountered. L'élément inattendu '%1' a été rencontré. + An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 - Une erreur est apparue lors de la lecture du fichier '%1' de définition des pinceaux à la ligne %2, colonne %3: %4 + Une erreur est apparue lors de la lecture du fichier '%1' de définition des pinceaux à la ligne %2, colonne %3 : %4 + An error occurred when reading the resource file '%1' at line %2, column %3: %4 Une erreur est survenue lors de la lecture du fichier de ressource '%1' à la ligne %2, colonne %3 : %4 @@ -3341,14 +4187,17 @@ Voulez-vous le remplacer ? qdesigner_internal::BuddyEditor + Add buddy Ajouter un copain + Remove buddies Supprimer les copains + Remove %n buddies Supprimer %n copain @@ -3356,6 +4205,7 @@ Voulez-vous le remplacer ? + Add %n buddies Ajouter %n copain @@ -3363,6 +4213,7 @@ Voulez-vous le remplacer ? + Set automatically Définir automatiquement @@ -3370,6 +4221,7 @@ Voulez-vous le remplacer ? qdesigner_internal::BuddyEditorPlugin + Edit Buddies Éditer les copains @@ -3377,6 +4229,7 @@ Voulez-vous le remplacer ? qdesigner_internal::BuddyEditorTool + Edit Buddies Éditer les copains @@ -3384,10 +4237,12 @@ Voulez-vous le remplacer ? qdesigner_internal::ButtonGroupMenu + Select members Sélectionner les membres + Break Casser @@ -3395,26 +4250,32 @@ Voulez-vous le remplacer ? qdesigner_internal::ButtonTaskMenu + Assign to button group Assigner au groupe de boutons + Button group Groupe de boutons + New button group Nouveau groupe de boutons + Change text... Modifier le texte... + None Aucun + Button group '%1' Groupe de boutons '%1' @@ -3422,46 +4283,57 @@ Voulez-vous le remplacer ? qdesigner_internal::CodeDialog + Save... Enregistrer... + Copy All Tout copier + &Find in Text... &Rechercher dans le texte... + A temporary form file could not be created in %1. Un fichier temporaire de formulaire n'a pas pu être créé dans %1. + The temporary form file %1 could not be written. Le fichier temporaire de formulaire %1 n'a pas pu être écrit. + %1 - [Code] %1 - [Code] + Save Code Enregistrer le code + Header Files (*.%1) Fichiers headers (*.%1) + The file %1 could not be opened: %2 Le fichier %1 ne peut pas être ouvert : %2 + The file %1 could not be written: %2 Le fichier %1 ne peut pas être écrit : %2 + %1 - Error %1 - Erreur @@ -3469,6 +4341,7 @@ Voulez-vous le remplacer ? qdesigner_internal::ColorAction + Text Color Couleur du texte @@ -3476,10 +4349,12 @@ Voulez-vous le remplacer ? qdesigner_internal::ComboBoxTaskMenu + Edit Items... Éditer les éléments... + Change Combobox Contents Modifier le contenu du Combobox @@ -3487,6 +4362,7 @@ Voulez-vous le remplacer ? qdesigner_internal::CommandLinkButtonTaskMenu + Change description... Modifier la description... @@ -3494,14 +4370,17 @@ Voulez-vous le remplacer ? qdesigner_internal::ConnectionEdit + Select All Tout sélectionner + Deselect All Désélectionner tout + Delete Supprimer @@ -3509,42 +4388,52 @@ Voulez-vous le remplacer ? qdesigner_internal::ConnectionModel + Sender Émetteur + Signal Signal + Receiver Receveur + Slot Slot + <sender> <émetteur> + <signal> <signal> + <receiver> <receveur> + <slot> <slot> + The connection already exists!<br>%1 La connexion existe déjà !<br>%1 + Signal and Slot Editor Éditeur de signaux et slots @@ -3552,34 +4441,42 @@ Voulez-vous le remplacer ? qdesigner_internal::ContainerWidgetTaskMenu + Delete Supprimer + Insert Insérer + Insert Page Before Current Page Insérer la page avant la page courante + Insert Page After Current Page Insérer la page après la page courante + Add Subwindow Ajouter sous-fenêtre + Subwindow Sous fenêtre + Page Page + Page %1 of %2 Page %1 de %2 @@ -3587,15 +4484,18 @@ Voulez-vous le remplacer ? qdesigner_internal::DPI_Chooser + System (%1 x %2) System resolution Système (%1 x %2) + User defined Défini par l'utilisateur + x DPI X/Y separator x @@ -3604,38 +4504,49 @@ Voulez-vous le remplacer ? qdesigner_internal::DesignerPropertyManager + + AlignLeft AlignementGauche + AlignHCenter AlignementCentreH + AlignRight AlignementDroite + AlignJustify AlignementJustifié + AlignTop AlignementSommet + + AlignVCenter AlignementCentreV + AlignBottom AlignementDessous + %1, %2 %1, %2 + Customized (%n roles) Personnalisé (%n rôle) @@ -3643,59 +4554,76 @@ Voulez-vous le remplacer ? + Inherited pour la palette Héritée + Horizontal Horizontal + Vertical Vertical + Normal Off Arrêt normal + Normal On Marche normal + Disabled Off Arrêt désactivé + Disabled On Marche désactivé + Active Off Arrêt activé + Active On Marche activé + Selected Off Arrêt sélectionné + Selected On Marche sélectionné + + translatable Traduisible + + disambiguation désambiguation + + comment commentaire @@ -3703,38 +4631,48 @@ Voulez-vous le remplacer ? qdesigner_internal::DeviceProfileDialog + Device Profiles (*.%1) Profils d'appareil (*.%1) + Default Par défaut + Save Profile Enregistrer le profil + Save Profile - Error Enregistrer le profile - Erreur + Unable to open the file '%1' for writing: %2 Impossible d'ouvrir le fichier '%1' en écriture : %2 + Open profile Ouvrir profil + + Open Profile - Error Ouvrir profil - Erreur + Unable to open the file '%1' for reading: %2 Impossible d'ouvrir le fichier '%1' en lecture : %2 + '%1' is not a valid profile: %2 '%1' n'est pas un profil valide : %2 @@ -3742,46 +4680,57 @@ Voulez-vous le remplacer ? qdesigner_internal::Dialog + Dialog Boîte de dialogue + StringList Liste de chaîne de caractères + New String Nouvelle chaîne de caractères + &New &Nouveau + Delete String Supprimer la chaîne de caractères + &Delete &Supprimer + &Value: &Valeur : + Move String Up Déplacer la chaîne de caractères vers le haut + Up Vers le haut + Move String Down Déplacer la chaîne de caractères vers le bas + Down Vers le bas @@ -3789,42 +4738,52 @@ Voulez-vous le remplacer ? qdesigner_internal::EmbeddedOptionsControl + None Aucun + Add a profile Ajouter un profil + Edit the selected profile Éditer le profile sélectionné + Delete the selected profile Supprimer le profil sélectionné + Add Profile Ajouter profil + New profile Nouveau profil + Edit Profile Éditer profil + Delete Profile Supprimer profil + Would you like to delete the profile '%1'? Voulez-vous supprimer le profil '%1' ? + Default Par défaut @@ -3836,10 +4795,12 @@ Voulez-vous le remplacer ? <Filtre> + Filter Filtre + Clear text Effacer le texte @@ -3847,10 +4808,12 @@ Voulez-vous le remplacer ? qdesigner_internal::FormEditor + Resource File Changed Fichier de ressource modifié + The file "%1" has changed outside Designer. Do you want to reload it? Le fichier "%1" a été modifié en dehors de Designer. Voulez-vous le recharger ? @@ -3858,6 +4821,7 @@ Voulez-vous le remplacer ? qdesigner_internal::FormLayoutMenu + Add form layout row... Ajouter une ligne au layout du formulaire... @@ -3865,30 +4829,37 @@ Voulez-vous le remplacer ? qdesigner_internal::FormWindow + Edit contents Éditer le contenu + F2 F2 + Insert widget '%1' Insérer le widget '%1' + Resize Redimensionner + Key Move Déplacement au clavier + Key Resize Redimensionnement au clavier + Paste %n action(s) Coller %n action @@ -3896,6 +4867,7 @@ Voulez-vous le remplacer ? + Paste %n widget(s) Coller %n widget @@ -3903,42 +4875,53 @@ Voulez-vous le remplacer ? + Paste (%1 widgets, %2 actions) Coller (%1 widgets, %2 actions) + Cannot paste widgets. Designer could not find a container without a layout to paste into. Impossible de coller les widgets. Designer n'a pas trouvé de conteneur sans layout pour coller. + Break the layout of the container you want to paste into, select this container and then paste again. Retirez le layout du conteneur dans lequel vous voulez coller, sélectionnez ce conteneur et collez à nouveau. + Paste error Erreur de collage + Raise widgets Élever widgets + Lower widgets Descendre widgets + Select Ancestor Sélectionner les ancêtres + Lay out Mettre en page + + Drop widget Supprimer widget + A QMainWindow-based form does not contain a central widget. Un formulaire basé sur QMainWindow ne contenant pas de widget central. @@ -3946,10 +4929,12 @@ Voulez-vous le remplacer ? qdesigner_internal::FormWindowBase + Delete '%1' Supprimer '%1' + Delete Supprimer @@ -3957,78 +4942,99 @@ Voulez-vous le remplacer ? qdesigner_internal::FormWindowManager + Cu&t Co&uper + Cuts the selected widgets and puts them on the clipboard Coupe les widgets sélectionnés et les place dans le presse-papiers + &Copy Cop&ier + Copies the selected widgets to the clipboard Copie les widgets sélectionnés dans le presse-papiers + &Paste C&oller + Pastes the clipboard's contents Colle le contenu du presse-papiers + &Delete &Supprimer + Deletes the selected widgets Supprime les widgets sélectionnés + Select &All Tout &sélectionner + Selects all widgets Sélectionne tous les widgets + Bring to &Front Amener au premier &plan + + Raises the selected widgets Élève les widgets sélectionnés + Send to &Back Placer en &arrière plan + + Lowers the selected widgets Descend les widgets sélectionnés + Adjust &Size Ajuster les &dimensions + Adjusts the size of the selected widget Ajuster les dimensions du widget sélectionné + Lay Out &Horizontally Mettre en page &horizontalement + Lays out the selected widgets horizontally Mettre en page horizontalement les widgets sélectionnés + Lays out the selected widgets horizontally in a splitter Met en page les widgets sélectionnés horizontalement à l'aide d'un séparateur @@ -4037,30 +5043,37 @@ Voulez-vous le remplacer ? Mettre en page horizontalement les widgets sélectionnés + Lay Out &Vertically Mettre en page &verticalement + Lays out the selected widgets vertically Mettre en page verticalement les widgets sélectionnés + Lay Out in a &Form Layout Mettre en page dans un layout de &formulaire + Lays out the selected widgets in a form layout Mettre en page les widgets sélectionnés dans un layout de formulaire + Lay Out in a &Grid Mettre en page dans une &grille + Lays out the selected widgets in a grid Mettre en page les widgets sélectionnés dans une grille + Lay Out Horizontally in S&plitter Mettre en page horizontalement avec un sé&parateur @@ -4069,55 +5082,68 @@ Voulez-vous le remplacer ? Met en page les widgets sélectionnés horizontalement à l'aide d'un séparateur + Lay Out Vertically in Sp&litter Mettre en page verticalement avec un sépa&rateur + Lays out the selected widgets vertically in a splitter Met en page les widgets sélectionnés verticalement à l'aide d'un séparateur + &Break Layout &Casser la mise en page + Breaks the selected layout Retire le layout sélectionné + Si&mplify Grid Layout Si&mplifier le layout de grille + Removes empty columns and rows Supprime les lignes et colonnes vides + &Preview... &Prévisualisation... + Preview current form Prévisualise le formulaire courant + Form &Settings... Paramètres du &formulaire... + Break Layout Casser la mise en page + Adjust Size Ajuster les dimensions + Could not create form preview Title of warning message box Impossible de créer la prévisualisation du formulaire + Form Settings - %1 Paramètres du formulaire - %1 @@ -4125,10 +5151,12 @@ Voulez-vous le remplacer ? qdesigner_internal::FormWindowSettings + None Aucun + Device Profile: %1 Profil de périphérique : %1 @@ -4136,30 +5164,37 @@ Voulez-vous le remplacer ? qdesigner_internal::GridPanel + Form Formulaire + Grid Grille + Visible Visible + Grid &X Grille &X + Snap Grille aimantée + Reset Réinitialisé + Grid &Y Grille &Y @@ -4167,6 +5202,7 @@ Voulez-vous le remplacer ? qdesigner_internal::GroupBoxTaskMenu + Change title... Modifier le titre... @@ -4174,6 +5210,7 @@ Voulez-vous le remplacer ? qdesigner_internal::HtmlTextEdit + Insert HTML entity Insérer une entité HTML @@ -4181,74 +5218,92 @@ Voulez-vous le remplacer ? qdesigner_internal::IconSelector + The pixmap file '%1' cannot be read. Le fichier pixmap '%1' ne peut pas être lu. + The file '%1' does not appear to be a valid pixmap file: %2 Le fichier '%1' n'est pas un fichier de pixmap valide : %2 + The file '%1' could not be read: %2 Le fichier '%1' ne peut pas être lu : %2 + Choose a Pixmap Choisissez un pixmap + Pixmap Read Error Erreur de lecture de pixmap + ... ... + Normal Off Arrêt normal + Normal On Marche normal + Disabled Off Arrêt désactivé + Disabled On Marche désactivé + Active Off Arrêt activé + Active On Marche activé + Selected Off Arrêt sélectionné + Selected On Marche sélectionné + Choose Resource... Choisir ressource... + Choose File... Choisir un fichier... + Reset Réinitialiser + Reset All Réinitialisé tout @@ -4256,46 +5311,58 @@ Voulez-vous le remplacer ? qdesigner_internal::ItemListEditor + Items List Liste d'éléments + New Item Nouvel élément + &New &Nouveau + Delete Item Supprimer élément + &Delete &Supprimer + Move Item Up Déplacer l'élément vers le haut + U Monter + Move Item Down Déplacer l'élément vers le bas + D Descendre + + Properties &>> Propriétés &>> + Properties &<< Propriétés &<< @@ -4303,10 +5370,12 @@ Voulez-vous le remplacer ? qdesigner_internal::LabelTaskMenu + Change rich text... Modifier texte riche... + Change plain text... Modifier texte simple... @@ -4314,6 +5383,7 @@ Voulez-vous le remplacer ? qdesigner_internal::LanguageResourceDialog + Choose Resource Choisir ressource @@ -4321,6 +5391,7 @@ Voulez-vous le remplacer ? qdesigner_internal::LineEditTaskMenu + Change text... Modifier texte... @@ -4328,14 +5399,17 @@ Voulez-vous le remplacer ? qdesigner_internal::ListWidgetEditor + New Item Nouvel élément + Edit List Widget Éditer le widget de liste + Edit Combobox Éditer le Combobox @@ -4343,10 +5417,12 @@ Voulez-vous le remplacer ? qdesigner_internal::ListWidgetTaskMenu + Edit Items... Éditer les éléments... + Change List Contents Modifier le contenu de la liste @@ -4354,18 +5430,22 @@ Voulez-vous le remplacer ? qdesigner_internal::MdiContainerWidgetTaskMenu + Next Subwindow Sous-fenêtre suivante + Previous Subwindow Sous-fenêtre précédente + Tile Côte à côte + Cascade Cascade @@ -4373,6 +5453,7 @@ Voulez-vous le remplacer ? qdesigner_internal::MenuTaskMenu + Remove Supprimer @@ -4380,6 +5461,7 @@ Voulez-vous le remplacer ? qdesigner_internal::MorphMenu + Morph into Transformer en @@ -4387,34 +5469,42 @@ Voulez-vous le remplacer ? qdesigner_internal::NewActionDialog + New Action... Nouvelle action... + &Text: &Texte : + Object &name: &Nom de l'objet : + &Icon: &Icône : + Shortcut: Raccourci : + Checkable: Peut être cochée : + ToolTip: Info-bulle : + ... ... @@ -4422,32 +5512,39 @@ Voulez-vous le remplacer ? qdesigner_internal::NewDynamicPropertyDialog + Create Dynamic Property Créer une propriété dynamique + Property Name Nom de la propriété + horizontalSpacer Espaceur horizontal + Property Type Type de la propriété + Set Property Name Définir le nom de la propriété + The current object already has a property named '%1'. Please select another, unique one. L'objet courant possède déjà une propriété nommée '%1'. Veuillez-sélectionner un autre nom. + The '_q_' prefix is reserved for the Qt library. Please select another name. Le préfixe «_q_» est réservé pour la bibliothèque Qt. @@ -4457,67 +5554,83 @@ Veuillez sélectionner un autre nom. qdesigner_internal::NewFormWidget + 0 0 + Choose a template for a preview Choisir un modèle pour la prévisualisation + Embedded Design Design pour appareil mobile + Device: Appareil : + Screen Size: Dimensions de l'écran : + Default size Dimensions par défaut + QVGA portrait (240x320) QVGA portrait (240x320) + QVGA landscape (320x240) QVGA paysage (320x240) + VGA portrait (480x640) VGA portrait (480x640) + VGA landscape (640x480) VGA paysage (640x480) + Widgets New Form Dialog Categories Widgets + Custom Widgets Widgets personnalisé + None Aucun + Error loading form Erreur de chargement du formulaire + Unable to open the form template file '%1': %2 Impossible d'ouvrir le fichier de modèle de formulaire '%1' : %2 + Internal error: No template selected. Erreur interne : aucun modèle sélectionné. @@ -4525,30 +5638,37 @@ Veuillez sélectionner un autre nom. qdesigner_internal::NewPromotedClassPanel + Add Ajouter + New Promoted Class Nouvelle classe promue + Base class name: Nom de la classe de base : + Promoted class name: Nom de la classe promue : + Header file: Fichier d'en-tête : + Global include En-tête global + Reset Réinitialiser @@ -4556,10 +5676,12 @@ Veuillez sélectionner un autre nom. qdesigner_internal::ObjectInspector + Change Current Page Modifier la page courante + &Find in Text... &Rechercher dans le texte... @@ -4574,26 +5696,32 @@ Veuillez sélectionner un autre nom. qdesigner_internal::OrderDialog + Change Page Order Modifier l'ordre des pages + Page Order Ordre des pages + Move page up Déplacer la page vers le haut + Move page down Déplacer la page vers le bas + Index %1 (%2) Indice %1 (%2) + %1 %2 %1 %2 @@ -4601,38 +5729,47 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PaletteEditor + Edit Palette Éditer la palette + Tune Palette Ajuster la palette + Show Details Afficher les détails + Compute Details Calculer les détails + Quick Rapide + Preview Prévisualisation + Disabled Désactivé + Inactive Inactif + Active Actif @@ -4640,6 +5777,7 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PaletteEditorButton + Change Palette Modifier la palette @@ -4647,18 +5785,22 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PaletteModel + Color Role Rôle de la couleur + Active Actif + Inactive Inactif + Disabled Désactivé @@ -4666,22 +5808,28 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PixmapEditor + Choose Resource... Choisir ressource... + Choose File... Choisir fichier... + Copy Path Chemin de copie + Paste Path Chemin de collage + + ... ... @@ -4689,6 +5837,7 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PlainTextEditorDialog + Edit text Éditer le texte @@ -4696,30 +5845,37 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PluginDialog + Components Composants + Plugin Information Information sur les plugins + Refresh Rafraîchir + Scan for newly installed custom widget plugins. Recherche des plugins personnalisés récemment installés. + Qt Designer couldn't find any plugins Qt Designer n'a trouvé aucun plugin + Qt Designer found the following plugins Qt Designer a trouvé les plugins suivants + New custom widget plugins have been found. De nouveaux plugins de widgets ont été trouvés. @@ -4727,6 +5883,7 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PreviewActionGroup + %1 Style Style %1 @@ -4734,38 +5891,47 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PreviewConfigurationWidget + Default Par défaut + None Aucun + Browse... Parcourir... + Load Custom Device Skin Charger le revêtement d'appareil personnalisé + All QVFB Skins (*.%1) Tous les revêtements QVFB (*.%1) + %1 - Duplicate Skin %1 - Revêtement doublon + The skin '%1' already exists. Le revêtement '%1' existe déjà. + %1 - Error %1 - Erreur + %1 is not a valid skin directory: %2 %1 n'est pas un répertoire de revêtements valide : @@ -4804,20 +5970,24 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PreviewDeviceSkin + &Portrait &Portrait + Landscape (&CCW) Rotate form preview counter-clockwise Paysage (&dans le sens horaire) + &Landscape (CW) Rotate form preview clockwise Paysage (&dans le sens anti-horaire) + &Close &Fermer @@ -4825,6 +5995,7 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PreviewManager + %1 - [Preview] %1 - [prévisualisation] @@ -4832,6 +6003,7 @@ Veuillez sélectionner un autre nom. qdesigner_internal::PreviewMdiArea + The moose in the noose ate the goose who was loose. Palette editor background @@ -4842,46 +6014,57 @@ je préfère les mines de Pompéi. qdesigner_internal::PreviewWidget + Preview Window Fenêtre de prévisualisation + LineEdit LineEdit + ComboBox ComboBox + PushButton PushButton + ButtonGroup2 ButtonGroup2 + CheckBox1 CheckBox1 + CheckBox2 CheckBox2 + ButtonGroup ButtonGroup + RadioButton1 RadioButton1 + RadioButton2 RadioButton2 + RadioButton3 BoutonRadio1 @@ -4889,18 +6072,22 @@ je préfère les mines de Pompéi. qdesigner_internal::PromotionModel + Name Nom + Header file Fichier d'en-tête + Global include En-tête global + Usage Usage @@ -4908,22 +6095,27 @@ je préfère les mines de Pompéi. qdesigner_internal::PromotionTaskMenu + Promoted widgets... Widgets promus... + Promote to ... Promouvoir en... + Change signals/slots... Modifier signaux/slots... + Promote to Promouvoir en + Demote to %1 Rétrograder en %1 @@ -4931,46 +6123,57 @@ je préfère les mines de Pompéi. qdesigner_internal::PropertyEditor + Add Dynamic Property... Ajouter une propriété dynamique... + Remove Dynamic Property Supprimer la propriété dynamique + Sorting Tri + Color Groups Groupes de couleur + Tree View Vue arborescente + Drop Down Button View Liste déroulante + String... Chaîne de caractères... + Bool... Booléen... + Other... Autre... + Configure Property Editor Configurer l'éditeur de propriétés + Object: %1 Class: %2 Objet : %1 @@ -4980,6 +6183,7 @@ Classe : %2 qdesigner_internal::PropertyLineEdit + Insert line break Insérer saut de ligne @@ -4987,22 +6191,27 @@ Classe : %2 qdesigner_internal::QDesignerPromotionDialog + Promoted Widgets Widgets promus + Promoted Classes Classes promues + Promote Promouvoir + Change signals/slots... Modifier signaux/slots... + %1 - Error %1 - Erreur @@ -5010,18 +6219,22 @@ Classe : %2 qdesigner_internal::QDesignerResource + Loading qrc file Chargement du fichier qrc + The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> - Le fichier qrc spécifié <p><b>%1</b></p><p>n'a pas pu être trouvé. Voulez-vous mettre à jour l'emplacement du fichier?</p> + Le fichier qrc spécifié <p><b>%1</b></p><p>n'a pas pu être trouvé. Voulez-vous mettre à jour l'emplacement du fichier ?</p> + New location for %1 Nouvel emplacement pour %1 + Resource files (*.qrc) Fichier de ressource (*.qrc) @@ -5029,90 +6242,112 @@ Classe : %2 qdesigner_internal::QDesignerTaskMenu + Change objectName... Modifier objectName... + Change toolTip... Modifier toolTip... + Change whatsThis... Modifier whatsThis... + Change styleSheet... Modifier la feuille de style... + Create Menu Bar Créer une barre de menus + Add Tool Bar Ajouter une barre d'outils + Create Status Bar Créer une barre de status + Remove Status Bar Supprimer la barre de status + Change script... Modifier le script... + Change signals/slots... Modifier signaux/slots... + Go to slot... Aller au slot... + Size Constraints Contrainte de taille + Set Minimum Width Définir la largeur minimum + Set Minimum Height Définir la hauteur minimum + Set Minimum Size Définir la taille minimum + Set Maximum Width Définir la largeur maximum + Set Maximum Height Définir la hauteur maximum + Set Maximum Size Définir la taille maximum + Edit ToolTip Éditer l'info-bulle + Edit WhatsThis Éditer «Qu'est-ce» + no signals available Aucun signal disponible + Set size constraint on %n widget(s) Définir les contraintes de dimensions sur %n widget @@ -5123,32 +6358,40 @@ Classe : %2 qdesigner_internal::QDesignerWidgetBox + An error has been encountered at line %1 of %2: %3 Une erreur a été rencontrée à la ligne %1 de %2 : %3 + Unexpected element <%1> encountered when parsing for <widget> or <ui> L'élément inattendu <%1> a été rencontré lors de l'analyse des élements <widget> et <ui> + Unexpected end of file encountered when parsing widgets. Fin de fichier inattendue lors de l'analyse grammaticale des widgets. + A widget element could not be found. Un élement de widget n'a pas pu être trouvé. + + Unexpected element <%1> Élément <%1> inattendu + A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 %5 Une erreur d'analyse grammaticale est apparue à la ligne %1, colonne %2 du code XML spécifiant le widget %3 : %4 %5 + The XML code specified for the widget %1 does not contain any widget elements. %2 Le code XML spécifié pour le widget %1 ne contient aucun élément widget. @@ -5158,58 +6401,73 @@ Classe : %2 qdesigner_internal::QtGradientStopsController + H T + S S + V V + + Hue Teinte + Sat Sat + Val Val + Saturation Saturation + Value Valeur + R R + G V + B B + Red Rouge + Green Vert + Blue Bleu @@ -5217,22 +6475,27 @@ Classe : %2 qdesigner_internal::RichTextEditorDialog + Edit text Éditer le texte + Rich Text Texte riche + Source Source + &OK &OK + &Cancel &Annuler @@ -5240,58 +6503,72 @@ Classe : %2 qdesigner_internal::RichTextEditorToolBar + Bold Gras + CTRL+B CTRL+B + Italic Italique + CTRL+I CTRL+I + Underline Souligné + CTRL+U CTRL+U + Left Align Aligner à gauche + Center Centrer + Right Align Aligner à droite + Justify Justifier + Superscript Exposant + Subscript Indice + Insert &Link Insérer &lien + Insert &Image Insérer &image @@ -5299,14 +6576,17 @@ Classe : %2 qdesigner_internal::ScriptDialog + Edit script Éditer le script + <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. <html>Entrez un snippet de code Qt Script à exécuter lors du chargement du formulaire.<br>Le widget et ses enfants sont accessibles via les variables <i>widget</i> et <i>childWidgets</i>, respectivement. + Syntax error Erreur de syntaxe @@ -5314,6 +6594,7 @@ Classe : %2 qdesigner_internal::ScriptErrorDialog + Script errors Erreurs de script @@ -5321,18 +6602,23 @@ Classe : %2 qdesigner_internal::SignalSlotDialog + There is already a slot with the signature '%1'. Un slot existe déjà avec la signature '%1'. + There is already a signal with the signature '%1'. Un signal existe déjà avec la signature '%1'. + %1 - Duplicate Signature %1 - Signature double + + Signals/Slots of %1 Signaux/slots de %1 @@ -5340,10 +6626,12 @@ Classe : %2 qdesigner_internal::SignalSlotEditorPlugin + Edit Signals/Slots Éditer signaux/slots + F4 F4 @@ -5351,6 +6639,7 @@ Classe : %2 qdesigner_internal::SignalSlotEditorTool + Edit Signals/Slots Éditer signaux/slots @@ -5358,6 +6647,7 @@ Classe : %2 qdesigner_internal::StatusBarTaskMenu + Remove Supprimer @@ -5365,6 +6655,7 @@ Classe : %2 qdesigner_internal::StringListEditorButton + Change String List Modifier la liste de chaîne de caractères @@ -5372,30 +6663,38 @@ Classe : %2 qdesigner_internal::StyleSheetEditorDialog + + Valid Style Sheet Feuille de style valide + Add Resource... Ajouter ressource... + Add Gradient... Ajouter gradient... + Add Color... Ajouter couleur... + Add Font... Ajouter police... + Edit Style Sheet Éditer feuille de style + Invalid Style Sheet Feuille de style invalide @@ -5403,22 +6702,27 @@ Classe : %2 qdesigner_internal::TabOrderEditor + Start from Here Démarrer à partir d'ici + Restart Redémarrer + Tab Order List... Ordre de la liste de tabulation... + Tab Order List Ordre de la liste de tabulation + Tab Order Ordre des tabulations @@ -5426,6 +6730,7 @@ Classe : %2 qdesigner_internal::TabOrderEditorPlugin + Edit Tab Order Éditer l'ordre des tabulations @@ -5433,6 +6738,7 @@ Classe : %2 qdesigner_internal::TabOrderEditorTool + Edit Tab Order Éditer l'ordre des tabulations @@ -5440,38 +6746,48 @@ Classe : %2 qdesigner_internal::TableWidgetEditor + Edit Table Widget Éditer le widget de table + &Items &Éléments + Table Items Éléments de la table + + Properties &>> Propriétés &>> + New Column Nouvelle colonne + New Row Nouvelle ligne + &Columns &Colonne + &Rows &Lignes + Properties &<< Propriétés &<< @@ -5479,6 +6795,7 @@ Classe : %2 qdesigner_internal::TableWidgetTaskMenu + Edit Items... Éditer les éléments... @@ -5486,18 +6803,22 @@ Classe : %2 qdesigner_internal::TemplateOptionsWidget + Form Formulaire + Additional Template Paths Chemins de modèles additionnels + ... ... + Pick a directory to save templates in Choisir un répertoire où enregistrer les modèles @@ -5505,18 +6826,22 @@ Classe : %2 qdesigner_internal::TextEditTaskMenu + Edit HTML Éditer le HTML + Change HTML... Modifier le HTML... + Edit Text Éditer le texte + Change Plain Text... Modifier le texte simple... @@ -5524,18 +6849,22 @@ Classe : %2 qdesigner_internal::TextEditor + Choose Resource... Choisir ressource... + Choose File... Choisir fichier... + ... ... + Choose a File Choisir un fichier @@ -5543,22 +6872,27 @@ Classe : %2 qdesigner_internal::ToolBarEventFilter + Insert Separator before '%1' Insérer un séparateur avant '%1' + Append Separator Ajouter un séparateur à la fin + Remove action '%1' Supprimer l'action '%1' + Remove Toolbar '%1' Supprimer la barre d'outils '%1' + Insert Separator Insérer un séparateur @@ -5566,98 +6900,125 @@ Classe : %2 qdesigner_internal::TreeWidgetEditor + Edit Tree Widget Éditer un widget d'arborescence + &Items &Éléments + Tree Items Élément de l'arbre + 1 1 + + New Item Nouvel élément + &New &Nouveau + + New Subitem Nouveau sous-élément + New &Subitem Nouveau &sous-élément + Delete Item Supprimer l'élément + &Delete &Supprimer + Move Item Left (before Parent Item) Déplacer l'élément à gauche (avant l'élément parent) + L G + Move Item Right (as a First Subitem of the Next Sibling Item) Déplacer l'élément sur la droite (comme un premier sous-élément de l'élément à droite) + R D + Move Item Up Déplacer l'élément vers le haut + U H + Move Item Down Déplacer l'élément vers le bas + D B + + Properties &>> Propriétés &>> + New Column Nouvelle colonne + &Columns &Colonnes + Per column properties Propriétés par colonnes + Common properties Propritétés de colonnes + Properties &<< Propriétés &<< @@ -5665,6 +7026,7 @@ Classe : %2 qdesigner_internal::TreeWidgetTaskMenu + Edit Items... Éditer les éléments... @@ -5672,6 +7034,7 @@ Classe : %2 qdesigner_internal::WidgetBox + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. Avertissement : La création du widget a échoué dans la boîte de widget. Ceci peut être causé par un code XML invalide d'un widget personnalisé. @@ -5679,34 +7042,42 @@ Classe : %2 qdesigner_internal::WidgetBoxTreeWidget + Scratchpad bloc-notes + Custom Widgets Widgets personnalisés + Expand all Tout étendre + Collapse all Tout replier + List View Vue de liste + Icon View Vue en icônes + Remove Supprimer + Edit name Éditer le nom @@ -5714,6 +7085,7 @@ Classe : %2 qdesigner_internal::WidgetDataBase + A custom widget plugin whose class name (%1) matches that of an existing class has been found. Un plugin de widgets personnalisés dont un nom de classe (%1) correspond à une classe existante à été trouvé. @@ -5721,6 +7093,7 @@ Classe : %2 qdesigner_internal::WidgetEditorTool + Edit Widgets Éditer les widgets @@ -5728,28 +7101,34 @@ Classe : %2 qdesigner_internal::WidgetFactory + The custom widget factory registered for widgets of class %1 returned 0. La fabrique (factory) de widget personnalisé, enregistrée pour les widgets de classe %1, a retourné 0. + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. Une discordance de nom de classe est apparue lors de la création d'un nouveau widget à l'aide de la fabrique de widget personnalisé enregistrée pour la classe %1. La fabrique a retourné un widget de classe %2. + %1 Widget %1 Widget + The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. Le conteneur '%1' de la page courante (%2) n'a pas pu être déterminé lors de la création du layout. Ceci indique une incohérence dans le fichier ui, probablement un layout étant construit sur un widget conteneur. + Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. This indicates an inconsistency in the ui-file. Temptative d'ajout d'un layout sur le widget '%1' (%2) qui a déjà un layout non pris en charge de type %3. Ceci indique une inconsistance dans le fichier ui. + Cannot create style '%1'. Impossible de créer le style '%1'. @@ -5757,10 +7136,12 @@ Ceci indique une inconsistance dans le fichier ui. qdesigner_internal::WizardContainerWidgetTaskMenu + Next Suivant + Back Précédent @@ -5768,6 +7149,7 @@ Ceci indique une inconsistance dans le fichier ui. qdesigner_internal::ZoomMenu + %1 % Zoom factor %1 % @@ -5776,6 +7158,7 @@ Ceci indique une inconsistance dans le fichier ui. qdesigner_internal::ZoomablePreviewDeviceSkin + &Zoom &Zoom diff --git a/translations/linguist_fr.ts b/translations/linguist_fr.ts index 5b98904..c186adc 100644 --- a/translations/linguist_fr.ts +++ b/translations/linguist_fr.ts @@ -2,15 +2,9 @@ - - - (New Entry) - - - - AboutDialog + Qt Linguist @@ -18,104 +12,134 @@ BatchTranslationDialog + Batch Translation of '%1' - Qt Linguist + Searching, please wait... + &Cancel + Linguist batch translator + Batch translated %n entries + Qt Linguist - Batch Translation + Options + Set translated entries to finished + Retranslate entries with existing translation - Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked. - - - + Translate also finished entries + Phrase book preference + Move up + Move down - The batch translator will search through the selected phrase books in the order given above. + + &Run - &Run + + Cancel - Cancel + + Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked + + + + + The batch translator will search through the selected phrase books in the order given above DataModel + <qt>Duplicate messages found in '%1': + + <p>[more duplicates omitted] + + <p>* ID: %1 + + + + <p>* Context: %1<br>* Source: %2 + <br>* Comment: %3 + Linguist does not know the plural rules for '%1'. Will assume a single universal form. + Cannot create '%2': %1 + Universal Form @@ -123,30 +147,37 @@ Will assume a single universal form. ErrorsView + Accelerator possibly superfluous in translation. + Accelerator possibly missing in translation. + Translation does not end with the same punctuation as the source text. + A phrase book suggestion for '%1' was ignored. + Translation does not refer to the same place markers as in the source text. + Translation does not contain the necessary %n place marker. + Unknown error @@ -154,95 +185,159 @@ Will assume a single universal form. FindDialog + Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog + This window allows you to search for some text in the translation source file. + Type in the text to search for. + Options + Source texts are searched when checked. + Translations are searched when checked. + Texts such as 'TeX' and 'tex' are considered as different when checked. + Comments and contexts are searched when checked. + Find + &Find what: + &Source texts + &Translations + &Match case + &Comments + Ignore &accelerators + Click here to find the next occurrence of the text you typed in. + Find Next + Click here to close this window. + Cancel + FormMultiWidget + + + Alt+Delete + translate, but don't change + + + + + Shift+Alt+Insert + translate, but don't change + + + + + Alt+Insert + translate, but don't change + + + + + Confirmation - Qt Linguist + + + + + Delete non-empty length variant? + + + + LRelease - Generated %n translation(s) (%1 finished and %2 unfinished) - + + Dropped %n message(s) which had no ID. - Ignored %n untranslated source text(s) - + + Excess context/disambiguation dropped from %n message(s). + + + + + + + Generated %n translation(s) (%1 finished and %2 unfinished) + + + + + + + Ignored %n untranslated source text(s) @@ -251,943 +346,1235 @@ Will assume a single universal form. MainWindow + MainWindow + &Phrases + &Close Phrase Book + &Edit Phrase Book + &Print Phrase Book + V&alidation + &View + Vie&ws + &Toolbars + &Help + &Translation + &File + &Edit + &Open... + Open a Qt translation source file (TS file) for editing + Ctrl+O + E&xit + Close this window and exit. + Ctrl+Q + + &Save + Save changes made to this Qt translation source file - Previous unfinished item. - - - + Move to the previous unfinished item. - Next unfinished item. - - - + Move to the next unfinished item. - Move to previous item. - - - + Move to the previous item. - Next item. - - - + Move to the next item. - Mark item as done and move to the next unfinished item. - - - + Mark this item as done and move to the next unfinished item. + Copy from source text - Toggle the validity check of accelerators. - - - + Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. - Toggle the validity check of ending punctuation. - - - + Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. + Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. - Toggle the validity check of place markers. - - - + Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. + Open Read-O&nly... + &Save All + Ctrl+S + + + Save &As... + Save As... + Save changes made to this Qt translation source file into a new file. + &Release + Create a Qt message file suitable for released applications from the current message file. + &Print... + Ctrl+P + &Undo + Recently Opened &Files + Save + Print a list of all the translation units in the current translation source file. + Undo the last editing operation performed on the current translation. + Ctrl+Z + &Redo + Redo an undone editing operation performed on the translation. + Ctrl+Y + Cu&t + Copy the selected translation text to the clipboard and deletes it. + Ctrl+X + &Copy + Copy the selected translation text to the clipboard. + Ctrl+C + &Paste + Paste the clipboard text into the translation. + Ctrl+V + Select &All + Select the whole translation text. + Ctrl+A + &Find... + Search for some text in the translation source file. + Ctrl+F + Find &Next + Continue the search where it was left. + F3 + &Prev Unfinished + Close + &Close All + Ctrl+W + Ctrl+K + &Next Unfinished + P&rev + Ctrl+Shift+K + Ne&xt + &Done and Next + Copies the source text into the translation field. + Ctrl+B + &Accelerators + &Ending Punctuation + &Phrase matches - Toggle checking that phrase suggestions are used. - - - + Place &Marker Matches + &New Phrase Book... + Create a new phrase book. + Ctrl+N + &Open Phrase Book... + Open a phrase book to assist translation. + Ctrl+H + &Reset Sorting + Sort the items back in the same order as in the message file. + &Display guesses + Set whether or not to display translation guesses. + &Statistics + Display translation statistics. + &Manual + F1 + About Qt Linguist + About Qt - Display information about the Qt toolkit by Trolltech. - - - + &What's This? + What's This? + Enter What's This? mode. + Shift+F1 + &Search And Translate... + Replace the translation on all entries that matches the search source text. + + &Batch Translation... + Batch translate all entries using the information in the phrase books. + + + Release As... - Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the .ts file. - - - + This is the application's main window. + Source text + + Index + + Context + Items + This panel lists the source contexts. + Strings + Phrases and guesses + Sources and Forms + Warnings + MOD status bar: file(s) modified + Loading... + + Loading File - Qt Linguist + The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? + %n translation unit(s) loaded. + Related files (%1);; + Open Translation Files + + File saved. + + + Release + Qt message files for released applications (*.qm) All files (*) + + File created. + + Printing... + Context: %1 + finished + unresolved + obsolete + + Printing... (page %1) + + Printing completed + + Printing aborted + Search wrapped. + + + + + + + + + + Qt Linguist + + Cannot find the string '%1'. + Search And Translate in '%1' - Qt Linguist + + + Translate - Qt Linguist + Translated %n entry(s) + No more occurrences of '%1'. Start over? + Create New Phrase Book + Qt phrase books (*.qph) All files (*) + Phrase book created. + Open Phrase Book + Qt phrase books (*.qph);;All files (*) + %n phrase(s) loaded. + + + Add to phrase book + No appropriate phrasebook found. + Adding entry to phrasebook %1 + Select phrase book to add to + Unable to launch Qt Assistant (%1) + Version %1 - <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> + + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + Do you want to save the modified files? + Do you want to save '%1'? + Qt Linguist[*] + %1[*] - Qt Linguist + + No untranslated translation units left. + &Window + Minimize + Ctrl+M + Display the manual for %1. + Display information about %1. + &Save '%1' + Save '%1' &As... + Release '%1' + Release '%1' As... + &Close '%1' + + &Close + Save All + + &Release All + Close All + Translation File &Settings for '%1'... + &Batch Translation of '%1'... + Search And &Translate in '%1'... + Search And &Translate... + + File + + Edit + + Translation + + Validation + + Help + Cannot read from phrase book '%1'. + Close this phrase book. + Enables you to add, modify, or delete entries in this phrase book. + Print the entries in this phrase book. + Cannot create phrase book '%1'. + Do you want to save phrase book '%1'? + All + Open/Refresh Form &Preview + Form Preview Tool + F5 + + Translation File &Settings... + &Add to Phrase Book + Ctrl+T + Ctrl+J + Ctrl+Shift+J + + + Previous unfinished item + + + + + Next unfinished item + + + + + Move to previous item + + + + + Next item + + + + + Mark item as done and move to the next unfinished item + + + + + Copies the source text into the translation field + + + + + Toggle the validity check of accelerators + + + + + Toggle the validity check of ending punctuation + + + + + Toggle checking that phrase suggestions are used + + + + + Toggle the validity check of place markers + + + + + Display information about the Qt toolkit by Nokia. + + + + + Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file. + + + + + Length Variants + + MessageEditor + + + This is the right panel of the main window. + + + + + Russian + + + + German + Japanese + French + Polish + Chinese + This whole panel allows you to view and edit the translation of some source text. + Source text + This area shows the source text. + Source text (Plural) + This area shows the plural form of the source text. + Developer comments + This area shows a comment that may guide you, and the context in which the text occurs. + Here you can enter comments for your own use. They have no effect on the translated applications. + %1 translation (%2) + This is where you can enter or modify the translation of the above source text. + %1 translation + %1 translator comments + '%1' Line: %2 @@ -1196,18 +1583,22 @@ Line: %2 MessageModel + Completion status for %1 + <file header> + <context comment> + <unnamed context> @@ -1215,6 +1606,7 @@ Line: %2 MsgEdit + This is the right panel of the main window. @@ -1223,87 +1615,113 @@ Line: %2 PhraseBookBox + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. + + (New Entry) + + + + %1[*] - Qt Linguist + Qt Linguist + Cannot save phrase book '%1'. + Edit Phrase Book + This window allows you to add, modify, or delete entries in a phrase book. + &Translation: + This is the phrase in the target language corresponding to the source phrase. + S&ource phrase: + This is a definition for the source phrase. + This is the phrase in the source language. + &Definition: + Click here to add the phrase to the phrase book. + &New Entry + Click here to remove the entry from the phrase book. + &Remove Entry + Settin&gs... + Click here to save the changes made. + &Save + Click here to close this window. + Close @@ -1311,14 +1729,17 @@ Line: %2 PhraseModel + Source phrase + Translation + Definition @@ -1326,18 +1747,22 @@ Line: %2 PhraseView + Insert + Edit + Guess (%1) + Guess @@ -1345,62 +1770,63 @@ Line: %2 QObject + Compiled Qt translations + Translation files (%1);; + All files (*) + + + + + + + Qt Linguist - C++ source files - - - - Java source files - - - + GNU Gettext localization files - Qt Script source files + + GNU Gettext localization template files + Qt translation sources (format 1.1) + Qt translation sources (format 2.0) + Qt translation sources (latest format) - Qt Designer form files - - - - Qt Jambi form files - - - + XLIFF localization files + Qt Linguist 'Phrase Book' @@ -1408,14 +1834,17 @@ Line: %2 SourceCodeView + <i>Source code not available</i> + <i>File %1 not available</i> + <i>File %1 not readable</i> @@ -1423,34 +1852,42 @@ Line: %2 Statistics + Statistics + Translation + Source + 0 + Words: + Characters: + Characters (with spaces): + Close @@ -1458,6 +1895,7 @@ Line: %2 TrWindow + This is the application's main window. @@ -1466,58 +1904,72 @@ Line: %2 TranslateDialog + This window allows you to search for some text in the translation source file. + Type in the text to search for. + Find &source text: + &Translate to: + Search options + Texts such as 'TeX' and 'tex' are considered as different when checked. + Match &case + Mark new translation as &finished + Click here to find the next occurrence of the text you typed in. + Find Next + Translate + Translate All + Click here to close this window. + Cancel @@ -1525,26 +1977,33 @@ Line: %2 TranslationSettingsDialog + Any Country + + Settings for '%1' - Qt Linguist + Source language + Language + Country/Region + Target language diff --git a/translations/qt_fr.ts b/translations/qt_fr.ts index 56a9e0e..1dd80be 100644 --- a/translations/qt_fr.ts +++ b/translations/qt_fr.ts @@ -39,15 +39,15 @@ local audio file: - Fichier audio local: + Fichier audio local : local video file: - Fichier vidéo local: + Fichier vidéo local : remote media URL: - URL distante : + URL distante : run tests @@ -69,11 +69,11 @@ FakeReply Fake error ! - Fausse erreur! + Fausse erreur ! Invalid URL - URL non valide + URL invalide @@ -96,7 +96,7 @@ Preferences... - Préférences… + Préférences... Quit %1 @@ -115,7 +115,7 @@ Location: - Emplacement: + Emplacement : @@ -224,13 +224,13 @@ so on. Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. Some video features have been disabled. - Attention: Vous n'avez apparemment pas installé le paquet gstreamer0.10-plugins-good. + Attention : Vous n'avez apparemment pas installé le paquet gstreamer0.10-plugins-good. Des fonctionnalités vidéo ont été desactivées. Warning: You do not seem to have the base GStreamer plugins installed. All audio and video support has been disabled - Attention: Vous n'avez apparemment pas installées les plugins de base de GStreamer. + Attention : Vous n'avez apparemment pas installées les plugins de base de GStreamer. Le support audio et vidéo est désactivé @@ -286,7 +286,7 @@ have libgstreamer-plugins-base installed. A required codec is missing. You need to install the following codec(s) to play this content: %0 - Un codec requis est manquant. Vous devez installer le codec suivant pour jouer le contenu: %0 + Un codec requis est manquant. Vous devez installer le codec suivant pour jouer le contenu : %0 Could not open media source. @@ -371,7 +371,7 @@ d'avoir installé libgstreamer-plugins-base. Access denied - Accès refusé + Autorisation refusée Could not connect @@ -407,11 +407,11 @@ d'avoir installé libgstreamer-plugins-base. Invalid protocol - Protocole non valide + Protocole invalide Invalid URL - URL non valide + URL invalide Multicast error @@ -465,6 +465,14 @@ d'avoir installé libgstreamer-plugins-base. Erreur lors de l'ouverture de l'URL + Error opening resource + erreur lors de l'ouverture de la ressource + + + Error opening source: resource not opened + erreur lors de l'ouverture de la source : ressource non ouverte + + Setting volume failed Le réglage du volume a échoué @@ -585,11 +593,19 @@ d'avoir installé libgstreamer-plugins-base. Phonon::MMF::MediaObject Error opening source: type not supported - Erreur lors de l'ouverture de la source: type non supporté + Erreur lors de l'ouverture de la source : type non supporté + + + Error opening source: resource is compressed + Erreur lors de l'ouverture de la source : ressource compressée + + + Error opening source: resource not valid + Erreur lors de l'ouverture de la source : ressource invalide Error opening source: media type could not be determined - Erreur lors de l'ouverture de la source: type de média non déterminé + Erreur lors de l'ouverture de la source : type de média non déterminé @@ -637,7 +653,7 @@ d'avoir installé libgstreamer-plugins-base. Phonon::VolumeSlider Volume: %1% - Volume: %1% + Volume : %1% Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% @@ -730,15 +746,15 @@ d'avoir installé libgstreamer-plugins-base. Look &in: - Chercher &dans : + Chercher &dans : File &name: - &Nom de fichier : + &Nom de fichier : File &type: - &Type de fichier : + &Type de fichier : Back @@ -910,7 +926,7 @@ d'avoir installé libgstreamer-plugins-base. Directory: - Dossier : + Dossier : Error @@ -922,7 +938,7 @@ File not found. Check path and filename. %1 Impossible de trouver le fichier. -Vérifier le chemin et le nom du fichier. +Vérifiez le chemin et le nom du fichier. All Files (*.*) @@ -1122,7 +1138,7 @@ en Q3ToolBar More... - Reste... + Plus... @@ -1284,7 +1300,7 @@ en COM &Object: - &Objet COM : + &Objet COM : @@ -1306,31 +1322,31 @@ en QColorDialog Hu&e: - &Teinte : + &Teinte : &Sat: - &Saturation : + &Saturation : &Val: - &Valeur : + &Valeur : &Red: - &Rouge : + &Rouge : &Green: - &Vert : + &Vert : Bl&ue: - Ble&u : + Ble&u : A&lpha channel: - Canal a&lpha : + Canal a&lpha : Select Color @@ -1389,7 +1405,7 @@ en %1: permission denied QSystemSemaphore - %1: permission refusée + %1 : permission refusée %1: already exists @@ -1399,7 +1415,7 @@ en %1: doesn't exists QSystemSemaphore - %1: n'existe pas + %1 : n'existe pas %1: does not exist @@ -1433,31 +1449,31 @@ en %1: key is empty - %1: clé vide + %1 : clé vide %1: unable to make key - %1: impossible de créer la clé + %1 : impossible de créer la clé %1: ftok failed - %1: ftok a échoué + %1 : ftok a échoué %1: already exists - %1: existe déjà + %1 : existe déjà %1: does not exist - %1: n'existe pas + %1 : n'existe pas %1: out of resources - %1: plus de ressources disponibles + %1 : plus de ressources disponibles %1: unknown error %2 - %1: erreur inconnue %2 + %1 : erreur inconnue %2 @@ -1487,7 +1503,7 @@ en Unable to prepare statement - Impossible de prépare la requête + Impossible de préparer la requête Unable to bind variable @@ -1575,7 +1591,7 @@ en Cannot anchor to a null item. - impossible d'ancrer à un élément nul. + Impossible d'ancrer à un élément nul. Cannot anchor a horizontal edge to a vertical edge. @@ -1620,10 +1636,10 @@ en - QDeclarativeCompiledBindings + QDeclarativeBindings Binding loop detected for property "%1" - + Boucle détectée dans l'affectation pour la propriété "%1" @@ -1654,11 +1670,15 @@ en Invalid property assignment: float expected - Affectation de propriété invalide : float attendu + Affectation de propriété invalide : float attendu Invalid property assignment: double expected - Affectation de propriété invalide : double attendu + Affectation de propriété invalide : double attendu + + + Invalid property assignment: number expected + Affectation de propriété invalide : nombre attendu Invalid property assignment: color expected @@ -1706,238 +1726,245 @@ en Component elements may not contain properties other than id - Les éléments du composant ne peuvent pas contenir des propriétés autres que id + Les éléments du composant ne peuvent pas contenir des propriétés autres que id Invalid component id specification - L'ID de composant spécifiée n'est pas valide + L'id de composant spécifiée n'est pas valide id is not unique - l'ID n'est pas unique + l'id n'est pas unique Invalid component body specification - Le corps de la spécification du composant n'est pas valide + Le corps de la spécification du composant n'est pas valide Component objects cannot declare new properties. - Les objets composants ne peuvent pas déclarer de nouvelles propriétés. + Les objets composants ne peuvent pas déclarer de nouvelles propriétés. Component objects cannot declare new signals. - Les objets composants ne peuvent pas déclarer de nouveaux signaux. + Les objets composants ne peuvent pas déclarer de nouveaux signaux. Component objects cannot declare new functions. - Les objets composants ne peuvent pas déclarer de nouvelles fonctions. + Les objets composants ne peuvent pas déclarer de nouvelles fonctions. Cannot create empty component specification - Impossible de créer une spécification du composant vide + Impossible de créer une spécification du composant vide Incorrectly specified signal assignment - L'affectation du signal est ncorrectement spécifiée + L'affectation du signal est incorrectement spécifiée Cannot assign a value to a signal (expecting a script to be run) - Impossible d'assigner une valeur à un signal (celà exige d'éxécuter un script) + Impossible d'assigner une valeur à un signal (un script à exécuter est attendu) Empty signal assignment - Signal d'affectation vide + Affectation de signal vide Empty property assignment - Propriété d'affectation vide + Affectation de propriété vide Attached properties cannot be used here - La configuration spécifiée ne peut être utilisée.ici + La configuration spécifiée ne peut être utilisée ici. Non-existent attached object - Objet attaché non existant + Objet attaché inexistant Invalid attached object assignment - L'affectation de l'objet attaché est invalide + L'affectation de l'objet attaché est invalide Cannot assign to non-existent default property - Impossible d'attacher à une propriété par défaut non existante + Impossible d'attacher à une propriété par défaut inexistante Cannot assign to non-existent property "%1" - Impossible d'attacher à une propriété non existante "%1" + Impossible d'attacher à une propriété inexistante "%1" Invalid use of namespace - Utilisation invalide d'espace de noms + Utilisation invalide d'espace de noms Not an attached property name - Ce n'est pas un nom de propriété attachée + Ce n'est pas un nom de propriété attachée Invalid use of id property - Utilisation invalide de la propriété id + Utilisation invalide de la propriété id Property has already been assigned a value - Une valeur a déjà été attribuée à la propriété + Une valeur a déjà été attribuée à la propriété Invalid grouped property access - Accès invalide à une propriété groupée + Accès invalide à une propriété groupée Cannot assign a value directly to a grouped property - Impossible d'assigner directement une valeur à une propriété groupée + Impossible d'assigner directement une valeur à une propriété groupée Invalid property use - La propriété utilisée est invalide + La propriété utilisée est invalide Property assignment expected - Propriété d'affectation attendue + Affectation de propriété attendue Single property assignment expected - Une seule propriété d'affectation est attendue + Une seule affectation de propriété est attendue Unexpected object assignment - Affectation d'objet innatendue + Affectation d'objet inattendue Cannot assign object to list - Impossible d'assigner un objet à une liste + Impossible d'assigner un objet à une liste Can only assign one binding to lists - Un seul lien peut être assigné à des listes + Un seul lien peut être assigné à des listes Cannot assign primitives to lists - Impossible d'assigner des primitives à des listes + Impossible d'assigner des primitives à des listes Cannot assign multiple values to a script property - Impossible d'assigner plusieurs valeurs à une propriété de script + Impossible d'assigner plusieurs valeurs à une propriété de script Invalid property assignment: script expected - Propriété d'affectation invalide: script attendu + Affectation de propriété invalide : script attendu Cannot assign object to property - Impossible d'assigner un objet à une propriété + Impossible d'assigner un objet à une propriété "%1" cannot operate on "%2" - "%1" ne peut pas fonctionner sur "%2" + "%1" ne peut pas opérer sur "%2" Duplicate default property - Propriété par défaut en double + Propriété par défaut en double Duplicate property name - Nom de propriété en double + Nom de propriété en double Property names cannot begin with an upper case letter - Les noms des propriétés ne peuvent pas commencer par une majuscule + Les noms des propriétés ne peuvent pas commencer par une majuscule + + + Illegal property name + Nom de propriété invalide Duplicate signal name - Nom de signal en double + Nom de signal en double Signal names cannot begin with an upper case letter - Les noms de signaux ne peuvent pas commencer par une majuscule + Les noms de signaux ne peuvent pas commencer par une majuscule + + + Illegal signal name + Nom de signal invalide Duplicate method name - Nom de méthode en double + Nom de méthode en double Method names cannot begin with an upper case letter - Les noms des méthodes ne peuvent pas commencer par une majuscule + Les noms des méthodes ne peuvent pas commencer par une majuscule + + + Illegal method name + Nom de méthode invalide Property value set multiple times - Valeur de propriété attribuée plusieurs fois + Valeur de propriété attribuée plusieurs fois Invalid property nesting - Propriété d'emboîtement invalide + Imbrication de propriété invalide Cannot override FINAL property - Impossible de remplacer la propriété FINAL + Impossible de remplacer la propriété FINAL Invalid property type - Type de propriété invalide + Type de propriété invalide Invalid empty ID - ID vide non valide + id vide invalide IDs cannot start with an uppercase letter - Les IDs ne peuvent pas commencer par une majuscule + Les ids ne peuvent pas commencer par une majuscule IDs must start with a letter or underscore - Les IDs doivent commencer par une lettre ou un souligné + Les ids doivent commencer par une lettre ou un tiret bas IDs must contain only letters, numbers, and underscores - Les IDs ne peuvent contenir que des lettres, des nombres ou des soulignés + Les ids ne peuvent contenir que des lettres, des nombres ou des tirets bas ID illegally masks global JavaScript property - ID masque illégalement la propriété JavaScript globale - - - No property alias location - ?? - La propriété de l'alias n'a pas d'emplacement + id masque illégalement la propriété JavaScript globale - Invalid alias location - Emplacement d'alias invalide + + L'alias de propriété n'a pas d'emplacement Invalid alias reference. An alias reference must be specified as <id> or <id>.<property> - Référence d'alias invalide. La référence d'alias doit être spécifiée comme <id> ou <id>.<property> + Référence d'alias invalide. Les références d'alias doivent être spécifiées comme <id> ou <id>.<property> Invalid alias reference. Unable to find id "%1" - Référence d'alias invalide. Impossible de trouver l'id "%1" + Référence d'alias invalide. Impossible de trouver l'id "%1" QDeclarativeComponent Invalid empty URL - URL vide non valide + URL vide invalide QDeclarativeCompositeTypeManager Resource %1 unavailable - La ressource %1 n'est pas disponible + La ressource %1 n'est pas disponible Namespace %1 cannot be used as a type - L'espace de noms %1 ne peut pas être utilisé comme un type + L'espace de noms %1 ne peut pas être utilisé comme un type %1 %2 @@ -1945,130 +1972,130 @@ en Type %1 unavailable - Le type %1 n'est pas disponible + Le type %1 n'est pas disponible QDeclarativeConnections Cannot assign to non-existent property "%1" - Imposible d'assigner à la propriété inexistante "%1" + Imposible d'assigner à la propriété inexistante "%1" Connections: nested objects not allowed - Connexions: les éléments imbriqués ne sont pas autorisés + Connexions : les éléments imbriqués ne sont pas autorisés Connections: syntax error - Connexions: erreur de syntaxe + Connexions : erreur de syntaxe Connections: script expected - Connexions: script attendu + Connexions : script attendu QDeclarativeEngine executeSql called outside transaction() - executeSql a été 1.appelé en dehors de transaction() + executeSql a été appelé en dehors de transaction() Read-only Transaction - Transaction en lecture seule + Transaction en lecture seule Version mismatch: expected %1, found %2 - Version incompatible:%1 attendue, %2 trouvée + Version incompatible : %1 attendue, %2 trouvée SQL transaction failed - la transaction SQL a échouée + la transaction SQL a échouée transaction: missing callback - transaction: le rappel est absent + transaction : la fonction de rappel est absente SQL: database version mismatch - SQL: la version de la base de données est incompatible + SQL : la version de la base de données est incompatible QDeclarativeFlipable front is a write-once property - avant est une propriété à écriture unique + front est une propriété à écriture unique back is a write-once property - arrière est une propriété à écriture unique + back est une propriété à écriture unique QDeclarativeImportDatabase module "%1" definition "%2" not readable - La définition "%2" du module "%1% n'est pas lisible + la définition "%2" du module "%1% n'est pas lisible plugin cannot be loaded for module "%1": %2 - Impossible de charger le plugin pour le module "%1": %2 + impossible de charger le plugin pour le module "%1" : %2 module "%1" plugin "%2" not found - Le plugin "%2" du module "%1" n'a pas été trouvé + le plugin "%2" du module "%1" n'a pas été trouvé module "%1" version %2.%3 is not installed - la version %2.%3 du module "%1" n'est pas installée + la version %2.%3 du module "%1" n'est pas installée module "%1" is not installed - le module "%1" n'est pas installé + le module "%1" n'est pas installé "%1": no such directory - "%1": le répertoire n'existe pas + "%1" : le répertoire n'existe pas import "%1" has no qmldir and no namespace - l'importation "%1" n'a pas de qmldir ni d'espace de noms + l'importation "%1" n'a pas de qmldir ni d'espace de noms - %1 is not a namespace - - %1 n'est pas un espace de noms + - %1 n'est pas un espace de noms - nested namespaces not allowed - - les espaces de noms imbriqués ne sont pas autorisés + - les espaces de noms imbriqués ne sont pas autorisés local directory - répertoire local + répertoire local is ambiguous. Found in %1 and in %2 - est ambigu. Trouvé dans %1 et dans %2 + est ambigu. Trouvé dans %1 et dans %2 is ambiguous. Found in %1 in version %2.%3 and %4.%5 - est ambigu. Trouvé dans %1 dans les versions %2.%3 et %4.%5 + est ambigu. Trouvé dans %1 dans les versions %2.%3 et %4.%5 is instantiated recursively - est instancié récursivement + est instancié récursivement is not a type - n'est pas un type + n'est pas un type QDeclarativeKeyNavigationAttached KeyNavigation is only available via attached properties - + KeyNavigation est disponible uniquement via les propriétés attachées @@ -2076,331 +2103,345 @@ en Keys is only available via attached properties Keys, a verifier - Keys est disponible uniquement via les propriétés attachées + Keys est disponible uniquement via les propriétés attachées QDeclarativeListModel remove: index %1 out of range - supprimer: l'inder %1 est hors de la plage de valeurs admissible + remove : l'index %1 est hors de la plage de valeurs admissibles insert: value is not an object - insérer: une valeur n'est pas un objet + insert : une valeur n'est pas un objet insert: index %1 out of range - insérer: l'inder %1 est hors de la plage de valeurs admissible + insert : l'index %1 est hors de la plage de valeurs admissibles move: out of range - Déplacer: hors de la plage de valeurs admissible + move : hors de la plage de valeurs admissibles append: value is not an object - ajouter: une valeur n'est pas un objet + append : une valeur n'est pas un objet set: value is not an object - attribuer: une valeur n'est pas un objet + set : une valeur n'est pas un objet set: index %1 out of range - attribuer: l'index %1 est hors de la plage de valeurs admissible + set : l'index %1 est hors de la plage de valeurs admissible ListElement: cannot contain nested elements - ListElement: ne peut pas contenir des éléments imbriqués + ListElement : ne peut pas contenir des éléments imbriqués ListElement: cannot use reserved "id" property - ListElement: ne peut pas utiliser la propriété réservée "id" + ListElement : ne peut pas utiliser la propriété réservée "id" ListElement: cannot use script for property value - ListElement: ne peut pas utiliser script comme valeur pour une propriété + ListElement : ne peut pas utiliser script comme valeur pour une propriété ListModel: undefined property '%1' - ListModel: propriété indéfinie '%1' + ListModel : propriété indéfinie '%1' QDeclarativeLoader Loader does not support loading non-visual elements. - Le chargeur n'est pas compatible avec le chargement d'éléments non-visuels. + Le chargeur n'est pas compatible avec le chargement d'éléments non-visuels. QDeclarativeParentAnimation Unable to preserve appearance under complex transform - Impossible de conserver l'aspect lors d'une transformation complexe + Impossible de conserver l'aspect lors d'une transformation complexe Unable to preserve appearance under non-uniform scale - Impossible de conserver l'aspect lors d'une mise à l'échelle non uniforme + Impossible de conserver l'aspect lors d'une mise à l'échelle non uniforme Unable to preserve appearance under scale of 0 - Impossible de conserver l'aspect lors d'une mise à l'échelle égale à 0 + Impossible de conserver l'aspect lors d'une mise à l'échelle égale à 0 QDeclarativeParentChange Unable to preserve appearance under complex transform - Impossible de conserver l'aspect lors d'une transformation complexe + Impossible de conserver l'aspect lors d'une transformation complexe Unable to preserve appearance under non-uniform scale - Impossible de conserver l'aspect lors d'une mise à l'échelle non uniforme + Impossible de conserver l'aspect lors d'une mise à l'échelle non uniforme Unable to preserve appearance under scale of 0 - Impossible de conserver l'aspect lors d'une mise à l'échelle égale à 0 + Impossible de conserver l'aspect lors d'une mise à l'échelle égale à 0 QDeclarativeParser Illegal unicode escape sequence - séquence d'échappement unicode illégale + Séquence d'échappement Unicode illégale Illegal character - caractère illégal + Caractère illégal Unclosed string at end of line - chaîne de caractères non fermée en fin de ligne + Chaîne de caractères non fermée en fin de ligne Illegal escape squence - séquence d'échappement illégale + Séquence d'échappement illégale Unclosed comment at end of file - commentaire non fermé en fin de ligne + Commentaire non fermé en fin de ligne Illegal syntax for exponential number - syntaxe illégale pour un nombre exponentiel + Syntaxe illégale pour un nombre exponentiel Identifier cannot start with numeric literal - ??? - impossible de commencer un identifiant par un littéral numérique + Impossible de commencer un identifiant par un chiffre Unterminated regular expression literal - littéral non terminé pour l'expression régulière + Élément non terminé pour l'expression régulière Invalid regular expression flag '%0' - drapeau '%0' invalid pour l'expression régulière + Drapeau '%0' invalid pour l'expression régulière Unterminated regular expression backslash sequence - séquence antislash non terminée pour l'expression régulière + Séquence antislash non terminée pour l'expression régulière Unterminated regular expression class - class non terminé pour l'expression régulière + Classe non terminée pour l'expression régulière Syntax error - Erreur de syntaxe + Erreur de syntaxe Unexpected token `%1' - jeton inattendu '%1' + jeton inattendu '%1' Expected token `%1' - jeton attendu '%1' + jeton attendu '%1' Property value set multiple times - valeur de propriété attribuée à plusieurs reprises + valeur de propriété attribuée à plusieurs reprises Expected type name - Nom de type attendu + Nom de type attendu Invalid import qualifier ID - qualificatif ID d'importation invalide + qualificatif id d'importation invalide Reserved name "Qt" cannot be used as an qualifier - "Qt" est un nom réservé et ne peut pas être utilisé comme qualificatif + "Qt" est un nom réservé et ne peut pas être utilisé comme qualificatif Script import qualifiers must be unique. ?? - Les qualificatifs d'importation de script doivent être uniques. + Les qualificatifs d'importation de script doivent être uniques. Script import requires a qualifier - L'importation de script exige un qualificatif + L'importation de script exige un qualificatif Library import requires a version - L'importation de bibliothèque exige une version + L'importation de bibliothèque exige une version Expected parameter type - Type de paramètre attendu + Type de paramètre attendu Invalid property type modifier - Modificateur invalide pour le type de propriété + Modificateur invalide pour le type de propriété Unexpected property type modifier - Modificateur innatendu pour le type de propriété + Modificateur inattendu pour le type de propriété Expected property type - Type de propriété attendue + Type de propriété attendu Readonly not yet supported - La lecture seule n'est pas encore implémentée + La lecture seule n'est pas encore implémentée JavaScript declaration outside Script element - Déclaration JavaScript en edhors de l'élément Script + Déclaration JavaScript en dehors de l'élément Script QDeclarativePauseAnimation Cannot set a duration of < 0 - Impossible d'attribuer une durée < 0 + Impossible d'attribuer une durée < 0 + + + + QDeclarativePixmap + + Error decoding: %1: %2 + Erreur de décodage : %1 : %2 + + + Failed to get image from provider: %1 + Impossible d'obtenir l'image du fournisseur : %1 + + + Cannot open: %1 + Impossible d'ouvrir : %1 QDeclarativePixmapCache Error decoding: %1: %2 - Erreur de décodage: %1: %2 + Erreur de décodage : %1 : %2 Failed to get image from provider: %1 - Impossible d'obtenir l'image du fournisseur: %1 + Impossible d'obtenir l'image du fournisseur : %1 Cannot open: %1 - Impossible d'ouvrir: %1 + Impossible d'ouvrir : %1 Unknown Error loading %1 - Erreur de chargement inconnue: %1 + Erreur de chargement inconnue : %1 QDeclarativePropertyAnimation Cannot set a duration of < 0 - Impossible d'attribuer une durée < 0 + Impossible d'attribuer une durée < 0 QDeclarativePropertyChanges PropertyChanges does not support creating state-specific objects. - PropertyChanges n'est pas compatible avec la création d'objets spécifiques à un état. + PropertyChanges n'est pas compatible avec la création d'objets spécifiques à un état. Cannot assign to non-existent property "%1" - Ne peut pas assigner à la propriété inexistante "%1" + Ne peut pas assigner à la propriété inexistante "%1" Cannot assign to read-only property "%1" - Ne peut pas assigner à la propriété en lecture seule "%1" + Ne peut pas assigner à la propriété en lecture seule "%1" QDeclarativeTextInput Could not load cursor delegate - Impossible de charger le curseur délégué + Impossible de charger le délégué de curseur Could not instantiate cursor delegate - Impossible d'instancier le curseur délégué + Impossible d'instancier le délégué de curseur QDeclarativeVME Unable to create object of type %1 - Impossible de créer un objet de type %1 + Impossible de créer un objet de type %1 Cannot assign value %1 to property %2 - Impossible d'assigner la valeur %1 à la propriété %2 + Impossible d'assigner la valeur %1 à la propriété %2 Cannot assign object type %1 with no default method - Impossible d'assigner un objet de type %1 sans méthode défaut + Impossible d'assigner un objet de type %1 sans méthode par défaut Cannot connect mismatched signal/slot %1 %vs. %2 le vs a confirmer - Impossible de connecter le signal/slot %1 %vs. %2 pour cause d'incompatibilité + Impossible de connecter le signal/slot %1 %vs. %2 pour cause d'incompatibilité Cannot assign an object to signal property %1 - NImpossible d'assigner un objet à la propriété %1 d'un signal + Impossible d'assigner un objet à la propriété %1 d'un signal Cannot assign object to list - Impossible d'assigner un objet à une liste + Impossible d'assigner un objet à une liste Cannot assign object to interface property - Impossible d'assigner un objet à la propriété d'une interface + Impossible d'assigner un objet à la propriété d'une interface Unable to create attached object - Impossible de créer un object attaché + Impossible de créer un objet attaché Cannot set properties on %1 as it is null - Impossible d'attribuer les propriétés à %1 car ce dernier est nul + Impossible d'attribuer les propriétés à %1 car ce dernier est nul QDeclarativeVisualDataModel Delegate component must be Item type. - Un composant délégué doit être de type Item. + Un composant délégué doit être de type Item. QDeclarativeXmlListModel Qt was built without support for xmlpatterns - Qt a été généré sans support pour xmlpatterns + Qt a été compilé sans support pour xmlpatterns QDeclarativeXmlListModelRole An XmlRole query must not start with '/' - Une requête XmlRole ne doit pas commencer par '/' + Une requête XmlRole ne doit pas commencer par '/' QDeclarativeXmlRoleList An XmlListModel query must start with '/' or "//" - Une requête XmlListModel doit commencer par '/' ou "//" + Une requête XmlListModel doit commencer par '/' ou "//" @@ -2415,7 +2456,7 @@ en SliderHandle - Poignée + Poignée du slider @@ -2599,15 +2640,15 @@ en Debug Message: - Message de débogage: + Message de débogage : Warning: - Avertissement: + Avertissement : Fatal Error: - Erreur fatale: + Erreur fatale : @@ -2638,7 +2679,7 @@ en Will not rename sequential file using block copy - Ne renommera pas le fichier séquentiel avec la copie bloc + Ne renommera pas le fichier séquentiel avec la copie par blocs @@ -2714,11 +2755,11 @@ Veuillez vérifier que le nom du fichier est correct. Files of type: - Fichiers de type : + Fichiers de type : Directory: - Dossier : + Dossier : @@ -2744,7 +2785,7 @@ Voulez-vous quand même le supprimer ? Are sure you want to delete '%1'? - Etes-vous sûr de vouloir supprimer '%1' ? + Êtes-vous sûr de vouloir supprimer '%1' ? Could not delete directory. @@ -2820,11 +2861,11 @@ Voulez-vous quand même le supprimer ? File &name: - &Nom de fichier : + &Nom de fichier : Look in: - Voir dans: + Voir dans : Create New Folder @@ -2956,11 +2997,11 @@ Voulez-vous quand même le supprimer ? Demi Bold - Semi Gras + Demi-gras Black - Noir + Extra-gras Demi @@ -2968,7 +3009,7 @@ Voulez-vous quand même le supprimer ? Light - Léger + Maigre Italic @@ -3012,11 +3053,11 @@ Voulez-vous quand même le supprimer ? Thaana - Thaana + Thâna Devanagari - Devanagari + Dévanagari Bengali @@ -3036,7 +3077,7 @@ Voulez-vous quand même le supprimer ? Tamil - Tamil + Tamoul Telugu @@ -3176,11 +3217,11 @@ Voulez-vous quand même le supprimer ? Connection to %1 closed - Connexion à %1 arrêtée + Connexion à %1 fermée Connection closed - Connexion arrêtée + Connexion fermée Host %1 not found @@ -3207,7 +3248,7 @@ Voulez-vous quand même le supprimer ? Login failed: %1 - Échec du login: + Échec du login : %1 @@ -3299,7 +3340,7 @@ Voulez-vous quand même le supprimer ? Invalid hostname - Nom d'hôte non valide + Nom d'hôte invalide @@ -3338,11 +3379,11 @@ Voulez-vous quand même le supprimer ? Connection to %1 closed - Connexion à %1 arrêtée + Connexion à %1 fermée Connection closed - Connexion arrêtée + Connexion fermée Unknown error @@ -3402,7 +3443,7 @@ Voulez-vous quand même le supprimer ? SSL handshake failed - le handshake SSL a échoué + La poignée de main SSL a échoué Connection refused (or timed out) @@ -3429,7 +3470,7 @@ Voulez-vous quand même le supprimer ? Proxy denied connection - Le Proxy a rejeté la connexion + Le proxy a rejeté la connexion Error communicating with HTTP proxy @@ -3546,7 +3587,7 @@ Voulez-vous quand même le supprimer ? QIODevice Permission denied - Accès refusé + Autorisation refusée Too many open files @@ -3596,22 +3637,22 @@ Voulez-vous quand même le supprimer ? QInputDialog Enter a value: - Entrer une valeur : + Entrer une valeur : QLibrary QLibrary::load_sys: Cannot load %1 (%2) - QLibrary::load_sys: Impossible de charger %1 (%2) + QLibrary::load_sys : Impossible de charger %1 (%2) QLibrary::unload_sys: Cannot unload %1 (%2) - QLibrary::unload_sys: Impossible de décharger %1 (%2) + QLibrary::unload_sys : Impossible de décharger %1 (%2) QLibrary::resolve_sys: Symbol "%1" undefined in %2 (%3) - QLibrary::resolve_sys: Symbole "%1" non défini dans %2 (%3) + QLibrary::resolve_sys : Symbole "%1" non défini dans %2 (%3) Could not mmap '%1': %2 @@ -3697,58 +3738,58 @@ Voulez-vous quand même le supprimer ? QLocalServer %1: Name error - %1: Erreur de nom + %1 : Erreur de nom %1: Permission denied - %1: Permission refusée + %1 : Permission refusée %1: Address in use - %1: Address déjà utilisée + %1 : Address déjà utilisée %1: Unknown error %2 - %1: Erreur inconnue %2 + %1 : Erreur inconnue %2 QLocalSocket %1: Connection refused - %1: Connexion refusée + %1 : Connexion refusée %1: Remote closed - %1: Connexion fermée + %1 : Connexion fermée %1: Invalid name - %1: Nom invalide + %1 : Nom invalide %1: Socket access error - %1: Erreur d'accès au socket + %1 : Erreur d'accès au socket %1: Socket resource error - %1: Erreur de ressource du socket + %1 : Erreur de ressource du socket %1: Socket operation timed out - %1: L'opération socket a expiré + %1 : L'opération socket a expiré %1: Datagram too large - %1: Datagramme trop grand + %1 : Datagramme trop grand %1: Connection error - %1: Erreur de connexion + %1 : Erreur de connexion %1: The socket operation is not supported - %1: L'opération n'est pas supportée + %1 : L'opération n'est pas supportée %1: Unknown error @@ -3756,7 +3797,7 @@ Voulez-vous quand même le supprimer ? %1: Unknown error %2 - %1: Erreur inconnue %2 + %1 : Erreur inconnue %2 @@ -3932,10 +3973,6 @@ Voulez-vous quand même le supprimer ? The file could not be accessed. Impossible d'accéder au fichier. - - Playlist format is not supported. - - QMenu @@ -3956,7 +3993,7 @@ Voulez-vous quand même le supprimer ? QMenuBar About - A propos + À propos Config @@ -3988,7 +4025,7 @@ Voulez-vous quand même le supprimer ? About %1 - A propos de %1 + À propos de %1 About Qt @@ -4027,7 +4064,7 @@ Voulez-vous quand même le supprimer ? <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qt.nokia.com/">qt.nokia.com/</a> for more information.</p> - <h3>A propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'applications multi-platformes.</p><p>Qt fournit la portabilité du code source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et toutes les variantes commerciales majeures d'Unix. Qt est aussi disponible pour les systèmes embarqués sous le nom Qtopia Core.</p><p>Qt est un produit de Trolltech. <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> + <h3>À propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'applications multi-platformes.</p><p>Qt fournit la portabilité du code source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et toutes les variantes commerciales majeures d'Unix. Qt est aussi disponible pour les systèmes embarqués sous le nom Qtopia Core.</p><p>Qt est un produit de Trolltech. <a href="http : //qt.nokia.com/">qt.nokia.com</a> for more information.</p> Show Details... @@ -4039,19 +4076,19 @@ Voulez-vous quand même le supprimer ? <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - <h3>À propos de Qt</h3><p>Ce programme utilise Qt version %1.</p><p>Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.</p><p>Qt fournit une portabilité source unique pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés tels que Qt pour Embedded Linux et Qt pour Windows CE.</p><p>Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.</p><p>Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.</p><p>Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.</p><p>Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.</p><p>Veuillez consulter<a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> pour un aperçu des concessions de licences Qt.</p><p>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</p><p>Qt est un produit Nokia. Voir <a href="http://qt.nokia.com/">qt.nokia.com</a> pour de plus amples informations.</p> + <h3>À propos de Qt</h3><p>Ce programme utilise Qt version %1.</p><p>Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.</p><p>Qt fournit une portabilité source unique pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés comme Qt pour Embedded Linux et Qt pour Windows CE.</p><p>Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.</p><p>Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.</p><p>Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.</p><p>Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.</p><p>Veuillez consulter<a href="http : //qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> pour un aperçu des concessions de licences Qt.</p><p>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</p><p>Qt est un produit Nokia. Voir <a href="http : //qt.nokia.com/">qt.nokia.com</a> pour de plus amples informations.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - <h3>A propos de Qt</h3>%1<p>Qt est un framework de développement d'applications multi-plateforme.</p><p>Qt fournit la portabilité du code source surMS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, et toutes les variantes majeures d'Unix. Qt est aussi disponible pour l'embarqué avec Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt est un produit de Nokia. Allez à <a href="http://qt.nokia.com/">qt.nokia.com</a> pour plus d'informations.</p> + <h3>À propos de Qt</h3>%1<p>Qt est un framework de développement d'applications multi-plateforme.</p><p>Qt fournit la portabilité du code source surMS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, et toutes les variantes majeures d'Unix. Qt est aussi disponible pour l'embarqué avec Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt est un produit de Nokia. Allez à <a href="http : //qt.nokia.com/">qt.nokia.com</a> pour plus d'informations.</p> <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qt.nokia.com/company/model/">qt.nokia.com/company/model/</a> for an overview of Qt licensing.</p> - <p>Ce programme utilise Qt Open Source Edition version %1.</p><p>Qt Open Source Edition est prévu pour le développement d'applications Open Source. Vous devez avoir un license commerciale de Qt pour développer des applications propiétaires (Closed Source).</p><p>Vous pouvez aller sur <a href="http://qt.nokia.com/company/model/">qt.nokia.com/company/model/</a> pour plus d'informations sur les licenses Qt.</p> + <p>Ce programme utilise Qt Open Source Edition version %1.</p><p>Qt Open Source Edition est prévu pour le développement d'applications Open Source. Vous devez avoir un license commerciale de Qt pour développer des applications propiétaires (Closed Source).</p><p>Vous pouvez aller sur <a href="http : //qt.nokia.com/company/model/">qt.nokia.com/company/model/</a> pour plus d'informations sur les licenses Qt.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt Embedded.</p><p>Qt is a Trolltech product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - <h3>A propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'application multi-plateforme.</p><p>Qt fournit la portabilité de votre source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, toutes les variantes majeures d'Unix. Qt est aussi disponible pour les périphériques embarqués avec Qt Embedded.</p><p>Qt est un produit de Trolltech. Voir <a href="http://qt.nokia.com/">qt.nokia.com</a> pour plus d'informations.</p> + <h3>À propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'application multi-plateforme.</p><p>Qt fournit la portabilité de votre source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, toutes les variantes majeures d'Unix. Qt est aussi disponible pour les périphériques embarqués avec Qt Embedded.</p><p>Qt est un produit de Trolltech. Voir <a href="http : //qt.nokia.com/">qt.nokia.com</a> pour plus d'informations.</p> <h3>About Qt</h3><p>This program uses Qt version %1.</p> @@ -4059,7 +4096,7 @@ Voulez-vous quand même le supprimer ? <p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - <p>Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.</p><p>Qt fournit une portabilité source unique pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés tels que Qt pour Embedded Linux et Qt pour Windows CE.</p><p>Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.</p><p>Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.</p><p>Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.</p><p>Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.</p><p>Veuillez consulter<a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> pour un aperçu des concessions de licences Qt.</p><p>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</p><p>Qt est un produit Nokia. Voir <a href="http://qt.nokia.com/">qt.nokia.com</a> pour de plus amples informations.</p> + <p>Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.</p><p>Qt fournit une portabilité source unique pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés comme Qt pour Embedded Linux et Qt pour Windows CE.</p><p>Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.</p><p>Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.</p><p>Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.</p><p>Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.</p><p>Veuillez consulter<a href="http : //qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> pour un aperçu des concessions de licences Qt.</p><p>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</p><p>Qt est un produit Nokia. Voir <a href="http : //qt.nokia.com/">qt.nokia.com</a> pour de plus amples informations.</p> @@ -4112,7 +4149,7 @@ Voulez-vous quand même le supprimer ? Permission denied - Accès refusé + Autorisation refusée Connection timed out @@ -4209,7 +4246,7 @@ Voulez-vous quand même le supprimer ? QNetworkAccessDebugPipeBackend Write error writing to %1: %2 - Erreur lors de l'écriture dans %1: %2 + Erreur lors de l'écriture dans %1 : %2 Socket error on %1: %2 @@ -4284,7 +4321,7 @@ Voulez-vous quand même le supprimer ? QNetworkReply Error downloading %1 - server replied: %2 - Erreur lors du téléchargement de %1 - le serveur a répondu: %2 + Erreur lors du téléchargement de %1 - le serveur a répondu : %2 Protocol "%1" is unknown @@ -4450,7 +4487,7 @@ Voulez-vous quand même le supprimer ? QODBCResult QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration - QODBCResult::reset: Impossible d'utiliser 'SQL_CURSOR_STATIC' comme attribut de requête. Veuillez vérifier la configuration de votre pilote ODBC + QODBCResult::reset : Impossible d'utiliser 'SQL_CURSOR_STATIC' comme attribut de requête. Veuillez vérifier la configuration de votre pilote ODBC Unable to execute statement @@ -4517,7 +4554,7 @@ Voulez-vous quand même le supprimer ? Protocol error: packet of size 0 received - Erreur de protocole: paquet de taille 0 reçu + Erreur de protocole : paquet de taille 0 reçu No host name given @@ -4525,7 +4562,7 @@ Voulez-vous quand même le supprimer ? Invalid hostname - Nom d'hôte non valide + Nom d'hôte invalide PulseAudio Sound Server @@ -4617,19 +4654,19 @@ Voulez-vous quand même le supprimer ? Page size: - Dimensions : + Dimensions : Width: - Largeur : + Largeur : Height: - Hauteur : + Hauteur : Paper source: - Source du papier : + Source du papier : Orientation @@ -4719,7 +4756,7 @@ Voulez-vous quand même le supprimer ? Number of copies: - Nombre de copies : + Nombre de copies : Paper format @@ -4867,15 +4904,15 @@ Voulez-vous quand même le supprimer ? Page size: - Dimensions : + Dimensions : Orientation: - Orientation : + Orientation : Paper source: - Source du papier : + Source du papier : Print @@ -4899,7 +4936,7 @@ Voulez-vous quand même le supprimer ? Size: - Taille : + Taille : Properties @@ -4907,7 +4944,7 @@ Voulez-vous quand même le supprimer ? Printer info: - Informations sur l'imprimante : + Informations sur l'imprimante : Browse @@ -5281,7 +5318,7 @@ Veuillez choisir un nom de fichier différent. Copies: - Copies : + Copies : Collate @@ -5340,7 +5377,7 @@ Veuillez choisir un nom de fichier différent. &Name: - &Nom : + &Nom : P&roperties @@ -5348,7 +5385,7 @@ Veuillez choisir un nom de fichier différent. Location: - Emplacement : + Emplacement : Preview @@ -5356,11 +5393,11 @@ Veuillez choisir un nom de fichier différent. Type: - Type : + Type : Output &file: - &Fichier de sortie: + &Fichier de sortie : ... @@ -5407,7 +5444,7 @@ Veuillez choisir un nom de fichier différent. Process failed to start: %1 - Le démarrage du processus a échoué: %1 + Le démarrage du processus a échoué : %1 @@ -5471,11 +5508,11 @@ Veuillez choisir un nom de fichier différent. invalid interval - intervalle non valide + intervalle invalide invalid category - catégorie non valide + catégorie invalide @@ -5586,15 +5623,15 @@ Veuillez choisir un nom de fichier différent. Ignore-count - Comptes d'ignorés + Nombre d'ignorés Single-shot - Un seul tir + Un seul coup Hit-count - Compte de coups + Nombre de coups @@ -5616,7 +5653,7 @@ Veuillez choisir un nom de fichier différent. Line: - Ligne: + Ligne : Interrupt @@ -5747,7 +5784,7 @@ Veuillez choisir un nom de fichier différent. <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped - <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;La recherche est revenue au début + <img src=" : /qt/scripttools/debugging/images/wrap.png">&nbsp;La recherche est revenue au début @@ -5773,7 +5810,7 @@ Veuillez choisir un nom de fichier différent. Location - Lieu + Emplacement @@ -5792,7 +5829,7 @@ Veuillez choisir un nom de fichier différent. Breakpoint Condition: - Condition du point d'arrêt: + Condition du point d'arrêt : @@ -5807,7 +5844,7 @@ Veuillez choisir un nom de fichier différent. Stack - Empiler + Pile Locals @@ -5853,7 +5890,7 @@ Veuillez choisir un nom de fichier différent. Left edge - Extrême gauche + Bord gauche Top @@ -5861,7 +5898,7 @@ Veuillez choisir un nom de fichier différent. Right edge - Extrême droite + Bord droit Bottom @@ -5988,11 +6025,11 @@ Veuillez choisir un nom de fichier différent. %1: doesn't exist - %1: n'existe pas + %1 : n'existe pas %1: UNIX key file doesn't exist - %1: le fichier de clés UNIX n'existe pas + %1 : le fichier de clés UNIX n'existe pas @@ -7100,7 +7137,7 @@ Veuillez choisir un nom de fichier différent. Unable to decrypt data: %1 - Impossible de décrypter les données: %1 + Impossible de décrypter les données : %1 Private key does not certify public key, %1 @@ -7136,11 +7173,11 @@ Veuillez choisir un nom de fichier différent. The certificate's notBefore field contains an invalid time - Le champ pasAvant du certificat inclut une heure non valide + Le champ pasAvant du certificat inclut une heure invalide The certificate's notAfter field contains an invalid time - Le champ pasAprès du certificat inclut une heure non valide + Le champ pasAprès du certificat inclut une heure invalide The certificate is self-signed, and untrusted @@ -7222,11 +7259,11 @@ Veuillez choisir un nom de fichier différent. QSystemSemaphore %1: out of resources - %1: plus de ressources disponibles + %1 : plus de ressources disponibles %1: permission denied - %1: permission refusée + %1 : permission refusée %1: already exists @@ -7238,7 +7275,7 @@ Veuillez choisir un nom de fichier différent. %1: unknown error %2 - %1: erreur inconnue %2 + %1 : erreur inconnue %2 @@ -7694,7 +7731,7 @@ Veuillez choisir un nom de fichier différent. Slider Media controller element - Barre de défilement + Slider Slider Thumb @@ -7906,7 +7943,7 @@ Veuillez choisir un nom de fichier différent. This is a searchable index. Enter search keywords: text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' - Ceci est un index. Veuillez saisir les mots-clé : + Ceci est un index. Veuillez saisir les mots-clé : Scroll here @@ -8438,7 +8475,7 @@ Veuillez choisir un nom de fichier différent. This is a searchable index. Enter search keywords: - Ceci est un index. Veuillez saisir les mots-clé : + Ceci est un index. Veuillez saisir les mots-clé : JavaScript Problem - %1 @@ -8446,7 +8483,7 @@ Veuillez choisir un nom de fichier différent. The script on this page appears to have a problem. Do you want to stop the script? - Le script de cette page semble avoir un problème. Souhaitez-vous arrêter le script? + Le script de cette page semble avoir un problème. Souhaitez-vous arrêter le script ? Paste and Match Style @@ -8630,161 +8667,161 @@ Veuillez choisir un nom de fichier différent. error triggered by consumer - Erreur déclenchée par le consommateur + Erreur déclenchée par le consommateur unexpected end of file - Fin de fichier inattendue + Fin de fichier inattendue more than one document type definition - plus d'une définition de type de docuement + plus d'une définition de type de document error occurred while parsing element - une erreur s'est produite pendant l'analyse syntaxique de l'élement + une erreur s'est produite pendant l'analyse syntaxique de l'élement tag mismatch - tag incongru + tag incongru error occurred while parsing content - une erreur s'est produite pendant l'analyse syntaxique du contenu + une erreur s'est produite pendant l'analyse syntaxique du contenu unexpected character - caractère inattendu + caractère inattendu invalid name for processing instruction - nom d'instruction invalide + nom d'instruction invalide version expected while reading the XML declaration - Une version est attendue dans la déclaration XML + une version est attendue dans la déclaration XML wrong value for standalone declaration - Valeur incorrecte pour une déclaration autonome + valeur incorrecte pour une déclaration "standalone" error occurred while parsing document type definition - une erreur s'est produite pendant l'analyse syntaxique de la définition du type de document + une erreur s'est produite pendant l'analyse syntaxique de la définition du type de document letter is expected - une lettre est attendue + une lettre est attendue error occurred while parsing comment - une erreur s'est produite pendant l'analyse syntaxique du commentaire + une erreur s'est produite pendant l'analyse syntaxique du commentaire error occurred while parsing reference - une erreur s'est produite pendant l'analyse syntaxique d'une référence + une erreur s'est produite pendant l'analyse syntaxique d'une référence internal general entity reference not allowed in DTD - + référence à une entité générale interne non autorisée dans la DTD external parsed general entity reference not allowed in attribute value - + référence à une entité générale externe non autorisée dans la valeur d'attribut external parsed general entity reference not allowed in DTD - + référence à une entité générale externe non autorisée dans le DTD unparsed entity reference in wrong context - + référence à une entité non analysée dans le mauvais contexte recursive entities - + entités récursives error in the text declaration of an external entity - + erreur dans la déclaration texte d'une entité externe encoding declaration or standalone declaration expected while reading the XML declaration - + déclaration d'encodage ou déclaration "standalone" attendue lors de la lecture de la déclaration XML standalone declaration expected while reading the XML declaration - + déclaration "standalone" attendue lors de la lecture de la déclaration XML QXmlPatternistCLI Warning in %1, at line %2, column %3: %4 - Avertissement dans %1, à la ligne %2, colonne %3: %4 + Avertissement dans %1, à la ligne %2, colonne %3 : %4 Warning in %1: %2 - Avertissement dans %1: %2 + Avertissement dans %1 : %2 - Unknown location + Lieu inconnu Error %1 in %2, at line %3, column %4: %5 - Erreur %1 dans %2, à la ligne %3, colonne %4: %5 + Erreur %1 dans %2, à la ligne %3, colonne %4 : %5 Error %1 in %2: %3 - Erreur %1 dans %2: %3 + Erreur %1 dans %2 : %3 QXmlStream Extra content at end of document. - + Contenu superflu à la fin du document. Invalid entity value. - + Valeur de l'entité invalide. Invalid XML character. - + Caractère XML invalide. Sequence ']]>' not allowed in content. - + séquence ']]>' non autorisée dans le contenu. Namespace prefix '%1' not declared - + Le préfixe d'espace de noms %1 n'a pas été déclaré Attribute redefined. - + Redéfinition d'attribut. Unexpected character '%1' in public id literal. - + Caractère '%1' inattendu pour une valeur d'identifiant public. Invalid XML version string. - + Chaîne de version XML invalide. Unsupported XML version. - + Version XML non supportée. %1 is an invalid encoding name. - + %1 n'est pas un nom d'encodage valide. Encoding %1 is unsupported - + %1 n'est pas un encodage supporté Invalid XML encoding name. @@ -8792,99 +8829,99 @@ Veuillez choisir un nom de fichier différent. Standalone accepts only yes or no. - + Le seules valeurs possibles pour "standalone" sont "yes" ou "no". Invalid attribute in XML declaration. - + Attribut invalide dans une déclaration XML. Premature end of document. - + Fin de document inattendue. Invalid document. - + Document invalide. Expected - + Attendu(e) , but got ' - + , mais trouvé ' Unexpected ' - + Inattendu(e) Expected character data. - + données texte attendues. Recursive entity detected. - + Entité récursive détectée. Start tag expected. - + Tag de départ attendu. XML declaration not at start of document. - + La déclaration XML doit être en début de document. NDATA in parameter entity declaration. - + NDATA dans une déclaration de paramètre d'entité. %1 is an invalid processing instruction name. - + %1 n'est pas un nom d'instruction valide. Invalid processing instruction name. - + nom d'instruction invalide. Illegal namespace declaration. - + Déclaration d'espace de noms non autorisée. Invalid XML name. - + Nom XML invalide. Opening and ending tag mismatch. - + Tags ouvrant et fermants ne correspondent pas. Reference to unparsed entity '%1'. - + Référence à l'entité '%1' non analysée. Entity '%1' not declared. - + Entité '%1' non déclarée. Reference to external entity '%1' in attribute value. - + Référence à l'entité externe '%1' en valeur d'attribut. Invalid character reference. - + Référence à un caractère invalide. Encountered incorrectly encoded content. - + Du contenu avec un encodage incorrect a été rencontré. The standalone pseudo attribute must appear after the encoding. - + Le pseudo-attribut "standalone" doit apparaître après l'encodage. %1 is an invalid PUBLIC identifier. - + %1 n'est pas un identifiant "PUBLIC" valide. @@ -8923,7 +8960,7 @@ Veuillez choisir un nom de fichier différent. Overflow: Can't represent date %1. - Overflow: ne peut pas représenter la date %1. + Overflow : impossible de représenter la date %1. Day %1 is invalid for month %2. @@ -8931,11 +8968,11 @@ Veuillez choisir un nom de fichier différent. Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; - L'heure 24:%1:%2.%3 est invalide. L'heure est 24 mais les minutes, seconndes et millisecondes ne sont pas à 0; + Heure 24 : %1 : %2.%3 est invalide. L'heure est 24 mais les minutes, secondes et millisecondes ne sont pas à 0; Time %1:%2:%3.%4 is invalid. - L'heure %1:%2:%3.%4 est invalide. + L'heure %1 : %2 : %3.%4 est invalide. Overflow: Date can't be represented. @@ -9197,11 +9234,11 @@ Veuillez choisir un nom de fichier différent. %1 is an invalid regular expression pattern: %2 - %1 est un modèle d'expression régulière invalide: %2 + %1 est un modèle d'expression régulière invalide : %2 %1 is an invalid flag for regular expressions. Valid flags are: - %1 est un flag invalide pour des expressions régulières. Les flags valides sont : + %1 est un flag invalide pour des expressions régulières. Les flags valides sont : If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. @@ -9604,16 +9641,12 @@ Veuillez choisir un nom de fichier différent. L'URI ne peut pas avoir de fragments - Element %1 is not allowed at this location. + L'élément %1 n'est pas autorisé à cet emplacement. - Text nodes are not allowed at this location. - Les noeuds de texte ne sont pas autorisés à cet emplacement. - - Parse error: %1 - Erreur: %1 + Erreur : %1 The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. diff --git a/translations/qt_help_fr.ts b/translations/qt_help_fr.ts index f0cabc2..62bfccc 100644 --- a/translations/qt_help_fr.ts +++ b/translations/qt_help_fr.ts @@ -4,87 +4,116 @@ QCLuceneResultWidget + Search Results Résultats de la recherche + Note: Note : + The search results may not be complete since the documentation is still being indexed! Les résultats de la recherche risquent d'être incomplets car l'indexation de la documentation est en cours ! + Your search did not match any documents. Votre recherche ne correspond à aucun document. + (The reason for this might be that the documentation is still being indexed.) (Il est possible que cela soit dû au fait que la documentation est en cours d'indexation.) + QHelp + + + Untitled + Sans titre + + + QHelpCollectionHandler + The collection file '%1' is not set up yet! Le fichier de collection '%1' n'est pas encore chargé ! + Cannot load sqlite database driver! driver ? Chargement du pilote de base de données sqlite impossible ! + + Cannot open collection file: %1 collection ? Impossible d'ouvrir le fichier collection : %1 + Cannot create tables in file %1! Impossible de créer les tables dans le fichier : %1 ! + The collection file '%1' already exists! Le fichier collection '%1' existe déjà ! + Cannot create directory: %1 Impossible de créer le répertoire : %1 + Cannot copy collection file: %1 Impossible de copier le fichier collection : %1 + Unknown filter '%1'! Filtre '%1' inconnu ! + Cannot register filter %1! Impossible d'enregistrer le filtre %1 ! + Cannot open documentation file %1! Impossible d'ouvrir le fichier de documentation %1 ! + Invalid documentation file '%1'! Fichier de documentation invalide : '%1' ! + The namespace %1 was not registered! L'espace de noms '%1' n'était pas référencé ! + Namespace %1 already exists! L'espace de noms %1 existe déjà ! + Cannot register namespace '%1'! Impossible d'enregistrer l'espace de noms '%1' ! + Cannot open database '%1' to optimize! Impossible d'ouvrir la base de données à optimiser '%1' ! @@ -92,6 +121,7 @@ QHelpDBReader + Cannot open database '%1' '%2': %3 The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string Impossible d'ouvrir la base de données '%1' '%2' : %3 @@ -100,10 +130,12 @@ QHelpEngineCore + Cannot open documentation file %1: %2! Impossible d'ouvrir le fichier de documentation %1 : %2 ! + The specified namespace does not exist! L'espace de noms spécifié n'existe pas ! @@ -118,107 +150,133 @@ QHelpGenerator + Invalid help data! Données d'aide invalides ! + No output file name specified! Aucun nom de fichier de sortie spécifié ! + The file %1 cannot be overwritten! Le fichier %1 ne peut être écrasé ! + Building up file structure... - Construction de la structure de fichiers en cours… + Construction de la structure de fichiers en cours... + Cannot open data base file %1! Impossible d'ouvrir le fichier de base de données %1 ! + Cannot register namespace %1! Impossible d'enregistrer l'espace de noms %1 ! + Insert custom filters... - Insértion des filtres personnalisés… + Insértion des filtres personnalisés... + Insert help data for filter section (%1 of %2)... ??? - Insertion des données d'aide pour la section filtre (%1 de %2)… + Insertion des données d'aide pour la section filtre (%1 de %2)... + Documentation successfully generated. Documentation générée avec succès. + Some tables already exist! Certaines tables existent déjà ! + Cannot create tables! Impossible de créer les tables ! + Cannot register virtual folder! Impossible d'enregistrer le dossier virtuel ! + Insert files... Insertion des fichiers... + The referenced file %1 must be inside or within a subdirectory of (%2). Skipping it. Le fichier référencé %1 doit être dans le dossier (%2) ou un de ses sous-dossiers. Fichier non pris en compte. + The file %1 does not exist! Skipping it. Le fichier %1 n'existe pas ! Fichier non pris en compte. + Cannot open file %1! Skipping it. Impossible d'ouvrir le fichier %1 ! Fichier non pris en compte. + The filter %1 is already registered! Le filtre %1 est déjà enregistré ! + Cannot register filter %1! Impossible d'enregistrer le filtre %1 ! + Insert indices... - Insertion des index… + Insertion des index... + Insert contents... - insertion du contenu… + insertion du contenu... + Cannot insert contents! Impossible d'insérer le contenu ! + Cannot register contents! Impossible de référencer le contenu ! + File '%1' does not exist. Le fichier '%1' n'existe pas. + File '%1' cannot be opened. Le fichier '%1' ne peut être ouvert. + File '%1' contains an invalid link to file '%2' Le fichier '%1' contient un lien invalide vers le fichier '%2' + Invalid links in HTML files. Liens invalides dans les fichiers HTML. @@ -226,38 +284,47 @@ QHelpProject + Unknown token. Identificateur inconnu. + Unknown token. Expected "QtHelpProject"! Identificateur inconnu. "QtHelpProject" attendu ! + Error in line %1: %2 Erreur à la ligne %1 : %2 + Virtual folder has invalid syntax. Syntaxe invalide pour le dossier virtuel. + Namespace has invalid syntax. Syntaxe invalide pour l'espace de noms. + Missing namespace in QtHelpProject. Espace de noms manquant dans QtHelpProject. + Missing virtual folder in QtHelpProject Dossier virtuel manquant dans QtHelpProject + Missing attribute in keyword at line %1. Attribut manquant pour le mot clé à la ligne %1. + The input file %1 could not be opened! Le fichier source %1 n'a pas pu être ouvert ! @@ -265,42 +332,52 @@ QHelpSearchQueryWidget + Search for: Rechercher : + Previous search Recherche précédente + Next search Recherche suivante + Search Recherche + Advanced search Recherche avancée + words <B>similar</B> to: mots <B>semblables</B> à : + <B>without</B> the words: <B>sans</B> les mots : + with <B>exact phrase</B>: avec la <B>phrase exacte</B> : + with <B>all</B> of the words: avec <B>tous</B> les mots : + with <B>at least one</B> of the words: avec <B>au moins un</B> des mots : @@ -308,6 +385,7 @@ QHelpSearchResultWidget + %1 - %2 of %n Hits %1 - %2 de %n résultat @@ -315,6 +393,7 @@ + 0 - 0 of 0 Hits 0 - 0 de 0 résultats -- cgit v0.12 From ab3ce23e3b5e28389b9f6f9bd5bc69cd42fcae5d Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Fri, 6 Aug 2010 17:07:51 +0200 Subject: Modified descriptions of QBasicTimer class and isActive() function. Reviewed by: David Boddie Task: QTBUG-12313 --- src/corelib/kernel/qbasictimer.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/corelib/kernel/qbasictimer.cpp b/src/corelib/kernel/qbasictimer.cpp index d176170..d595ac1 100644 --- a/src/corelib/kernel/qbasictimer.cpp +++ b/src/corelib/kernel/qbasictimer.cpp @@ -54,7 +54,8 @@ QT_BEGIN_NAMESPACE This is a fast, lightweight, and low-level class used by Qt internally. We recommend using the higher-level QTimer class rather than this class if you want to use timers in your - applications. + applications. Note that this timer is a repeating timer that + will send subsequent timer events unless the stop() function is called. To use this class, create a QBasicTimer, and call its start() function with a timeout interval and with a pointer to a QObject @@ -88,8 +89,8 @@ QT_BEGIN_NAMESPACE /*! \fn bool QBasicTimer::isActive() const - Returns true if the timer is running, has not yet timed - out, and has not been stopped; otherwise returns false. + Returns true if the timer is running and has not been stopped; otherwise + returns false. \sa start() stop() */ -- cgit v0.12 From 6eb7a210eed1b392431fc913d13d205b8ccc1933 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Fri, 6 Aug 2010 16:25:15 +0100 Subject: Fixes for combining multiple Qt::ImhXXXOnly with S60 FEP When one restriction is a superset of another (e.g. ImhDigitsOnly | ImhDialableCharactersOnly), the less restrictive one is used When two restrictions are incompatible (e.g. ImhDialableCharactersOnly | ImhFormattedNumbersOnly), fall back to allowing all symbols Note for some combinations additional characters not in the union can be entered, this is a limitation of the API to AVKON FEP. Before this change, some characters in the union could not be entered at all, which is worse. Tested on I8510 (3.2), 5800XM (5.0), N8(symbian^3) Task Number: QTBUG-12726 Reviewed-by: Alessandro Portale --- src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 52 ++++++++++++++----------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index ae51b1c..44fe7da 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -359,10 +359,10 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) commitTemporaryPreeditString(); - bool numbersOnly = (hints & ImhDigitsOnly) || (hints & ImhFormattedNumbersOnly) - || (hints & ImhDialableCharactersOnly); - bool noOnlys = !(numbersOnly || (hints & ImhUppercaseOnly) - || (hints & ImhLowercaseOnly)); + const bool anynumbermodes = hints & (ImhDigitsOnly | ImhFormattedNumbersOnly | ImhDialableCharactersOnly); + const bool anytextmodes = hints & (ImhUppercaseOnly | ImhLowercaseOnly | ImhEmailCharactersOnly | ImhUrlCharactersOnly); + const bool numbersOnly = anynumbermodes && !anytextmodes; + const bool noOnlys = !(hints & ImhExclusiveInputMask); TInt flags; Qt::InputMethodHints oldHints = hints; @@ -374,8 +374,7 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) } if (!noOnlys) { // Make sure that the preference is within the permitted set. - if (hints & ImhPreferNumbers && !(hints & ImhDigitsOnly || hints & ImhFormattedNumbersOnly - || hints & ImhDialableCharactersOnly)) { + if (hints & ImhPreferNumbers && !anynumbermodes) { hints &= ~ImhPreferNumbers; } else if (hints & ImhPreferUppercase && !(hints & ImhUppercaseOnly)) { hints &= ~ImhPreferUppercase; @@ -402,18 +401,21 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) m_fepState->SetCurrentInputMode(EAknEditorTextInputMode); } flags = 0; - if (numbersOnly) { - flags |= EAknEditorNumericInputMode; + if (noOnlys || (anynumbermodes && anytextmodes)) { + flags = EAknEditorAllInputModes; } - if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 - && ((hints & ImhFormattedNumbersOnly) || (hints & ImhDialableCharactersOnly))) { - //workaround - the * key does not launch the symbols menu, making it impossible to use these modes unless text mode is enabled. - flags |= EAknEditorTextInputMode; + else if (anynumbermodes) { + flags |= EAknEditorNumericInputMode; + if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 + && ((hints & ImhFormattedNumbersOnly) || (hints & ImhDialableCharactersOnly))) { + //workaround - the * key does not launch the symbols menu, making it impossible to use these modes unless text mode is enabled. + flags |= EAknEditorTextInputMode; + } } - if (hints & ImhUppercaseOnly || hints & ImhLowercaseOnly) { + else if (anytextmodes) { flags |= EAknEditorTextInputMode; } - if (flags == 0) { + else { flags = EAknEditorAllInputModes; } m_fepState->SetPermittedInputModes(flags); @@ -460,27 +462,33 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) if (hints & ImhNoPredictiveText || hints & ImhHiddenText) { flags |= EAknEditorFlagNoT9; } - // if alphanumeric input, then make all symbols available in numeric mode too. - if (!numbersOnly) + // if alphanumeric input, or if multiple incompatible number modes are selected; + // then make all symbols available in numeric mode too. + if (!numbersOnly || ((hints & ImhFormattedNumbersOnly) && (hints & ImhDialableCharactersOnly))) flags |= EAknEditorFlagUseSCTNumericCharmap; m_fepState->SetFlags(flags); ReportAknEdStateEvent(MAknEdStateObserver::EAknEdwinStateFlagsUpdate); - if (hints & ImhFormattedNumbersOnly) { + if (hints & ImhDialableCharactersOnly) { + // This is first, because if (ImhDialableCharactersOnly | ImhFormattedNumbersOnly) + // is specified, this one is more natural (# key enters a #) + flags = EAknEditorStandardNumberModeKeymap; + } else if (hints & ImhFormattedNumbersOnly) { + // # key enters decimal point flags = EAknEditorCalculatorNumberModeKeymap; } else if (hints & ImhDigitsOnly) { + // This is last, because it is most restrictive (# key is inactive) flags = EAknEditorPlainNumberModeKeymap; } else { - // ImhDialableCharactersOnly is the fallback as well, so we don't need to check for - // that flag. flags = EAknEditorStandardNumberModeKeymap; } m_fepState->SetNumericKeymap(static_cast(flags)); - if (hints & ImhEmailCharactersOnly) { - m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_EMAIL_ADDR_SPECIAL_CHARACTER_TABLE_DIALOG); - } else if (hints & ImhUrlCharactersOnly) { + if (hints & ImhUrlCharactersOnly) { + // URL characters is everything except space, so a superset of the other restrictions m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_URL_SPECIAL_CHARACTER_TABLE_DIALOG); + } else if (hints & ImhEmailCharactersOnly) { + m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_EMAIL_ADDR_SPECIAL_CHARACTER_TABLE_DIALOG); } else { m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_SPECIAL_CHARACTER_TABLE_DIALOG); } -- cgit v0.12 From 1b0f790d27cda48137c7114fadc694432a104c90 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 6 Aug 2010 17:48:28 +0200 Subject: QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads Task-number: QTBUG-12700 Reviewed-by: thiago --- src/corelib/tools/qsharedpointer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp index f102598..5fac960 100644 --- a/src/corelib/tools/qsharedpointer.cpp +++ b/src/corelib/tools/qsharedpointer.cpp @@ -67,8 +67,8 @@ QSharedPointer and QWeakPointer are thread-safe and operate atomically on the pointer value. Different threads can also access - the same QSharedPointer or QWeakPointer object at the same time - without need for locking mechanisms. + the QSharedPointer or QWeakPointer pointing to the same object at + the same time without need for locking mechanisms. It should be noted that, while the pointer value can be accessed in this manner, QSharedPointer and QWeakPointer provide no -- cgit v0.12 From d81ab877bc4424d918c400af3f65509f80f22f67 Mon Sep 17 00:00:00 2001 From: Benjamin Poulain Date: Thu, 5 Aug 2010 14:45:49 +0200 Subject: Move the build of Neon file from painting.pri to gui.pro Move the build operation of files using Neon from painting.pri to gui.pro. This will make easier to add Neon files in the future. Reviewed-by: Andreas Kling --- src/gui/gui.pro | 18 ++++++++++++++++++ src/gui/painting/painting.pri | 21 +++------------------ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 28440cc..89ae06f 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -77,6 +77,24 @@ symbian { DEPLOYMENT = partial_upgrade $$DEPLOYMENT } +neon: QMAKE_CXXFLAGS *= -mfpu=neon +neon:*-g++* { + HEADERS += $$NEON_HEADERS + SOURCES += $$NEON_SOURCES + + DRAWHELPER_NEON_ASM_FILES = $$NEON_ASM + + neon_compiler.commands = $$QMAKE_CXX -c + neon_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + neon_compiler.dependency_type = TYPE_C + neon_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} + neon_compiler.input = DRAWHELPER_NEON_ASM_FILES + neon_compiler.variable_out = OBJECTS + neon_compiler.name = compiling[neon] ${QMAKE_FILE_IN} + silent:neon_compiler.commands = @echo compiling[neon] ${QMAKE_FILE_IN} && $$neon_compiler.commands + QMAKE_EXTRA_COMPILERS += neon_compiler +} + contains(QMAKE_MAC_XARCH, no) { DEFINES += QT_NO_MAC_XARCH } else { diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index 4023f65..dfa4a48 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -246,23 +246,8 @@ symbian { QMAKE_CXXFLAGS.ARMCC *= -O3 } -neon:*-g++* { - DEFINES += QT_HAVE_NEON - HEADERS += painting/qdrawhelper_neon_p.h - SOURCES += painting/qdrawhelper_neon.cpp - QMAKE_CXXFLAGS *= -mfpu=neon - - DRAWHELPER_NEON_ASM_FILES = ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S - - neon_compiler.commands = $$QMAKE_CXX -c - neon_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - neon_compiler.dependency_type = TYPE_C - neon_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} - neon_compiler.input = DRAWHELPER_NEON_ASM_FILES - neon_compiler.variable_out = OBJECTS - neon_compiler.name = compiling[neon] ${QMAKE_FILE_IN} - silent:neon_compiler.commands = @echo compiling[neon] ${QMAKE_FILE_IN} && $$neon_compiler.commands - QMAKE_EXTRA_COMPILERS += neon_compiler -} +NEON_SOURCES += painting/qdrawhelper_neon.cpp +NEON_HEADERS += painting/qdrawhelper_neon_p.h +NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S include($$PWD/../../3rdparty/zlib_dependency.pri) -- cgit v0.12 From a0f155cdaf641d92acc8b61be89b96319d16ccba Mon Sep 17 00:00:00 2001 From: Benjamin Poulain Date: Thu, 5 Aug 2010 14:47:54 +0200 Subject: Do the conversion from RGB888 to RGB32 using Neon Doing the conversion with Neon is 700% faster. Help by Thiago Macieira on vacation. Reviewed-by: Thiago Macieira --- src/gui/image/image.pri | 1 + src/gui/image/qimage.cpp | 8 +++ src/gui/image/qimage_neon.cpp | 114 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 123 insertions(+) create mode 100644 src/gui/image/qimage_neon.cpp diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index b20a04f..f89706c 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -94,5 +94,6 @@ contains(QT_CONFIG, tiff):include($$PWD/qtiffhandler.pri) contains(QT_CONFIG, gif):include($$PWD/qgifhandler.pri) # SIMD +NEON_SOURCES += image/qimage_neon.cpp SSE2_SOURCES += image/qimage_sse2.cpp SSSE3_SOURCES += image/qimage_ssse3.cpp diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index cb834c0..ac148ee 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -3769,6 +3769,14 @@ void qInitImageConversions() converter_map[QImage::Format_RGB888][QImage::Format_ARGB32_Premultiplied] = convert_RGB888_to_RGB32_ssse3; } #endif +#ifdef QT_HAVE_NEON + if (features & NEON) { + extern void convert_RGB888_to_RGB32_neon(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags); + converter_map[QImage::Format_RGB888][QImage::Format_RGB32] = convert_RGB888_to_RGB32_neon; + converter_map[QImage::Format_RGB888][QImage::Format_ARGB32] = convert_RGB888_to_RGB32_neon; + converter_map[QImage::Format_RGB888][QImage::Format_ARGB32_Premultiplied] = convert_RGB888_to_RGB32_neon; + } +#endif } /*! diff --git a/src/gui/image/qimage_neon.cpp b/src/gui/image/qimage_neon.cpp new file mode 100644 index 0000000..15bf472 --- /dev/null +++ b/src/gui/image/qimage_neon.cpp @@ -0,0 +1,114 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include + +#ifdef QT_HAVE_NEON + +QT_BEGIN_NAMESPACE + +Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_neon(quint32 *dst, const uchar *src, int len) +{ + if (!len) + return; + + const quint32 *const end = dst + len; + + // align dst on 64 bits + const int offsetToAlignOn8Bytes = (reinterpret_cast(dst) >> 2) & 0x1; + for (int i = 0; i < offsetToAlignOn8Bytes; ++i) { + *dst++ = qRgb(src[0], src[1], src[2]); + src += 3; + } + + if ((len - offsetToAlignOn8Bytes) >= 8) { + const quint32 *const simdEnd = end - 7; + register uint8x8_t fullVector asm ("d3") = vdup_n_u8(0xff); + do { +#if Q_BYTE_ORDER == Q_BIG_ENDIAN + asm volatile ( + "vld3.8 { d4, d5, d6 }, [%[SRC]] !\n\t" + "vst4.8 { d3, d4, d5, d6 }, [%[DST],:64] !\n\t" + : [DST]"+r" (dst), [SRC]"+r" (src) + : "w"(fullVector) + : "memory", "d4", "d5", "d6" + ); +#else + asm volatile ( + "vld3.8 { d0, d1, d2 }, [%[SRC]] !\n\t" + "vswp d0, d2\n\t" + "vst4.8 { d0, d1, d2, d3 }, [%[DST],:64] !\n\t" + : [DST]"+r" (dst), [SRC]"+r" (src) + : "w"(fullVector) + : "memory", "d0", "d1", "d2" + ); +#endif + } while (dst < simdEnd); + } + + while (dst != end) { + *dst++ = qRgb(src[0], src[1], src[2]); + src += 3; + } +} + +void convert_RGB888_to_RGB32_neon(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags) +{ + Q_ASSERT(src->format == QImage::Format_RGB888); + Q_ASSERT(dest->format == QImage::Format_RGB32 || dest->format == QImage::Format_ARGB32 || dest->format == QImage::Format_ARGB32_Premultiplied); + Q_ASSERT(src->width == dest->width); + Q_ASSERT(src->height == dest->height); + + const uchar *src_data = (uchar *) src->data; + quint32 *dest_data = (quint32 *) dest->data; + + for (int i = 0; i < src->height; ++i) { + qt_convert_rgb888_to_rgb32_neon(dest_data, src_data, src->width); + src_data += src->bytes_per_line; + dest_data = (quint32 *)((uchar*)dest_data + dest->bytes_per_line); + } +} + +QT_END_NAMESPACE + +#endif // QT_HAVE_NEON -- cgit v0.12 From 296cf92e1047409a203294e81fb388cc6a0e5c85 Mon Sep 17 00:00:00 2001 From: Benjamin Poulain Date: Fri, 6 Aug 2010 15:50:38 +0200 Subject: Use the fast Neon conversion for converting colors of jpeg images. Reviewed-by: Andreas Kling --- src/gui/image/qjpeghandler.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp index d358a5e..eda5efb 100644 --- a/src/gui/image/qjpeghandler.cpp +++ b/src/gui/image/qjpeghandler.cpp @@ -803,9 +803,16 @@ bool QJpegHandlerPrivate::read(QImage *image) QJpegHandler::QJpegHandler() : d(new QJpegHandlerPrivate(this)) { -#if defined(QT_HAVE_SSSE3) const uint features = qDetectCPUFeatures(); - + Q_UNUSED(features); +#if defined(QT_HAVE_NEON) + // from qimage_neon.cpp + Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_neon(quint32 *dst, const uchar *src, int len); + + if (features & NEON) + rgb888ToRgb32ConverterPtr = qt_convert_rgb888_to_rgb32_neon; +#endif // QT_HAVE_NEON +#if defined(QT_HAVE_SSSE3) // from qimage_ssse3.cpp Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_ssse3(quint32 *dst, const uchar *src, int len); -- cgit v0.12 From c45516f1f3781dcb504158f730b98897c7f2f2a1 Mon Sep 17 00:00:00 2001 From: Benjamin Poulain Date: Fri, 6 Aug 2010 15:52:37 +0200 Subject: Remove the definition of QT_HAVE_NEON from qt.prf Since we cannot use NEON and VFP concurrently, it is better not to force neon all over the place :) Reviewed-by: Andreas Kling Reviewed-by: Thiago Macieira --- mkspecs/features/qt.prf | 1 - src/corelib/corelib.pro | 5 ++++- src/gui/gui.pro | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index aa0f06e..84010a0 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -211,7 +211,6 @@ mac { } #SIMD defines: -neon: DEFINES += QT_HAVE_NEON mmx:DEFINES += QT_HAVE_MMX 3dnow:DEFINES += QT_HAVE_3DNOW sse:DEFINES += QT_HAVE_SSE QT_HAVE_MMXEXT diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index bc8ef9f..728bdf9 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -53,6 +53,9 @@ symbian: { DEPLOYMENT = partial_upgrade $$DEPLOYMENT } -neon: QMAKE_CXXFLAGS *= -mfpu=neon +neon { + DEFINES += QT_HAVE_NEON + QMAKE_CXXFLAGS *= -mfpu=neon +} diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 89ae06f..3943e26 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -77,8 +77,9 @@ symbian { DEPLOYMENT = partial_upgrade $$DEPLOYMENT } -neon: QMAKE_CXXFLAGS *= -mfpu=neon neon:*-g++* { + DEFINES += QT_HAVE_NEON + QMAKE_CXXFLAGS *= -mfpu=neon HEADERS += $$NEON_HEADERS SOURCES += $$NEON_SOURCES -- cgit v0.12 From 44d5bcde1713a5f51b7140259e9fd4e426a868a8 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Mon, 9 Aug 2010 16:11:30 +1000 Subject: PathView required some diagonal movement before a drag was initiated. Any movement beyond the threshold is sufficient. Task-number: 12747 Reviewed-by: Joona Petrell --- src/declarative/graphicsitems/qdeclarativepathview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp index 06ac275..5771f84 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp @@ -1061,7 +1061,7 @@ void QDeclarativePathView::mouseMoveEvent(QGraphicsSceneMouseEvent *event) if (!d->stealMouse) { QPointF delta = event->pos() - d->startPoint; - if (qAbs(delta.x()) > QApplication::startDragDistance() && qAbs(delta.y()) > QApplication::startDragDistance()) + if (qAbs(delta.x()) > QApplication::startDragDistance() || qAbs(delta.y()) > QApplication::startDragDistance()) d->stealMouse = true; } -- cgit v0.12 From 8c4de17eb643af324a13b16d20c301772183022b Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Mon, 9 Aug 2010 10:58:23 +1000 Subject: Explain Flipable example further --- src/declarative/graphicsitems/qdeclarativeflipable.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp index 8c9d2dd..b266273 100644 --- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp @@ -83,10 +83,16 @@ public: \image flipable.gif - The \l Rotation element is used to specify the angle and axis of the flip, - and the \l State defines the changes in angle which produce the flipping - effect. Finally, the \l Transition creates the animation that changes the - angle over one second. + The \l Rotation element is used to specify the angle and axis of the flip. + When \c flipped is \c true, the item changes to the "back" state, where + the angle is changed to 180 degrees to produce the flipping effect. + Finally, the \l Transition creates the animation that changes the + angle over one second: when the item changes between its "back" and + default states, the NumberAnimation animates the angle between + its old and new values. + + See the \l {QML States} and \l {QML Animation} documentation for more + details on state changes and how animations work within transitions. \sa {declarative/ui-components/flipable}{Flipable example} */ -- cgit v0.12 From 983882f68a8f7463aa4adf6d379fd4ef5dd4f915 Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Mon, 9 Aug 2010 10:58:43 +1000 Subject: Merge sections about when property and default state --- doc/src/declarative/qdeclarativestates.qdoc | 95 ++++++++++++++++++----------- 1 file changed, 59 insertions(+), 36 deletions(-) diff --git a/doc/src/declarative/qdeclarativestates.qdoc b/doc/src/declarative/qdeclarativestates.qdoc index 0b91756..274040a 100644 --- a/doc/src/declarative/qdeclarativestates.qdoc +++ b/doc/src/declarative/qdeclarativestates.qdoc @@ -84,18 +84,34 @@ Rectangle. \snippet doc/src/snippets/declarative/states.qml 0 -A \l State item defines all the changes to be made in the new state. You +The \l State item defines all the changes to be made in the new state. It could specify additional properties to be changed, or create additional -PropertyChanges for other objects. (Note that a \l State can modify the -properties of other objects, not just the object that owns the state.) +PropertyChanges for other objects. It can also modify the properties of other +objects, not just the object that owns the state. For example: -For example: +\qml +Rectangle { + ... + states: [ + State { + name: "moved" + PropertyChanges { target: myRect; x: 50; y: 50; color: "blue" } + PropertyChanges { target: someOtherItem; width: 1000 } + } + ] +} +\endqml + +As a convenience, if an item only has one state, its \l {Item::}{states} +property can be defined as a single \l State, without the square-brace list +syntax: \qml -State { - name: "moved" - PropertyChanges { target: myRect; x: 50; y: 50; color: "blue" } - PropertyChanges { target: someOtherItem; width: 1000 } +Item { + ... + states: State { + ... + } } \endqml @@ -118,54 +134,61 @@ transitions between them. Of course, the \l Rectangle in the example above could have simply been moved by setting its position to (50, 50) in the mouse area's \c onClicked handler. -However, aside from enabling batched property changes, the use of states allows -an item to revert to its \e {default state}, which contains all of the items' -initial property values before they were modified in a state change. +However, aside from enabling batched property changes, one of the features of +QML states is the ability of an item to revert to its \e {default state}. +The default state contains all of an item's initial property values before +they were modified in a state change. -The default state is specified by an empty string. If the MouseArea in the -above example was changed to this: +For example, suppose the \l Rectangle should move to (50,50) when the mouse is +pressed, and then move back to its original position when the mouse is +released. This can be achieved by using the \l {State::}{when} property, +like this: -\qml -MouseArea { - anchors.fill: parent - onClicked: myRect.state == 'moved' ? myRect.state = "" : myRect.state = 'moved'; -} -\endqml - -This would toggle the \l Rectangle's state between the \e moved and \e default -states when clicked. The properties can be reverted to their initial -values without requiring the definition of another \l State that defines these -value changes. +\qml +Rectangle { + ... + MouseArea { + id: mouseArea + anchors.fill: parent + } + states: State { + name: "moved"; when: mouseArea.pressed + ... + } +} +\endqml -\section1 The "when" property +The \l {State::}{when} property is set to an expression that evaluates to +\c true when the item should be set to that state. When the mouse is pressed, +the state is changed to \e moved. When it is released, the item reverts to its +\e default state, which defines all of the item's original property values. -The \l {State::}{when} property is useful for specifying when a state should be -applied. This can be set to an expression that evaluates to \c true when an -item should change to a particular state. +Alternatively, an item can be explicitly set to its default state by setting its +\l {Item::}{state} property to an empty string (""). For example, instead of +using the \l {State::}{when} property, the above code could be changed to: -If the above example was changed to this: - \qml Rectangle { ... MouseArea { - id: mouseArea anchors.fill: parent + onPressed: myRect.state = 'moved'; + onReleased: myRect.state = ''; } states: State { - name: "moved"; when: mouseArea.pressed + name: "moved" ... } +} \endqml -The \l Rectangle would automatically change to the \e moved state when the -mouse is pressed, and revert to the default state when it is released. This is -simpler (and a better, more declarative method) than creating \c onPressed -and \c onReleased handlers in the MouseArea to set the current state. +Obviously it makes sense to use the \l {State::}{when} property when possible +as it provides a simpler (and a better, more declarative) solution than +assigning the state from signal handlers. \section1 Animating state changes -- cgit v0.12 From db91a8849bbe9581d096aa486708b9a655fc092f Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Mon, 9 Aug 2010 11:10:22 +1000 Subject: Mention QML_IMPORT_TRACE in Modules docs --- doc/src/declarative/modules.qdoc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc index 9e51a40..467b7d0 100644 --- a/doc/src/declarative/modules.qdoc +++ b/doc/src/declarative/modules.qdoc @@ -302,5 +302,13 @@ For examples of \c qmldir files for plugins, see the \l {declarative/cppextensions/plugins}{Plugins} example and \l {Tutorial: Writing QML extensions with C++}. + +\section1 Debugging + +The \c QML_IMPORT_TRACE environment variable can be useful for debugging +when there are problems with finding and loading modules. See +\l{Debugging module imports} for more information. + + */ / -- cgit v0.12 From 0d060e71a5a03f21df5b2edbb4f6de1e928b9ada Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Mon, 9 Aug 2010 17:08:23 +1000 Subject: XmlListModel doc fixes Task-number: QTBUG-12749 --- src/declarative/util/qdeclarativexmllistmodel.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp index 7c1e1fd..8bd829e 100644 --- a/src/declarative/util/qdeclarativexmllistmodel.cpp +++ b/src/declarative/util/qdeclarativexmllistmodel.cpp @@ -560,7 +560,7 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListPropertyprogress; } +/*! + \qmlmethod void XmlListModel::errorString() + + Returns a string description of the last error that occurred + if \l status is XmlListModel::Error. +*/ QString QDeclarativeXmlListModel::errorString() const { Q_D(const QDeclarativeXmlListModel); -- cgit v0.12 From 7ee7f19502bfd9193c624045bed07bdfdb23d1df Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 9 Aug 2010 09:17:27 +0200 Subject: I18N: Update German translations for 4.7.0. --- translations/assistant_de.ts | 345 +++--- translations/designer_de.ts | 1380 +--------------------- translations/linguist_de.ts | 438 +------ translations/qt_de.ts | 2666 +----------------------------------------- translations/qt_help_de.ts | 78 +- 5 files changed, 278 insertions(+), 4629 deletions(-) diff --git a/translations/assistant_de.ts b/translations/assistant_de.ts index bfafc71..0f4d0d6 100644 --- a/translations/assistant_de.ts +++ b/translations/assistant_de.ts @@ -4,7 +4,6 @@ AboutDialog - &Close &Schließen @@ -12,19 +11,16 @@ AboutLabel - Warning Achtung - Unable to launch external application. Fehler beim Starten der externen Anwendung. - OK OK @@ -32,17 +28,14 @@ Assistant - Error registering documentation file '%1': %2 Beim Registrieren der Dokumentationsdatei '%1' trat ein Fehler auf: %2 - Error: %1 Fehler: %1 - Could not register documentation file %1 @@ -54,12 +47,10 @@ Grund: %2 - Documentation successfully registered. Dokumentation erfolgreich registriert. - Could not unregister documentation file %1 @@ -71,27 +62,22 @@ Grund: %2 - Documentation successfully unregistered. Dokumentation erfolgreich entfernt. - Error reading collection file '%1': %2. Fehler beim Lesen der Katalogdatei '%1': %2 - Error creating collection file '%1': %2. Fehler beim Erstellen der Katalogdatei '%1': %2. - Error reading collection file '%1': %2 Fehler beim Lesen der Katalogdatei '%1': %2 - Cannot load sqlite database driver! Der Datenbanktreiber für SQLite kann nicht geladen werden. @@ -99,139 +85,229 @@ Grund: BookmarkDialog - Add Bookmark Lesezeichen hinzufügen - Bookmark: Lesezeichen: - Add in Folder: Erstellen in: - New Folder Neuer Ordner - + + + + Rename Folder + Ordner umbenennen + BookmarkManager - Untitled Ohne Titel - Remove Entfernen - You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? Wenn Sie diesen Ordner löschen, wird auch<br>dessen kompletter Inhalt gelöscht. Möchten Sie wirklich fortfahren? - Manage Bookmarks... Lesezeichen verwalten... - Add Bookmark... Lesezeichen hinzufügen ... - Ctrl+D Ctrl+D - Delete Folder Ordner löschen - Rename Folder Ordner umbenennen - Show Bookmark Lesezeichen öffnen - Show Bookmark in New Tab Lesezeichen in neuem Reiter öffnen - Delete Bookmark Lesezeichen löschen - Rename Bookmark Lesezeichen umbenennen + BookmarkManagerWidget + + Manage Bookmarks + Lesezeichen verwalten + + + Search: + Suche: + + + Remove + Entfernen + + + Import and Backup + Importieren und Sichern + + + OK + OK + + + Import... + Importieren... + + + Export... + Exportieren... + + + Open File + Datei öffnen + + + Files (*.xbel) + Dateien (*.xbel) + + + Save File + Datei speichern + + + Qt Assistant + Qt Assistant + + + Unable to save bookmarks. + Die Lesezeichen konnten nicht gespeichert werden. + + + You are goingto delete a Folder, this will also<br> remove it's content. Are you sure to continue? + Beim Löschen des Ordners wird auch dessen Inhalt entfernt.<br>Möchten Sie fortsetzen? + + + Delete Folder + Ordner löschen + + + Rename Folder + Ordner umbenennen + + + Show Bookmark + Lesezeichen anzeigen + + + Show Bookmark in New Tab + Lesezeichen in neuem Reiter öffnen + + + Delete Bookmark + Lesezeichen löschen + + + Rename Bookmark + Lesezeichen umbenennen + + + + BookmarkModel + + Name + Name + + + Address + Adresse + + + Bookmarks Menu + Lesezeichen-Menü + + + + BookmarkWidget + + Bookmarks + Lesezeichen + + + Filter: + Filter: + + + Add + Hinzufügen + + + Remove + Entfernen + + + CentralWidget - Add new page Neue Seite hinzufügen - Close current page Aktuelle Seite schließen - Print Document Drucken - - unknown unbekannt - Add New Page Neue Seite hinzufügen - Close This Page Aktuelle Seite schließen - Close Other Pages Andere Seiten schließen - Add Bookmark for this Page... Lesezeichen für diese Seite hinzufügen ... - Search Suchen @@ -239,62 +315,50 @@ Grund: CmdLineParser - Unknown option: %1 Unbekannte Option: %1 - Unknown widget: %1 Unbekanntes Widget-Objekt: %1 - The collection file '%1' does not exist. Die Katalogdatei '%1' existiert nicht. - Missing collection file. Fehlende Katalogdatei. - Invalid URL '%1'. Ungültige URL '%1'. - Missing URL. Fehlende URL. - Missing widget. Fehlendes Widget-Objekt. - The Qt help file '%1' does not exist. Die Hilfedatei '%1' existiert nicht. - Missing help file. Fehlende Hilfedatei. - Missing filter argument. Das Filter-Argument fehlt. - Error Fehler - Notice Hinweis @@ -302,12 +366,10 @@ Grund: ContentWindow - Open Link Link öffnen - Open Link in New Tab Link in neuem Reiter öffnen @@ -315,40 +377,52 @@ Grund: FilterNameDialogClass - Add Filter Name Filternamen hinzufügen - Filter Name: Filtername: + FindWidget + + Previous + Voriges + + + Next + Nächstes + + + Case Sensitive + Groß/Kleinschreibung beachten + + + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Seitenende erreicht + + + FontPanel - Font Schriftart - &Writing system S&kript - &Family &Schriftart - &Style S&chriftschnitt - &Point size &Schriftgrad @@ -356,30 +430,37 @@ Grund: HelpViewer - <title>about:blank</title> <title>about:blank</title> - <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>Fehler 404 ...</title><div align="center"><br><br><h1>Die Seite kann nicht gefunden werden.</h1><br><h3>'%1'</h3></div> + + Copy &Link Location + &Link-Adresse kopieren + + + Open Link in New Tab Ctrl+LMB + Link in neuem Reiter öffnen (Strg + linke Maustaste) + + + Open Link in New Tab + Link in neuem Reiter öffnen + IndexWindow - &Look for: Suchen &nach: - Open Link Link öffnen - Open Link in New Tab Link in neuem Reiter öffnen @@ -387,99 +468,76 @@ Grund: InstallDialog - - Install Documentation Dokumentation installieren - Downloading documentation info... Dokumentationsinformation herunterladen ... - Download canceled. Herunterladen abgebrochen. - - - Done. Fertig. - The file %1 already exists. Do you want to overwrite it? Die Datei %1 existiert bereits. Möchten Sie sie überschreiben? - Unable to save the file %1: %2. Die Datei %1 kann nicht gespeichert werden: %2. - Downloading %1... Herunterladen der Datei %1 ... - - - Download failed: %1. Herunterladen fehlgeschlagen: %1. - Documentation info file is corrupt! Die Dokumentationsdatei ist beschädigt. - Download failed: Downloaded file is corrupted. Herunterladen fehlgeschlagen: Die Datei ist wahrscheinlich beschädigt. - Installing documentation %1... Dokumentation %1 installieren ... - Error while installing documentation: %1 Fehler bei der Installation von: %1 - Available Documentation: Verfügbare Dokumentation: - Install Installieren - Cancel Abbrechen - Close Schließen - Installation Path: Installationsordner: - ... ... @@ -487,297 +545,234 @@ Grund: MainWindow - - Index Index - - Contents Inhalt - - Bookmarks Lesezeichen - Search Suchen - - - Qt Assistant Qt Assistant - Page Set&up... S&eite einrichten ... - Print Preview... Druckvorschau ... - &Print... &Drucken ... - New &Tab Neuer &Reiter - &Close Tab Reiter &schließen - &Quit &Beenden - CTRL+Q CTRL+Q - &Copy selected Text Ausgewählten Text &kopieren - &Find in Text... &Textsuche ... - &Find &Suchen - Find &Next &Weitersuchen - Find &Previous &Vorheriges suchen - Preferences... Einstellungen ... - Zoom &in &Vergrößern - Zoom &out Ver&kleinern - Normal &Size Standard&größe - Ctrl+0 Ctrl+0 - ALT+C ALT+C - ALT+I ALT+I - ALT+S ALT+S - &Home &Startseite - &Back &Rückwärts - &Forward &Vorwärts - Sync with Table of Contents Seite mit Inhaltsangabe abgleichen - Sync Synchronisieren - Next Page Nächste Seite - Ctrl+Alt+Right Ctrl+Alt+Right - Previous Page Vorherige Seite - Ctrl+Alt+Left Ctrl+Alt+Left - Could not register file '%1': %2 Die Datei '%1' konnte nicht registriert werden: %2 - About... Über ... - Navigation Toolbar Navigationsleiste - Toolbars Werkzeugleisten - Filter Toolbar Filterleiste - Filtered by: Filter: - Address Toolbar Adressleiste - Address: Adresse: - Could not find the associated content item. Der zugehörige Inhaltseintrag konnte nicht gefunden werden. - About %1 Über %1 - Updating search index Suchindex wird aufgebaut - Looking for Qt Documentation... Suche nach Qt-Dokumentation ... - &Window &Fenster - Minimize Minimieren - Ctrl+M Ctrl+M - Zoom Zoom - &File &Datei - &Edit &Bearbeiten - &View &Ansicht - &Go &Gehe zu - ALT+Home ALT+Home - &Bookmarks &Lesezeichen - &Help &Hilfe - ALT+O ALT+O @@ -785,48 +780,38 @@ Grund: PreferencesDialog - - Add Documentation Dokumentation hinzufügen - Qt Compressed Help Files (*.qch) Komprimierte Hilfedateien (*.qch) - The specified file is not a valid Qt Help File! Die angegebene Datei ist keine Qt-Hilfedatei. - The namespace %1 is already registered! Der Namespace %1 ist bereits registriert. - Remove Documentation Dokumentation entfernen - Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. Einige der derzeit geöffneten Dokumente stammen aus der Dokumentation, die Sie gerade zu löschen versuchen. Sie werden beim Löschen geschlossen. - Cancel Abbrechen - OK OK - Use custom settings Benutzerdefinierte Einstellungen verwenden @@ -834,117 +819,94 @@ Grund: PreferencesDialogClass - Preferences Einstellungen - Fonts Schriftart - Font settings: Schriftart: - Browser Browser - Application Anwendung - Filters Filter - Filter: Filter: - Attributes: Attribute: - 1 1 - Add Hinzufügen - Remove Entfernen - Documentation Dokumentation - Registered Documentation: Registrierte Dokumentation: - Add... Hinzufügen ... - Options Einstellungen - Current Page Aktuelle Seite - Restore to default Voreinstellung wiederherstellen - Homepage Startseite - On help start: Zu Beginn: - Show my home page Startseite zeigen - Show a blank page Leere Seite zeigen - Show my tabs from last session Reiter aus letzter Sitzung zeigen - Blank Page Leere Seite @@ -952,12 +914,10 @@ Grund: RemoteControl - Debugging Remote Control Debugging Remote Control - Received Command: %1 %2 Empfangenes Kommando: %1 : %2 @@ -965,22 +925,18 @@ Grund: SearchWidget - &Copy &Kopieren - Copy &Link Location &Link-Adresse kopieren - Open Link in New Tab Link in neuem Reiter öffnen - Select All Alles markieren @@ -988,27 +944,22 @@ Grund: TopicChooser - Choose a topic for <b>%1</b>: Wählen Sie ein Thema für <b>%1</b>: - Choose Topic Thema wählen - &Topics &Themen - &Display &Anzeigen - &Close &Schließen diff --git a/translations/designer_de.ts b/translations/designer_de.ts index b508b7f..9ff5099 100644 --- a/translations/designer_de.ts +++ b/translations/designer_de.ts @@ -4,27 +4,22 @@ AbstractFindWidget - &Previous &Vorige - &Next &Nächste - &Case sensitive &Groß/Kleinschreibung - Whole &words Nur ganze &Worte - <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/shared/images/wrap.png">&nbsp;Die Suche hat das Ende erreicht @@ -32,17 +27,14 @@ AddLinkDialog - Insert Link Link einfügen - Title: Titel: - URL: URL: @@ -50,7 +42,6 @@ AppFontDialog - Additional Fonts Zusätzliche Schriftarten @@ -58,37 +49,30 @@ AppFontManager - '%1' is not a file. '%1' ist keine Datei. - The font file '%1' does not have read permissions. Die Fontdatei '%1' hat keinen Lesezugriff. - The font file '%1' is already loaded. Die Fontdatei ist bereits geladen. - The font file '%1' could not be loaded. Die Fontdatei '%1' konnte nicht geladen werden. - '%1' is not a valid font id. '%1' ist keine gültige Id einer Schriftart. - There is no loaded font matching the id '%1'. Es ist keine Schriftart mit der Id '%1' geladen. - The font '%1' (%2) could not be unloaded. Die Schriftart '%1' (%2) konnte nicht entladen werden. @@ -96,52 +80,42 @@ AppFontWidget - Fonts Schriftarten - Add font files Schriftarten hinzufügen - Remove current font file Schriftart entfernen - Remove all font files Alle Schriftarten entfernen - Add Font Files Schriftarten hinzufügen - Font files (*.ttf) Schriftarten (*.ttf) - Error Adding Fonts Fehler beim Hinzufügen einer Schriftart - Error Removing Fonts Fehler beim Entfernen von Schriftarten - Remove Fonts Schriftarten entfernen - Would you like to remove all fonts? Möchten Sie alle Schriftarten entfernen? @@ -149,12 +123,10 @@ AppearanceOptionsWidget - Form Formular - User Interface Mode Fenstermodus @@ -162,17 +134,14 @@ AssistantClient - Unable to send request: Assistant is not responding. Fehler beim Senden einer Anforderung: Das Programm Assistant antwortet nicht. - The binary '%1' does not exist. Die ausführbare Datei '%1' existiert nicht. - Unable to launch assistant (%1). Das Programm Assistant kann nicht gestartet werden (%1). @@ -180,92 +149,74 @@ BrushPropertyManager - Style Stil - No brush Kein Muster - Solid Voll - Dense 1 Dichte 1 - Dense 2 Dichte 2 - Dense 3 Dichte 3 - Dense 4 Dichte 4 - Dense 5 Dichte 5 - Dense 6 Dichte 6 - Dense 7 Dichte 7 - Horizontal Horizontal - Vertical Vertikal - Cross Kreuzende Linien - Backward diagonal Rückwärtslehnende Diagonalen - Forward diagonal Vorwärtslehnende Diagonalen - Crossing diagonal Kreuzende Diagonalen - Color Farbe - [%1, %2] [%1, %2] @@ -273,360 +224,277 @@ Command - - Change signal Signal ändern - - Change slot Slot ändern - Change signal-slot connection Signale-Slotverbindung ändern - Change sender Sender ändern - Change receiver Empfänger ändern - Add connection Verbindung hinzufügen - Adjust connection Verbindung anpassen - Delete connections Verbindungen löschen - Change source Startpunkt ändern - Change target Endpunkt ändern - Insert '%1' '%1' einfügen - Raise '%1' '%1' nach vorn - Lower '%1' '%1' nach hinten - Delete '%1' '%1' löschen - Reparent '%1' '%1' einem anderen Widget zuordnen - Promote to custom widget Platzhalter für benutzerdefinierte Klasse erzeugen - Demote from custom widget Platzhalter für benutzerdefinierte Klasse entfernen - Lay out using grid Objekte tabellarisch anordnen - Lay out vertically Objekte senkrecht anordnen - Lay out horizontally Objekte waagrecht anordnen - Break layout Layout auflösen - - - Move Page Seite verschieben - - - - Delete Page Seite löschen - - Page Seite - page Seite - - - - Insert Page Seite einfügen - Change Tab order Seite ändern - Create Menu Bar Menü erzeugen - Delete Menu Bar Menüleiste löschen - Create Status Bar Statuszeile erzeugen - Delete Status Bar Statuszeile löschen - Add Tool Bar Werkzeugleiste hinzufügen - Add Dock Window Dockfenster hinzufügen - Adjust Size of '%1' Größe von '%1' anpassen - Change Form Layout Item Geometry Ändern des Formularlayout-Elements - Change Layout Item Geometry Geometrie des Layoutelements ändern - Change Table Contents Tabelleninhalt ändern - Change Tree Contents Bauminhalt ändern - - Add action Aktion hinzufügen - - Remove action Aktion löschen - Add menu Menü hinzufügen - Remove menu Menü löschen - Create submenu Untermenü erzeugen - Delete Tool Bar Werkzeugleiste löschen - Set action text Text der Aktion setzen - Insert action Aktion einfügen - - Move action Aktion verschieben - Change Title Titel ändern - Insert Menu Menü einfügen - Change signals/slots Signale/Slots ändern - Delete Subwindow Subfenster löschen - Insert Subwindow Subfenster einfügen - subwindow subwindow - Subwindow Subwindow - Change Z-order of '%1' Z-Reihenfolge von '%1' ändern - Simplify Grid Layout Tabellarisches Layout vereinfachen - Create button group Buttons gruppieren - Break button group Button-Gruppierung aufheben - Break button group '%1' Gruppierung '%1' aufheben - Add buttons to group Buttons zur Gruppierung hinzufügen - Remove buttons from group Buttons aus Gruppierung entfernen - Morph %1/'%2' into %3 MorphWidgetCommand description %1/'%2' in %3 umwandeln - Change layout of '%1' from %2 to %3 Layout von '%1' von %2 in %3 umwandeln - - Add '%1' to '%2' Command description for adding buttons to a QButtonGroup '%1' zu '%2' hinzufügen - Remove '%1' from '%2' Command description for removing buttons from a QButtonGroup '%1' aus '%2' entfernen - Change script Skript ändern - Changed '%1' of '%2' '%1' von '%2' geändert - Changed '%1' of %n objects Singular will never be shown @@ -635,12 +503,10 @@ - Reset '%1' of '%2' '%1' von '%2' zurücksetzen - Reset '%1' of %n objects Singular will never be shown @@ -649,12 +515,10 @@ - Add dynamic property '%1' to '%2' Dynamische Eigenschaft '%1' zu '%2' hinzufügen - Add dynamic property '%1' to %n objects Singular will never be shown @@ -663,12 +527,10 @@ - Remove dynamic property '%1' from '%2' Dynamische Eigenschaft '%1' von '%2' entfernen - Remove dynamic property '%1' from %n objects Dynamische Eigenschaft '%1' des Objektes entfernen @@ -679,22 +541,18 @@ ConnectDialog - Configure Connection Verbindung bearbeiten - GroupBox GroupBox - Edit... Ändern... - Show signals and slots inherited from QWidget Signale und Slots von QWidget anzeigen @@ -702,17 +560,14 @@ ConnectionDelegate - <object> <Objekt> - <signal> <Signal> - <slot> <Slot> @@ -720,19 +575,16 @@ DPI_Chooser - Standard (96 x 96) Embedded device standard screen resolution Standardauflösung (96 x 96) - Greenphone (179 x 185) Embedded device screen resolution Greenphone (179 x 185) - High (192 x 192) Embedded device high definition screen resolution Hohe Auflösung (192 x 192) @@ -741,89 +593,72 @@ Designer - Qt Designer Qt Designer - Unable to launch %1. %1 konnte nicht gestartet werden. - %1 timed out. Zeitüberschreitung bei der Ausführung von %1. - This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. Das Formular enthält freistehende Layoutelemente, die <b>nicht</b> gespeichert wurden. - Perhaps you forgot to create a layout? Haben Sie ein Layout eingefügt? - This file cannot be read because it was created using %1. Die Datei kann nicht gelesen werden, da sie mit %1 erzeugt wurde. - This file was created using Designer from Qt-%1 and cannot be read. Die Datei kann nicht gelesen werden, da sie mit dem Designer der Version %1 erzeugt wurde. - This file cannot be read because the extra info extension failed to load. Die Datei kann nicht gelesen werden (Fehler beim Laden der Daten der ExtraInfoExtension). - The converted file could not be read. Die konvertierte Datei konnte nicht gelesen werden. - Invalid UI file: The root element <ui> is missing. Fehler beim Lesen der ui-Datei: Das Wurzelelement <ui> fehlt. - An error has occurred while reading the UI file at line %1, column %2: %3 Fehler beim Lesen der ui-Datei bei Zeile %1, Spalte %2: %3 - This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. Die Datei wurde mit dem Designer der Version %1 erzeugt und wird zu einem neuen Formular konvertiert. - The old form has not been touched, but you will have to save the form under a new name. Sie bleibt unverändert.Das neue Formular muss unter einem neuen Namen abgespeichert werden. - This file was created using Designer from Qt-%1 and could not be read: %2 Das Lesen der von Designer %1 erzeugten Datei schlug fehl: %2 - Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. Bitte wandeln Sie sie mit dem Befehl <b>uic3&nbsp;-convert</b> zum Format von Qt 4. - Custom Widgets Benutzerdefinierte Widgets - Promoted Widgets Platzhalter für benutzerdefinierte Klassen @@ -831,12 +666,10 @@ DesignerMetaEnum - %1 is not a valid enumeration value of '%2'. %1 ist kein gültiger Wert der Aufzählung '%2'. - '%1' could not be converted to an enumeration value of type '%2'. '%1' konnte nicht in einen Wert der Aufzählung '%2' konvertiert werden. @@ -844,7 +677,6 @@ DesignerMetaFlags - '%1' could not be converted to a flag value of type '%2'. '%1' konnte nicht in einen Wert des Maskentyps '%2' konvertiert werden. @@ -852,13 +684,11 @@ DeviceProfile - '%1' is not a number. Reading a number for an embedded device profile '%1' ist keine gültige Zahl. - An invalid tag <%1> was encountered. Ein ungültiges Element '%1' wurde festgestellt. @@ -866,27 +696,22 @@ DeviceProfileDialog - &Family Schrift&familie - &Point Size Punktgröße - Style Stil - Device DPI Bildschirmauflösung - Name Name @@ -894,57 +719,46 @@ DeviceSkin - The image file '%1' could not be loaded. Die Pixmap-Datei '%1' konnte nicht geladen werden. - The skin directory '%1' does not contain a configuration file. Das Skin-Verzeichnis '%1' enthält keine Konfigurationsdatei. - The skin configuration file '%1' could not be opened. Die Skin-Konfigurationsdatei '%1' konnte nicht geöffnet werden. - Syntax error: %1 Syntaxfehler: %1 - The skin cursor image file '%1' does not exist. Die Skin-Bilddatei '%1' für den Cursor existiert nicht. - Syntax error in area definition: %1 Die Bereichsdefinition enthält einen Syntaxfehler: %1 - Mismatch in number of areas, expected %1, got %2. Die angegebene Anzahl der Bereiche (%1) stimmt nicht; es wurden %2 Bereiche gefunden. - The skin configuration file '%1' could not be read: %2 Die Skin-Konfigurationsdatei '%1' konnte nicht gelesen werden: %2 - The skin "up" image file '%1' does not exist. Die Skin-Konfigurationsdatei '%1' (oben) existiert nicht. - The skin "down" image file '%1' does not exist. Die Skin-Konfigurationsdatei '%1' (unten) existiert nicht. - The skin "closed" image file '%1' does not exist. Die Skin-Konfigurationsdatei '%1' (geschlossen) existiert nicht. @@ -952,7 +766,6 @@ EmbeddedOptionsControl - <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Stil</b></td><td>%3</td></tr><tr><td><b>Auflösung</b></td><td>%4 x %5</td></tr></table></html> @@ -961,13 +774,11 @@ EmbeddedOptionsPage - Embedded Design Tab in preferences dialog Embedded-Entwurf - Device Profiles EmbeddedOptionsControl group box" Profile @@ -976,27 +787,22 @@ FontPanel - Font Schriftart - &Writing system Schrifts&ystem - &Family Schrift&familie - &Style &Stil - &Point size &Punktgröße @@ -1004,22 +810,18 @@ FontPropertyManager - PreferDefault Voreinstellung bevorzugt - NoAntialias Keine Kantenglättung - PreferAntialias Kantenglättung bevorzugen - Antialiasing Kantenglättung @@ -1027,43 +829,44 @@ FormBuilder - Invalid stretch value for '%1': '%2' - Parsing layout stretch values + Parsing layout stretch values +---------- +Parsing layout stretch values +---------- +Parsing layout stretch values Ungültiger Stretch-Wert für '%1': '%2' - Invalid minimum size for '%1': '%2' - Parsing grid layout minimum size values + Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values FormEditorOptionsPage - %1 % %1 % - Preview Zoom Vergrößerungsfaktor für Vorschau - Default Zoom Vorgabe für Vergrößerungsfaktor - Forms Tab in preferences dialog Formulare - Default Grid Raster für neue Formulare @@ -1071,37 +874,30 @@ FormLayoutRowDialog - Add Form Layout Row Formularlayoutzeile hinzufügen - &Label text: Be&schriftung: - Field &type: &Datentyp: - &Field name: &Feldname: - &Buddy: &Buddy: - &Row: &Zeile: - Label &name: &Label-Name: @@ -1109,12 +905,10 @@ FormWindow - Unexpected element <%1> Ungültiges Element <%1> - Error while pasting clipboard contents at line %1, column %2: %3 Fehler beim Einfügen der Zwischenablage, Zeile %1, Spalte %2: %3 @@ -1122,62 +916,50 @@ FormWindowSettings - Form Settings Formulareinstellungen - Layout &Default &Layout-Standardwerte - &Spacing: A&bstand: - &Margin: &Rand: - &Layout Function Layout&funktion - Ma&rgin: Ra&nd: - Spa&cing: Abstan&d: - Embedded Design Embedded-Entwurf - &Author &Autor - &Include Hints &Include-Dateien - &Pixmap Function &Pixmapfunktion - Grid Raster @@ -1185,7 +967,6 @@ IconSelector - All Pixmaps ( Alle Pixmap-Dateien ( @@ -1193,7 +974,6 @@ ItemPropertyBrowser - XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser Ausgewähltes Icon, aus @@ -1202,33 +982,27 @@ MainWindowBase - Main Not currently used (main tool bar) Haupt-Werkzeugleiste - File Datei - Edit Bearbeiten - Tools Werkzeuge - Form Formular - Qt Designer Qt Designer @@ -1236,52 +1010,42 @@ NewForm - C&reate &Neu von Vorlage - Recent Zuletzt bearbeitet - &Close &Schließen - &Open... &Öffnen... - &Recent Forms &Zuletzt bearbeitete Formulare - Read error Lesefehler - New Form Neues Formular - Show this Dialog on Startup Diesen Dialog zu Beginn anzeigen - A temporary form file could not be created in %1. In dem Verzeichnis %1 konnte keine temporäre Formulardatei angelegt werden. - The temporary form file %1 could not be written. Die temporäre Formulardatei %1 konnte nicht geschrieben werden. @@ -1289,22 +1053,18 @@ ObjectInspectorModel - Object Objekt - Class Klasse - separator Trenner - <noname> <unbenannt> @@ -1312,12 +1072,10 @@ ObjectNameDialog - Change Object Name Objektnamen bearbeiten - Object Name Objektname @@ -1325,12 +1083,10 @@ PluginDialog - Plugin Information Plugins - 1 1 @@ -1338,7 +1094,6 @@ PreferencesDialog - Preferences Einstellungen @@ -1346,32 +1101,26 @@ PreviewConfigurationWidget - Form Formular - Print/Preview Configuration Druck/Vorschau - Style Stil - Style sheet Style sheet - ... ... - Device skin Geräte-Skin @@ -1379,7 +1128,6 @@ PromotionModel - Not used Usage of promoted widgets Nicht verwendet @@ -1388,8 +1136,6 @@ Q3WizardContainer - - Page Seite @@ -1397,58 +1143,47 @@ QAbstractFormBuilder - Unexpected element <%1> Ungültiges Element <%1> - An error has occurred while reading the UI file at line %1, column %2: %3 Fehler beim Lesen der ui-Datei bei Zeile %1, Spalte %2: %3 - Invalid UI file: The root element <ui> is missing. Fehler beim Lesen der ui-Datei: Das Wurzelelement <ui> fehlt. - The creation of a widget of the class '%1' failed. Es konnte kein Widget der Klasse '%1' erzeugt werden. - Attempt to add child that is not of class QWizardPage to QWizard. Es wurde versucht, einem Objekt der Klasse QWizard eine Seite hinzuzufügen, die nicht vom Typ QWizardPage ist. - Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. This indicates an inconsistency in the ui-file. Es wurde versucht, ein Layout auf das Widget '%1' (%2) zu setzen, welches bereits ein Layout vom Typ %3 hat. Das deutet auf eine Inkonsistenz in der ui-Datei hin. - Empty widget item in %1 '%2'. Leeres Widget-Item in %1 '%2'. - Flags property are not supported yet. Eigenschaften des Typs "Flag" werden nicht unterstützt. - While applying tab stops: The widget '%1' could not be found. Fehler beim Setzen der Tabulatorreihenfolge: Es konnte kein Widget mit dem Namen '%1' gefunden werden. - Invalid QButtonGroup reference '%1' referenced by '%2'. Ungültige Referenz der Buttongruppe '%1', referenziert von '%2'. - This version of the uitools library is linked without script support. Dies Version der uitools-Bibliothek unterstützt keine Skripte. @@ -1456,12 +1191,10 @@ This indicates an inconsistency in the ui-file. QAxWidgetPlugin - ActiveX control ActiveX-Steuerelement - ActiveX control widget ActiveX-Widget @@ -1469,22 +1202,18 @@ This indicates an inconsistency in the ui-file. QAxWidgetTaskMenu - Set Control Steuerelement setzen - Reset Control Steuerelement zurücksetzen - Licensed Control Lizensiertes Steuerelement - The control requires a design-time license Das Steuerelement erfordert eine Lizenz zur Entwurfszeit @@ -1492,67 +1221,54 @@ This indicates an inconsistency in the ui-file. QCoreApplication - %1 is not a promoted class. %1 ist kein Platzhalter für eine benutzerdefinierte Klasse. - The base class %1 is invalid. %1 ist keine gültige Basisklasse. - The class %1 already exists. Es existiert bereits eine Klasse namens %1. - Promoted Widgets Platzhalter für benutzerdefinierte Klassen - The class %1 cannot be removed Die Klasse %1 kann nicht gelöscht werden - The class %1 cannot be removed because it is still referenced. Die Klasse %1 kann nicht gelöscht werden, da sie gegenwärtig verwendet wird. - The class %1 cannot be renamed Die Klasse %1 kann nicht umbenannt werden - The class %1 cannot be renamed to an empty name. Der Klassennamen darf nicht leer sein (%1). - There is already a class named %1. Es existiert bereits eine Klasse namens %1. - Cannot set an empty include file. Der Name der Include-Datei darf nicht leer sein. - Exception at line %1: %2 Ausnahmefehler bei Zeile %1: %2 - Unknown error Unbekannter Fehler - An error occurred while running the script for %1: %2 Script: %3 Bei der Ausführung des Skripts für %1 trat ein Fehler auf: %2Skript: %3 @@ -1561,17 +1277,14 @@ Script: %3 QDesigner - %1 - warning %1 - Warnung - Qt Designer Qt Designer - This application cannot be used for the Console edition of Qt Diese Anwendung kann in der Qt-Konsolen-Edition nicht benutzt werden @@ -1579,207 +1292,162 @@ Script: %3 QDesignerActions - Edit Widgets Widgets bearbeiten - &Quit &Beenden - &Minimize &Minimieren - Bring All to Front Alle Formulare anzeigen - Preferences... Einstellungen... - Clear &Menu Menü &löschen - CTRL+SHIFT+S CTRL+SHIFT+S - CTRL+R CTRL+R - CTRL+M CTRL+M - Qt Designer &Help &Hilfe zum Qt Designer - Current Widget Help Hilfe zum ausgewählten Widget - What's New in Qt Designer? Was gibt es Neues beim Qt Designer? - About Plugins Plugins - - About Qt Designer Über Qt Designer - About Qt Über Qt - - Open Form Formular öffnen - - - Designer UI files (*.%1);;All Files (*) Designer-UI-Dateien (*.%1);;Alle Dateien (*) - %1 already exists. Do you want to replace it? Die Datei %1 existiert bereits. Möchten Sie sie überschreiben? - Saved %1. Das Formular %1 wurde gespeichert... - &Recent Forms &Zuletzt bearbeitete Formulare - Designer Designer - Feature not implemented yet! Diese Funktionalität ist noch nicht implementiert. - Read error Lesefehler - %1 Do you want to update the file location or generate a new form? %1 Möchten Sie einen anderen Namen eingeben oder ein neues Formular erzeugen? - &Update &Anderer Name - &New Form &Neues Formular - - Save Form? Formular speichern? - Could not open file Die Datei konnte nicht geöffnet werden - - The backup file %1 could not be written. Hintergrundsicherung: Die Datei %1 konnte nicht geschrieben werden. - The backup directory %1 could not be created. Hintergrundsicherung: Das Verzeichnis %1 konnte nicht angelegt werden. - The temporary backup directory %1 could not be created. Hintergrundsicherung: Das temporäre Verzeichnis %1 konnte nicht angelegt werden. - Please close all forms to enable the loading of additional fonts. Bitte schließen Sie alle Formulare, um zusätzliche Schriftarten zu laden. - Select New File Andere Datei - Could not write file Die Datei konnte nicht geschrieben werden - &Close Preview Vorschau &schließen - Save &Image... &Vorschaubild speichern... - &Print... &Drucken... - Additional Fonts... &Zusätzliche Schriftarten... - The file %1 could not be opened. Reason: %2 Would you like to retry or select a different file? @@ -1788,7 +1456,6 @@ Would you like to retry or select a different file? Möchten Sie es noch einmal versuchen oder eine andere Datei auswählen? - It was not possible to write the entire file %1 to disk. Reason:%2 Would you like to retry? @@ -1797,96 +1464,74 @@ Would you like to retry? Möchten Sie es noch einmal versuchen? - Image files (*.%1) Bilddateien (*.%1) - - Save Image Bild speichern - The file %1 could not be written. Die Datei %1 konnte nicht geschrieben werden. - &New... &Neu... - &Open... &Öffnen... - &Save &Speichern - Save &As... Speichern &unter... - Save A&ll &Alles speichern - Save As &Template... Als Vor&lage abspeichern... - - &Close &Schließen - View &Code... &Code anzeigen... - - Save Form As Formular unter einem anderen Namen speichern - Preview failed Es konnte keine Vorschau erzeugt werden - Code generation failed Es konnte kein Code generiert werden - - Assistant Assistant - Saved image %1. Das Vorschaubild wurde unter %1 gespeichert. - Printed %1. %1 wurde gedruckt. - ALT+CTRL+S ALT+CTRL+S @@ -1894,7 +1539,6 @@ Möchten Sie es noch einmal versuchen? QDesignerAppearanceOptionsPage - Appearance Tab in preferences dialog Ansicht @@ -1903,17 +1547,14 @@ Möchten Sie es noch einmal versuchen? QDesignerAppearanceOptionsWidget - Docked Window Dockfenster-Modus - Multiple Top-Level Windows Multifenster-Modus - Toolwindow Font Font für Dockfenster @@ -1921,22 +1562,18 @@ Möchten Sie es noch einmal versuchen? QDesignerAxWidget - Reset control Steuerelement zurücksetzen - Set control Steuerelement setzen - Control loaded Steuerelement geladen - A COM exception occurred when executing a meta call of type %1, index %2 of "%3". Beim Methodenaufruf des Typs %1, index %2 von "%3" trat eine COM-Ausnahme auf. @@ -1944,17 +1581,14 @@ Möchten Sie es noch einmal versuchen? QDesignerFormBuilder - Script errors occurred: Es sind Skriptfehler aufgetreten: - The preview failed to build. Es konnte keine Vorschau erzeugt werden. - Designer Designer @@ -1962,22 +1596,18 @@ Möchten Sie es noch einmal versuchen? QDesignerFormWindow - %1 - %2[*] %1 - %2[*] - Save Form? Formular speichern? - Do you want to save the changes to this document before closing? Möchten Sie die Änderungen an diesem Formular speichern? - If you don't save, your changes will be lost. Die Änderungen gehen verloren, wenn Sie nicht speichern. @@ -1985,38 +1615,30 @@ Möchten Sie es noch einmal versuchen? QDesignerMenu - Type Here Geben Sie Text ein - Add Separator Trenner hinzufügen - Insert separator Trenner einfügen - Remove action '%1' Aktion '%1' löschen - Remove separator Trenner löschen - - Add separator Trenner hinzufügen - Insert action Aktion einfügen @@ -2024,22 +1646,18 @@ Möchten Sie es noch einmal versuchen? QDesignerMenuBar - Type Here Geben Sie Text ein - Remove Menu '%1' Menü '%1' öschen - Remove Menu Bar Menüleiste löschen - Menu Menü @@ -2047,37 +1665,30 @@ Möchten Sie es noch einmal versuchen? QDesignerPluginManager - An XML error was encountered when parsing the XML of the custom widget %1: %2 Fehler beim Auswerten des XML des benutzerdefinierten Widgets %1: %2 - A required attribute ('%1') is missing. Bei dem Element fehlt ein erforderliches Attribut ('%1'). - An invalid property specification ('%1') was encountered. Supported types: %2 '%1' ist keine gültige Spezifikation einer Eigenschaft. Die folgenden Typen werden unterstützt: %2 - '%1' is not a valid string property specification. '%1' ist keine gültige Spezifikation einer Zeichenketten-Eigenschaft. - The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. Der XML-Code für das Widget %1 enthält kein gültiges Wurzelelement (<widget>, <ui>). - The class attribute for the class %1 is missing. Das Klassenattribut der Klasse %1 fehlt. - The class attribute for the class %1 does not match the class name %2. Das Klassenattribut der Klasse %1 entspricht nicht dem Klassennamen (%2). @@ -2085,7 +1696,6 @@ Möchten Sie es noch einmal versuchen? QDesignerPropertySheet - Dynamic Properties Dynamische Eigenschaften @@ -2093,31 +1703,26 @@ Möchten Sie es noch einmal versuchen? QDesignerResource - The layout type '%1' is not supported, defaulting to grid. Der Layout-Typ '%1' wird nicht unterstützt; es wurde ein Grid-Layout erzeugt. - The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. Die Container-Extension des Widgets '%1' (%2) gab für Seite %5 ein Widget '%3' (%4) zurück, was nicht von Designer verwaltet wird. Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifiziert werden. - Unexpected element <%1> Parsing clipboard contents Ungültiges Element <%1> - Error while pasting clipboard contents at line %1, column %2: %3 Parsing clipboard contents Fehler beim Einfügen der Zwischenablage, Zeile %1, Spalte %2: %3 - Error while pasting clipboard contents: The root element <ui> is missing. Parsing clipboard contents Fehler beim Einfügen der Zwischenablage: Das Wurzelelement <ui> fehlt. @@ -2126,12 +1731,10 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QDesignerSharedSettings - The template path %1 could not be created. Das Vorlagenverzeichnis %1 konnte nicht angelegt werden. - An error has been encountered while parsing device profile XML: %1 Beim Lesen des Profils trat ein Fehler auf: %1 @@ -2139,32 +1742,26 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QDesignerToolWindow - Property Editor Eigenschaften - Action Editor Aktionseditor - Object Inspector Objektanzeige - Resource Browser Ressourcen - Signal/Slot Editor Signale und Slots - Widget Box Widget-Box @@ -2172,97 +1769,78 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QDesignerWorkbench - &File &Datei - F&orm F&ormular - Preview in Vorschau im - &Window &Fenster - &Help &Hilfe - Edit Bearbeiten - Toolbars Werkzeugleisten - Save Forms? Formulare speichern? - &View &Ansicht - &Settings &Einstellungen - Widget Box Widgetbox - If you do not review your documents, all your changes will be lost. Die Änderungen gehen verloren, wenn Sie sich die Formulare nicht noch einmal ansehen. - Discard Changes Änderungen verwerfen - Review Changes Änderungen ansehen - Backup Information Information zur Hintergrundsicherung - The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? Designer wurde offenbar nicht ordnungsgemäß beendet; es existieren noch Dateien von der Hintergrundsicherung. Möchten Sie sie laden? - The file <b>%1</b> could not be opened. Die Datei <b>%1</b> konnte nicht geöffnet werden. - The file <b>%1</b> is not a valid Designer UI file. Die Datei <b>%1</b> ist keine gültige Designer-Datei. - There are %n forms with unsaved changes. Do you want to review these changes before quitting? Das Formular wurde geändert. Möchten Sie sich die Änderungen ansehen, bevor Sie das Programm beenden? @@ -2273,53 +1851,47 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QFormBuilder - An empty class name was passed on to %1 (object name: '%2'). - Empty class name passed to widget factory method + Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method Der Methode %1 wurde ein leerer Klassennamen übergeben (Name '%2'). - QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. QFormBuilder konnte kein benutzerdefiniertes Widget der Klasse '%1' erzeugen; es wurde ein Widget der Basisklasse '%2' erzeugt. - QFormBuilder was unable to create a widget of the class '%1'. QFormBuilder konnte kein Objekt der Klasse '%1' erzeugen. - The layout type `%1' is not supported. Layouts des Typs `%1' werden nicht unterstützt. - The set-type property %1 could not be read. Die Eigenschaft %1 konnte nicht gelesen werden (Typ: Menge). - The enumeration-type property %1 could not be read. Die Eigenschaft %1 konnte nicht gelesen werden (Typ: Aufzählung). - Reading properties of the type %1 is not supported yet. Das Lesen von Eigenschaften des Typs %1 wird nicht unterstützt. - The property %1 could not be written. The type %2 is not supported yet. Die Eigenschaft %1 konnte nicht geschrieben werden, da der Typ %2 nicht unterstützt wird. - The enumeration-value '%1' is invalid. The default value '%2' will be used instead. Der Aufzählungswert '%1' ist ungültig. Es wird der Vorgabewert '%2' verwendet. - The flag-value '%1' is invalid. Zero will be used instead. Der Flag-Wert '%1' ist ungültig. Es wird der Wert 0 verwendet. @@ -2327,48 +1899,38 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QStackedWidgetEventFilter - Previous Page Vorige Seite - Next Page Nächste Seite - Delete Löschen - Before Current Page Davor - After Current Page Danach - Change Page Order... Seiten umordnen.... - Change Page Order Seiten umordnen - Page %1 of %2 Seite %1 von %2 - - Insert Page Seite einfügen @@ -2376,12 +1938,10 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QStackedWidgetPreviewEventFilter - Go to previous page of %1 '%2' (%3/%4). Gehe zur vorigen Seite von %1 '%2' (%3/%4). - Go to next page of %1 '%2' (%3/%4). Gehe zur nächste Seite von %1 '%2' (%3/%4). @@ -2389,28 +1949,22 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QTabWidgetEventFilter - Delete Löschen - Before Current Page Davor - After Current Page Danach - Page %1 of %2 Seite %1 von %2 - - Insert Page Seite einfügen @@ -2418,37 +1972,30 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QToolBoxHelper - Delete Page Seite löschen - Before Current Page Davor - After Current Page Danach - Change Page Order... Seiten umordnen.... - Change Page Order Seiten umordnen - Page %1 of %2 Seite %1 von %2 - Insert Page Seite einfügen @@ -2456,15 +2003,10 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtBoolEdit - - - True Wahr - - False Falsch @@ -2472,12 +2014,10 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtBoolPropertyManager - True Wahr - False Falsch @@ -2485,7 +2025,6 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtCharEdit - Clear Char Zeichen löschen @@ -2493,7 +2032,6 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtColorEditWidget - ... ... @@ -2501,22 +2039,18 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtColorPropertyManager - Red Rot - Green Grün - Blue Blau - Alpha Alpha @@ -2524,97 +2058,78 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtCursorDatabase - Arrow Pfeil - Up Arrow Pfeil hoch - Cross Kreuzende Linien - Wait Sanduhr - IBeam IBeam - Size Vertical Vertikal vergrößern - Size Horizontal Horizontal vergrößern - Size Backslash Vergrößern/Backslash - Size Slash Vergrößern/Slash - Size All Alles vergrößern - Blank Leer - Split Vertical Vertikal aufteilen - Split Horizontal Horizontal aufteilen - Pointing Hand Hand - Forbidden Verboten - Open Hand Geöffnete Hand - Closed Hand Geschlossene Hand - What's This What's This - Busy Beschäftigt @@ -2622,12 +2137,10 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtFontEditWidget - ... ... - Select Font Schriftart auswählen @@ -2635,37 +2148,30 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtFontPropertyManager - Family Familie - Point Size Punktgröße - Bold Fett - Italic Kursiv - Underline Unterstreichen - Strikeout Durchgestrichen - Kerning Kerning @@ -2673,7 +2179,6 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientDialog - Edit Gradient Gradienten bearbeiten @@ -2681,304 +2186,242 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientEditor - Start X Anfangswert X - Start Y Anfangswert Y - Final X Endwert X - Final Y Endwert Y - - Central X Mittelpunkt X - - Central Y Mittelpunkt Y - Focal X Fokus X - Focal Y Fokus Y - Radius Radius - Angle Winkel - Linear Linear - Radial Radial - Conical Konisch - Pad Auffüllen - Repeat Wiederholen - Reflect Spiegeln - Form Form - Gradient Editor Gradienten bearbeiten - 1 1 - 2 2 - 3 3 - 4 4 - 5 5 - Gradient Stops Editor Bezugspunkte - 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. Diese Fläche dient zum Bearbeiten der Bezugspunkte. Doppelklicken Sie auf einen Bezugspunkt, um ihn zu duplizieren. Doppelklicken Sie auf die Fläche, um einen neuen Bezugspunkt zu erzeugen. Benutzen Sie Drag & Drop um einen Punkt zu verschieben. Die rechte Maustaste aktiviert ein Menü mit weiteren Optionen. - Zoom Vergrößern - Position Position - Hue Farbton - H H - Saturation Sättigung - S S - Sat Sättigung - Value Wert - V V - Val Wert - Alpha Alpha - A A - Type Typ - Spread Ausbreitung - Color Farbe - Current stop's color Farbe des Bezugspunkts - HSV HSV - RGB RGB - Current stop's position Position des Bezugspunkts - % % - Zoom In Vergrößern - Zoom Out Verkleinern - Toggle details extension Weiter Optionen einblenden - > > - Linear Type Typ linear - ... ... - Radial Type Typ radial - Conical Type Typ konisch - Pad Spread Auffüllen - Repeat Spread Wiederholen - Reflect Spread Spiegeln - 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. Dieser Bereich zeigt eine Vorschau des in Bearbeitung befindlichen Gradienten. Hier können Gradienttyp-spezifische Parameter, wie Start- und Endpunkt, Radius etc. per Drag & Drop bearbeitet werden. - Show HSV specification HSV-Spezifikation anzeigen - Show RGB specification RGB-Spezifikation anzeigen - Reset Zoom Vergrößerung zurücksetzen @@ -2986,37 +2429,30 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientStopsWidget - New Stop Neuer Bezugspunkt - Delete Löschen - Flip All Alles umkehren - Select All Alles auswählen - Zoom In Vergrößern - Zoom Out Verkleinern - Reset Zoom Vergrößerung zurücksetzen @@ -3024,46 +2460,34 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientView - Grad Grad - Remove Gradient Gradient löschen - Are you sure you want to remove the selected gradient? Möchten Sie den ausgewählten Gradienten löschen? - - New... Neu... - - Edit... Ändern... - - Rename Umbenennen - - Remove Löschen - Gradient View Gradientenanzeige @@ -3071,8 +2495,6 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientViewDialog - - Select Gradient Gradienten auswählen @@ -3080,7 +2502,6 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtKeySequenceEdit - Clear Shortcut Tastenkürzel löschen @@ -3088,17 +2509,14 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtLocalePropertyManager - %1, %2 %1, %2 - Language Sprache - Country Land @@ -3106,17 +2524,14 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtPointFPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3124,17 +2539,14 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtPointPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3142,12 +2554,10 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtPropertyBrowserUtils - [%1, %2, %3] (%4) [%1, %2, %3] (%4) - [%1, %2] [%1, %2] @@ -3155,27 +2565,22 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtRectFPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - X X - Y Y - Width Breite - Height Höhe @@ -3183,27 +2588,22 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtRectPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - X X - Y Y - Width Breite - Height Höhe @@ -3211,33 +2611,26 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtResourceEditorDialog - Edit Resources Ressourcen bearbeiten - New... Neu... - - New Resource File Neue Ressourcendatei - <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> <p><b>Hinweis:</b><p>Die gewählte Datei: </p><p>%1</p><p>befindet sich außerhalb des Verzeichnisses der Ressourcendatei:</p> - <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> <p>Bitte wählen Sie:</p><table><tr><th align="left">Kopieren</th><td>um die Datei in das Verzeichnis der Ressourcendatei zu kopieren.</td></tr><tr><th align="left">Kopieren nach...</th><td>um die Datei in ein Unterverzeichnis der Ressourcendatei zu kopieren.</td></tr><tr><th align="left">Beibehalten</th><td>um die Datei in ihrem gegenwärtigen Verzeichnis zu verwenden.</td></tr></table> - Could not copy %1 to @@ -3248,248 +2641,192 @@ zu: %2 - A parse error occurred at line %1, column %2 of %3: %4 In der Datei %3 wurde bei Zeile %1, Spalte %2 ein Fehler gefunden: %4 - Open... Öffnen... - - Remove Löschen - - Move Up Nach oben - - Move Down Nach unten - - Add Prefix Präfix hinzufügen - Add Files... Dateien hinzufügen... - Change Prefix Präfix ändern - Change Language Sprache ändern - Change Alias Alias ändern - Clone Prefix... Präfix doppeln... - Prefix / Path Präfix / Pfad - Language / Alias Sprache / Alias - <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> <html><p><b>Warnung:</b> Beim Neuladen der Ressourcen traten Fehler auf:</p><pre>%1</pre></html> - Resource Warning Ressourcen - Warnung - Dialog Dialog - New File Neue Datei - N N - Remove File Datei löschen - R L - I I - New Resource Neue Ressource - A A - Remove Resource or File Datei oder Ressource löschen - %1 already exists. Do you want to replace it? Die Datei %1 existiert bereits. Wollen Sie sie überschreiben? - The file does not appear to be a resource file; element '%1' was found where '%2' was expected. Die Datei ist offenbar keine Ressourcendatei; an Stelle des erwarteten Elements '%2' wurde das Element '%1' gefunden. - %1 [read-only] %1 [schreibgeschützt] - - %1 [missing] %1 [fehlt] - <no prefix> <kein Präfix> - - Resource files (*.qrc) Ressourcendateien (*.qrc) - Import Resource File Ressourcendatei importieren - newPrefix newPrefix - Add Files Dateien hinzufügen - Incorrect Path Fehlerhafte Pfadangabe - - - - Copy Kopieren - Copy As... Kopieren nach... - Keep Beibehalten - Skip Überspringen - Clone Prefix Präfix doppeln - Enter the suffix which you want to add to the names of the cloned files. This could for example be a language extension like "_de". Bitte geben Sie den Suffix ein, der an den Namen der gedoppelten Dateien angehängt werden soll. Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. - - Copy As Kopieren nach - <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> <p>Die gewählte Datei: </p><p>%1</p><p>befindet sich außerhalb des Verzeichnisses der Ressourcendatei:</p><p>%2</p><p>Bitte wählen Sie einen anderen Pfad, der im Verzeichnis der Ressourcendatei enthalten ist.</p> - Could not overwrite %1. %1 konnte nicht überschrieben werden. - Save Resource File Ressourcendatei speichern - Could not write %1: %2 Die Datei %1konnte nicht geschrieben werden: %2 - Open Resource File Ressourcendatei öffnen @@ -3497,24 +2834,20 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtResourceView - Size: %1 x %2 %3 Größe: %1 x %2 %3 - Edit Resources... Ressourcen bearbeiten... - Reload Neu laden - Copy Path Pfad kopieren @@ -3522,7 +2855,6 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtResourceViewDialog - Select Resource Ressource auswählen @@ -3530,17 +2862,14 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtSizeFPropertyManager - %1 x %2 %1 x %2 - Width Breite - Height Höhe @@ -3548,33 +2877,26 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtSizePolicyPropertyManager - - <Invalid> <Ungültig> - [%1, %2, %3, %4] [%1, %2, %3, %4] - Horizontal Policy Horizontale Einstellung - Vertical Policy Vertikale Einstellung - Horizontal Stretch Horizontaler Dehnungsfaktor - Vertical Stretch Vertikaler Dehnungsfaktor @@ -3582,17 +2904,14 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtSizePropertyManager - %1 x %2 %1 x %2 - Width Breite - Height Höhe @@ -3600,107 +2919,86 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtToolBarDialog - < S E P A R A T O R > < T R E N N E R > - Customize Toolbars Werkzeugleisten anpassen - 1 1 - Actions Aktionen - Toolbars Werkzeugleisten - New Neu - Remove Löschen - Rename Umbenennen - Up Nach oben - <- <- - -> -> - Down Nach unten - Current Toolbar Actions Aktionen - Custom Toolbar Benutzerdefinierte Werkzeugleiste - Add new toolbar Neue Werkzeugleiste hinzufügen - Remove selected toolbar Ausgewählte Werkzeugleiste '%1' löschen - Rename toolbar Werkzeugleiste umbenennen - Move action up Aktion eins nach oben - Remove action from toolbar Aktion aus Werkzeugleiste entfernen - Add action to toolbar Aktion zu Werkzeugleiste hinzufügen - Move action down Aktion eins nach unten @@ -3708,12 +3006,10 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtTreePropertyBrowser - Property Eigenschaft - Value Wert @@ -3721,64 +3017,52 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. SaveFormAsTemplate - Add path... Verzeichnis anlegen... - Template Exists Die Vorlage existiert bereits - A template with the name %1 already exists. Do you want overwrite the template? Es existiert bereits eine Vorlage mit dem Namen %1. Möchten Sie sie überschreiben? - Overwrite Template Vorlage überschreiben - Open Error Fehler beim Öffnen - There was an error opening template %1 for writing. Reason: %2 Die Vorlage %1 konnte nicht in eine Datei geschrieben werden: %2 - Write Error Schreibfehler - There was an error writing the template %1 to disk. Reason: %2 Die Vorlage %1 konnte nicht in eine Datei geschrieben werden: %2 - Pick a directory to save templates in Wählen Sie ein Verzeichnis zum Abspeichern der Vorlagen aus - Save Form As Template Formular als Vorlage abspeichern - &Category: &Kategorie: - &Name: &Name: @@ -3786,7 +3070,6 @@ Möchten Sie sie überschreiben? ScriptErrorDialog - An error occurred while running the scripts for "%1": Bei der Ausführung der Skripte für "%1" sind Fehler aufgetreten: @@ -3796,22 +3079,18 @@ Möchten Sie sie überschreiben? SelectSignalDialog - Go to slot - Select signal - signal Signal - class Klasse @@ -3819,7 +3098,6 @@ Möchten Sie sie überschreiben? SignalSlotConnection - SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) SENDER(%1), SIGNAL(%2), EMPFÄNGER(%3), SLOT(%4) @@ -3827,32 +3105,26 @@ Möchten Sie sie überschreiben? SignalSlotDialogClass - Signals and slots Signale und Slots - Slots Slots - ... ... - Signals Signale - Add Hinzufügen - Delete Löschen @@ -3860,12 +3132,10 @@ Möchten Sie sie überschreiben? Spacer - Horizontal Spacer '%1', %2 x %3 Horizontales Füllelement '%1', %2 x %3 - Vertical Spacer '%1', %2 x %3 Vertikales Füllelement '%1', %2 x %3 @@ -3873,7 +3143,6 @@ Möchten Sie sie überschreiben? TemplateOptionsPage - Template Paths Tab in preferences dialog Verzeichnisse für Vorlagen @@ -3882,52 +3151,42 @@ Möchten Sie sie überschreiben? ToolBarManager - Configure Toolbars... Werkzeugleiste konfigurieren... - Window Fenster - Help Hilfe - Style Stil - Dock views Dockfenster - File Datei - Edit Bearbeiten - Tools Werkzeuge - Form Formular - Toolbars Werkzeugleisten @@ -3935,30 +3194,64 @@ Möchten Sie sie überschreiben? VersionDialog - <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>Version %2 - Qt Designer Qt Designer - <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> - %1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + VideoPlayerTaskMenu + + Available Mime Types + Verfügbare Mime-Typen + + + Display supported mime types... + Verfügbare Mime-Typen anzeigen... + + + Load... + Laden... + + + Play + Wiedergabe + + + Pause + Pause + + + Stop + Stop + + + Choose Video Player Media Source + Medienquelle wählen + + + An error has occurred in '%1': %2 + In '%1' ist ein Fehler aufgetreten: %2 + + + Video Player Error + Video Player Fehler + + + WidgetDataBase - The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. Die Datei enthält ein benutzerdefiniertes Widget '%1' dessen Basisklasse (%2) nicht mit dem Eintrag in der Widget-Datenbank übereinstimmt. Die Widget-Datenbank wird nicht geändert. @@ -3966,87 +3259,70 @@ Möchten Sie sie überschreiben? qdesigner_internal::ActionEditor - Actions Aktionen - New... Neu... - Delete Löschen - New action Neue Aktion - Edit action Aktion ändern - Edit... Ändern... - Go to slot... Slot anzeigen... - Copy Kopieren - Cut Ausschneiden - Paste Einfügen - Select all Alles auswählen - Icon View Icon-Ansicht - Detailed View Detaillierte Ansicht - Remove actions Aktionen löschen - Remove action '%1' Aktion '%1' löschen - Used In Verwendet in - Configure Action Editor Aktionseditor konfigurieren @@ -4054,32 +3330,26 @@ Möchten Sie sie überschreiben? qdesigner_internal::ActionModel - Name Name - Used Verwendet - Text Text - Shortcut Tastenkürzel - Checkable Ankreuzbar - ToolTip ToolTip @@ -4087,27 +3357,22 @@ Möchten Sie sie überschreiben? qdesigner_internal::BrushManagerProxy - The element '%1' is missing the required attribute '%2'. Bei dem Element fehlt das erforderliche Attribut '%2'. - Empty brush name encountered. Fehlender Name bei der Brush-Definition. - An unexpected element '%1' was encountered. Ein ungültiges Element '%1' wurde festgestellt. - An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 Fehler beim Lesen der Brush-Datei '%1' bei Zeile %2, Spalte %3: %4 - An error occurred when reading the resource file '%1' at line %2, column %3: %4 Fehler beim Lesen der Ressourcen-Datei '%1' bei Zeile %2, Spalte %3: %4 @@ -4115,17 +3380,14 @@ Möchten Sie sie überschreiben? qdesigner_internal::BuddyEditor - Add buddy Buddy hinzufügen - Remove buddies Buddies löschen - Remove %n buddies Buddy löschen @@ -4133,7 +3395,6 @@ Möchten Sie sie überschreiben? - Add %n buddies Buddy hinzufügen @@ -4141,7 +3402,6 @@ Möchten Sie sie überschreiben? - Set automatically Automatisch setzen @@ -4149,7 +3409,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::BuddyEditorPlugin - Edit Buddies Buddies bearbeiten @@ -4157,7 +3416,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::BuddyEditorTool - Edit Buddies Buddies bearbeiten @@ -4165,12 +3423,10 @@ Möchten Sie sie überschreiben? qdesigner_internal::ButtonGroupMenu - Select members Mitglieder auswählen - Break Aufheben @@ -4178,32 +3434,26 @@ Möchten Sie sie überschreiben? qdesigner_internal::ButtonTaskMenu - Assign to button group Gruppierung - Button group Gruppierung - New button group Neue Gruppierung - Change text... Text ändern... - None Keine - Button group '%1' Gruppierung '%1' @@ -4211,57 +3461,46 @@ Möchten Sie sie überschreiben? qdesigner_internal::CodeDialog - Save... Speichern... - Copy All Alles kopieren - &Find in Text... &Suchen... - A temporary form file could not be created in %1. In dem Verzeichnis %1 konnte keine temporäre Formulardatei angelegt werden. - The temporary form file %1 could not be written. Die temporäre Formulardatei %1 konnte nicht geschrieben werden. - %1 - [Code] %1 - [Code] - Save Code Code speichern - Header Files (*.%1) Include-Dateien (*.%1) - The file %1 could not be opened: %2 Die Datei %1 konnte nicht geöffnet werden: %2 - The file %1 could not be written: %2 Die Datei %1 konnte nicht geschrieben werden: %2 - %1 - Error %1 - Fehler @@ -4269,7 +3508,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::ColorAction - Text Color Schriftfarbe @@ -4277,12 +3515,10 @@ Möchten Sie sie überschreiben? qdesigner_internal::ComboBoxTaskMenu - Edit Items... Einträge ändern... - Change Combobox Contents Inhalt der Combobox ändern @@ -4290,7 +3526,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::CommandLinkButtonTaskMenu - Change description... Beschreibung ändern... @@ -4298,17 +3533,14 @@ Möchten Sie sie überschreiben? qdesigner_internal::ConnectionEdit - Select All Alles auswählen - Delete Löschen - Deselect All Auswahl rücksetzen @@ -4316,52 +3548,42 @@ Möchten Sie sie überschreiben? qdesigner_internal::ConnectionModel - Sender Sender - Signal - Receiver Empfänger - Slot Slot - <sender> <Sender> - <signal> <Signal> - <receiver> <Receiver> - <slot> <Slot> - Signal and Slot Editor Signal/Slot editor - The connection already exists!<br>%1 Diese Verbindung existiert bereits!<br>%1</br> @@ -4369,42 +3591,34 @@ Möchten Sie sie überschreiben? qdesigner_internal::ContainerWidgetTaskMenu - Insert Page Before Current Page Seite davor einfügen - Insert Page After Current Page Seite danach einfügen - Add Subwindow Subfenster hinzufügen - Delete Löschen - Insert Einfügen - Subwindow Subwindow - Page Seite - Page %1 of %2 Seite %1 von %2 @@ -4412,19 +3626,16 @@ Möchten Sie sie überschreiben? qdesigner_internal::DPI_Chooser - x DPI X/Y separator x - System (%1 x %2) System resolution System (%1 x %2) - User defined Benutzerdefiniert @@ -4432,49 +3643,38 @@ Möchten Sie sie überschreiben? qdesigner_internal::DesignerPropertyManager - - AlignLeft Linksbündig ausrichten - AlignHCenter Horizontal zentrieren - AlignRight Rechtsbündig ausrichten - AlignJustify Blocksatz - AlignTop Am oberen Rand ausrichten - - AlignVCenter Vertikal zentrieren - AlignBottom Am unteren Rand zentrieren - %1, %2 %1, %2 - Customized (%n roles) Angepasst (eine Rolle) @@ -4482,75 +3682,58 @@ Möchten Sie sie überschreiben? - Inherited Geerbt - Horizontal Horizontal - Vertical Vertikal - Normal Off Normal, aus - Normal On Normal, ein - Disabled Off Nicht verfügbar, aus - Disabled On Verfügbar, ein - Active Off Aktiv, aus - Active On Aktiv, ein - Selected Off Ausgewählt, aus - Selected On Ausgewählt, ein - - translatable Übersetzung - - disambiguation Kennung - - comment Kommentar @@ -4558,48 +3741,38 @@ Möchten Sie sie überschreiben? qdesigner_internal::DeviceProfileDialog - Device Profiles (*.%1) Profile - Default Vorgabe - Save Profile Profil speichern - Save Profile - Error Fehler beim Speichern des Profils - Unable to open the file '%1' for writing: %2 Die Datei '%1' konnte nicht zum Schreiben geöffnet werden: %2 - Unable to open the file '%1' for reading: %2 Die Datei '%1' konnte nicht zum Lesen geöffnet werden: %2 - '%1' is not a valid profile: %2 '%1' ist kein gültiges Profil: %2 - Open profile Profil öffnen - - Open Profile - Error Fehler beim Öffnen des Profils @@ -4607,57 +3780,46 @@ Möchten Sie sie überschreiben? qdesigner_internal::Dialog - Dialog Dialog - StringList Liste von Zeichenketten - New String Neue Zeichenkette - &New &Neu - Delete String Zeichenkette löschen - &Delete &Löschen - &Value: &Wert: - Move String Up Zeichenkette eins nach oben - Up Hoch - Move String Down Zeichenkette eins nach unten - Down Runter @@ -4665,52 +3827,42 @@ Möchten Sie sie überschreiben? qdesigner_internal::EmbeddedOptionsControl - None Vorgabe - Add a profile Profil hinzufügen - Edit the selected profile Ausgewähltes Profil modifizieren - Delete the selected profile Ausgewähltes Profil löschen - Add Profile Profil hinzufügen - New profile Neues Profil - Edit Profile Profil ändern - Delete Profile Profil löschen - Would you like to delete the profile '%1'? Möchten Sie das Profil '%1' löschen? - Default Vorgabe @@ -4718,12 +3870,10 @@ Möchten Sie sie überschreiben? qdesigner_internal::FilterWidget - Filter Filter - Clear text Text löschen @@ -4731,12 +3881,10 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormEditor - Resource File Changed Änderung einer Ressourcendatei - The file "%1" has changed outside Designer. Do you want to reload it? Die Ressourcendatei "%1" wurde außerhalb Designer geändert. Möchten Sie sie neu laden? @@ -4744,7 +3892,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormLayoutMenu - Add form layout row... Zeile hinzufügen... @@ -4752,43 +3899,34 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormWindow - Edit contents Ändern - F2 F2 - Resize Größe ändern - Key Move Verschieben mittels Tastatur - Paste error Fehler beim Einfügen - Lay out Layout - - Drop widget Widget einfügen - Paste %n action(s) Eine Aktion einfügen @@ -4796,17 +3934,14 @@ Möchten Sie sie überschreiben? - Insert widget '%1' Widget '%1' einfügen - Key Resize Größe ändern mittels Tastatur - Paste %n widget(s) Widget einfügen @@ -4814,37 +3949,30 @@ Möchten Sie sie überschreiben? - Paste (%1 widgets, %2 actions) Einfügen (%1 Widgets, %2 Aktionen) - Cannot paste widgets. Designer could not find a container without a layout to paste into. Die Widgets konnten nicht eingefügt werden, da kein Container gefunden werden konnte, der nicht bereits ein Layout hat. - Break the layout of the container you want to paste into, select this container and then paste again. Bitte lösen Sie das Layout des gewünschten Containers auf und wählen Sie ihn erneut aus, um die Widgets einzufügen. - Select Ancestor Übergeordnetes Widget auswählen - A QMainWindow-based form does not contain a central widget. Ein auf QMainWindow basierendes Formular enthält kein zentrales Widget. - Raise widgets Widgets nach vorn bringen - Lower widgets Widgets nach hinten setzen @@ -4852,12 +3980,10 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormWindowBase - Delete Löschen - Delete '%1' '%1' löschen @@ -4865,200 +3991,159 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormWindowManager - Cu&t &Ausschneiden - Cuts the selected widgets and puts them on the clipboard Schneidet die ausgewählten Widgets aus und legt sie in der Zwischenablage ab - &Copy &Kopieren - Copies the selected widgets to the clipboard Kopiert die ausgewählten Widgets in die Zwischenablage - &Paste &Einfügen - Pastes the clipboard's contents Fügt den Inhalt der Zwischenablage ein - &Delete &Löschen - Deletes the selected widgets Löscht die ausgewählten Widgets - Select &All &Alles auswählen - Selects all widgets Wählt alle Widget aus - Bring to &Front Nach &vorn - - Raises the selected widgets Bringt das ausgewählte Widget nach vorn - Send to &Back Nach &hinten - - Lowers the selected widgets Stellt das ausgewählte Widget nach hinten - Adjust &Size &Größe anpassen - Adjusts the size of the selected widget Berechnet die Größe des ausgewählten Widgets aus dem Layout und passt das Widget an - Lay Out &Horizontally Objekte &waagrecht anordnen - Lays out the selected widgets horizontally Ordnet die ausgewähltenObjekte waagrecht an - Lay Out &Vertically Objekte &senkrecht anordnen - Lays out the selected widgets vertically Ordnet die ausgewählten Objekte senkrecht an - Lay Out in a &Grid Objekte &tabellarisch anordnen - Lays out the selected widgets in a grid Ordnet die ausgewählten Objekte tabellarisch an - Lay Out Horizontally in S&plitter Objekte waagrecht um Spl&itter anordnen - Lays out the selected widgets horizontally in a splitter Ordnet die ausgewählten Objekte um einen Splitter waagrecht an - Lay Out Vertically in Sp&litter Objekte senkrecht um Spl&itter anordnen - Lays out the selected widgets vertically in a splitter Ordnet die ausgewählten Objekte um einen Splitter senkecht an - &Break Layout La&yout auflösen - Breaks the selected layout Löst das ausgewählte Layout auf - &Preview... &Vorschau... - Preview current form Vorschau des Formulars - Form &Settings... Formular&einstellungen... - Break Layout Layout auflösen - Adjust Size Größe anpassen - Could not create form preview Title of warning message box Es konnte keine Vorschau erzeugt werden - Form Settings - %1 Formulareinstellungen - %1 - Removes empty columns and rows Entfernt unbesetzte Zeilen und Spalten - Lay Out in a &Form Layout Objekte in &Formularlayout anordnen - Lays out the selected widgets in a form layout Ordnet die ausgewählten Objekte in einem zweispaltigen Formularlayout an - Si&mplify Grid Layout Tabellarisches Layout &vereinfachen @@ -5066,12 +4151,10 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormWindowSettings - None Kein - Device Profile: %1 Profil: %1 @@ -5079,37 +4162,30 @@ Möchten Sie sie überschreiben? qdesigner_internal::GridPanel - Visible Sichtbar - Snap Einschnappen - Reset Rücksetzen - Form Formular - Grid Raster - Grid &X Raster &X - Grid &Y Raster &Y @@ -5117,7 +4193,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::GroupBoxTaskMenu - Change title... Titel ändern... @@ -5125,7 +4200,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::HtmlTextEdit - Insert HTML entity HTML-Sonderzeichen einfügen @@ -5133,92 +4207,74 @@ Möchten Sie sie überschreiben? qdesigner_internal::IconSelector - The pixmap file '%1' cannot be read. Die Pixmap-Datei '%1' kann nicht gelesen werden. - The file '%1' does not appear to be a valid pixmap file: %2 Die Datei '%1' ist keine gültige Pixmap-Datei: %2 - The file '%1' could not be read: %2 Die Datei '%1' konnte nicht gelesen werden: %2 - Pixmap Read Error Fehler beim Lesen der Pixmap - ... ... - Normal Off Normal, aus - Normal On Normal, ein - Disabled Off Nicht verfügbar, aus - Disabled On Verfügbar, ein - Active Off Aktiv, aus - Active On Aktiv, ein - Selected Off Ausgewählt, aus - Selected On Ausgewählt, ein - Choose Resource... Ressource auswählen... - Choose File... Datei auswählen... - Reset Rücksetzen - Reset All Alle rücksetzen - Choose a Pixmap Pixmap-Datei auswählen @@ -5226,58 +4282,46 @@ Möchten Sie sie überschreiben? qdesigner_internal::ItemListEditor - Properties &<< Eigenschaften &<< - - Properties &>> Eigenschaften &>> - Items List Liste der Elemente - New Item Neues Element - &New &Neu - Delete Item Element löschen - &Delete &Löschen - Move Item Up Element eins nach oben - U U - Move Item Down Element eins nach unten - D D @@ -5285,12 +4329,10 @@ Möchten Sie sie überschreiben? qdesigner_internal::LabelTaskMenu - Change rich text... Formatierbaren Text ändern... - Change plain text... Text ändern... @@ -5298,7 +4340,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::LanguageResourceDialog - Choose Resource Ressource auswählen @@ -5306,7 +4347,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::LineEditTaskMenu - Change text... Text ändern... @@ -5314,17 +4354,14 @@ Möchten Sie sie überschreiben? qdesigner_internal::ListWidgetEditor - Edit List Widget List-Widget ändern - Edit Combobox Combobox ändern - New Item Neues Element @@ -5332,12 +4369,10 @@ Möchten Sie sie überschreiben? qdesigner_internal::ListWidgetTaskMenu - Edit Items... Elemente ändern... - Change List Contents Inhalt der Liste ändern @@ -5345,22 +4380,18 @@ Möchten Sie sie überschreiben? qdesigner_internal::MdiContainerWidgetTaskMenu - Next Subwindow Nächste Unterfenster - Previous Subwindow Voriges Unterfenster - Tile Nebeneinander anordnen - Cascade Stapeln @@ -5368,7 +4399,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::MenuTaskMenu - Remove Löschen @@ -5376,7 +4406,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::MorphMenu - Morph into Widget umwandeln in @@ -5384,42 +4413,34 @@ Möchten Sie sie überschreiben? qdesigner_internal::NewActionDialog - New Action... Neue Aktion... - &Text: &Text: - Shortcut: Tastenkürzel - Checkable: Ankreuzbar: - ToolTip: ToolTip: - ... ... - &Icon: &Icon: - Object &name: Objekt&name: @@ -5427,40 +4448,33 @@ Möchten Sie sie überschreiben? qdesigner_internal::NewDynamicPropertyDialog - Set Property Name Namen der Eigenschaft setzen - The current object already has a property named '%1'. Please select another, unique one. Das Objekt besitzt eine bereits eine Eigenschaft namens '%1'. Bitte wählen Sie einen anderen, eindeutigen Namen. - Create Dynamic Property Dynamische Eigenschaft erzeugen - Property Name Name der Eigenschaft - Property Type Typ der Eigenschaft - The '_q_' prefix is reserved for the Qt library. Please select another name. Der Präfix '_q_' wird von der Qt-Bibliothek für interne Zwecke verwendet.Bitte wählen Sie einen anderen Namen. - horizontalSpacer @@ -5468,83 +4482,67 @@ Please select another name. qdesigner_internal::NewFormWidget - Default size Vorgabe - QVGA portrait (240x320) QVGA Hochformat (240x320) - QVGA landscape (320x240) QVGA Querformat (320x240) - VGA portrait (480x640) VGA Hochformat (480x640) - VGA landscape (640x480) VGA Querformat (640x480) - Widgets New Form Dialog Categories Widgets - Custom Widgets Benutzerdefinierte Widgets - None Kein - Error loading form Das Formular konnte nicht geladen werden - Unable to open the form template file '%1': %2 Die Formularvorlage '%1' konnte nicht geöffnet werden: %2 - Internal error: No template selected. Interner Fehler: Es ist keine Vorlage selektiert. - 0 0 - Choose a template for a preview Wählen Sie eine Vorlage für die Vorschau - Embedded Design Embedded-Entwurf - Device: Geräteprofil: - Screen Size: Bildschirmgröße: @@ -5552,37 +4550,30 @@ Please select another name. qdesigner_internal::NewPromotedClassPanel - Add Hinzufügen - New Promoted Class Neue Klasse - Base class name: Basisklasse: - Promoted class name: Klassenname: - Header file: Include-Datei: - Global include Globale Include-Datei - Reset Rücksetzen @@ -5590,12 +4581,10 @@ Please select another name. qdesigner_internal::ObjectInspector - Change Current Page Seite wechseln - &Find in Text... &Suchen... @@ -5603,32 +4592,26 @@ Please select another name. qdesigner_internal::OrderDialog - Index %1 (%2) Position %1 (%2) - Change Page Order Seiten umordnen - Page Order Reihenfolge - Move page up Seite eins nach oben - Move page down Seite eins nach unten - %1 %2 %1 %2 @@ -5636,47 +4619,38 @@ Please select another name. qdesigner_internal::PaletteEditor - Edit Palette Palette ändern - Tune Palette Palette - Show Details Details einblenden - Compute Details Details berechnen - Quick Einfach - Preview Vorschau - Disabled Ausgegraut - Inactive Inaktiv - Active Aktiv @@ -5684,7 +4658,6 @@ Please select another name. qdesigner_internal::PaletteEditorButton - Change Palette Palette ändern @@ -5692,22 +4665,18 @@ Please select another name. qdesigner_internal::PaletteModel - Color Role Farbrolle - Active Aktiv - Inactive Inaktiv - Disabled Ausgegraut @@ -5715,28 +4684,22 @@ Please select another name. qdesigner_internal::PixmapEditor - Copy Path Pfad kopieren - Paste Path Pfad einfügen - Choose Resource... Ressource auswählen... - Choose File... Datei auswählen... - - ... ... @@ -5744,7 +4707,6 @@ Please select another name. qdesigner_internal::PlainTextEditorDialog - Edit text Text bearbeiten @@ -5752,37 +4714,30 @@ Please select another name. qdesigner_internal::PluginDialog - Components Komponenten - Plugin Information Plugins - Refresh Neu laden - Scan for newly installed custom widget plugins. Nach neu installierten Plugins mit benutzerdefinierten Widgets suchen. - Qt Designer couldn't find any plugins Qt Designer kann keine Plugins finden - Qt Designer found the following plugins Qt Designer hat die folgenden Plugins gefunden - New custom widget plugins have been found. Es wurden neu installierte Plugins mit benutzerdefinierten Widgets gefunden. @@ -5790,7 +4745,6 @@ Please select another name. qdesigner_internal::PreviewActionGroup - %1 Style %1-Stil @@ -5798,47 +4752,38 @@ Please select another name. qdesigner_internal::PreviewConfigurationWidget - Default Vorgabe - None Kein - Browse... Durchsuchen... - Load Custom Device Skin Benutzerdefinierten Geräte-Skin laden - All QVFB Skins (*.%1) Alle QVFB-Skins (*.%1) - %1 - Duplicate Skin %1 - Skin bereits vorhanden - The skin '%1' already exists. Der Skin '%1' ist bereits vorhanden. - %1 - Error %1 - Fehler - %1 is not a valid skin directory: %2 %1 ist kein gültiges Verzeichnis eines Skins: @@ -5848,24 +4793,20 @@ Please select another name. qdesigner_internal::PreviewDeviceSkin - &Portrait &Hochformat - Landscape (&CCW) Rotate form preview counter-clockwise Querformat (&entgegen Uhrzeigersinn) - &Landscape (CW) Rotate form preview clockwise Querformat (im &Uhrzeigersinn) - &Close &Schließen @@ -5873,7 +4814,6 @@ Please select another name. qdesigner_internal::PreviewManager - %1 - [Preview] %1 - [Vorschau] @@ -5881,7 +4821,6 @@ Please select another name. qdesigner_internal::PreviewMdiArea - The moose in the noose ate the goose who was loose. Palette editor background @@ -5891,57 +4830,46 @@ ate the goose who was loose. qdesigner_internal::PreviewWidget - Preview Window Vorschaufenster - LineEdit - ComboBox - PushButton - ButtonGroup2 - CheckBox1 - CheckBox2 - ButtonGroup - RadioButton1 - RadioButton2 - RadioButton3 @@ -5949,22 +4877,18 @@ ate the goose who was loose. qdesigner_internal::PromotionModel - Name Name - Header file Include-Datei - Global include Globale Include-Datei - Usage Verwendet @@ -5972,27 +4896,22 @@ ate the goose who was loose. qdesigner_internal::PromotionTaskMenu - Promoted widgets... Benutzerdefinierte Klassen... - Promote to ... Als Platzhalter für benutzerdefinierte Klasse festlegen... - Promote to Als Platzhalter für benutzerdefinierte Klasse festlegen - Demote to %1 Platzhalter für benutzerdefinierte Klasse entfernen und in %1 wandeln - Change signals/slots... Signale/Slots ändern... @@ -6000,59 +4919,48 @@ ate the goose who was loose. qdesigner_internal::PropertyEditor - Add Dynamic Property... Dynamische Eigenschaft hinzufügen... - Remove Dynamic Property Dynamische Eigenschaft löschen - Tree View Baumansicht - Drop Down Button View Detailansicht - Object: %1 Class: %2 Objekt: %1 Klasse: %2 - Sorting Sortiert - Color Groups Farbige Hervorhebung - Configure Property Editor Anzeige der Eigenschaften konfigurieren - String... Zeichenkette... - Bool... Boolescher Wert... - Other... Anderer Typ... @@ -6060,7 +4968,6 @@ Klasse: %2 qdesigner_internal::PropertyLineEdit - Insert line break Zeilenumbruch einfügen @@ -6068,27 +4975,22 @@ Klasse: %2 qdesigner_internal::QDesignerPromotionDialog - Promoted Widgets Platzhalter für benutzerdefinierte Widgets - Promoted Classes Platzhalter für benutzerdefinierte Klassen - Promote Anwenden - %1 - Error %1 - Fehler - Change signals/slots... Signale/Slots ändern... @@ -6096,22 +4998,18 @@ Klasse: %2 qdesigner_internal::QDesignerResource - Loading qrc file Laden der Ressourcendatei - The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> Die Ressourcendatei <p><b>%1</b></p><p> konnte nicht gefunden werden. Möchten Sie einen neuen Pfad eingeben?</p> - New location for %1 Neuer Pfad für %1 - Resource files (*.qrc) Ressourcendateien (*.qrc) @@ -6119,67 +5017,54 @@ Klasse: %2 qdesigner_internal::QDesignerTaskMenu - Change objectName... Objektnamen ändern... - Change toolTip... ToolTip ändern... - Change whatsThis... WhatsThis ändern... - Change styleSheet... Stylesheet ändern... - Create Menu Bar Menüleiste erzeugen - Add Tool Bar Werkzeugleiste hinzufügen - Create Status Bar Statuszeile hinzufügen - Remove Status Bar Statuszeile löschen - Change script... Skript ändern... - Change signals/slots... Signale/Slots ändern... - Go to slot... Slot anzeigen... - no signals available Es sind keine Signale vorhanden - Set size constraint on %n widget(s) Größenbeschränkung eines Widgets festlegen @@ -6187,47 +5072,38 @@ Klasse: %2 - Size Constraints Größe - Set Minimum Width Minimalbreite festlegen - Set Minimum Height Minimalhöhe festlegen - Set Minimum Size Minimalgröße festlegen - Set Maximum Width Maximalbreite festlegen - Set Maximum Height Maximalhöhe festlegen - Set Maximum Size Maximalgröße festlegen - Edit ToolTip ToolTip bearbeiten - Edit WhatsThis What'sThis bearbeiten @@ -6235,41 +5111,33 @@ Klasse: %2 qdesigner_internal::QDesignerWidgetBox - - Unexpected element <%1> Ungültiges Element <%1> - A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 %5 Der XML-Code für das Widget %3 enthält einen Fehler bei Zeile %1, Spalte %2:%4: %5 - The XML code specified for the widget %1 does not contain any widget elements. %2 Der XML-Code für das Widget %1 enthält keine Widgets.%2 - An error has been encountered at line %1 of %2: %3 Fehler bei Zeile %1 von %2: %3 - Unexpected element <%1> encountered when parsing for <widget> or <ui> An Stelle des erwarteten <widget>- oder <ui>-Elementes wurde <%1> gefunden - Unexpected end of file encountered when parsing widgets. Vorzeitiges Dateiende beim Lesen der Widget-Box-Konfiguration. - A widget element could not be found. Es fehlt das Widget-Element. @@ -6277,73 +5145,58 @@ Klasse: %2 qdesigner_internal::QtGradientStopsController - H H - S S - V V - - Hue Farbton - Sat Sättigung - Val Wert - Saturation Sättigung - Value Wert - R R - G G - B B - Red Rot - Green Grün - Blue Blau @@ -6351,27 +5204,22 @@ Klasse: %2 qdesigner_internal::RichTextEditorDialog - Edit text Text bearbeiten - &OK &OK - &Cancel &Abbrechen - Rich Text Text - Source Quelltext @@ -6379,72 +5227,58 @@ Klasse: %2 qdesigner_internal::RichTextEditorToolBar - Bold Fett - CTRL+B CTRL+F - Italic Kursiv - CTRL+I CTRL+K - Underline Unterstreichen - CTRL+U CTRL+U - Left Align Linksbündig ausrichten - Center Zentrieren - Right Align Rechtsbündig ausrichten - Justify Blocksatz - Superscript Hochstellung - Subscript Tiefstellung - Insert &Link &Link einfügen - Insert &Image &Bild einfügen @@ -6452,17 +5286,14 @@ Klasse: %2 qdesigner_internal::ScriptDialog - Edit script Skript bearbeiten - Syntax error Syntaxfehler - <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. <html>Geben Sie ein Qt-Skript zur Ausführung während des Formularaufbaus ein.<br>Auf das Widget und seine untergeordneten Widgets kann durch die Variablen <i>widget</i> und <i>childWidgets</i> zugegriffen werden. @@ -6470,7 +5301,6 @@ Klasse: %2 qdesigner_internal::ScriptErrorDialog - Script errors Skriptfehler @@ -6478,23 +5308,18 @@ Klasse: %2 qdesigner_internal::SignalSlotDialog - There is already a slot with the signature '%1'. Es existiert bereits ein Slot mit der Signatur '%1'. - There is already a signal with the signature '%1'. Es existiert bereits ein Signal mit der Signatur '%1'. - %1 - Duplicate Signature %1 - Doppelte Signatur - - Signals/Slots of %1 Signale/Slots von %1 @@ -6502,12 +5327,10 @@ Klasse: %2 qdesigner_internal::SignalSlotEditorPlugin - Edit Signals/Slots Signale und Slots bearbeiten - F4 F4 @@ -6515,7 +5338,6 @@ Klasse: %2 qdesigner_internal::SignalSlotEditorTool - Edit Signals/Slots Signale und Slots bearbeiten @@ -6523,7 +5345,6 @@ Klasse: %2 qdesigner_internal::StatusBarTaskMenu - Remove Löschen @@ -6531,7 +5352,6 @@ Klasse: %2 qdesigner_internal::StringListEditorButton - Change String List Zeichenkettenliste ändern @@ -6539,38 +5359,30 @@ Klasse: %2 qdesigner_internal::StyleSheetEditorDialog - Edit Style Sheet Stylesheet bearbeiten - - Valid Style Sheet Stylesheet gültig - Invalid Style Sheet Stylesheet ungültig - Add Resource... Ressource hinzufügen... - Add Gradient... Gradient hinzufügen... - Add Color... Farbe hinzufügen... - Add Font... Font hinzufügen... @@ -6578,27 +5390,22 @@ Klasse: %2 qdesigner_internal::TabOrderEditor - Start from Here Hier neu beginnen - Restart Neu beginnen - Tab Order List... Tabulatorreihenfolge... - Tab Order List Tabulatorreihenfolge - Tab Order Tabulatorreihenfolge @@ -6606,7 +5413,6 @@ Klasse: %2 qdesigner_internal::TabOrderEditorPlugin - Edit Tab Order Tabulatorreihenfolge bearbeiten @@ -6614,7 +5420,6 @@ Klasse: %2 qdesigner_internal::TabOrderEditorTool - Edit Tab Order Tabulatorreihenfolge bearbeiten @@ -6622,48 +5427,38 @@ Klasse: %2 qdesigner_internal::TableWidgetEditor - New Column Neue Spalte - New Row Neue Zeile - &Columns &Spalten - &Rows &Zeilen - Properties &<< Eigenschaften &<< - - Properties &>> Eigenschaften &>> - Edit Table Widget Table Widget ändern - &Items &Inhalt - Table Items Tabellenelemente @@ -6671,7 +5466,6 @@ Klasse: %2 qdesigner_internal::TableWidgetTaskMenu - Edit Items... Elemente ändern... @@ -6679,22 +5473,18 @@ Klasse: %2 qdesigner_internal::TemplateOptionsWidget - Pick a directory to save templates in Wählen Sie ein Verzeichnis zum Abspeichern der Vorlagen aus - Form - Additional Template Paths Zusätzliche Verzeichnisse für Vorlagen - ... ... @@ -6702,22 +5492,18 @@ Klasse: %2 qdesigner_internal::TextEditTaskMenu - Change HTML... HTML ändern... - Edit HTML HTML bearbeiten - Edit Text Text bearbeiten - Change Plain Text... Text ändern... @@ -6725,22 +5511,18 @@ Klasse: %2 qdesigner_internal::TextEditor - Choose Resource... Ressource auswählen... - Choose File... Datei auswählen... - Choose a File - ... ... @@ -6748,27 +5530,22 @@ Klasse: %2 qdesigner_internal::ToolBarEventFilter - Insert Separator Trenner einfügen - Remove action '%1' Aktion '%1' löschen - Remove Toolbar '%1' Werkzeugleiste '%1' löschen - Insert Separator before '%1' Trenner vor '%1' einfügen - Append Separator Trenner hinzufügen @@ -6776,125 +5553,98 @@ Klasse: %2 qdesigner_internal::TreeWidgetEditor - &Columns &Spalten - Per column properties Spalteneigenschaften - Common properties Gemeinsame Eigenschaften - - New Item Neues Element - Properties &<< Eigenschaften &<< - - Properties &>> Eigenschaften &>> - New Column Neue Spalte - Edit Tree Widget Tree Widget ändern - &Items &Inhalt - Tree Items Elemente - - New Subitem - New &Subitem Neues &untergeordnetes Element - Delete Item Element löschen - Move Item Left (before Parent Item) Element nach links (vor übergeordnetes Element) - L L - Move Item Right (as a First Subitem of the Next Sibling Item) Element nach rechts (als untergeordnetes Element des nächsten gleichrangigen Elements) - R R - Move Item Up Element eins nach oben - U U - Move Item Down Element eins nach unten - D D - 1 1 - &New &Neu - &Delete &Löschen @@ -6902,7 +5652,6 @@ Klasse: %2 qdesigner_internal::TreeWidgetTaskMenu - Edit Items... Elemente ändern... @@ -6910,7 +5659,6 @@ Klasse: %2 qdesigner_internal::WidgetBox - Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. Warnung: Die Erzeugung des Widgets in der Widget-Box schlug fehl. Das könnte durch fehlerhaften XML-Code benutzerdefinierter Widgets verursacht worden sein. @@ -6918,42 +5666,34 @@ Klasse: %2 qdesigner_internal::WidgetBoxTreeWidget - Scratchpad Ablage - Custom Widgets Benutzerdefinierte Widgets - Expand all Alles aufklappen - Collapse all Alles zuklappen - List View Listenansicht - Icon View Icon-Ansicht - Remove Löschen - Edit name Namen ändern @@ -6961,7 +5701,6 @@ Klasse: %2 qdesigner_internal::WidgetDataBase - A custom widget plugin whose class name (%1) matches that of an existing class has been found. Es wurde ein Plugin gefunden, das ein benutzerdefiniertes Widget enthält, dessen Klassenname (%1) einer existierenden Klasse entspricht. @@ -6969,7 +5708,6 @@ Klasse: %2 qdesigner_internal::WidgetEditorTool - Edit Widgets Widgets bearbeiten @@ -6977,33 +5715,27 @@ Klasse: %2 qdesigner_internal::WidgetFactory - The custom widget factory registered for widgets of class %1 returned 0. Die Factory für benutzerdefinierte Widgets der Klasse %1 gab einen 0-Zeiger zurück. - A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. Bei der Erzeugung von Widgets wurden widersprüchliche Klassennamen festgestellt: Die Factory für benutzerdefinierte Widgets der Klasse %1 gab ein Widget der Klasse %2 zurück. - The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. Der Container '%1' (%2) hat keine Seite, auf der ein Layout angelegt werden könnte. Das deutet auf eine inkonsistente ui-Datei hin; wahrscheinlich wurde ein Layout direkt auf dem Container spezifiziert. - Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. This indicates an inconsistency in the ui-file. Es wurde versucht, ein Layout auf das Widget '%1' (%2) zu setzen, welches bereits ein Layout vom Typ %3 hat. Das deutet auf eine Inkonsistenz in der ui-Datei hin. - Cannot create style '%1'. Der Stil '%1' konnte nicht erzeugt werden. - %1 Widget %1 Widget @@ -7011,12 +5743,10 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::WizardContainerWidgetTaskMenu - Next Nächste - Back Vorige @@ -7024,7 +5754,6 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomMenu - %1 % Zoom factor %1 % @@ -7033,7 +5762,6 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomablePreviewDeviceSkin - &Zoom &Vergrößern diff --git a/translations/linguist_de.ts b/translations/linguist_de.ts index 5597458..b4e0a45 100644 --- a/translations/linguist_de.ts +++ b/translations/linguist_de.ts @@ -4,7 +4,6 @@ AboutDialog - Qt Linguist Qt Linguist @@ -12,27 +11,22 @@ BatchTranslationDialog - Batch Translation of '%1' - Qt Linguist Automatische Übersetzung von '%1' - Qt Linguist - Searching, please wait... Suche, bitte warten ... - &Cancel &Abbrechen - Linguist batch translator Automatischer Übersetzer (Linguist) - Batch translated %n entries 1 Eintrag wurde automatisch übersetzt @@ -40,62 +34,50 @@ - Qt Linguist - Batch Translation Qt Linguist - Automatische Übersetzung - Options Optionen - Set translated entries to finished Übersetzung als erledigt markieren - Retranslate entries with existing translation Einträge mit bereits existierender Übersetzung neu übersetzen - Translate also finished entries Erledigte Einträge übersetzen - Phrase book preference Wörterbücher - Move up Nach oben - Move down Nach unten - &Run &Ausführen - Cancel Abbrechen - Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked Geänderte Einträge werden als unerledigt gekennzeichnet, wenn die obige Einstellung 'Übersetzung als erledigt markieren' nicht aktiviert ist - The batch translator will search through the selected phrase books in the order given above Der automatische Übersetzer wird in der angegebenen Reihenfolge durch die ausgewählten Wörterbücher gehen @@ -103,45 +85,36 @@ DataModel - <qt>Duplicate messages found in '%1': <qt>Mehrfach vorhandene Meldungen in '%1': - - <p>[more duplicates omitted] <p>[weitere mehrfach vorhandene Nachrichten weggelassen] - <p>* ID: %1 <p>* ID: %1 - <p>* Context: %1<br>* Source: %2 <p>* Kontext: %1<br>* Quelle: %2 - <br>* Comment: %3 <br>* Kommentar: %3 - Linguist does not know the plural rules for '%1'. Will assume a single universal form. Die Regeln zur Pluralbildung der Sprache '%1' sind in Linguist nicht definiert. Es wird mit einer einfachen Universalform gearbeitet. - Cannot create '%2': %1 '%2' kann nicht erzeugt werden: %1 - Universal Form Universalform @@ -149,37 +122,30 @@ Es wird mit einer einfachen Universalform gearbeitet. ErrorsView - Accelerator possibly superfluous in translation. Möglicherweise überflüssiger Kurzbefehl im Übersetzungstext. - Accelerator possibly missing in translation. Kurzbefehl fehlt im Übersetzungstext. - Translation does not end with the same punctuation as the source text. Interpunktion am Ende des Übersetzungstextes unterscheidet sich von Interpunktion des Ursprungstextes. - A phrase book suggestion for '%1' was ignored. Ein Vorschlag aus dem Wörterbuch für '%1' wurde nicht berücksichtigt. - Translation does not refer to the same place markers as in the source text. Platzhalter im Übersetzungstext und Ursprungstext unterscheiden sich. - Translation does not contain the necessary %n place marker. Der erforderliche Platzhalter (%n) fehlt in der Übersetzung. - Unknown error Unbekannter Fehler @@ -187,97 +153,78 @@ Es wird mit einer einfachen Universalform gearbeitet. FindDialog - This window allows you to search for some text in the translation source file. Dieses Fenster erlaubt die Suche in der Übersetzungsdatei. - Type in the text to search for. Geben Sie den Text ein, nach dem gesucht werden soll. - Options Optionen - Source texts are searched when checked. Wenn aktiviert, wird in den Ursprungstexten gesucht. - Translations are searched when checked. Wenn ausgewählt, wird in den Übersetzungen gesucht. - Texts such as 'TeX' and 'tex' are considered as different when checked. Wenn aktiviert, werden Texte wie 'TeX' und 'tex' als unterschiedlich betrachtet. - Comments and contexts are searched when checked. Wenn ausgewählt, werden Kommentare und Kontextnamen durchsucht. - Find Suchen - &Find what: &Suchmuster: - &Source texts &Ursprungstexte - &Translations &Übersetzungen - &Match case &Groß-/Kleinschreibung beachten - &Comments &Kommentare - Ignore &accelerators Tastenkürzel &ignorieren - Click here to find the next occurrence of the text you typed in. Klicken Sie hier, um zum nächsten Vorkommen des Suchtextes zu springen. - Find Next Weitersuchen - Click here to close this window. Klicken Sie hier, um das Fenster zu schließen. - Cancel Abbrechen - Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog @@ -286,30 +233,25 @@ Es wird mit einer einfachen Universalform gearbeitet. FormMultiWidget - Alt+Delete translate, but don't change Alt+Delete - Shift+Alt+Insert translate, but don't change Shift+Alt+Insert - Alt+Insert translate, but don't change Alt+Insert - Confirmation - Qt Linguist Bestätigung - Qt Linguist - Delete non-empty length variant? Soll die ausgefüllte Längenvariante gelöscht werden? @@ -317,7 +259,6 @@ Es wird mit einer einfachen Universalform gearbeitet. LRelease - Dropped %n message(s) which had no ID. Es wurde ein Eintrag ohne Bezeichner gelöscht. @@ -325,7 +266,6 @@ Es wird mit einer einfachen Universalform gearbeitet. - Excess context/disambiguation dropped from %n message(s). Es wurde überflüssiger Kontext beziehungsweise überflüssige Infomation zur Unterscheidung bei einem Eintrag entfernt. @@ -333,10 +273,23 @@ Es wird mit einer einfachen Universalform gearbeitet. - + Generated %n translation(s) (%1 finished and %2 unfinished) + + Eine Übersetzung wurde erzeugt (%1 abgeschlossen und %2 nicht abgeschlossen) + %n Übersetzungen wurden erzeugt (%1 abgeschlossen und %2 nicht abgeschlossen) + + + + Ignored %n untranslated source text(s) + + Ein nicht übersetzter Text wurde ignoriert + %n nicht übersetzte Texte wurden ignoriert + + + Generated %n translation(s) (%1 finished and %2 unfinished) - + Eine Übersetzung wurde erzeugt (%1 abgeschlossen und %2 nicht abgeschlossen) %n Übersetzungen wurden erzeugt (%1 abgeschlossene und %2 nicht abgeschlossene) @@ -344,10 +297,9 @@ Es wird mit einer einfachen Universalform gearbeitet. - Ignored %n untranslated source text(s) - + Ein nicht übersetzter Text wurde ignoriert %n nicht übersetzte Texte wurden ignoriert @@ -358,628 +310,496 @@ Es wird mit einer einfachen Universalform gearbeitet. MainWindow - MainWindow Hauptfenster - &Phrases &Wörterbuch - &Close Phrase Book Wörterbuch &Schließen - &Edit Phrase Book Wörterbuch &bearbeiten - &Print Phrase Book Wörterbuch &drucken - V&alidation V&alidierung - &View &Ansicht - Vie&ws &Ansichten - &Toolbars &Werkzeugleisten - &Help &Hilfe - &Translation &Übersetzung - &File &Datei - &Edit &Bearbeiten - &Open... Ö&ffnen ... - Open a Qt translation source file (TS file) for editing Qt-Übersetzungsdatei (TS-Datei) zum Bearbeiten öffnen - Ctrl+O Ctrl+O - E&xit &Beenden - Close this window and exit. Dieses Fenster schließen und das Programm beenden. - Ctrl+Q Ctrl+Q - - &Save &Speichern - Save changes made to this Qt translation source file Änderungen an der Qt-Übersetzungsdatei speichern - Move to the previous unfinished item. Zum vorherigen unerledigten Eintrag gehen. - Move to the next unfinished item. Zum nächsten unerledigten Eintrag gehen. - Move to the previous item. Zum vorigen Eintrag gehen. - Move to the next item. Zum nächsten Eintrag gehen. - Mark this item as done and move to the next unfinished item. Diesen Eintrag als erledigt markieren und zum nächsten unerledigten Eintrag gehen. - Copy from source text Ursprungstext übernehmen - Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. Die Prüfung der Tastenkürzel, das heißt, die Übereinstimmung der kaufmännischen Und-Zeichen in Quelle und Übersetzung ein- bzw. ausschalten. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt. - Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. Die Prüfung der Satzendezeichen am Ende des Textes ein- bzw. ausschalten. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt. - Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. Die Prüfung der Verwendung der Wörterbuchvorschläge ein- bzw. ausschalten. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt. - Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. Die Prüfung der Platzhalter, das heißt, ob %1, %2 usw. in Ursprungstext und Übersetzung übereinstimmend verwendet werden, ein- bzw. ausschalten. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt. - Open Read-O&nly... Schr&eibgeschützt öffnen ... - &Save All &Alle speichern - Ctrl+S Ctrl+S - - - Save &As... Speichern &unter... - Save As... Speichern unter ... - Save changes made to this Qt translation source file into a new file. Änderungen an dieser Qt-Übersetzungsdatei in einer neuen Datei speichern. - &Release &Freigeben - Create a Qt message file suitable for released applications from the current message file. Qt-Nachrichtendatei (QM-Datei) aus der aktuellen Übersetzungsdatei erzeugen. - &Print... &Drucken ... - Ctrl+P Ctrl+P - &Undo &Rückgängig - Recently Opened &Files Zu&letzt bearbeitete Dateien - Save Speichern - Print a list of all the translation units in the current translation source file. Liste aller Übersetzungseinheiten in der aktuellen Übersetzungsdatei drucken. - Undo the last editing operation performed on the current translation. Die letzte Änderung an der Übersetzung rückgängig machen. - Ctrl+Z Ctrl+Z - &Redo &Wiederherstellen - Redo an undone editing operation performed on the translation. Die letzte rückgängig gemachte Änderung wieder herstellen. - Ctrl+Y Ctrl+Y - Cu&t &Ausschneiden - Copy the selected translation text to the clipboard and deletes it. Den ausgewählten Übersetzungstext in die Zwischenablage kopieren und löschen. - Ctrl+X Ctrl+X - &Copy &Kopieren - Copy the selected translation text to the clipboard. Den ausgewählten Übersetzungstext in die Zwischenablage kopieren. - Ctrl+C Ctrl+C - &Paste &Einfügen - Paste the clipboard text into the translation. Text aus der Zwischenablage in die Übersetzung einfügen. - Ctrl+V Ctrl+V - Select &All Alles &markieren - Select the whole translation text. Den gesamten Übersetzungstext auswählen. - Ctrl+A Ctrl+A - &Find... &Suchen ... - Search for some text in the translation source file. In der Übersetzungsdatei nach Text suchen. - Ctrl+F Ctrl+F - Find &Next &Weitersuchen - Continue the search where it was left. Die Suche fortsetzen. - F3 F3 - &Prev Unfinished &Vorheriger Unerledigter - Close Schließen - &Close All A&lle schließen - Ctrl+W Ctrl+W - Ctrl+K Ctrl+K - &Next Unfinished &Nächster Unerledigter - P&rev V&orheriger - Ctrl+Shift+K Ctrl+Shift+K - Ne&xt Nä&chster - &Done and Next &Fertig und Nächster - Copies the source text into the translation field. Kopiert den Ursprungstext in das Übersetzungsfeld. - Ctrl+B Ctrl+B - &Accelerators &Kurzbefehle - &Ending Punctuation &Punktierung am Ende - &Phrase matches &Wörterbuch - Place &Marker Matches Platz&halter - &New Phrase Book... &Neues Wörterbuch ... - Create a new phrase book. Ein neues Wörterbuch erzeugen. - Ctrl+N Ctrl+N - &Open Phrase Book... &Wörterbuch öffnen ... - Open a phrase book to assist translation. Ein Wörterbuch zur Unterstützung bei der Übersetzung öffnen. - Ctrl+H Ctrl+H - &Reset Sorting &Sortierung zurücksetzen - Sort the items back in the same order as in the message file. Die Einträge in der gleichen Reihenfolge wie in der ursprünglichen Übersetzungsdatei sortieren. - &Display guesses &Vorschläge anzeigen - Set whether or not to display translation guesses. Darstellung von Übersetzungsvorschlägen aktivieren/deaktivieren. - &Statistics S&tatistik - Display translation statistics. Zeige Übersetzungsstatistik an. - &Manual &Handbuch - F1 F1 - About Qt Linguist Über Qt Linguist - About Qt Über Qt - &What's This? &Direkthilfe - What's This? Direkthilfe - Enter What's This? mode. Direkthilfe-Modus aktivieren. - Shift+F1 Shift+F1 - &Search And Translate... Suchen und &übersetzen ... - Replace the translation on all entries that matches the search source text. Die Übersetzung aller Einträge ersetzen, die dem Suchtext entsprechen. - - &Batch Translation... &Automatische Übersetzung ... - Batch translate all entries using the information in the phrase books. Alle Einträge automatisch mit Hilfe des Wörterbuchs übersetzen. - - - Release As... Freigeben unter ... - This is the application's main window. - Source text Ursprungstext - - Index Index - - Context Kontext - Items Einträge - This panel lists the source contexts. Dieser Bereich zeigt die Kontexte an. - Strings Zeichenketten - Phrases and guesses Wörterbuch und Vorschläge - Sources and Forms Quelldateien und Formulare - Warnings Hinweise - MOD status bar: file(s) modified Geändert - Loading... Lade ... - - Loading File - Qt Linguist Laden - Qt Linguist - The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? @@ -988,7 +808,6 @@ Close the open file(s) first? Sollen die bereits geöffneten Dateien vorher geschlossen werden? - The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? @@ -997,7 +816,6 @@ Skip loading the first named file? Soll die erstgenannte Datei übersprungen werden? - %n translation unit(s) loaded. Eine Übersetzungseinheit geladen. @@ -1005,124 +823,84 @@ Soll die erstgenannte Datei übersprungen werden? - Related files (%1);; Verwandte Dateien (%1);; - Open Translation Files Übersetzungsdateien öffnen - - File saved. Datei gespeichert. - - - Release Freigeben - Qt message files for released applications (*.qm) All files (*) Qt-Nachrichtendateien (*.qm) Alle Dateien (*) - - File created. Datei erzeugt. - - Printing... Drucke ... - Context: %1 Kontext: %1 - finished erledigt - unresolved ungelöst - obsolete veraltet - - Printing... (page %1) Drucke ... (Seite %1) - - Printing completed Drucken beendet - - Printing aborted Drucken abgebrochen - Search wrapped. Suche beginnt von oben. - - - - - - - - - - Qt Linguist Qt Linguist - - Cannot find the string '%1'. Kann Zeichenkette '%1' nicht finden. - Search And Translate in '%1' - Qt Linguist Suchen und übersetzen in '%1' - Qt Linguist - - - Translate - Qt Linguist Übersetzung - Qt Linguist - Translated %n entry(s) Ein Eintrag übersetzt @@ -1130,39 +908,32 @@ Alle Dateien (*) - No more occurrences of '%1'. Start over? Keine weiteren Vorkommen von '%1'. Von vorne beginnen? - Create New Phrase Book Erzeugen eines neuen Wörterbuchs - Qt phrase books (*.qph) All files (*) Qt-Wörterbücher (*.qph) Alle Dateien (*) - Phrase book created. Wörterbuch erzeugt. - Open Phrase Book Wörterbuch öffnen - Qt phrase books (*.qph);;All files (*) Qt-Wörterbücher (*.qph);;Alle Dateien (*) - %n phrase(s) loaded. Ein Wörterbucheintrag geladen. @@ -1170,328 +941,254 @@ Alle Dateien (*) - - - Add to phrase book Hinzufügen zum Wörterbuch - No appropriate phrasebook found. Es kann kein geeignetes Wörterbuch gefunden werden. - Adding entry to phrasebook %1 Eintrag zu Wörterbuch %1 hinzufügen - Select phrase book to add to Zu welchem Wörterbuch soll der Eintrag hinzugefügt werden? - Unable to launch Qt Assistant (%1) Qt Assistant kann nicht gestartet werden (%1) - Version %1 Version %1 - <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). - Do you want to save the modified files? Möchten Sie die geänderten Dateien speichern? - Do you want to save '%1'? Möchten Sie '%1' speichern? - Qt Linguist[*] Qt Linguist[*] - %1[*] - Qt Linguist %1[*] - Qt Linguist - - No untranslated translation units left. Es wurden alle Übersetzungseinheiten abgearbeitet. - &Window &Fenster - Minimize Minimieren - Ctrl+M Ctrl+M - Display the manual for %1. Handbuch zu %1 anzeigen. - Display information about %1. Informationen über %1 anzeigen. - &Save '%1' '%1' &speichern - Save '%1' &As... '%1' speichern &unter ... - Release '%1' '%1' freigeben - Release '%1' As... '%1' freigeben unter ... - &Close '%1' '%1' &schließen - - &Close &Schließen - Save All Alles speichern - - &Release All Alles f&reigeben - Close All Alle schließen - Translation File &Settings for '%1'... Einstellungen der Übersetzungs&datei für '%1' ... - &Batch Translation of '%1'... &Automatische Übersetzung von '%1' ... - Search And &Translate in '%1'... Suchen und &übersetzen in '%1' ... - Search And &Translate... Suchen und &übersetzen ... - - File Datei - - Edit Bearbeiten - - Translation Übersetzung - - Validation Validierung - - Help Hilfe - Cannot read from phrase book '%1'. Wörterbuch '%1' kann nicht gelesen werden. - Close this phrase book. Dieses Wörterbuch schließen. - Enables you to add, modify, or delete entries in this phrase book. Erlaubt das Hinzufügen, Ändern und Entfernen von Wörterbuch-Einträgen. - Print the entries in this phrase book. Die Einträge des Wörterbuchs drucken. - Cannot create phrase book '%1'. Wörterbuch '%1' kann nicht erzeugt werden. - Do you want to save phrase book '%1'? Möchten Sie das Wörterbuch '%1' speichern? - All Alle - Open/Refresh Form &Preview &Vorschau öffnen/aktualisieren - Form Preview Tool Vorschau für Eingabemasken - F5 F5 - - Translation File &Settings... E&instellungen ... - &Add to Phrase Book Zum Wörterbuch &hinzufügen - Ctrl+T Ctrl+T - Ctrl+J Ctrl+J - Ctrl+Shift+J Ctrl+Shift+J - Previous unfinished item Vorheriger unerledigter Eintrag - Next unfinished item Nächster unerledigter Eintrag - Move to previous item Zum vorigen Eintrag gehen - Next item Nächster Eintrag - Mark item as done and move to the next unfinished item Eintrag als erledigt markieren und zum nächsten unerledigten Eintrag gehen - Copies the source text into the translation field Kopiert den Ursprungstext in das Übersetzungsfeld - Toggle the validity check of accelerators Prüfung der Tastenkürzel ein- bzw. ausschalten - Toggle the validity check of ending punctuation Prüfung der Satzendezeichen am Ende des Textes ein- bzw. ausschalten - Toggle checking that phrase suggestions are used Überprüfung, ob Wörterbucheinträge benutzt werden, aktivieren/deaktivieren - Toggle the validity check of place markers Prüfung der Platzhalter ein- bzw. ausschalten' - Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file. Eine Qt-Nachrichtendatei aus der aktuellen Übersetzungsdatei erzeugen. Der Dateiname wird automatisch aus dem Namen der TS-Datei abgeleitet. - Length Variants Längenvarianten - Display information about the Qt toolkit by Nokia. Zeigt Informationen über das Qt-Toolkit von Nokia an. @@ -1499,103 +1196,83 @@ Alle Dateien (*) MessageEditor - This is the right panel of the main window. - Russian Russisch - German Deutsch - Japanese Japanisch - French Französisch - Polish Polnisch - Chinese Chinesisch - This whole panel allows you to view and edit the translation of some source text. Dieser Bereich erlaubt die Darstellung und Änderung der Übersetzung eines Textes. - Source text Ursprungstext - This area shows the source text. Dieser Bereich zeigt den Ursprungstext. - Source text (Plural) Ursprungstext (Plural) - This area shows the plural form of the source text. Dieser Bereich zeigt die Pluralform des Ursprungstexts. - Developer comments Hinweise des Entwicklers - This area shows a comment that may guide you, and the context in which the text occurs. Dieser Bereich zeigt eventuelle Kommentare und den Kontext, in dem der Text auftritt. - Here you can enter comments for your own use. They have no effect on the translated applications. Hier können Sie Hinweise für den eigenen Gebrauch eintragen. Diese haben keinen Einflusse auf die Übersetzung. - %1 translation (%2) Übersetzung %1 (%2) - This is where you can enter or modify the translation of the above source text. Hier können Sie die Übersetzung des Ursprungstextes eingeben bzw. ändern. - %1 translation Übersetzung %1 - %1 translator comments %1 Hinweise des Übersetzers - '%1' Line: %2 '%1' @@ -1605,22 +1282,18 @@ Zeile: %2 MessageModel - Completion status for %1 Bearbeitungsstand von %1 - <file header> <Dateikopf> - <context comment> <Kontexthinweis> - <unnamed context> <unbenannter Kontext> @@ -1628,7 +1301,6 @@ Zeile: %2 MsgEdit - This is the right panel of the main window. @@ -1637,113 +1309,91 @@ Zeile: %2 PhraseBookBox - Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. - (New Entry) (Neuer Eintrag) - %1[*] - Qt Linguist %1[*] - Qt Linguist - Qt Linguist Qt Linguist - Cannot save phrase book '%1'. Wörterbuch '%1' kann nicht gespeichert werden. - Edit Phrase Book Wörterbuch bearbeiten - This window allows you to add, modify, or delete entries in a phrase book. Dieses Fenster erlaubt das Hinzufügen, Ändern und Entfernen von Wörterbuch-Einträgen. - &Translation: &Übersetzung: - This is the phrase in the target language corresponding to the source phrase. Dies ist der Text, der in der Zielsprache dem Ursprungstext entspricht. - S&ource phrase: &Ursprungstext: - This is a definition for the source phrase. Dies ist die Definition des Ursprungstextes. - This is the phrase in the source language. Dies ist der Text der Ursprungssprache. - &Definition: &Definition: - Click here to add the phrase to the phrase book. Einen neuen Eintrag ins Wörterbuch einfügen. - &New Entry &Neuer Eintrag - Click here to remove the entry from the phrase book. Den Eintrag aus dem Wörterbuch entfernen. - &Remove Entry &Eintrag entfernen - Settin&gs... &Einstellungen ... - Click here to save the changes made. Änderungen speichern. - &Save &Speichern - Click here to close this window. Klicken Sie hier, um das Fenster zu schließen. - Close Schließen @@ -1751,17 +1401,14 @@ Zeile: %2 PhraseModel - Source phrase Ursprungstext - Translation Übersetzung - Definition Definition @@ -1769,22 +1416,18 @@ Zeile: %2 PhraseView - Insert Einfügen - Edit Bearbeiten - Guess (%1) Vorschlag (%1) - Guess Vorschlag @@ -1792,63 +1435,46 @@ Zeile: %2 QObject - Compiled Qt translations Kompilierte Qt-Übersetzungen - Translation files (%1);; Übersetzungsdateien (%1);; - All files (*) Alle Dateien (*) - - - - - - - Qt Linguist Qt Linguist - GNU Gettext localization files GNU-Gettext-Übersetzungsdateien - GNU Gettext localization template files Vorlagen für GNU-Gettext-Übersetzungsdateien - Qt translation sources (format 1.1) Qt-Übersetzungsdateien (Formatversion 1.1) - Qt translation sources (format 2.0) Qt-Übersetzungsdateien (Formatversion 2.0) - Qt translation sources (latest format) Qt-Übersetzungsdateien (aktuelles Format) - XLIFF localization files XLIFF-Übersetzungsdateien - Qt Linguist 'Phrase Book' Qt-Linguist-Wörterbuch @@ -1856,17 +1482,14 @@ Zeile: %2 SourceCodeView - <i>Source code not available</i> <i>Quelltext nicht verfügbar</i> - <i>File %1 not available</i> <i>Datei %1 nicht vorhanden</i> - <i>File %1 not readable</i> <i>Datei %1 nicht lesbar</i> @@ -1874,42 +1497,34 @@ Zeile: %2 Statistics - Statistics Statistiken - Translation Übersetzung - Source Quelle - 0 0 - Words: Wörter: - Characters: Zeichen: - Characters (with spaces): Zeichen (mit Leerzeichen): - Close Schließen @@ -1917,72 +1532,58 @@ Zeile: %2 TranslateDialog - This window allows you to search for some text in the translation source file. Dieses Fenster erlaubt die Suche in der Übersetzungsdatei. - Type in the text to search for. Geben Sie den Text ein, nach dem gesucht werden soll. - Find &source text: &Ursprungstext: - &Translate to: &Übersetzung: - Search options Sucheinstellungen - Texts such as 'TeX' and 'tex' are considered as different when checked. Wenn aktiviert, werden Texte wie 'TeX' und 'tex' als unterschiedlich betrachtet. - Match &case &Groß-/Kleinschreibung beachten - Mark new translation as &finished Neue Übersetzung als &erledigt markieren - Click here to find the next occurrence of the text you typed in. Klicken Sie hier, um zum nächsten Vorkommen des Suchtextes zu springen. - Find Next Weitersuchen - Translate Übersetzen - Translate All Alle übersetzen - Click here to close this window. Klicken Sie hier, um das Fenster zu schließen. - Cancel Abbrechen @@ -1990,33 +1591,26 @@ Zeile: %2 TranslationSettingsDialog - Any Country Land - - Settings for '%1' - Qt Linguist Einstellungen für '%1' - Qt Linguist - Source language Ursprungssprache - Language Sprache - Country/Region Land/Region - Target language Zielsprache diff --git a/translations/qt_de.ts b/translations/qt_de.ts index 74bd048..7a062dc 100644 --- a/translations/qt_de.ts +++ b/translations/qt_de.ts @@ -4,7 +4,6 @@ CloseButton - Close Tab Schließen @@ -12,12 +11,10 @@ FakeReply - Fake error ! Fake error ! - Invalid URL Ungültige URL @@ -25,37 +22,30 @@ MAC_APPLICATION_MENU - Services Dienste - Hide %1 %1 ausblenden - Hide Others Andere ausblenden - Show All Alle anzeigen - Preferences... Einstellungen... - Quit %1 %1 beenden - About %1 Über %1 @@ -63,32 +53,26 @@ Phonon:: - Notifications Benachrichtigungen - Music Musik - Video Video - Communication Kommunikation - Games Spiele - Accessibility Eingabehilfen @@ -96,24 +80,18 @@ Phonon::AudioOutput - - <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>Das Audiogerät <b>%1</b> funktioniert nicht.<br/>Es wird stattdessen <b>%2</b> verwendet.</html> - <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> <html>Das Audiogerät <b>%1</b> wurde aktiviert,<br/>da es gerade verfügbar und höher priorisiert ist.</html> - - Revert back to device '%1' Zurückschalten zum Gerät '%1' - <html>Switching to the audio playback device <b>%1</b><br/>which has higher preference or is specifically configured for this stream.</html> <html>Es wird zum Audiogerät <b>%1</b> geschaltet, <br/>da es höher priorisiert ist oder spezifisch für diesen Stream konfiguriert wurde.</html> @@ -121,14 +99,12 @@ Phonon::Gstreamer::Backend - Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. Some video features have been disabled. Achtung: Das Paket gstreamer0.10-plugins-good ist nicht installiert. Einige Video-Funktionen stehen nicht zur Verfügung. - Warning: You do not seem to have the base GStreamer plugins installed. All audio and video support has been disabled Achtung: Die grundlegenden GStreamer-Plugins sind nicht installiert. @@ -138,7 +114,6 @@ Die Audio- und Video-Unterstützung steht nicht zur Verfügung. Phonon::Gstreamer::MediaObject - Cannot start playback. Check your GStreamer installation and make sure you @@ -148,49 +123,34 @@ have libgstreamer-plugins-base installed. Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass das Paket libgstreamer-plugins-base installiert ist. - Missing codec helper script assistant. Der Skript-Hilfsassistent des Codecs fehlt. - Plugin codec installation failed for codec: %0 Die Installation des Codec-Plugins schlug fehl für: %0 - A required codec is missing. You need to install the following codec(s) to play this content: %0 Es sind nicht alle erforderlichen Codecs installiert. Um diesen Inhalt abzuspielen, muss der folgende Codec installiert werden: %0 - - - - - - - - Could not open media source. Die Medienquelle konnte nicht geöffnet werden. - Invalid source type. Ungültiger Typ der Medienquelle. - Could not locate media source. Die Medienquelle konnte nicht gefunden werden. - Could not open audio device. The device is already in use. Das Audiogerät konnte nicht geöffnet werden, da es bereits in Benutzung ist. - Could not decode media source. Die Medienquelle konnte nicht gefunden werden. @@ -198,162 +158,130 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF - Audio Output Audio-Ausgabe - The audio output device Audio-Ausgabegerät - No error Kein Fehler - Not found Nicht gefunden - Out of memory Es ist kein Speicher mehr verfügbar - Not supported Nicht unterstützt - Overflow Überlauf - Underflow Unterlauf - Already exists Existiert bereits - Path not found Pfad konnte nicht gefunden werden - In use Bereits in Verwendung - Not ready Nicht bereit - Access denied Zugriff verweigert - Could not connect Es konnte keine Verbindung hergestellt werden - Disconnected Getrennt - Permission denied Zugriff verweigert - Insufficient bandwidth Unzureichende Bandweite - Network unavailable Netzwerk nicht verfügbar - Network communication error Fehler bei der Kommunikation über das Netzwerk - Streaming not supported Streaming nicht unterstützt - Server alert Server alert - Invalid protocol Ungültiges Protokoll - Invalid URL Ungültige URL - Multicast error Multicast-Fehler - Proxy server error Fehler bei Proxy-Server-Kommunikation - Proxy server not supported Proxy-Server nicht unterstützt - Audio output error Fehler bei Audio-Ausgabe - Video output error Fehler bei Video-Ausgabe - Decoder error Fehler im Decoder - Audio or video components could not be played Audio- oder Videokomponenten konnten nicht abgespielt werden - DRM error DRM-Fehler - Unknown error (%1) Unbekannter Fehler (%1) @@ -361,33 +289,34 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::AbstractMediaPlayer - Not ready to play Das Abspielen ist im Grundzustand nicht möglich - - Error opening file Die Datei konnte nicht geöffnet werden - Error opening URL Der URL konnte nicht geöffnet werden - + Error opening resource + Die Ressource konnte nicht geöffnet werden + + + Error opening source: resource not opened + Die Quelle konnte nicht geöffnet werden: Ressource nicht geöffnet + + Setting volume failed Die Lautstärke konnte nicht eingestellt werden - Loading clip failed Das Laden des Clips schlug fehl - Playback complete Abspielen beendet @@ -395,22 +324,18 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::AbstractVideoPlayer - Pause failed Fehler bei Pause-Funktion - Seek failed Suchoperation fehlgeschlagen - Getting position failed Die Position konnte nicht bestimmt werden - Opening clip failed Der Clip konnte nicht geöffnet werden @@ -418,7 +343,6 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::AudioEqualizer - %1 Hz %1 Hz @@ -426,7 +350,6 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::AudioPlayer - Getting position failed Die Position konnte nicht bestimmt werden @@ -434,11 +357,6 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::DsaVideoPlayer - - - - - Video display error Fehler bei der Video-Anzeige @@ -446,7 +364,6 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::EffectFactory - Enabled Aktiviert @@ -454,61 +371,51 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::EnvironmentalReverb - Decay HF ratio (%) DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime. Hochfrequenz-Abklingverhältnis (%) - Decay time (ms) DecayTime: Time over which reverberation is diminished. Abklingzeit (ms) - Density (%) Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value. Dichte (%) - Diffusion (%) Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value. Diffusion (%) - Reflections delay (ms) ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection. Verzögerung des Echos (ms) - Reflections level (mB) ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude. Stärke des Echos (mB) - Reverb delay (ms) ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation. Verzögerung des Nachhalls (ms) - Reverb level (mB) ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude. Stärke des Nachhalls (mB) - Room HF level RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound. Hochfrequenz-Pegel des Raums - Room level (mB) RoomLevel: Master volume control for all reflected sound. Pegel des Raums (mB) @@ -517,12 +424,18 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::MediaObject - Error opening source: type not supported Die Quelle konnte nicht geöffnet werden: Dieser Typ wird nicht unterstützt - + Error opening source: resource is compressed + Die Quelle konnte nicht geöffnet werden: Die Ressource ist komprimiert + + + Error opening source: resource not valid + Die Quelle konnte nicht geöffnet werden: Ungültige Ressource + + Error opening source: media type could not be determined Die Quelle konnte nicht geöffnet werden: Der Medientyp konnte nicht bestimmt werden @@ -530,7 +443,6 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::StereoWidening - Level (%) Stärke (%) @@ -538,8 +450,6 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::SurfaceVideoPlayer - - Video display error Fehler bei der Video-Anzeige @@ -547,22 +457,14 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::VolumeSlider - - - - Volume: %1% Lautstärke: %1% - - - Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% Mit diesem Regler stellen Sie die Lautstärke ein. Die Position links entspricht 0%; die Position rechts entspricht %1% - Muted Stummschaltung @@ -570,12 +472,10 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Q3Accel - %1, %2 not defined %1, %2 sind nicht definiert - Ambiguous %1 not handled Mehrdeutige %1 können nicht verarbeitet werden @@ -583,27 +483,22 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Q3DataTable - True Wahr - False Falsch - Insert Einfügen - Update Aktualisieren - Delete Löschen @@ -611,313 +506,238 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Q3FileDialog - Copy or Move a File Datei kopieren oder verschieben - Read: %1 Lesen: %1 - - Write: %1 Schreiben: %1 - - Cancel Abbrechen - - - - All Files (*) Alle Dateien (*) - Name Name - Size Größe - Type Typ - Date Datum - Attributes Attribute - - &OK &OK - Look &in: Su&chen in: - - - File &name: Datei&name: - File &type: Datei&typ: - Back Zurück - One directory up Ein Verzeichnis zurück - Create New Folder Neuen Ordner erstellen - List View Liste - Detail View Ausführlich - Preview File Info Vorschau der Datei-Informationen - Preview File Contents Vorschau des Datei-Inhalts - Read-write Lesen/Schreiben - Read-only Nur Lesen - Write-only Nur Schreiben - Inaccessible Gesperrt - Symlink to File Verknüpfung mit Datei - Symlink to Directory Verknüpfung mit Verzeichnis - Symlink to Special Verknüpfung mit Spezialdatei - File Datei - Dir Verzeichnis - Special Spezialattribut - - - Open Öffnen - - Save As Speichern unter - - - &Open &Öffnen - - &Save S&peichern - &Rename &Umbenennen - &Delete &Löschen - R&eload Erne&ut laden - Sort by &Name Nach &Namen sortieren - Sort by &Size Nach &Größe sortieren - Sort by &Date Nach &Datum sortieren - &Unsorted &Unsortiert - Sort Sortieren - Show &hidden files &Versteckte Dateien anzeigen - the file die Datei - the directory das Verzeichnis - the symlink die Verknüpfung - Delete %1 %1 löschen - <qt>Are you sure you wish to delete %1 "%2"?</qt> <qt>Sind Sie sicher, dass Sie %1 "%2" löschen möchten?</qt> - &Yes &Ja - &No &Nein - New Folder 1 Neues Verzeichnis 1 - New Folder Neues Verzeichnis - New Folder %1 Neues Verzeichnis %1 - Find Directory Verzeichnis suchen - - Directories Verzeichnisse - Directory: Verzeichnis: - - Error Fehler - %1 File not found. Check path and filename. @@ -926,17 +746,14 @@ Datei kann nicht gefunden werden. Überprüfen Sie Pfad und Dateinamen. - All Files (*.*) Alle Dateien (*.*) - Open Öffnen - Select a Directory Wählen Sie ein Verzeichnis @@ -944,29 +761,24 @@ Datei kann nicht gefunden werden. Q3LocalFs - - Could not read directory %1 Konnte Verzeichnis nicht lesen %1 - Could not create directory %1 Konnte Verzeichnis nicht erstellen %1 - Could not remove file or directory %1 Konnte Datei oder Verzeichnis nicht löschen %1 - Could not rename %1 to @@ -977,14 +789,12 @@ nach %2 - Could not open %1 Konnte nicht geöffnet werden: %1 - Could not write %1 Konnte nicht geschrieben werden: @@ -994,12 +804,10 @@ nach Q3MainWindow - Line up Ausrichten - Customize... Anpassen... @@ -1007,7 +815,6 @@ nach Q3NetworkProtocol - Operation stopped by the user Operation von Benutzer angehalten @@ -1015,8 +822,6 @@ nach Q3ProgressDialog - - Cancel Abbrechen @@ -1024,28 +829,22 @@ nach Q3TabDialog - - OK OK - Apply Anwenden - Help Hilfe - Defaults Voreinstellungen - Cancel Abbrechen @@ -1053,38 +852,30 @@ nach Q3TextEdit - &Undo &Rückgängig - &Redo Wieder&herstellen - Cu&t &Ausschneiden - &Copy &Kopieren - &Paste Einf&ügen - Clear Löschen - - Select All Alles auswählen @@ -1092,67 +883,54 @@ nach Q3TitleBar - System System - Restore up Wiederherstellen - Minimize Minimieren - Restore down Wiederherstellen - Maximize Maximieren - Close Schließen - Contains commands to manipulate the window Enthält Befehle zum Ändern der Fenstergröße - Puts a minimized window back to normal Stellt ein minimiertes Fenster wieder her - Moves the window out of the way Minimiert das Fenster - Puts a maximized window back to normal Stellt ein maximiertes Fenster wieder her - Makes the window full screen Vollbildmodus - Closes the window Schließt das Fenster - Displays the name of the window and contains controls to manipulate it Zeigt den Namen des Fensters und enthält Befehle zum Ändern @@ -1160,7 +938,6 @@ nach Q3ToolBar - More... Mehr... @@ -1168,51 +945,38 @@ nach Q3UrlOperator - - - The protocol `%1' is not supported Das Protokoll `%1' wird nicht unterstützt - The protocol `%1' does not support listing directories Das Protokoll `%1' unterstützt nicht das Auflisten von Verzeichnissen - The protocol `%1' does not support creating new directories Das Protokoll `%1' unterstützt nicht das Anlegen neuer Verzeichnisse - The protocol `%1' does not support removing files or directories Das Protokoll `%1' unterstützt nicht das Löschen von Dateien oder Verzeichnissen - The protocol `%1' does not support renaming files or directories Das Protokoll `%1' unterstützt nicht das Umbenennen von Dateien oder Verzeichnissen - The protocol `%1' does not support getting files Das Protokoll `%1' unterstützt nicht das Laden von Dateien - The protocol `%1' does not support putting files Das Protokoll `%1' unterstützt nicht das Speichern von Dateien - - The protocol `%1' does not support copying or moving files or directories Das Protokoll `%1' unterstützt nicht das Kopieren oder Verschieben von Dateien oder Verzeichnissen - - (unknown) (unbekannt) @@ -1220,27 +984,22 @@ nach Q3Wizard - &Cancel &Abbrechen - < &Back < &Zurück - &Next > &Weiter > - &Finish Ab&schließen - &Help &Hilfe @@ -1248,45 +1007,30 @@ nach QAbstractSocket - - - - Host not found Rechner konnte nicht gefunden werden - - - Connection refused Verbindung verweigert - Connection timed out Das Zeitlimit für die Verbindung wurde überschritten - - - Operation on socket is not supported Diese Socket-Operation wird nicht unterstützt - - Socket operation timed out Das Zeitlimit für die Operation wurde überschritten - Socket is not connected Nicht verbunden - Network unreachable Das Netzwerk ist nicht erreichbar @@ -1294,17 +1038,14 @@ nach QAbstractSpinBox - &Step up &Inkrementieren - Step &down &Dekrementieren - &Select All &Alles auswählen @@ -1312,7 +1053,6 @@ nach QAccessibleButton - Press Drücken @@ -1320,28 +1060,23 @@ nach QApplication - QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR - Executable '%1' requires Qt %2, found Qt %3. Die Anwendung '%1' benötigt Qt %2; es wurde aber Qt %3 gefunden. - Incompatible Qt Library Error Die Qt-Bibliothek ist inkompatibel - Activate Aktivieren - Activates the program's main window Aktiviert das Hauptfenster der Anwendung @@ -1349,22 +1084,18 @@ nach QAxSelect - Select ActiveX Control ActiveX-Element auswählen - OK OK - &Cancel &Abbrechen - COM &Object: COM-&Objekt: @@ -1372,17 +1103,14 @@ nach QCheckBox - Uncheck Löschen - Check Ankreuzen - Toggle Umschalten @@ -1390,57 +1118,46 @@ nach QColorDialog - Hu&e: Farb&ton: - &Sat: &Sättigung: - &Val: &Helligkeit: - &Red: &Rot: - &Green: &Grün: - Bl&ue: Bla&u: - A&lpha channel: A&lphakanal: - Select Color Farbauswahl - &Basic colors Grundfar&ben - &Custom colors &Benutzerdefinierte Farben - &Add to Custom Colors Zu benutzerdefinierten Farben &hinzufügen @@ -1448,23 +1165,18 @@ nach QComboBox - - Open Öffnen - False Falsch - True Wahr - Close Schließen @@ -1472,43 +1184,36 @@ nach QCoreApplication - %1: key is empty QSystemSemaphore %1: Ungültige Schlüsselangabe (leer) - %1: unable to make key QSystemSemaphore %1: Es kann kein Schlüssel erzeugt werden - %1: ftok failed QSystemSemaphore %1: ftok-Aufruf schlug fehl - %1: already exists QSystemSemaphore %1: existiert bereits - %1: does not exist QSystemSemaphore %1: Nicht existent - %1: out of resources QSystemSemaphore %1: Keine Ressourcen mehr verfügbar - %1: unknown error %2 QSystemSemaphore %1: Unbekannter Fehler %2 @@ -1517,22 +1222,18 @@ nach QDB2Driver - Unable to connect Es kann keine Verbindung aufgebaut werden - Unable to commit transaction Die Transaktion kann nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion kann nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) - Unable to set autocommit 'autocommit' kann nicht aktiviert werden @@ -1540,33 +1241,26 @@ nach QDB2Result - - Unable to execute statement Der Befehl kann nicht ausgeführt werden - Unable to prepare statement Der Befehl kann nicht initialisiert werden - Unable to bind variable Die Variable kann nicht gebunden werden - Unable to fetch record %1 Der Datensatz %1 kann nicht abgeholt werden - Unable to fetch next Der nächste Datensatz kann nicht abgeholt werden - Unable to fetch first Der erste Datensatz kann nicht abgeholt werden @@ -1574,22 +1268,18 @@ nach QDateTimeEdit - AM AM - am am - PM PM - pm pm @@ -1597,17 +1287,14 @@ nach QDeclarativeAbstractAnimation - Cannot animate non-existent property "%1" Die Eigenschaft '%1" existiert nicht und kann daher nicht animiert werden - Cannot animate read-only property "%1" Die Eigenschaft '%1" ist schreibgeschützt und kann daher nicht animiert werden - Animation is an abstract class Die Klasse Animation ist abstrakt @@ -1615,7 +1302,6 @@ nach QDeclarativeAnchorAnimation - Cannot set a duration of < 0 Es kann keine Zeitdauer <0 gesetzt werden @@ -1623,67 +1309,50 @@ nach QDeclarativeAnchors - Possible anchor loop detected on fill. Bei der Fülloperation wurde eine potentielle Endlosschleife der Anker festgestellt. - Possible anchor loop detected on centerIn. Bei der Operation 'centerIn' wurde eine potentielle Endlosschleife der Anker festgestellt. - - - - Cannot anchor to an item that isn't a parent or sibling. Das Ziel eines Anker muss ein Elternelement oder Element der gleichen Ebene sein. - Possible anchor loop detected on vertical anchor. Bei einem vertikalen Anker wurde eine potentielle Endlosschleife der Anker festgestellt. - Possible anchor loop detected on horizontal anchor. Bei einem horizontalen Anker wurde eine potentielle Endlosschleife der Anker festgestellt. - Cannot specify left, right, and hcenter anchors. Ankerangaben für links, rechts und horizontal zentriert dürfen nicht zusammen auftreten. - - Cannot anchor to a null item. Es kann kein Anker zu einem Null-Element angegeben werden. - Cannot anchor a horizontal edge to a vertical edge. Es kann kein Anker zu einer horizontalen oder vertikalen Kante angegeben werden. - - Cannot anchor item to self. Ein Element kann keinen Anker zu sich selbst haben. - Cannot specify top, bottom, and vcenter anchors. Ankerangaben für oben, unten und vertikal zentriert dürfen nicht zusammen auftreten. - Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors. Ein Baseline-Anker darf nicht mit zusammen mit weiteren Ankerangaben für oben, unten und vertikal zentriert verwendet werden. - Cannot anchor a vertical edge to a horizontal edge. Vertikale und horizontale Kanten können nicht mit Ankern verbunden werden. @@ -1691,7 +1360,6 @@ nach QDeclarativeAnimatedImage - Qt was built without support for QMovie Diese Version der Qt-Bibliothek wurde ohne Unterstützung für die Klasse QMovie erstellt @@ -1699,7 +1367,6 @@ nach QDeclarativeBehavior - Cannot change the animation assigned to a Behavior. Die zu einem Behavior-Element gehörende Animation kann nicht geändert werden. @@ -1707,7 +1374,6 @@ nach QDeclarativeBinding - Binding loop detected for property "%1" Bei der für die Eigenschaft "%1" angegebenen Bindung wurde eine Endlosschleife festgestellt @@ -1715,7 +1381,6 @@ nach QDeclarativeCompiledBindings - Binding loop detected for property "%1" Bei der für die Eigenschaft "%1" angegebenen Bindung wurde eine Endlosschleife festgestellt @@ -1723,390 +1388,310 @@ nach QDeclarativeCompiler - - - - - - Invalid property assignment: "%1" is a read-only property Ungültige Zuweisung bei Eigenschaft: "%1" ist schreibgeschützt - Invalid property assignment: unknown enumeration Ungültige Zuweisung bei Eigenschaft: Ungültiger Aufzählungswert - Invalid property assignment: string expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Zeichenkette erwartet - Invalid property assignment: url expected Ungültige Zuweisung bei Eigenschaft: Es wird eine URL erwartet - Invalid property assignment: unsigned int expected Ungültige Zuweisung bei Eigenschaft: Es wird eine vorzeichenloser Ganzzahlwert erwartet - Invalid property assignment: int expected Ungültige Zuweisung bei Eigenschaft: Es wird ein Ganzzahlwert erwartet - Invalid property assignment: float expected - Ungültige Zuweisung bei Eigenschaft: Es wird eine Gleitkommazahl erwartet + Ungültige Zuweisung bei Eigenschaft: Es wird eine Gleitkommazahl erwartet - Invalid property assignment: double expected - Ungültige Zuweisung bei Eigenschaft: Es wird eine Gleitkommazahl (double) erwartet + Ungültige Zuweisung bei Eigenschaft: Es wird eine Gleitkommazahl (double) erwartet - Invalid property assignment: color expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Farbspezifikation erwartet - Invalid property assignment: date expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Datumsangabe erwartet - Invalid property assignment: time expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Zeitangabe erwartet - Invalid property assignment: datetime expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Datumsangabe erwartet - Invalid property assignment: point expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Koordinatenangabe für einen Punkt erwartet - Invalid property assignment: size expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Größenangabe erwartet - Invalid property assignment: rect expected Ungültige Zuweisung bei Eigenschaft: Es werden Parameter für ein Rechteck erwartet - Invalid property assignment: boolean expected Ungültige Zuweisung bei Eigenschaft: Es wird ein Boolescher Wert erwartet - Invalid property assignment: 3D vector expected Ungültige Zuweisung bei Eigenschaft: Es wird ein dreidimensionaler Vektor erwartet - Invalid property assignment: unsupported type "%1" Ungültige Zuweisung bei Eigenschaft: Der Typ "%1" ist nicht unterstützt - Element is not creatable. Das Element kann nicht erzeugt werden. - Component elements may not contain properties other than id Komponenten dürfen außer id keine weiteren Eigenschaften enthalten. - Invalid component id specification Ungültige Komponentenspezifikation - - id is not unique ID-Wert nicht eindeutig - Invalid component body specification Inhalt der Komponente ungültig - Cannot create empty component specification Es kann keine leere Komponentenangabe erzeugt werden - Empty signal assignment Leere Signalzuweisung - Empty property assignment Leere Eigenschaftszuweisung - Attached properties cannot be used here An dieser Stelle können keine Eigenschaften des Typs 'attached' verwendet werden - - Non-existent attached object Es existiert kein Bezugselement für die Eigenschaft - - Invalid attached object assignment Ungültige Zuweisung des Bezugselements - Cannot assign to non-existent default property Es kann keine Zuweisung erfolgen, da keine Vorgabe-Eigenschaft existiert - - Cannot assign to non-existent property "%1" Es kann keine Zuweisung erfolgen, da keine Eigenschaft des Namens '%1" existiert - Invalid use of namespace Ungültige Verwendung eines Namensraums - Not an attached property name Kein gültiger Name einer Eigenschaft des Typs 'attached' - Invalid use of id property Ungültige Verwendung einer Eigenschaft des Typs 'Id' - Incorrectly specified signal assignment - + Invalid property assignment: number expected + Ungültige Zuweisung bei Eigenschaft: Es wird eine Zahl erwartet + + Component objects cannot declare new properties. Komponentenobjekte können keine neuen Eigenschaften deklarieren. - Component objects cannot declare new signals. Komponentenobjekte können keine neuen Signale deklarieren. - Component objects cannot declare new functions. Komponentenobjekte können keine neuen Funktionen deklarieren. - Cannot assign a value to a signal (expecting a script to be run) Einem Signal können keine Werte zugewiesen werden (es wird ein Skript erwartet) - - Property has already been assigned a value Der Eigenschaft wurde bereits ein Wert zugewiesen - - Invalid grouped property access Falsche Gruppierung bei Zugriff auf Eigenschaft - Cannot assign a value directly to a grouped property Bei einer Eigenschaft, die Teil einer Gruppierung ist, ist keine direkte Wertzuweisung zulässig - Invalid property use Ungültige Verwendung von Eigenschaften - Property assignment expected Zuweisung an Eigenschaft erwartet - Single property assignment expected Einzelne Zuweisung an Eigenschaft erwartet - Unexpected object assignment Zuweisung des Objekts nicht zulässig - Cannot assign object to list Zuweisung eines Objekts an eine Liste nicht zulässig - Can only assign one binding to lists Listen kann nur eine einzige Bindung zugewiesen werden - Cannot assign primitives to lists Zuweisung eines einfachen Werts (primitive) an eine Liste nicht zulässig - Cannot assign multiple values to a script property Eine Zuweisung mehrerer Werte an eine Skript-Eigenschaft ist nicht zulässig - Invalid property assignment: script expected Ungültige Zuweisung bei Eigenschaft: Es wird ein Skript erwartet - Cannot assign object to property Zuweisung eines Objekts an eine Eigenschaft nicht zulässig - "%1" cannot operate on "%2" "%1" kann nicht auf "%2" angewandt werden - Duplicate default property Mehrfaches Auftreten der Vorgabe-Eigenschaft - Duplicate property name Mehrfaches Auftreten eines Eigenschaftsnamens - Property names cannot begin with an upper case letter Eigenschaftsnamen dürfen nicht mit einem Großbuchstaben beginnen - + Illegal property name + Ungültiger Name der Eigenschaft + + Duplicate signal name Mehrfaches Auftreten eines Signalnamens - Signal names cannot begin with an upper case letter Signalnamen dürfen nicht mit einem Großbuchstaben beginnen - Illegal signal name Ungültiger Name für Signal - Duplicate method name Mehrfaches Auftreten eines Methodennamens - Method names cannot begin with an upper case letter Methodennamen dürfen nicht mit einem Großbuchstaben beginnen - Illegal method name Ungültiger Name für Methode - Property value set multiple times Mehrfache Zuweisung eines Wertes an eine Eigenschaft - Invalid property nesting Ungültige Schachtelung von Eigenschaften - Cannot override FINAL property Eine als 'FINAL' ausgewiesene Eigenschaft kann nicht überschrieben werden - Invalid property type Ungültiger Typ der Eigenschaft - Invalid empty ID Ungültiger (leerer) Id-Wert - IDs cannot start with an uppercase letter Id-Werte dürfen nicht mit einem Großbuchstaben beginnen - IDs must start with a letter or underscore Id-Werte müssen mit einem Buchstaben oder dem Zeichen '_' beginnen - IDs must contain only letters, numbers, and underscores Id-Werte dürfen nur Buchstaben oder Unterstriche enthalten - ID illegally masks global JavaScript property Der Id-Wert überdeckt eine globale Eigenschaft aus JavaScript - - No property alias location Alias-Eigenschaft ohne Quellangabe - - Invalid alias location Ungültige Quellangabe bei Alias-Eigenschaft - Invalid alias reference. An alias reference must be specified as <id> or <id>.<property> Ungültige Referenzierung einer Alias-Eigenschaft. Die Referenz muss in der Form <id> oder <id>.<property> angegeben werden - Invalid alias reference. Unable to find id "%1" Ungültige Referenzierung einer Alias-Eigenschaft. Der Id-Wert "%1" konnte nicht gefunden werden @@ -2114,7 +1699,6 @@ nach QDeclarativeComponent - Invalid empty URL Ungültige (leere) URL @@ -2122,23 +1706,18 @@ nach QDeclarativeCompositeTypeManager - - Resource %1 unavailable Auf die Ressource %1 konnte nicht zugegriffen werden - Namespace %1 cannot be used as a type Der Namensraum %1 kann nicht als Typangabe verwendet werden - %1 %2 %1 %2 - Type %1 unavailable Der Typ %1 ist nicht verfügbar @@ -2146,23 +1725,18 @@ nach QDeclarativeConnections - - Cannot assign to non-existent property "%1" Es kann keine Zuweisung erfolgen, da keine Eigenschaft des Namens '%1" existiert - Connections: nested objects not allowed Verbindungen: Verschachtelte Objekte sind nicht zulässig - Connections: syntax error Verbindungen: Syntaxfehler - Connections: script expected Verbindungen: Skript erwartet @@ -2170,33 +1744,26 @@ nach QDeclarativeEngine - executeSql called outside transaction() 'executeSql' wurde außerhalb von 'transaction()' aufgerufen - Read-only Transaction Schreibgeschützte Transaktion - Version mismatch: expected %1, found %2 Die Version %2 kann nicht verwendet werden; es wird %1 benötigt - SQL transaction failed Die SQL-Transaktion schlug fehl - transaction: missing callback callback fehlt bei Transaktion - - SQL: database version mismatch SQL: Die Version der Datenbank entspricht nicht der erwarteten Version @@ -2204,12 +1771,10 @@ nach QDeclarativeFlipable - front is a write-once property 'front' kann nur einmal zugewiesen werden - back is a write-once property 'back' kann nur einmal zugewiesen werden @@ -2217,75 +1782,58 @@ nach QDeclarativeImportDatabase - module "%1" definition "%2" not readable Modul "%1" Definition "%2" kann nicht gelesen werden - plugin cannot be loaded for module "%1": %2 Das Plugin des Moduls "%1" konnte nicht geladen werden: %2 - module "%1" plugin "%2" not found Modul "%1" Plugin "%2" konnte nicht gefunden werden - - module "%1" version %2.%3 is not installed Modul "%1" Version %2.%3 ist nicht installiert - module "%1" is not installed Modul "%1" ist nicht installiert - - "%1": no such directory Das Verzeichnis "%1" existiert nicht - import "%1" has no qmldir and no namespace "qmldir" und Namensraum fehlen bei dem Import "%1" - - %1 is not a namespace - %1 ist kein gültiger Namensraum - - nested namespaces not allowed - geschachtelte Namensräume sind nicht zulässig - - local directory Lokales Verzeichnis' - is ambiguous. Found in %1 and in %2 ist mehrdeutig. Es kommt in %1 und in %2 vor - is ambiguous. Found in %1 in version %2.%3 and %4.%5 ist mehrdeutig. Es kommt in %1 in den Version %2.%3 und %4.%5 vor - is instantiated recursively wird rekursiv instanziiert - is not a type ist kein Typ @@ -2293,7 +1841,6 @@ nach QDeclarativeKeyNavigationAttached - KeyNavigation is only available via attached properties Tastennavigation ist nur über Eigenschaften des Typs 'attached' verfügbar @@ -2301,7 +1848,6 @@ nach QDeclarativeKeysAttached - Keys is only available via attached properties Die Unterstützung für Tasten ist nur über Eigenschaften des Typs 'attached' verfügbar @@ -2309,59 +1855,46 @@ nach QDeclarativeListModel - remove: index %1 out of range remove: Der Index %1 ist außerhalb des gültigen Bereichs - insert: value is not an object insert: Der Wert ist kein Objekt - insert: index %1 out of range insert: Der Index %1 ist außerhalb des gültigen Bereichs - move: out of range move: Außerhalb des gültigen Bereichs - append: value is not an object append: Der Wert ist kein Objekt - set: value is not an object set: Der Wert ist kein Objekt - - set: index %1 out of range set: Der Index %1 ist außerhalb des gültigen Bereichs - - ListElement: cannot contain nested elements ListElement kann keine geschachtelten Elemente enthalten - ListElement: cannot use reserved "id" property ListElement: Die "id"-Eigenschaft kann nicht verwendet werden - ListElement: cannot use script for property value ListElement: Es kann kein Skript für den Wert der Eigenschaft verwendet werden - ListModel: undefined property '%1' ListModel: Die Eigenschaft '%1' ist nicht definiert @@ -2369,7 +1902,6 @@ nach QDeclarativeLoader - Loader does not support loading non-visual elements. Das Laden nicht-visueller Elemente ist nicht unterstützt. @@ -2377,18 +1909,14 @@ nach QDeclarativeParentAnimation - Unable to preserve appearance under complex transform Das Erscheinungsbild kann bei einer komplexen Transformation nicht beibehalten werden - - Unable to preserve appearance under non-uniform scale Das Erscheinungsbild kann bei einer nicht-uniformen Skalierung nicht beibehalten werden - Unable to preserve appearance under scale of 0 Das Erscheinungsbild kann bei einer Skalierung mit 0 nicht beibehalten werden @@ -2396,18 +1924,14 @@ nach QDeclarativeParentChange - Unable to preserve appearance under complex transform Das Erscheinungsbild kann bei einer komplexen Transformation nicht beibehalten werden - - Unable to preserve appearance under non-uniform scale Das Erscheinungsbild kann bei einer nicht-uniformen Skalierung nicht beibehalten werden - Unable to preserve appearance under scale of 0 Das Erscheinungsbild kann bei einer Skalierung mit 0 nicht beibehalten werden @@ -2415,144 +1939,110 @@ nach QDeclarativeParser - Illegal character Ungültiges Zeichen - Unclosed string at end of line Zeichenkette am Zeilenende nicht abgeschlossen - Illegal escape squence Ungültiges Escape-Sequenz - - - Illegal unicode escape sequence Ungültige Unicode-Escape-Sequenz - Unclosed comment at end of file Kommentar am Dateiende nicht abgeschlossen - Illegal syntax for exponential number Ungültige Syntax des Exponenten - Identifier cannot start with numeric literal Ein Bezeichner darf nicht mit einem numerischen Literal beginnen - Unterminated regular expression literal Regulärer Ausdruck nicht abgeschlossen - Invalid regular expression flag '%0' Ungültiger Modifikator '%0' bei regulärem Ausdruck - - Unterminated regular expression backslash sequence Regulärer Ausdruck nicht abgeschlossen - Unterminated regular expression class Klasse im regulären Ausdruck nicht abgeschlossen - - Syntax error Syntaxfehler - Unexpected token `%1' Unerwartetes Element '%1' - - Expected token `%1' Es wird das Element '%1' erwartet - - - Property value set multiple times Mehrfache Zuweisung eines Wertes an eine Eigenschaft - Expected type name Es wird ein Typname erwartet - Invalid import qualifier ID Ungültige Id-Angabe bei Import - Reserved name "Qt" cannot be used as an qualifier Der reservierte Name "Qt" kann nicht als Bezeichner verwendet werden - Script import qualifiers must be unique. Der für den Skript-Import angegebene Qualifizierer muss eindeutig sein. - Script import requires a qualifier Der Skript-Import erfordert die Angabe eines Qualifizierers. - Library import requires a version Der Import einer Bibliothek erfordert eine Versionsangabe - Expected parameter type Es wird eine Typangabe für den Parameter erwartet - Invalid property type modifier Ungültiger Modifikator für den Typ der Eigenschaft - Unexpected property type modifier Modifikator für den Typ der Eigenschaft an dieser Stelle nicht zulässig - Expected property type Typangabe für Eigenschaft erwartet - Readonly not yet supported 'read-only' wird an dieser Stelle noch nicht unterstützt - JavaScript declaration outside Script element Eine JavaScript-Deklaration ist außerhalb eines Skriptelementes nicht zulässig @@ -2560,39 +2050,47 @@ nach QDeclarativePauseAnimation - Cannot set a duration of < 0 Es kann keine Zeitdauer <0 gesetzt werden - QDeclarativePixmapCache + QDeclarativePixmap - Error decoding: %1: %2 Fehler beim Decodieren: %1: %2 - Failed to get image from provider: %1 Bilddaten konnten nicht erhalten werden: %1 - - Cannot open: %1 Fehlschlag beim Öffnen: %1 + + + QDeclarativePixmapCache + + Error decoding: %1: %2 + Fehler beim Decodieren: %1: %2 + + + Failed to get image from provider: %1 + Bilddaten konnten nicht erhalten werden: %1 + + + Cannot open: %1 + Fehlschlag beim Öffnen: %1 + - Unknown Error loading %1 - Unbekannter Fehler beim Laden von %1 + Unbekannter Fehler beim Laden von %1 QDeclarativePropertyAnimation - Cannot set a duration of < 0 Es kann keine Zeitdauer <0 gesetzt werden @@ -2600,17 +2098,14 @@ nach QDeclarativePropertyChanges - PropertyChanges does not support creating state-specific objects. Die Erzeugung von Objekten, die einem Zustand zugeordnet sind, wird von PropertyChanges nicht unterstützt. - Cannot assign to non-existent property "%1" Es kann keine Zuweisung erfolgen, da keine Eigenschaft des Namens '%1" existiert - Cannot assign to read-only property "%1" Die Eigenschaft '%1" ist schreibgeschützt und kann daher nicht zugewiesen werden @@ -2618,13 +2113,10 @@ nach QDeclarativeTextInput - - Could not load cursor delegate Cursor-Delegate konnte nicht geladen werden - Could not instantiate cursor delegate Cursor-Delegate konnte angelegt werden @@ -2632,47 +2124,38 @@ nach QDeclarativeVME - Unable to create object of type %1 Es konnte kein Objekt des Typs %1 erzeugt werden - Cannot assign value %1 to property %2 Der Wert '%1' kann nicht der Eigenschaft %2 zugewiesen werden - Cannot assign object type %1 with no default method Der Objekttyp %1 kann nicht zugewiesen werden, da keine Vorgabe-Methode existiert - Cannot connect mismatched signal/slot %1 %vs. %2 Es kann keine Verbindung zwischen dem Signal %1 und dem Slot %2 hergestellt werden, da sie nicht zusammenpassen - Cannot assign an object to signal property %1 Der Signal-Eigenschaft %1 kann kein Objekt zugewiesen werden - Cannot assign object to list Zuweisung eines Objekts an eine Liste nicht zulässig - Cannot assign object to interface property Der Eigenschaft der Schnittstelle kann kein Objekt zugewiesen werden - Unable to create attached object Es konnte kein 'attached'-Objekt erzeugt werden - Cannot set properties on %1 as it is null Es können keine Eigenschaften auf %1 gesetzt werden, da es 'null' ist @@ -2680,7 +2163,6 @@ nach QDeclarativeVisualDataModel - Delegate component must be Item type. Delegate-Komponente muss vom Typ 'Item' sein @@ -2688,8 +2170,6 @@ nach QDeclarativeXmlListModel - - Qt was built without support for xmlpatterns Diese Version der Qt-Bibliothek wurde ohne Unterstützung für xmlpatterns erstellt @@ -2697,7 +2177,6 @@ nach QDeclarativeXmlListModelRole - An XmlRole query must not start with '/' Eine XmlRole-Abfrage darf nicht mit '/' beginnen @@ -2705,7 +2184,6 @@ nach QDeclarativeXmlRoleList - An XmlListModel query must start with '/' or "//" Eine XmlListModel-Abfrage muss mit '/' oder "//" beginnen @@ -2713,17 +2191,14 @@ nach QDial - QDial QDial - SpeedoMeter Tachometer - SliderHandle Schieberegler @@ -2731,12 +2206,10 @@ nach QDialog - What's This? Direkthilfe - Done Fertig @@ -2744,124 +2217,98 @@ nach QDialogButtonBox - - - OK OK - Save Speichern - &Save S&peichern - Open Öffnen - Cancel Abbrechen - &Cancel &Abbrechen - Close Schließen - &Close Schl&ießen - Apply Anwenden - Reset Zurücksetzen - Help Hilfe - Don't Save Nicht speichern - Discard Verwerfen - &Yes &Ja - Yes to &All Ja, &alle - &No &Nein - N&o to All N&ein, keine - Save All Alles speichern - Abort Abbrechen - Retry Wiederholen - Ignore Ignorieren - Restore Defaults Voreinstellungen - Close without Saving Schließen ohne Speichern - &OK &OK @@ -2869,29 +2316,24 @@ nach QDirModel - Name Name - Size Größe - Kind Match OS X Finder Art - Type All other platforms Typ - Date Modified Änderungsdatum @@ -2899,17 +2341,14 @@ nach QDockWidget - Close Schließen - Dock Andocken - Float Herauslösen @@ -2917,12 +2356,10 @@ nach QDoubleSpinBox - More Mehr - Less Weniger @@ -2930,27 +2367,22 @@ nach QErrorMessage - &Show this message again Diese Meldung wieder an&zeigen - &OK &OK - Debug Message: Debug-Ausgabe: - Warning: Achtung: - Fatal Error: Fehler: @@ -2958,38 +2390,30 @@ nach QFile - - Destination file exists Die Zieldatei existiert bereits - Will not rename sequential file using block copy Eine sequentielle Datei kann nicht durch blockweises Kopieren umbenannt werden - Cannot remove source file Die Quelldatei kann nicht entfernt werden - Cannot open %1 for input %1 kann nicht zum Lesen geöffnet werden - Cannot open for output Das Öffnen zum Schreiben ist fehlgeschlagen - Failure to write block Der Datenblock konnte nicht geschrieben werden - Cannot create %1 for output %1 kann nicht erstellt werden @@ -2997,113 +2421,84 @@ nach QFileDialog - - All Files (*) Alle Dateien (*) - - Back Zurück - - List View Liste - - Detail View Details - - File Datei - Open Öffnen - Save As Speichern unter - - - &Open &Öffnen - - &Save S&peichern - Recent Places Zuletzt besucht - &Rename &Umbenennen - &Delete &Löschen - Show &hidden files &Versteckte Dateien anzeigen - New Folder Neues Verzeichnis - Find Directory Verzeichnis suchen - Directories Verzeichnisse - All Files (*.*) Alle Dateien (*.*) - - Directory: Verzeichnis: - %1 already exists. Do you want to replace it? Die Datei %1 existiert bereits. Soll sie überschrieben werden? - %1 File not found. Please verify the correct file name was given. @@ -3112,25 +2507,18 @@ Die Datei konnte nicht gefunden werden. Stellen Sie sicher, dass der Dateiname richtig ist. - My Computer Mein Computer - - Parent Directory Übergeordnetes Verzeichnis - - Files of type: Dateien des Typs: - - %1 Directory not found. Please verify the correct directory name was given. @@ -3139,128 +2527,100 @@ Das Verzeichnis konnte nicht gefunden werden. Stellen Sie sicher, dass der Verzeichnisname richtig ist. - '%1' is write protected. Do you want to delete it anyway? '%1' ist schreibgeschützt. Möchten Sie die Datei trotzdem löschen? - Are sure you want to delete '%1'? Sind Sie sicher, dass Sie '%1' löschen möchten? - Could not delete directory. Konnte Verzeichnis nicht löschen. - Drive Laufwerk - File Folder Match Windows Explorer Ordner - Folder All other platforms Order - Alias Mac OS X Finder Alias - Shortcut All other platforms Symbolischer Link - Unknown Unbekannt - Show Anzeigen - - Forward Vorwärts - &New Folder &Neues Verzeichnis - - &Choose &Auswählen - Remove Löschen - - File &name: Datei&name: - - Look in: Suchen in: - - Create New Folder Neuen Ordner erstellen - Go back Zurück - Go forward Vor - Go to the parent directory Gehe zum übergeordneten Verzeichnis - Create a New Folder Neuen Ordner erstellen - Change to list view mode Wechsle zu Listenansicht - Change to detail view mode Wechsle zu Detailansicht @@ -3268,83 +2628,64 @@ Möchten Sie die Datei trotzdem löschen? QFileSystemModel - - %1 TB %1 TB - - %1 GB %1 GB - - %1 MB %1 MB - - %1 KB %1 KB - %1 bytes %1 Byte - Invalid filename Ungültiger Dateiname - <b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks. <b>Der Name "%1" kann nicht verwendet werden.</b><p>Versuchen Sie, die Sonderzeichen zu entfernen oder einen kürzeren Namen zu verwenden. - Name Name - Size Größe - Kind Match OS X Finder Art - Type All other platforms Typ - Date Modified Änderungsdatum - My Computer Mein Computer - Computer Computer - %1 byte(s) %1 byte @@ -3352,221 +2693,170 @@ Möchten Sie die Datei trotzdem löschen? QFontDatabase - - Normal Normal - - - Bold Fett - - Demi Bold Halbfett - - - Black Schwarz - Demi Semi - - Light Leicht - - Italic Kursiv - - Oblique Schräggestellt - Any Alle - Latin Lateinisch - Greek Griechisch - Cyrillic Kyrillisch - Armenian Armenisch - Hebrew Hebräisch - Arabic Arabisch - Syriac Syrisch - Thaana Thaana - Devanagari Devanagari - Bengali Bengalisch - Gurmukhi Gurmukhi - Gujarati Gujarati - Oriya Oriya - Tamil Tamilisch - Telugu Telugu - Kannada Kannada - Malayalam Malayalam - Sinhala Sinhala - Thai Thailändisch - Lao Laotisch - Tibetan Tibetisch - Myanmar Myanmar - Georgian Georgisch - Khmer Khmer - Simplified Chinese Chinesisch (Kurzzeichen) - Traditional Chinese Chinesisch (Langzeichen) - Japanese Japanisch - Korean Koreanisch - Vietnamese Vietnamesisch - Symbol Symbol - Ogham Ogham - Runic Runen - N'Ko N'Ko @@ -3574,47 +2864,38 @@ Möchten Sie die Datei trotzdem löschen? QFontDialog - &Font &Schriftart - Font st&yle Schrifts&til - &Size &Größe - Effects Effekte - Stri&keout Durch&gestrichen - &Underline &Unterstrichen - Sample Beispiel - Select Font Schriftart auswählen - Wr&iting System &Schriftsystem @@ -3622,145 +2903,104 @@ Möchten Sie die Datei trotzdem löschen? QFtp - Host %1 found Rechner %1 gefunden - Host found Rechner gefunden - - - Connected to host %1 Verbunden mit Rechner %1 - Connected to host Verbindung mit Rechner besteht - Connection to %1 closed Verbindung mit %1 beendet - - - Connection closed Verbindung beendet - - Host %1 not found Rechner %1 konnte nicht gefunden werden - - Connection refused to host %1 Verbindung mit %1 verweigert - Connection timed out to host %1 Das Zeitlimit für die Verbindung zu '%1' wurde überschritten - - - - Unknown error Unbekannter Fehler - - Connecting to host failed: %1 Verbindung mit Rechner schlug fehl: %1 - - Login failed: %1 Anmeldung schlug fehl: %1 - - Listing directory failed: %1 Der Inhalt des Verzeichnisses kann nicht angezeigt werden: %1 - - Changing directory failed: %1 Ändern des Verzeichnisses schlug fehl: %1 - - Downloading file failed: %1 Herunterladen der Datei schlug fehl: %1 - - Uploading file failed: %1 Hochladen der Datei schlug fehl: %1 - - Removing file failed: %1 Löschen der Datei schlug fehl: %1 - - Creating directory failed: %1 Erstellen des Verzeichnisses schlug fehl: %1 - - Removing directory failed: %1 Löschen des Verzeichnisses schlug fehl: %1 - - Not connected Keine Verbindung - - Connection refused for data connection Verbindung für die Daten Verbindung verweigert @@ -3768,12 +3008,10 @@ Möchten Sie die Datei trotzdem löschen? QHostInfo - Unknown error Unbekannter Fehler - No host name given Es wurde kein Hostname angegeben @@ -3781,37 +3019,22 @@ Möchten Sie die Datei trotzdem löschen? QHostInfoAgent - - - - Host not found Rechner konnte nicht gefunden werden - - - - Unknown address type Unbekannter Adresstyp - - - Unknown error Unbekannter Fehler - - No host name given Es wurde kein Hostname angegeben - - Invalid hostname Ungültiger Rechnername @@ -3819,153 +3042,110 @@ Möchten Sie die Datei trotzdem löschen? QHttp - - Connection refused Verbindung verweigert - - - Host %1 not found Rechner %1 konnte nicht gefunden werden - - Wrong content length Ungültige Längenangabe - - HTTP request failed HTTP-Anfrage fehlgeschlagen - Host %1 found Rechner %1 gefunden - Host found Rechner gefunden - Connected to host %1 Verbunden mit Rechner %1 - Connected to host Verbindung mit Rechner besteht - Connection to %1 closed Verbindung mit %1 beendet - - Connection closed Verbindung beendet - - - - Unknown error Unbekannter Fehler - - Request aborted Anfrage wurde abgebrochen - - No server set to connect to Für die Verbindung wurde kein Server-Rechner angegeben - - Server closed connection unexpectedly Der Server hat die Verbindung unerwartet geschlossen - - Invalid HTTP response header Der Kopfteil der HTTP-Antwort ist ungültig - Unknown authentication method Unbekannte Authentifizierungsmethode - - - - Invalid HTTP chunked body Der Inhalt (chunked body) der HTTP-Antwort ist ungültig - Error writing response to device Beim Schreiben der Antwort auf das Ausgabegerät ist ein Fehler aufgetreten - Proxy authentication required Proxy-Authentifizierung erforderlich - Authentication required Authentifizierung erforderlich - Proxy requires authentication Der Proxy-Server verlangt eine Authentifizierung - Host requires authentication Der Hostrechner verlangt eine Authentifizierung - Data corrupted Die Daten sind verfälscht - SSL handshake failed Im Ablauf des SSL-Protokolls ist ein Fehler aufgetreten. - Unknown protocol specified Es wurde ein unbekanntes Protokoll angegeben - Connection refused (or timed out) Verbindung verweigert oder Zeitlimit überschritten - HTTPS connection requested but SSL support not compiled in Die angeforderte HTTPS-Verbindung kann nicht aufgebaut werden, da keine SSL-Unterstützung vorhanden ist @@ -3973,47 +3153,38 @@ Möchten Sie die Datei trotzdem löschen? QHttpSocketEngine - Did not receive HTTP response from proxy Keine HTTP-Antwort vom Proxy-Server - Error parsing authentication request from proxy Fehler beim Auswerten der Authentifizierungsanforderung des Proxy-Servers - Authentication required Authentifizierung erforderlich - Proxy denied connection Der Proxy-Server hat den Aufbau einer Verbindung verweigert - Error communicating with HTTP proxy Fehler bei der Kommunikation mit dem Proxy-Server - Proxy server not found Es konnte kein Proxy-Server gefunden werden - Proxy connection refused Der Proxy-Server hat den Aufbau einer Verbindung verweigert - Proxy server connection timed out Bei der Verbindung mit dem Proxy-Server wurde ein Zeitlimit überschritten - Proxy connection closed prematurely Der Proxy-Server hat die Verbindung vorzeitig beendet @@ -4021,22 +3192,18 @@ Möchten Sie die Datei trotzdem löschen? QIBaseDriver - Error opening database Die Datenbankverbindung konnte nicht geöffnet werden - Could not start transaction Es konnte keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) @@ -4044,89 +3211,70 @@ Möchten Sie die Datei trotzdem löschen? QIBaseResult - Unable to create BLOB Es konnte kein BLOB erzeugt werden - Unable to write BLOB Der BLOB konnte nicht geschrieben werden - Unable to open BLOB Der BLOB konnte nicht geöffnet werden - Unable to read BLOB Der BLOB konnte nicht gelesen werden - - Could not find array Das Feld konnte nicht gefunden werden - Could not get array data Die Daten des Feldes konnten nicht gelesen werden - Could not get query info Die erforderlichen Informationen zur Abfrage sind nicht verfügbar - Could not start transaction Es konnte keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Could not allocate statement Die Allokation des Befehls schlug fehl - Could not prepare statement Der Befehl konnte nicht initialisiert werden - - Could not describe input statement Es konnte keine Beschreibung des Eingabebefehls erhalten werden - Could not describe statement Es konnte keine Beschreibung des Befehls erhalten werden - Unable to close statement Der Befehl konnte nicht geschlossen werden - Unable to execute query Der Befehl konnte nicht ausgeführt werden - Could not fetch next item Das nächste Element konnte nicht abgeholt werden - Could not get statement info Es ist keine Information zum Befehl verfügbar @@ -4134,27 +3282,22 @@ Möchten Sie die Datei trotzdem löschen? QIODevice - Permission denied Zugriff verweigert - Too many open files Zu viele Dateien geöffnet - No such file or directory Die Datei oder das Verzeichnis konnte nicht gefunden werden - No space left on device Kein freier Speicherplatz auf dem Gerät vorhanden - Unknown error Unbekannter Fehler @@ -4162,32 +3305,26 @@ Möchten Sie die Datei trotzdem löschen? QInputContext - XIM XIM - FEP FEP - XIM input method XIM-Eingabemethode - Windows input method Windows-Eingabemethode - Mac OS X input method Mac OS X-Eingabemethode - S60 FEP input method S60-FEP-Eingabemethode @@ -4195,7 +3332,6 @@ Möchten Sie die Datei trotzdem löschen? QInputDialog - Enter a value: Geben Sie einen Wert ein: @@ -4203,67 +3339,50 @@ Möchten Sie die Datei trotzdem löschen? QLibrary - Could not mmap '%1': %2 Operation mmap fehlgeschlagen für '%1': %2 - Plugin verification data mismatch in '%1' Die Prüfdaten des Plugins '%1' stimmen nicht überein - Could not unmap '%1': %2 Operation unmap fehlgeschlagen für '%1': %2 - The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5] Das Plugin '%1' verwendet eine inkompatible Qt-Bibliothek. (%2.%3.%4) [%5] - The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3" Das Plugin '%1' verwendet eine inkompatible Qt-Bibliothek. Erforderlicher build-spezifischer Schlüssel "%2", erhalten "%3" - Unknown error Unbekannter Fehler - - - The shared library was not found. Die dynamische Bibliothek konnte nicht gefunden werden. - The file '%1' is not a valid Qt plugin. Die Datei '%1' ist kein gültiges Qt-Plugin. - The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.) Das Plugin '%1' verwendet eine inkompatible Qt-Bibliothek. (Im Debug- bzw. Release-Modus erstellte Bibliotheken können nicht zusammen verwendet werden.) - - Cannot load library %1: %2 Die Bibliothek %1 kann nicht geladen werden: %2 - - Cannot unload library %1: %2 Die Bibliothek %1 kann nicht entladen werden: %2 - - Cannot resolve symbol "%1" in %2: %3 Das Symbol "%1" kann in %2 nicht aufgelöst werden: %3 @@ -4271,37 +3390,30 @@ Möchten Sie die Datei trotzdem löschen? QLineEdit - Select All Alles auswählen - &Undo &Rückgängig - &Redo Wieder&herstellen - Cu&t &Ausschneiden - &Copy &Kopieren - &Paste Einf&ügen - Delete Löschen @@ -4309,23 +3421,18 @@ Möchten Sie die Datei trotzdem löschen? QLocalServer - - %1: Name error %1: Fehlerhafter Name - %1: Permission denied %1: Zugriff verweigert - %1: Address in use %1: Die Adresse wird bereits verwendet - %1: Unknown error %2 %1: Unbekannter Fehler %2 @@ -4333,70 +3440,46 @@ Möchten Sie die Datei trotzdem löschen? QLocalSocket - - %1: Connection refused %1: Der Verbindungsaufbau wurde verweigert - - %1: Remote closed %1: Die Verbindung wurde von der Gegenseite geschlossen - - - - %1: Invalid name %1: Ungültiger Name - - %1: Socket access error %1: Fehler beim Zugriff auf den Socket - - %1: Socket resource error %1: Socket-Fehler (Ressourcenproblem) - - %1: Socket operation timed out %1: Zeitüberschreitung bei Socket-Operation - - %1: Datagram too large %1: Das Datagramm ist zu groß - - - %1: Connection error %1: Verbindungsfehler - - %1: The socket operation is not supported %1: Diese Socket-Operation wird nicht unterstützt - %1: Unknown error %1: Unbekannter Fehler - - %1: Unknown error %2 %1: Unbekannter Fehler %2 @@ -4404,27 +3487,22 @@ Möchten Sie die Datei trotzdem löschen? QMYSQLDriver - Unable to open database ' Die Datenbankverbindung kann nicht geöffnet werden ' - Unable to connect Es kann keine Verbindung aufgebaut werden - Unable to begin transaction Es kann keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion kann nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion kann nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) @@ -4432,60 +3510,46 @@ Möchten Sie die Datei trotzdem löschen? QMYSQLResult - - Unable to fetch data Es konnten keine Daten abgeholt werden - Unable to execute query Die Abfrage konnte nicht ausgeführt werden - Unable to store result Das Ergebnis konnte nicht gespeichert werden - - Unable to prepare statement Der Befehl konnte nicht initialisiert werden - Unable to reset statement Der Befehl konnte nicht zurückgesetzt werden - Unable to bind value Der Wert konnte nicht gebunden werden - Unable to execute statement Der Befehl konnte nicht ausgeführt werden - - Unable to bind outvalues Die Ausgabewerte konnten nicht gebunden werden - Unable to store statement results Die Ergebnisse des Befehls konnten nicht gespeichert werden - Unable to execute next query Die folgende Abfrage kann nicht ausgeführt werden - Unable to store next result Das folgende Ergebnis kann nicht gespeichert werden @@ -4493,7 +3557,6 @@ Möchten Sie die Datei trotzdem löschen? QMdiArea - (Untitled) (Unbenannt) @@ -4501,92 +3564,74 @@ Möchten Sie die Datei trotzdem löschen? QMdiSubWindow - %1 - [%2] %1 - [%2] - Close Schließen - Minimize Minimieren - Restore Down Wiederherstellen - &Restore Wieder&herstellen - &Move Ver&schieben - &Size Größe ä&ndern - Mi&nimize M&inimieren - Ma&ximize Ma&ximieren - Stay on &Top Im &Vordergrund bleiben - &Close Schl&ießen - Maximize Maximieren - Unshade Herabrollen - Shade Aufrollen - Restore Wiederherstellen - Help Hilfe - Menu Menü - - [%1] - [%1] @@ -4594,21 +3639,14 @@ Möchten Sie die Datei trotzdem löschen? QMenu - - Close Schließen - - Open Öffnen - - - Execute Ausführen @@ -4616,7 +3654,6 @@ Möchten Sie die Datei trotzdem löschen? QMenuBar - Actions Optionen @@ -4624,40 +3661,30 @@ Möchten Sie die Datei trotzdem löschen? QMessageBox - - - - OK OK - <h3>About Qt</h3><p>This program uses Qt version %1.</p> - <p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - About Qt Über Qt - Help Hilfe - Show Details... Details einblenden... - Hide Details... Details ausblenden... @@ -4665,7 +3692,6 @@ Möchten Sie die Datei trotzdem löschen? QMultiInputContext - Select IM Eingabemethode auswählen @@ -4673,12 +3699,10 @@ Möchten Sie die Datei trotzdem löschen? QMultiInputContextPlugin - Multiple input method switcher Umschalter für Eingabemethoden - Multiple input method switcher that uses the context menu of the text widgets Mehrfachumschalter für Eingabemethoden, der das Kontextmenü des Text-Widgets verwendet @@ -4686,132 +3710,106 @@ Möchten Sie die Datei trotzdem löschen? QNativeSocketEngine - The remote host closed the connection Der entfernte Rechner hat die Verbindung geschlossen - Network operation timed out Das Zeitlimit für die Operation wurde überschritten - Out of resources Keine Ressourcen verfügbar - Unsupported socket operation Socket-Kommando nicht unterstützt - Protocol type not supported Das Protokoll wird nicht unterstützt - Invalid socket descriptor Ungültiger Socket-Deskriptor - Network unreachable Das Netzwerk ist nicht erreichbar - Permission denied Zugriff verweigert - Connection timed out Das Zeitlimit für die Verbindung wurde überschritten - Connection refused Verbindung verweigert - The bound address is already in use Die angegebene Adresse ist bereits in Gebrauch - The address is not available Die Adresse ist nicht verfügbar - The address is protected Die Adresse ist geschützt - Unable to send a message Die Nachricht konnte nicht gesendet werden - Unable to receive a message Die Nachricht konnte nicht empfangen werden - Unable to write Der Schreibvorgang konnte nicht ausgeführt werden - Network error Netzwerkfehler - Another socket is already listening on the same port Auf diesem Port hört bereits ein anderer Socket - Unable to initialize non-blocking socket Der nichtblockierende Socket konnte nicht initialisiert werden - Unable to initialize broadcast socket Der Broadcast-Socket konnte nicht initialisiert werden - Attempt to use IPv6 socket on a platform with no IPv6 support Es wurde versucht, einen IPv6-Socket auf einem System ohne IPv6-Unterstützung zu verwenden - Host unreachable Der Zielrechner kann nicht erreicht werden - Datagram was too large to send Das Datagram konnte nicht gesendet werden, weil es zu groß ist - Operation on non-socket Operation kann nur auf einen Socket angewandt werden - Unknown error Unbekannter Fehler - The proxy type is invalid for this operation Die Operation kann mit dem Proxy-Typ nicht durchgeführt werden @@ -4819,7 +3817,6 @@ Möchten Sie die Datei trotzdem löschen? QNetworkAccessCacheBackend - Error opening %1 %1 konnte nicht geöffnet werden @@ -4827,12 +3824,10 @@ Möchten Sie die Datei trotzdem löschen? QNetworkAccessDataBackend - Operation not supported on %1 Diese Operation wird von %1 nicht unterstützt - Invalid URI: %1 Ungültiger URI: %1 @@ -4840,17 +3835,14 @@ Möchten Sie die Datei trotzdem löschen? QNetworkAccessDebugPipeBackend - Write error writing to %1: %2 Fehler beim Schreiben zu %1: %2 - Socket error on %1: %2 Socket-Fehler bei %1: %2 - Remote host closed the connection prematurely on %1 Der entfernte Rechner hat die Verbindung zu %1 vorzeitig beendet @@ -4858,30 +3850,22 @@ Möchten Sie die Datei trotzdem löschen? QNetworkAccessFileBackend - - Request for opening non-local file %1 Anforderung zum Öffnen einer Datei über Netzwerk %1 - - Error opening %1: %2 %1 konnte nicht geöffnet werden: %2 - Write error writing to %1: %2 Fehler beim Schreiben zur Datei %1: %2 - - Cannot open %1: Path is a directory %1 kann nicht geöffnet werden: Der Pfad spezifiziert ein Verzeichnis - Read error reading from %1: %2 Beim Lesen von der Datei %1 trat ein Fehler auf: %2 @@ -4889,27 +3873,22 @@ Möchten Sie die Datei trotzdem löschen? QNetworkAccessFtpBackend - No suitable proxy found Es konnte kein geeigneter Proxy-Server gefunden werden - Cannot open %1: is a directory %1 kann nicht geöffnet werden: Es handelt sich um ein Verzeichnis - Logging in to %1 failed: authentication required Die Anmeldung bei %1 schlug fehl: Es ist eine Authentifizierung erforderlich - Error while downloading %1: %2 Beim Herunterladen von %1 trat ein Fehler auf: %2 - Error while uploading %1: %2 Beim Hochladen von %1 trat ein Fehler auf: %2 @@ -4917,7 +3896,6 @@ Möchten Sie die Datei trotzdem löschen? QNetworkAccessHttpBackend - No suitable proxy found Es konnte kein geeigneter Proxy-Server gefunden werden @@ -4925,7 +3903,6 @@ Möchten Sie die Datei trotzdem löschen? QNetworkAccessManager - Network access is disabled. Der Zugriff auf das Netzwerk ist nicht gestattet. @@ -4933,22 +3910,18 @@ Möchten Sie die Datei trotzdem löschen? QNetworkReply - Error downloading %1 - server replied: %2 Beim Herunterladen von %1 trat ein Fehler auf - Die Antwort des Servers ist: %2 - Protocol "%1" is unknown Das Protokoll "%1" ist unbekannt - Network session error. Fehler bei Netzwerkverbindung. - Temporary network failure. Das Netzwerk ist zur Zeit ausgefallen. @@ -4956,8 +3929,6 @@ Möchten Sie die Datei trotzdem löschen? QNetworkReplyImpl - - Operation canceled Operation abgebrochen @@ -4965,7 +3936,6 @@ Möchten Sie die Datei trotzdem löschen? QNetworkSession - Invalid configuration. Ungültige Konfiguration. @@ -4973,47 +3943,34 @@ Möchten Sie die Datei trotzdem löschen? QNetworkSessionPrivateImpl - - Unknown session error. Unbekannter Fehler bei Netzwerkverbindung. - - The session was aborted by the user or system. Die Verbindung wurde vom Nutzer oder vom Betriebssystem unterbrochen. - - The requested operation is not supported by the system. Die angeforderte Operation wird vom System nicht unterstützt. - - The specified configuration cannot be used. Die angegebene Konfiguration kann nicht verwendet werden. - - Roaming was aborted or is not possible. Das Roaming wurde abgebrochen oder ist hier nicht möglich. - Roaming error Fehler beim Roaming - Session aborted by user or system Die Verbindung wurde vom Nutzer oder vom Betriebssystem unterbrochen - Unidentified Error Unbekannter Fehler @@ -5021,28 +3978,23 @@ Möchten Sie die Datei trotzdem löschen? QOCIDriver - Unable to logon Logon-Vorgang fehlgeschlagen - Unable to initialize QOCIDriver Initialisierung fehlgeschlagen - Unable to begin transaction Es konnte keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) @@ -5050,44 +4002,34 @@ Möchten Sie die Datei trotzdem löschen? QOCIResult - - - Unable to bind column for batch execute Die Spalte konnte nicht für den Stapelverarbeitungs-Befehl gebunden werden - Unable to execute batch statement Der Stapelverarbeitungs-Befehl konnte nicht ausgeführt werden - Unable to goto next Kann nicht zum nächsten Element gehen - Unable to alloc statement Die Allokation des Befehls schlug fehl - Unable to prepare statement Der Befehl konnte nicht initialisiert werden - Unable to get statement type Der Anweisungstyp kann nicht bestimmt werden - Unable to bind value Der Wert konnte nicht gebunden werden - Unable to execute statement Der Befehl konnte nicht ausgeführt werden @@ -5095,32 +4037,26 @@ Möchten Sie die Datei trotzdem löschen? QODBCDriver - Unable to connect Es kann keine Verbindung aufgebaut werden - Unable to disable autocommit 'autocommit' konnte nicht deaktiviert werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) - Unable to enable autocommit 'autocommit' konnte nicht aktiviert werden - Unable to connect - Driver doesn't support all functionality required Es kann keine Verbindung aufgebaut werden weil der Treiber die benötigte Funktionalität nicht vollständig unterstützt @@ -5128,51 +4064,38 @@ Möchten Sie die Datei trotzdem löschen? QODBCResult - - QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: 'SQL_CURSOR_STATIC' konnte nicht als Attribut des Befehls gesetzt werden. Bitte prüfen Sie die Konfiguration Ihres ODBC-Treibers - - Unable to execute statement Der Befehl konnte nicht ausgeführt werden - Unable to fetch next Der nächste Datensatz konnte nicht abgeholt werden - Unable to prepare statement Der Befehl konnte nicht initialisiert werden - Unable to bind variable Die Variable konnte nicht gebunden werden - - - Unable to fetch last Der letzte Datensatz konnte nicht abgeholt werden - Unable to fetch Es konnten keine Daten abgeholt werden - Unable to fetch first Der erste Datensatz konnte nicht abgeholt werden - Unable to fetch previous Der vorangegangene Datensatz kann nicht abgeholt werden @@ -5180,19 +4103,14 @@ Möchten Sie die Datei trotzdem löschen? QObject - "%1" duplicates a previous role name and will be disabled. "%1" ist bereits als Name einer Rolle vergeben und wird daher deaktiviert. - - invalid query: "%1" Ungültige Abfrage: "%1" - - PulseAudio Sound Server PulseAudio Sound Server @@ -5200,12 +4118,10 @@ Möchten Sie die Datei trotzdem löschen? QPPDOptionsModel - Name Name - Value Wert @@ -5213,32 +4129,26 @@ Möchten Sie die Datei trotzdem löschen? QPSQLDriver - Unable to connect Es kann keine Verbindung aufgebaut werden - Could not begin transaction Es konnte keine Transaktion gestartet werden - Could not commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Could not rollback transaction Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) - Unable to subscribe Die Registrierung schlug fehl - Unable to unsubscribe Die Registrierung konnte nicht aufgehoben werden @@ -5246,12 +4156,10 @@ Möchten Sie die Datei trotzdem löschen? QPSQLResult - Unable to create query Es konnte keine Abfrage erzeugt werden - Unable to prepare statement Der Befehl konnte nicht initialisiert werden @@ -5259,102 +4167,82 @@ Möchten Sie die Datei trotzdem löschen? QPageSetupWidget - Centimeters (cm) Zentimeter (cm) - Millimeters (mm) Millimeter (mm) - Inches (in) Zoll (in) - Points (pt) Punkte (pt) - Form Formular - Paper Papier - Page size: Seitengröße: - Width: Breite: - Height: Höhe: - Paper source: Papierquelle: - Orientation Ausrichtung - Portrait Hochformat - Landscape Querformat - Reverse landscape Umgekehrtes Querformat - Reverse portrait Umgekehrtes Hochformat - Margins Ränder - top margin Oberer Rand - left margin Linker Rand - right margin Rechter Rand - bottom margin Unterer Rand @@ -5362,12 +4250,10 @@ Möchten Sie die Datei trotzdem löschen? QPluginLoader - Unknown error Unbekannter Fehler - The plugin was not loaded. Das Plugin wurde nicht geladen. @@ -5375,433 +4261,344 @@ Möchten Sie die Datei trotzdem löschen? QPrintDialog - locally connected direkt verbunden - - Aliases: %1 Alias: %1 - - unknown unbekannt - OK OK - Print all Alles drucken - Print range Bereich drucken - A0 (841 x 1189 mm) A0 (841 x 1189 mm) - A1 (594 x 841 mm) A1 (594 x 841 mm) - A2 (420 x 594 mm) A2 (420 x 594 mm) - A3 (297 x 420 mm) A3 (297 x 420 mm) - A5 (148 x 210 mm) A5 (148 x 210 mm) - A6 (105 x 148 mm) A6 (105 x 148 mm) - A7 (74 x 105 mm) A7 (74 x 105 mm) - A8 (52 x 74 mm) A8 (52 x 74 mm) - A9 (37 x 52 mm) A9 (37 x 52 mm) - B0 (1000 x 1414 mm) B0 (1000 x 1414 mm) - B1 (707 x 1000 mm) B1 (707 x 1000 mm) - B2 (500 x 707 mm) B2 (500 x 707 mm) - B3 (353 x 500 mm) B3 (353 x 500 mm) - B4 (250 x 353 mm) B4 (250 x 353 mm) - B6 (125 x 176 mm) B6 (125 x 176 mm) - B7 (88 x 125 mm) B7 (88 x 125 mm) - B8 (62 x 88 mm) B8 (62 x 88 mm) - B9 (44 x 62 mm) B9 (44 x 62 mm) - B10 (31 x 44 mm) B10 (31 x 44 mm) - C5E (163 x 229 mm) C5E (163 x 229 mm) - DLE (110 x 220 mm) DLE (110 x 220 mm) - Folio (210 x 330 mm) Folio (210 x 330 mm) - Ledger (432 x 279 mm) Ledger (432 x 279 mm) - Tabloid (279 x 432 mm) Tabloid (279 x 432 mm) - US Common #10 Envelope (105 x 241 mm) US Common #10 Envelope (105 x 241 mm) - Print current page Diese Seite drucken - A4 (210 x 297 mm, 8.26 x 11.7 inches) A4 (210 x 297 mm) - B5 (176 x 250 mm, 6.93 x 9.84 inches) B5 (176 x 250 mm) - Executive (7.5 x 10 inches, 191 x 254 mm) Executive (7,5 x 10 Zoll, 191 x 254 mm) - Legal (8.5 x 14 inches, 216 x 356 mm) Legal (8,5 x 14 Zoll, 216 x 356 mm) - Letter (8.5 x 11 inches, 216 x 279 mm) Letter (8,5 x 11 Zoll, 216 x 279 mm) - Print selection Auswahl drucken - - - Print Drucken - Print To File ... In Datei drucken ... - File %1 is not writable. Please choose a different file name. Die Datei %1 ist schreibgeschützt. Bitte wählen Sie einen anderen Dateinamen. - %1 already exists. Do you want to overwrite it? Die Datei %1 existiert bereits. Soll sie überschrieben werden? - File exists Die Datei existiert bereits - <qt>Do you want to overwrite it?</qt> <qt>Soll sie überschrieben werden?</qt> - %1 is a directory. Please choose a different file name. %1 ist ein Verzeichnis. Bitte wählen Sie einen anderen Dateinamen. - The 'From' value cannot be greater than the 'To' value. Die Angabe für die erste Seite darf nicht größer sein als die für die letzte Seite. - A0 A0 - A1 A1 - A2 A2 - A3 A3 - A4 A4 - A5 A5 - A6 A6 - A7 A7 - A8 A8 - A9 A9 - B0 B0 - B1 B1 - B2 B2 - B3 B3 - B4 B4 - B5 B5 - B6 B6 - B7 B7 - B8 B8 - B9 B9 - B10 B10 - C5E C5E - DLE DLE - Executive Executive - Folio Folio - Ledger Ledger - Legal Legal - Letter Letter - Tabloid Tabloid - US Common #10 Envelope US Common #10 Envelope - Custom Benutzerdefiniert - - &Options >> &Einstellungen >> - &Options << &Einstellungen << - Print to File (PDF) In PDF-Datei drucken - Print to File (Postscript) In Postscript-Datei drucken - Local file Lokale Datei - Write %1 file Schreiben der Datei %1 - &Print &Drucken @@ -5809,108 +4606,86 @@ Bitte wählen Sie einen anderen Dateinamen. QPrintPreviewDialog - %1% %1% - Print Preview Druckvorschau - Next page Nächste Seite - Previous page Vorige Seite - First page Erste Seite - Last page Letzte Seite - Fit width Breite anpassen - Fit page Seite anpassen - Zoom in Vergrößern - Zoom out Verkleinern - Portrait Hochformat - Landscape Querformat - Show single page Einzelne Seite anzeigen - Show facing pages Gegenüberliegende Seiten anzeigen - Show overview of all pages Übersicht aller Seiten - Print Drucken - Page setup Seite einrichten - Close Schließen - Export to PDF PDF exportieren - Export to PostScript PostScript exportieren - - Page Setup Seite einrichten @@ -5918,17 +4693,14 @@ Bitte wählen Sie einen anderen Dateinamen. QPrintPropertiesWidget - Form Formular - Page Seite - Advanced Erweitert @@ -5936,102 +4708,82 @@ Bitte wählen Sie einen anderen Dateinamen. QPrintSettingsOutput - Form Formular - Copies Anzahl Exemplare - Print range Bereich drucken - Print all Alles drucken - Pages from Seiten von - to bis - Selection Auswahl - Output Settings Ausgabeeinstellungen - Copies: Anzahl Exemplare: - Collate Sortieren - Reverse Umgekehrt - Options Optionen - Color Mode Farbmodus - Color Farbe - Grayscale Graustufen - Duplex Printing Duplexdruck - None Kein - Long side Lange Seite - Short side Kurze Seite - Current Page @@ -6039,47 +4791,38 @@ Bitte wählen Sie einen anderen Dateinamen. QPrintWidget - Form Formular - Printer Drucker - &Name: &Name: - P&roperties &Eigenschaften - Location: Standort: - Preview Vorschau - Type: Typ: - Output &file: Ausgabe&datei: - ... ... @@ -6087,62 +4830,38 @@ Bitte wählen Sie einen anderen Dateinamen. QProcess - - Could not open input redirection for reading Die Eingabeumleitung konnte nicht zum Lesen geöffnet werden - - Could not open output redirection for writing Die Ausgabeumleitung konnte nicht zum Lesen geöffnet werden - Resource error (fork failure): %1 Ressourcenproblem ("fork failure"): %1 - - - - - - - - - Process operation timed out Zeitüberschreitung - - - - Error reading from process Das Lesen vom Prozess schlug fehl - - - Error writing to process Das Schreiben zum Prozess schlug fehl - Process crashed Der Prozess ist abgestürzt - No program defined Es wurde kein Programm angegeben - Process failed to start: %1 Das Starten des Prozesses schlug fehl: %1 @@ -6150,7 +4869,6 @@ Bitte wählen Sie einen anderen Dateinamen. QProgressDialog - Cancel Abbrechen @@ -6158,7 +4876,6 @@ Bitte wählen Sie einen anderen Dateinamen. QPushButton - Open Öffnen @@ -6166,7 +4883,6 @@ Bitte wählen Sie einen anderen Dateinamen. QRadioButton - Check Ankreuzen @@ -6174,57 +4890,46 @@ Bitte wählen Sie einen anderen Dateinamen. QRegExp - no error occurred kein Fehler - disabled feature used deaktivierte Eigenschaft wurde benutzt - bad char class syntax falsche Syntax für Zeichenklasse - bad lookahead syntax falsche Syntax für Lookahead - bad repetition syntax falsche Syntax für Wiederholungen - invalid octal value ungültiger Oktal-Wert - missing left delim fehlende linke Begrenzung - unexpected end unerwartetes Ende - met internal limit internes Limit erreicht - invalid interval ungültiges Intervall - invalid category ungültige Kategorie @@ -6232,22 +4937,18 @@ Bitte wählen Sie einen anderen Dateinamen. QSQLite2Driver - Error opening database Die Datenbankverbindung konnte nicht geöffnet werden - Unable to begin transaction Es konnte keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion kann nicht rückgängig gemacht werden @@ -6255,12 +4956,10 @@ Bitte wählen Sie einen anderen Dateinamen. QSQLite2Result - Unable to fetch results Das Ergebnis konnte nicht abgeholt werden - Unable to execute statement Der Befehl konnte nicht ausgeführt werden @@ -6268,27 +4967,22 @@ Bitte wählen Sie einen anderen Dateinamen. QSQLiteDriver - Error opening database Die Datenbankverbindung konnte nicht geöffnet werden - Error closing database Die Datenbankverbindung konnte nicht geschlossen werden - Unable to begin transaction Es konnte keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) @@ -6296,34 +4990,26 @@ Bitte wählen Sie einen anderen Dateinamen. QSQLiteResult - - - Unable to fetch row Der Datensatz konnte nicht abgeholt werden - Unable to execute statement Der Befehl konnte nicht ausgeführt werden - Unable to reset statement Der Befehl konnte nicht zurückgesetzt werden - Unable to bind parameters Die Parameter konnte nicht gebunden werden - Parameter count mismatch Die Anzahl der Parameter ist falsch - No query Kein Abfrage @@ -6331,32 +5017,26 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptBreakpointsModel - ID ID - Location Stelle - Condition Bedingung - Ignore-count Auslösen nach - Single-shot Einmal auslösen - Hit-count Ausgelöst @@ -6364,12 +5044,10 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptBreakpointsWidget - New Neu - Delete Löschen @@ -6377,143 +5055,114 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptDebugger - - Go to Line Gehe zu Zeile - Line: Zeile: - Interrupt Unterbrechen - Shift+F5 Shift+F5 - Continue Weiter - F5 F5 - Step Into Einzelschritt herein - F11 F11 - Step Over Einzelschritt über - F10 F10 - Step Out Einzelschritt heraus - Shift+F11 Shift+F11 - Run to Cursor Bis Cursor ausführen - Ctrl+F10 Ctrl+F10 - Run to New Script Bis zu neuem Skript ausführen - Toggle Breakpoint Haltepunkt umschalten - F9 F9 - Clear Debug Output Debug-Ausgabe löschen - Clear Error Log Fehlerausgabe löschen - Clear Console Konsole löschen - &Find in Script... &Suche im Skript... - Ctrl+F Ctrl+F - Find &Next &Nächste Fundstelle - F3 F3 - Find &Previous Vorhergehende Fundstelle - Shift+F3 Shift+F3 - Ctrl+G Ctrl+G - Debug Debuggen @@ -6521,32 +5170,26 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptDebuggerCodeFinderWidget - Close Schließen - Previous Vorige - Next Nächste - Case Sensitive Groß/Kleinschreibung beachten - Whole words Ganze Worte - <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Die Suche hat das Ende erreicht @@ -6554,12 +5197,10 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptDebuggerLocalsModel - Name Name - Value Wert @@ -6567,17 +5208,14 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptDebuggerStackModel - Level Ebene - Name Name - Location Stelle @@ -6585,22 +5223,18 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptEdit - Toggle Breakpoint Haltepunkt umschalten - Disable Breakpoint Haltepunkt deaktivieren - Enable Breakpoint Haltepunkt aktivieren - Breakpoint Condition: Bedingung: @@ -6608,52 +5242,42 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptEngineDebugger - Loaded Scripts Geladene Skripte - Breakpoints Haltepunkte - Stack Stapel - Locals Lokale Variablen - Console Konsole - Debug Output Debug-Ausgabe - Error Log Fehlerausgabe - Search Suche - View Ansicht - Qt Script Debugger Qt Script Debugger @@ -6661,7 +5285,6 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptNewBreakpointWidget - Close Schließen @@ -6669,84 +5292,66 @@ Bitte wählen Sie einen anderen Dateinamen. QScrollBar - Scroll here Hierher scrollen - Left edge Linker Rand - Top Anfang - Right edge Rechter Rand - Bottom Ende - Page left Eine Seite nach links - - Page up Eine Seite nach oben - Page right Eine Seite nach rechts - - Page down Eine Seite nach unten - Scroll left Nach links scrollen - Scroll up Nach oben scrollen - Scroll right Nach rechts scrollen - Scroll down Nach unten scrollen - Line up Ausrichten - Position Position - Line down Eine Zeile nach unten @@ -6754,111 +5359,78 @@ Bitte wählen Sie einen anderen Dateinamen. QSharedMemory - %1: create size is less then 0 %1: Die Größenangabe für die Erzeugung ist kleiner als Null - - %1: unable to lock %1: Sperrung fehlgeschlagen - %1: unable to unlock %1: Die Sperrung konnte nicht aufgehoben werden - - - %1: permission denied %1: Zugriff verweigert - - - %1: already exists %1: existiert bereits - %1: doesn't exists %1: existiert nicht - - - %1: out of resources %1: Keine Ressourcen mehr verfügbar - - - %1: unknown error %2 %1: Unbekannter Fehler %2 - %1: key is empty %1: Ungültige Schlüsselangabe (leer) - %1: ftok failed %1: ftok-Aufruf schlug fehl - - - %1: unable to make key %1: Es kann kein Schlüssel erzeugt werden - - %1: doesn't exist %1: existiert nicht - %1: UNIX key file doesn't exist %1: Die Unix-Schlüsseldatei existiert nicht - %1: system-imposed size restrictions %1: Ein systembedingtes Limit der Größe wurde erreicht - %1: not attached %1: nicht verbunden - - %1: invalid size %1: Ungültige Größe - - %1: key error %1: Fehlerhafter Schlüssel - %1: size query failed %1: Die Abfrage der Größe schlug fehl - %1: unable to set key on lock %1: Es kann kein Schlüssel für die Sperrung gesetzt werden @@ -6866,1095 +5438,884 @@ Bitte wählen Sie einen anderen Dateinamen. QShortcut - Space This and all following "incomprehensible" strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used. Leertaste - Esc Esc - Tab Tab - Backtab Rück-Tab - Backspace Rücktaste - Return Return - Enter Enter - Ins Einfg - Del Entf - Pause Pause - Print Druck - SysReq SysReq - Home Pos1 - End Ende - Left Links - Up Hoch - Right Rechts - Down Runter - PgUp Bild aufwärts - PgDown Bild abwärts - CapsLock Feststelltaste - NumLock Zahlen-Feststelltaste - ScrollLock Rollen-Feststelltaste - Menu Menü - Help Hilfe - Back Zurück - Forward Vorwärts - Stop Abbrechen - Refresh Aktualisieren - Volume Down Lautstärke - - Volume Mute Ton aus - Volume Up Lautstärke + - Bass Boost Bass-Boost - Bass Up Bass + - Bass Down Bass - - Treble Up Höhen + - Treble Down Höhen - - Media Play Wiedergabe - Media Stop Stopp - Media Previous Vorheriger - Media Next Nächster - Media Record Aufzeichnen - + Media Pause + Media player pause button + Pause + + + Toggle Media Play/Pause + Media player button to toggle between playing and paused + Pause + + Favorites Favoriten - Search Suchen - Standby Standby - Open URL URL öffnen - Launch Mail Mail starten - Launch Media Medienspieler starten - Launch (0) (0) starten - Launch (1) (1) starten - Launch (2) (2) starten - Launch (3) (3) starten - Launch (4) (4) starten - Launch (5) (5) starten - Launch (6) (6) starten - Launch (7) (7) starten - Launch (8) (8) starten - Launch (9) (9) starten - Launch (A) (A) starten - Launch (B) (B) starten - Launch (C) (C) starten - Launch (D) (D) starten - Launch (E) (E) starten - Launch (F) (F) starten - Monitor Brightness Up Monitor heller - Monitor Brightness Down Monitor dunkler - Keyboard Light On/Off Tastaturbeleuchtung Ein/Aus - Keyboard Brightness Up Tastaturbeleuchtung heller - Keyboard Brightness Down Tastaturbeleuchtung dunkler - Power Off Ausschalten - Wake Up Aufwecken - Eject Auswerfen - Screensaver Bildschirmschoner - WWW Internet - Sleep Schlafmodus - LightBulb Beleuchtung - Shop Shop - History Verlauf - Add Favorite Lesezeichen hinzufügen - Hot Links Empfohlene Verweise - Adjust Brightness Helligkeit einstellen - Finance Finanzen - Community Community - Audio Rewind Audio rückspulen - Back Forward Hinterstes nach vorn - Application Left Anwendung links - Application Right Anwendung rechts - Book Buch - CD CD - Calculator Rechner - Clear Löschen - Clear Grab Zugriff löschen - Close Schließen - Copy Kopieren - Cut Ausschneiden - Display Anzeigen - DOS DOS - Documents Dokumente - Spreadsheet Spreadsheet - Browser Browser - Game Spiel - Go Los - iTouch iTouch - Logoff Logoff - Market Markt - Meeting Versammlung - Keyboard Menu Tastaturmenü - Menu PB Menü PB - My Sites Meine Orte - News Nachrichten - Home Office Home Office - Option Option - Paste Einfügen - Phone Telefon - Reply Antworten - Reload Neu laden - Rotate Windows Fenster rotieren - Rotation PB Rotation PB - Rotation KB Rotation KB - Save Speichern - Send Senden - Spellchecker Rechtschreibprüfung - Split Screen Bildschirm teilen - Support Hilfe - Task Panel Task-Leiste - Terminal Terminal - Tools Werkzeuge - Travel Reise - Video Video - Word Processor Textverarbeitung - XFer XFer - Zoom In Vergrößern - Zoom Out Verkleinern - Away Abwesend - Messenger Messenger - WebCam WebCam - Mail Forward Weiterleitung - Pictures Bilder - Music Musik - Battery Batterie - Bluetooth Bluetooth - Wireless Drahtlos - Ultra Wide Band Ultra Wide Band - Audio Forward Audio vorspulen - Audio Repeat Audio wiederholen - Audio Random Play Audio zufällige Auswahl spielen - Subtitle Untertitel - Audio Cycle Track Audiospur wechseln - Time Zeit - View Ansicht - Top Menu Hauptmenü - Suspend Pause - Hibernate Hibernate - Print Screen Bildschirm drucken - Page Up Bild aufwärts - Page Down Bild abwärts - Caps Lock Feststelltaste - Num Lock Zahlen-Feststelltaste - Number Lock Zahlen-Feststelltaste - Scroll Lock Rollen-Feststelltaste - Insert Einfügen - Delete Löschen - Escape Escape - System Request System Request - - Select Auswählen - Yes Ja - No Nein - Context1 Kontext1 - Context2 Kontext2 - Context3 Kontext3 - Context4 Kontext4 - Call Button to start a call (note: a separate button is used to end the call) Anruf - Hangup Button to end a call (note: a separate button is used to start the call) Auflegen - Toggle Call/Hangup Button that will hang up if we're in call, or make a call if we're not. Anrufen/Aufhängen - Flip Umdrehen - Voice Dial Button to trigger voice dialling Sprachwahl - Last Number Redial Button to redial the last number called Wahlwiederholung - Camera Shutter Button to trigger the camera shutter (take a picture) Auslöser - Camera Focus Button to focus the camera Scharfstellen - Kanji Kanji - Muhenkan Muhenkan - Henkan Henkan - Romaji Romaji - Hiragana Hiragana - Katakana Katakana - Hiragana Katakana Hiragana Katakana - Zenkaku Zenkaku - Hankaku Hankaku - Zenkaku Hankaku Zenkaku Hankaku - Touroku Touroku - Massyo Massyo - Kana Lock Kana Lock - Kana Shift Kana Shift - Eisu Shift Eisu Shift - Eisu toggle Eisu toggle - Code input Code-Eingabe - Multiple Candidate Mehrere Vorschläge - Previous Candidate Vorangegangener Vorschlag - Hangul Hangul - Hangul Start Hangul Anfang - Hangul End Hangul Ende - Hangul Hanja Hangul Hanja - Hangul Jamo Hangul Jamo - Hangul Romaja Hangul Romaja - Hangul Jeonja Hangul Jeonja - Hangul Banja Hangul Banja - Hangul PreHanja Hangul PreHanja - Hangul PostHanja Hangul PostHanja - Hangul Special Hangul Special - - Ctrl Strg - - Shift Umschalt - - Alt Alt - - Meta Meta - + + - F%1 F%1 - Home Page Startseite @@ -7962,27 +6323,22 @@ Bitte wählen Sie einen anderen Dateinamen. QSlider - Page left Eine Seite nach links - Page up Eine Seite nach oben - Position Position - Page right Eine Seite nach rechts - Page down Eine Seite nach unten @@ -7990,72 +6346,58 @@ Bitte wählen Sie einen anderen Dateinamen. QSocks5SocketEngine - Connection to proxy refused Der Proxy-Server hat den Aufbau einer Verbindung verweigert - Connection to proxy closed prematurely Der Proxy-Server hat die Verbindung vorzeitig beendet - Proxy host not found Der Proxy-Server konnte nicht gefunden werden - Connection to proxy timed out Bei der Verbindung mit dem Proxy-Server wurde ein Zeitlimit überschritten - Proxy authentication failed Die Authentifizierung beim Proxy-Server schlug fehl - Proxy authentication failed: %1 Die Authentifizierung beim Proxy-Server schlug fehl: %1 - SOCKS version 5 protocol error Protokoll-Fehler (SOCKS version 5) - General SOCKSv5 server failure Allgemeiner Fehler bei der Kommunikation mit dem SOCKSv5-Server - Connection not allowed by SOCKSv5 server Der SOCKSv5-Server hat die Verbindung verweigert - TTL expired TTL verstrichen - SOCKSv5 command not supported Dieses SOCKSv5-Kommando wird nicht unterstützt - Address type not supported Dieser Adresstyp wird nicht unterstützt - Unknown SOCKSv5 proxy error code 0x%1 Unbekannten Fehlercode vom SOCKSv5-Proxy-Server erhalten: 0x%1 - Network operation timed out Das Zeitlimit für die Operation wurde überschritten @@ -8063,32 +6405,26 @@ Bitte wählen Sie einen anderen Dateinamen. QSoftKeyManager - Ok Ok - Select Auswählen - Done Fertig - Options Optionen - Cancel Abbrechen - Exit Beenden @@ -8096,12 +6432,10 @@ Bitte wählen Sie einen anderen Dateinamen. QSpinBox - More Mehr - Less Weniger @@ -8109,56 +6443,42 @@ Bitte wählen Sie einen anderen Dateinamen. QSql - Delete Löschen - Delete this record? Diesen Datensatz löschen? - - - Yes Ja - - - No Nein - Insert Einfügen - Update Aktualisieren - Save edits? Änderungen speichern? - Cancel Abbrechen - Confirm Bestätigen - Cancel your edits? Änderungen verwerfen? @@ -8166,177 +6486,142 @@ Bitte wählen Sie einen anderen Dateinamen. QSslSocket - Unable to write data: %1 Die Daten konnten nicht geschrieben werden: %1 - Unable to decrypt data: %1 Die Daten konnten nicht entschlüsselt werden: %1 - Error while reading: %1 Beim Lesen ist ein Fehler aufgetreten: %1 - Error during SSL handshake: %1 Im Ablauf des SSL-Protokolls ist ein Fehler aufgetreten: %1 - Error creating SSL context (%1) Es konnte keine SSL-Kontextstruktur erzeugt werden (%1) - Invalid or empty cipher list (%1) Ungültige oder leere Schlüsselliste (%1) - Private key does not certify public key, %1 Der private Schlüssel passt nicht zum öffentlichen Schlüssel, %1 - Error creating SSL session, %1 Es konnte keine SSL-Sitzung erzeugt werden, %1 - Error creating SSL session: %1 Es konnte keine SSL-Sitzung erzeugt werden: %1 - Cannot provide a certificate with no key, %1 Ohne Schlüssel kann kein Zertifikat zur Verfügung gestellt werden, %1 - Error loading local certificate, %1 Das lokale Zertifikat konnte nicht geladen werden, %1 - Error loading private key, %1 Der private Schlüssel konnte nicht geladen werden, %1 - No error Kein Fehler - The issuer certificate could not be found Das Zertifikat des Ausstellers konnte nicht gefunden werden - The certificate signature could not be decrypted Die Signatur des Zertifikats konnte nicht entschlüsselt werden - The public key in the certificate could not be read Der öffentliche Schlüssel konnte nicht gelesen werden - The signature of the certificate is invalid Die Signatur des Zertifikats ist ungültig - The certificate is not yet valid Das Zertifikat ist noch nicht gültig - The certificate has expired Die Gültigkeit des Zertifikats ist abgelaufen - The certificate's notBefore field contains an invalid time Das Feld 'notBefore' des Zertifikats enthält eine ungültige Zeit - The certificate's notAfter field contains an invalid time Das Feld 'notAfter' des Zertifikats enthält eine ungültige Zeit - The certificate is self-signed, and untrusted Das Zertifikat ist selbstsigniert und daher nicht vertrauenswürdig - The root certificate of the certificate chain is self-signed, and untrusted Das oberste Zertifikat der Kette ist selbstsigniert und daher nicht vertrauenswürdig - The issuer certificate of a locally looked up certificate could not be found Das Zertifikat des Ausstellers eines lokal gefundenen Zertifikats konnte nicht gefunden werden - No certificates could be verified Keines der Zertifikate konnte verifiziert werden - One of the CA certificates is invalid Eines der Zertifikate der Zertifizierungsstelle ist ungültig - The basicConstraints path length parameter has been exceeded Die Länge des basicConstraints-Pfades wurde überschritten - The supplied certificate is unsuitable for this purpose Das angegebene Zertifikat kann in diesem Fall nicht verwendet werden - The root CA certificate is not trusted for this purpose Das oberste Zertifikat der Zertifizierungsstelle ist für diesen Fall nicht vertrauenswürdig - The root CA certificate is marked to reject the specified purpose Das oberste Zertifikat der Zertifizierungsstelle weist diesen Fall auf Grund einer speziellen Kennzeichnung zurück - The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate Das Zertifikat des betrachteten Ausstellers wurde zurückgewiesen da sein Subjektname nicht dem Namen des Austellers des aktuellen Zertifikats entspricht - The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate Das Zertifikat des betrachteten Ausstellers wurde zurückgewiesen da Ausstellername und Seriennummer vorhanden sind und nicht dem Bezeichner der Zertifizierungsstelle des aktuellen Zertifikats entsprechen - The peer did not present any certificate Die Gegenstelle hat kein Zertifikat angegeben - The host name did not match any of the valid hosts for this certificate Der Name des Hosts ist keiner aus der Liste der für dieses Zertifikat gültigen Hosts - Unknown error Unbekannter Fehler @@ -8344,22 +6629,18 @@ Bitte wählen Sie einen anderen Dateinamen. QStateMachine - Missing initial state in compound state '%1' Der Anfangszustand des zusammengesetzten Zustands '%1' fehlt - Missing default state in history state '%1' Der Anfangszustand im Verlauf bei Zustand '%1' fehlt - No common ancestor for targets and source of transition from state '%1' Die Ziele und die Quelle des Übergangs vom Zustand '%1' haben keinen gemeinsamen Ursprung - Unknown error Unbekannter Fehler @@ -8367,30 +6648,22 @@ Bitte wählen Sie einen anderen Dateinamen. QSystemSemaphore - %1: does not exist %1: Nicht existent - - %1: out of resources %1: Keine Ressourcen mehr verfügbar - - %1: permission denied %1: Zugriff verweigert - %1: already exists %1: Existiert bereits - - %1: unknown error %2 %1: Unbekannter Fehler %2 @@ -8398,12 +6671,10 @@ Bitte wählen Sie einen anderen Dateinamen. QTDSDriver - Unable to open connection Die Datenbankverbindung kann nicht geöffnet werden - Unable to use database Die Datenbank kann nicht verwendet werden @@ -8411,12 +6682,10 @@ Bitte wählen Sie einen anderen Dateinamen. QTabBar - Scroll Left Nach links scrollen - Scroll Right Nach rechts scrollen @@ -8424,7 +6693,6 @@ Bitte wählen Sie einen anderen Dateinamen. QTcpServer - Operation on socket is not supported Diese Socket-Operation wird nicht unterstützt @@ -8432,42 +6700,34 @@ Bitte wählen Sie einen anderen Dateinamen. QTextControl - &Undo &Rückgängig - &Redo Wieder&herstellen - Cu&t &Ausschneiden - &Copy &Kopieren - Copy &Link Location &Link-Adresse kopieren - &Paste Einf&ügen - Delete Löschen - Select All Alles auswählen @@ -8475,14 +6735,10 @@ Bitte wählen Sie einen anderen Dateinamen. QToolButton - - Press Drücken - - Open Öffnen @@ -8490,7 +6746,6 @@ Bitte wählen Sie einen anderen Dateinamen. QUdpSocket - This platform does not support IPv6 Diese Plattform unterstützt kein IPv6 @@ -8498,12 +6753,10 @@ Bitte wählen Sie einen anderen Dateinamen. QUndoGroup - Undo Rückgängig - Redo Wiederherstellen @@ -8511,7 +6764,6 @@ Bitte wählen Sie einen anderen Dateinamen. QUndoModel - <empty> <leer> @@ -8519,12 +6771,10 @@ Bitte wählen Sie einen anderen Dateinamen. QUndoStack - Undo Rückgängig - Redo Wiederherstellen @@ -8532,57 +6782,46 @@ Bitte wählen Sie einen anderen Dateinamen. QUnicodeControlCharacterMenu - LRM Left-to-right mark LRM Left-to-right mark - RLM Right-to-left mark RLM Right-to-left mark - ZWJ Zero width joiner ZWJ Zero width joiner - ZWNJ Zero width non-joiner ZWNJ Zero width non-joiner - ZWSP Zero width space ZWSP Zero width space - LRE Start of left-to-right embedding LRE Start of left-to-right embedding - RLE Start of right-to-left embedding RLE Start of right-to-left embedding - LRO Start of left-to-right override LRO Start of left-to-right override - RLO Start of right-to-left override RLO Start of right-to-left override - PDF Pop directional formatting PDF Pop directional formatting - Insert Unicode control character Unicode-Kontrollzeichen einfügen @@ -8590,32 +6829,26 @@ Bitte wählen Sie einen anderen Dateinamen. QWebFrame - Request cancelled Anfrage wurde abgebrochen - Request blocked Anfrage wurde abgewiesen - Cannot show URL Der URL kann nicht angezeigt werden - Frame load interrupted by policy change Das Laden des Rahmens wurde durch eine Änderung der Richtlinien unterbrochen - Cannot show mimetype Dieser Mime-Typ kann nicht angezeigt werden - File does not exist Die Datei existiert nicht @@ -8623,621 +6856,515 @@ Bitte wählen Sie einen anderen Dateinamen. QWebPage - Submit default label for Submit buttons in forms on web pages Senden - Submit Submit (input element) alt text for <input> elements with no alt, title, or value Senden - Reset default label for Reset buttons in forms on web pages Rücksetzen - Choose File title for file button used in HTML forms Durchsuchen - No file selected text to display in file button used in HTML forms when no file is selected Es ist keine Datei ausgewählt - Open in New Window Open in New Window context menu item In neuem Fenster öffnen - Save Link... Download Linked File context menu item Ziel speichern unter... - Copy Link Copy Link context menu item Link-Adresse kopieren - Open Image Open Image in New Window context menu item Grafik in neuem Fenster öffnen - Save Image Download Image context menu item Grafik speichern unter - Copy Image Copy Link context menu item Grafik kopieren - Open Frame Open Frame in New Window context menu item Frame öffnen - Copy Copy context menu item Kopieren - Go Back Back context menu item Zurück - Go Forward Forward context menu item Vor - Stop Stop context menu item Abbrechen - Reload Reload context menu item Neu laden - Cut Cut context menu item Ausschneiden - Paste Paste context menu item Einfügen - No Guesses Found No Guesses Found context menu item Keine Vorschläge gefunden - Ignore Ignore Spelling context menu item Ignorieren - Add To Dictionary Learn Spelling context menu item In Wörterbuch aufnehmen - Search The Web Search The Web context menu item Im Web suchen - Look Up In Dictionary Look Up in Dictionary context menu item Im Wörterbuch nachschauen - Open Link Open Link context menu item Adresse öffnen - Ignore Ignore Grammar context menu item Ignorieren - Spelling Spelling and Grammar context sub-menu item Rechtschreibung - Show Spelling and Grammar menu item title Rechtschreibung und Grammatik anzeigen - Hide Spelling and Grammar menu item title Rechtschreibung und Grammatik nicht anzeigen - Check Spelling Check spelling context menu item Rechtschreibung prüfen - Check Spelling While Typing Check spelling while typing context menu item Rechtschreibung während des Schreibens überprüfen - Check Grammar With Spelling Check grammar with spelling context menu item Grammatik mit Rechtschreibung zusammen überprüfen - Fonts Font context sub-menu item Fonts - Bold Bold context menu item Fett - Italic Italic context menu item Kursiv - Underline Underline context menu item Unterstrichen - Outline Outline context menu item Umriss - Direction Writing direction context sub-menu item Schreibrichtung - Text Direction Text direction context sub-menu item Schreibrichtung - Default Default writing direction context menu item Vorgabe - Left to Right Left to Right context menu item Von links nach rechts - Right to Left Right to Left context menu item Von rechts nach links - Missing Plug-in Label text to be used when a plug-in is missing Fehlendes Plugin - Loading... Media controller status message when the media is loading Lädt... - Live Broadcast Media controller status message when watching a live broadcast Live-Übertragung - Audio Element Media controller element Audio-Element - Video Element Media controller element Video-Element - Mute Button Media controller element Stummschalttaste - Unmute Button Media controller element Abstelltaste für Stummschaltung - Play Button Media controller element Abspielknopf - Pause Button Media controller element Pause-Knopf - Slider Media controller element Schieberegler - Slider Thumb Media controller element Schieberegler-Griff - Rewind Button Media controller element Rückspultaste - Return to Real-time Button Media controller element Kehre zu Echtzeit zurück - Elapsed Time Media controller element Spielzeit - Remaining Time Media controller element Verbleibende Zeit - Status Display Media controller element Statusanzeige - Fullscreen Button Media controller element Vollbild-Taste - Seek Forward Button Media controller element Vorlauftaste - Seek Back Button Media controller element Rücklauftaste - Audio element playback controls and status display Media controller element Audio-Steuerung und Statusanzeige - Video element playback controls and status display Media controller element Video-Steuerung und Statusanzeige - Mute audio tracks Media controller element Schalte Tonspuren stumm - Unmute audio tracks Media controller element Stummschaltung der Tonspuren aufheben - Begin playback Media controller element Abspielen - Pause playback Media controller element Pause - Movie time scrubber Media controller element Abspielzeit - Movie time scrubber thumb Media controller element Griff zur Einstellung der Abspielzeit - Rewind movie Media controller element Film zurückspulen - Return streaming movie to real-time Media controller element Setze Film auf Echtzeit zurück - Current movie time Media controller element Abspielzeit des Films - Remaining movie time Media controller element Verbleibende Zeit des Films - Current movie status Media controller element Status des Films - Play movie in full-screen mode Media controller element Film im Vollbildmodus abspielen - Seek quickly back Media controller element Schnelles Rückwärtssuchen - Seek quickly forward Media controller element Schnelles Vorwärtssuchen - Indefinite time Media time description Unbegrenzte Zeit - %1 days %2 hours %3 minutes %4 seconds Media time description %1 Tage %2 Stunden %3 Minuten %4 Sekunden - %1 hours %2 minutes %3 seconds Media time description %1 Stunden %2 Minuten %3 Sekunden - %1 minutes %2 seconds Media time description %1 Minuten %2 Sekunden - %1 seconds Media time description %1 Sekunden - Inspect Inspect Element context menu item Prüfen - No recent searches Label for only item in menu that appears when clicking on the search field image, when no searches have been performed Es existieren noch keine Suchanfragen - Recent searches label for first item in the menu that appears when clicking on the search field image, used as embedded menu title Bisherige Suchanfragen - Clear recent searches menu item in Recent Searches menu that empties menu's contents Gespeicherte Suchanfragen löschen - Unknown Unknown filesize FTP directory listing item Unbekannt - Web Inspector - %2 Web Inspector - %2 - %1 (%2x%3 pixels) Title string for images %1 (%2x%3 Pixel) - Redirection limit reached Maximal Anzahl von Weiterleitungen wurde erreicht - Bad HTTP request Ungültige HTTP-Anforderung - This is a searchable index. Enter search keywords: text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' Dieser Index verfügt über eine Suchfunktion. Geben Sie einen Suchbegriff ein: - Scroll here Hierher scrollen - Left edge Linker Rand - Top Anfang - Right edge Rechter Rand - Bottom Ende - Page left Eine Seite nach links - Page up Eine Seite nach oben - Page right Eine Seite nach rechts - Page down Eine Seite nach unten - Scroll left Nach links scrollen - Scroll up Nach oben scrollen - Scroll right Nach rechts scrollen - Scroll down Nach unten scrollen - %n file(s) number of chosen file @@ -9246,237 +7373,190 @@ Bitte wählen Sie einen anderen Dateinamen. - JavaScript Alert - %1 JavaScript-Hinweis - %1 - JavaScript Confirm - %1 JavaScript-Bestätigung - %1 - JavaScript Prompt - %1 JavaScript-Eingabeaufforderung - %1 - JavaScript Problem - %1 JavaScript-Problem - %1 - The script on this page appears to have a problem. Do you want to stop the script? Das Skript dieser Webseite ist fehlerhaft. Möchten Sie es anhalten? - Move the cursor to the next character Positionsmarke auf folgendes Zeichen setzen - Move the cursor to the previous character Positionsmarke auf vorangehendes Zeichen setzen - Move the cursor to the next word Positionsmarke auf folgendes Wort setzen - Move the cursor to the previous word Positionsmarke auf vorangehendes Wort setzen - Move the cursor to the next line Positionsmarke auf folgende Zeile setzen - Move the cursor to the previous line Positionsmarke auf vorangehende Zeile setzen - Move the cursor to the start of the line Positionsmarke auf Zeilenanfang setzen - Move the cursor to the end of the line Positionsmarke auf Zeilenende setzen - Move the cursor to the start of the block Positionsmarke auf Anfang des Blocks setzen - Move the cursor to the end of the block Positionsmarke auf Ende des Blocks setzen - Move the cursor to the start of the document Positionsmarke auf Anfang des Dokumentes setzen - Move the cursor to the end of the document Positionsmarke auf Ende des Dokumentes setzen - Select all Alles auswählen - Select to the next character Bis zum nächsten Zeichen markieren - Select to the previous character Bis zum vorherigen Zeichen markieren - Select to the next word Bis zum nächsten Wort markieren - Select to the previous word Bis zum vorherigen Wort markieren - Select to the next line Bis zur nächsten Zeile markieren - Select to the previous line Bis zur vorherigen Zeile markieren - Select to the start of the line Bis zum Zeilenanfang markieren - Select to the end of the line Bis zum Zeilenende markieren - Select to the start of the block Bis zum Anfang des Blocks markieren - Select to the end of the block Bis zum Ende des Blocks markieren - Select to the start of the document Bis zum Anfang des Dokuments markieren - Select to the end of the document Bis zum Ende des Dokuments markieren - Delete to the start of the word Bis zum Anfang des Wortes löschen - Delete to the end of the word Bis zum Ende des Wortes löschen - Insert a new paragraph Neuen Abschnitt einfügen - Insert a new line Neue Zeile einfügen - Paste and Match Style Einfügen und dem Stil anpassen - Remove formatting Formatierung entfernen - Strikethrough Durchgestrichen - Subscript Tiefstellung - Superscript Hochstellung - Insert Bulleted List Liste mit Punkten einfügen - Insert Numbered List Nummerierte Liste einfügen - Indent Einrücken - Outdent Einrückung aufheben - Center Zentrieren - Justify Ausrichten - Align Left Linksbündig ausrichten - Align Right Rechtsbündig ausrichten @@ -9484,7 +7564,6 @@ Bitte wählen Sie einen anderen Dateinamen. QWhatsThisAction - What's This? Direkthilfe @@ -9492,7 +7571,6 @@ Bitte wählen Sie einen anderen Dateinamen. QWidget - * * @@ -9500,57 +7578,46 @@ Bitte wählen Sie einen anderen Dateinamen. QWizard - Cancel Abbrechen - Help Hilfe - < &Back < &Zurück - &Finish Ab&schließen - &Help &Hilfe - Go Back Zurück - Continue Weiter - Commit Anwenden - Done Fertig - &Next &Weiter - &Next > &Weiter > @@ -9558,69 +7625,54 @@ Bitte wählen Sie einen anderen Dateinamen. QWorkspace - &Restore Wieder&herstellen - &Move Ver&schieben - &Size &Größe ändern - Mi&nimize M&inimieren - Ma&ximize Ma&ximieren - &Close Schl&ießen - Stay on &Top Im &Vordergrund bleiben - Minimize Minimieren - Restore Down Wiederherstellen - Close Schließen - - Sh&ade &Aufrollen - - %1 - [%2] %1 - [%2] - &Unshade &Herabrollen @@ -9628,117 +7680,94 @@ Bitte wählen Sie einen anderen Dateinamen. QXml - no error occurred kein Fehler - error triggered by consumer Konsument löste Fehler aus - unexpected end of file unerwartetes Ende der Datei - more than one document type definition mehrere Dokumenttypdefinitionen - error occurred while parsing element Fehler beim Parsen eines Elements - tag mismatch Element-Tags sind nicht richtig geschachtelt - error occurred while parsing content Fehler beim Parsen des Inhalts eines Elements - unexpected character unerwartetes Zeichen - invalid name for processing instruction kein gültiger Name für eine Processing-Instruktion - version expected while reading the XML declaration fehlende Version beim Parsen der XML-Deklaration - wrong value for standalone declaration falscher Wert für die Standalone-Deklaration - error occurred while parsing document type definition Fehler beim Parsen der Dokumenttypdefinition - letter is expected ein Buchstabe ist an dieser Stelle erforderlich - error occurred while parsing comment Fehler beim Parsen eines Kommentars - error occurred while parsing reference Fehler beim Parsen einer Referenz - internal general entity reference not allowed in DTD in einer DTD ist keine interne allgemeine Entity-Referenz erlaubt - external parsed general entity reference not allowed in attribute value in einem Attribut-Wert sind keine externen Entity-Referenzen erlaubt - external parsed general entity reference not allowed in DTD in der DTD sind keine externen Entity-Referenzen erlaubt - unparsed entity reference in wrong context nicht-analysierte Entity-Referenz im falschen Kontext verwendet - recursive entities rekursive Entity - error in the text declaration of an external entity Fehler in der Text-Deklaration einer externen Entity - encoding declaration or standalone declaration expected while reading the XML declaration fehlende Encoding-Deklaration oder Standalone-Deklaration beim Parsen der XML-Deklaration - standalone declaration expected while reading the XML declaration fehlende Standalone-Deklaration beim Parsen der XML Deklaration @@ -9746,27 +7775,22 @@ Bitte wählen Sie einen anderen Dateinamen. QXmlPatternistCLI - Warning in %1, at line %2, column %3: %4 Warnung in %1, bei Zeile %2, Spalte %3: %4 - Warning in %1: %2 Warnung in %1: %2 - Unknown location unbekannt - Error %1 in %2, at line %3, column %4: %5 Fehler %1 in %2, bei Zeile %3, Spalte %4: %5 - Error %1 in %2: %3 Fehler %1 in %2: %3 @@ -9774,184 +7798,142 @@ Bitte wählen Sie einen anderen Dateinamen. QXmlStream - - Extra content at end of document. Überzähliger Inhalt nach Ende des Dokumentes. - Invalid entity value. Ungültiger Entity-Wert. - Invalid XML character. Ungültiges XML-Zeichen. - Sequence ']]>' not allowed in content. Im Inhalt ist die Zeichenfolge ']]>' nicht erlaubt. - Namespace prefix '%1' not declared Der Namensraum-Präfix '%1' wurde nicht deklariert - Attribute redefined. Redefinition eines Attributes. - Unexpected character '%1' in public id literal. '%1' ist kein gültiges Zeichen in einer public-id-Angabe. - Invalid XML version string. Ungültige XML-Versionsangabe. - Unsupported XML version. Diese XML-Version wird nicht unterstützt. - %1 is an invalid encoding name. %1 ist kein gültiger Name für das Encoding. - Encoding %1 is unsupported Das Encoding %1 wird nicht unterstützt - Standalone accepts only yes or no. Der Wert für das 'Standalone'-Attribut kann nur 'yes' oder 'no' sein. - Invalid attribute in XML declaration. Die XML-Deklaration enthält ein ungültiges Attribut. - Premature end of document. Vorzeitiges Ende des Dokuments. - Invalid document. Ungültiges Dokument. - Expected Es wurde - , but got ' erwartet, stattdessen erhalten ' - Unexpected ' Ungültig an dieser Stelle ' - Expected character data. Es wurden Zeichendaten erwartet. - Recursive entity detected. Es wurde eine rekursive Entity festgestellt. - Start tag expected. Öffnendes Element erwartet. - XML declaration not at start of document. Die XML-Deklaration befindet sich nicht am Anfang des Dokuments. - NDATA in parameter entity declaration. Eine Parameter-Entity-Deklaration darf kein NDATA enthalten. - %1 is an invalid processing instruction name. %1 ist kein gültiger Name für eine Prozessing-Instruktion. - Invalid processing instruction name. Der Name der Prozessing-Instruktion ist ungültig. - - - - Illegal namespace declaration. Ungültige Namensraum-Deklaration. - Invalid XML name. Ungültiger XML-Name. - Opening and ending tag mismatch. Die Anzahl der öffnenden Elemente stimmt nicht mit der Anzahl der schließenden Elemente überein. - Reference to unparsed entity '%1'. Es wurde die ungeparste Entity '%1' referenziert. - - - Entity '%1' not declared. Die Entity '%1' ist nicht deklariert. - Reference to external entity '%1' in attribute value. Im Attributwert wurde die externe Entity '%1' referenziert. - Invalid character reference. Ungültige Zeichenreferenz. - - Encountered incorrectly encoded content. Es wurde Inhalt mit einer ungültigen Kodierung gefunden. - The standalone pseudo attribute must appear after the encoding. Das Standalone-Pseudoattribut muss dem Encoding unmittelbar folgen. - %1 is an invalid PUBLIC identifier. %1 ist keine gültige Angabe für eine PUBLIC-Id. @@ -9959,702 +7941,558 @@ Bitte wählen Sie einen anderen Dateinamen. QtXmlPatterns - - At least one component must be present. Es muss mindestens eine Komponente vorhanden sein. - %1 is not a valid value of type %2. %1 ist kein gültiger Wert des Typs %2. - When casting to %1 from %2, the source value cannot be %3. Bei einer "cast"-Operation von %1 zu %2 darf der Wert nicht %3 sein. - Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. Der effektive Boolesche Wert einer Sequenz aus zwei oder mehreren atomaren Werten kann nicht berechnet werden. - The data of a processing instruction cannot contain the string %1 Die Daten einer Processing-Anweisung dürfen nicht die Zeichenkette %1 enthalten - - %1 is an invalid %2 %1 ist kein gültiges %2 - %1 is not a valid XML 1.0 character. %1 ist kein gültiges XML 1.0 Zeichen. - %1 was called. %1 wurde gerufen. - In the replacement string, %1 must be followed by at least one digit when not escaped. In der Ersetzung muss auf %1 eine Ziffer folgen, wenn es nicht durch ein Escape-Zeichen geschützt ist. - In the replacement string, %1 can only be used to escape itself or %2, not %3 In der Ersetzung kann %1 nur verwendet werden, um sich selbst oder %2 schützen, nicht jedoch für %3 - %1 matches newline characters Der Ausdruck '%1' schließt Zeilenvorschübe ein - Matches are case insensitive Groß/Kleinschreibung wird nicht beachtet - %1 is an invalid regular expression pattern: %2 %1 ist kein gültiger regulärer Ausdruck: %2 - It will not be possible to retrieve %1. %1 kann nicht bestimmt werden. - The default collection is undefined Für eine Kollektion ist keine Vorgabe definiert - %1 cannot be retrieved %1 kann nicht bestimmt werden - The item %1 did not match the required type %2. Das Element %1 entspricht nicht dem erforderlichen Typ %2. - - %1 is an unknown schema type. %1 ist ein unbekannter Schema-Typ. - A template with name %1 has already been declared. Eine Vorlage des Namens %1 existiert bereits. - Only one %1 declaration can occur in the query prolog. Der Anfrage-Prolog darf nur eine %1-Deklaration enthalten. - The initialization of variable %1 depends on itself Die Initialisierung der Variable %1 hängt von ihrem eigenem Wert ab - The variable %1 is unused Die Variable %1 wird nicht verwendet - Version %1 is not supported. The supported XQuery version is 1.0. Die Version %1 wird nicht unterstützt. Die unterstützte Version von XQuery ist 1.0. - No function with signature %1 is available Es existiert keine Funktion mit der Signatur %1 - It is not possible to redeclare prefix %1. Der Präfix %1 kann nicht redeklariert werden. - Prefix %1 is already declared in the prolog. Der Präfix %1 wurde bereits im Prolog deklariert. - The name of an option must have a prefix. There is no default namespace for options. Der Name einer Option muss einen Präfix haben. Es gibt keine Namensraum-Vorgabe für Optionen. - The Schema Import feature is not supported, and therefore %1 declarations cannot occur. Die Deklaration %1 ist unzulässig, da Schema-Import nicht unterstützt wird. - The target namespace of a %1 cannot be empty. Der Ziel-Namensraum von %1 darf nicht leer sein. - The module import feature is not supported Modul-Import wird nicht unterstützt - The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2 Der Namensraum einer nutzerdefinierten Funktion aus einem Bibliotheksmodul muss dem Namensraum des Moduls entsprechen (%1 anstatt %2) - A function already exists with the signature %1. Es existiert bereits eine Funktion mit der Signatur %1. - No external functions are supported. All supported functions can be used directly, without first declaring them as external Externe Funktionen werden nicht unterstützt. Alle unterstützten Funktionen können direkt verwendet werden, ohne sie als extern zu deklarieren - The %1-axis is unsupported in XQuery Die %1-Achse wird in XQuery nicht unterstützt - The namespace URI cannot be the empty string when binding to a prefix, %1. Der Namensraum-URI darf nicht leer sein, wenn er an den Präfix %1 gebunden ist. - %1 is an invalid namespace URI. %1 ist kein gültiger Namensraum-URI. - It is not possible to bind to the prefix %1 Der Präfix %1 kann nicht gebunden werden - Two namespace declaration attributes have the same name: %1. Es wurden zwei Namensraum-Deklarationsattribute gleichen Namens (%1) gefunden. - The namespace URI must be a constant and cannot use enclosed expressions. Ein Namensraum-URI muss eine Konstante sein und darf keine eingebetteten Ausdrücke verwenden. - - %1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported. %1 befindet sich nicht unter den Attributdeklarationen im Bereich. Schema-Import wird nicht unterstützt. - empty leer - zero or one kein oder ein - exactly one genau ein - one or more ein oder mehrere - zero or more kein oder mehrere - The focus is undefined. Es ist kein Fokus definiert. - An attribute by name %1 has already been created. Es wurde bereits ein Attribut mit dem Namen %1 erzeugt. - Network timeout. Das Zeitlimit der Netzwerkoperation wurde überschritten. - Element %1 can't be serialized because it appears outside the document element. Das Element %1 kann nicht serialisiert werden, da es außerhalb des Dokumentenelements erscheint. - Year %1 is invalid because it begins with %2. %1 ist keine gültige Jahresangabe, da es mit %2 beginnt. - Day %1 is outside the range %2..%3. Die Tagesangabe %1 ist außerhalb des Bereiches %2..%3. - Month %1 is outside the range %2..%3. Die Monatsangabe %1 ist außerhalb des Bereiches %2..%3. - Overflow: Can't represent date %1. Das Datum %1 kann nicht dargestellt werden (Überlauf). - Day %1 is invalid for month %2. Die Tagesangabe %1 ist für den Monat %2 ungültig. - Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; Die Zeitangabe 24:%1:%2.%3 ist ungültig. Bei der Stundenangabe 24 müssen Minuten, Sekunden und Millisekunden 0 sein. - Time %1:%2:%3.%4 is invalid. Die Zeitangabe %1:%2:%3.%4 ist ungültig. - Overflow: Date can't be represented. Das Datum kann nicht dargestellt werden (Überlauf). - At least one time component must appear after the %1-delimiter. Bei Vorhandensein eines %1-Begrenzers muss mindestens eine Komponente vorhanden sein. - - Dividing a value of type %1 by %2 (not-a-number) is not allowed. Die Division eines Werts des Typs %1 durch %2 (kein numerischer Wert) ist nicht zulässig. - Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed. Die Division eines Werts des Typs %1 durch %2 oder %3 (positiv oder negativ Null) ist nicht zulässig. - Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed. Die Multiplikation eines Werts des Typs %1 mit %2 oder %3 (positiv oder negativ unendlich) ist nicht zulässig. - A value of type %1 cannot have an Effective Boolean Value. Ein Wert des Typs %1 kann keinen effektiven Booleschen Wert haben. - Value %1 of type %2 exceeds maximum (%3). Der Wert %1 des Typs %2 überschreitet das Maximum (%3). - Value %1 of type %2 is below minimum (%3). Der Wert %1 des Typs %2 unterschreitet das Minimum (%3). - A value of type %1 must contain an even number of digits. The value %2 does not. Die Stellenzahl eines Wertes des Typs %1 muss geradzahlig sein. Das ist bei %2 nicht der Fall. - %1 is not valid as a value of type %2. %1 ist kein gültiger Wert des Typs %2. - Operator %1 cannot be used on type %2. Der Operator %1 kann nicht auf den Typ %2 angewandt werden. - Operator %1 cannot be used on atomic values of type %2 and %3. Der Operator %1 kann nicht auf atomare Werte der Typen %2 und %3 angewandt werden. - The namespace URI in the name for a computed attribute cannot be %1. Der Namensraum-URI im Namen eines berechneten Attributes darf nicht %1 sein. - The name for a computed attribute cannot have the namespace URI %1 with the local name %2. Der Name eines berechneten Attributes darf keinen Namensraum-URI %1 mit dem lokalen Namen %2 haben. - Type error in cast, expected %1, received %2. Typfehler bei "cast"-Operation; es wurde %1 erwartet, aber %2 empfangen. - When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed. Bei einer "cast"-Operation zum Typ %1 oder abgeleitetenTypen muss der Quellwert ein Zeichenketten-Literal oder ein Wert gleichen Typs sein. Der Typ %2 ist ungültig. - A comment cannot contain %1 Ein Kommentar darf nicht'%1 enthalten - A comment cannot end with a %1. Ein Kommentar darf nicht auf %1 enden. - An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. Ein Attributknoten darf nicht als Kind eines Dokumentknotens erscheinen. Es erschien ein Attributknoten mit dem Namen %1. - A library module cannot be evaluated directly. It must be imported from a main module. Ein Bibliotheksmodul kann nicht direkt ausgewertet werden, er muss von einem Hauptmodul importiert werden. - No template by name %1 exists. Es existiert keine Vorlage mit dem Namen %1. - A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. Werte des Typs %1 dürfen keine Prädikate sein. Für Prädikate sind nur numerische oder effektiv Boolesche Typen zulässig. - A positional predicate must evaluate to a single numeric value. Ein positionales Prädikat muss sich als einfacher, numerischer Wert auswerten lassen. - The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid. Der Zielname einer Processing-Anweisung kann nicht %1 (unabhängig von Groß/Kleinschreibung sein). %2 ist daher ungültig. - %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. %1 ist kein gültiger Zielname einer Processing-Anweisung, es muss ein %2 Wert wie zum Beispiel %3 sein. - The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. Der letzte Schritt eines Pfades kann entweder nur Knoten oder nur atomare Werte enthalten. Sie dürfen nicht zusammen auftreten. - No namespace binding exists for the prefix %1 Es existiert keine Namensraum-Bindung für den Präfix %1 - No namespace binding exists for the prefix %1 in %2 Es existiert keine Namensraum-Bindung für den Präfix %1 in %2 - The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. Das erste Argument von %1 darf nicht vom Typ %2 sein; es muss numerisch, xs:yearMonthDuration oder xs:dayTimeDuration sein. - The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. Das erste Argument von %1 kann nicht vom Typ %2 sein, es muss einer der Typen %3, %4 oder %5 sein. - The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. Das zweite Argument von %1 kann nicht vom Typ %2 sein, es muss einer der Typen %3, %4 oder %5 sein. - If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. Wenn beide Werte mit Zeitzonen angegeben werden, müssen diese übereinstimmen. %1 und %2 sind daher unzulässig. - %1 must be followed by %2 or %3, not at the end of the replacement string. Auf %1 muss %2 oder %3 folgen; es kann nicht am Ende der Ersetzung erscheinen. - %1 and %2 match the start and end of a line. Die Ausdrücke %1 und %2 passen jeweils auf den Anfang oder das Ende einer beliebigen Zeile. - Whitespace characters are removed, except when they appear in character classes Leerzeichen werden entfernt, sofern sie nicht in Zeichenklassen erscheinen - %1 is an invalid flag for regular expressions. Valid flags are: %1 ist kein gültiger Modifikator für reguläre Ausdrücke. Gültige Modifikatoren sind: - If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. Es kann kein Präfix angegeben werden, wenn das erste Argument leer oder eine leere Zeichenkette (kein Namensraum) ist. Es wurde der Präfix %1 angegeben. - The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). Die Normalisierungsform %1 wird nicht unterstützt. Die unterstützten Normalisierungsformen sind %2, %3, %4 and %5, und "kein" (eine leere Zeichenkette steht für "keine Normalisierung"). - A zone offset must be in the range %1..%2 inclusive. %3 is out of range. Eine Zeitzonen-Differenz muss im Bereich %1..%2 (einschließlich) liegen. %3 liegt außerhalb des Bereiches. - Required cardinality is %1; got cardinality %2. Die erforderliche Kardinalität ist %1 (gegenwärtig %2). - The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2. Die Kodierung %1 ist ungültig; sie darf nur aus lateinischen Buchstaben bestehen und muss dem regulären Ausdruck %2 entsprechen. - The keyword %1 cannot occur with any other mode name. Das Schlüsselwort %1 kann nicht mit einem anderen Modusnamen zusammen verwendet werden. - No variable with name %1 exists Es existiert keine Variable des Namens %1 - The value of attribute %1 must be of type %2, which %3 isn't. Der Wert des Attributs %1 muss vom Typ %2 sein, was bei %3 nicht der Fall ist. - The prefix %1 cannot be bound. By default, it is already bound to the namespace %2. Der Präfix %1 kann nicht gebunden werden. Er ist bereits per Vorgabe an den Namensraum %2 gebunden. - A variable with name %1 has already been declared. Eine Variable des Namens %1 wurde bereits deklariert. - No value is available for the external variable with name %1. Es ist kein Wert für die externe Variable des Namens %1 verfügbar. - A stylesheet function must have a prefixed name. Der Name einer Stylesheet-Funktion muss einen Präfix haben. - The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases. Der Namensraum %1 ist reserviert und kann daher von nutzerdefinierten Funktionen nicht verwendet werden (für diesen Zweck gibt es den vordefinierten Präfix %2). - An argument with name %1 has already been declared. Every argument name must be unique. Es wurde bereits ein Argument des Namens %1 deklariert. Argumentnamen müssen eindeutig sein. - When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal. Bei der Verwendung der Funktion %1 zur Auswertung innerhalb eines Suchmusters muss das Argument eine Variablenreferenz oder ein Zeichenketten-Literal sein. - In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching. Bei einem XSL-T-Suchmuster muss das erste Argument zur Funktion %1 bei der Verwendung zur Suche ein Zeichenketten-Literal sein. - In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching. Bei einem XSL-T-Suchmuster muss das erste Argument zur Funktion %1 bei der Verwendung zur Suche ein Literal oder eine Variablenreferenz sein. - In an XSL-T pattern, function %1 cannot have a third argument. Bei einem XSL-T-Suchmuster darf die Funktion %1 kein drittes Argument haben. - In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching. Bei einem XSL-T-Suchmuster dürfen nur die Funktionen %1 und %2, nicht jedoch %3 zur Suche verwendet werden. - In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can. Bei einem XSL-T-Suchmuster dürfen nur die Achsen %2 oder %3 verwendet werden, nicht jedoch %1. - %1 is an invalid template mode name. %1 ist kein gültiger Name für einen Vorlagenmodus. - The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide. Der Name der gebundenen Variablen eines for-Ausdrucks muss sich von dem der Positionsvariable unterscheiden. Die zwei Variablen mit dem Namen %1 stehen im Konflikt. - The Schema Validation Feature is not supported. Hence, %1-expressions may not be used. %1-Ausdrücke können nicht verwendet werden, da Schemavalidierung nicht unterstützt wird. - None of the pragma expressions are supported. Therefore, a fallback expression must be present Es muss ein fallback-Ausdruck vorhanden sein, da keine pragma-Ausdrücke unterstützt werden - Each name of a template parameter must be unique; %1 is duplicated. Die Namen von Vorlagenparametern müssen eindeutig sein, %1 existiert bereits. - No function with name %1 is available. Es ist keine Funktion des Namens %1 verfügbar. - %1 is not a valid numeric literal. %1 ist kein gültiger numerischer Literal. - W3C XML Schema identity constraint selector W3C XML Schema identity constraint selector - W3C XML Schema identity constraint field W3C XML Schema identity constraint field - A construct was encountered which is disallowed in the current language(%1). Es wurde ein Sprachkonstrukt angetroffen, was in der aktuellen Sprache (%1) nicht erlaubt ist. - Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared). Der Namensraum %1 kann nur an %2 gebunden werden. Dies ist bereits vordeklariert. - Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared). Der Präfix %1 kann nur an %2 gebunden werden. Dies ist bereits vordeklariert. - An attribute with name %1 has already appeared on this element. Das Element hat bereits ein Attribut des Namens %1. - A direct element constructor is not well-formed. %1 is ended with %2. Es wurde ein fehlerhafter direkter Element-Konstruktor gefunden. %1 endet mit %2. - The name %1 does not refer to any schema type. Der Name %1 hat keinen Bezug zu einem Schematyp. - %1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works. %1 ist ein komplexer Typ. Eine "cast"-Operation zu komplexen Typen ist nicht möglich. Es können allerdings "cast"-Operationen zu atomare Typen wie %2 durchgeführt werden. - %1 is not an atomic type. Casting is only possible to atomic types. %1 ist kein atomarer Typ. "cast"-Operation können nur zu atomaren Typen durchgeführt werden. - %1 is not a valid name for a processing-instruction. %1 ist kein gültiger Name für eine Processing-Instruktion. - The name of an extension expression must be in a namespace. Der Name eines Erweiterungsausdrucks muss sich in einem Namensraum befinden. - Required type is %1, but %2 was found. Der erforderliche Typ ist %1, es wurde aber %2 angegeben. - Promoting %1 to %2 may cause loss of precision. Die Wandlung von %1 zu %2 kann zu einem Verlust an Genauigkeit führen. - It's not possible to add attributes after any other kind of node. Attribute dürfen nicht auf andere Knoten folgen. - Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. Es wird nur Unicode Codepoint Collation unterstützt (%1). %2 wird nicht unterstützt. - Integer division (%1) by zero (%2) is undefined. Die Ganzzahldivision (%1) durch Null (%2) ist nicht definiert. - Division (%1) by zero (%2) is undefined. Die Division (%1) durch Null (%2) ist nicht definiert. - Modulus division (%1) by zero (%2) is undefined. Die Modulo-Division (%1) durch Null (%2) ist nicht definiert. - %1 takes at most %n argument(s). %2 is therefore invalid. %1 hat nur %n Argument; die Angabe %2 ist daher ungültig. @@ -10662,7 +8500,6 @@ Bitte wählen Sie einen anderen Dateinamen. - %1 requires at least %n argument(s). %2 is therefore invalid. %1 erfordert mindestens ein Argument; die Angabe %3 ist daher ungültig. @@ -10670,1655 +8507,1258 @@ Bitte wählen Sie einen anderen Dateinamen. - The root node of the second argument to function %1 must be a document node. %2 is not a document node. Der übergeordnete Knoten des zweiten Arguments der Funktion %1 muss ein Dokumentknoten sein, was bei %2 nicht der Fall ist. - The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this) Der Namensraum einer benutzerdefinierten Funktion darf nicht leer sein (für diesen Zweck gibt es den vordefinierten Präfix %1) - - A default namespace declaration must occur before function, variable, and option declarations. Die Deklaration des Default-Namensraums muss vor Funktions-, Variablen- oder Optionsdeklaration erfolgen. - Namespace declarations must occur before function, variable, and option declarations. Namensraums-Deklarationen müssen vor Funktions- Variablen- oder Optionsdeklarationen stehen. - Module imports must occur before function, variable, and option declarations. Modul-Importe müssen vor Funktions-, Variablen- oder Optionsdeklarationen stehen. - %1 is not a whole number of minutes. %1 ist keine ganzzahlige Minutenangabe. - Attribute %1 can't be serialized because it appears at the top level. Das Attributelement %1 kann nicht serialisiert werden, da es auf der höchsten Ebene erscheint. - %1 is an unsupported encoding. Das Encoding %1 wird nicht unterstützt. - %1 contains octets which are disallowed in the requested encoding %2. %1 enthält Oktette, die im Encoding %2 nicht zulässig sind. - The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character. Der Code-Punkt %1 aus %2 mit Encoding %3 ist kein gültiges XML-Zeichen. - Ambiguous rule match. Mehrdeutige Regel. - In a namespace constructor, the value for a namespace cannot be an empty string. Im Konstruktor eines Namensraums darf der Wert des Namensraumes keine leere Zeichenkette sein. - The prefix must be a valid %1, which %2 is not. Der Präfix muss ein gültiger %1 sein. Das ist bei %2 nicht der Fall. - The prefix %1 cannot be bound. Der Präfix %1 kann nicht gebunden werden - Only the prefix %1 can be bound to %2 and vice versa. An %2 kann nur der Präfix %1 gebunden werden (und umgekehrt). - The parameter %1 is required, but no corresponding %2 is supplied. Es wurde kein entsprechendes %2 für den erforderlichen Parameter %1 angegeben. - The parameter %1 is passed, but no corresponding %2 exists. Es existiert kein entsprechendes %2 für den übergebenen Parameter %1. - The URI cannot have a fragment Der URI darf kein Fragment enthalten. - Element %1 is not allowed at this location. Das Element %1 darf nicht an dieser Stelle stehen. - Text nodes are not allowed at this location. An dieser Stelle dürfen keine Textknoten stehen. - Parse error: %1 Parse-Fehler: %1 - The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. Der Wert eines XSL-T-Versionsattributes muss vom Typ %1 sein, was bei %2 nicht der Fall ist. - Running an XSL-T 1.0 stylesheet with a 2.0 processor. Es wird ein XSL-T-1.0-Stylesheet mit einem Prozessor der Version 2.0 verarbeitet. - Unknown XSL-T attribute %1. Unbekanntes XSL-T-Attribut: %1. - Attribute %1 and %2 are mutually exclusive. Die Attribute %1 und %2 schließen sich gegenseitig aus. - In a simplified stylesheet module, attribute %1 must be present. In einem vereinfachten Stylesheet-Modul muss das Attribut %1 vorhanden sein. - If element %1 has no attribute %2, it cannot have attribute %3 or %4. Das Element %1 darf keines der Attribute %3 oder %4 haben, solange es nicht das Attribut %2 hat. - Element %1 must have at least one of the attributes %2 or %3. Das Element %1 muss mindestens eines der Attribute %2 oder %3 haben. - At least one mode must be specified in the %1-attribute on element %2. Im %1-Attribut des Elements %2 muss mindestens ein Modus angegeben werden. - Element %1 must come last. Das Element %1 muss zuletzt stehen. - At least one %1-element must occur before %2. Vor %2 muss mindestens ein %1-Element stehen. - Only one %1-element can appear. Es darf nur ein einziges %1-Element stehen. - At least one %1-element must occur inside %2. In %2 muss mindestens ein %1-Element stehen. - When attribute %1 is present on %2, a sequence constructor cannot be used. Es kann kein Sequenzkonstruktor verwendet werden, wenn %2 ein Attribut %1 hat. - Element %1 must have either a %2-attribute or a sequence constructor. Das Element %1 muss entweder ein %2-Attribut haben oder es muss ein Sequenzkonstruktor verwendet werden. - When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor. Der Defaultwert eines erforderlichen Parameters kann weder durch ein %1-Attribut noch durch einen Sequenzkonstruktor angegeben werden. - Element %1 cannot have children. Das Element %1 kann keine Kindelemente haben. - Element %1 cannot have a sequence constructor. Das Element %1 kann keinen Sequenzkonstruktor haben. - - The attribute %1 cannot appear on %2, when it is a child of %3. %2 darf nicht das Attribut %1 haben, wenn es ein Kindelement von %3 ist. - A parameter in a function cannot be declared to be a tunnel. Der Parameter einer Funktion kann nicht als Tunnel deklariert werden. - This processor is not Schema-aware and therefore %1 cannot be used. %1 kann nicht verwendet werden, da dieser Prozessor keine Schemas unterstützt. - Top level stylesheet elements must be in a non-null namespace, which %1 isn't. Die zuoberst stehenden Elemente eines Stylesheets dürfen sich nicht im Null-Namensraum befinden, was bei %1 der Fall ist. - The value for attribute %1 on element %2 must either be %3 or %4, not %5. Der Wert des Attributs %1 des Elements %2 kann nur %3 oder %4 sein, nicht jedoch %5. - Attribute %1 cannot have the value %2. Das Attribut %1 darf nicht den Wert %2 haben. - The attribute %1 can only appear on the first %2 element. Nur das erste %2-Element darf das Attribut %1 haben. - At least one %1 element must appear as child of %2. %2 muss mindestens ein %1-Kindelement haben. - %1 has inheritance loop in its base type %2. %1 hat eine zirkuläre Vererbung im Basistyp %2. - - Circular inheritance of base type %1. Zirkuläre Vererbung im Basistyp %1. - Circular inheritance of union %1. Zirkuläre Vererbung bei der Vereinigung %1. - %1 is not allowed to derive from %2 by restriction as the latter defines it as final. %1 darf nicht durch Einschränkung von %2 abgeleitet werden, da letzterer sie als final deklariert. - %1 is not allowed to derive from %2 by extension as the latter defines it as final. %1 darf nicht durch Erweiterung von %2 abgeleitet werden, da letzterer sie als final deklariert. - Base type of simple type %1 cannot be complex type %2. Der komplexe Typ %2 kann nicht Basisklasse des einfachen Typs %1 sein. - Simple type %1 cannot have direct base type %2. Der einfache Typ %1 kann nicht den unmittelbaren Basistyp %2 haben. - - Simple type %1 is not allowed to have base type %2. Der einfache Typ %1 darf nicht den Basistyp %2 haben. - Simple type %1 can only have simple atomic type as base type. Der einfache Typ %1 kann nur einen einfachen. atomaren Basistyp haben. - Simple type %1 cannot derive from %2 as the latter defines restriction as final. %1 darf nicht von %2 abgeleitet werden, da letzterer die Einschränkung als final deklariert. - - Variety of item type of %1 must be either atomic or union. Die Varietät der Typen von %1 muss entweder atomar oder eine Vereinigung sein. - - Variety of member types of %1 must be atomic. Die Varietät der Typen von %1 muss atomar sein. - - %1 is not allowed to derive from %2 by list as the latter defines it as final. %1 darf nicht durch Listen von %2 abgeleitet werden, da letzterer sie als final deklariert. - Simple type %1 is only allowed to have %2 facet. Der einfache Typ %1 darf nur die Facette %2 haben. - Base type of simple type %1 must have variety of type list. Der Basistyp des einfachen Typs %1 muss eine Varietät des Typs Liste haben. - Base type of simple type %1 has defined derivation by restriction as final. Der Basistyp des einfachen Typs %1 definiert Vererbung durch Einschränkung als final. - Item type of base type does not match item type of %1. Der Elementtyp des Basistyps entspricht nicht dem Elementtyp von %1. - - Simple type %1 contains not allowed facet type %2. Der einfache Typ %1 enthält einen nicht erlaubten Facettentyp %2. - - %1 is not allowed to derive from %2 by union as the latter defines it as final. %1 darf nicht durch Vereinigung von %2 abgeleitet werden, da sie letzterer sie als final deklariert. - %1 is not allowed to have any facets. %1 darf keine Facetten haben. - Base type %1 of simple type %2 must have variety of union. Der Basistyp %1 des einfachen Typs %2 muss eine Varietät des Typs Vereinigung haben. - Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute. Der Basistyp %1 des einfachen Typs %2 darf keine Einschränkung im %3 Attribut haben. - Member type %1 cannot be derived from member type %2 of %3's base type %4. Der Typ %1 des Mitglieds darf nicht vom Typ %2 des Mitglieds vom Basistyp %4 von %3 sein. - Derivation method of %1 must be extension because the base type %2 is a simple type. Erweiterung muss als Vererbungsmethode für %1 verwendet werden, da der Basistyp %2 ein einfacher Typ ist. - Complex type %1 has duplicated element %2 in its content model. Der komplexe Typ %1 hat ein dupliziertes Element %2 in seinem Inhaltsmodell. - Complex type %1 has non-deterministic content. Der komplexe Typ %1 hat nicht-deterministischen Inhalt. - Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3. Die Attribute des komplexen Typs %1 sind keine gültige Erweiterung der Attribute des Basistyps %2: %3. - Content model of complex type %1 is not a valid extension of content model of %2. Das Inhaltsmodell des komplexen Typs %1 ist keine gültige Erweiterung des Inhaltsmodells von %2. - Complex type %1 must have simple content. Der komplexe Typ %1 kann nur einfachen Inhalt haben. - Complex type %1 must have the same simple type as its base class %2. Der komplexe Typ %1 kann nur einen einfachen Typ als Basisklasse %2 haben. - Complex type %1 cannot be derived from base type %2%3. Der komplexe Typ %1 kann nicht vom Basistyp %2 abgeleitet werden%3. - Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3. Die Attribute des komplexen Typs %1 sind keine gültige Einschränkung der Attribute des Basistyps %2: %3. - Complex type %1 with simple content cannot be derived from complex base type %2. Der komplexe Typ %1 einfachen Inhalts darf nicht vom komplexen Basistyp %2 abgeleitet werden. - Item type of simple type %1 cannot be a complex type. Der Elementtyp des einfachen Typs %1 kann kein komplexer Typ sein. - Member type of simple type %1 cannot be a complex type. Der Typ eines Mitglieds des einfachen Typs %1 kann kein komplexer Typ sein. - %1 is not allowed to have a member type with the same name as itself. %1 darf keinen Typ eines Mitglieds desselben Namens haben. - - - %1 facet collides with %2 facet. Die Facette %1 steht im Widerspruch zu der Facette %2. - %1 facet must have the same value as %2 facet of base type. Die Facette %1 muss denselben Wert wie die Facette %2 des Basistyps haben. - %1 facet must be equal or greater than %2 facet of base type. Die Facette %1 muss größer oder gleich der Facette %2 des Basistyps sein. - - - - - - - - %1 facet must be less than or equal to %2 facet of base type. Die Facette %1 muss kleiner oder gleich der Facette %2 des Basistyps sein. - %1 facet contains invalid regular expression Die Facette %1 enthält einen ungültigen regulären Ausdruck - Unknown notation %1 used in %2 facet. Die Facette %2 enthält eine ungültige Notation %1. - %1 facet contains invalid value %2: %3. Die Facette %1 enthält einen ungültigen Wert %2: %3. - %1 facet cannot be %2 or %3 if %4 facet of base type is %5. Die Facette %1 kann nicht %2 oder %3 sein, wenn die Facette %4 des Basistyps %5 ist. - %1 facet cannot be %2 if %3 facet of base type is %4. Die Facette %1 kann nicht %2 sein, wenn die Facette %3 des Basistyps %4 ist. - - - %1 facet must be less than or equal to %2 facet. Die Facette %1 muss kleiner oder gleich der Facette %2 sein. - - - %1 facet must be less than %2 facet of base type. Die Facette %1 muss kleiner der Facette %2 des Basistyps sein. - - %1 facet and %2 facet cannot appear together. Die Facetten %1 und %2 können nicht zusammen erscheinen. - - - %1 facet must be greater than %2 facet of base type. Die Facette %1 muss größer als die Facette %2 des Basistyps sein. - - %1 facet must be less than %2 facet. Die Facette %1 muss kleiner als die Facette %2 sein. - - %1 facet must be greater than or equal to %2 facet of base type. Die Facette %1 muss größer oder gleich der Facette %2 des Basistyps sein. - Simple type contains not allowed facet %1. Der einfache Typ enthält eine unzulässige Facette %1. - %1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list. Die Facetten %1, %2, %3, %4, %5 und %6 sind bei Vererbung durch Listen nicht zulässig. - Only %1 and %2 facets are allowed when derived by union. Bei Vererbung durch Vereinigung sind nur die Facetten %1 und %2 zulässig. - - %1 contains %2 facet with invalid data: %3. %1 enthält eine Facette %2 mit ungültigen Daten: %3. - Attribute group %1 contains attribute %2 twice. Die Attributgruppe %1 enthält das Attribut %2 zweimal. - Attribute group %1 contains two different attributes that both have types derived from %2. Die Attributgruppe %1 enthält zwei verschiedene Attribute mit Typen, die von %2 abgeleitet sind. - Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3. Die Attributgruppe %1 enthält ein Attribut %2 mit einer Einschränkung des Werts, dessen Typ aber von %3 abgeleitet ist. - Complex type %1 contains attribute %2 twice. Der komplexe Typ %1 enthält das Attribut %2 doppelt. - Complex type %1 contains two different attributes that both have types derived from %2. Die Attributgruppe %1 enthält zwei verschiedene Attribute mit Typen, die beide von %2 abgeleitet sind. - Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3. Der komplexe Typ %1 enthält ein Attribut %2 mit einer Einschränkung des Werts, dessen Typ aber von %3 abgeleitet ist. - Element %1 is not allowed to have a value constraint if its base type is complex. Das Element %1 darf keine Einschränkung des Werts haben, wenn der Basistyp komplex ist. - Element %1 is not allowed to have a value constraint if its type is derived from %2. Das Element %1 darf keine Einschränkung des Werts haben, wenn sein Typ von %2 abgeleitet ist. - - Value constraint of element %1 is not of elements type: %2. Die Einschränkung des Werts des Elements %1 ist nicht vom Typ des Elements: %2. - Element %1 is not allowed to have substitution group affiliation as it is no global element. Das Element %1 kann nicht zu einer Substitutionsgruppe gehören, da es kein globales Element ist. - Type of element %1 cannot be derived from type of substitution group affiliation. Der Typ des Elements %1 kann nicht vom Typ der zugehörigen Substitutionsgruppe abgeleitet werden. - Value constraint of attribute %1 is not of attributes type: %2. Die Einschränkung des Werts des Attributs %1 ist nicht vom Typ des Attributs: %2. - Attribute %1 has value constraint but has type derived from %2. Das Attribut %1 hat eine Einschränkung des Werts, während sein Typ von %2 abgeleitet ist. - %1 attribute in derived complex type must be %2 like in base type. Das Attribut %1 in einem abgeleiteten komplexen Typ muss wie im Basistyp '%2' sein. - Attribute %1 in derived complex type must have %2 value constraint like in base type. Das Attribut %1 in einem abgeleiteten komplexen Typ muss wie der Basistyp eine Einschränkung des Werts (%2) haben. - Attribute %1 in derived complex type must have the same %2 value constraint like in base type. Das Attribut %1 in einem abgeleiteten komplexen Typ muss die gleiche Einschränkung des Werts (%2) wie der Basistyp haben. - Attribute %1 in derived complex type must have %2 value constraint. Das Attribut %1 in einem abgeleiteten komplexen Typ muss die Einschränkung des Werts '%2' haben. - processContent of base wildcard must be weaker than derived wildcard. Das 'processContent'-Attribut des Basissuchmusters muss schwächer sein als das des abgeleiteten Suchmusters. - - Element %1 exists twice with different types. Es existieren zwei Vorkommen verschiedenen Typs des Elements %1. - Particle contains non-deterministic wildcards. Der Partikel enthält nicht-deterministische Suchmuster. - - Base attribute %1 is required but derived attribute is not. Das Basisattribut %1 ist erforderlich, nicht jedoch das abgeleitete Attribut. - Type of derived attribute %1 cannot be validly derived from type of base attribute. Der Typ des abgeleiteten Attributs %1 kann nicht aus Typ des Basisattributs bestimmt werden. - Value constraint of derived attribute %1 does not match value constraint of base attribute. Die Einschränkung des Werts des abgeleiteten Attributs %1 entspricht nicht der Einschränkung des Werts des Basisattributs. - Derived attribute %1 does not exist in the base definition. Das abgeleitete Attribut %1 existiert in der Basisdefinition nicht. - Derived attribute %1 does not match the wildcard in the base definition. Das abgeleitete Attribut %1 entspricht nicht dem Suchmuster in der Basisdefinition. - Base attribute %1 is required but missing in derived definition. Das erforderliche Basisattribut %1 fehlt in der abgeleiteten Definition. - Derived definition contains an %1 element that does not exists in the base definition Die abgeleitete Definition enthält ein Element %1, was in der Basisdefinition nicht existiert - Derived wildcard is not a subset of the base wildcard. Das abgeleitete Suchmuster ist keine Untermenge des Basissuchmusters. - %1 of derived wildcard is not a valid restriction of %2 of base wildcard Das Attribut %1 des abgeleiteten Suchmusters ist keine gültige Einschränkung des Attributs '%2' des Basissuchmusters - Attribute %1 from base type is missing in derived type. Das Attribut %1 des Basistyps fehlt im abgeleiteten Typ. - Type of derived attribute %1 differs from type of base attribute. Der Typ des abgeleiteten Attributs %1 unterscheidet sich vom Basistyp. - Base definition contains an %1 element that is missing in the derived definition Das Element %1 des Basistyps fehlt in der abgeleiteten Definition - %1 references unknown %2 or %3 element %4. %1 verweist auf ein unbekanntes Element %4 ('%2' oder '%3'). - %1 references identity constraint %2 that is no %3 or %4 element. %1 verweist auf eine Identitätseinschränkung %2, die weder ein '%3' noch ein '%4' Element ist. - %1 has a different number of fields from the identity constraint %2 that it references. Bei %1 unterscheidet sich die Anzahl der Felder von der der Identitätseinschränkung %2, auf die es verweist. - Base type %1 of %2 element cannot be resolved. Der Basistyp %1 des Elements %2 kann nicht aufgelöst werden. - Item type %1 of %2 element cannot be resolved. Der Subtyp %1 des Elements %2 kann nicht aufgelöst werden. - Member type %1 of %2 element cannot be resolved. Der Subtyp %1 des Elements %2 kann nicht aufgelöst werden. - - - Type %1 of %2 element cannot be resolved. Der Typ %1 des Elements %2 kann nicht aufgelöst werden. - Base type %1 of complex type cannot be resolved. Der Basistyp %1 des komplexen Typs kann nicht aufgelöst werden. - %1 cannot have complex base type that has a %2. %1 kann keinen komplexen Basistyp haben, der '%2' spezifiziert. - Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type. Das Inhaltsmodell des komplexen Typs %1enthält ein Element '%2'; es kann daher nicht durch Erweiterung von einem Typ abgeleitet werden, der nicht leer ist. - Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model. Der komplexe Typ %1 kann nicht durch Erweiterung von %2 abgeleitet werden, da letzterer ein '%3'-Element in seinem Inhaltsmodell hat. - Type of %1 element must be a simple type, %2 is not. Der Typ des Elements %1 muss ein einfacher Typ sein, was %2 nicht ist. - Substitution group %1 of %2 element cannot be resolved. Die Substitutionsgruppe %1 des Elements %2 kann nicht aufgelöst werden. - Substitution group %1 has circular definition. Die Substitutionsgruppe %1 hat eine zirkuläre Definition. - - Duplicated element names %1 in %2 element. Der Elementname %1 kommt im Element %2 mehrfach vor. - - - - Reference %1 of %2 element cannot be resolved. Der Verweis %1 des Elements %2 kann nicht aufgelöst werden. - Circular group reference for %1. Zirkulärer Verweis bei %1. - %1 element is not allowed in this scope Das Element %1 ist in diesem Bereich nicht zulässig - %1 element cannot have %2 attribute with value other than %3. Der Wert des Attributs %2 des Elements %1 kann nur %3 sein. - %1 element cannot have %2 attribute with value other than %3 or %4. Der Wert des Attributs %2 des Elements %1 kann nur %3 oder %4 sein. - %1 or %2 attribute of reference %3 does not match with the attribute declaration %4. Das Attribut %1 oder %2 des Verweises %3 entspricht nicht der Attributsdeklaration %4. - Attribute group %1 has circular reference. Die Attributgruppe %1 hat einen zirkulären Verweis. - %1 attribute in %2 must have %3 use like in base type %4. Das Attribut %1 aus %2 muss die Verwendung '%3' spezifizieren, wie im Basistyp %4. - Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2. Das Attributssuchmuster %1 ist keine gültige Einschränkung des Attributssuchmuster des Basistyps %2. - %1 has attribute wildcard but its base type %2 has not. %1 hat ein Attributssuchmuster, nicht jedoch sein Basistyp %2. - Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible. Die Vereinigung der Attributssuchmuster des Typs %1 und seines Basistyps %2 ergibt keinen gültigen Ausdruck. - Enumeration facet contains invalid content: {%1} is not a value of type %2. Ungültiger Inhalt einer Aufzählungsfacette: {%1} ist kein Wert des Typs %2. - Namespace prefix of qualified name %1 is not defined. Der Namensraum-Präfix des qualifizierten Namens %1 ist nicht definiert. - - %1 element %2 is not a valid restriction of the %3 element it redefines: %4. Das Element %2 (%1) ist keine gültige Einschränkung des überschriebenen Elements (%3): %4. - Empty particle cannot be derived from non-empty particle. Es kann kein leerer Partikel von einem Partikel abgeleitet werden, der nicht leer ist. - Derived particle is missing element %1. Das Element %1 fehlt im abgeleiteten Partikel. - Derived element %1 is missing value constraint as defined in base particle. Im abgeleiteten Element %1 fehlt Einschränkung des Wertes, wie sie im Basispartikel definiert ist. - Derived element %1 has weaker value constraint than base particle. Das abgeleitete Element %1 hat eine schwächere Einschränkung des Wertes als der Basispartikel. - Fixed value constraint of element %1 differs from value constraint in base particle. Die feste Einschränkung des Wertes des Elements %1 unterscheidet sich von der Einschränkung des Wertes des Basispartikels. - Derived element %1 cannot be nillable as base element is not nillable. Das abgeleitete Element %1 kann kein 'nillable'-Attribut haben, da das Basiselement keines spezifiziert. - Block constraints of derived element %1 must not be more weaker than in the base element. Die Blockeinschränkung des abgeleiteten Elements %1 darf nicht schwächer sein als im Basiselement. - Simple type of derived element %1 cannot be validly derived from base element. Der einfache Typ des abgeleiteten Elements %1 kann nicht vom Basiselement abgeleitet werden. - Complex type of derived element %1 cannot be validly derived from base element. Der komplexe Typ des abgeleiteten Elements %1 kann nicht vom Basiselement abgeleitet werden. - Element %1 is missing in derived particle. Das Element %1 fehlt im abgeleiteten Partikel. - Element %1 does not match namespace constraint of wildcard in base particle. Das Element %1 entspricht nicht der Namensraumeinschränkung des Basispartikels. - Wildcard in derived particle is not a valid subset of wildcard in base particle. Das Suchmuster im abgeleiteten Partikel ist keine gültige Untermenge des Suchmusters des Basispartikels. - processContent of wildcard in derived particle is weaker than wildcard in base particle. Das processContent-Attribut des Suchmusters des abgeleiteten Partikels ist schwächer als das Suchmuster des Basispartikels. - Derived particle allows content that is not allowed in the base particle. Der abgeleitete Partikel gestattet Inhalt, der für den Basispartikel nicht zulässig ist. - Can not process unknown element %1, expected elements are: %2. Das unbekannte Element %1 kann nicht verarbeitet werden; zulässig wären: %2. - Element %1 is not allowed in this scope, possible elements are: %2. Das Element %1 ist in diesem Bereich nicht zulässig; möglich wären: %2. - Child element is missing in that scope, possible child elements are: %1. Das Unterelement fehlt im Bereich; mögliche Unterelemente wären: %1. - Document is not a XML schema. Das Dokument ist kein XML-Schema. - %1 attribute of %2 element contains invalid content: {%3} is not a value of type %4. Das Attribut %1 des Elements %2 enthält ungültigen Inhalt: {%3} ist kein Wert des Typs %4. - %1 attribute of %2 element contains invalid content: {%3}. Das Attribut %1 des Elements %2 enthält ungültigen Inhalt: {%3}. - Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema. Der Zielnamensraum %1 des eingebundenen Schemas unterscheidet sich vom dem von ihm definierten Zielnamensraum %2. - - Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema. Der Zielnamensraum %1 des importierten Schemas unterscheidet sich vom dem von ihm definierten Zielnamensraum %2. - %1 element is not allowed to have the same %2 attribute value as the target namespace %3. Das Element %1 kann nicht den Zielnamensraum %3 als Wert des Attributs '%2' spezifizieren. - %1 element without %2 attribute is not allowed inside schema without target namespace. In einem Schema ohne Namensraum muss das Element %1 ein Attribut %2 haben. - - %1 element is not allowed inside %2 element if %3 attribute is present. Wenn das Attribut %3 vorhanden ist, darf das Element %1 nicht im Element %2 vorkommen. - - - %1 element has neither %2 attribute nor %3 child element. Das Element %1 hat weder das Attribut %2 noch ein Unterelement %3. - - - - - - - - - - - - - - %1 element with %2 child element must not have a %3 attribute. Das Element %1 darf kein Attribut %3 haben, wenn das Unterelement %2 vorhanden ist. - %1 attribute of %2 element must be %3 or %4. Das Attribut %1 des Elements %2 kann nur %3 oder %4 sein. - %1 attribute of %2 element must have a value of %3. Das Attribut %1 des Elements %2 muss den Wert %3 haben. - - %1 attribute of %2 element must have a value of %3 or %4. Das Attribut %1 des Elements %2 kann nur einen der Werte %3 oder %4 haben. - - - - - - - - - - - - - - %1 element must not have %2 and %3 attribute together. Die Attribute %2 und %3 können nicht zusammen im Element %1 erscheinen. - - Content of %1 attribute of %2 element must not be from namespace %3. Der Inhalt des Attributs %1 des Elements %2 kann nicht vom Namensraum %3 stammen. - - %1 attribute of %2 element must not be %3. Das Attribut %1 des Elements %2 kann nicht %3 sein. - %1 attribute of %2 element must have the value %3 because the %4 attribute is set. Das Attribut %1 des Elements %2 muss den Wert %3 haben, da das Attribut %4 gesetzt ist. - Specifying use='prohibited' inside an attribute group has no effect. Die Angabe von use='prohibited' in einer Attributgruppe hat keinerlei Auswirkungen. - %1 element must have either %2 or %3 attribute. Das Element %1 muss eines der Attribute %2 oder %3 spezifizieren. - %1 element must have either %2 attribute or %3 or %4 as child element. Das Element %1 muss entweder das Attribut %2 spezifizieren oder über eines der Unterelemente %3 oder %4 verfügen. - %1 element requires either %2 or %3 attribute. Das Element %1 erfordert eines der Attribute %2 oder %3. - Text or entity references not allowed inside %1 element Text- oder Entitätsreferenzen sind innerhalb eines %1-Elements nicht zulässig. - - %1 attribute of %2 element must contain %3, %4 or a list of URIs. Das Attribut %1 des Elements %2 muss %3, %4 oder eine Liste der URIs enthalten. - %1 element is not allowed in this context. Das Element %1 ist in diesem Kontext nicht zulässig. - %1 attribute of %2 element has larger value than %3 attribute. Der Wert des Attributs %1 des Elements %2 ist größer als der des Attributs %3. - Prefix of qualified name %1 is not defined. Der Präfix des qualifizierten Namens %1 ist nicht definiert. - - %1 attribute of %2 element must either contain %3 or the other values. Der Wert des Attributs %1 des Elements %2 muss entweder %3 oder die anderen Werte enthalten. - Component with ID %1 has been defined previously. Es wurde bereits eine Komponente mit der ID %1 definiert. - Element %1 already defined. Das Element %1 ist bereits definiert. - Attribute %1 already defined. Das Attribut %1 ist bereits definiert. - Type %1 already defined. Der Typ %1 ist bereits definiert. - Attribute group %1 already defined. Die Attributgruppe %1 ist bereits definiert. - Element group %1 already defined. Die Elementgruppe %1 ist bereits definiert. - Notation %1 already defined. Die Notation %1 ist bereits definiert. - Identity constraint %1 already defined. Die Identitätseinschränkung %1 ist bereits definiert. - Duplicated facets in simple type %1. Im einfachen Typ %1 kommen Facetten mehrfach vor. - - - %1 is not valid according to %2. %1 ist nach %2 ungültig. - String content does not match the length facet. Der Zeichenketteninhalt entspricht nicht der Längenfacette. - String content does not match the minLength facet. Der Zeichenketteninhalt entspricht nicht der Längenfacette (Minimumangabe). - String content does not match the maxLength facet. Der Zeichenketteninhalt entspricht nicht der Längenfacette (Maximumangabe). - String content does not match pattern facet. Der Zeichenketteninhalt entspricht nicht der Suchmusterfacette. - String content is not listed in the enumeration facet. Der Zeichenketteninhalt ist nicht in der Aufzählungsfacette enthalten. - Signed integer content does not match the maxInclusive facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Facette 'maxInclusive'. - Signed integer content does not match the maxExclusive facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Facette 'maxExclusive'. - Signed integer content does not match the minInclusive facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Facette 'minInclusive'. - Signed integer content does not match the minExclusive facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Facette 'minExclusive'. - Signed integer content is not listed in the enumeration facet. Der vorzeichenbehaftete Ganzzahlwert ist nicht in der Aufzählungsfacette enthalten. - Signed integer content does not match pattern facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Suchmusterfacette. - Signed integer content does not match in the totalDigits facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Facette 'totalDigits'. - Unsigned integer content does not match the maxInclusive facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Facette 'maxInclusive'. - Unsigned integer content does not match the maxExclusive facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Facette 'maxExclusive'. - Unsigned integer content does not match the minInclusive facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Facette 'minInclusive'. - Unsigned integer content does not match the minExclusive facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Facette 'minExclusive'. - Unsigned integer content is not listed in the enumeration facet. Der vorzeichenlose Ganzzahlwert ist nicht in der Aufzählungsfacette enthalten. - Unsigned integer content does not match pattern facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Suchmusterfacette. - Unsigned integer content does not match in the totalDigits facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Facette 'totalDigits'. - Double content does not match the maxInclusive facet. Die Gleitkommazahl entspricht nicht der Facette 'maxInclusive'. - Double content does not match the maxExclusive facet. Die Gleitkommazahl entspricht nicht der Facette 'maxExclusive'. - Double content does not match the minInclusive facet. Die Gleitkommazahl entspricht nicht der Facette 'minInclusive'. - Double content does not match the minExclusive facet. Die Gleitkommazahl entspricht nicht der Facette 'minExclusive'. - Double content is not listed in the enumeration facet. Die Gleitkommazahl ist nicht in der Aufzählungsfacette enthalten. - Double content does not match pattern facet. Die Gleitkommazahl entspricht nicht der Suchmusterfacette. - Decimal content does not match in the fractionDigits facet. Die Dezimalzahl entspricht nicht der Facette 'fractionDigit'. - Decimal content does not match in the totalDigits facet. Die Dezimalzahl entspricht nicht der Facette 'totalDigits'. - Date time content does not match the maxInclusive facet. Die Datumsangabe entspricht nicht der Facette 'maxInclusive'. - Date time content does not match the maxExclusive facet. Die Datumsangabe entspricht nicht der Facette 'maxExclusive'. - Date time content does not match the minInclusive facet. Die Datumsangabe entspricht nicht der Facette 'minInclusive'. - Date time content does not match the minExclusive facet. Die Datumsangabe entspricht nicht der Facette 'minExclusive'. - Date time content is not listed in the enumeration facet. Die Datumsangabe ist nicht in der Aufzählungsfacette enthalten. - Date time content does not match pattern facet. Die Datumsangabe entspricht nicht der Suchmusterfacette. - Duration content does not match the maxInclusive facet. Die Angabe der Zeitdauer entspricht nicht der Facette 'maxInclusive'. - Duration content does not match the maxExclusive facet. Die Angabe der Zeitdauer entspricht nicht der Facette 'maxExclusive'. - Duration content does not match the minInclusive facet. Die Angabe der Zeitdauer entspricht nicht der Facette 'minInclusive'. - Duration content does not match the minExclusive facet. Die Angabe der Zeitdauer entspricht nicht der Facette 'minExclusive'. - Duration content is not listed in the enumeration facet. Die Angabe der Zeitdauer ist nicht in der Aufzählungsfacette enthalten. - Duration content does not match pattern facet. Die Angabe der Zeitdauer entspricht nicht der Suchmusterfacette. - Boolean content does not match pattern facet. Der Boolesche Wert entspricht nicht der Suchmusterfacette. - Binary content does not match the length facet. Der binäre Inhalt entspricht nicht der Längenfacette. - Binary content does not match the minLength facet. Der binäre Inhalt entspricht nicht der Facette 'minLength'. - Binary content does not match the maxLength facet. Der binäre Inhalt entspricht nicht der Facette 'maxLength'. - Binary content is not listed in the enumeration facet. Der binäre Inhalt ist nicht in der Aufzählungsfacette enthalten. - Invalid QName content: %1. Der Inhalt des qualifizierten Namens ist ungültig: %1. - QName content is not listed in the enumeration facet. Der Inhalt des qualifizierten Namens ist nicht in der Aufzählungsfacette enthalten. - QName content does not match pattern facet. Der Inhalt des qualifizierten Namens entspricht nicht der Suchmusterfacette. - Notation content is not listed in the enumeration facet. Der Inhalt der Notation ist nicht in der Aufzählungsfacette enthalten. - List content does not match length facet. Der Listeninhalt entspricht nicht der Längenfacette. - List content does not match minLength facet. Der Listeninhalt entspricht nicht der Facette 'minLength'. - List content does not match maxLength facet. Der Listeninhalt entspricht nicht der Facette 'maxLength'. - List content is not listed in the enumeration facet. Der Listeninhalt ist nicht in der Aufzählungsfacette enthalten. - List content does not match pattern facet. Der Listeninhalt entspricht nicht der Suchmusterfacette. - Union content is not listed in the enumeration facet. Der Inhalt der Vereinigung ist nicht in der Aufzählungsfacette enthalten. - Union content does not match pattern facet. Der Inhalt der Vereinigung entspricht nicht der Suchmusterfacette. - Data of type %1 are not allowed to be empty. Daten vom Typ %1 können nicht leer sein. - Element %1 is missing child element. Beim Element %1 fehlt ein Unterelement. - There is one IDREF value with no corresponding ID: %1. Es existiert ein IDREF-Wert, für den keine zugehörige ID vorhanden ist: %1. - Loaded schema file is invalid. Das geladene Schema ist ungültig. - %1 contains invalid data. %1 enthält ungültige Daten. - xsi:schemaLocation namespace %1 has already appeared earlier in the instance document. xsi:schemaLocation namespace %1 wurde im Instanzdokument bereits spezifiziert. - xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute. xsi:noNamespaceSchemaLocation kann nicht nach dem ersten Element oder Attribut ohne Namensraum erscheinen. - No schema defined for validation. Es ist kein Schema für die Validierung definiert. - No definition for element %1 available. Für das Element %1 ist keine Definition verfügbar. - - - Specified type %1 is not known to the schema. Der angegebene Typ %1 ist im Schema nicht spezifiziert. - Element %1 is not defined in this scope. Das Element %1 ist in diesem Bereich nicht definiert. - Declaration for element %1 does not exist. Für das Element %1 ist keine Deklaration verfügbar. - Element %1 contains invalid content. Das Element %1 enthält ungültigen Inhalt. - Element %1 is declared as abstract. Das Element %1 ist als abstrakt deklariert. - Element %1 is not nillable. Das Element %1 hat das Attribut 'nillable' nicht spezifiziert. - Attribute %1 contains invalid data: %2 Das Attribut %1 enthält ungültige Daten: %2 - Element contains content although it is nillable. Das Element hat Inhalt, obwohl es 'nillable' spezifiziert. - Fixed value constraint not allowed if element is nillable. Eine Beschränkung auf einen festen Wert ist nicht zulässig, wenn das Element 'nillable' spezifiziert. - Element %1 cannot contain other elements, as it has a fixed content. Das Element %1 kann keine anderen Element enthalten, da sein Inhalt festgelegt ist. - Specified type %1 is not validly substitutable with element type %2. Der angebenene Typ %1 kann nicht durch den Elementtyp %2 substituiert werden. - Complex type %1 is not allowed to be abstract. Der komplexe Typ %1 kann nicht abstrakt sein. - Element %1 contains not allowed attributes. Das Element %1 enthält unzulässige Attribute. - - Element %1 contains not allowed child element. Das Element %1 enthält ein unzulässiges Unterelement. - - Content of element %1 does not match its type definition: %2. Der Inhalt des Elements %1 entspricht nicht seiner Typdefinition: %2. - - - Content of element %1 does not match defined value constraint. Der Inhalt des Elements %1 entspricht nicht der definierten Einschränkung des Werts. - Element %1 contains not allowed child content. Das Element %1 enthält unzulässigen Unterinhalt. - Element %1 contains not allowed text content. Das Element %1 enthält unzulässigen Textinhalt. - Element %1 is missing required attribute %2. Bei dem Element %1 fehlt ein erforderliches Attribut %2. - Attribute %1 does not match the attribute wildcard. Das Attribut %1 entspricht nicht dem Attributssuchmuster. - Declaration for attribute %1 does not exist. Für das Attribut %1 ist keine Deklaration verfügbar. - Element %1 contains two attributes of type %2. Das Element %1 enthält zwei Attribute des Typs %2. - Attribute %1 contains invalid content. Das Attribut %1 enthält ungültigen Inhalt. - Element %1 contains unknown attribute %2. Das Element %1 enthält ein unbekanntes Attribut %2. - - Content of attribute %1 does not match its type definition: %2. Der Inhalt des Attributs %1 entspricht nicht seiner Typdefinition: %2. - - Content of attribute %1 does not match defined value constraint. Der Inhalt des Attributs %1 entspricht nicht der definierten Einschränkung des Werts. - Non-unique value found for constraint %1. Für die Einschränkung %1 wurde ein nicht eindeutiger Wert gefunden. - Key constraint %1 contains absent fields. Die Einschränkung des Schlüssels %1 enthält nicht vorhandene Felder. - Key constraint %1 contains references nillable element %2. Die Einschränkung des Schlüssels %1 verweist auf das Element %2, was 'nillable' spezifiziert. - No referenced value found for key reference %1. Der referenzierte Wert der Schlüsselreferenz %1 konnte nicht gefunden werden. - More than one value found for field %1. Für das Feld %1 wurden mehrere Werte gefunden. - Field %1 has no simple type. Das Feld %1 hat keinen einfachen Typ. - ID value '%1' is not unique. Der ID-Wert '%1' ist nicht eindeutig. - '%1' attribute contains invalid QName content: %2. Das Attribut '%1' enthält einen ungültigen qualifizierten Namen: %2. diff --git a/translations/qt_help_de.ts b/translations/qt_help_de.ts index c7a8103..1f0cf32 100644 --- a/translations/qt_help_de.ts +++ b/translations/qt_help_de.ts @@ -4,106 +4,92 @@ QCLuceneResultWidget - Search Results Suchergebnisse - Note: Achtung: - The search results may not be complete since the documentation is still being indexed! Es können nicht alle möglichen Ergebnisse angezeigt werden, da die Dokumentation noch indiziert wird. - Your search did not match any documents. Es wurden keine mit Ihrer Suche übereinstimmenden Dokumente gefunden. - (The reason for this might be that the documentation is still being indexed.) (Ein Grund dafür könnte sein, das die Dokumentation noch nicht vollständig indiziert ist.) + QHelp + + Untitled + + + + QHelpCollectionHandler - The collection file '%1' is not set up yet! Die Katalogdatei '%1' ist noch nicht eingerichtet. - Cannot load sqlite database driver! Der Datenbanktreiber für SQLite kann nicht geladen werden. - - Cannot open collection file: %1 Katalogdatei kann nicht geöffnet werden: %1 - Cannot create tables in file %1! In Datei %1 können keine Tabellen angelegt werden. - The collection file '%1' already exists! Die Katalogdatei '%1' existiert bereits. - Unknown filter '%1'! Unbekannter Filter '%1'. - Invalid documentation file '%1'! Ungültige Dokumentationsdatei '%1'. - Cannot register namespace '%1'! Der Namensraum '%1' kann nicht registriert werden. - Cannot open database '%1' to optimize! Die Datenbank '%1' kann nicht zur Optimierung geöffnet werden. - Cannot create directory: %1 Das Verzeichnis kann nicht angelegt werden: %1 - Cannot copy collection file: %1 Die Katalogdatei kann nicht kopiert werden: %1 - Cannot register filter %1! Der Filter kann nicht registriert werden: %1 - Cannot open documentation file %1! Die Dokumentationsdatei kann nicht geöffnet werden: %1 - The namespace %1 was not registered! Der Namensraum %1 wurde nicht registriert. - Namespace %1 already exists! Der Namensraum %1 existiert bereits. @@ -111,7 +97,6 @@ QHelpDBReader - Cannot open database '%1' '%2': %3 The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string Kann Datenbank nicht öffnen: '%1' '%2': %3 @@ -120,12 +105,10 @@ QHelpEngineCore - Cannot open documentation file %1: %2! Die Dokumentationsdatei %1 kann nicht geöffnet werden: %2! - The specified namespace does not exist! Der angegebene Namensraum existiert nicht. @@ -133,132 +116,106 @@ QHelpGenerator - Invalid help data! Ungültige Hilfe-Daten. - No output file name specified! Für die Ausgabe-Datei wurde kein Name angegeben. - Building up file structure... Dateistruktur wird erzeugt... - The file %1 cannot be overwritten! Die Datei %1 kann nicht überschrieben werden. - Cannot open data base file %1! Die Datenbank-Datei %1 kann nicht geöffnet werden. - Cannot register namespace %1! Der Namensraum %1 kann nicht registriert werden. - Insert custom filters... Benutzerdefinierte Filter einfügen... - Insert help data for filter section (%1 of %2)... Hilfe-Daten für Filter-Sektion (%1 von %2) einfügen... - Documentation successfully generated. Dokumentation erfolgreich generiert. - Some tables already exist! Einige Tabellen existieren bereits. - Cannot create tables! Tabellen können nicht erstellt werden. - Cannot register virtual folder! Virtuelles Verzeichnis nicht registriert werden. - Insert files... Dateien einfügen... - The referenced file %1 must be inside or within a subdirectory of (%2). Skipping it. Die referenzierte Datei %1 muss sich im Verzeichnis %2 oder in einem Unterverzeichnis davon befinden. Sie wird übersprungen. - The file %1 does not exist! Skipping it. Die Datei %1 existiert nicht. Wird übersprungen. - Cannot open file %1! Skipping it. Die Datei %1 kann nicht geöffnet werden. Wird übersprungen. - The filter %1 is already registered! Der Filter %1 ist bereits registriert. - Cannot register filter %1! Der Filter %1 kann nicht registriert werden. - Insert indices... Indizes einfügen... - Insert contents... Inhalt einfügen... - Cannot insert contents! Inhalt kann nicht eingefügt werden. - Cannot register contents! Inhalt kann nicht registriert werden. - File '%1' does not exist. Die Datei '%1' existiert nicht. - File '%1' cannot be opened. Die Datei '%1' kann nicht geöffnet werden. - File '%1' contains an invalid link to file '%2' Die Datei '%1' enthält einen ungültigen Verweis auf die Datei '%2' - Invalid links in HTML files. Es wurden ungültige Verweise in HTML-Dateien gefunden. @@ -266,47 +223,38 @@ QHelpProject - Unknown token. Unbekanntes Token. - Unknown token. Expected "QtHelpProject"! Unbekanntes Token. "QtHelpProject" erwartet. - Error in line %1: %2 Fehler in Zeile %1: %2 - Virtual folder has invalid syntax. Ungültige Syntax bei Angabe des virtuellen Verzeichnisses. - Namespace has invalid syntax. Ungültige Syntax der Namensraum-Angabe. - Missing namespace in QtHelpProject. Fehlender Namensraum in QtHelpProject. - Missing virtual folder in QtHelpProject Fehlendes virtuelles Verzeichnis in QtHelpProject. - Missing attribute in keyword at line %1. Fehlendes Attribut in Schlagwort in Zeile %1. - The input file %1 could not be opened! Die Eingabe-Datei %1 kann nicht geöffnet werden. @@ -314,52 +262,42 @@ QHelpSearchQueryWidget - Search for: Suche nach: - Previous search Vorige Suche - Next search Nächste Suche - Search Suche - Advanced search Erweiterte Suche - words <B>similar</B> to: Worte <B>ähnlich</B> zu: - <B>without</B> the words: <B>ohne</B> die Wörter: - with <B>exact phrase</B>: mit der <B>genauen Wortgruppe</B>: - with <B>all</B> of the words: mit <B>allen</B> Wörtern: - with <B>at least one</B> of the words: mit <B>irgendeinem</B> der Wörter: @@ -367,7 +305,6 @@ QHelpSearchResultWidget - %1 - %2 of %n Hits %1 - %2 - Ein Treffer @@ -375,7 +312,6 @@ - 0 - 0 of 0 Hits 0 - 0 von 0 Treffern -- cgit v0.12 From 689d8f81cdb9beff8974c7672708e0d3dd61302d Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 09:29:03 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/getting-started/gettingstartedqml.qdoc | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc index 93f6f88..6c85776 100644 --- a/doc/src/getting-started/gettingstartedqml.qdoc +++ b/doc/src/getting-started/gettingstartedqml.qdoc @@ -308,7 +308,7 @@ with a header that displays a row of menu names. The list of menus are declared inside a \c VisualItemModel. The \l{VisualItemModel}{\c VisualItemModel} element contains items that already have views such as \c Rectangle elements - and imported UI elements. Other model types such as the \l{ListModel}{\c ListModel} + and imported UI elements. Other model types such as the \l {ListModel}{\c ListModel} element need a delegate to display their data. We declare two visual items in the \c menuListModel, the \c FileMenu and the @@ -361,7 +361,7 @@ } \endcode - Additionally, \c ListView inherits from \l{Flickable}{\c Flickable}, making + Additionally, \c ListView inherits from \l {Flickable}{\c Flickable}, making the list respond to mouse drags and other gestures. The last portion of the code above sets \c Flickable properties to create the desired flicking movement to our view. In particular,the property \c highlightMoveDuration changes the @@ -585,7 +585,7 @@ that the targets' properties will animate for a certain duration of time and using a certain easing curve. An easing curve controls the animation rates and interpolation behavior during state transitions. The easing curve we chose is - \l{PropertyAnimation::easing.type}{Easing.OutQuint}, which slows the movement near + \l{PropertyAnimation::easing.type}{Easing.OutQuint}, which slows the movement near the end of the animation. Pleae read \l {qdeclarativeanimation.html}{QML's Animation} article. @@ -737,7 +737,12 @@ }; \endcode - Our plugin class, \c DialogPlugin is a subclass of \l {QDeclarativeExtensionPlugin}{QDeclarativeExtensionPlugin}. We need to implement the inherited function, \l {QDeclarativeExtensionPlugin::registerTypes}{registerTypes}. The \c dialogPlugin.cpp file looks like this: + + Our plugin class, \c DialogPlugin is a subclass of \l + {QDeclarativeExtensionPlugin}{QDeclarativeExtensionPlugin}. We + need to implement the inherited function, \l + {QDeclarativeExtensionPlugin::registerTypes()}{registerTypes}. The + \c dialogPlugin.cpp file looks like this: \code DialogPlugin.cpp: @@ -756,7 +761,7 @@ Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin); \endcode - The \l {QDeclarativeExtensionPlugin::registerTypes}{registerTypes} + The \l {QDeclarativeExtensionPlugin::registerTypes()}{registerTypes} function registers our File and Directory classes into QML. This function needs the class name for its template, a major version number, a minor version number, and a name for our classes. @@ -816,7 +821,7 @@ The \c files list property is a list of all the filtered files in a directory. The \c Directory class is implemented to filter out invalid text files; only - files with a \c .txt extension are valid. Further, \l {QLists}{QLists} can be + files with a \c .txt extension are valid. Further, \l {QList}{QLists} can be used in QML files by declaring them as a \c QDeclarativeListProperty in C++. The templated object needs to inherit from a \l {QObject}{QObject}, therefore, the \c File class must also inherit from \c QObject. In the \c Directory class, -- cgit v0.12 From 8b0761d942ced89e34a8ee99de10f2f106f19396 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 09:43:49 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/modules.qdoc | 64 +--------------------------------------------------- 1 file changed, 1 insertion(+), 63 deletions(-) diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index a81bfb2..c35d71c 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -40,7 +40,7 @@ \header \o {2,1} \bold{Modules for general software development} \row \o \l{QtCore} \o Core non-graphical classes used by other modules \row \o \l{QtGui} \o Graphical user interface (GUI) components - \row \o \l{QtMultimedia} \o Classes for low-level multimedia functionality + \row \o \l{qtmultimedia-module.html}{QtMultimedia} \o Classes for low-level multimedia functionality \row \o \l{QtNetwork} \o Classes for network programming \row \o \l{QtOpenGL} \o OpenGL support classes \row \o \l{QtOpenVG} \o OpenVG support classes @@ -82,9 +82,6 @@ /*! \module QtCore \title QtCore Module - \contentspage All Modules - \previouspage All Modules - \nextpage QtGui \ingroup modules \keyword QtCore @@ -101,9 +98,6 @@ /*! \module QtGui \title QtGui Module - \contentspage All Modules - \previouspage QtCore - \nextpage QtNetwork \ingroup modules \brief The QtGui module extends QtCore with GUI functionality. @@ -118,9 +112,6 @@ \module QtMultimedia \page qtmultimedia-module.html \title QtMultimedia Module - \contentspage All Modules - \previouspage QtCore - \nextpage QtNetwork \ingroup modules \brief The QtMultimedia module provides low-level multimedia functionality. @@ -142,9 +133,6 @@ /*! \module QtNetwork \title QtNetwork Module - \contentspage All Modules - \previouspage QtMultimedia - \nextpage QtOpenGL \ingroup modules \brief The QtNetwork module provides classes to make network programming @@ -164,9 +152,6 @@ /*! \module QtOpenGL \title QtOpenGL Module - \contentspage All Modules - \previouspage QtNetwork - \nextpage QtOpenVG \ingroup modules \brief The QtOpenGL module offers classes that make it easy to @@ -217,9 +202,6 @@ \module QtOpenVG \title QtOpenVG Module \since 4.6 - \contentspage All Modules - \previouspage QtOpenGL - \nextpage QtScript \ingroup modules \brief The QtOpenVG module is a plugin that provides support for @@ -272,9 +254,6 @@ \module QtScript \title QtScript Module \since 4.3 - \contentspage All Modules - \previouspage QtOpenVG - \nextpage QtScriptTools \ingroup modules \brief The QtScript module provides classes for making Qt applications scriptable. @@ -332,9 +311,6 @@ \module QtScriptTools \title QtScriptTools Module \since 4.5 - \contentspage All Modules - \previouspage QtScript - \nextpage QtSql \ingroup modules \brief The QtScriptTools module provides additional components for applications that use Qt Script. @@ -356,9 +332,6 @@ /*! \module QtSql \title QtSql Module - \contentspage All Modules - \previouspage QtScript - \nextpage QtSvg \ingroup modules To include the definitions of the module's classes, use the @@ -379,9 +352,6 @@ \module QtSvg \title QtSvg Module \since 4.1 - \contentspage All Modules - \previouspage QtSql - \nextpage QtWebKit \ingroup modules \brief The QtSvg module provides classes for displaying and creating SVG files. @@ -430,9 +400,6 @@ /*! \module QtXml \title QtXml Module - \contentspage All Modules - \previouspage QtSvg - \nextpage QtXmlPatterns \ingroup modules \brief The QtXml module provides a stream reader and writer for @@ -457,9 +424,6 @@ \module QtXmlPatterns \title QtXmlPatterns Module \since 4.4 - \contentspage All Modules - \previouspage QtXml - \nextpage Phonon Module \ingroup modules \brief The QtXmlPatterns module provides support for XPath, @@ -537,9 +501,6 @@ \page phonon-module.html \module Phonon \title Phonon Module - \contentspage All Modules - \previouspage QtXmlPatterns - \nextpage Qt3Support \ingroup modules \brief The Phonon module contains namespaces and classes for multimedia functionality. @@ -607,9 +568,6 @@ /*! \module Qt3Support \title Qt3Support Module - \contentspage All Modules - \previouspage Phonon Module - \nextpage QtDesigner \ingroup modules \keyword Qt3Support @@ -640,9 +598,6 @@ /*! \module QtDesigner \title QtDesigner Module - \contentspage All Modules - \previouspage Qt3Support - \nextpage QtUiTools \ingroup modules \brief The QtDesigner module provides classes that allow you to @@ -667,9 +622,6 @@ \module QtUiTools \title QtUiTools Module \since 4.1 - \contentspage All Modules - \previouspage QtDesigner - \nextpage QtHelp \ingroup modules \brief The QtUiTools module provides classes to handle forms created @@ -703,9 +655,6 @@ /*! \module QtHelp \title QtHelp Module - \contentspage All Modules - \previouspage QtUiTools - \nextpage QtTest \ingroup modules \brief The QtHelp module provides classes for integrating @@ -762,9 +711,6 @@ /*! \module QtTest \title QtTest Module - \contentspage All Modules - \previouspage QtHelp - \nextpage QAxContainer \ingroup modules \keyword QtTest @@ -792,9 +738,6 @@ /*! \module QAxContainer \title QAxContainer Module - \contentspage All Modules - \previouspage QtTest - \nextpage QAxServer \ingroup modules \brief The QAxContainer module is a Windows-only extension for @@ -844,9 +787,6 @@ /*! \module QAxServer \title QAxServer Module - \contentspage All Modules - \previouspage QAxContainer - \nextpage QtDBus module \ingroup modules \brief The QAxServer module is a Windows-only static library that @@ -896,8 +836,6 @@ /*! \module QtDBus \title QtDBus module - \contentspage All Modules - \previouspage QAxServer \ingroup modules \keyword QtDBus -- cgit v0.12 From ac355872573c7131e4b783cabe00c5656dc668af Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Mon, 9 Aug 2010 10:14:27 +0200 Subject: Fixed missing link tag in declarativeui.qdoc. Fix for QTBUG-12750 --- doc/src/declarative/declarativeui.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc index 1fc9d69..b25d000 100644 --- a/doc/src/declarative/declarativeui.qdoc +++ b/doc/src/declarative/declarativeui.qdoc @@ -43,7 +43,7 @@ C++ module, you can load and interact with QML files from your Qt application. QML provides mechanisms to declaratively build an object tree using \l {QML Elements}{QML elements}. QML improves the integration between -{http://www.ecma-international.org/publications/standards/Ecma-262.htm}{JavaScript} +\l {http://www.ecma-international.org/publications/standards/Ecma-262.htm}{JavaScript} and Qt's existing QObject based type system, adds support for automatic \l {Property Binding}{property bindings} and provides \l {Network Transparency}{network transparency} -- cgit v0.12 From c5fa9eb1cb02d979502e2c9918d752c6708fb406 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Mon, 9 Aug 2010 10:31:16 +0200 Subject: Fix scrollbar randomly popping up in QPlainTextEdit When a line break was detected, we would retain the value of the right bearing for the character after the break instead of resetting it to the right bearing of the previous value. This could in some cases cause the bounding rect of the text to be wrong, and could cause unnecessary horizontal scrollbars to pop up. It was especially visible when using WrapAnywhere. Visible e.g. in the compile output in Creator. Done-by: mae Reviewed-by: Eskil Reviewed-by: Lars --- src/gui/text/qtextlayout.cpp | 21 +++++++++++++++++---- tests/auto/qtextlayout/tst_qtextlayout.cpp | 30 ++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 5a11c87..da43913 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -1709,14 +1709,18 @@ namespace { return glyphs.glyphs[logClusters[currentPosition - 1]]; } + inline void adjustRightBearing(glyph_t glyph) + { + qreal rb; + fontEngine->getGlyphBearings(glyph, 0, &rb); + rightBearing = qMin(QFixed(), QFixed::fromReal(rb)); + } + inline void adjustRightBearing() { if (currentPosition <= 0) return; - - qreal rb; - fontEngine->getGlyphBearings(currentGlyph(), 0, &rb); - rightBearing = qMin(QFixed(), QFixed::fromReal(rb)); + adjustRightBearing(currentGlyph()); } inline void resetRightBearing() @@ -1901,6 +1905,9 @@ void QTextLine::layout_helper(int maxGlyphs) } else { lbh.whiteSpaceOrObject = false; bool sb_or_ws = false; + glyph_t previousGlyph = 0; + if (lbh.currentPosition > 0 && lbh.logClusters[lbh.currentPosition - 1] line.width) lbh.adjustRightBearing(); if (lbh.checkFullOtherwiseExtend(line)) { + // we are too wide, fix right bearing + if (rightBearing <= 0) + lbh.rightBearing = rightBearing; // take from cache + else if (previousGlyph > 0) + lbh.adjustRightBearing(previousGlyph); if (!breakany) { line.textWidth += lbh.softHyphenWidth; } diff --git a/tests/auto/qtextlayout/tst_qtextlayout.cpp b/tests/auto/qtextlayout/tst_qtextlayout.cpp index f798faf..659ba1a 100644 --- a/tests/auto/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/qtextlayout/tst_qtextlayout.cpp @@ -122,6 +122,7 @@ private slots: void smallTextLengthWrapAtWordBoundaryOrAnywhere(); void testLineBreakingAllSpaces(); void lineWidthFromBOM(); + void textWidthVsWIdth(); private: @@ -1359,5 +1360,34 @@ void tst_QTextLayout::glyphLessItems() } } +void tst_QTextLayout::textWidthVsWIdth() +{ + QTextLayout layout; + QTextOption opt; + opt.setWrapMode(QTextOption::WrapAnywhere); + layout.setTextOption(opt); + layout.setText(QString::fromLatin1( + "g++ -c -m64 -pipe -g -fvisibility=hidden -fvisibility-inlines-hidden -Wall -W -D_REENTRANT -fPIC -DCORE_LIBRARY -DIDE_LIBRARY_BASENAME=\"lib\" -DWITH_TESTS " + "-DQT_NO_CAST_TO_ASCII -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_FAST_CONCATENATION -DQT_PLUGIN -DQT_TESTLIB_LIB -DQT_SCRIPT_LIB -DQT_SVG_LIB -DQT_SQL_LIB -DQT_XM" + "L_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED -I../../../../qt-qml/mkspecs/linux-g++-64 -I. -I../../../../qt-qml/include/QtCore -I../../../." + "./qt-qml/include/QtNetwork -I../../../../qt-qml/include/QtGui -I../../../../qt-qml/include/QtXml -I../../../../qt-qml/include/QtSql -I../../../../qt-qml/inc" + "lude/QtSvg -I../../../../qt-qml/include/QtScript -I../../../../qt-qml/include/QtTest -I../../../../qt-qml/include -I../../../../qt-qml/include/QtHelp -I../." + "./libs -I/home/ettrich/dev/creator/tools -I../../plugins -I../../shared/scriptwrapper -I../../libs/3rdparty/botan/build -Idialogs -Iactionmanager -Ieditorma" + "nager -Iprogressmanager -Iscriptmanager -I.moc/debug-shared -I.uic -o .obj/debug-shared/sidebar.o sidebar.cpp")); + + // textWidth includes right bearing, but it should never be LARGER than width if there is space for at least one character + for (int width = 100; width < 1000; ++width) { + layout.beginLayout(); + QTextLine line = layout.createLine(); + line.setLineWidth(width); + layout.endLayout(); + + qreal textWidthIsLargerBy = qMax(qreal(0), line.naturalTextWidth() - line.width()); + qreal thisMustBeZero = 0; + QCOMPARE(textWidthIsLargerBy, thisMustBeZero); + } +} + + QTEST_MAIN(tst_QTextLayout) #include "tst_qtextlayout.moc" -- cgit v0.12 From 94244ea3c5edf57d4dc258381d37bc99fc23ed0d Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 10:43:46 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/declarative/example-slideswitch.qdoc | 2 +- doc/src/tutorials/modelview.qdoc | 4 ++-- src/declarative/graphicsitems/qdeclarativeitem.cpp | 2 +- src/declarative/qml/qdeclarativeimageprovider.cpp | 2 +- src/declarative/util/qdeclarativestate.cpp | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/src/declarative/example-slideswitch.qdoc b/doc/src/declarative/example-slideswitch.qdoc index f056892..1a40f14 100644 --- a/doc/src/declarative/example-slideswitch.qdoc +++ b/doc/src/declarative/example-slideswitch.qdoc @@ -115,7 +115,7 @@ For more information on scripts see \l{Integrating JavaScript}. At this point, when the switch toggles between the two states the knob will instantly change its \c x position between 1 and 78. In order for the the knob to move smoothly we add a transition that will animate the \c x property with an easing curve for a duration of 200ms. -For more information on transitions see \l{state-transitions}{QML Transitions}. +For more information on transitions see \l{qdeclarativeanimation.html#transitions}{QML Transitions}. \section1 Usage The switch can be used in a QML file, like this: diff --git a/doc/src/tutorials/modelview.qdoc b/doc/src/tutorials/modelview.qdoc index 98096a0..b39a01c 100755 --- a/doc/src/tutorials/modelview.qdoc +++ b/doc/src/tutorials/modelview.qdoc @@ -80,8 +80,8 @@ /*! \page modelview-part1.html - \contentspage {modelview-index.html}{Model/View Contents} - \previouspage {modelview-index.html}{Model/View Contents} + \contentspage {modelview.html}{Model/View Contents} + \previouspage {modelview.html}{Model/View Contents} \nextpage {modelview-part2.html}{Developing a Simple Model/View Application} \title An Introduction to Model/View Programming diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index ff05997..5872585 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -2454,7 +2454,7 @@ QDeclarativeListProperty QDeclarativeItemPrivate::states() } \endqml - \sa {state-transitions}{Transitions} + \sa {qdeclarativeanimation.html#transitions}{QML Transitions} */ diff --git a/src/declarative/qml/qdeclarativeimageprovider.cpp b/src/declarative/qml/qdeclarativeimageprovider.cpp index 241df87..da5b65e 100644 --- a/src/declarative/qml/qdeclarativeimageprovider.cpp +++ b/src/declarative/qml/qdeclarativeimageprovider.cpp @@ -59,7 +59,7 @@ public: \list \o Loaded using QPixmaps rather than actual image files - \o Loaded asynchronously in a separate thread, if imageType() is \l ImageType::Image + \o Loaded asynchronously in a separate thread, if imageType() is \l Image \endlist To specify that an image should be loaded by an image provider, use the diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index 7a78a2b..028bacb 100644 --- a/src/declarative/util/qdeclarativestate.cpp +++ b/src/declarative/util/qdeclarativestate.cpp @@ -160,7 +160,8 @@ QDeclarativeStateOperation::QDeclarativeStateOperation(QObjectPrivate &dd, QObje \note Setting the state of an object from within another state of the same object is not allowed. - \sa {declarative/animation/states}{states example}, {qmlstates}{States}, {state-transitions}{Transitions}, QtDeclarative + \sa {declarative/animation/states}{states example}, {qmlstates}{States}, + {qdeclarativeanimation.html#transitions}{QML Transitions}, QtDeclarative */ /*! -- cgit v0.12 From 362641ec2bdf5e05b4adfc54275c1c4869759d56 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 9 Aug 2010 11:01:45 +0200 Subject: Doc: typo fixed in qlibraryinfo.cpp Reviewed-by: TrustMe --- src/corelib/global/qlibraryinfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index a9ea44a..4b56efc 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -467,7 +467,7 @@ QLibraryInfo::location(LibraryLocation loc) \value PrefixPath The default prefix for all paths. \value DocumentationPath The location for documentation upon install. \value HeadersPath The location for all headers. - \value LibrariesPath The location of installed librarires. + \value LibrariesPath The location of installed libraries. \value BinariesPath The location of installed Qt binaries (tools and applications). \value PluginsPath The location of installed Qt plugins. \value DataPath The location of general Qt data. -- cgit v0.12 From 3ed0f33f7a8a5697d55faf8e4ce8fb003d4f8b93 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Mon, 9 Aug 2010 11:16:40 +0200 Subject: Doc: removing reduntant text from the index page --- doc/src/index.qdoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index f890aa6..ded57f5 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -94,14 +94,14 @@
    -- cgit v0.12 From 66a6183dc30ca1d572274695707f16b84325b459 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 11:23:35 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/widgets-and-layouts/layout.qdoc | 4 ++-- doc/src/widgets-and-layouts/styles.qdoc | 2 +- doc/src/widgets-and-layouts/stylesheet.qdoc | 2 +- doc/src/widgets-and-layouts/widgets.qdoc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/src/widgets-and-layouts/layout.qdoc b/doc/src/widgets-and-layouts/layout.qdoc index 798a7a1..d2687ea 100644 --- a/doc/src/widgets-and-layouts/layout.qdoc +++ b/doc/src/widgets-and-layouts/layout.qdoc @@ -37,9 +37,9 @@ \brief A tour of the standard layout managers and an introduction to custom layouts. - \previouspage Widget Classes + \previouspage Widgets and Layouts \contentspage Widgets and Layouts - \nextpage {Implementing Styles and Style Aware Widgets}{Styles} + \nextpage {Styles and Style Aware Widgets}{Styles} \ingroup frameworks-technologies diff --git a/doc/src/widgets-and-layouts/styles.qdoc b/doc/src/widgets-and-layouts/styles.qdoc index eab7014..180260b 100644 --- a/doc/src/widgets-and-layouts/styles.qdoc +++ b/doc/src/widgets-and-layouts/styles.qdoc @@ -33,7 +33,7 @@ /*! \page style-reference.html - \title Styles & Style Aware Widgets + \title Styles and Style Aware Widgets \ingroup qt-gui-concepts \brief Styles and the styling of widgets. diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc index 1390376..475de3d 100644 --- a/doc/src/widgets-and-layouts/stylesheet.qdoc +++ b/doc/src/widgets-and-layouts/stylesheet.qdoc @@ -32,7 +32,7 @@ \ingroup frameworks-technologies - \previouspage {Implementing Styles and Style Aware Widgets}{Styles} + \previouspage {Styles and Style Aware Widgets}{Styles} \contentspage Widgets and Layouts \nextpage The Style Sheet Syntax diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc index f2475c2..baf3dce 100644 --- a/doc/src/widgets-and-layouts/widgets.qdoc +++ b/doc/src/widgets-and-layouts/widgets.qdoc @@ -68,7 +68,7 @@ \section1 Widget Styles - \l{Styles & Style Aware Widgets}{Styles} draw on behalf of + \l{Styles and Style Aware Widgets}{Styles} draw on behalf of widgets and encapsulate the look and feel of a GUI. Qt's built-in widgets use the QStyle class to perform nearly all of their drawing, ensuring that they look exactly like the equivalent native widgets. -- cgit v0.12 From 4f2f48caae2ae18336bff10bb1e1ab07f2dd4650 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Mon, 9 Aug 2010 11:49:43 +0200 Subject: doc: Clarify documentation of QStaticText There has been some confusion concerning what HTML tags can be used when using the rich text format with QStaticText. This patch attempts to make it clearer in the documentation that the tags have to be text related. Reviewed-by: Samuel --- src/gui/text/qstatictext.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 7396bcd..21c2e02 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -109,10 +109,18 @@ QT_BEGIN_NAMESPACE QPainter::drawStaticText() and can change from call to call with a minimal impact on performance. - QStaticText will attempt to guess the format of the input text using Qt::mightBeRichText(). - To force QStaticText to display its contents as either plain text or rich text, use the - function QStaticText::setTextFormat() and pass in, respectively, Qt::PlainText and - Qt::RichText. + For extra convenience, it is possible to apply formatting to the text using the HTML subset + supported by QTextDocument. QStaticText will attempt to guess the format of the input text using + Qt::mightBeRichText(), and interpret it as rich text if this function returns true. To force + QStaticText to display its contents as either plain text or rich text, use the function + QStaticText::setTextFormat() and pass in, respectively, Qt::PlainText and Qt::RichText. + + QStaticText can only represent text, so only HTML tags which alter the layout or appearance of + the text will be respected. Adding an image to the input HTML, for instance, will cause the + image to be included as part of the layout, affecting the positions of the text glyphs, but it + will not be displayed. The result will be an empty area the size of the image in the output. + Similarly, using tables will cause the text to be laid out in table format, but the borders + will not be drawn. If it's the first time the static text is drawn, or if the static text, or the painter's font has been altered since the last time it was drawn, the text's layout has to be -- cgit v0.12 From ddd2a54224e651ff45af834201eec1be2c56d583 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 9 Aug 2010 11:58:40 +0200 Subject: QtDeclarative: get rid of warnings in public header warning: use of old-style cast Reviewed-by: brad --- src/declarative/qml/qdeclarativelist.h | 8 ++++---- src/declarative/qml/qdeclarativeprivate.h | 4 ++-- tests/auto/compilerwarnings/test_cpp.txt | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h index 399b2a1..c10bc11 100644 --- a/src/declarative/qml/qdeclarativelist.h +++ b/src/declarative/qml/qdeclarativelist.h @@ -98,16 +98,16 @@ public: private: static void qlist_append(QDeclarativeListProperty *p, T *v) { - ((QList *)p->data)->append(v); + reinterpret_cast *>(p->data)->append(v); } static int qlist_count(QDeclarativeListProperty *p) { - return ((QList *)p->data)->count(); + return reinterpret_cast *>(p->data)->count(); } static T *qlist_at(QDeclarativeListProperty *p, int idx) { - return ((QList *)p->data)->at(idx); + return reinterpret_cast *>(p->data)->at(idx); } static void qlist_clear(QDeclarativeListProperty *p) { - return ((QList *)p->data)->clear(); + return reinterpret_cast *>(p->data)->clear(); } }; #endif diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h index cb916bf..d45ddbc 100644 --- a/src/declarative/qml/qdeclarativeprivate.h +++ b/src/declarative/qml/qdeclarativeprivate.h @@ -105,7 +105,7 @@ namespace QDeclarativePrivate template struct StaticCastSelectorClass { - static inline int cast() { return (int)((intptr_t)static_cast((From *)0x10000000)) - 0x10000000; } + static inline int cast() { return int(reinterpret_cast(static_cast(reinterpret_cast(0x10000000)))) - 0x10000000; } }; template @@ -119,7 +119,7 @@ namespace QDeclarativePrivate static inline int cast() { - return StaticCastSelectorClass::cast(); + return StaticCastSelectorClass(0)))>::cast(); } }; diff --git a/tests/auto/compilerwarnings/test_cpp.txt b/tests/auto/compilerwarnings/test_cpp.txt index 62b35eb..1d317b8 100644 --- a/tests/auto/compilerwarnings/test_cpp.txt +++ b/tests/auto/compilerwarnings/test_cpp.txt @@ -58,6 +58,9 @@ #include #endif +#include + + #ifndef Q_OS_MAC int main(int, char **) { -- cgit v0.12 From f45c6c61a0967468b1b80375d8c72db4f4fec438 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 12:18:53 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/examples/qml-examples.qdoc | 2 +- doc/src/examples/simpletreemodel.qdoc | 16 +++++++++------- doc/src/examples/spinboxdelegate.qdoc | 5 +++-- doc/src/objectmodel/metaobjects.qdoc | 3 ++- doc/src/objectmodel/properties.qdoc | 3 ++- doc/src/painting-and-printing/paintsystem.qdoc | 6 +++--- doc/src/windows-and-dialogs/dialogs.qdoc | 2 +- src/gui/styles/qstyle.cpp | 2 +- 8 files changed, 22 insertions(+), 17 deletions(-) diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc index 8d3aa25..0d191c9 100644 --- a/doc/src/examples/qml-examples.qdoc +++ b/doc/src/examples/qml-examples.qdoc @@ -562,7 +562,7 @@ \example declarative/ui-components/dialcontrol This example shows how to create a dial-type control. It combines - \l Image elements with \l Rotation transforms and \l SpringAnimatino behaviors + \l Image elements with \l Rotation transforms and \l SpringAnimation behaviors to produce an interactive speedometer-type dial. \image qml-dialcontrol-example.png diff --git a/doc/src/examples/simpletreemodel.qdoc b/doc/src/examples/simpletreemodel.qdoc index c34f4af..16cf8b7 100644 --- a/doc/src/examples/simpletreemodel.qdoc +++ b/doc/src/examples/simpletreemodel.qdoc @@ -36,13 +36,15 @@ \image simpletreemodel-example.png - Qt's model/view architecture provides a standard way for views to manipulate - information in a data source, using an abstract model of the data to - simplify and standardize the way it is accessed. Simple models represent - data as a table of items, and allow views to access this data via an - \l{model-view-model.html}{index-based} system. More generally, models can - be used to represent data in the form of a tree structure by allowing each - item to act as a parent to a table of child items. + Qt's model/view architecture provides a standard way for views to + manipulate information in a data source, using an abstract model + of the data to simplify and standardize the way it is accessed. + Simple models represent data as a table of items, and allow views + to access this data via an + \l{model-view-programming.html#model-indexes} {index-based} + system. More generally, models can be used to represent data in + the form of a tree structure by allowing each item to act as a + parent to a table of child items. Before attempting to implement a tree model, it is worth considering whether the data is supplied by an external source, or whether it is going to be diff --git a/doc/src/examples/spinboxdelegate.qdoc b/doc/src/examples/spinboxdelegate.qdoc index 49e3295..da65831 100644 --- a/doc/src/examples/spinboxdelegate.qdoc +++ b/doc/src/examples/spinboxdelegate.qdoc @@ -42,8 +42,9 @@ \image spinboxdelegate-example.png This concepts behind this example are covered in the - \l{model-view-delegate.html}{Delegate Classes} chapter of the - \l{model-view-programming.html}{Model/View Programming} overview. + \l{model-view-programming.html#delegate-classes}{Delegate Classes} + chapter of the \l{model-view-programming.html}{Model/View + Programming} overview. \section1 SpinBoxDelegate Class Definition diff --git a/doc/src/objectmodel/metaobjects.qdoc b/doc/src/objectmodel/metaobjects.qdoc index dd00c5e..0597cd6 100644 --- a/doc/src/objectmodel/metaobjects.qdoc +++ b/doc/src/objectmodel/metaobjects.qdoc @@ -28,8 +28,9 @@ /*! \page metaobjects.html \title The Meta-Object System - \ingroup qt-basic-concepts \brief An overview of Qt's meta-object system and introspection capabilities. + + \ingroup qt-basic-concepts \keyword meta-object \target Meta-Object System diff --git a/doc/src/objectmodel/properties.qdoc b/doc/src/objectmodel/properties.qdoc index 356aaaf..dca332e 100644 --- a/doc/src/objectmodel/properties.qdoc +++ b/doc/src/objectmodel/properties.qdoc @@ -28,8 +28,9 @@ /*! \page properties.html \title The Property System - \ingroup qt-basic-concepts \brief An overview of Qt's property system. + + \ingroup qt-basic-concepts \target Qt's Property System Qt provides a sophisticated property system similar to the ones diff --git a/doc/src/painting-and-printing/paintsystem.qdoc b/doc/src/painting-and-printing/paintsystem.qdoc index e5eb75d..4c6fd91 100644 --- a/doc/src/painting-and-printing/paintsystem.qdoc +++ b/doc/src/painting-and-printing/paintsystem.qdoc @@ -273,7 +273,7 @@ \previouspage Paint Devices and Backends \contentspage The Paint System - \nextpage The Coordinate System + \nextpage Coordinate System \section1 Drawing @@ -395,7 +395,7 @@ \page paintsystem-images.html \title Reading and Writing Image Files - \previouspage The Coordinate System + \previouspage Coordinate System \contentspage The Paint System \nextpage Styling @@ -554,5 +554,5 @@ \endtable For more information about widget styling and appearance, see the - \l{Styles & Style Aware Widgets}. + \l{Styles and Style Aware Widgets}. */ diff --git a/doc/src/windows-and-dialogs/dialogs.qdoc b/doc/src/windows-and-dialogs/dialogs.qdoc index 74df2aa..f6649fd 100644 --- a/doc/src/windows-and-dialogs/dialogs.qdoc +++ b/doc/src/windows-and-dialogs/dialogs.qdoc @@ -43,7 +43,7 @@ \ingroup qt-gui-concepts \brief An overview over dialog windows. - \previouspage The Application Main Window + \previouspage Application Main Window \contentspage Application Windows and Dialogs \nextpage Desktop Integration diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp index 687e587..0a75492 100644 --- a/src/gui/styles/qstyle.cpp +++ b/src/gui/styles/qstyle.cpp @@ -325,7 +325,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C control over size of header items and row and column sizes. \sa QStyleOption, QStylePainter, {Styles Example}, - {Styles & Style Aware Widgets}, QStyledItemDelegate + {Styles and Style Aware Widgets}, QStyledItemDelegate */ /*! -- cgit v0.12 From 58d78590fc29fd6695d60eaf50af604bd1f75588 Mon Sep 17 00:00:00 2001 From: Victor Ostashevsky Date: Mon, 9 Aug 2010 12:49:09 +0200 Subject: Add Ukrainian translation. Merge-request: 761 Reviewed-by: Oswald Buddenhagen --- translations/assistant_uk.ts | 969 +++++++ translations/designer_uk.ts | 5783 ++++++++++++++++++++++++++++++++++++++++++ translations/linguist_uk.ts | 1602 ++++++++++++ translations/qt_help_uk.ts | 320 +++ translations/qtconfig_uk.ts | 717 ++++++ translations/qvfb_uk.ts | 276 ++ 6 files changed, 9667 insertions(+) create mode 100644 translations/assistant_uk.ts create mode 100644 translations/designer_uk.ts create mode 100644 translations/linguist_uk.ts create mode 100644 translations/qt_help_uk.ts create mode 100644 translations/qtconfig_uk.ts create mode 100644 translations/qvfb_uk.ts diff --git a/translations/assistant_uk.ts b/translations/assistant_uk.ts new file mode 100644 index 0000000..78fd59d --- /dev/null +++ b/translations/assistant_uk.ts @@ -0,0 +1,969 @@ + + + + + AboutDialog + + &Close + &Закрити + + + + AboutLabel + + Warning + Попередження + + + Unable to launch external application. + + Неможливо запустити зовнішню програму. + + + + OK + OK + + + + Assistant + + Error registering documentation file '%1': %2 + Помилка реєстрації файлу документації '%1': %2 + + + Error: %1 + Помилка: %1 + + + Could not register documentation file +%1 + +Reason: +%2 + Не можу зареєструвати файл документації +%1 + +Причина: +%2 + + + Documentation successfully registered. + Документацію успішно зареєстровано. + + + Could not unregister documentation file +%1 + +Reason: +%2 + Не можу скасувати реєстрацію файлу документації +%1 + +Причина: +%2 + + + Documentation successfully unregistered. + Реєстрацію документації успішно скасовано. + + + Error reading collection file '%1': %2. + Помилка читання файлу колекції '%1': %2. + + + Error creating collection file '%1': %2. + Помилка створення файлу колекції '%1': %2. + + + Error reading collection file '%1': %2 + Помилка читання файлу колекції '%1': %2 + + + Cannot load sqlite database driver! + Не можу завантажити драйвер бази даний SQLite! + + + + BookmarkDialog + + Add Bookmark + Додати закладку + + + Bookmark: + Закладка: + + + Add in Folder: + Додати в теку: + + + + + + + + + New Folder + Нова тека + + + Rename Folder + Перейменувати теку + + + + BookmarkManager + + Untitled + Без назви + + + Remove + Видалити + + + You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? + Ви збираєтесь видалити теку, що призведе до видалення її змісту.<br>Ви впевнені, що хочете продовжити? + + + Manage Bookmarks... + Керування закладками... + + + Add Bookmark... + Додати закладку... + + + Ctrl+D + + + + Delete Folder + Видалити теку + + + Rename Folder + Перейменувати теку + + + Show Bookmark + Показати закладку + + + Show Bookmark in New Tab + Показати закладку в новій вкладці + + + Delete Bookmark + Видалити закладку + + + Rename Bookmark + Перейменувати закладку + + + + BookmarkManagerWidget + + Manage Bookmarks + Керування закладками + + + Search: + Пошук: + + + Remove + Видалити + + + Import and Backup + Імпорт та резервування + + + OK + OK + + + Import... + Імпортувати... + + + Export... + Експортувати... + + + Open File + Відкрити файл + + + Files (*.xbel) + Файли (*.xbel) + + + Save File + Зберегти файл + + + Qt Assistant + Qt Assistant + + + Unable to save bookmarks. + Не можу зберегти закладки. + + + You are goingto delete a Folder, this will also<br> remove it's content. Are you sure to continue? + Ви збираєтесь видалити теку, що призведе до видалення її змісту.<br>Ви впевнені, що хочете продовжити? + + + Delete Folder + Видалити теку + + + Rename Folder + Перейменувати теку + + + Show Bookmark + Показати закладку + + + Show Bookmark in New Tab + Показати закладку в новій вкладці + + + Delete Bookmark + Видалити закладку + + + Rename Bookmark + Перейменувати закладку + + + + BookmarkModel + + Name + Ім'я + + + Address + Адреса + + + Bookmarks Menu + Меню закладок + + + + BookmarkWidget + + Bookmarks + Закладки + + + Filter: + Фільтр: + + + Add + Додати + + + Remove + Видалити + + + + CentralWidget + + Add new page + Додати нову сторінку + + + Close current page + Закрити поточну сторінку + + + Print Document + Друкувати документ + + + unknown + невідомо + + + Add New Page + Додати нову сторінку + + + Close This Page + Закрити цю сторінку + + + Close Other Pages + Закрити інші сторінки + + + Add Bookmark for this Page... + Додати закладку для цієї сторінки... + + + Search + Пошук + + + + CmdLineParser + + Unknown option: %1 + Невідома опція: %1 + + + The collection file '%1' does not exist. + Файл колекції '%1' не існує. + + + Missing collection file. + Відсутній файл колекції. + + + Invalid URL '%1'. + Неправильний URL '%1'. + + + Missing URL. + URL відсутній. + + + Unknown widget: %1 + Невідомий віджет: %1 + + + Missing widget. + Відсутній віджет. + + + The Qt help file '%1' does not exist. + Файл довідки Qt '%1' не існує. + + + Missing help file. + Відсутній файл довідки. + + + Missing filter argument. + Відсутній аргумент фільтру. + + + Error + Помилка + + + Notice + Примітка + + + + ContentWindow + + Open Link + Відкрити посилання + + + Open Link in New Tab + Відкрити посилання в новій вкладці + + + + FilterNameDialogClass + + Add Filter Name + Додати назву фільтру + + + Filter Name: + Назва фільтру: + + + + FindWidget + + Previous + Попередній + + + Next + Наступний + + + Case Sensitive + Враховувати регістр + + + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Пошук з початку + + + + FontPanel + + Font + Шрифт + + + &Writing system + Система &письма + + + &Family + &Шрифт + + + &Style + &Стиль + + + &Point size + &Розмір + + + + HelpViewer + + <title>about:blank</title> + <title>about:blank</title> + + + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> + <title>Помилка 404...</title><div align="center"><br><br><h1>Неможливо знайти сторінку</h1><br><h3>'%1'</h3></div> + + + Copy &Link Location + Копіювати &адресу посилання + + + Open Link in New Tab Ctrl+LMB + Відкрити посилання в новій вкладці Ctrl+LMB + + + Open Link in New Tab + Відкрити посилання в новій вкладці + + + + IndexWindow + + &Look for: + + + + Open Link + Відкрити посилання + + + Open Link in New Tab + Відкрити посилання в новій вкладці + + + + InstallDialog + + Install Documentation + Встановити документацію + + + Available Documentation: + Доступна документація: + + + Install + Встановити + + + Cancel + Скасувати + + + Close + Закрити + + + Installation Path: + Шлях встановлення: + + + ... + ... + + + Downloading documentation info... + Завантажую інформацію про документацію... + + + Download canceled. + Завантаження скасоване. + + + Done. + Виконано. + + + The file %1 already exists. Do you want to overwrite it? + Файл %1 вже існує. Бажаєте перезаписати? + + + Unable to save the file %1: %2. + Не можу зберегти файл %1: %2. + + + Downloading %1... + Завантажую %1... + + + Download failed: %1. + Завантаження провалилось: %1. + + + Documentation info file is corrupt! + Файл інформації про документації пошкоджений! + + + Download failed: Downloaded file is corrupted. + Завантаження провалилось: Завантажений файл пошкоджений. + + + Installing documentation %1... + Встановлюю документацію %1... + + + Error while installing documentation: +%1 + Помилка під час встановлення документації: +%1 + + + + MainWindow + + Index + Індекс + + + Contents + Зміст + + + Bookmarks + Закладки + + + Qt Assistant + Qt Assistant + + + Looking for Qt Documentation... + + + + &File + &Файл + + + New &Tab + &Нова вкладка + + + Page Set&up... + Параметри &сторінки... + + + Print Preview... + Попередній перегляд... + + + &Print... + &Друк... + + + &Close Tab + &Закрити вкладку + + + &Quit + Ви&йти + + + CTRL+Q + + + + &Edit + &Правка + + + &Copy selected Text + &Копіювати виділений текст + + + &Find in Text... + Пошук в &тексті... + + + &Find + По&шук + + + Find &Next + Знайти &наступне + + + Find &Previous + Знайти &попереднє + + + Preferences... + Налаштування... + + + &View + &Вид + + + Zoom &in + З&більшити + + + Zoom &out + З&меншити + + + Normal &Size + &Нормальний розмір + + + Ctrl+0 + + + + ALT+C + + + + ALT+I + + + + ALT+O + + + + Search + Пошук + + + ALT+S + + + + &Go + П&ерейти + + + &Home + &Додому + + + ALT+Home + + + + &Back + &Назад + + + &Forward + &Вперед + + + Sync with Table of Contents + Синхронізувати зі змістом + + + Sync + Синхронізувати + + + Next Page + Наступна сторінка + + + Ctrl+Alt+Right + + + + Previous Page + Попередня сторінка + + + Ctrl+Alt+Left + + + + &Bookmarks + &Закладки + + + &Help + &Довідка + + + About... + Про... + + + Navigation Toolbar + Панель навігації + + + &Window + В&ікно + + + Zoom + Масштабувати + + + Minimize + Мінімізувати + + + Ctrl+M + + + + Toolbars + Панелі + + + Filter Toolbar + Панель фільтру + + + Filtered by: + Фільтрувати по: + + + Address Toolbar + Панель адреси + + + Address: + Адреса: + + + Could not find the associated content item. + Не вдалось знайти елемент, пов'язаний зі змістом. + + + About %1 + Про %1 + + + Updating search index + Оновлюється індекс пошуку + + + Could not register file '%1': %2 + Не можу зареєструвати файл '%1': %2 + + + + PreferencesDialog + + Add Documentation + Додати документацію + + + Qt Compressed Help Files (*.qch) + Стиснені файли довідки Qt (*.qch) + + + The namespace %1 is already registered! + Простір імен %1 вже зареєстровано! + + + The specified file is not a valid Qt Help File! + Вказаний файл не є коректним файлом довідки Qt! + + + Remove Documentation + Видалити документацію + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + Деякі документи, що зараз відкриті в Assistant пов'язані з документацією, яку ви намагаєтесь видалити. Видалення документації призведе до закриття цих документів. + + + Cancel + Скасувати + + + OK + OK + + + Use custom settings + Використовувати налаштування користувача + + + + PreferencesDialogClass + + Preferences + Налаштування + + + Fonts + Шрифти + + + Font settings: + Параметри шрифту: + + + Browser + Навігатор + + + Application + Додаток + + + Filters + Фільтри + + + Filter: + Фільтр: + + + Attributes: + Атрибути: + + + 1 + 1 + + + Add + Додати + + + Remove + Видалити + + + Documentation + Документація + + + Registered Documentation: + Зареєстрована документація: + + + Add... + Додати... + + + Options + Опції + + + On help start: + При запуску довідки: + + + Show my home page + Показувати мою домашню сторінку + + + Show a blank page + Показувати пусту сторінку + + + Show my tabs from last session + Показувати вкладку з минулого сеансу + + + Homepage + Домашня сторінка + + + Current Page + Поточна сторінка + + + Blank Page + Пуста сторінка + + + Restore to default + Відновити типово + + + + RemoteControl + + Debugging Remote Control + Зневадження віддаленого управління + + + Received Command: %1 %2 + Отримано команду: %1 %2 + + + + SearchWidget + + &Copy + &Копіювати + + + Copy &Link Location + Копіювати &адресу посилання + + + Open Link in New Tab + Відкрити посилання в новій вкладці + + + Select All + Виділити все + + + + TopicChooser + + Choose Topic + Оберіть тему + + + &Topics + &Теми + + + &Display + &Показати + + + &Close + &Закрити + + + Choose a topic for <b>%1</b>: + Оберіть тему для <b>%1</b>: + + + diff --git a/translations/designer_uk.ts b/translations/designer_uk.ts new file mode 100644 index 0000000..24b2a44 --- /dev/null +++ b/translations/designer_uk.ts @@ -0,0 +1,5783 @@ + + + + + AbstractFindWidget + + &Previous + &Попередній + + + &Next + &Наступний + + + &Case sensitive + Враховувати &регістр + + + Whole &words + Цілі &слова + + + <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped + <img src=":/trolltech/shared/images/wrap.png">&nbsp;Пошук з початку + + + + AddLinkDialog + + Insert Link + Вставити посилання + + + Title: + Заголовок: + + + URL: + URL: + + + + AppFontDialog + + Additional Fonts + Додаткові шрифти + + + + AppFontManager + + '%1' is not a file. + '%1' не є файлом. + + + The font file '%1' does not have read permissions. + Файл шрифту '%1' не доступний для читання. + + + The font file '%1' is already loaded. + Файл шрифти '%1' вже завантажено. + + + The font file '%1' could not be loaded. + Неможливо завантажити файл шрифт '%1'. + + + '%1' is not a valid font id. + '%1' не є правильним ідентифікатором шрифт. + + + There is no loaded font matching the id '%1'. + Відсутній завантажений шрифт, що відповідає ідентифікатору '%1'. + + + The font '%1' (%2) could not be unloaded. + Неможливо вивантажити шрифт '%1' (%2). + + + + AppFontWidget + + Fonts + Шрифти + + + Add font files + Додати файли шрифтів + + + Remove current font file + Видалити поточний файл шрифт + + + Remove all font files + Видалити усі файли шрифтів + + + Add Font Files + Додати файли шрифтів + + + Font files (*.ttf) + Файли шрифтів (*.ttf) + + + Error Adding Fonts + Помилка додавання шрифтів + + + Error Removing Fonts + Помилка видалення шрифтів + + + Remove Fonts + Видалити шрифти + + + Would you like to remove all fonts? + Бажаєте видалити усі шрифти? + + + + AppearanceOptionsWidget + + Form + Форма + + + User Interface Mode + Режим інтерфейсу користувача + + + + AssistantClient + + Unable to send request: Assistant is not responding. + Неможливо надіслати запит. Assistant не відповідає. + + + The binary '%1' does not exist. + Виконуваний файл '%1' не існує. + + + Unable to launch assistant (%1). + Неможливо запустити Assistant (%1). + + + + BrushPropertyManager + + No brush + Без пензля + + + Solid + Суцільна + + + Dense 1 + Густина 1 + + + Dense 2 + Густина 2 + + + Dense 3 + Густина 3 + + + Dense 4 + Густина 4 + + + Dense 5 + Густина 5 + + + Dense 6 + Густина 6 + + + Dense 7 + Густина 7 + + + Horizontal + Горизонтальний + + + Vertical + Вертикальний + + + Cross + Хрестоподібний + + + Backward diagonal + Зворотня діагональ + + + Forward diagonal + Пряма діагональ + + + Crossing diagonal + Діагоналі, що перетинаються + + + Style + Стиль + + + Color + Колір + + + [%1, %2] + [%1, %2] + + + + Command + + Add connection + Додати з'єднання + + + Adjust connection + Налаштувати з'єднання + + + Delete connections + Видалити з'єднання + + + Change source + Змінити джерело + + + Change target + Зміни ціль + + + Add '%1' to '%2' + Command description for adding buttons to a QButtonGroup + Додати '%1' до '%2' + + + Morph %1/'%2' into %3 + MorphWidgetCommand description + Перетворити %1/%2 в %3 + + + Insert '%1' + Вставити '%1' + + + Change Z-order of '%1' + Змінити порядок глибина для '%1' + + + Raise '%1' + Підняти '%1' + + + Lower '%1' + Опустити '%1' + + + Delete '%1' + Видалити '%1' + + + Reparent '%1' + Змінити власника '%1' + + + Promote to custom widget + Перетворити на користувацький віджет + + + Demote from custom widget + Перетворити з користувацького віджета + + + Lay out using grid + Розташувати, використовуючи сітку + + + Lay out vertically + Розташувати вертикально + + + Lay out horizontally + Розташувати горизонтально + + + Break layout + Розбити розташування + + + Simplify Grid Layout + Спрощене розташування по сітці + + + Move Page + Пересунути сторінку + + + Delete Page + Видалити сторінку + + + Page + Сторінка + + + Insert Page + Вставити сторінку + + + Change Tab order + Змінити порядок обходу + + + Create Menu Bar + Створити панель меню + + + Delete Menu Bar + Видалити панель меню + + + Create Status Bar + Створити рядок статусу + + + Delete Status Bar + Видалити рядок статусу + + + Add Tool Bar + Додати панель інструментів + + + Add Dock Window + Додати прикріплене вікно + + + Adjust Size of '%1' + Підігнати розмір '%1' + + + Change Form Layout Item Geometry + Змінити геометрію елемента розташування формою + + + Change Layout Item Geometry + Змінити геометрію елемента розташування + + + Delete Subwindow + Видалити підвікно + + + page + сторінка + + + Insert Subwindow + Вставити підвікно + + + subwindow + підвікно + + + Subwindow + Підвікно + + + Change Table Contents + Змінити зміст таблиці + + + Change Tree Contents + Змінити зміст дерева + + + Add action + Додати дію + + + Remove action + Видалити дію + + + Add menu + Додати меню + + + Remove menu + Видалити меню + + + Create submenu + Створити підменю + + + Delete Tool Bar + Видалити панель інструментів + + + Change layout of '%1' from %2 to %3 + Змінити розташування '%1' з %2 на %3 + + + Set action text + Встановити текст дії + + + Insert action + Вставити дію + + + Move action + Пересунути дію + + + Change Title + Змінити заголовок + + + Insert Menu + Вставити меню + + + Changed '%1' of '%2' + Змінено '%1' з '%2' + + + Changed '%1' of %n objects + + Змінено '%1' з '%n' oб'єкта + Змінено '%1' з '%n' oб'єктів + Змінено '%1' з '%n' oб'єктів + + + + Reset '%1' of '%2' + Відновлено '%1' з '%2' + + + Reset '%1' of %n objects + + Відновлено '%1' з %n об'єкта + Відновлено '%1' з %n об'єктів + Відновлено '%1' з %n об'єктів + + + + Add dynamic property '%1' to '%2' + Додати динамічну властивість '%1' до '%2' + + + Add dynamic property '%1' to %n objects + + Додати динамічну властивість '%1' до '%n' об'єкта + Додати динамічну властивість '%1' до '%n' об'єктів + Додати динамічну властивість '%1' до '%n' об'єктів + + + + Remove dynamic property '%1' from '%2' + Видалити динамічну властивість '%1' у '%2' + + + Remove dynamic property '%1' from %n objects + + Видалити динамічну властивість '%1' у '%n' об'єкта + Видалити динамічну властивість '%1' у '%n' об'єктів + Видалити динамічну властивість '%1' у '%n' об'єктів + + + + Change script + Змінити скрипт + + + Change signals/slots + Змінити сигнали/слоти + + + Change signal + Змінити сигнал + + + Change slot + Змінити слот + + + Change signal-slot connection + Змінити з'єднання сигнал-слот + + + Change sender + Змінити відправника + + + Change receiver + Змінити отримувача + + + Create button group + Створити групу кнопок + + + Break button group + Розбити групу кнопок + + + Break button group '%1' + Розбити групу кнопок '%1' + + + Add buttons to group + Додати кнопки до групи + + + Remove buttons from group + Видалити кнопки з групи + + + Remove '%1' from '%2' + Command description for removing buttons from a QButtonGroup + Видалити '%1' з '%2' + + + + ConnectDialog + + Configure Connection + Налаштування з'єднання + + + GroupBox + + + + Edit... + Редагувати... + + + Show signals and slots inherited from QWidget + Показувати сигнали та слоти успадковані від QWidget + + + + ConnectionDelegate + + <object> + <об'єкт> + + + <signal> + <сигнал> + + + <slot> + <слот> + + + + DPI_Chooser + + Standard (96 x 96) + Embedded device standard screen resolution + Стандартна (96 x 96) + + + Greenphone (179 x 185) + Embedded device screen resolution + Greenphone (179 x 185) + + + High (192 x 192) + Embedded device high definition screen resolution + Висока (192 x 192) + + + + Designer + + Unable to launch %1. + Неможливо запустити %1. + + + %1 timed out. + Час очікування %1 вичерпано. + + + Custom Widgets + Віджети користувача + + + Promoted Widgets + Перетворені віджети + + + Qt Designer + Qt Designer + + + This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. + Цей файл містить роздільники верхнього рівня.<br>Вони <b>НЕ</b> будуть збережені в формі. + + + Perhaps you forgot to create a layout? + Можливо, ви забули створити розташування? + + + Invalid UI file: The root element <ui> is missing. + Неправильний файл UI: Кореневий елемент <ui> відсутній. + + + An error has occurred while reading the UI file at line %1, column %2: %3 + Під час читання файлу UI сталася помилка в рядку %1, позиція %2: %3 + + + This file cannot be read because it was created using %1. + Неможливо прочитати файл, бо його було створено з використанням %1. + + + This file was created using Designer from Qt-%1 and cannot be read. + Неможливо прочитати файл, бо його було створено з використанням Designer з Qt-%1. + + + The converted file could not be read. + Неможливо прочитати конвертований файл. + + + This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. + Цей файл було створено з використанням Designer з Qt-%1.і його буде сконвертовано до нової форми. + + + The old form has not been touched, but you will have to save the form under a new name. + Стара форма не змінилася, але ви маєте зберегти форму під новим іменем. + + + This file was created using Designer from Qt-%1 and could not be read: +%2 + Неможливо прочитати файл, бо його було створено з використанням Designer з Qt-%1: +%2 + + + Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. + Будь-ласка, пропустіть його через <b>uic3&nbsp;-convert</b>, щоб сконвертувати до формату Qt-4. + + + This file cannot be read because the extra info extension failed to load. + Неможливо прочитати цей файл, бо трапився збій при завантаженні розширення додаткової інформації. + + + + DesignerMetaEnum + + %1 is not a valid enumeration value of '%2'. + %1 не є правильним значення для переліку '%2'. + + + '%1' could not be converted to an enumeration value of type '%2'. + Неможливо сконвертувати '%1'до типу значень переліку '%2'. + + + + DesignerMetaFlags + + '%1' could not be converted to a flag value of type '%2'. + '%1' не можу бути сконвертовано до прапорця типу '%2'. + + + + DeviceProfile + + '%1' is not a number. + Reading a number for an embedded device profile + '%1' не є числом. + + + An invalid tag <%1> was encountered. + Знайдено неправильний тег <%1>. + + + + DeviceProfileDialog + + &Family + &Сім'я + + + &Point Size + &Розмір точки + + + Style + Стиль + + + Device DPI + DPI пристрою + + + Name + Назва + + + + DeviceSkin + + The image file '%1' could not be loaded. + Неможливо завантажити файл зображення '%1'. + + + The skin directory '%1' does not contain a configuration file. + Тека обкладинки '%1' не містить конфігураційного файлу. + + + The skin configuration file '%1' could not be opened. + Неможливо відкрити конфігураційний файл '%1'. + + + The skin configuration file '%1' could not be read: %2 + Неможливо прочитати конфігураційний файл '%1': %2 + + + Syntax error: %1 + Синтаксична помилка: %1 + + + The skin "up" image file '%1' does not exist. + Зображення обкладинки "вгору" '%1' не існує. + + + The skin "down" image file '%1' does not exist. + Зображення обкладинки "вниз" '%1' не існує. + + + The skin "closed" image file '%1' does not exist. + Зображення обкладинки "закрито" '%1' не існує. + + + The skin cursor image file '%1' does not exist. + Зображення обкладинки для курсору '%1' не існує. + + + Syntax error in area definition: %1 + Синтаксична помилка в описі області: %1 + + + Mismatch in number of areas, expected %1, got %2. + Не співпадає кількість областей, очікувалось %1, отримано %2. + + + + EmbeddedOptionsControl + + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> + Format embedded device profile description + <html><table><tr><td><b>Шрифт</b></td><td>%1, %2</td></tr><tr><td><b>Стиль</b></td><td>%3</td></tr><tr><td><b>Роздільна здатність</b></td><td>%4 x %5</td></tr></table></html> + + + + EmbeddedOptionsPage + + Embedded Design + Tab in preferences dialog + Дизайн для портативних пристроїв + + + Device Profiles + EmbeddedOptionsControl group box" + Профілі пристроїв + + + + FontPanel + + Font + Шрифт + + + &Writing system + Система &письма + + + &Family + &Сім'я + + + &Style + Сти&ль + + + &Point size + &Розмір точки + + + + FontPropertyManager + + PreferDefault + Надавати перевагу типовому + + + NoAntialias + Без згладжування + + + PreferAntialias + Надавати перевагу згладжування + + + Antialiasing + Згладжування + + + + FormBuilder + + Invalid stretch value for '%1': '%2' + Parsing layout stretch values +---------- +Parsing layout stretch values +---------- +Parsing layout stretch values + Неправильне значення розтягування для '%1': '%2' + + + Invalid minimum size for '%1': '%2' + Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values + Неправильне значення мінімального розміру для '%1': '%2' + + + + FormEditorOptionsPage + + %1 % + %1 % + + + Preview Zoom + Масштаб попереднього перегляду + + + Default Zoom + Типовий масштаб + + + Forms + Tab in preferences dialog + Форми + + + Default Grid + Типова сітка + + + + FormLayoutRowDialog + + Add Form Layout Row + Додати рядок до розташування формою + + + &Label text: + Текст &мітки: + + + Field &type: + &Тип поля: + + + &Field name: + Назва &поля: + + + &Buddy: + Прив'&язка: + + + &Row: + &Рядок: + + + Label &name: + &Назва мітки: + + + + FormWindow + + Unexpected element <%1> + Неочікуваний елемент <%1> + + + Error while pasting clipboard contents at line %1, column %2: %3 + Помилка під час вставки змісту буферу обміну в рядку %1, позиція %2: %3 + + + + FormWindowSettings + + Form Settings + Налаштування форми + + + Layout &Default + &Типове розташування + + + &Spacing: + &Відступ: + + + &Margin: + &Границя: + + + &Layout Function + Функція р&озташування + + + Ma&rgin: + Г&раниця: + + + Spa&cing: + В&ідступ: + + + &Pixmap Function + Функція растрового &зображення + + + &Include Hints + Включити під&казки + + + Grid + Сітка + + + Embedded Design + Дизайн для портативних пристроїв + + + &Author + &Автор + + + + IconSelector + + All Pixmaps ( + Усі растрові зображення ( + + + + ItemPropertyBrowser + + XX Icon Selected off + Sample string to determinate the width for the first column of the list item property browser + XX Значок Виділено вимк + + + + MainWindowBase + + Main + Not currently used (main tool bar) + Головна + + + File + Файл + + + Edit + Правка + + + Tools + Інструменти + + + Form + Форма + + + Qt Designer + Qt Designer + + + + NewForm + + Show this Dialog on Startup + Показувати цей діалог під час запуску + + + C&reate + &Створити + + + Recent + Нещодавні + + + New Form + Нова форма + + + &Close + З&акрити + + + &Open... + &Відкрити... + + + &Recent Forms + Нещодавні &форми + + + Read error + Помилка читання + + + A temporary form file could not be created in %1. + Неможливо створити тимчасовий файл форми в %1. + + + The temporary form file %1 could not be written. + Неможливо записати тимчасовий файл форми %1. + + + + ObjectInspectorModel + + Object + Об'єкт + + + Class + Клас + + + separator + розділювач + + + <noname> + <без назви> + + + + ObjectNameDialog + + Change Object Name + Змінити назву об'єкта + + + Object Name + Назва об'єкта + + + + PluginDialog + + Plugin Information + Інформація про додатки + + + 1 + 1 + + + + PreferencesDialog + + Preferences + Налаштування + + + + PreviewConfigurationWidget + + Form + Форма + + + Print/Preview Configuration + Налаштування друку/попереднього перегляду + + + Style + Стиль + + + Style sheet + Таблиця стилів + + + ... + ... + + + Device skin + Обкладинка пристрою + + + + PromotionModel + + Not used + Usage of promoted widgets + Не використовується + + + + Q3WizardContainer + + Page + Сторінка + + + + QAbstractFormBuilder + + Unexpected element <%1> + Неочікуваний елемент <%1> + + + An error has occurred while reading the UI file at line %1, column %2: %3 + Під час читання файлу UI '%1' сталася помилка в рядку %2, позиція %3 + + + Invalid UI file: The root element <ui> is missing. + Неправильний файл UI: Кореневий елемент <ui> відсутній. + + + The creation of a widget of the class '%1' failed. + Збій створення віджета класу '%1'. + + + Attempt to add child that is not of class QWizardPage to QWizard. + Спроба додати до QWizard нащадка, який не є класом QWizardPage. + + + Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. +This indicates an inconsistency in the ui-file. + Спроба додати розташування для віджета '%1' (%2), який вже має розташування %3. +Це вказує на некоректність в файлі UI. + + + Empty widget item in %1 '%2'. + Пустий елемент віджета в %1 '%2'. + + + Flags property are not supported yet. + Властивості-прапорці ще не підтримуються. + + + While applying tab stops: The widget '%1' could not be found. + Під час застосування позицій табуляції: Неможливо знайти віджет '%1'. + + + Invalid QButtonGroup reference '%1' referenced by '%2'. + '%2' містить неправильне посилання на QButtonGroup '%1'. + + + This version of the uitools library is linked without script support. + Ця версія бібліотеки uitools зібрана без підтримки скриптів. + + + + QAxWidgetPlugin + + ActiveX control + Елемент керування ActiveX + + + ActiveX control widget + Віджет елемента керування ActiveX + + + + QAxWidgetTaskMenu + + Set Control + Встановити елемент керування + + + Reset Control + Скинути елемент керування + + + Licensed Control + Ліцензований елемент керування + + + The control requires a design-time license + Цей елемент управління вимагає ліцензії для розробки + + + + QCoreApplication + + Exception at line %1: %2 + Виключна ситуація в рядку %1: %2 + + + Unknown error + Невідома помилка + + + An error occurred while running the script for %1: %2 +Script: %3 + Під час виконання скрипту для %1 сталася помилка: %2 +Скрипт: %3 + + + %1 is not a promoted class. + %1 не є перетвореним класом. + + + The base class %1 is invalid. + Неправильний базовий клас %1. + + + The class %1 already exists. + Клас %1 вже існує. + + + Promoted Widgets + Перетворені віджети + + + The class %1 cannot be removed + Неможливо видалити клас %1 + + + The class %1 cannot be removed because it is still referenced. + Неможливо видалити клас %1, оскільки на нього досі є посилання. + + + The class %1 cannot be renamed + Неможливо перейменувати клас %1 + + + The class %1 cannot be renamed to an empty name. + Неможливо дати класу %1 пусте ім'я. + + + There is already a class named %1. + Вже існує клас з іменем %1. + + + Cannot set an empty include file. + Неможливо встановити порожнє ім'я файлу заголовків. + + + + QDesigner + + %1 - warning + %1 - попередження + + + Qt Designer + Qt Designer + + + This application cannot be used for the Console edition of Qt + Ця програма не може бути використана консольною редакцією Qt + + + + QDesignerActions + + Saved %1. + Збережено %1. + + + %1 already exists. +Do you want to replace it? + %1 вже існує. +Бажаєте замінити його? + + + Edit Widgets + Редагувати віджети + + + &New... + &Новий... + + + &Open... + &Відкрити... + + + &Save + &Зберегти + + + Save &As... + Зберегти &як... + + + Save A&ll + Зберегти &усе + + + Save As &Template... + Зберегти як &шаблон... + + + &Close + З&акрити + + + Save &Image... + Зберегти з&ображення... + + + &Print... + &Друк... + + + &Quit + Ви&йти + + + View &Code... + Переглянути &код... + + + &Minimize + &Мінімізувати + + + Bring All to Front + Усе на передній план + + + Preferences... + Налаштування... + + + Additional Fonts... + Додаткові шрифти... + + + ALT+CTRL+S + + + + CTRL+SHIFT+S + + + + CTRL+R + + + + CTRL+M + + + + Qt Designer &Help + &Довідка по Qt Designer + + + Current Widget Help + Довідка по поточному віджету + + + What's New in Qt Designer? + Що нового в Qt Designer? + + + About Plugins + Про додатки + + + About Qt Designer + Про Qt Designer + + + About Qt + Про Qt + + + Clear &Menu + Очистити &меню + + + &Recent Forms + Нещодавні &форми + + + Open Form + Відкрити форму + + + Designer UI files (*.%1);;All Files (*) + UI файли Designer (*.%1);;Всі файли (*) + + + Save Form As + Зберегти форму як + + + Designer + Designer + + + Feature not implemented yet! + Можливість ще не реалізована! + + + Code generation failed + Збій генерації коду + + + Read error + Помилка читання + + + %1 +Do you want to update the file location or generate a new form? + %1 +Бажаєте оновити розташування файлу чи згенерувати нову форму? + + + &Update + &Оновити + + + &New Form + &Нова форма + + + Save Form? + Зберегти форму? + + + Could not open file + Неможливо відкрити файл + + + The file %1 could not be opened. +Reason: %2 +Would you like to retry or select a different file? + Неможливо відкрити файл %1. +Причина: %2 +Чи не хотіли б ви спробувати ще раз чи вибрати інший файл? + + + Select New File + Оберіть новий файл + + + Could not write file + Неможливо записати файл + + + It was not possible to write the entire file %1 to disk. +Reason:%2 +Would you like to retry? + Не вдалось записати цілий файл %1 на диск. +Причина:%2 +Бажаєте спробувати ще раз? + + + Assistant + Assistant + + + &Close Preview + З&акрити попередній перегляд + + + The backup file %1 could not be written. + Неможливо записати файл резервної копії %1. + + + The backup directory %1 could not be created. + Неможливо створити теку резервних копій %1. + + + The temporary backup directory %1 could not be created. + Неможливо створити тимчасову теку резервних копій %1. + + + Preview failed + Збій попереднього перегляду + + + Image files (*.%1) + Файли зображень (*.%1) + + + Save Image + Зберегти зображення + + + Saved image %1. + Збережено зображення %1. + + + The file %1 could not be written. + Неможливо записати файл %1. + + + Please close all forms to enable the loading of additional fonts. + Будь-ласка, закрийте усі форми, щоб дозволити завантаження додаткових шрифтів. + + + Printed %1. + Надруковано %1. + + + + QDesignerAppearanceOptionsPage + + Appearance + Tab in preferences dialog + + + + + QDesignerAppearanceOptionsWidget + + Docked Window + Прикріплені вікна + + + Multiple Top-Level Windows + Декілька вікон верхнього рівня + + + Toolwindow Font + Шрифт інструментальних вікон + + + + QDesignerAxWidget + + Reset control + Скинути елемент керування + + + Set control + Встановити елемент керування + + + Control loaded + Елемент керування завантажено + + + A COM exception occurred when executing a meta call of type %1, index %2 of "%3". + Виникла виключна ситуація COM під час здійснення мета-виклику типу %1, індекс %2 з "%3". + + + + QDesignerFormBuilder + + Script errors occurred: + Трапились помилки скрипту: + + + The preview failed to build. + Збій побудови попереднього перегляду. + + + Designer + Designer + + + + QDesignerFormWindow + + %1 - %2[*] + %1 - %2[*] + + + Save Form? + Зберегти форму? + + + Do you want to save the changes to this document before closing? + Бажаєте зберегти зміни до цього документи перед тим як закрити? + + + If you don't save, your changes will be lost. + Якщо ви не збережете, ваші зміни будуть втрачені. + + + + QDesignerMenu + + Type Here + Набирайте тут + + + Add Separator + Додати розділювач + + + Insert separator + Вставити розділювач + + + Remove separator + Видалити розділювач + + + Remove action '%1' + Видалити дію '%1' + + + Add separator + Додати розділювач + + + Insert action + Вставити дію + + + + QDesignerMenuBar + + Type Here + Набирайте тут + + + Remove Menu '%1' + Видалити меню '%1' + + + Remove Menu Bar + Видалити панель меню + + + Menu + Меню + + + + QDesignerPluginManager + + An XML error was encountered when parsing the XML of the custom widget %1: %2 + Під час розбору XML користувацького віджета %1 сталась помилка XML: %2 + + + A required attribute ('%1') is missing. + Обов'язковий атрибут ('%1') відсутній. + + + An invalid property specification ('%1') was encountered. Supported types: %2 + Знайдено неправильну специфікацію властивості ('%1'). Підтримувані типи: %2 + + + '%1' is not a valid string property specification. + '%1' не є правильною специфікацією рядкової властивості. + + + The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. + XML користувацького віджета %1 не містить жодного з елементів <widget> або <ui>. + + + The class attribute for the class %1 is missing. + Відсутній атрибут для класу %1. + + + The class attribute for the class %1 does not match the class name %2. + Атрибут "клас" для класу %1 не співпадає з іменем класу %2. + + + + QDesignerPropertySheet + + Dynamic Properties + Динамічні властивості + + + + QDesignerResource + + The layout type '%1' is not supported, defaulting to grid. + Тип розташування '%1' не підтримується, використовуємо сітку. + + + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. +Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. + Контейнерне розширення '%1' (%2) повернуло віджет, який не може бути керований за допомогою Qt Designer '%3' (%4) під час запиту сторінки №%5. +Сторінки контейнера повинні додаватись лише за допомогою вказування їх в XML, що повертається методом domXml() віджета користувача. + + + Unexpected element <%1> + Parsing clipboard contents + Неочікуваний елемент <%1> + + + Error while pasting clipboard contents at line %1, column %2: %3 + Parsing clipboard contents + Помилка під час вставки змісту буферу обміну в рядку %1, позиція %2: %3 + + + Error while pasting clipboard contents: The root element <ui> is missing. + Parsing clipboard contents + Помилка під час вставки змісту буферу обміну. Кореневий елемент <ui> відсутній. + + + + QDesignerSharedSettings + + The template path %1 could not be created. + Неможливо створити шлях до шаблону %1. + + + An error has been encountered while parsing device profile XML: %1 + Трапилась помилка під час розбору XML профілю пристрою: %1 + + + + QDesignerToolWindow + + Property Editor + Редактор властивостей + + + Action Editor + Редактор дій + + + Object Inspector + Інспектор об'єктів + + + Resource Browser + Оглядач ресурсів + + + Signal/Slot Editor + Редактор сигналів/слотів + + + Widget Box + Панель віджетів + + + + QDesignerWorkbench + + &File + &Файл + + + Edit + Правка + + + F&orm + Ф&орма + + + Preview in + Попередній перегляд в + + + &View + &Вид + + + &Settings + &Налаштування + + + &Window + В&ікно + + + &Help + &Довідка + + + Toolbars + Панелі інструментів + + + Widget Box + Панель віджетів + + + Save Forms? + Зберегти форми? + + + There are %n forms with unsaved changes. Do you want to review these changes before quitting? + + Є %n форма з незбереженими змінами. Бажаєте переглянути ці зміни перед виходом? + Є %n форми з незбереженими змінами. Бажаєте переглянути ці зміни перед виходом? + Є %n форм з незбереженими змінами. Бажаєте переглянути ці зміни перед виходом? + + + + If you do not review your documents, all your changes will be lost. + Якщо ви не переглянете ваші документи, усі ваші зміну будуть втрачені. + + + Discard Changes + Відхилити зміни + + + Review Changes + Переглянути зміни + + + Backup Information + Інформація про резервні копії + + + The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? + Останній сеанс Qt Designer не був правильно завершений. Залишились резервні копії файлів. Бажаєте їх завантажити? + + + The file <b>%1</b> could not be opened. + Неможливо відкрити файл <b>%1</b>. + + + The file <b>%1</b> is not a valid Designer UI file. + Файл <b>%1</b> не є правильним файлом UI Qt Designer. + + + + QFormBuilder + + An empty class name was passed on to %1 (object name: '%2'). + Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method + До %1 було передане пусте ім'я класу (ім'я об'єкта: '%2'). + + + QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. + QFormBuilder не зміг створити користувацький віджет класу '%1'; було створено базовий клас '%2'. + + + QFormBuilder was unable to create a widget of the class '%1'. + QFormBuilder не зміг створити віджет класу '%1'. + + + The layout type `%1' is not supported. + Тип розташування '%1' не підтримується. + + + The set-type property %1 could not be read. + Неможливо прочитати властивість %1 типу "множина". + + + The enumeration-type property %1 could not be read. + Неможливо прочитати властивість %1 типу "перелік". + + + Reading properties of the type %1 is not supported yet. + Читання властивостей типу %1 ще не підтримується. + + + The property %1 could not be written. The type %2 is not supported yet. + Неможливо записати властивість %1. Тип %2 ще не підтримується. + + + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. + Неправильне значення '%1' для переліку. Натомість, буде використано типове значення '%2'. + + + The flag-value '%1' is invalid. Zero will be used instead. + Неправильне значення '%1' для прапорців. Натомість, буде використано нуль. + + + + QStackedWidgetEventFilter + + Previous Page + Попередня сторінка + + + Next Page + Наступна сторінка + + + Delete + Видалити + + + Before Current Page + Перед поточною сторінкою + + + After Current Page + Після поточною сторінкою + + + Change Page Order... + Змінити порядок сторінок... + + + Change Page Order + Змінити порядок сторінок + + + Page %1 of %2 + Сторінка %1 з %2 + + + Insert Page + Вставити сторінку + + + + QStackedWidgetPreviewEventFilter + + Go to previous page of %1 '%2' (%3/%4). + Перейти до попередньої сторінки з %1 '%2' (%3/%4). + + + Go to next page of %1 '%2' (%3/%4). + Перейти до наступної сторінки з %1 '%2' (%3/%4). + + + + QTabWidgetEventFilter + + Delete + Видалити + + + Before Current Page + Перед поточною сторінкою + + + After Current Page + Після поточної сторінки + + + Page %1 of %2 + Сторінка %1 з %2 + + + Insert Page + Вставити сторінку + + + + QToolBoxHelper + + Delete Page + Видалити сторінку + + + Before Current Page + Перед поточною сторінкою + + + After Current Page + Після поточної сторінки + + + Change Page Order... + Змінити порядок сторінок... + + + Change Page Order + Змінити порядок сторінок + + + Page %1 of %2 + Сторінка %1 з %2 + + + Insert Page + Вставити сторінку + + + + QtBoolEdit + + True + Істинно + + + False + Хибно + + + + QtBoolPropertyManager + + True + Істинно + + + False + Хибно + + + + QtCharEdit + + Clear Char + Стерти символ + + + + QtColorEditWidget + + ... + ... + + + + QtColorPropertyManager + + Red + Червоний + + + Green + Зелений + + + Blue + Блакитний + + + Alpha + Альфа + + + + QtCursorDatabase + + Arrow + Стрілка + + + Up Arrow + Стрілка вгору + + + Cross + Хрест + + + Wait + Очікування + + + IBeam + Текстовий + + + Size Vertical + Вертикальний розмір + + + Size Horizontal + Горизонтальний розмір + + + Size Backslash + Зворотній слеш + + + Size Slash + Слеш + + + Size All + В усі сторони + + + Blank + Пусто + + + Split Vertical + Розділити вертикально + + + Split Horizontal + Розділити вертикально + + + Pointing Hand + Вказівний перст + + + Forbidden + Заборонено + + + Open Hand + Відкрита рука + + + Closed Hand + Закрита рука + + + What's This + Що це + + + Busy + Зайнятий + + + + QtFontEditWidget + + ... + ... + + + Select Font + Оберіть шрифт + + + + QtFontPropertyManager + + Family + Сім'я + + + Point Size + Розмір точки + + + Bold + Жирний + + + Italic + Курсив + + + Underline + Підкреслений + + + Strikeout + Перекреслений + + + Kerning + Кернінг + + + + QtGradientDialog + + Edit Gradient + Редагувати градієнт + + + + QtGradientEditor + + Form + Форма + + + Gradient Editor + Редактор градієнту + + + 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. + В цій області відображається попередній перегляд градієнту, що редагується. Вона також дозволяє за допомогою "drag & drop" редагувати специфічні до типу градієнта параметри, такі як: початкова та кінцева точки, радіус та ін. + + + 1 + 1 + + + 2 + 2 + + + 3 + 3 + + + 4 + 4 + + + 5 + 5 + + + Gradient Stops Editor + Редактор точок градієнту + + + 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. + Ця область дозволяє вам редагувати точки градієнту. Подвійне клацання на існуючій точці створює її дублікат. Подвійне клацання поза межами існуючої точки створює нову точку. Перетягніть точку мишею, щоб змінити її позицію. Використовуйте праву кнопку миші, щоб отримати контекстне меню з додатковими діями. + + + Zoom + Масштаб + + + Reset Zoom + Скинути + + + Position + Положення + + + Hue + Відтінок + + + H + H + + + Saturation + Насиченість + + + S + S + + + Sat + Насиченість + + + Value + Значення + + + V + V + + + Val + Значення + + + Alpha + Альфа + + + A + A + + + Type + Тип + + + Spread + Заливка + + + Color + Колір + + + Current stop's color + Колір поточної точки + + + Show HSV specification + Показати у вигляді HSV + + + HSV + HSV + + + Show RGB specification + Показати у вигляді RGB + + + RGB + RGB + + + Current stop's position + Позиція поточної точки + + + % + % + + + Zoom In + Збільшити + + + Zoom Out + Зменшити + + + Toggle details extension + Показати/приховати деталі + + + > + > + + + Linear Type + Лінійний тип + + + ... + ... + + + Radial Type + Радіальний тип + + + Conical Type + Конічний тип + + + Pad Spread + Рівномірна заливка + + + Repeat Spread + Повторна заливка + + + Reflect Spread + Дзеркальна заливка + + + Start X + X початку + + + Start Y + Y початку + + + Final X + X кінця + + + Final Y + Y кінця + + + Central X + X центру + + + Central Y + Y центру + + + Focal X + X фокусу + + + Focal Y + Y фокусу + + + Radius + Радіус + + + Angle + Кут + + + Linear + Лінійний + + + Radial + Радіальний + + + Conical + Конічний + + + Pad + Рівномірна + + + Repeat + Повторна + + + Reflect + Дзеркальна + + + + QtGradientStopsWidget + + New Stop + Нова точка + + + Delete + Видалити + + + Flip All + Відобразити дзеркально + + + Select All + Виділити все + + + Zoom In + Збільшити + + + Zoom Out + Зменшити + + + Reset Zoom + Скинути + + + + QtGradientView + + Gradient View + Перегляд градієнту + + + New... + Новий... + + + Edit... + Редагувати... + + + Rename + Перейменувати + + + Remove + Видалити + + + Grad + Градієнт + + + Remove Gradient + Видалити градієнт + + + Are you sure you want to remove the selected gradient? + Ви впевнені, що бажаєте видалити виділений градієнт? + + + + QtGradientViewDialog + + Select Gradient + Обрати градієнт + + + + QtKeySequenceEdit + + Clear Shortcut + Видалити поєднання клавіш + + + + QtLocalePropertyManager + + %1, %2 + %1, %2 + + + Language + Мова + + + Country + Країна + + + + QtPointFPropertyManager + + (%1, %2) + (%1, %2) + + + X + X + + + Y + Y + + + + QtPointPropertyManager + + (%1, %2) + (%1, %2) + + + X + X + + + Y + Y + + + + QtPropertyBrowserUtils + + [%1, %2, %3] (%4) + [%1, %2, %3] (%4) + + + [%1, %2] + [%1, %2] + + + + QtRectFPropertyManager + + [(%1, %2), %3 x %4] + [(%1, %2), %3 x %4] + + + X + X + + + Y + Y + + + Width + Ширина + + + Height + Висота + + + + QtRectPropertyManager + + [(%1, %2), %3 x %4] + [(%1, %2), %3 x %4] + + + X + X + + + Y + Y + + + Width + Ширина + + + Height + Висота + + + + QtResourceEditorDialog + + Dialog + Діалог + + + New File + Новий файл + + + N + Н + + + Remove File + Видалити файл + + + R + В + + + I + Ф + + + New Resource + Новий ресурс + + + A + Д + + + Remove Resource or File + Видалити ресурс або файл + + + %1 already exists. +Do you want to replace it? + %1 вже існує. +Бажаєте замінити його? + + + The file does not appear to be a resource file; element '%1' was found where '%2' was expected. + Не схоже, що файл є файлом ресурсів, елемент '%1' було знайдено, замість '%2'. + + + %1 [read-only] + %1 [лише для читання] + + + %1 [missing] + %1 [відсутній] + + + <no prefix> + <без префіксу> + + + New Resource File + Новий файл ресурсів + + + Resource files (*.qrc) + Файли ресурсів (*.qrc) + + + Import Resource File + Імпортувати файл ресурсів + + + newPrefix + + + + <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> + <p><b>Попередження:</b> Файл</p><p>%1</p><p>знаходиться поза межами батьківської теки поточного файлу ресурсів.</p> + + + <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> + <p>Щоб вирішити цю проблему, натисніть:</p><table><tr><th align="left">Копіювати</th><td>, щоб скопіювати файл до батьківської теки файлу ресурсів.</td></tr><tr><th align="left">Копіювати як...</th><td>, щоб скопіювати файл в підтеку батьківської теки файлу ресурсів.</td></tr><tr><th align="left">Залишити</th><td>, щоб використовувати поточне розміщення.</td></tr></table> + + + Add Files + Додати файли + + + Incorrect Path + Неправильний шлях + + + Copy + Копіювати + + + Copy As... + Копіювати як... + + + Keep + Залишити + + + Skip + Пропустити + + + Clone Prefix + Префікс клонування + + + Enter the suffix which you want to add to the names of the cloned files. +This could for example be a language extension like "_de". + Введіть суфікс, який ви хочете додавати до імен клонованих файлів. +Це може бути, наприклад, мовне розширення, як "_uk". + + + Copy As + Копіювати як + + + <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> + <p>Обраний файл</p><p>%1</p><p>знаходиться поза межами батьківської теки поточного файлу ресурсів.</p><p>%2</p>Будь-ласка, оберіть інший шлях всередині цієї теки.<p><p> + + + Could not overwrite %1. + Неможливо перезаписати %1. + + + Could not copy +%1 +to +%2 + Неможливо копіювати +%1 +до +%2 + + + A parse error occurred at line %1, column %2 of %3: +%4 + Сталась помилка розбору в рядку %1, позиція %2 з %3 +%4 + + + Save Resource File + Зберегти файл ресурсів + + + Could not write %1: %2 + Неможливо записати %1: %2 + + + Edit Resources + Редагування ресурсів + + + New... + Новий... + + + Open... + Відкрити... + + + Open Resource File + Відкрити файл ресурсів + + + Remove + Видалити + + + Move Up + Пересунути вгору + + + Move Down + Пересунути вниз + + + Add Prefix + Додати префікс + + + Add Files... + Додати файли... + + + Change Prefix + Змінити префікс + + + Change Language + Змінити мову + + + Change Alias + Додати псевдонім + + + Clone Prefix... + Префікс клонування... + + + Prefix / Path + Префікс / Шлях + + + Language / Alias + Мова / Псевдонім + + + <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> + <html><p><b>Попередження:</b> Під час перезавантаження ресурсів виникли проблеми:</p><pre>%1</pre></html> + + + Resource Warning + Попередження про ресурси + + + + QtResourceView + + Size: %1 x %2 +%3 + Розмір: %1 x %2 +%3 + + + Edit Resources... + Редагувати ресурси... + + + Reload + Перезавантажити + + + Copy Path + Копіювати шлях + + + + QtResourceViewDialog + + Select Resource + Оберіть ресурс + + + + QtSizeFPropertyManager + + %1 x %2 + %1 x %2 + + + Width + Ширина + + + Height + Висота + + + + QtSizePolicyPropertyManager + + <Invalid> + <Неправильний> + + + [%1, %2, %3, %4] + [%1, %2, %3, %4] + + + Horizontal Policy + Горизонтальна політика + + + Vertical Policy + Вертикальна політика + + + Horizontal Stretch + Горизонтальне розтягування + + + Vertical Stretch + Вертикальне розтягування + + + + QtSizePropertyManager + + %1 x %2 + %1 x %2 + + + Width + Ширина + + + Height + Висота + + + + QtToolBarDialog + + Customize Toolbars + Налаштувати панелі інструментів + + + 1 + 1 + + + Actions + Дії + + + Toolbars + Панелі інструментів + + + Add new toolbar + Додати нову панель інструментів + + + New + Нова + + + Remove selected toolbar + Видалити виділену панель інструментів + + + Remove + Видалити + + + Rename toolbar + Перейменувати панель інструментів + + + Rename + Перейменувати + + + Move action up + Пересунути дію вгору + + + Up + Вгору + + + Remove action from toolbar + Видалити дію з панелі інструментів + + + <- + <- + + + Add action to toolbar + Додати дію до панелі інструментів + + + -> + -> + + + Move action down + Пересунути дію вниз + + + Down + Вниз + + + Current Toolbar Actions + Поточні дії панелі інструментів + + + Custom Toolbar + Користувацька панель інструментів + + + < S E P A R A T O R > + < Р О З Д І Л Ю В А Ч > + + + + QtTreePropertyBrowser + + Property + Властивість + + + Value + Значення + + + + SaveFormAsTemplate + + Save Form As Template + Зберегти форму як шаблон + + + &Name: + &Назва: + + + &Category: + &Категорія: + + + Add path... + Додати шлях... + + + Template Exists + Шаблон існує + + + A template with the name %1 already exists. +Do you want overwrite the template? + Шаблон з іменем %1 вже існує. +Бажаєте перезаписати його? + + + Overwrite Template + Перезаписати шаблон + + + Open Error + Помилка відкриття + + + There was an error opening template %1 for writing. Reason: %2 + Під час відкриття шаблону %1 для запису сталася помилка. Причина: %2 + + + Write Error + Помилка запису + + + There was an error writing the template %1 to disk. Reason: %2 + Під час запису шаблону %1 на диск сталася помилка. Причина: %2 + + + Pick a directory to save templates in + Виберіть теку для збереження шаблонів + + + + ScriptErrorDialog + + An error occurred while running the scripts for "%1": + + Під час виконання скриптів для "%1" сталася помилка: + + + + + SelectSignalDialog + + Go to slot + Перейти до слота + + + Select signal + Оберіть сигнал + + + signal + сигнал + + + class + клас + + + + SignalSlotConnection + + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) + НАДСИЛАЧ(%1), СИГНАЛ(%2), ОТРИМУВАЧ(%3), СЛОТ(%4) + + + + SignalSlotDialogClass + + Signals and slots + Сигнали та слоти + + + Slots + Слоти + + + Add + Додати + + + ... + ... + + + Delete + Видалити + + + Signals + Сигнали + + + + Spacer + + Horizontal Spacer '%1', %2 x %3 + Горизонтальний роздільник '%1', %2 x %3 + + + Vertical Spacer '%1', %2 x %3 + Вертикальний роздільник '%1', %2 x %3 + + + + TemplateOptionsPage + + Template Paths + Tab in preferences dialog + Шляхи до шаблонів + + + + ToolBarManager + + Configure Toolbars... + Налаштувати панелі інструментів... + + + Window + Вікно + + + Help + Довідка + + + Style + Стиль + + + Dock views + Прикріплюванні панелі + + + File + Файл + + + Edit + Правка + + + Tools + Інструменти + + + Form + Форма + + + Toolbars + Панелі інструментів + + + + VersionDialog + + <h3>%1</h3><br/><br/>Version %2 + <h3>%1</h3><br/><br/>Версія %2 + + + Qt Designer + Qt Designer + + + <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> + <br/>Qt Designer - це дизайнер графічного інтерфейсу користувача для програм Qt.<br/> + + + %1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + %1<br/>Copyright (C) 2010 Корпорація Nokia та/або її дочірні компанії. + + + + VideoPlayerTaskMenu + + Available Mime Types + Доступні типи MIME + + + Display supported mime types... + Показати підтримувані типи MIME... + + + Load... + Завантажити... + + + Play + Грати + + + Pause + Пауза + + + Stop + Зупинити + + + Choose Video Player Media Source + Оберіть джерело медіа для відеопрогравача + + + An error has occurred in '%1': %2 + Сталась помилка в '%1': %2 + + + Video Player Error + Помилка відеопрогравача + + + + WidgetDataBase + + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. + Цей файл містить користувацький віджет '%1', чий базовий клас (%2) відрізняється від поточного елементу в базі даних віджетів (%3). Базу даних віджетів залишено без змін. + + + + qdesigner_internal::ActionEditor + + New... + Новий... + + + Edit... + Редагувати... + + + Go to slot... + Перейти до слота... + + + Copy + Копіювати + + + Cut + Вирізати + + + Paste + Вставити + + + Select all + Виділити все + + + Delete + Видалити + + + Actions + Дії + + + Configure Action Editor + Налаштувати редактор дій + + + Icon View + Значками + + + Detailed View + Детально + + + New action + Нова дія + + + Edit action + Редагувати дію + + + Remove action '%1' + Видалити дію '%1' + + + Remove actions + Видалити дії + + + Used In + Використовується в + + + + qdesigner_internal::ActionModel + + Name + Назва + + + Used + Використовується + + + Text + Текст + + + Shortcut + Поєднання клавіш + + + Checkable + Прапорець + + + ToolTip + Спливаюча підказка + + + + qdesigner_internal::BrushManagerProxy + + The element '%1' is missing the required attribute '%2'. + У елемента '%1' відсутній обов'язковий атрибут '%2'. + + + Empty brush name encountered. + Знайдено порожня назва пензля. + + + An unexpected element '%1' was encountered. + Знайдено неочікуваний елемент '%1'. + + + An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 + Під час читання файлу опису пензля '%1' сталася помилка в рядку %2, позиція %3: %4 + + + An error occurred when reading the resource file '%1' at line %2, column %3: %4 + Під час читання файлу ресурсів '%1' сталася помилка в рядку %2, позиція %3: %4 + + + + qdesigner_internal::BuddyEditor + + Add buddy + Додати прив'язку + + + Remove buddies + Видалити прив'язки + + + Remove %n buddies + + Видалити %n прив'язку + Видалити %n прив'язки + Видалити %n прив'язок + + + + Add %n buddies + + Додати %n прив'язку + Додати %n прив'язки + Додати %n прив'язок + + + + Set automatically + Встановити автоматично + + + + qdesigner_internal::BuddyEditorPlugin + + Edit Buddies + Редагувати прив'язки + + + + qdesigner_internal::BuddyEditorTool + + Edit Buddies + Редагувати прив'язки + + + + qdesigner_internal::ButtonGroupMenu + + Select members + Обрати членів + + + Break + Розбити + + + + qdesigner_internal::ButtonTaskMenu + + Assign to button group + Призначити до групи кнопок + + + Button group + Група кнопок + + + New button group + Нова група кнопок + + + Change text... + Змінити текст... + + + None + Немає + + + Button group '%1' + Група кнопок '%1' + + + + qdesigner_internal::CodeDialog + + Save... + Зберегти... + + + Copy All + Копіювати все + + + &Find in Text... + &Знайти в тексті... + + + A temporary form file could not be created in %1. + Неможливо створити тимчасовий файл форми в %1. + + + The temporary form file %1 could not be written. + Неможливо записати тимчасовий файл форми %1. + + + %1 - [Code] + %1 - [код] + + + Save Code + Зберегти код + + + Header Files (*.%1) + Файли заголовків (*.%1) + + + The file %1 could not be opened: %2 + Неможливо відкрити файл %1: %2 + + + The file %1 could not be written: %2 + Неможливо записати файл %1: %2 + + + %1 - Error + %1 - Помилка + + + + qdesigner_internal::ColorAction + + Text Color + Колір тексту + + + + qdesigner_internal::ComboBoxTaskMenu + + Edit Items... + Редагувати елементи... + + + Change Combobox Contents + Змінити зміст випадаючого списку + + + + qdesigner_internal::CommandLinkButtonTaskMenu + + Change description... + Змінити опис... + + + + qdesigner_internal::ConnectionEdit + + Select All + Виділити все + + + Deselect All + Зняти виділення + + + Delete + Видалити + + + + qdesigner_internal::ConnectionModel + + Sender + Надсилач + + + Signal + Сигнал + + + Receiver + Отримувач + + + Slot + Слот + + + <sender> + <надсилач> + + + <signal> + <сигнал> + + + <receiver> + <отримувач> + + + <slot> + <слот> + + + The connection already exists!<br>%1 + З'єднання вже існує!<br>%1 + + + Signal and Slot Editor + Редактор сигналів та слотів + + + + qdesigner_internal::ContainerWidgetTaskMenu + + Delete + Видалити + + + Insert + Вставити + + + Insert Page Before Current Page + Вставити сторінку перед поточною сторінкою + + + Insert Page After Current Page + Вставити сторінку після поточної сторінки + + + Add Subwindow + Додати підвікно + + + Subwindow + Підвікно + + + Page + Сторінка + + + Page %1 of %2 + Сторінка %1 з %2 + + + + qdesigner_internal::DPI_Chooser + + System (%1 x %2) + System resolution + Системна (%1 x %2) + + + User defined + Визначена користувачем + + + x + DPI X/Y separator + x + + + + qdesigner_internal::DesignerPropertyManager + + AlignLeft + Вліво + + + AlignHCenter + По центру + + + AlignRight + Вправо + + + AlignJustify + По ширині + + + AlignTop + Догори + + + AlignVCenter + По центру + + + AlignBottom + Донизу + + + %1, %2 + %1, %2 + + + Customized (%n roles) + + Користувацька (%n роль) + Користувацька (%n ролі) + Користувацька (%n ролей) + + + + Inherited + Успадкована + + + Horizontal + Горизонтальне + + + Vertical + Вертикальне + + + Normal Off + Нормальний, вимк + + + Normal On + Нормальний, увімк + + + Disabled Off + Вимкнений, вимк + + + Disabled On + Вимкнений, увімк + + + Active Off + Активний, вимк + + + Active On + Активний, увімк + + + Selected Off + Обраний, вимк + + + Selected On + Обраний, увімк + + + translatable + перекладати + + + disambiguation + уточнення + + + comment + коментар + + + + qdesigner_internal::DeviceProfileDialog + + Device Profiles (*.%1) + Профілі пристроїв (*.%1) + + + Default + Типовий + + + Save Profile + Зберегти профіль + + + Save Profile - Error + Збереження профілю - Помилка + + + Unable to open the file '%1' for writing: %2 + Неможливо відкрити файл '%1' для запису: %2 + + + Open profile + Відкрити профіль + + + Open Profile - Error + Відкриття профілю - Помилка + + + Unable to open the file '%1' for reading: %2 + Неможливо відкрити файл '%1' для читання: %2 + + + '%1' is not a valid profile: %2 + '%1' не є правильним профілем: %2 + + + + qdesigner_internal::Dialog + + Dialog + Діалог + + + StringList + Список рядків + + + New String + Новий рядок + + + &New + &Новий + + + Delete String + Видалити рядок + + + &Delete + Ви&далити + + + &Value: + &Значення: + + + Move String Up + Пересунути рядок вгору + + + Up + Вгору + + + Move String Down + Пересунути рядок донизу + + + Down + Вниз + + + + qdesigner_internal::EmbeddedOptionsControl + + None + Немає + + + Add a profile + Додати профіль + + + Edit the selected profile + Редагувати виділений профіль + + + Delete the selected profile + Видалити виділений профіль + + + Add Profile + Додати профіль + + + New profile + Новий профіль + + + Edit Profile + Редагувати профіль + + + Delete Profile + Видалити профіль + + + Would you like to delete the profile '%1'? + Бажаєте видалити профіль '%1'? + + + Default + Типовий + + + + qdesigner_internal::FilterWidget + + Filter + Фільтр + + + Clear text + Очистити текст + + + + qdesigner_internal::FormEditor + + Resource File Changed + Файли ресурсів було змінено + + + The file "%1" has changed outside Designer. Do you want to reload it? + Файл "%1" було змінено поза Qt Designer. Бажаєте перезавантажити його? + + + + qdesigner_internal::FormLayoutMenu + + Add form layout row... + Додати рядок до розташування формою... + + + + qdesigner_internal::FormWindow + + Edit contents + Редагувати зміст + + + F2 + + + + Insert widget '%1' + Вставити віджет '%1' + + + Resize + Змінити розмір + + + Key Resize + Зміна розміру клавішею + + + Key Move + Переміщення клавішею + + + Paste %n action(s) + + Вставити %n дію + Вставити %n дії + Вставити %n дій + + + + Paste %n widget(s) + + Вставити %n віджет + Вставити %n віджети + Вставити %n віджетів + + + + Paste (%1 widgets, %2 actions) + Вставити (%1 віджетів, %2 дії) + + + Cannot paste widgets. Designer could not find a container without a layout to paste into. + Неможливо вставити віджети. Qt Designer не зміг знайти контейнер без розташування для вставки. + + + Break the layout of the container you want to paste into, select this container and then paste again. + Розбийте розташування контейнеру, в який ви бажаєте вставити, виділіть цей контейнер та вставте знову. + + + Paste error + Помилка вставки + + + Raise widgets + Підняти віджети + + + Lower widgets + Опустити віджети + + + Select Ancestor + Обрати предка + + + Lay out + Розташування + + + Drop widget + Кинути віджет + + + A QMainWindow-based form does not contain a central widget. + Форма, що базується на QMainWindow не містить центрального віджета. + + + + qdesigner_internal::FormWindowBase + + Delete '%1' + Видалити '%1' + + + Delete + Видалити + + + + qdesigner_internal::FormWindowManager + + Cu&t + Вирі&зати + + + Cuts the selected widgets and puts them on the clipboard + Вирізає виділені віджети та розміщує їх в буфері обміну + + + &Copy + &Копіювати + + + Copies the selected widgets to the clipboard + Копіює виділені віджети до буферу обміну + + + &Paste + &Вставити + + + Pastes the clipboard's contents + Вставляє зміст буферу обміну + + + &Delete + Ви&далити + + + Deletes the selected widgets + Видаляє виділені віджети + + + Select &All + Виділити в&се + + + Selects all widgets + Виділяє усі віджети + + + Bring to &Front + На &передній план + + + Raises the selected widgets + Піднімає виділені віджети + + + Send to &Back + На зад&ній план + + + Lowers the selected widgets + Опускає виділені віджети + + + Adjust &Size + Підігнати &розмір + + + Adjusts the size of the selected widget + Підганяє розмір виділених віджетів + + + Lay Out &Horizontally + Розташувати &горизонтально + + + Lays out the selected widgets horizontally + Розташовує виділені віджети горизонтально + + + Lay Out &Vertically + Розташувати &вертикально + + + Lays out the selected widgets vertically + Розташовує виділені віджети вертикально + + + Lay Out in a &Form Layout + Розташувати по &формі + + + Lays out the selected widgets in a form layout + Розташовує виділені віджети по формі + + + Lay Out in a &Grid + Розташувати, використовуючи &сітку + + + Lays out the selected widgets in a grid + Розташовує виділені віджети по сітці + + + Lay Out Horizontally in S&plitter + Розташувати г&оризонтально з розділювачем + + + Lays out the selected widgets horizontally in a splitter + Розташовує виділені віджети горизонтально з розділювачем + + + Lay Out Vertically in Sp&litter + Розташувати в&ертикально з розділювачем + + + Lays out the selected widgets vertically in a splitter + Розташовує виділені віджети вертикально з розділювачем + + + &Break Layout + Розби&ти розташування + + + Breaks the selected layout + Розбиває виділено розташування + + + Si&mplify Grid Layout + Спро&щене розташування по сітці + + + Removes empty columns and rows + Видаляє пусті рядки та колонки + + + &Preview... + Попередній перегля&д... + + + Preview current form + Попередній перегляд поточної форми + + + Form &Settings... + Нала&штування форми... + + + Break Layout + Розбити розташування + + + Adjust Size + Підігнати розмір + + + Could not create form preview + Title of warning message box + Неможливо створити попередній перегляд форми + + + Form Settings - %1 + Налаштування форми - %1 + + + + qdesigner_internal::FormWindowSettings + + None + Немає + + + Device Profile: %1 + Профіль пристрою: %1 + + + + qdesigner_internal::GridPanel + + Form + Форма + + + Grid + Сітка + + + Visible + Видима + + + Grid &X + Сітка &X + + + Snap + Прив'язка + + + Reset + Скинути + + + Grid &Y + Сітка &Y + + + + qdesigner_internal::GroupBoxTaskMenu + + Change title... + Змінити заголовок... + + + + qdesigner_internal::HtmlTextEdit + + Insert HTML entity + Вставити елемент HTML + + + + qdesigner_internal::IconSelector + + The pixmap file '%1' cannot be read. + Неможливо прочитати файл растрового зображення '%1'. + + + The file '%1' does not appear to be a valid pixmap file: %2 + Файл '%1' не схожий на правильний файл растрового зображення: %2 + + + The file '%1' could not be read: %2 + Неможливо прочитати файл '%1': %2 + + + Choose a Pixmap + Оберіть растрове зображення + + + Pixmap Read Error + Помилка читання растрового зображення + + + ... + ... + + + Normal Off + Нормальний, вимк + + + Normal On + Нормальний, увімк + + + Disabled Off + Вимкнений, вимк + + + Disabled On + Вимкнений, увімк + + + Active Off + Активний, вимк + + + Active On + Активний, увімк + + + Selected Off + Обраний, вимк + + + Selected On + Обраний, увімк + + + Choose Resource... + Оберіть ресурс... + + + Choose File... + Оберіть файл... + + + Reset + Скинути + + + Reset All + Скинути все + + + + qdesigner_internal::ItemListEditor + + Items List + Список елементів + + + New Item + Новий елемент + + + &New + &Новий + + + Delete Item + Видалити елемент + + + &Delete + Ви&далити + + + Move Item Up + Пересунути елемент вгору + + + U + В + + + Move Item Down + Пересунути елемент вниз + + + D + Н + + + Properties &>> + Властивост&і >> + + + Properties &<< + Властивост&і << + + + + qdesigner_internal::LabelTaskMenu + + Change rich text... + Змінити форматований текст... + + + Change plain text... + Змінити простий текст... + + + + qdesigner_internal::LanguageResourceDialog + + Choose Resource + Оберіть ресурс + + + + qdesigner_internal::LineEditTaskMenu + + Change text... + Змінити текст... + + + + qdesigner_internal::ListWidgetEditor + + New Item + Новий елемент + + + Edit List Widget + Редагування віджета "Список" + + + Edit Combobox + Редагування віджета "Випадаючий список" + + + + qdesigner_internal::ListWidgetTaskMenu + + Edit Items... + Редагувати елементи... + + + Change List Contents + Змінити зміст списку + + + + qdesigner_internal::MdiContainerWidgetTaskMenu + + Next Subwindow + Наступне підвікно + + + Previous Subwindow + Попереднє підвікно + + + Tile + Плиткою + + + Cascade + Каскадом + + + + qdesigner_internal::MenuTaskMenu + + Remove + Видалити + + + + qdesigner_internal::MorphMenu + + Morph into + Перетворити на + + + + qdesigner_internal::NewActionDialog + + New Action... + Нова дія... + + + &Text: + &Текст: + + + Object &name: + &Ім'я об'єкта: + + + &Icon: + &Значок: + + + Shortcut: + Поєднання клавіш: + + + Checkable: + Прапорець: + + + ToolTip: + Спливаюча підказка: + + + ... + ... + + + + qdesigner_internal::NewDynamicPropertyDialog + + Create Dynamic Property + Створити динамічну властивість + + + Property Name + Ім'я властивості + + + horizontalSpacer + + + + Property Type + Тип властивості + + + Set Property Name + Встановіть ім'я властивості + + + The current object already has a property named '%1'. +Please select another, unique one. + Поточний об'єкт вже має властивість з іменем '%1'. +Будь-ласка, оберіть інше, унікальне ім'я. + + + The '_q_' prefix is reserved for the Qt library. +Please select another name. + Префікс '_q_' зарезервовано для бібліотеки Qt. +Будь-ласка, оберіть інше ім'я. + + + + qdesigner_internal::NewFormWidget + + 0 + 0 + + + Choose a template for a preview + Оберіть шаблон для попереднього перегляду + + + Embedded Design + Дизайн для портативних пристроїв + + + Device: + Пристрій: + + + Screen Size: + Розмір екрану: + + + Default size + Типовий розмір + + + QVGA portrait (240x320) + QVGA книжкою (240x320) + + + QVGA landscape (320x240) + QVGA альбомом (320x240) + + + VGA portrait (480x640) + VGA книжкою (480x640) + + + VGA landscape (640x480) + VGA альбомом (640x480) + + + Widgets + New Form Dialog Categories + Віджети + + + Custom Widgets + Віджети користувача + + + None + Немає + + + Error loading form + Помилка завантаження форми + + + Unable to open the form template file '%1': %2 + Неможливо відкрити файл шаблону форми '%1': %2 + + + Internal error: No template selected. + Внутрішня помилка. Не обрано шаблон. + + + + qdesigner_internal::NewPromotedClassPanel + + Add + Додати + + + New Promoted Class + Новий перетворений клас + + + Base class name: + Ім'я базового класу: + + + Promoted class name: + Ім'я перетвореного класу: + + + Header file: + Файл заголовків: + + + Global include + Глобальне включення + + + Reset + Скинути + + + + qdesigner_internal::ObjectInspector + + Change Current Page + Змінити поточну сторінку + + + &Find in Text... + &Знайти в тексті... + + + + qdesigner_internal::OrderDialog + + Change Page Order + Змінити порядок сторінок + + + Page Order + Порядок сторінок + + + Move page up + Пересунути сторінку вгору + + + Move page down + Пересунути сторінку вниз + + + Index %1 (%2) + Індекс %1 (%2) + + + %1 %2 + %1 %2 + + + + qdesigner_internal::PaletteEditor + + Edit Palette + Редагувати палітру + + + Tune Palette + Налаштувати палітру + + + Show Details + Показати деталі + + + Compute Details + Розраховувати деталі + + + Quick + Швидко + + + Preview + Попередній перегляд + + + Disabled + Вимкнений + + + Inactive + Неактивний + + + Active + Активний + + + + qdesigner_internal::PaletteEditorButton + + Change Palette + Змінити палітру + + + + qdesigner_internal::PaletteModel + + Color Role + Кольорова роль + + + Active + Активна + + + Inactive + Неактивний + + + Disabled + Вимкнений + + + + qdesigner_internal::PixmapEditor + + Choose Resource... + Оберіть ресурс... + + + Choose File... + Оберіть файл... + + + Copy Path + Копіювати шлях + + + Paste Path + Вставити шлях + + + ... + ... + + + + qdesigner_internal::PlainTextEditorDialog + + Edit text + Редагувати текст + + + + qdesigner_internal::PluginDialog + + Components + Компоненти + + + Plugin Information + Інформація про додаток + + + Refresh + Оновити + + + Scan for newly installed custom widget plugins. + Шукати нові встановлені додатки користувацьких віджетів. + + + Qt Designer couldn't find any plugins + Qt Designer не зміг знайти жодного додатку + + + Qt Designer found the following plugins + Qt Designer знайшов наступні додатки + + + New custom widget plugins have been found. + Були знайдені нові додатки користувацьких віджетів. + + + + qdesigner_internal::PreviewActionGroup + + %1 Style + Стиль %1 + + + + qdesigner_internal::PreviewConfigurationWidget + + Default + Типово + + + None + Немає + + + Browse... + Огляд... + + + Load Custom Device Skin + Завантажити користувацьку обкладинку пристрою + + + All QVFB Skins (*.%1) + Усі обкладинки QVFB (*.%1) + + + %1 - Duplicate Skin + %1 - Обкладинка-дублікат + + + The skin '%1' already exists. + Обкладинка '%1' вже існує. + + + %1 - Error + %1 - Помилка + + + %1 is not a valid skin directory: +%2 + %1 не є правильною текою обкладинки: +%2 + + + + qdesigner_internal::PreviewDeviceSkin + + &Portrait + Книжка + + + Landscape (&CCW) + Rotate form preview counter-clockwise + Альбом (проти ГС) + + + &Landscape (CW) + Rotate form preview clockwise + Альбом (за ГС) + + + &Close + Закрити + + + + qdesigner_internal::PreviewManager + + %1 - [Preview] + %1 - [Перегляд] + + + + qdesigner_internal::PreviewMdiArea + + The moose in the noose +ate the goose who was loose. + Palette editor background + Кричав Архип, Архип охрип, +Не треба Архипу кричати до хрипу. + + + + qdesigner_internal::PreviewWidget + + Preview Window + Вікно попереднього перегляду + + + LineEdit + Поле введення + + + ComboBox + Випадаючий список + + + PushButton + Кнопка + + + ButtonGroup2 + Група кнопок 2 + + + CheckBox1 + Прапорець 1 + + + CheckBox2 + Прапорець 2 + + + ButtonGroup + Група кнопок + + + RadioButton1 + Перемикач 1 + + + RadioButton2 + Перемикач 2 + + + RadioButton3 + Перемикач 3 + + + + qdesigner_internal::PromotionModel + + Name + Назва + + + Header file + Файл заголовків + + + Global include + Глобальне включення + + + Usage + Використання + + + + qdesigner_internal::PromotionTaskMenu + + Promoted widgets... + Перетворені віджети... + + + Promote to ... + Перетворити на... + + + Change signals/slots... + Змінити сигнали/слоти... + + + Promote to + Перетворити на + + + Demote to %1 + Перетворити на %1 + + + + qdesigner_internal::PropertyEditor + + Add Dynamic Property... + Додати динамічну властивість... + + + Remove Dynamic Property + Видалити динамічну властивість + + + Sorting + Сортування + + + Color Groups + Групи кольорів + + + Tree View + Деревом + + + Drop Down Button View + Випадаючим списком + + + String... + Рядки... + + + Bool... + Булева... + + + Other... + Інше... + + + Configure Property Editor + Налаштувати редактор властивостей + + + Object: %1 +Class: %2 + Об'єкт: %1 +Клас: %2 + + + + qdesigner_internal::PropertyLineEdit + + Insert line break + Insert розрив рядка + + + + qdesigner_internal::QDesignerPromotionDialog + + Promoted Widgets + Перетворені віджети + + + Promoted Classes + Перетворені класи + + + Promote + Перетворити + + + Change signals/slots... + Змінити сигнали/слоти... + + + %1 - Error + %1 - Помилка + + + + qdesigner_internal::QDesignerResource + + Loading qrc file + Завантаження файлу qrc + + + The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> + Неможливо знайти вказаний файл qrc <p><b>%1</b></p><p>. Бажаєте оновити розташування файлу?</p> + + + New location for %1 + Нове розташування для %1 + + + Resource files (*.qrc) + Файли ресурсів (*.qrc) + + + + qdesigner_internal::QDesignerTaskMenu + + Change objectName... + Змінити objectName... + + + Change toolTip... + Змінити toolTip... + + + Change whatsThis... + Змінити whatsThis... + + + Change styleSheet... + Змінити styleSheet... + + + Create Menu Bar + Створити панель меню + + + Add Tool Bar + Додати панель інструментів + + + Create Status Bar + Створити рядок статусу + + + Remove Status Bar + Видалити рядок статусу + + + Change script... + Змінити скрипт... + + + Change signals/slots... + Змінити сигнали/слоти... + + + Go to slot... + Перейти до слота... + + + Size Constraints + Обмеження розміру + + + Set Minimum Width + Встановити мінімальну ширину + + + Set Minimum Height + Встановити мінімальну висоту + + + Set Minimum Size + Встановити мінімальний розмір + + + Set Maximum Width + Встановити максимальну ширину + + + Set Maximum Height + Встановити максимальну висоту + + + Set Maximum Size + Встановити максимальний розмір + + + Edit ToolTip + Редагувати спливаючу підказку + + + Edit WhatsThis + Редагування підказки "Що це?" + + + no signals available + немає доступних сигналів + + + Set size constraint on %n widget(s) + + Встановити обмеження розміру для %n віджета + Встановити обмеження розміру для %n віджетів + Встановити обмеження розміру для %n віджетів + + + + + qdesigner_internal::QDesignerWidgetBox + + Unexpected element <%1> + Неочікуваний елемент <%1> + + + A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 +%5 + Під час розбору XML коду, вказаного для віджета %3, сталась помилка в рядку %1, позиція %2: %4 +%5 + + + The XML code specified for the widget %1 does not contain any widget elements. +%2 + XML код, вказаний для віджета %1, не містить жодного елемента віджета. +%2 + + + An error has been encountered at line %1 of %2: %3 + Сталась помилка в рядку %1 з %2: %3 + + + Unexpected element <%1> encountered when parsing for <widget> or <ui> + Під час розбору <widget> або <ui> було знайдено неочікуваний елемент <%1> + + + Unexpected end of file encountered when parsing widgets. + Під час розбору віджетів несподівано закінчився файл. + + + A widget element could not be found. + Неможливо знайти елемент віджета. + + + + qdesigner_internal::QtGradientStopsController + + H + H + + + S + S + + + V + V + + + Hue + Відтінок + + + Sat + Насиченість + + + Val + Значення + + + Saturation + Насиченість + + + Value + Значення + + + R + R + + + G + G + + + B + B + + + Red + Червоний + + + Green + Зелений + + + Blue + Блакитний + + + + qdesigner_internal::RichTextEditorDialog + + Edit text + Редагувати текст + + + Rich Text + Форматований текст + + + Source + Код + + + &OK + &OK + + + &Cancel + &Скасувати + + + + qdesigner_internal::RichTextEditorToolBar + + Bold + Жирний + + + CTRL+B + + + + Italic + Курсив + + + CTRL+I + + + + Underline + Підкреслений + + + CTRL+U + + + + Left Align + Вліво + + + Center + По центру + + + Right Align + Вправо + + + Justify + По ширині + + + Superscript + Верхній індекс + + + Subscript + Нижній індекс + + + Insert &Link + Вставити &посилання + + + Insert &Image + Вставити &зображення + + + + qdesigner_internal::ScriptDialog + + Edit script + Редагування скрипту + + + <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. + <html>Введіть фрагмент коду Qt Script, що має виконуватись під час завантаження форми.<br>Віджет та його діти доступні через змінні <i>widget</i> та <i>childWidgets</i>, відповідно. + + + Syntax error + Синтаксична помилка + + + + qdesigner_internal::ScriptErrorDialog + + Script errors + Помилки скрипту + + + + qdesigner_internal::SignalSlotDialog + + There is already a slot with the signature '%1'. + Вже існує слот з сигнатурою '%1'. + + + There is already a signal with the signature '%1'. + Вже існує сигнал з сигнатурою '%1'. + + + %1 - Duplicate Signature + %1 - Повторна сигнатура + + + Signals/Slots of %1 + Сигнали/слоти %1 + + + + qdesigner_internal::SignalSlotEditorPlugin + + Edit Signals/Slots + Редагувати сигнали/слоти + + + F4 + F4 + + + + qdesigner_internal::SignalSlotEditorTool + + Edit Signals/Slots + Редагувати сигнали/слоти + + + + qdesigner_internal::StatusBarTaskMenu + + Remove + Видалити + + + + qdesigner_internal::StringListEditorButton + + Change String List + Змінити список рядків + + + + qdesigner_internal::StyleSheetEditorDialog + + Valid Style Sheet + Коректна таблиця стилів + + + Add Resource... + Додати ресурс... + + + Add Gradient... + Додати градієнт... + + + Add Color... + Додати колір... + + + Add Font... + Додати шрифт... + + + Edit Style Sheet + Редагувати таблицю стилів + + + Invalid Style Sheet + Неправильна таблиця стилів + + + + qdesigner_internal::TabOrderEditor + + Start from Here + Почати звідси + + + Restart + Почати спочатку + + + Tab Order List... + Список порядку обходу... + + + Tab Order List + Список порядку обходу + + + Tab Order + Порядок обходу + + + + qdesigner_internal::TabOrderEditorPlugin + + Edit Tab Order + Редагувати порядок обходу + + + + qdesigner_internal::TabOrderEditorTool + + Edit Tab Order + Редагувати порядок обходу + + + + qdesigner_internal::TableWidgetEditor + + Edit Table Widget + Редагування віджета "Таблиця" + + + &Items + &Елементи + + + Table Items + Елементи таблиці + + + Properties &>> + Властивост&і >> + + + New Column + Новий стовпчик + + + New Row + Новий рядок + + + &Columns + &Стовпці + + + &Rows + &Рядки + + + Properties &<< + Властивост&і << + + + + qdesigner_internal::TableWidgetTaskMenu + + Edit Items... + Редагувати елементи... + + + + qdesigner_internal::TemplateOptionsWidget + + Form + Форма + + + Additional Template Paths + Додаткові шляхи до шаблонів + + + ... + ... + + + Pick a directory to save templates in + Виберіть теку для збереження шаблонів + + + + qdesigner_internal::TextEditTaskMenu + + Edit HTML + Редагувати HTML + + + Change HTML... + Змінити HTML... + + + Edit Text + Редагувати текст + + + Change Plain Text... + Змінити простий текст... + + + + qdesigner_internal::TextEditor + + Choose Resource... + Оберіть ресурс... + + + Choose File... + Оберіть файл... + + + ... + ... + + + Choose a File + Оберіть файл + + + + qdesigner_internal::ToolBarEventFilter + + Insert Separator before '%1' + Вставити розділювач перед %1 + + + Append Separator + Приєднати розділювач + + + Remove action '%1' + Видалити дію '%1' + + + Remove Toolbar '%1' + Видалити панель інструментів '%1' + + + Insert Separator + Вставити розділювач + + + + qdesigner_internal::TreeWidgetEditor + + Edit Tree Widget + Редагування віджета "Дерево" + + + &Items + &Елементи + + + Tree Items + Елементи дерева + + + 1 + 1 + + + New Item + Новий елемент + + + &New + &Новий + + + New Subitem + Новий піделемент + + + New &Subitem + Новий &піделемент + + + Delete Item + Видалити елемент + + + &Delete + Ви&далити + + + Move Item Left (before Parent Item) + Пересунути елемент вліво (перед батьківським) + + + L + Л + + + Move Item Right (as a First Subitem of the Next Sibling Item) + Пересунути елемент вправо (як перший піделемент наступного сусіда) + + + R + П + + + Move Item Up + Пересунути елемент вгору + + + U + В + + + Move Item Down + Пересунути елемент вниз + + + D + Н + + + Properties &>> + Властивост&і >> + + + New Column + Новий стовпчик + + + &Columns + &Стовпці + + + Per column properties + Властивості стовпця + + + Common properties + Загальні властивості + + + Properties &<< + Властивост&і << + + + + qdesigner_internal::TreeWidgetTaskMenu + + Edit Items... + Редагувати елементи... + + + + qdesigner_internal::WidgetBox + + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. + Попередження: Збій створення віджета в панелі віджетів. Причиною цього може бути неправильний XML користувацького віджета. + + + + qdesigner_internal::WidgetBoxTreeWidget + + Scratchpad + Нотатник + + + Custom Widgets + Віджети користувача + + + Expand all + Розгорнути все + + + Collapse all + Згорнути все + + + List View + Списком + + + Icon View + Значками + + + Remove + Видалити + + + Edit name + Редагувати ім'я + + + + qdesigner_internal::WidgetDataBase + + A custom widget plugin whose class name (%1) matches that of an existing class has been found. + Користувацький додаток віджета з іменем класу (%1) співпадає з існуючим класом. + + + + qdesigner_internal::WidgetEditorTool + + Edit Widgets + Редагувати віджети + + + + qdesigner_internal::WidgetFactory + + The custom widget factory registered for widgets of class %1 returned 0. + Користувацька фабрика віджетів, що зареєстрована для класу %1, повернула 0. + + + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. + Сталося неспівпадіння імені класу під час створення віджета, використовуючи користувацьку фабрику віджетів, що зареєстрована для класу %1. Вона повернула віджет класу %2. + + + %1 Widget + Віджет %1 + + + The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. + Неможливо визначити поточну сторінку контейнера '%1' (%2) під час створення розташування. Це вказує на некоректність файлу UI, можливо, розташування було створене на контейнерному віджеті. + + + Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. +This indicates an inconsistency in the ui-file. + Спроба додати розташування для віджета '%1' (%2), який вже має некероване розташування %3. +Це вказує на некоректність в файлі UI. + + + Cannot create style '%1'. + Неможливо створити стиль '%1'. + + + + qdesigner_internal::WizardContainerWidgetTaskMenu + + Next + Далі + + + Back + Назад + + + + qdesigner_internal::ZoomMenu + + %1 % + Zoom factor + %1 % + + + + qdesigner_internal::ZoomablePreviewDeviceSkin + + &Zoom + Масштаб + + + diff --git a/translations/linguist_uk.ts b/translations/linguist_uk.ts new file mode 100644 index 0000000..92d16dd --- /dev/null +++ b/translations/linguist_uk.ts @@ -0,0 +1,1602 @@ + + + + + AboutDialog + + Qt Linguist + Qt Linguist + + + + BatchTranslationDialog + + Qt Linguist - Batch Translation + Qt Linguist - Пакетний переклад + + + Options + Опції + + + Set translated entries to finished + Помічати перекладені елементи як завершені + + + Retranslate entries with existing translation + Повторно перекласти елементи, що вже мають переклад + + + Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked + Майте на увазі, що модифіковані елементи будуть помічені як незавершені, якщо параметр 'Помічати перекладені елементи як завершені' вимкнено + + + Translate also finished entries + Перекладати також завершені елементи + + + Phrase book preference + Використання глосарію + + + Move up + Вгору + + + Move down + Вниз + + + The batch translator will search through the selected phrase books in the order given above + Пакетний перекладач буде шукати серед обраних глосаріїв у вказаному вище порядку + + + &Run + &Запустити + + + Cancel + Скасувати + + + Batch Translation of '%1' - Qt Linguist + Пакетний переклад '%1' - Qt Linguist + + + Searching, please wait... + Здійснюється пошук, будь-ласка, зачекайте... + + + &Cancel + &Скасувати + + + Linguist batch translator + Пакетний переклад Linguist'а + + + Batch translated %n entries + + Пакетно перекладено %n елемент + Пакетно перекладено %n елементи + Пакетно перекладено %n елементів + + + + + DataModel + + <qt>Duplicate messages found in '%1': + <qt>Повідомлення-дублікати знайдено в '%1': + + + <p>[more duplicates omitted] + <p>[решта дублікатів пропущено] + + + <p>* ID: %1 + <p>* ID: %1 + + + <p>* Context: %1<br>* Source: %2 + <p>* Контекст: %1<br>* Оригінал: %2 + + + <br>* Comment: %3 + <br>* Коментар: %3 + + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + Linguist не знає правил множини для '%1'. +Буде застосована універсальна форма однини. + + + Cannot create '%2': %1 + Не можу створити '%2': %1 + + + Universal Form + Універсальна форма + + + + ErrorsView + + Accelerator possibly superfluous in translation. + В перекладі, можливо, пропущено акселератор. + + + Accelerator possibly missing in translation. + В перекладі, можливо, пропущено акселератор. + + + Translation does not end with the same punctuation as the source text. + Переклад не закінчується тим самим знаком пунктуації, що й оригінал. + + + A phrase book suggestion for '%1' was ignored. + Пропозицію глосарію для '%1' було проігноровано. + + + Translation does not refer to the same place markers as in the source text. + Переклад не містить тих самих маркерів позиції, що й оригінал. + + + Translation does not contain the necessary %n place marker. + Переклад не містить необхідних маркерів позиції %n. + + + Unknown error + Невідома помилка + + + + FindDialog + + Find + Знайти + + + This window allows you to search for some text in the translation source file. + Це вікно дозволяє вам шукати текст в файлі перекладу. + + + &Find what: + &Шукати: + + + Type in the text to search for. + Введіть текст для пошуку. + + + Options + Опції + + + Source texts are searched when checked. + Якщо відмічено, то пошук здійснюватиметься серед оригінальних текстів. + + + &Source texts + &Оригінальні тексти + + + Translations are searched when checked. + Якщо відмічено, то пошук здійснюватиметься серед перекладів. + + + &Translations + &Переклади + + + Texts such as 'TeX' and 'tex' are considered as different when checked. + Якщо відмічено, то рядки 'приклад' та 'прИкЛад' будуть вважатись різними. + + + &Match case + Враховувати &регістр + + + Comments and contexts are searched when checked. + Якщо відмічено, то пошук здійснюватиметься серед коментарів та контекстів. + + + &Comments + &Коментарі + + + Ignore &accelerators + Ігнорувати &акселератори + + + Click here to find the next occurrence of the text you typed in. + Клацніть тут, щоб знайти наступне співпадіння для введеного вами тексту. + + + Find Next + Знайти наступний + + + Click here to close this window. + Клацніть тут щоб закрити вікно. + + + Cancel + Скасувати + + + + Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog + Виберіть Правка|Пошук з головного меню чи натисніть Ctrl+F, щоб відкрити діалог пошуку + + + + + FormMultiWidget + + Alt+Delete + translate, but don't change + + + + Shift+Alt+Insert + translate, but don't change + + + + Alt+Insert + translate, but don't change + + + + Confirmation - Qt Linguist + Підтвердження - Qt Linguist + + + Delete non-empty length variant? + Видалити непустий варіант перекладу? + + + + LRelease + + Dropped %n message(s) which had no ID. + + Видалено %n повідомлення, яке не має ID. + Видалено %n повідомлення, які не мають ID. + Видалено %n повідомлень, які не мають ID. + + + + Excess context/disambiguation dropped from %n message(s). + + Видалено зайвий контекст/неоднозначність з %n повідомлення. + Видалено зайвий контекст/неоднозначність з %n повідомлень. + Видалено зайвий контекст/неоднозначність з %n повідомлень. + + + + Generated %n translation(s) (%1 finished and %2 unfinished) + + Згенеровано %n переклад (%1 завершено та %2 незавершено) + Згенеровано %n переклади (%1 завершено та %2 незавершено) + Згенеровано %n перекладів (%1 завершено та %2 незавершено) + + + + Ignored %n untranslated source text(s) + + Зігноровано %n неперекладений оригінальний текст + Зігноровано %n неперекладені оригінальні тексти + Зігноровано %n неперекладених оригінальних текстів + + + + + MainWindow + + MainWindow + Головне вікно + + + &Phrases + Фра&зи + + + &Close Phrase Book + &Закрити глосарій + + + &Edit Phrase Book + &Редагувати глосарій + + + &Print Phrase Book + &Друк глосарію + + + V&alidation + Перев&ірка + + + &View + &Вид + + + Vie&ws + &Види + + + &Toolbars + Панелі &інструментів + + + &Help + &Довідка + + + &Translation + Пере&клад + + + &File + &Файл + + + Recently Opened &Files + &Нещодавно відкриті файли + + + &Edit + &Правка + + + &Open... + &Відкрити... + + + Open a Qt translation source file (TS file) for editing + Відкрити файл перекладу Qt (файл TS) для редагування + + + Ctrl+O + + + + E&xit + Ви&йти + + + Close this window and exit. + Закрити вікно та вийти. + + + Ctrl+Q + + + + Save + Зберегти + + + Save changes made to this Qt translation source file + Зберегти зміни зроблені до цього файлу перекладу Qt + + + Save &As... + Зберегти &як... + + + Save As... + Зберегти як... + + + Save changes made to this Qt translation source file into a new file. + Зберегти зміни зроблені до цього файлу перекладу Qt до нового файлу. + + + Release + Скомпілювати + + + Create a Qt message file suitable for released applications from the current message file. + Створити файл повідомлень Qt придатний для використання програмами з поточного файлу повідомлень. + + + &Print... + &Друк... + + + Print a list of all the translation units in the current translation source file. + Друкувати список усіх елементів перекладу з поточного файлу перекладу. + + + Ctrl+P + + + + &Undo + &Повернути + + + Undo the last editing operation performed on the current translation. + Скасувати останню операцію редагування здійснену над поточним перекладом. + + + Ctrl+Z + + + + &Redo + П&овторити + + + Redo an undone editing operation performed on the translation. + Повторити скасовану операцію редагування здійснену над поточним перекладом. + + + Ctrl+Y + + + + Cu&t + Ви&різати + + + Copy the selected translation text to the clipboard and deletes it. + Копіювати виділений текст перекладу в буфер обміну та видалити його. + + + Ctrl+X + + + + &Copy + &Копіювати + + + Copy the selected translation text to the clipboard. + Копіювати виділений текст перекладу до буферу обміну. + + + Ctrl+C + + + + &Paste + &Вставити + + + Paste the clipboard text into the translation. + Вставити текст з буферу обміну до перекладу. + + + Ctrl+V + + + + Select &All + Виділити в&се + + + Select the whole translation text. + Виділити все текст перекладу. + + + Ctrl+A + + + + &Find... + &Знайти... + + + Search for some text in the translation source file. + Шукати деякий текст в файлі перекладу. + + + Ctrl+F + + + + Find &Next + Знайти &наступне + + + Continue the search where it was left. + Продовжити пошук з місця, де він був зупинений. + + + F3 + + + + &Prev Unfinished + &Попередній незавершений + + + Previous unfinished item + Попередній незавершений елемент + + + Move to the previous unfinished item. + Перейти до попереднього незавершеного елементу. + + + Ctrl+K + + + + &Next Unfinished + &Наступний незавершений + + + Next unfinished item + Наступний незавершений елемент + + + Move to the next unfinished item. + Перейти до наступного незавершеного елементу. + + + Ctrl+J + + + + P&rev + П&опередній + + + Move to previous item + Перейти до попереднього елементу + + + Move to the previous item. + Перейти до попереднього елементу. + + + Ctrl+Shift+K + + + + Ne&xt + Н&аступний + + + Next item + Наступний елемент + + + Move to the next item. + Перейти до наступного елементу. + + + Ctrl+Shift+J + + + + &Done and Next + &Готово і наступний + + + Mark item as done and move to the next unfinished item + Помітити елемент як завершений та перейти до наступного незавершеного елементу + + + Mark this item as done and move to the next unfinished item. + Помітити цей елемент як завершений та перейти до наступного незавершеного елементу. + + + Copy from source text + Копіювати з оригінального тексту + + + Copies the source text into the translation field + Копіює оригінальний текст в поле перекладу + + + Copies the source text into the translation field. + Копіює оригінальний текст в поле перекладу. + + + Ctrl+B + + + + &Accelerators + &Акселератори + + + Toggle the validity check of accelerators + Перемикання перевірки правильності акселераторів + + + Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. + Перемикання перевірки акселераторів, тобто чи співпадає кількість амперсандів в оригінальному та перекладеному тексті. Якщо виявлено неспівпадіння, то у вікні попереджень буде показано повідомлення. + + + &Ending Punctuation + &Кінцева пунктуація + + + Toggle the validity check of ending punctuation + Перемикання перевірки правильності кінцевої пунктуації + + + Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. + Перемикання перевірки кінцевої пунктуації. Якщо виявлено неспівпадіння, то у вікні попереджень буде показано повідомлення. + + + &Phrase matches + Співпадіння &фраз + + + Toggle checking that phrase suggestions are used + Перемикання перевірки, що пропозиції фраз були застосовані + + + Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. + Перемикання перевірки про використання запропонованих фраз. Якщо виявлено неспівпадіння, то у вікні попереджень буде показано повідомлення. + + + Place &Marker Matches + Співпадіння &маркерів положення + + + Toggle the validity check of place markers + Перемикання перевірки правильності маркерів розташування + + + Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. + Перемикання перевірки правильності маркерів розташування, тобто чи усі %1, %2, ... співпадають в оригінальному та перекладеному тексті. Якщо виявлено неспівпадіння, то у вікні попереджень буде показано повідомлення. + + + &New Phrase Book... + &Новий глосарій... + + + Create a new phrase book. + Створити новий глосарій. + + + Ctrl+N + + + + &Open Phrase Book... + &Відкрити глосарій... + + + Open a phrase book to assist translation. + Відкрити глосарій для допомоги в перекладі. + + + Ctrl+H + + + + &Reset Sorting + С&кинути сортування + + + Sort the items back in the same order as in the message file. + Сортувати елементи в тому ж порядку, що й в файлі повідомлень. + + + &Display guesses + &Показувати підказки + + + Set whether or not to display translation guesses. + Встановлює показувати чи ні підказки перекладу. + + + &Statistics + &Статистика + + + Display translation statistics. + Показати статистку перекладу. + + + &Manual + &Посібник + + + F1 + + + + About Qt Linguist + Про Qt Linguist + + + About Qt + Про Qt + + + Display information about the Qt toolkit by Nokia. + Показати інформацію про інструментарій Qt від Nokia. + + + &What's This? + &Що це? + + + What's This? + Що це? + + + Enter What's This? mode. + Перехід в режим "Що це?". + + + Shift+F1 + Shift+F1 + + + &Search And Translate... + Знайти &та перекласти... + + + Replace the translation on all entries that matches the search source text. + Замінити переклад усіх елементів, що співпадають з оригінальним текстом, що шукається. + + + &Batch Translation... + Пакетний перекла&д... + + + Batch translate all entries using the information in the phrase books. + Пакетно перекласти усі елементи використовуючи інформацію з глосаріїв. + + + Release As... + Скомпілювати як... + + + Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file. + Створення файла повідомлень Qt придатного для використання програмами з поточного файлу повідомлень. Ім'я файла буде автоматично визначено з імені файлу TS. + + + File + Файл + + + Edit + Правка + + + Translation + Переклад + + + Validation + Перевірка + + + Help + Довідка + + + Open/Refresh Form &Preview + &Відкрити/оновити попередній перегляд форм + + + Form Preview Tool + Засіб попереднього перегляду форм + + + F5 + + + + Translation File &Settings... + Налаштування &файлу перекладу... + + + &Add to Phrase Book + Дод&ати до глосарію + + + Ctrl+T + + + + Open Read-O&nly... + Відкрити лише для &читання... + + + &Save All + &Зберегти усе + + + Ctrl+S + + + + &Release All + &Скомпілювати все + + + Close + Закрити + + + &Close All + З&акрити усе + + + Ctrl+W + + + + Length Variants + Варіанти перекладу + + + + This is the application's main window. + Це головне вікно програми. + + + + Source text + Оригінальний текст + + + Index + Індекс + + + Context + Контекст + + + Items + Елементи + + + This panel lists the source contexts. + В цій панелі перераховані оригінальні контексти. + + + Strings + Рядки + + + Phrases and guesses + Фрази та підказки + + + Sources and Forms + Коди та форми + + + Warnings + Попередження + + + MOD + status bar: file(s) modified + ЗМІ + + + Loading... + Завантажується... + + + Loading File - Qt Linguist + Завантаження файлу - Qt Linguist + + + The file '%1' does not seem to be related to the currently open file(s) '%2'. + +Close the open file(s) first? + Не схоже, що файл '%1' пов'язаний з жодним з відкритим зараз файлом '%2'. + +Закрити спочатку відкриті файли? + + + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. + +Skip loading the first named file? + Не схоже, що файл '%1' пов'язаний з файлом '%2', що також завантажується. + +Пропустити завантаження першого вказаного файлу? + + + %n translation unit(s) loaded. + + %n одиниця перекладу завантажена. + %n одиниці перекладу завантажені. + %n одиниць перекладу завантажено. + + + + Related files (%1);; + Пов'язані файли (%1);; + + + Open Translation Files + Відкрити файли перекладу + + + File saved. + Файл збережено. + + + Qt message files for released applications (*.qm) +All files (*) + Файли повідомлень Qt для готовий програм (*.qm) +Всі файли (*) + + + File created. + Файл створено. + + + Printing... + Друкується... + + + Context: %1 + Контекст: %1 + + + finished + завершено + + + unresolved + нерозв'язаний + + + obsolete + застарілий + + + Printing... (page %1) + Друк... (сторінка %1) + + + Printing completed + Друк завершено + + + Printing aborted + Друк перервано + + + Search wrapped. + Пошук з початку. + + + Qt Linguist + Qt Linguist + + + Cannot find the string '%1'. + Неможливо знайти рядок '%1. + + + Search And Translate in '%1' - Qt Linguist + Пошук та переклад і '%1' - Qt Linguist + + + Translate - Qt Linguist + Переклад - Qt Linguist + + + Translated %n entry(s) + + Перекладено %n елемент + Перекладено %n елементи + Перекладено %n елементів + + + + No more occurrences of '%1'. Start over? + Більше співпадінь '%1' немає. Почати спочатку? + + + Create New Phrase Book + Створити новий глосарій + + + Qt phrase books (*.qph) +All files (*) + Глосарії Q (*.qph) +Всі файли (*) + + + Phrase book created. + Глосарій створено. + + + Open Phrase Book + Відкрити глосарій + + + Qt phrase books (*.qph);;All files (*) + Глосарії Q (*.qph);;Всі файли (*) + + + %n phrase(s) loaded. + + %n фразу завантажено. + %n фрази завантажено. + %n фраз завантажено. + + + + Add to phrase book + Додати до глосарію + + + No appropriate phrasebook found. + Не знайдено відповідного глосарію. + + + Adding entry to phrasebook %1 + Додавання елементу до глосарію %1 + + + Select phrase book to add to + Оберіть глосарій, в який бажаєте додати + + + Unable to launch Qt Assistant (%1) + Неможливо запустити Qt Assistant (%1) + + + Version %1 + Версія %1 + + + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist - це засіб для додавання перекладів до програм на Qt.</p><p>Copyright (C) 2010 Корпорація Nokia та/або її дочірні компанії. + + + Do you want to save the modified files? + Бажаєте зберегти модифіковані файли? + + + Do you want to save '%1'? + Бажаєте зберегти '%1'? + + + Qt Linguist[*] + Qt Linguist[*] + + + %1[*] - Qt Linguist + %1[*] - Qt Linguist + + + No untranslated translation units left. + Неперекладених одиниць не залишилось. + + + &Window + Вікн&о + + + Minimize + Мінімізувати + + + Ctrl+M + + + + Display the manual for %1. + Показати посібник для %1. + + + Display information about %1. + Показати інформацію про %1. + + + &Save '%1' + &Зберегти '%1' + + + Save '%1' &As... + Зберегти '%1' &як... + + + Release '%1' + Скомпілювати '%1' + + + Release '%1' As... + Скомпілювати '%1' як... + + + &Close '%1' + З&акрити '%1' + + + &Save + &Зберегти + + + &Close + З&акрити + + + Save All + Зберегти усе + + + Close All + Закрити усе + + + &Release + &Скомпілювати + + + Translation File &Settings for '%1'... + Налаштування &файлу перекладу для '%1'... + + + &Batch Translation of '%1'... + Пакетний перекла&д '%1'... + + + Search And &Translate in '%1'... + Знайти &та переклад '%1'... + + + Search And &Translate... + Знайти &та перекласти... + + + Cannot read from phrase book '%1'. + Неможливо прочитати з глосарію '%1'. + + + Close this phrase book. + Закрити цей глосарій. + + + Enables you to add, modify, or delete entries in this phrase book. + Дозволяє вам додавати, модифікувати та видаляти елементи глосарію. + + + Print the entries in this phrase book. + Друку елементів цього глосарію. + + + Cannot create phrase book '%1'. + Неможливо створити глосарій '%1'. + + + Do you want to save phrase book '%1'? + Бажаєте зберегти глосарій '%1'? + + + All + Усе + + + + MessageEditor + + + This is the right panel of the main window. + Це права панель основного вікна. + + + + Russian + Російська + + + German + Німецька + + + Japanese + Японська + + + French + Французька + + + Polish + Польська + + + Chinese + Китайська + + + This whole panel allows you to view and edit the translation of some source text. + Ця панель дозволяє вам переглядати та редагувати переклад деякого оригінального тексту. + + + Source text + Оригінальний текст + + + This area shows the source text. + В цій області відображається оригінальний текст. + + + Source text (Plural) + Оригінальний текст (множина) + + + This area shows the plural form of the source text. + В цій області відображається множина оригінального тексту. + + + Developer comments + Коментарі розробника + + + This area shows a comment that may guide you, and the context in which the text occurs. + В цій області відображається коментар, який може допомогти вам та контекст, в якому зустрічається текст. + + + Here you can enter comments for your own use. They have no effect on the translated applications. + Тут ви можете вводити коментарі для власного вжитку. Вони не впливають на перекладені програми. + + + %1 translation (%2) + %1 переклад (%2) + + + This is where you can enter or modify the translation of the above source text. + Тут ви можете чи змінювати переклад оригінального тексту, наведеного вище. + + + %1 translation + %1 переклад + + + %1 translator comments + %1 коментар перекладача + + + '%1' +Line: %2 + '%1' +Рядок: %2 + + + + MessageModel + + Completion status for %1 + Статус завершеності для %1 + + + <file header> + <заголовок файлу> + + + <context comment> + <контекстний коментар> + + + <unnamed context> + <контекст без назви> + + + + PhraseBookBox + + Edit Phrase Book + Редагування глосарію + + + This window allows you to add, modify, or delete entries in a phrase book. + Це вікно дозволяє вам додавати, модифікувати та видаляти елементи глосарію. + + + &Translation: + &Переклад: + + + This is the phrase in the target language corresponding to the source phrase. + Це фраза на мові перекладу, що відповідає оригінальній фразі. + + + S&ource phrase: + &Оригінальна фраза: + + + This is a definition for the source phrase. + Це визначення оригінальної фрази. + + + This is the phrase in the source language. + Це фраза мовою оригіналу. + + + &Definition: + &Визначення: + + + Click here to add the phrase to the phrase book. + Клацніть тут, щоб додати фразу до глосарію. + + + &New Entry + &Новий запис + + + Click here to remove the entry from the phrase book. + Клацніть тут, щоб видалити фразу з глосарію. + + + &Remove Entry + Ви&далити запис + + + Settin&gs... + Нала&штування... + + + Click here to save the changes made. + Клацніть тут, щоб зберегти зроблені зміни. + + + &Save + &Зберегти + + + Click here to close this window. + Клацніть тут щоб закрити вікно. + + + Close + Закрити + + + + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. + Йдіть в Фрази > Редагувати глосарій... З'явиться діалог PhraseBookBox. + + + + (New Entry) + (Новий запис) + + + %1[*] - Qt Linguist + %1[*] - Qt Linguist + + + Qt Linguist + Qt Linguist + + + Cannot save phrase book '%1'. + Неможливо зберегти глосарій '%1'. + + + + PhraseModel + + Source phrase + Оригінальна фраза + + + Translation + Переклад + + + Definition + Визначення + + + + PhraseView + + Insert + Вставити + + + Edit + Редагувати + + + Guess (%1) + Підказка (%1) + + + Guess + Підказка + + + + QObject + + Translation files (%1);; + Файли перекладу (%1);; + + + All files (*) + Всі файли (*) + + + Qt Linguist + Qt Linguist + + + GNU Gettext localization files + Файли локалізації GNU Gettext + + + GNU Gettext localization template files + Файли шаблонів локалізації GNU Gettext + + + Compiled Qt translations + Скомпільовані переклади Qt + + + Qt Linguist 'Phrase Book' + 'Глосарій' Qt Linguist + + + Qt translation sources (format 1.1) + Файли перекладу Qt (формат 1.1) + + + Qt translation sources (format 2.0) + Файли перекладу Qt (формат 2.0) + + + Qt translation sources (latest format) + Файли перекладу Qt (останній формат) + + + XLIFF localization files + Файли локалізації XLIFF + + + + SourceCodeView + + <i>Source code not available</i> + <i>Код недоступний</i> + + + <i>File %1 not available</i> + <i>Файл %1 не доступний</i> + + + <i>File %1 not readable</i> + <i>Неможливо прочитати файл %1</i> + + + + Statistics + + Statistics + Статистика + + + Close + Закрити + + + Translation + Переклад + + + Source + Оригінал + + + 0 + 0 + + + Words: + Слів: + + + Characters: + Символів: + + + Characters (with spaces): + Символів (з пропусками): + + + + TranslateDialog + + This window allows you to search for some text in the translation source file. + Це вікно дозволяє вам шукати текст в файлі перекладу. + + + Type in the text to search for. + Введіть текст для пошуку. + + + Find &source text: + &Знайти оригінальний текст: + + + &Translate to: + &Перекласти як: + + + Search options + Опції пошуку + + + Texts such as 'TeX' and 'tex' are considered as different when checked. + Якщо відмічено, то рядки 'приклад' та 'прИкЛад' будуть вважатись різними. + + + Match &case + Враховувати &регістр + + + Mark new translation as &finished + Позначати нові переклади &як завершені + + + Click here to find the next occurrence of the text you typed in. + Клацніть тут, щоб знайти наступне співпадіння для введеного вами тексту. + + + Find Next + Знайти наступний + + + Translate + Перекласти + + + Translate All + Перекласти усе + + + Click here to close this window. + Клацніть тут щоб закрити вікно. + + + Cancel + Скасувати + + + + TranslationSettingsDialog + + Source language + Мова оригіналу + + + Language + Мова + + + Country/Region + Країна/регіон + + + Target language + Мова перекладу + + + Settings for '%1' - Qt Linguist + Налаштування для '%1' - Qt Linguist + + + Any Country + Будь-яка країна + + + diff --git a/translations/qt_help_uk.ts b/translations/qt_help_uk.ts new file mode 100644 index 0000000..1687959 --- /dev/null +++ b/translations/qt_help_uk.ts @@ -0,0 +1,320 @@ + + + + + QCLuceneResultWidget + + Search Results + Результати пошуку + + + Note: + Примітка: + + + The search results may not be complete since the documentation is still being indexed! + Результати пошуку можуть бути не повні, оскільки документація досі індексується! + + + Your search did not match any documents. + Ваш пошук не повернув результатів. + + + (The reason for this might be that the documentation is still being indexed.) + (Причиною цього може бути те, що документація досі індексується.) + + + + QHelp + + Untitled + Без назви + + + + QHelpCollectionHandler + + The collection file '%1' is not set up yet! + Файл колекції '%1' ще не встановлено! + + + Cannot load sqlite database driver! + Неможливо завантажити драйвер бази даних sqlite! + + + Cannot open collection file: %1 + Неможливо відкрити файл колекції: %1 + + + Cannot create tables in file %1! + Неможливо створити таблиці в файлі %1! + + + The collection file '%1' already exists! + Файл колекції '%1' вже існує! + + + Cannot create directory: %1 + Неможливо створити теку: %1 + + + Cannot copy collection file: %1 + Неможливо скопіювати файл колекції: %1 + + + Unknown filter '%1'! + Невідомий фільтр '%1'! + + + Cannot register filter %1! + Неможливо зареєструвати фільтр %1! + + + Cannot open documentation file %1! + Неможливо відкрити файл документації %1! + + + Invalid documentation file '%1'! + Неправильний файл документації '%1'! + + + The namespace %1 was not registered! + Простір імен %1 не зареєстровано! + + + Namespace %1 already exists! + Простір імен %1 вже існує! + + + Cannot register namespace '%1'! + Неможливо зареєструвати простір імен '%1'! + + + Cannot open database '%1' to optimize! + Неможливо відкрити базу даних '%1' для оптимізації! + + + + QHelpDBReader + + Cannot open database '%1' '%2': %3 + The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string + Не можу відкрити базу даних '%1' '%2': %3 + + + + QHelpEngineCore + + Cannot open documentation file %1: %2! + Не можу відкрити файл документації %1: %2! + + + The specified namespace does not exist! + Вказаний простір імен не існує! + + + + QHelpGenerator + + Invalid help data! + Неправильні дані довідки! + + + No output file name specified! + Не вказане ім'я вихідного файлу! + + + The file %1 cannot be overwritten! + Неможливо перезаписати файл %1! + + + Building up file structure... + Побудова структури файлу.... + + + Cannot open data base file %1! + Неможливо відкрити файл бази даних %1! + + + Cannot register namespace %1! + Неможливо зареєструвати простір імен %1! + + + Insert custom filters... + Вставка фільтрів користувача... + + + Insert help data for filter section (%1 of %2)... + Вставка даних довідки для розділу фільтра (%1 з %2)... + + + Documentation successfully generated. + Документацію успішно згенеровано. + + + Some tables already exist! + Деякі таблиці вже існують! + + + Cannot create tables! + Неможливо створити таблиці! + + + Cannot register virtual folder! + Неможливо зареєструвати віртуальну теку! + + + Insert files... + Вставка файлів... + + + The referenced file %1 must be inside or within a subdirectory of (%2). Skipping it. + Файл %1 має бути всередині підтеки (%2). Пропускаємо його. + + + The file %1 does not exist! Skipping it. + Файл %1 не існує! Пропускаємо його. + + + Cannot open file %1! Skipping it. + Неможливо відкрити файл %1! Пропускаємо його. + + + The filter %1 is already registered! + Фільтр %1 вже зареєстровано! + + + Cannot register filter %1! + Неможливо зареєструвати фільтр %1! + + + Insert indices... + Вставка індексів... + + + Insert contents... + Вставка змісту... + + + Cannot insert contents! + Неможливо вставити зміст! + + + Cannot register contents! + Неможливо зареєструвати зміст! + + + File '%1' does not exist. + Файл '%1' не існує. + + + File '%1' cannot be opened. + Неможливо відкрити файл '%1'. + + + File '%1' contains an invalid link to file '%2' + Файл '%1' містить неправильне посилання до файлу '%2' + + + Invalid links in HTML files. + Неправильні посилання в файлах HTML. + + + + QHelpProject + + Unknown token. + Невідомий токен. + + + Unknown token. Expected "QtHelpProject"! + Невідомий токен. Очікувався "QtHelpProject"! + + + Error in line %1: %2 + Помилка в рядку %1: %2 + + + Virtual folder has invalid syntax. + Віртуальна тека має неправильний синтаксис. + + + Namespace has invalid syntax. + Простір імен має неправильний синтаксис. + + + Missing namespace in QtHelpProject. + Відсутній простір імен в QtHelpProject. + + + Missing virtual folder in QtHelpProject + Відсутня віртуальна тека в QtHelpProject + + + Missing attribute in keyword at line %1. + Відсутній атрибут в ключовому слові на рядку %1. + + + The input file %1 could not be opened! + Неможливо відкрити вхідний файл %1! + + + + QHelpSearchQueryWidget + + Search for: + Шукати: + + + Previous search + Попередній пошук + + + Next search + Наступний пошук + + + Search + Шукати + + + Advanced search + Розширений пошук + + + words <B>similar</B> to: + слова <B>схожі</B> на: + + + <B>without</B> the words: + <B>без</B> слів: + + + with <B>exact phrase</B>: + з <B>точною фразою</B>: + + + with <B>all</B> of the words: + з <B>усіма</B> словами: + + + with <B>at least one</B> of the words: + з <B>щонайменше одним</B> зі слів: + + + + QHelpSearchResultWidget + + %1 - %2 of %n Hits + + %1 - %2 з %n співпадіння + %1 - %2 з %n співпадінь + %1 - %2 з %n співпадінь + + + + 0 - 0 of 0 Hits + 0 - 0 з 0 співпадінь + + + diff --git a/translations/qtconfig_uk.ts b/translations/qtconfig_uk.ts new file mode 100644 index 0000000..9d5b0a7 --- /dev/null +++ b/translations/qtconfig_uk.ts @@ -0,0 +1,717 @@ + + + + + MainWindow + + Desktop Settings (Default) + Налаштування стільниці (Типово) + + + Choose style and palette based on your desktop settings. + Оберіть стиль та палітру відповідно до ваших налаштувань стільниці. + + + On The Spot + У вікні документу + + + Auto (default) + Автоматично (типово) + + + Choose audio output automatically. + Вибрати аудіо вихід автоматично. + + + aRts + aRts + + + Experimental aRts support for GStreamer. + Експериментальна підтримка aRts для GStreamer. + + + Phonon GStreamer backend not available. + Підтримка GStreamer для Phonon не доступна. + + + Choose render method automatically + Обрати метод вімальовки автоматично + + + X11 + X11 + + + Use X11 Overlays + Використовувати оверлеї X11 + + + OpenGL + OpenGL + + + Use OpenGL if available + Використовувати OpenGL, якщо доступно + + + Software + Програмно + + + Use simple software rendering + Використовувати простий програмний рендеринг + + + No changes to be saved. + Немає змін для збереження. + + + Saving changes... + Збереження змін... + + + Over The Spot + Над вікном документу + + + Off The Spot + В рядку стану + + + Root + В додатковому вікні + + + Select a Directory + Оберіть теку + + + <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + + + Qt Configuration + Конфігурація Qt + + + Save Changes + Зберегти зміни + + + Save changes to settings? + Зберегти зміни до налаштувань? + + + &Yes + &Так + + + &No + &Ні + + + &Cancel + &Скасувати + + + + MainWindowBase + + Qt Configuration + Конфігурація Qt + + + Appearance + Вигляд + + + GUI Style + Стиль GUI + + + Select GUI &Style: + Оберіть &стиль GUI: + + + Preview + Попередній перегляд + + + Select &Palette: + Виберіть &палітру: + + + Active Palette + Активна палітра + + + Inactive Palette + Неактивна палітра + + + Disabled Palette + Вимкнена палітра + + + Build Palette + Створити палітру + + + &3-D Effects: + &3-D ефекти: + + + Window Back&ground: + Фон &вікна: + + + &Tune Palette... + &Налаштувати палітру... + + + Please use the KDE Control Center to set the palette. + Будь-ласка, використовуйте Системні параметри KDE, щоб встановити палітру. + + + Fonts + Шрифти + + + Default Font + Типовий шрифт + + + &Style: + &Стиль: + + + &Point Size: + &Розмір: + + + F&amily: + &Шрифт: + + + Sample Text + Зразок тексту + + + Font Substitution + Заміна шрифтів + + + S&elect or Enter a Family: + &Виберіть чи введіть шрифт: + + + Current Substitutions: + Поточні заміни: + + + Up + Вгору + + + Down + Вниз + + + Remove + Видалити + + + Select s&ubstitute Family: + &Оберіть шрифт, яким заміняти: + + + Add + Додати + + + Interface + Інтерфейс + + + Feel Settings + Поведінка миші + + + ms + мс + + + &Double Click Interval: + &Інтервал подвійного клацання: + + + No blinking + Без блимання + + + &Cursor Flash Time: + &Час блимання курсору: + + + lines + рядків + + + Wheel &Scroll Lines: + &Коліщатко прокручує: + + + Resolve symlinks in URLs + Вирішувати символьні посилання в URL + + + GUI Effects + Ефекти GUI + + + &Enable + &Увімкнути + + + Alt+E + + + + &Menu Effect: + Ефект &меню: + + + C&omboBox Effect: + Ефект випадаючого &списку: + + + &ToolTip Effect: + Ефект &підказки: + + + Tool&Box Effect: + Ефект панелі &інструментів: + + + Disable + Вимкнуто + + + Animate + Анімація + + + Fade + Згасання + + + Global Strut + Мінімальний розмір віджетів + + + Minimum &Width: + Мінімальна &ширина: + + + Minimum Hei&ght: + Мінімальна &висота: + + + pixels + пікселів + + + Enhanced support for languages written right-to-left + Розширена підтримка для, що пишуться справа наліво + + + XIM Input Style: + Стиль введення XIM: + + + On The Spot + У вікні документу + + + Over The Spot + Над вікном документу + + + Off The Spot + В рядку стану + + + Root + В додатковому вікні + + + Default Input Method: + Типовий метод введення: + + + Printer + Принтер + + + Enable Font embedding + Увімкнути вживлення шрифтів + + + Font Paths + Шляхи до шрифтів + + + Browse... + Огляд... + + + Press the <b>Browse</b> button or enter a directory and press Enter to add them to the list. + Натисніть кнопку <b>Огляд</b> чи введіть теку та натисніть Enter, щоб додати її до списку. + + + Phonon + Phonon + + + About Phonon + Про Phonon + + + Current Version: + Поточна версія: + + + Not available + Не доступна + + + Website: + Веб-сайт: + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://phonon.kde.org"><span style=" text-decoration: underline; color:#0000ff;">http://phonon.kde.org</span></a></p></body></html> + + + + About GStreamer + Про GStreamer + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gstreamer.freedesktop.org/"><span style=" text-decoration: underline; color:#0000ff;">http://gstreamer.freedesktop.org/</span></a></p></body></html> + + + + GStreamer backend settings + Налаштування модуля GStreamer + + + Preferred audio sink: + Бажаний аудіо вихід: + + + Preferred render method: + Бажаний метод рендерингу: + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Note: changes to these settings may prevent applications from starting up correctly.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Примітка: зміни до цих налаштувань можуть заважати правильному запуску програм.</span></p></body></html> + + + &File + &Файл + + + &Help + &Довідка + + + &Save + &Зберегти + + + Save + Зберегти + + + Ctrl+S + Ctrl+S + + + E&xit + Ви&йти + + + Exit + Вийти + + + &About + &Про + + + About + Про + + + About &Qt + Про &Qt + + + About Qt + Про Qt + + + + PaletteEditorAdvancedBase + + Tune Palette + Налаштувати палітру + + + <b>Edit Palette</b><p>Change the palette of the current widget or form.</p><p>Use a generated palette or select colors for each color group and each color role.</p><p>The palette can be tested with different widget layouts in the preview section.</p> + <b>Редагування палітри</b><p>Змінити палітру поточного віджета чи форми.</p><p>Використовуйте згенеровану палітру чи оберіть кольори для кожної групи кольорів та кожної кольорової ролі.</p><p>Палітру можна протестувати з різними розміщеннями віджетів в секції попереднього перегляду.</p> + + + Select &Palette: + Виберіть &палітру: + + + Active Palette + Активна палітра + + + Inactive Palette + Неактивна палітра + + + Disabled Palette + Вимкнена палітра + + + Auto + Автоматично + + + Build inactive palette from active + Будувати неактивну палітру з активної + + + Build disabled palette from active + Будувати вимкнену палітру з активної + + + Central color &roles + Головні кольорові &ролі + + + Choose central color role + Оберіть головну кольорову роль + + + <b>Select a color role.</b><p>Available central roles are: <ul> <li>Window - general background color.</li> <li>WindowText - general foreground color. </li> <li>Base - used as background color for e.g. text entry widgets, usually white or another light color. </li> <li>Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. </li> <li>Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. </li> <li>ButtonText - a foreground color used with the Button color. </li> <li>Highlight - a color to indicate a selected or highlighted item. </li> <li>HighlightedText - a text color that contrasts to Highlight. </li> <li>BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. </li> </ul> </p> + <b>Вибір кольорової ролі.</b><p>Доступні наступні головні ролі: <ul> <li>Вікно - загальний колір фону.</li> <li>Текст вікна - загальний колір переднього плану. </li> <li>Базовий - використовується як колір фону, наприклад, для віджетів для введення тексту, зазвичай білий або інший світлий колір. </li> <li>Текст - колір переднього плану, що використовується разом з базовим. Зазвичай співпадає з "Текст вікна", і в цьому випадку має забезпечувати гарний контраст і з "Вікном", і з "Базовим". </li> <li>Кнопка - загальний колір фону кнопки, там де кнопки потребуються інший від "Вікна" фон, як в стилі Macintosh. </li> <li>Текст кнопки - колір переднього плану, що застосовується разом з кольором "Кнопки". </li> <li>Підсвічений - колір для індикації виділеного чи підсвіченого елементу. </li> <li>Підсвічений текст - колір тексту, що контрастує з "Підсвіченим". </li> <li>Яскравий текст - колір тексту, що суттєво відрізняється від "Тексту вікна" та добре контрастує з чорним, наприклад. </li> </ul> </p> + + + Window + Вікно + + + WindowText + Текст вікна + + + Button + Кнопка + + + Base + Базовий + + + Text + Текст + + + BrightText + Яскравий текст + + + ButtonText + Текст кнопки + + + Highlight + Підсвічений + + + HighlightedText + Підсвічений текст + + + &Select Color: + &Оберіть колір: + + + Choose a color + Оберіть колір + + + Choose a color for the selected central color role. + Виберіть колір для вказаної головної кольорової ролі. + + + 3-D shadow &effects + 3-D &ефекти тіні + + + Build &from button color + Будувати &з кольору кнопки + + + Generate shadings + Генерувати тіні + + + Check to let 3D-effect colors be calculated from button-color. + Увімкніть, щоб кольори 3D-ефектів розраховувались з кольору кнопки. + + + Choose 3D-effect color role + Оберіть роль для 3D-ефектів + + + <b>Select a color role.</b><p>Available effect roles are: <ul> <li>Light - lighter than Button color. </li> <li>Midlight - between Button and Light. </li> <li>Mid - between Button and Dark. </li> <li>Dark - darker than Button. </li> <li>Shadow - a very dark color. </li> </ul> + <b>Оберіть кольорову роль.</b><p>Доступні наступні ролі ефектів: <ul> <li>Світлий - світліше ніж колір кнопки. </li> <li>Напівсвітлий - між "Кнопкою" та "Світлим". </li> <li>Напівтемний - між "Кнопкою" та "Темним". </li> <li>Темний - темніший ніж "Кнопка". </li> <li>Тінь - дуже темний колір. </li> </ul> + + + Light + Світлий + + + Midlight + Напівсвітлий + + + Mid + Напівтемний + + + Dark + Темний + + + Shadow + Тінь + + + Select Co&lor: + Оберіть &колір: + + + Choose a color for the selected effect color role. + Оберіть колір для вказаної кольорової ролі ефектів. + + + OK + OK + + + Close dialog and apply all changes. + Закрити діалог та застосувати усі зміни. + + + Cancel + Скасувати + + + Close dialog and discard all changes. + Закрити діалог та відкинути усі зміни. + + + + PreviewFrame + + Desktop settings will only take effect after an application restart. + Налаштування стільниці будуть застосовані лише після перезапуску програми. + + + + PreviewWidgetBase + + Preview Window + Вікно попереднього перегляду + + + ButtonGroup + Група кнопок + + + RadioButton1 + Перемикач 1 + + + RadioButton2 + Перемикач 2 + + + RadioButton3 + Перемикач 3 + + + ButtonGroup2 + Група кнопок 2 + + + CheckBox1 + Прапорець 1 + + + CheckBox2 + Прапорець 2 + + + LineEdit + Поле введення + + + ComboBox + Випадаючий список + + + PushButton + Кнопка + + + <p> +<a href="http://qt.nokia.com">http://qt.nokia.com</a> +</p> +<p> +<a href="http://www.kde.org">http://www.kde.org</a> +</p> + <p> +<a href="http://qt.nokia.com">http://qt.nokia.com</a> +</p> +<p> +<a href="http://www.kde.org">http://www.kde.org</a> +</p> + + + diff --git a/translations/qvfb_uk.ts b/translations/qvfb_uk.ts new file mode 100644 index 0000000..142863b --- /dev/null +++ b/translations/qvfb_uk.ts @@ -0,0 +1,276 @@ + + + + + AnimationSaveWidget + + Record + Записати + + + Reset + Відновити + + + Save + Зберегти + + + Save in MPEG format (requires netpbm package installed) + Зберегти в форматі MPEG (необхідний встановлений пакунок netpbm) + + + Click record to begin recording. + Клацніть "Записати", щоб розпочати запис. + + + Finished saving. + Збереження завершено. + + + Paused. Click record to resume, or save if done. + Зупинено. Клацніть "Записати", щоб продовжити, або "Зберегти" якщо готово. + + + Pause + Пауза + + + Recording... + Записую... + + + Saving... + Зберігаю... + + + Save animation... + Зберегти анімацію... + + + Save canceled. + Збереження скасовано. + + + Save failed! + Збереження провалилось! + + + + Config + + Configure + Конфігурування + + + Size + Розмір + + + 176x220 "SmartPhone" + 176x220 "Смартфон" + + + 240x320 "PDA" + 240x320 "PDA" + + + 320x240 "TV" / "QVGA" + 320x240 "TV" / "QVGA" + + + 640x480 "VGA" + 640x480 "VGA" + + + 800x480 + 800x480 + + + 800x600 + 800x600 + + + 1024x768 + 1024x768 + + + Custom + Користувацький + + + Depth + Глибина кольору + + + 1 bit monochrome + 1 біт монохромний + + + 2 bit grayscale + 2 біти сірий + + + 4 bit grayscale + 4 біти сірий + + + 8 bit + 8 біт + + + 12 (16) bit + 12 (16) біт + + + 15 bit + 15 біт + + + 16 bit + 16 біт + + + 18 bit + 18 біт + + + 24 bit + 24 біти + + + 32 bit + 32 біти + + + 32 bit ARGB + 32 біти ARGB + + + Swap red and blue channels + Поміняти червоний та блакитний канали + + + BGR format + Формат BGR + + + Skin + Обкладинка + + + None + Немає + + + Emulate touch screen (no mouse move) + Емулювати тачскрін (без пересувань миші) + + + Emulate LCD screen (Only with fixed zoom of 3.0 times magnification) + Емулювати LCD-екран (Лише фіксований масштаб з 3x збільшенням) + + + <p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth <i>above</i>. You may freely modify the Gamma <i>below</i>. + <p>Зверніть увагу, що будь-який додаток, який використовує віртуальний фреймбуфер буде закрито, якщо ви зміните розмір чи глибину кольору <i>зверху</i>. Ви можете довільно змінювати гамму <i>знизу</i>. + + + Gamma + Гамма + + + Blue + Блакитний + + + 1.0 + 1,0 + + + Green + Зелений + + + All + Усі + + + Red + Червоний + + + Set all to 1.0 + Встановити усі в 1.0 + + + &OK + &OK + + + &Cancel + &Скасувати + + + + DeviceSkin + + The image file '%1' could not be loaded. + Неможливо завантажити файл зображення '%1'. + + + The skin directory '%1' does not contain a configuration file. + Тека обкладинки '%1' не містить конфігураційного файлу. + + + The skin configuration file '%1' could not be opened. + Неможливо відкрити конфігураційний файл '%1'. + + + The skin configuration file '%1' could not be read: %2 + Неможливо прочитати конфігураційний файл '%1': %2 + + + Syntax error: %1 + Синтаксична помилка: %1 + + + The skin "up" image file '%1' does not exist. + Зображення обкладинки "вгору" '%1' не існує. + + + The skin "down" image file '%1' does not exist. + Зображення обкладинки "вниз" '%1' не існує. + + + The skin "closed" image file '%1' does not exist. + Зображення обкладинки "закрито" '%1' не існує. + + + The skin cursor image file '%1' does not exist. + Зображення обкладинки для курсору '%1' не існує. + + + Syntax error in area definition: %1 + Синтаксична помилка в описі області: %1 + + + Mismatch in number of areas, expected %1, got %2. + Не співпадає кількість областей, очікувалось %1, отримано %2. + + + + QVFb + + Browse... + Оглянути... + + + Load Custom Skin... + Завантажити обкладинку користувача... + + + All QVFB Skins (*.skin) + Усі обкладинки QVFB (*.skin) + + + -- cgit v0.12 From 23e5a48e77f1b30905fbc6d4fa8d91b88d152c0d Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 12:59:14 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/index.qdoc | 3 ++- doc/src/overviews.qdoc | 1 - doc/src/windows-and-dialogs/dialogs.qdoc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index ded57f5..1032e30 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -66,7 +66,8 @@
      -
    • Basic Qt Architecture
      • +
    • Qt Basic Concepts
      • +
    • Qt GUI Concepts
    • Cross-platform & Platform-specific Development
    • Qt & standard technologies
    • Qt How-to's & best practices
      • diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index b72df98..a1773a3 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -29,7 +29,6 @@ \page overviews.html \title All Overviews and HOWTOs - \ingroup qt-basic-concepts \generatelist overviews */ diff --git a/doc/src/windows-and-dialogs/dialogs.qdoc b/doc/src/windows-and-dialogs/dialogs.qdoc index f6649fd..960d7be 100644 --- a/doc/src/windows-and-dialogs/dialogs.qdoc +++ b/doc/src/windows-and-dialogs/dialogs.qdoc @@ -28,12 +28,12 @@ /*! \group standard-dialogs \ingroup qt-basic-concepts - \title Standard Dialog Classes + \title Standard Dialogs + \brief A list of Qt classes for implementing standard dialogs. */ /*! \group dialog-classes - \ingroup qt-basic-concepts \title Classes for Building Dialogs */ -- cgit v0.12 From d3ab1fccea2b1e011e7518269a29045a53f0a30b Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Mon, 9 Aug 2010 09:47:31 +0300 Subject: Pending surface might not get destroyed if no flush() happens in between graphics system change. This patch ensures that all old surfaces are destroyed before new graphics system is activated. Reviewed-by: Jason Barron --- src/gui/kernel/qapplication_s60.cpp | 2 +- src/gui/painting/qgraphicssystem_runtime.cpp | 19 ++++++------------- src/gui/painting/qgraphicssystem_runtime_p.h | 4 ++-- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index a14b1a7..c3824f9 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1067,7 +1067,7 @@ void QSymbianControl::Draw(const TRect& controlRect) const if (QApplicationPrivate::runtime_graphics_system) { QRuntimeWindowSurface *rtSurface = static_cast(qwidget->windowSurface()); - s60Surface = static_cast(rtSurface->m_windowSurface); + s60Surface = static_cast(rtSurface->m_windowSurface.data()); } else #endif s60Surface = static_cast(qwidget->windowSurface()); diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp index be04df6..e1e0ad0 100644 --- a/src/gui/painting/qgraphicssystem_runtime.cpp +++ b/src/gui/painting/qgraphicssystem_runtime.cpp @@ -251,7 +251,7 @@ QPixmapData* QRuntimePixmapData::runtimeData() const } QRuntimeWindowSurface::QRuntimeWindowSurface(const QRuntimeGraphicsSystem *gs, QWidget *window) - : QWindowSurface(window), m_windowSurface(0), m_pendingWindowSurface(0), m_graphicsSystem(gs) + : QWindowSurface(window), m_graphicsSystem(gs) { } @@ -259,7 +259,6 @@ QRuntimeWindowSurface::QRuntimeWindowSurface(const QRuntimeGraphicsSystem *gs, Q QRuntimeWindowSurface::~QRuntimeWindowSurface() { m_graphicsSystem->removeWindowSurface(this); - delete m_windowSurface; } QPaintDevice *QRuntimeWindowSurface::paintDevice() @@ -278,8 +277,7 @@ void QRuntimeWindowSurface::flush(QWidget *widget, const QRegion ®ion, #ifdef QT_DEBUG qDebug() << "QRuntimeWindowSurface::flush() - destroy pending window surface"; #endif - delete m_pendingWindowSurface; - m_pendingWindowSurface = 0; + m_pendingWindowSurface.reset(); } } @@ -355,7 +353,7 @@ QWindowSurface *QRuntimeGraphicsSystem::createWindowSurface(QWidget *widget) con { Q_ASSERT(m_graphicsSystem); QRuntimeWindowSurface *rtSurface = new QRuntimeWindowSurface(this, widget); - rtSurface->m_windowSurface = m_graphicsSystem->createWindowSurface(widget); + rtSurface->m_windowSurface.reset(m_graphicsSystem->createWindowSurface(widget)); widget->setWindowSurface(rtSurface); m_windowSurfaces << rtSurface; return rtSurface; @@ -379,7 +377,6 @@ void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name) for (int i = 0; i < m_pixmapDatas.size(); ++i) { QRuntimePixmapData *proxy = m_pixmapDatas.at(i); QPixmapData *newData = m_graphicsSystem->createPixmapData(proxy->m_data); - // ### TODO Optimize. Openvg and s60raster graphics systems could switch internal ARGB32_PRE QImage buffers. newData->fromImage(proxy->m_data->toImage(), Qt::NoOpaqueDetection); delete proxy->m_data; proxy->m_data = newData; @@ -390,14 +387,10 @@ void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name) QRuntimeWindowSurface *proxy = m_windowSurfaces.at(i); QWidget *widget = proxy->m_windowSurface->window(); - if(m_windowSurfaceDestroyPolicy == DestroyImmediately) { - delete proxy->m_windowSurface; - proxy->m_pendingWindowSurface = 0; - } else { - proxy->m_pendingWindowSurface = proxy->m_windowSurface; - } + if(m_windowSurfaceDestroyPolicy == DestroyAfterFirstFlush) + proxy->m_pendingWindowSurface.reset(proxy->m_windowSurface.take()); - proxy->m_windowSurface = m_graphicsSystem->createWindowSurface(widget); + proxy->m_windowSurface.reset(m_graphicsSystem->createWindowSurface(widget)); qt_widget_private(widget)->invalidateBuffer(widget->rect()); } } diff --git a/src/gui/painting/qgraphicssystem_runtime_p.h b/src/gui/painting/qgraphicssystem_runtime_p.h index d4c9152..0232241 100644 --- a/src/gui/painting/qgraphicssystem_runtime_p.h +++ b/src/gui/painting/qgraphicssystem_runtime_p.h @@ -129,8 +129,8 @@ public: virtual QPoint offset(const QWidget *widget) const; - QWindowSurface *m_windowSurface; - QWindowSurface *m_pendingWindowSurface; + QScopedPointer m_windowSurface; + QScopedPointer m_pendingWindowSurface; private: const QRuntimeGraphicsSystem *m_graphicsSystem; -- cgit v0.12 From 24742e54332a71db0bc5ae7b1632924ae592aea7 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Mon, 9 Aug 2010 13:39:51 +0200 Subject: OpenGL: Fix multisample renderbuffer creation when MAX_SAMPLES is 0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, we would try to create one with samples = 1 anyway, potentially resulting in an INVALID_VALUE error. Task-number: QTBUG-12757 Reviewed-by: Samuel Rødal --- src/opengl/qglframebufferobject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index deffc20..9b8a3d1 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -445,11 +445,11 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz, GLint maxSamples; glGetIntegerv(GL_MAX_SAMPLES_EXT, &maxSamples); - samples = qBound(1, int(samples), int(maxSamples)); + samples = qBound(0, int(samples), int(maxSamples)); glGenRenderbuffers(1, &color_buffer); glBindRenderbuffer(GL_RENDERBUFFER_EXT, color_buffer); - if (glRenderbufferStorageMultisampleEXT) { + if (glRenderbufferStorageMultisampleEXT && samples > 0) { glRenderbufferStorageMultisampleEXT(GL_RENDERBUFFER_EXT, samples, internal_format, size.width(), size.height()); } else { -- cgit v0.12 From 7d39a66fe88c039876285b21b592de20cf2e78ed Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 13:40:48 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/widgets-and-layouts/widgets.qdoc | 1 - doc/src/windows-and-dialogs/dialogs.qdoc | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc index baf3dce..fbce744 100644 --- a/doc/src/widgets-and-layouts/widgets.qdoc +++ b/doc/src/widgets-and-layouts/widgets.qdoc @@ -29,7 +29,6 @@ \page widgets-and-layouts.html \title Widgets and Layouts \ingroup qt-gui-concepts - \ingroup qt-basic-concepts \brief The primary elements for designing user interfaces in Qt. \section1 Widgets diff --git a/doc/src/windows-and-dialogs/dialogs.qdoc b/doc/src/windows-and-dialogs/dialogs.qdoc index 960d7be..bcf9c0e 100644 --- a/doc/src/windows-and-dialogs/dialogs.qdoc +++ b/doc/src/windows-and-dialogs/dialogs.qdoc @@ -27,17 +27,12 @@ /*! \group standard-dialogs - \ingroup qt-basic-concepts + \ingroup qt-gui-concepts \title Standard Dialogs \brief A list of Qt classes for implementing standard dialogs. */ /*! - \group dialog-classes - \title Classes for Building Dialogs -*/ - -/*! \page dialogs.html \title Dialog Windows \ingroup qt-gui-concepts -- cgit v0.12 From 631b56c7e8e628c3399faeab3932338195073a38 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 13:45:12 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/index.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 1032e30..c1c63da 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -68,7 +68,7 @@
    • Qt Basic Concepts
    • Qt GUI Concepts
      • -
    • Cross-platform & Platform-specific Development
      • +
    • Cross-platform & Platform-specific dev
    • Qt & standard technologies
    • Qt How-to's & best practices
    -- cgit v0.12 From 75bd4d9b1f14b1aea085af3f6714c06ab6ae1cd2 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Mon, 9 Aug 2010 16:11:30 +1000 Subject: PathView required some diagonal movement before a drag was initiated. Any movement beyond the threshold is sufficient. Task-number: 12747 Reviewed-by: Joona Petrell --- src/declarative/graphicsitems/qdeclarativepathview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp index 06ac275..5771f84 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp @@ -1061,7 +1061,7 @@ void QDeclarativePathView::mouseMoveEvent(QGraphicsSceneMouseEvent *event) if (!d->stealMouse) { QPointF delta = event->pos() - d->startPoint; - if (qAbs(delta.x()) > QApplication::startDragDistance() && qAbs(delta.y()) > QApplication::startDragDistance()) + if (qAbs(delta.x()) > QApplication::startDragDistance() || qAbs(delta.y()) > QApplication::startDragDistance()) d->stealMouse = true; } -- cgit v0.12 From 5f611f5a68a0994b46dbe696e5275c4fb40b7470 Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Mon, 9 Aug 2010 10:58:23 +1000 Subject: Explain Flipable example further --- src/declarative/graphicsitems/qdeclarativeflipable.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp index 8c9d2dd..b266273 100644 --- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp @@ -83,10 +83,16 @@ public: \image flipable.gif - The \l Rotation element is used to specify the angle and axis of the flip, - and the \l State defines the changes in angle which produce the flipping - effect. Finally, the \l Transition creates the animation that changes the - angle over one second. + The \l Rotation element is used to specify the angle and axis of the flip. + When \c flipped is \c true, the item changes to the "back" state, where + the angle is changed to 180 degrees to produce the flipping effect. + Finally, the \l Transition creates the animation that changes the + angle over one second: when the item changes between its "back" and + default states, the NumberAnimation animates the angle between + its old and new values. + + See the \l {QML States} and \l {QML Animation} documentation for more + details on state changes and how animations work within transitions. \sa {declarative/ui-components/flipable}{Flipable example} */ -- cgit v0.12 From 7c05fdc74c6ad04c549bf367f68e3f9d8d2c438d Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Mon, 9 Aug 2010 10:58:43 +1000 Subject: Merge sections about when property and default state --- doc/src/declarative/qdeclarativestates.qdoc | 95 ++++++++++++++++++----------- 1 file changed, 59 insertions(+), 36 deletions(-) diff --git a/doc/src/declarative/qdeclarativestates.qdoc b/doc/src/declarative/qdeclarativestates.qdoc index 0b91756..274040a 100644 --- a/doc/src/declarative/qdeclarativestates.qdoc +++ b/doc/src/declarative/qdeclarativestates.qdoc @@ -84,18 +84,34 @@ Rectangle. \snippet doc/src/snippets/declarative/states.qml 0 -A \l State item defines all the changes to be made in the new state. You +The \l State item defines all the changes to be made in the new state. It could specify additional properties to be changed, or create additional -PropertyChanges for other objects. (Note that a \l State can modify the -properties of other objects, not just the object that owns the state.) +PropertyChanges for other objects. It can also modify the properties of other +objects, not just the object that owns the state. For example: -For example: +\qml +Rectangle { + ... + states: [ + State { + name: "moved" + PropertyChanges { target: myRect; x: 50; y: 50; color: "blue" } + PropertyChanges { target: someOtherItem; width: 1000 } + } + ] +} +\endqml + +As a convenience, if an item only has one state, its \l {Item::}{states} +property can be defined as a single \l State, without the square-brace list +syntax: \qml -State { - name: "moved" - PropertyChanges { target: myRect; x: 50; y: 50; color: "blue" } - PropertyChanges { target: someOtherItem; width: 1000 } +Item { + ... + states: State { + ... + } } \endqml @@ -118,54 +134,61 @@ transitions between them. Of course, the \l Rectangle in the example above could have simply been moved by setting its position to (50, 50) in the mouse area's \c onClicked handler. -However, aside from enabling batched property changes, the use of states allows -an item to revert to its \e {default state}, which contains all of the items' -initial property values before they were modified in a state change. +However, aside from enabling batched property changes, one of the features of +QML states is the ability of an item to revert to its \e {default state}. +The default state contains all of an item's initial property values before +they were modified in a state change. -The default state is specified by an empty string. If the MouseArea in the -above example was changed to this: +For example, suppose the \l Rectangle should move to (50,50) when the mouse is +pressed, and then move back to its original position when the mouse is +released. This can be achieved by using the \l {State::}{when} property, +like this: -\qml -MouseArea { - anchors.fill: parent - onClicked: myRect.state == 'moved' ? myRect.state = "" : myRect.state = 'moved'; -} -\endqml - -This would toggle the \l Rectangle's state between the \e moved and \e default -states when clicked. The properties can be reverted to their initial -values without requiring the definition of another \l State that defines these -value changes. +\qml +Rectangle { + ... + MouseArea { + id: mouseArea + anchors.fill: parent + } + states: State { + name: "moved"; when: mouseArea.pressed + ... + } +} +\endqml -\section1 The "when" property +The \l {State::}{when} property is set to an expression that evaluates to +\c true when the item should be set to that state. When the mouse is pressed, +the state is changed to \e moved. When it is released, the item reverts to its +\e default state, which defines all of the item's original property values. -The \l {State::}{when} property is useful for specifying when a state should be -applied. This can be set to an expression that evaluates to \c true when an -item should change to a particular state. +Alternatively, an item can be explicitly set to its default state by setting its +\l {Item::}{state} property to an empty string (""). For example, instead of +using the \l {State::}{when} property, the above code could be changed to: -If the above example was changed to this: - \qml Rectangle { ... MouseArea { - id: mouseArea anchors.fill: parent + onPressed: myRect.state = 'moved'; + onReleased: myRect.state = ''; } states: State { - name: "moved"; when: mouseArea.pressed + name: "moved" ... } +} \endqml -The \l Rectangle would automatically change to the \e moved state when the -mouse is pressed, and revert to the default state when it is released. This is -simpler (and a better, more declarative method) than creating \c onPressed -and \c onReleased handlers in the MouseArea to set the current state. +Obviously it makes sense to use the \l {State::}{when} property when possible +as it provides a simpler (and a better, more declarative) solution than +assigning the state from signal handlers. \section1 Animating state changes -- cgit v0.12 From 380335c8b8afd302f2f3f783163b2563ee9a122a Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Mon, 9 Aug 2010 11:10:22 +1000 Subject: Mention QML_IMPORT_TRACE in Modules docs --- doc/src/declarative/modules.qdoc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc index 9e51a40..467b7d0 100644 --- a/doc/src/declarative/modules.qdoc +++ b/doc/src/declarative/modules.qdoc @@ -302,5 +302,13 @@ For examples of \c qmldir files for plugins, see the \l {declarative/cppextensions/plugins}{Plugins} example and \l {Tutorial: Writing QML extensions with C++}. + +\section1 Debugging + +The \c QML_IMPORT_TRACE environment variable can be useful for debugging +when there are problems with finding and loading modules. See +\l{Debugging module imports} for more information. + + */ / -- cgit v0.12 From 45f6c749ff5f1773a5a52f1b40278ad390f3ae59 Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Mon, 9 Aug 2010 17:08:23 +1000 Subject: XmlListModel doc fixes Task-number: QTBUG-12749 --- src/declarative/util/qdeclarativexmllistmodel.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp index 7c1e1fd..8bd829e 100644 --- a/src/declarative/util/qdeclarativexmllistmodel.cpp +++ b/src/declarative/util/qdeclarativexmllistmodel.cpp @@ -560,7 +560,7 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListPropertyprogress; } +/*! + \qmlmethod void XmlListModel::errorString() + + Returns a string description of the last error that occurred + if \l status is XmlListModel::Error. +*/ QString QDeclarativeXmlListModel::errorString() const { Q_D(const QDeclarativeXmlListModel); -- cgit v0.12 From 7829343dc9e12befd6c471cc72d00139bad5d42b Mon Sep 17 00:00:00 2001 From: Carlos Manuel Duclos Vergara Date: Mon, 9 Aug 2010 13:42:26 +0200 Subject: CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit That code is deprecated for the most part, however under certain circumstances could be run. The fix is to check the value when using the deprecated code and change the return value to follow the logic of the new code. Task-number: QTBUG-12732 Reviewed-by: João Abecasis --- src/corelib/io/qfsfileengine_win.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index 21930e1..35fa04b 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -1958,6 +1958,10 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + // Since this is a special case, we check if the return value was NULL and if so + // we change it to INVALID_HANDLE_VALUE to follow the logic inside this function. + if(0 == handle) + handle = INVALID_HANDLE_VALUE; #endif if (handle == INVALID_HANDLE_VALUE) { -- cgit v0.12 From eea84818e98af917d3cf2bf04ea17a416ef9d55e Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Mon, 9 Aug 2010 13:55:23 +0200 Subject: Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938. Reviewer: David Boddie Task number: QTBUG-11938 --- demos/books/bookwindow.cpp | 2 +- demos/browser/browsermainwindow.cpp | 2 +- demos/browser/webview.cpp | 2 +- demos/qtdemo/menumanager.cpp | 2 +- src/corelib/concurrent/qtconcurrentfilter.cpp | 2 +- src/corelib/concurrent/qtconcurrentmap.cpp | 2 +- src/corelib/concurrent/qtconcurrentresultstore.cpp | 2 +- src/corelib/io/qfileinfo.cpp | 4 ++-- src/corelib/thread/qmutexpool.cpp | 2 +- src/corelib/tools/qbytearraymatcher.h | 2 +- src/corelib/tools/qstringmatcher.h | 2 +- src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp | 2 +- src/declarative/qml/qdeclarativecompiledbindings.cpp | 2 +- src/declarative/qml/qdeclarativecomponent.cpp | 4 ++-- src/declarative/qml/qdeclarativeimageprovider.cpp | 2 +- src/declarative/qml/qdeclarativeinstruction.cpp | 2 +- src/declarative/qml/qdeclarativeproperty.cpp | 2 +- src/declarative/qml/qdeclarativescriptparser.cpp | 2 +- src/gui/embedded/qkbdlinuxinput_qws.cpp | 2 +- src/gui/embedded/qkbdqnx_qws.cpp | 2 +- src/gui/itemviews/qsortfilterproxymodel.cpp | 2 +- src/gui/kernel/qapplication_s60.cpp | 4 ++-- src/gui/kernel/qwidget_win.cpp | 4 ++-- src/gui/widgets/qcommandlinkbutton.cpp | 2 +- src/gui/widgets/qmainwindowlayout.cpp | 2 +- src/gui/widgets/qmenu.cpp | 4 ++-- src/gui/widgets/qmenubar.cpp | 2 +- src/gui/widgets/qprintpreviewwidget.cpp | 2 +- src/gui/widgets/qtoolbarextension.cpp | 2 +- src/network/kernel/qhostinfo.cpp | 2 +- src/network/socket/qabstractsocket.cpp | 2 +- src/network/socket/qlocalsocket_win.cpp | 2 +- src/network/socket/qnativesocketengine_unix.cpp | 2 +- src/network/ssl/qsslsocket.cpp | 2 +- src/opengl/qgl.cpp | 2 +- src/qt3support/widgets/q3gridview.cpp | 2 +- src/script/api/qscriptcontext.cpp | 2 +- src/tools/moc/moc.cpp | 2 +- tools/qdoc3/htmlgenerator.cpp | 4 ++-- 39 files changed, 45 insertions(+), 45 deletions(-) diff --git a/demos/books/bookwindow.cpp b/demos/books/bookwindow.cpp index 089d5e0..c801283 100644 --- a/demos/books/bookwindow.cpp +++ b/demos/books/bookwindow.cpp @@ -64,7 +64,7 @@ BookWindow::BookWindow() model->setEditStrategy(QSqlTableModel::OnManualSubmit); model->setTable("books"); - // Remeber the indexes of the columns + // Remember the indexes of the columns authorIdx = model->fieldIndex("author"); genreIdx = model->fieldIndex("genre"); diff --git a/demos/browser/browsermainwindow.cpp b/demos/browser/browsermainwindow.cpp index 8c2ed89..50c2cf8 100644 --- a/demos/browser/browsermainwindow.cpp +++ b/demos/browser/browsermainwindow.cpp @@ -670,7 +670,7 @@ void BrowserMainWindow::slotPrivateBrowsing() " items are automatically removed from the Downloads window," \ " new cookies are not stored, current cookies can't be accessed," \ " site icons wont be stored, session wont be saved, " \ - " and searches are not addded to the pop-up menu in the Google search box." \ + " and searches are not added to the pop-up menu in the Google search box." \ " Until you close the window, you can still click the Back and Forward buttons" \ " to return to the webpages you have opened.").arg(title); diff --git a/demos/browser/webview.cpp b/demos/browser/webview.cpp index 2f9b3e6..2cbd2f1 100644 --- a/demos/browser/webview.cpp +++ b/demos/browser/webview.cpp @@ -260,7 +260,7 @@ void WebView::setProgress(int progress) void WebView::loadFinished() { if (100 != m_progress) { - qWarning() << "Recieved finished signal while progress is still:" << progress() + qWarning() << "Received finished signal while progress is still:" << progress() << "Url:" << url(); } m_progress = 0; diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp index c9ffecb..5b851b4 100644 --- a/demos/qtdemo/menumanager.cpp +++ b/demos/qtdemo/menumanager.cpp @@ -449,7 +449,7 @@ void MenuManager::init(MainWindow *window) window->scene->setStickyFocus(true); window->setFocus(); }else{ - qDebug() << "Error intializing QML subsystem, Declarative examples will not work"; + qDebug() << "Error initializing QML subsystem, Declarative examples will not work"; } } diff --git a/src/corelib/concurrent/qtconcurrentfilter.cpp b/src/corelib/concurrent/qtconcurrentfilter.cpp index 36febe7..29c3edb 100644 --- a/src/corelib/concurrent/qtconcurrentfilter.cpp +++ b/src/corelib/concurrent/qtconcurrentfilter.cpp @@ -117,7 +117,7 @@ function, and should merge the \e{intermediate} into the \e{result} variable. QtConcurrent::filteredReduced() guarantees that only one thread will call reduce at a time, so using a mutex to lock the result variable - is not neccesary. The QtConcurrent::ReduceOptions enum provides a way to + is not necessary. The QtConcurrent::ReduceOptions enum provides a way to control the order in which the reduction is done. \section1 Additional API Features diff --git a/src/corelib/concurrent/qtconcurrentmap.cpp b/src/corelib/concurrent/qtconcurrentmap.cpp index e74d69c..4303ff6 100644 --- a/src/corelib/concurrent/qtconcurrentmap.cpp +++ b/src/corelib/concurrent/qtconcurrentmap.cpp @@ -161,7 +161,7 @@ function, and should merge the \e{intermediate} into the \e{result} variable. QtConcurrent::mappedReduced() guarantees that only one thread will call reduce at a time, so using a mutex to lock the result variable - is not neccesary. The QtConcurrent::ReduceOptions enum provides a way to + is not necessary. The QtConcurrent::ReduceOptions enum provides a way to control the order in which the reduction is done. If QtConcurrent::UnorderedReduce is used (the default), the order is undefined, while QtConcurrent::OrderedReduce ensures that the reduction diff --git a/src/corelib/concurrent/qtconcurrentresultstore.cpp b/src/corelib/concurrent/qtconcurrentresultstore.cpp index ad4b2cf..65f3afa 100644 --- a/src/corelib/concurrent/qtconcurrentresultstore.cpp +++ b/src/corelib/concurrent/qtconcurrentresultstore.cpp @@ -236,7 +236,7 @@ int ResultStoreBase::count() const return resultCount; } -// returns the insert index, calling this funciton with +// returns the insert index, calling this function with // index equal to -1 returns the next available index. int ResultStoreBase::updateInsertIndex(int index, int _count) { diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index 37591c5..61f7180 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -797,12 +797,12 @@ QString QFileInfo::suffix() const \bold{Note:} The QDir returned always corresponds to the object's parent directory, even if the QFileInfo represents a directory. - For each of the follwing, dir() returns a QDir for + For each of the following, dir() returns a QDir for \c{"~/examples/191697"}. \snippet doc/src/snippets/fileinfo/main.cpp 0 - For each of the follwing, dir() returns a QDir for + For each of the following, dir() returns a QDir for \c{"."}. \snippet doc/src/snippets/fileinfo/main.cpp 1 diff --git a/src/corelib/thread/qmutexpool.cpp b/src/corelib/thread/qmutexpool.cpp index d9abdc5..59211fb 100644 --- a/src/corelib/thread/qmutexpool.cpp +++ b/src/corelib/thread/qmutexpool.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -// qt_global_mutexpool is here for backwards compatability only, +// qt_global_mutexpool is here for backwards compatibility only, // use QMutexpool::instance() in new clode. Q_CORE_EXPORT QMutexPool *qt_global_mutexpool = 0; Q_GLOBAL_STATIC_WITH_ARGS(QMutexPool, globalMutexPool, (QMutex::Recursive)) diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h index 8e7bc21..d3db4e9 100644 --- a/src/corelib/tools/qbytearraymatcher.h +++ b/src/corelib/tools/qbytearraymatcher.h @@ -78,7 +78,7 @@ private: QByteArrayMatcherPrivate *d; QByteArray q_pattern; #ifdef Q_CC_RVCT -// explicitely allow anonymous unions for RVCT to prevent compiler warnings +// explicitly allow anonymous unions for RVCT to prevent compiler warnings # pragma push # pragma anon_unions #endif diff --git a/src/corelib/tools/qstringmatcher.h b/src/corelib/tools/qstringmatcher.h index 1aafcb8..451aeb6 100644 --- a/src/corelib/tools/qstringmatcher.h +++ b/src/corelib/tools/qstringmatcher.h @@ -78,7 +78,7 @@ private: QString q_pattern; Qt::CaseSensitivity q_cs; #ifdef Q_CC_RVCT -// explicitely allow anonymous unions for RVCT to prevent compiler warnings +// explicitly allow anonymous unions for RVCT to prevent compiler warnings # pragma push # pragma anon_unions #endif diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp index ceb1961..a489b5a 100644 --- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp +++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp @@ -525,7 +525,7 @@ QVariant QDeclarativeVisualDataModelDataMetaObject::initialValue(int propId) QVariant value = model->m_listModelInterface->data(data->m_index, *it); return value; } else if (model->m_roles.count() == 1 && propName == "modelData") { - //for compatability with other lists, assign modelData if there is only a single role + //for compatibility with other lists, assign modelData if there is only a single role QVariant value = model->m_listModelInterface->data(data->m_index, model->m_roles.first()); return value; } diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp index 507e47b..723da94 100644 --- a/src/declarative/qml/qdeclarativecompiledbindings.cpp +++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp @@ -1628,7 +1628,7 @@ void QDeclarativeBindingCompiler::dump(const QByteArray &programData) /*! Clear the state associated with attempting to compile a specific binding. -This does not clear the global "commited binding" states. +This does not clear the global "committed binding" states. */ void QDeclarativeBindingCompilerPrivate::resetInstanceState() { diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index 1d48b1a..5f4a063 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -192,7 +192,7 @@ class QByteArray; \value Null This QDeclarativeComponent has no data. Call loadUrl() or setData() to add QML content. \value Ready This QDeclarativeComponent is ready and create() may be called. \value Loading This QDeclarativeComponent is loading network data. - \value Error An error has occured. Call errors() to retrieve a list of \{QDeclarativeError}{errors}. + \value Error An error has occurred. Call errors() to retrieve a list of \{QDeclarativeError}{errors}. */ void QDeclarativeComponentPrivate::typeDataReady() @@ -518,7 +518,7 @@ void QDeclarativeComponent::loadUrl(const QUrl &url) } /*! - Return the list of errors that occured during the last compile or create + Return the list of errors that occurred during the last compile or create operation. An empty list is returned if isError() is not set. */ QList QDeclarativeComponent::errors() const diff --git a/src/declarative/qml/qdeclarativeimageprovider.cpp b/src/declarative/qml/qdeclarativeimageprovider.cpp index 241df87..27269b7 100644 --- a/src/declarative/qml/qdeclarativeimageprovider.cpp +++ b/src/declarative/qml/qdeclarativeimageprovider.cpp @@ -112,7 +112,7 @@ public: } \endcode - Now the images can be succesfully loaded in QML: + Now the images can be successfully loaded in QML: \image imageprovider.png diff --git a/src/declarative/qml/qdeclarativeinstruction.cpp b/src/declarative/qml/qdeclarativeinstruction.cpp index 0f7b09d..1767d2f 100644 --- a/src/declarative/qml/qdeclarativeinstruction.cpp +++ b/src/declarative/qml/qdeclarativeinstruction.cpp @@ -218,7 +218,7 @@ void QDeclarativeCompiledData::dump(QDeclarativeInstruction *instr, int idx) qWarning().nospace() << idx << "\t\t" << line << "\t" << "DEFER" << "\t\t\t" << instr->defer.deferCount; break; default: - qWarning().nospace() << idx << "\t\t" << line << "\t" << "XXX UNKOWN INSTRUCTION" << "\t" << instr->type; + qWarning().nospace() << idx << "\t\t" << line << "\t" << "XXX UNKNOWN INSTRUCTION" << "\t" << instr->type; break; } #endif // QT_NO_DEBUG_STREAM diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp index 071dd07..515c4d6 100644 --- a/src/declarative/qml/qdeclarativeproperty.cpp +++ b/src/declarative/qml/qdeclarativeproperty.cpp @@ -640,7 +640,7 @@ QDeclarativePropertyPrivate::binding(const QDeclarativeProperty &that) is assumed by the caller. \a flags is passed through to the binding and is used for the initial update (when - the binding sets the intial value, it will use these flags for the write). + the binding sets the initial value, it will use these flags for the write). */ QDeclarativeAbstractBinding * QDeclarativePropertyPrivate::setBinding(const QDeclarativeProperty &that, diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp index f703cf5..0657f49 100644 --- a/src/declarative/qml/qdeclarativescriptparser.cpp +++ b/src/declarative/qml/qdeclarativescriptparser.cpp @@ -760,7 +760,7 @@ bool ProcessAST::visit(AST::UiArrayBinding *node) prop->listValueRange.offset = node->lbracketToken.offset; prop->listValueRange.length = node->rbracketToken.offset + node->rbracketToken.length - node->lbracketToken.offset; - // Store the positions of the comma token too, again for the DOM to be able to retreive it. + // Store the positions of the comma token too, again for the DOM to be able to retrieve it. prop->listCommaPositions = collectCommas(node->members); while (propertyCount--) diff --git a/src/gui/embedded/qkbdlinuxinput_qws.cpp b/src/gui/embedded/qkbdlinuxinput_qws.cpp index 6c91a08..f53c444 100644 --- a/src/gui/embedded/qkbdlinuxinput_qws.cpp +++ b/src/gui/embedded/qkbdlinuxinput_qws.cpp @@ -138,7 +138,7 @@ QWSLinuxInputKbPrivate::QWSLinuxInputKbPrivate(QWSLinuxInputKeyboardHandler *h, // record the original mode so we can restore it again in the destructor. ::ioctl(m_tty_fd, KDGKBMODE, &m_orig_kbmode); - // setting this tranlation mode is even needed in INPUT mode to prevent + // setting this translation mode is even needed in INPUT mode to prevent // the shell from also interpreting codes, if the process has a tty // attached: e.g. Ctrl+C wouldn't copy, but kill the application. ::ioctl(m_tty_fd, KDSKBMODE, K_MEDIUMRAW); diff --git a/src/gui/embedded/qkbdqnx_qws.cpp b/src/gui/embedded/qkbdqnx_qws.cpp index fbc683e..72d1cb5 100644 --- a/src/gui/embedded/qkbdqnx_qws.cpp +++ b/src/gui/embedded/qkbdqnx_qws.cpp @@ -150,7 +150,7 @@ void QWSQnxKeyboardHandler::socketActivated() // figure out whether it's a press bool isPress = packet.data.key_cap & KEY_DOWN; - // figure out wheter the key is still pressed and the key event is repeated + // figure out whether the key is still pressed and the key event is repeated bool isRepeat = packet.data.key_cap & KEY_REPEAT; Qt::Key key = Qt::Key_unknown; diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp index f9b6b94..953a7f1 100644 --- a/src/gui/itemviews/qsortfilterproxymodel.cpp +++ b/src/gui/itemviews/qsortfilterproxymodel.cpp @@ -774,7 +774,7 @@ void QSortFilterProxyModelPrivate::source_items_inserted( if (model->rowCount(source_parent) == delta_item_count) { // Items were inserted where there were none before. // If it was new rows make sure to create mappings for columns so that a - // valid mapping can be retreived later and vice-versa. + // valid mapping can be retrieved later and vice-versa. QVector &orthogonal_proxy_to_source = (orient == Qt::Horizontal) ? m->source_rows : m->source_columns; QVector &orthogonal_source_to_proxy = (orient == Qt::Horizontal) ? m->proxy_rows : m->proxy_columns; diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 1f6a4ae..e36ebb9 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1328,7 +1328,7 @@ void qt_init(QApplicationPrivate * /* priv */, int) // framework destruction. TTrapHandler *origTrapHandler = User::TrapHandler(); - // The S60 framework has not been initalized. We need to do it. + // The S60 framework has not been initialized. We need to do it. TApaApplicationFactory factory(S60->s60ApplicationFactory ? S60->s60ApplicationFactory : newS60Application); CApaCommandLine* commandLine = 0; @@ -1506,7 +1506,7 @@ void qt_init(QApplicationPrivate * /* priv */, int) */ // Register WId with the metatype system. This is to enable - // QWidgetPrivate::create_sys to used delayed slot invokation in order + // QWidgetPrivate::create_sys to used delayed slot invocation in order // to destroy WId objects during reparenting. qRegisterMetaType("WId"); } diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp index 23f57da..59035b1 100644 --- a/src/gui/kernel/qwidget_win.cpp +++ b/src/gui/kernel/qwidget_win.cpp @@ -166,7 +166,7 @@ static void qt_tablet_init() qt_tablet_widget = new QWidget(0); qt_tablet_widget->createWinId(); qt_tablet_widget->setObjectName(QLatin1String("Qt internal tablet widget")); - // We dont need this internal widget to appear in QApplication::topLevelWidgets() + // We don't need this internal widget to appear in QApplication::topLevelWidgets() if (QWidgetPrivate::allWidgets) QWidgetPrivate::allWidgets->remove(qt_tablet_widget); LOGCONTEXT lcMine; @@ -1547,7 +1547,7 @@ bool QWidgetPrivate::shouldShowMaximizeButton() { if (data.window_flags & Qt::MSWindowsFixedSizeDialogHint) return false; - // if the user explicitely asked for the maximize button, we try to add + // if the user explicitly asked for the maximize button, we try to add // it even if the window has fixed size. if (data.window_flags & Qt::CustomizeWindowHint && data.window_flags & Qt::WindowMaximizeButtonHint) diff --git a/src/gui/widgets/qcommandlinkbutton.cpp b/src/gui/widgets/qcommandlinkbutton.cpp index d3b5869..a6f5f7d 100644 --- a/src/gui/widgets/qcommandlinkbutton.cpp +++ b/src/gui/widgets/qcommandlinkbutton.cpp @@ -349,7 +349,7 @@ void QCommandLinkButton::paintEvent(QPaintEvent *) QStyleOptionButton option; initStyleOption(&option); - //Enable command link appearence on Vista + //Enable command link appearance on Vista option.features |= QStyleOptionButton::CommandLinkButton; option.text = QString(); option.icon = QIcon(); //we draw this ourselves diff --git a/src/gui/widgets/qmainwindowlayout.cpp b/src/gui/widgets/qmainwindowlayout.cpp index 593e391..62ee398 100644 --- a/src/gui/widgets/qmainwindowlayout.cpp +++ b/src/gui/widgets/qmainwindowlayout.cpp @@ -943,7 +943,7 @@ void QMainWindowLayout::toggleToolBarsVisible() #ifdef Q_WS_MAC if (layoutState.mainWindow->unifiedTitleAndToolBarOnMac()) { // If we hit this case, someone has pressed the "toolbar button" which will - // toggle the unified toolbar visiblity, because that's what the user wants. + // toggle the unified toolbar visibility, because that's what the user wants. // We might be in a situation where someone has hidden all the toolbars // beforehand (maybe in construction), but now they've hit this button and // and are expecting the items to show. What do we do? diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index 7941c4e..4bea6de 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -262,7 +262,7 @@ void QMenuPrivate::updateActionRects() const const int deskFw = style->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, &opt, q); const int tearoffHeight = tearoff ? style->pixelMetric(QStyle::PM_MenuTearoffHeight, &opt, q) : 0; - //for compatability now - will have to refactor this away.. + //for compatibility now - will have to refactor this away tabWidth = 0; maxIconWidth = 0; hasCheckableItems = false; @@ -1154,7 +1154,7 @@ void QMenuPrivate::_q_actionHovered() bool QMenuPrivate::hasMouseMoved(const QPoint &globalPos) { - //determines if the mouse has moved (ie its intial position has + //determines if the mouse has moved (ie its initial position has //changed by more than QApplication::startDragDistance() //or if there were at least 6 mouse motions) return motions > 6 || diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index e8e80b7..df16f7f 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -102,7 +102,7 @@ void QMenuBarExtension::paintEvent(QPaintEvent *) QStylePainter p(this); QStyleOptionToolButton opt; initStyleOption(&opt); - // We do not need to draw both extention arrows + // We do not need to draw both extension arrows opt.features &= ~QStyleOptionToolButton::HasMenu; p.drawComplexControl(QStyle::CC_ToolButton, opt); } diff --git a/src/gui/widgets/qprintpreviewwidget.cpp b/src/gui/widgets/qprintpreviewwidget.cpp index 45b15ef..ea311d3 100644 --- a/src/gui/widgets/qprintpreviewwidget.cpp +++ b/src/gui/widgets/qprintpreviewwidget.cpp @@ -469,7 +469,7 @@ void QPrintPreviewWidgetPrivate::setZoomFactor(qreal _zoomFactor) \o Create the QPrintPreviewWidget Construct the QPrintPreviewWidget either by passing in an - exisiting QPrinter object, or have QPrintPreviewWidget create a + existing QPrinter object, or have QPrintPreviewWidget create a default constructed QPrinter object for you. \o Connect the paintRequested() signal to a slot. diff --git a/src/gui/widgets/qtoolbarextension.cpp b/src/gui/widgets/qtoolbarextension.cpp index 032c6f0..574a775 100644 --- a/src/gui/widgets/qtoolbarextension.cpp +++ b/src/gui/widgets/qtoolbarextension.cpp @@ -75,7 +75,7 @@ void QToolBarExtension::paintEvent(QPaintEvent *) QStylePainter p(this); QStyleOptionToolButton opt; initStyleOption(&opt); - // We do not need to draw both extention arrows + // We do not need to draw both extension arrows opt.features &= ~QStyleOptionToolButton::HasMenu; p.drawComplexControl(QStyle::CC_ToolButton, opt); } diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index 8ae1305..348b0d2 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -647,7 +647,7 @@ void QHostInfoLookupManager::lookupFinished(QHostInfoRunnable *r) work(); } -// This function returns immediatly when we had a result in the cache, else it will later emit a signal +// This function returns immediately when we had a result in the cache, else it will later emit a signal QHostInfo qt_qhostinfo_lookup(const QString &name, QObject *receiver, const char *member, bool *valid, int *id) { *valid = false; diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index b604e89..505db71 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -1380,7 +1380,7 @@ void QAbstractSocket::connectToHostImplementation(const QString &hostName, quint #endif } else { if (d->threadData->eventDispatcher) { - // this internal API for QHostInfo either immediatly gives us the desired + // this internal API for QHostInfo either immediately gives us the desired // QHostInfo from cache or later calls the _q_startConnecting slot. bool immediateResultValid = false; QHostInfo hostInfo = qt_qhostinfo_lookup(hostName, diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index 4907f2c..1e0bced 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -306,7 +306,7 @@ void QLocalSocketPrivate::startAsyncRead() /*! \internal Sets the correct size of the read buffer after a read operation. - Returns false, if an error occured or the connection dropped. + Returns false, if an error occurred or the connection dropped. */ bool QLocalSocketPrivate::completeAsyncRead() { diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index f91ce5f..fe28863 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -562,7 +562,7 @@ int QNativeSocketEnginePrivate::nativeAccept() #else int acceptedDescriptor = qt_safe_accept(socketDescriptor, 0, 0); #endif - //check if we have vaild descriptor at all + //check if we have valid descriptor at all if(acceptedDescriptor > 0) { // Ensure that the socket is closed on exec*() ::fcntl(acceptedDescriptor, F_SETFD, FD_CLOEXEC); diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index f73068e..91265f3 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -210,7 +210,7 @@ valid. On failure, QSslSocket will emit the QSslSocket::sslErrors() signal. This mode is the default for clients. - \value AutoVerifyPeer QSslSocket will automaticaly use QueryPeer for + \value AutoVerifyPeer QSslSocket will automatically use QueryPeer for server sockets and VerifyPeer for client sockets. \sa QSslSocket::peerVerifyMode() diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 6120a85..4daa866 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1991,7 +1991,7 @@ struct DDSFormat { option helps preserve this default behavior. \omitvalue CanFlipNativePixmapBindOption Used by x11 from pixmap to choose - wether or not it can bind the pixmap upside down or not. + whether or not it can bind the pixmap upside down or not. \omitvalue MemoryManagedBindOption Used by paint engines to indicate that the pixmap should be memory managed along side with diff --git a/src/qt3support/widgets/q3gridview.cpp b/src/qt3support/widgets/q3gridview.cpp index 343b49f..b270a38 100644 --- a/src/qt3support/widgets/q3gridview.cpp +++ b/src/qt3support/widgets/q3gridview.cpp @@ -84,7 +84,7 @@ using namespace Qt; size in a potentially scrollable canvas. If you need rows and columns with different sizes, use a Q3Table instead. If you need a simple list of items, use a Q3ListBox. If you need to present - hierachical data use a Q3ListView, and if you need random objects + hierarichal data use a Q3ListView, and if you need random objects at random positions, consider using either a Q3IconView or a Q3Canvas. */ diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp index 1a11100..abaf5f9 100644 --- a/src/script/api/qscriptcontext.cpp +++ b/src/script/api/qscriptcontext.cpp @@ -324,7 +324,7 @@ QScriptValue QScriptContext::argumentsObject() const When a function is called as constructor, the thisObject() contains the newly constructed object to be initialized. - \note This function is only guarenteed to work for a context + \note This function is only guaranteed to work for a context corresponding to native functions. */ bool QScriptContext::isCalledAsConstructor() const diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 84d1567..ac49d65 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -1211,7 +1211,7 @@ bool Moc::until(Token target) { //when searching commas within the default argument, we should take care of template depth (anglecount) // unfortunatelly, we do not have enough semantic information to know if '<' is the operator< or - // the begining of a template type. so we just use heuristics. + // the beginning of a template type. so we just use heuristics. int possible = -1; while (index < symbols.size()) { diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index d23b41e..eb33ce9 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -2027,7 +2027,7 @@ void HtmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *marker) } /*! - Generates a table of contents begining at \a node. + Generates a table of contents beginning at \a node. */ void HtmlGenerator::generateTableOfContents(const Node *node, CodeMarker *marker, @@ -2113,7 +2113,7 @@ void HtmlGenerator::generateTableOfContents(const Node *node, /*! Revised for the new doc format. - Generates a table of contents begining at \a node. + Generates a table of contents beginning at \a node. */ void HtmlGenerator::generateTableOfContents(const Node *node, CodeMarker *marker, -- cgit v0.12 From 6648d81c880012bad52380bd73bbe92d68260f7e Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 14:27:50 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/frameworks-technologies/dnd.qdoc | 1 - doc/src/index.qdoc | 14 +++++++------- doc/src/overviews.qdoc | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/doc/src/frameworks-technologies/dnd.qdoc b/doc/src/frameworks-technologies/dnd.qdoc index c5dd27c..ebfa39e 100644 --- a/doc/src/frameworks-technologies/dnd.qdoc +++ b/doc/src/frameworks-technologies/dnd.qdoc @@ -30,7 +30,6 @@ \title Drag and Drop \brief An overview of the drag and drop system provided by Qt. - \ingroup technology-apis \ingroup qt-gui-concepts Drag and drop provides a simple visual mechanism which users can use diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index c1c63da..0609eb8 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -65,11 +65,10 @@
    @@ -78,8 +77,9 @@
  • Qt Quick
  • Introduction to QML
  • QML Elements
    • -
  • UI components
    • - +
  • Model/View Programming
    • +
  • Network Programming
    • +
  • Graphics and Printing
    • diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index a1773a3..3c02705 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -63,7 +63,7 @@ /*! \group qt-graphics - \title Qt Graphics and Painting + \title Qt Graphics and Printing \brief The Qt components for doing graphics. -- cgit v0.12 From 720f4ca0ec3b42a101ac24b2cf74cdc87d29eac9 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 9 Aug 2010 14:11:46 +0200 Subject: Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator Task-number: QTBUG-9281 Reviewed-by: Denis --- src/corelib/tools/qstring.cpp | 13 ++++++++----- tests/auto/qstring/tst_qstring.cpp | 12 ++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index d6ab5da..2fd9a0b 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -6645,8 +6645,9 @@ QString QString::arg(qlonglong a, int fieldWidth, int base, const QChar &fillCha QString locale_arg; if (d.locale_occurrences > 0) { QLocale locale; - locale_arg = locale.d()->longLongToString(a, -1, base, fieldWidth, - flags | QLocalePrivate::ThousandsGroup); + if (!locale.numberOptions() & QLocale::OmitGroupSeparator) + flags |= QLocalePrivate::ThousandsGroup; + locale_arg = locale.d()->longLongToString(a, -1, base, fieldWidth, flags); } return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg, fillChar); @@ -6688,8 +6689,9 @@ QString QString::arg(qulonglong a, int fieldWidth, int base, const QChar &fillCh QString locale_arg; if (d.locale_occurrences > 0) { QLocale locale; - locale_arg = locale.d()->unsLongLongToString(a, -1, base, fieldWidth, - flags | QLocalePrivate::ThousandsGroup); + if (!locale.numberOptions() & QLocale::OmitGroupSeparator) + flags |= QLocalePrivate::ThousandsGroup; + locale_arg = locale.d()->unsLongLongToString(a, -1, base, fieldWidth, flags); } return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg, fillChar); @@ -6822,7 +6824,8 @@ QString QString::arg(double a, int fieldWidth, char fmt, int prec, const QChar & if (d.locale_occurrences > 0) { QLocale locale; - flags |= QLocalePrivate::ThousandsGroup; + if (!locale.numberOptions() & QLocale::OmitGroupSeparator) + flags |= QLocalePrivate::ThousandsGroup; locale_arg = locale.d()->doubleToString(a, prec, form, fieldWidth, flags); } diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp index c887936..ef82769 100644 --- a/tests/auto/qstring/tst_qstring.cpp +++ b/tests/auto/qstring/tst_qstring.cpp @@ -208,6 +208,7 @@ private slots: void repeated_data() const; void task262677remove(); void QTBUG10404_compareRef(); + void QTBUG9281_arg_locale(); }; typedef QList IntList; @@ -4860,6 +4861,17 @@ void tst_QString::QTBUG10404_compareRef() QVERIFY(QStringRef(&a2, 1, 2).compare(QStringRef(&a, 1, 3), Qt::CaseInsensitive) < 0); } +void tst_QString::QTBUG9281_arg_locale() +{ + QLocale l(QLocale::English, QLocale::UnitedKingdom); + l.setNumberOptions(QLocale::OmitGroupSeparator); + QLocale::setDefault(l); + QString str("*%L1*%L2*"); + str = str.arg(123456).arg(1234.56); + QCOMPARE(str, QString::fromLatin1("*123456*1234.56*")); + QLocale::setDefault(QLocale::C); +} + QTEST_APPLESS_MAIN(tst_QString) -- cgit v0.12 From 163458f6363d32be453a186e02216f574f62dda3 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Mon, 9 Aug 2010 14:48:47 +0200 Subject: Added comment about calendarPopup in setCalendarWidget function documentation. Reviewer: David Boddie Task: QTBUG-12300 --- src/gui/widgets/qdatetimeedit.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp index 50fa9c9..7a61dc7 100644 --- a/src/gui/widgets/qdatetimeedit.cpp +++ b/src/gui/widgets/qdatetimeedit.cpp @@ -754,6 +754,7 @@ QCalendarWidget *QDateTimeEdit::calendarWidget() const Sets the given \a calendarWidget as the widget to be used for the calendar pop-up. The editor does not automatically take ownership of the calendar widget. + \note calendarPopup must be set to true before setting the calendar widget. \sa calendarPopup */ void QDateTimeEdit::setCalendarWidget(QCalendarWidget *calendarWidget) -- cgit v0.12 From 3b9c811a658d45f6e84a98ac26a5d122b34254fc Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 9 Aug 2010 13:27:31 +0200 Subject: Fix invalid memory write during recursive timer activation The handler for one timer recurses the event loop, and the handler for another timer removes the first timer, returning from the recursion and the handler for the first timer causes an invalid write (since the timer info for the first timer has been deleted). Fix this by keeping an active reference in QTimerInfo (instead of just a bool inTimerEvent). If this is non-zero, the timer is currently being delivered, so we prevent more delivery. When a timer is removed and it's activateRef is set, we clear it so that the delivery code knows now to write to memory that's already been freed. A side effect of this change is that we no longer need to track the currentTimerInfo "globally" anymore, it can be a normal local variable in the QTimerInfoList::activateTimers() function. Task-number: QT-3553 Reviewed-by: olivier Reviewed-by: joao --- src/corelib/kernel/qeventdispatcher_unix.cpp | 31 ++++++++------------ src/corelib/kernel/qeventdispatcher_unix_p.h | 4 +-- tests/auto/qtimer/tst_qtimer.cpp | 44 ++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 20 deletions(-) diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index f7d45ac..9dadd82 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -331,7 +331,7 @@ QTimerInfoList::QTimerInfoList() } #endif - firstTimerInfo = currentTimerInfo = 0; + firstTimerInfo = 0; } timeval QTimerInfoList::updateCurrentTime() @@ -445,7 +445,7 @@ bool QTimerInfoList::timerWait(timeval &tm) // Find first waiting timer not already active QTimerInfo *t = 0; for (QTimerInfoList::const_iterator it = constBegin(); it != constEnd(); ++it) { - if (!(*it)->inTimerEvent) { + if (!(*it)->activateRef) { t = *it; break; } @@ -474,7 +474,7 @@ void QTimerInfoList::registerTimer(int timerId, int interval, QObject *object) t->interval.tv_usec = (interval % 1000) * 1000; t->timeout = updateCurrentTime() + t->interval; t->obj = object; - t->inTimerEvent = false; + t->activateRef = 0; timerInsert(t); } @@ -489,8 +489,8 @@ bool QTimerInfoList::unregisterTimer(int timerId) removeAt(i); if (t == firstTimerInfo) firstTimerInfo = 0; - if (t == currentTimerInfo) - currentTimerInfo = 0; + if (t->activateRef) + *(t->activateRef) = 0; // release the timer id if (!QObjectPrivate::get(t->obj)->inThreadChangeEvent) @@ -515,8 +515,8 @@ bool QTimerInfoList::unregisterTimers(QObject *object) removeAt(i); if (t == firstTimerInfo) firstTimerInfo = 0; - if (t == currentTimerInfo) - currentTimerInfo = 0; + if (t->activateRef) + *(t->activateRef) = 0; // release the timer id if (!QObjectPrivate::get(t->obj)->inThreadChangeEvent) @@ -552,10 +552,7 @@ int QTimerInfoList::activateTimers() bool firstTime = true; timeval currentTime; int n_act = 0, maxCount = count(); - - QTimerInfo *saveFirstTimerInfo = firstTimerInfo; - QTimerInfo *saveCurrentTimerInfo = currentTimerInfo; - firstTimerInfo = currentTimerInfo = 0; + firstTimerInfo = 0; while (maxCount--) { currentTime = updateCurrentTime(); @@ -567,7 +564,7 @@ int QTimerInfoList::activateTimers() if (isEmpty()) break; - currentTimerInfo = first(); + QTimerInfo *currentTimerInfo = first(); if (currentTime < currentTimerInfo->timeout) break; // no timer has expired @@ -594,21 +591,19 @@ int QTimerInfoList::activateTimers() if (currentTimerInfo->interval.tv_usec > 0 || currentTimerInfo->interval.tv_sec > 0) n_act++; - if (!currentTimerInfo->inTimerEvent) { + if (!currentTimerInfo->activateRef) { // send event, but don't allow it to recurse - currentTimerInfo->inTimerEvent = true; + currentTimerInfo->activateRef = ¤tTimerInfo; QTimerEvent e(currentTimerInfo->id); QCoreApplication::sendEvent(currentTimerInfo->obj, &e); if (currentTimerInfo) - currentTimerInfo->inTimerEvent = false; + currentTimerInfo->activateRef = 0; } } - firstTimerInfo = saveFirstTimerInfo; - currentTimerInfo = saveCurrentTimerInfo; - + firstTimerInfo = 0; return n_act; } diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index cbe58de..060a163 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -77,7 +77,7 @@ struct QTimerInfo { timeval interval; // - timer interval timeval timeout; // - when to sent event QObject *obj; // - object to receive event - bool inTimerEvent; + QTimerInfo **activateRef; // - ref from activateTimers }; class QTimerInfoList : public QList @@ -92,7 +92,7 @@ class QTimerInfoList : public QList #endif // state variables used by activateTimers() - QTimerInfo *firstTimerInfo, *currentTimerInfo; + QTimerInfo *firstTimerInfo; public: QTimerInfoList(); diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp index a0408ef..8d213ed 100644 --- a/tests/auto/qtimer/tst_qtimer.cpp +++ b/tests/auto/qtimer/tst_qtimer.cpp @@ -86,6 +86,7 @@ private slots: void timerIdPersistsAfterThreadExit(); void cancelLongTimer(); void singleShotStaticFunctionZeroTimeout(); + void recurseOnTimeoutAndStopTimer(); }; class TimerHelper : public QObject @@ -623,5 +624,48 @@ void tst_QTimer::singleShotStaticFunctionZeroTimeout() QCOMPARE(helper.count, 1); } +class RecursOnTimeoutAndStopTimerTimer : public QObject +{ + Q_OBJECT + +public: + QTimer *one; + QTimer *two; + +public slots: + void onetrigger() + { + QCoreApplication::processEvents(); + } + + void twotrigger() + { + one->stop(); + } +}; + +void tst_QTimer::recurseOnTimeoutAndStopTimer() +{ + QEventLoop eventLoop; + QTimer::singleShot(1000, &eventLoop, SLOT(quit())); + + RecursOnTimeoutAndStopTimerTimer t; + t.one = new QTimer(&t); + t.two = new QTimer(&t); + + QObject::connect(t.one, SIGNAL(timeout()), &t, SLOT(onetrigger())); + QObject::connect(t.two, SIGNAL(timeout()), &t, SLOT(twotrigger())); + + t.two->setSingleShot(true); + + t.one->start(); + t.two->start(); + + (void) eventLoop.exec(); + + QVERIFY(!t.one->isActive()); + QVERIFY(!t.two->isActive()); +} + QTEST_MAIN(tst_QTimer) #include "tst_qtimer.moc" -- cgit v0.12 From af3a204b8b3e780438c39425ba74338cc6a46a80 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 9 Aug 2010 17:38:05 +0200 Subject: configure: fix error message when calling config.status Calling configure in a shadow build directory led to error messages when trying to delete the content of $$QT_BUILD_TREE/mkspecs. Task-number: QTBUG-12764 Reviewed-by: ossi --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 74f5505..25f1ef5 100755 --- a/configure +++ b/configure @@ -2407,7 +2407,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then # symlink the mkspecs directory mkdir -p "$outpath/mkspecs" - rm -f "$outpath"/mkspecs/* + rm -rf "$outpath"/mkspecs/* ln -s "$relpath"/mkspecs/* "$outpath/mkspecs" rm -f "$outpath/mkspecs/default" -- cgit v0.12 From 48cd20335f838db5aa31031c10352ca7058d84e8 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Tue, 10 Aug 2010 10:20:14 +1000 Subject: Associate qmlInfo() documentation with QDeclarativeEngine Task-number: QTBUG-12755 --- src/declarative/qml/qdeclarativeinfo.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp index c980a2a..c6560dd 100644 --- a/src/declarative/qml/qdeclarativeinfo.cpp +++ b/src/declarative/qml/qdeclarativeinfo.cpp @@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE /*! \fn QDeclarativeInfo qmlInfo(const QObject *object) + \relates QDeclarativeEngine \brief Prints warnings messages that include the file and line number for QML types. -- cgit v0.12 From bacf934f35c51baf49d0b73cf4fb79e860e24303 Mon Sep 17 00:00:00 2001 From: Arvid Ephraim Picciani Date: Mon, 9 Aug 2010 15:28:59 -0700 Subject: add performance comparisons to qregexp benchmark Reviewed-by: hjk --- tests/benchmarks/corelib/tools/qregexp/main.cpp | 304 +++++++++++++++++++++ tests/benchmarks/corelib/tools/qregexp/qregexp.pro | 11 +- tests/benchmarks/corelib/tools/qregexp/qregexp.qrc | 6 + 3 files changed, 320 insertions(+), 1 deletion(-) create mode 100644 tests/benchmarks/corelib/tools/qregexp/qregexp.qrc diff --git a/tests/benchmarks/corelib/tools/qregexp/main.cpp b/tests/benchmarks/corelib/tools/qregexp/main.cpp index ab9ed71..51cde95 100644 --- a/tests/benchmarks/corelib/tools/qregexp/main.cpp +++ b/tests/benchmarks/corelib/tools/qregexp/main.cpp @@ -38,16 +38,27 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #include #include #include +#include #include +#ifdef HAVE_BOOST +#include +#endif + +#include +#include "pcre/pcre.h" +#define ZLIB_VERSION "1.2.3.4" class tst_qregexp : public QObject { Q_OBJECT +public: + tst_qregexp(); private slots: void escape_old(); void escape_old_data() { escape_data(); } @@ -59,10 +70,56 @@ private slots: void escape_new3_data() { escape_data(); } void escape_new4(); void escape_new4_data() { escape_data(); } +/* + JSC outperforms everything. + Boost is less impressive then expected. + */ + void simpleFind1(); + void rangeReplace1(); + void matchReplace1(); + + void simpleFind2(); + void rangeReplace2(); + void matchReplace2(); + + void simpleFindJSC(); + void rangeReplaceJSC(); + void matchReplaceJSC(); + +#ifdef HAVE_BOOST + void simpleFindBoost(); + void rangeReplaceBoost(); + void matchReplaceBoost(); +#endif + +/* those apply an (incorrect) regexp on entire source + (this main.cpp). JSC appears to handle this + (ab)use case best. QRegExp performs extremly bad. + */ + void horribleWrongReplace1(); + void horribleReplace1(); + void horribleReplace2(); + void horribleWrongReplace2(); + void horribleWrongReplaceJSC(); + void horribleReplaceJSC(); +#ifdef HAVE_BOOST + void horribleWrongReplaceBoost(); + void horribleReplaceBoost(); +#endif private: + QString str1; + QString str2; void escape_data(); }; +tst_qregexp::tst_qregexp() + :QObject() + ,str1("We are all happy monkeys") +{ + QFile f(":/main.cpp"); + f.open(QFile::ReadOnly); + str2=f.readAll(); +} static void verify(const QString "ed, const QString &expected) { @@ -285,6 +342,253 @@ void tst_qregexp::escape_new4() // "return quoted" } } + + +void tst_qregexp::simpleFind1() +{ + int roff; + QRegExp rx("happy"); + rx.setPatternSyntax(QRegExp::RegExp); + QBENCHMARK{ + roff = rx.indexIn(str1); + } + QCOMPARE(roff, 11); +} + +void tst_qregexp::rangeReplace1() +{ + QString r; + QRegExp rx("[a-f]"); + rx.setPatternSyntax(QRegExp::RegExp); + QBENCHMARK{ + r = QString(str1).replace(rx, "-"); + } + QCOMPARE(r, QString("W- -r- -ll h-ppy monk-ys")); +} + +void tst_qregexp::matchReplace1() +{ + QString r; + QRegExp rx("[^a-f]*([a-f]+)[^a-f]*"); + rx.setPatternSyntax(QRegExp::RegExp); + QBENCHMARK{ + r = QString(str1).replace(rx, "\\1"); + } + QCOMPARE(r, QString("eaeaae")); +} + +void tst_qregexp::horribleWrongReplace1() +{ + QString r; + QRegExp rx(".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*"); + rx.setPatternSyntax(QRegExp::RegExp); + QBENCHMARK{ + r = QString(str2).replace(rx, "\\1.\\2.\\3"); + } + QCOMPARE(r, str2); +} + +void tst_qregexp::horribleReplace1() +{ + QString r; + QRegExp rx(".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*"); + rx.setPatternSyntax(QRegExp::RegExp); + QBENCHMARK{ + r = QString(str2).replace(rx, "\\1.\\2.\\3"); + } + QCOMPARE(r, QString("1.2.3")); +} + + +void tst_qregexp::simpleFind2() +{ + int roff; + QRegExp rx("happy"); + rx.setPatternSyntax(QRegExp::RegExp2); + QBENCHMARK{ + roff = rx.indexIn(str1); + } + QCOMPARE(roff, 11); +} + +void tst_qregexp::rangeReplace2() +{ + QString r; + QRegExp rx("[a-f]"); + rx.setPatternSyntax(QRegExp::RegExp2); + QBENCHMARK{ + r = QString(str1).replace(rx, "-"); + } + QCOMPARE(r, QString("W- -r- -ll h-ppy monk-ys")); +} + +void tst_qregexp::matchReplace2() +{ + QString r; + QRegExp rx("[^a-f]*([a-f]+)[^a-f]*"); + rx.setPatternSyntax(QRegExp::RegExp2); + QBENCHMARK{ + r = QString(str1).replace(rx, "\\1"); + } + QCOMPARE(r, QString("eaeaae")); +} + +void tst_qregexp::horribleWrongReplace2() +{ + QString r; + QRegExp rx(".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*"); + rx.setPatternSyntax(QRegExp::RegExp2); + QBENCHMARK{ + r = QString(str2).replace(rx, "\\1.\\2.\\3"); + } + QCOMPARE(r, str2); +} + +void tst_qregexp::horribleReplace2() +{ + QString r; + QRegExp rx(".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*"); + rx.setPatternSyntax(QRegExp::RegExp2); + QBENCHMARK{ + r = QString(str2).replace(rx, "\\1.\\2.\\3"); + } + QCOMPARE(r, QString("1.2.3")); +} + + +void tst_qregexp::simpleFindJSC() +{ + int numr; + const char * errmsg=" "; + QString rxs("happy"); + JSRegExp *rx = jsRegExpCompile(rxs.utf16(), rxs.length(), JSRegExpDoNotIgnoreCase, JSRegExpSingleLine, 0, &errmsg); + QVERIFY(rx != 0); + QString s(str1); + int offsetVector[3]; + QBENCHMARK{ + numr = jsRegExpExecute(rx, s.utf16(), s.length(), 0, offsetVector, 3); + } + jsRegExpFree(rx); + QCOMPARE(numr, 1); + QCOMPARE(offsetVector[0], 11); +} + +void tst_qregexp::rangeReplaceJSC() +{ + QScriptValue r; + QScriptEngine engine; + engine.globalObject().setProperty("s", str1); + QScriptValue replaceFunc = engine.evaluate("(function() { return s.replace(/[a-f]/g, '-') } )"); + QVERIFY(replaceFunc.isFunction()); + QBENCHMARK{ + r = replaceFunc.call(QScriptValue()); + } + QCOMPARE(r.toString(), QString("W- -r- -ll h-ppy monk-ys")); +} + +void tst_qregexp::matchReplaceJSC() +{ + QScriptValue r; + QScriptEngine engine; + engine.globalObject().setProperty("s", str1); + QScriptValue replaceFunc = engine.evaluate("(function() { return s.replace(/[^a-f]*([a-f]+)[^a-f]*/g, '$1') } )"); + QVERIFY(replaceFunc.isFunction()); + QBENCHMARK{ + r = replaceFunc.call(QScriptValue()); + } + QCOMPARE(r.toString(), QString("eaeaae")); +} + +void tst_qregexp::horribleWrongReplaceJSC() +{ + QScriptValue r; + QScriptEngine engine; + engine.globalObject().setProperty("s", str2); + QScriptValue replaceFunc = engine.evaluate("(function() { return s.replace(/.*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*/gm, '$1.$2.$3') } )"); + QVERIFY(replaceFunc.isFunction()); + QBENCHMARK{ + r = replaceFunc.call(QScriptValue()); + } + QCOMPARE(r.toString(), str2); +} + +void tst_qregexp::horribleReplaceJSC() +{ + QScriptValue r; + QScriptEngine engine; + // the m flag doesnt actually work here; dunno + engine.globalObject().setProperty("s", str2.replace('\n', ' ')); + QScriptValue replaceFunc = engine.evaluate("(function() { return s.replace(/.*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*/gm, '$1.$2.$3') } )"); + QVERIFY(replaceFunc.isFunction()); + QBENCHMARK{ + r = replaceFunc.call(QScriptValue()); + } + QCOMPARE(r.toString(), QString("1.2.3")); +} + + +#ifdef HAVE_BOOST +void tst_qregexp::simpleFindBoost(){ + int roff; + boost::regex rx ("happy", boost::regex_constants::perl); + std::string s = str1.toStdString(); + std::string::const_iterator start, end; + start = s.begin(); + end = s.end(); + boost::match_flag_type flags = boost::match_default; + QBENCHMARK{ + boost::match_results what; + regex_search(start, end, what, rx, flags); + roff = (what[0].first)-start; + } + QCOMPARE(roff, 11); +} + +void tst_qregexp::rangeReplaceBoost() +{ + boost::regex pattern ("[a-f]", boost::regex_constants::perl); + std::string s = str1.toStdString(); + std::string r; + QBENCHMARK{ + r = boost::regex_replace (s, pattern, "-"); + } + QCOMPARE(r, std::string("W- -r- -ll h-ppy monk-ys")); +} + +void tst_qregexp::matchReplaceBoost() +{ + boost::regex pattern ("[^a-f]*([a-f]+)[^a-f]*",boost::regex_constants::perl); + std::string s = str1.toStdString(); + std::string r; + QBENCHMARK{ + r = boost::regex_replace (s, pattern, "$1"); + } + QCOMPARE(r, std::string("eaeaae")); +} + +void tst_qregexp::horribleWrongReplaceBoost() +{ + boost::regex pattern (".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*", boost::regex_constants::perl); + std::string s = str2.toStdString(); + std::string r; + QBENCHMARK{ + r = boost::regex_replace (s, pattern, "$1.$2.$3"); + } + QCOMPARE(r, s); +} + +void tst_qregexp::horribleReplaceBoost() +{ + boost::regex pattern (".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*", boost::regex_constants::perl); + std::string s = str2.toStdString(); + std::string r; + QBENCHMARK{ + r = boost::regex_replace (s, pattern, "$1.$2.$3"); + } + QCOMPARE(r, std::string("1.2.3")); +} +#endif //HAVE_BOOST + QTEST_MAIN(tst_qregexp) #include "main.moc" diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro index e0f47c9..ffdad12 100644 --- a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro +++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro @@ -3,10 +3,19 @@ TEMPLATE = app TARGET = tst_bench_qregexp DEPENDPATH += . INCLUDEPATH += . - +RESOURCES+=qregexp.qrc QT -= gui +QT += script CONFIG += release # Input SOURCES += main.cpp + +include( $${QT_SOURCE_TREE}/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri ) + +exists( /usr/include/boost/regex.hpp ){ +DEFINES+=HAVE_BOOST +LIBS+=-lboost_regex +} + diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.qrc b/tests/benchmarks/corelib/tools/qregexp/qregexp.qrc new file mode 100644 index 0000000..a7fe13c --- /dev/null +++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.qrc @@ -0,0 +1,6 @@ + + + main.cpp + + + -- cgit v0.12 From 6feb5b75ce96aeeefee189af003949db8c031519 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Tue, 10 Aug 2010 11:50:49 +1000 Subject: Don't double-add item change listeners. When a Repeater was used as the child of an Item binding to childrenRect, the item change listener was being added twice for the items created by the Repeater. Task-number: QTBUG-12722 --- src/declarative/graphicsitems/qdeclarativeitem.cpp | 4 ++-- .../qdeclarativeitem/data/childrenRectBug3.qml | 15 +++++++++++++++ .../declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp | 12 ++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index ff05997..9d782b9 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -2724,12 +2724,12 @@ QVariant QDeclarativeItem::itemChange(GraphicsItemChange change, } break; case ItemChildAddedChange: - if (d->_contents) + if (d->_contents && d->componentComplete) d->_contents->childAdded(qobject_cast( value.value())); break; case ItemChildRemovedChange: - if (d->_contents) + if (d->_contents && d->componentComplete) d->_contents->childRemoved(qobject_cast( value.value())); break; diff --git a/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml b/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml new file mode 100644 index 0000000..f19ab4f --- /dev/null +++ b/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml @@ -0,0 +1,15 @@ +import Qt 4.7 + +Rectangle { + width: 300 + height: 300 + + Rectangle { + height: childrenRect.height + + Repeater { + model: 1 + Rectangle { } + } + } +} diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp index d76d360..25ca157 100644 --- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp +++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp @@ -75,6 +75,7 @@ private slots: void childrenRect(); void childrenRectBug(); void childrenRectBug2(); + void childrenRectBug3(); void childrenProperty(); void resourcesProperty(); @@ -780,6 +781,17 @@ void tst_QDeclarativeItem::childrenRectBug2() delete canvas; } +// QTBUG-12722 +void tst_QDeclarativeItem::childrenRectBug3() +{ + QDeclarativeView *canvas = new QDeclarativeView(0); + canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/childrenRectBug3.qml")); + canvas->show(); + + //don't crash on delete + delete canvas; +} + template T *tst_QDeclarativeItem::findItem(QGraphicsObject *parent, const QString &objectName) { -- cgit v0.12 From f3ac9de816c0bff9961110c5a734871da2e129cf Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Tue, 10 Aug 2010 07:21:10 +0200 Subject: Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression Commit eea84818e98af917d3cf2bf04ea17a416ef9d55e corrected some spelling mistakes, one of which this test was relying on. Reviewed-by: trustme --- .../declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp index d5a911a..db1f191 100644 --- a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp +++ b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp @@ -585,7 +585,7 @@ void tst_qdeclarativeinstruction::dump() << "45\t\t48\tDEFER\t\t\t7" << "46\t\tNA\tDEFER\t\t\t7" << "47\t\t48\tSTORE_IMPORTED_SCRIPT\t2" - << "48\t\t50\tXXX UNKOWN INSTRUCTION\t1234" + << "48\t\t50\tXXX UNKNOWN INSTRUCTION\t1234" << "49\t\t51\tSTORE_VARIANT_INTEGER\t\t32\t11" << "50\t\t52\tSTORE_VARIANT_DOUBLE\t\t19\t33.7" << "-------------------------------------------------------------------------------"; -- cgit v0.12 From a1641e27d2e2f5e29362e3737be6b9d75714d138 Mon Sep 17 00:00:00 2001 From: Jiang Jiang Date: Mon, 9 Aug 2010 15:56:34 +0200 Subject: Add text decoration support to QStaticText The original code path of QStaticText does not include decoration drawing, this patch generalized the drawTextItemDecoration() function to draw decoration for drawText(), then use that to draw decoration for QStaticText. A helper function called drawDecorationForGlyphs() is made to allow easier extension for direct glyphs drawing support. Task-number: QTBUG-12121 Reviewed-by: Eskil --- src/gui/painting/qpainter.cpp | 84 +++++++++++++++++++---- tests/auto/qstatictext/tst_qstatictext.cpp | 106 +++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 13 deletions(-) diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 9dadbd5..b694d9c 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -90,6 +90,15 @@ void qt_format_text(const QFont &font, const QRectF &_r, int tf, const QTextOption *option, const QString& str, QRectF *brect, int tabstops, int* tabarray, int tabarraylen, QPainter *painter); +static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const QFontEngine *fe, + QTextCharFormat::UnderlineStyle underlineStyle, + const QTextItem::RenderFlags flags, qreal width, + const QTextCharFormat &charFormat); +// Helper function to calculate left most position, width and flags for decoration drawing +static void drawDecorationForGlyphs(QPainter *painter, const glyph_t *glyphArray, + const QFixedPoint *positions, int glyphCount, + QFontEngine *fontEngine, const QFont &font, + const QTextCharFormat &charFormat); static inline QGradient::CoordinateMode coordinateMode(const QBrush &brush) { @@ -5923,6 +5932,10 @@ void QPainter::drawStaticText(const QPointF &topLeftPosition, const QStaticText currentColor = item->color; } d->extended->drawStaticTextItem(item); + + drawDecorationForGlyphs(this, item->glyphs, item->glyphPositions, + item->numGlyphs, item->fontEngine, staticText_d->font, + QTextCharFormat()); } if (currentColor != oldPen.color()) setPen(oldPen); @@ -6290,15 +6303,15 @@ static QPixmap generateWavyPixmap(qreal maxRadius, const QPen &pen) return pixmap; } -static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const QTextItemInt &ti) +static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const QFontEngine *fe, + QTextCharFormat::UnderlineStyle underlineStyle, + const QTextItem::RenderFlags flags, qreal width, + const QTextCharFormat &charFormat) { - QTextCharFormat::UnderlineStyle underlineStyle = ti.underlineStyle; if (underlineStyle == QTextCharFormat::NoUnderline - && !(ti.flags & (QTextItem::StrikeOut | QTextItem::Overline))) + && !(flags & (QTextItem::StrikeOut | QTextItem::Overline))) return; - QFontEngine *fe = ti.fontEngine; - const QPen oldPen = painter->pen(); const QBrush oldBrush = painter->brush(); painter->setBrush(Qt::NoBrush); @@ -6307,7 +6320,7 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const pen.setWidthF(fe->lineThickness().toReal()); pen.setCapStyle(Qt::FlatCap); - QLineF line(pos.x(), pos.y(), pos.x() + ti.width.toReal(), pos.y()); + QLineF line(pos.x(), pos.y(), pos.x() + width, pos.y()); const qreal underlineOffset = fe->underlinePosition().toReal(); // deliberately ceil the offset to avoid the underline coming too close to @@ -6322,21 +6335,21 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const painter->save(); painter->translate(0, pos.y() + 1); - QColor uc = ti.charFormat.underlineColor(); + QColor uc = charFormat.underlineColor(); if (uc.isValid()) pen.setColor(uc); // Adapt wave to underlineOffset or pen width, whatever is larger, to make it work on all platforms const QPixmap wave = generateWavyPixmap(qMax(underlineOffset, pen.widthF()), pen); - const int descent = (int) ti.descent.toReal(); + const int descent = (int) fe->descent().toReal(); painter->setBrushOrigin(painter->brushOrigin().x(), 0); - painter->fillRect(pos.x(), 0, qCeil(ti.width.toReal()), qMin(wave.height(), descent), wave); + painter->fillRect(pos.x(), 0, qCeil(width), qMin(wave.height(), descent), wave); painter->restore(); } else if (underlineStyle != QTextCharFormat::NoUnderline) { QLineF underLine(line.x1(), underlinePos, line.x2(), underlinePos); - QColor uc = ti.charFormat.underlineColor(); + QColor uc = charFormat.underlineColor(); if (uc.isValid()) pen.setColor(uc); @@ -6348,14 +6361,14 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const pen.setStyle(Qt::SolidLine); pen.setColor(oldPen.color()); - if (ti.flags & QTextItem::StrikeOut) { + if (flags & QTextItem::StrikeOut) { QLineF strikeOutLine = line; strikeOutLine.translate(0., - fe->ascent().toReal() / 3.); painter->setPen(pen); painter->drawLine(strikeOutLine); } - if (ti.flags & QTextItem::Overline) { + if (flags & QTextItem::Overline) { QLineF overLine = line; overLine.translate(0., - fe->ascent().toReal()); painter->setPen(pen); @@ -6366,6 +6379,50 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const painter->setBrush(oldBrush); } +static void drawDecorationForGlyphs(QPainter *painter, const glyph_t *glyphArray, + const QFixedPoint *positions, int glyphCount, + QFontEngine *fontEngine, const QFont &font, + const QTextCharFormat &charFormat) +{ + if (!(font.underline() || font.strikeOut() || font.overline())) + return; + + QFixed leftMost; + QFixed rightMost; + QFixed baseLine; + for (int i=0; iboundingBox(glyphArray[i]); + if (i == 0 || leftMost > positions[i].x) + leftMost = positions[i].x; + + // We don't support glyphs that do not share a common baseline. If this turns out to + // be a relevant use case, then we need to find clusters of glyphs that share a baseline + // and do a drawTextItemDecorations call per cluster. + if (i == 0 || baseLine < positions[i].y) + baseLine = positions[i].y; + + // We use the advance rather than the actual bounds to match the algorithm in drawText() + if (i == 0 || rightMost < positions[i].x + gm.xoff) + rightMost = positions[i].x + gm.xoff; + } + + QFixed width = rightMost - leftMost; + QTextItem::RenderFlags flags = 0; + + if (font.underline()) + flags |= QTextItem::Underline; + if (font.overline()) + flags |= QTextItem::Overline; + if (font.strikeOut()) + flags |= QTextItem::StrikeOut; + + drawTextItemDecoration(painter, QPointF(leftMost.toReal(), baseLine.toReal()), + fontEngine, + font.underline() ? QTextCharFormat::SingleUnderline + : QTextCharFormat::NoUnderline, flags, + width.toReal(), charFormat); +} + void QPainter::drawTextItem(const QPointF &p, const QTextItem &_ti) { #ifdef QT_DEBUG_DRAW @@ -6496,7 +6553,8 @@ void QPainter::drawTextItem(const QPointF &p, const QTextItem &_ti) else d->engine->drawTextItem(p, ti); } - drawTextItemDecoration(this, p, ti); + drawTextItemDecoration(this, p, ti.fontEngine, ti.underlineStyle, ti.flags, ti.width.toReal(), + ti.charFormat); if (d->state->renderHints != oldRenderHints) { d->state->renderHints = oldRenderHints; diff --git a/tests/auto/qstatictext/tst_qstatictext.cpp b/tests/auto/qstatictext/tst_qstatictext.cpp index 1d166f4..0ae5320 100644 --- a/tests/auto/qstatictext/tst_qstatictext.cpp +++ b/tests/auto/qstatictext/tst_qstatictext.cpp @@ -85,6 +85,10 @@ private slots: void setPenPlainText(); void setPenRichText(); void richTextOverridesPen(); + + void drawStruckOutText(); + void drawOverlinedText(); + void drawUnderlinedText(); }; void tst_QStaticText::init() @@ -620,5 +624,107 @@ void tst_QStaticText::richTextOverridesPen() } } +void tst_QStaticText::drawStruckOutText() +{ + QPixmap imageDrawText(1000, 1000); + QPixmap imageDrawStaticText(1000, 1000); + + imageDrawText.fill(Qt::white); + imageDrawStaticText.fill(Qt::white); + + QString s = QString::fromLatin1("Foobar"); + + QFont font; + font.setStrikeOut(true); + + { + QPainter p(&imageDrawText); + p.setFont(font); + p.drawText(QPointF(50, 50), s); + } + + { + QPainter p(&imageDrawStaticText); + QStaticText text = QStaticText(s); + p.setFont(font); + p.drawStaticText(QPointF(50, 50 - QFontMetricsF(p.font()).ascent()), text); + } + +#if defined(DEBUG_SAVE_IMAGE) + imageDrawText.save("drawStruckOutText_imageDrawText.png"); + imageDrawStaticText.save("drawStruckOutText_imageDrawStaticText.png"); +#endif + + QCOMPARE(imageDrawText, imageDrawStaticText); +} + +void tst_QStaticText::drawOverlinedText() +{ + QPixmap imageDrawText(1000, 1000); + QPixmap imageDrawStaticText(1000, 1000); + + imageDrawText.fill(Qt::white); + imageDrawStaticText.fill(Qt::white); + + QString s = QString::fromLatin1("Foobar"); + + QFont font; + font.setOverline(true); + + { + QPainter p(&imageDrawText); + p.setFont(font); + p.drawText(QPointF(50, 50), s); + } + + { + QPainter p(&imageDrawStaticText); + QStaticText text = QStaticText(s); + p.setFont(font); + p.drawStaticText(QPointF(50, 50 - QFontMetricsF(p.font()).ascent()), text); + } + +#if defined(DEBUG_SAVE_IMAGE) + imageDrawText.save("drawOverlinedText_imageDrawText.png"); + imageDrawStaticText.save("drawOverlinedText_imageDrawStaticText.png"); +#endif + + QCOMPARE(imageDrawText, imageDrawStaticText); +} + +void tst_QStaticText::drawUnderlinedText() +{ + QPixmap imageDrawText(1000, 1000); + QPixmap imageDrawStaticText(1000, 1000); + + imageDrawText.fill(Qt::white); + imageDrawStaticText.fill(Qt::white); + + QString s = QString::fromLatin1("Foobar"); + + QFont font; + font.setUnderline(true); + + { + QPainter p(&imageDrawText); + p.setFont(font); + p.drawText(QPointF(50, 50), s); + } + + { + QPainter p(&imageDrawStaticText); + QStaticText text = QStaticText(s); + p.setFont(font); + p.drawStaticText(QPointF(50, 50 - QFontMetricsF(p.font()).ascent()), text); + } + +#if defined(DEBUG_SAVE_IMAGE) + imageDrawText.save("drawUnderlinedText_imageDrawText.png"); + imageDrawStaticText.save("drawUnderlinedText_imageDrawStaticText.png"); +#endif + + QCOMPARE(imageDrawText, imageDrawStaticText); +} + QTEST_MAIN(tst_QStaticText) #include "tst_qstatictext.moc" -- cgit v0.12 From 30b82b9440fcfc4a703d1a2b1150efd6b4147093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Wed, 4 Aug 2010 10:37:58 +0200 Subject: Fixed a bug in implementation of sizeHint() when there was a constraint The constraint was not adjusted with the margins before passing it on to the engine (which is unaware of the margins). Task-number: Found during QT-3570 Reviewed-by: Paul --- src/gui/graphicsview/qgraphicsgridlayout.cpp | 3 ++- src/gui/graphicsview/qgraphicslinearlayout.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsgridlayout.cpp b/src/gui/graphicsview/qgraphicsgridlayout.cpp index 062b5ac..3fc7f10 100644 --- a/src/gui/graphicsview/qgraphicsgridlayout.cpp +++ b/src/gui/graphicsview/qgraphicsgridlayout.cpp @@ -641,7 +641,8 @@ QSizeF QGraphicsGridLayout::sizeHint(Qt::SizeHint which, const QSizeF &constrain Q_D(const QGraphicsGridLayout); qreal left, top, right, bottom; getContentsMargins(&left, &top, &right, &bottom); - return d->engine.sizeHint(d->styleInfo(), which , constraint) + QSizeF(left + right, top + bottom); + const QSizeF extraMargins(left + right, top + bottom); + return d->engine.sizeHint(d->styleInfo(), which , constraint - extraMargins) + extraMargins; } diff --git a/src/gui/graphicsview/qgraphicslinearlayout.cpp b/src/gui/graphicsview/qgraphicslinearlayout.cpp index 37408ef..1588364 100644 --- a/src/gui/graphicsview/qgraphicslinearlayout.cpp +++ b/src/gui/graphicsview/qgraphicslinearlayout.cpp @@ -528,7 +528,8 @@ QSizeF QGraphicsLinearLayout::sizeHint(Qt::SizeHint which, const QSizeF &constra Q_D(const QGraphicsLinearLayout); qreal left, top, right, bottom; getContentsMargins(&left, &top, &right, &bottom); - return d->engine.sizeHint(d->styleInfo(), which , constraint) + QSizeF(left + right, top + bottom); + const QSizeF extraMargins(left + right, top + bottom); + return d->engine.sizeHint(d->styleInfo(), which , constraint - extraMargins) + extraMargins; } /*! -- cgit v0.12 From 62b5ef3cc1306e46a4042b14867f2f92d9a110f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Wed, 4 Aug 2010 10:51:51 +0200 Subject: Fix (implement!) hfw/wfh in QGridLayoutEngine Note that only height-for-width works, since we cannot add QSizePolicy::hasWidthForHeight() in a patch release. Task-number: QT-3570 Reviewed-by: Paul --- src/gui/graphicsview/qgraphicslayoutitem.cpp | 51 ++- src/gui/graphicsview/qgraphicslayoutitem_p.h | 6 + src/gui/graphicsview/qgridlayoutengine.cpp | 251 +++++++++++++- src/gui/graphicsview/qgridlayoutengine_p.h | 23 +- .../tst_qgraphicsgridlayout.cpp | 364 ++++++++++++++++++++- 5 files changed, 678 insertions(+), 17 deletions(-) diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp index 5a7f1af..3707591 100644 --- a/src/gui/graphicsview/qgraphicslayoutitem.cpp +++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp @@ -48,6 +48,7 @@ #include "qgraphicslayoutitem.h" #include "qgraphicslayoutitem_p.h" #include "qwidget.h" +#include "qgraphicswidget.h" #include @@ -139,9 +140,11 @@ QSizeF *QGraphicsLayoutItemPrivate::effectiveSizeHints(const QSizeF &constraint) if (!sizeHintCacheDirty && cachedConstraint == constraint) return cachedSizeHints; + const bool hasConstraint = constraint.width() >= 0 || constraint.height() >= 0; + for (int i = 0; i < Qt::NSizeHints; ++i) { cachedSizeHints[i] = constraint; - if (userSizeHints) + if (userSizeHints && !hasConstraint) combineSize(cachedSizeHints[i], userSizeHints[i]); } @@ -259,6 +262,52 @@ void QGraphicsLayoutItemPrivate::setSizeComponent( q->updateGeometry(); } + +bool QGraphicsLayoutItemPrivate::hasHeightForWidth() const +{ + Q_Q(const QGraphicsLayoutItem); + if (isLayout) { + const QGraphicsLayout *l = static_cast(q); + for (int i = l->count() - 1; i >= 0; --i) { + if (QGraphicsLayoutItemPrivate::get(l->itemAt(i))->hasHeightForWidth()) + return true; + } + } else if (QGraphicsItem *item = q->graphicsItem()) { + if (item->isWidget()) { + QGraphicsWidget *w = static_cast(item); + if (w->layout()) { + return QGraphicsLayoutItemPrivate::get(w->layout())->hasHeightForWidth(); + } + } + } + return q->sizePolicy().hasHeightForWidth(); +} + +bool QGraphicsLayoutItemPrivate::hasWidthForHeight() const +{ + // enable this code when we add QSizePolicy::hasWidthForHeight() (For 4.8) +#if 1 + return false; +#else + Q_Q(const QGraphicsLayoutItem); + if (isLayout) { + const QGraphicsLayout *l = static_cast(q); + for (int i = l->count() - 1; i >= 0; --i) { + if (QGraphicsLayoutItemPrivate::get(l->itemAt(i))->hasWidthForHeight()) + return true; + } + } else if (QGraphicsItem *item = q->graphicsItem()) { + if (item->isWidget()) { + QGraphicsWidget *w = static_cast(item); + if (w->layout()) { + return QGraphicsLayoutItemPrivate::get(w->layout())->hasWidthForHeight(); + } + } + } + return q->sizePolicy().hasWidthForHeight(); +#endif +} + /*! \class QGraphicsLayoutItem \brief The QGraphicsLayoutItem class can be inherited to allow your custom diff --git a/src/gui/graphicsview/qgraphicslayoutitem_p.h b/src/gui/graphicsview/qgraphicslayoutitem_p.h index 15cc7a5..b752e03 100644 --- a/src/gui/graphicsview/qgraphicslayoutitem_p.h +++ b/src/gui/graphicsview/qgraphicslayoutitem_p.h @@ -65,6 +65,9 @@ class Q_AUTOTEST_EXPORT QGraphicsLayoutItemPrivate public: virtual ~QGraphicsLayoutItemPrivate(); QGraphicsLayoutItemPrivate(QGraphicsLayoutItem *parent, bool isLayout); + static QGraphicsLayoutItemPrivate *get(QGraphicsLayoutItem *q) { return q->d_func();} + static const QGraphicsLayoutItemPrivate *get(const QGraphicsLayoutItem *q) { return q->d_func();} + void init(); QSizeF *effectiveSizeHints(const QSizeF &constraint) const; QGraphicsItem *parentItem() const; @@ -73,6 +76,9 @@ public: enum SizeComponent { Width, Height }; void setSizeComponent(Qt::SizeHint which, SizeComponent component, qreal value); + bool hasHeightForWidth() const; + bool hasWidthForHeight() const; + QSizePolicy sizePolicy; QGraphicsLayoutItem *parent; diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp index a084647..ea54a90 100644 --- a/src/gui/graphicsview/qgridlayoutengine.cpp +++ b/src/gui/graphicsview/qgridlayoutengine.cpp @@ -545,6 +545,24 @@ QSizePolicy::Policy QGridLayoutItem::sizePolicy(Qt::Orientation orientation) con : sizePolicy.verticalPolicy(); } +/* + returns true if the size policy returns true for either hasHeightForWidth() + or hasWidthForHeight() + */ +bool QGridLayoutItem::hasDynamicConstraint() const +{ + return QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasHeightForWidth() + || QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasWidthForHeight(); +} + +Qt::Orientation QGridLayoutItem::dynamicConstraintOrientation() const +{ + if (QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasHeightForWidth()) + return Qt::Vertical; + else //if (QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasWidthForHeight()) + return Qt::Horizontal; +} + QSizePolicy::ControlTypes QGridLayoutItem::controlTypes(LayoutSide /* side */) const { return q_layoutItem->sizePolicy().controlType(); @@ -613,7 +631,14 @@ QRectF QGridLayoutItem::geometryWithin(qreal x, qreal y, qreal width, qreal heig qreal cellWidth = width; qreal cellHeight = height; - QSizeF size = effectiveMaxSize().boundedTo(QSizeF(cellWidth, cellHeight)); + QSize constraint; + if (hasDynamicConstraint()) { + if (dynamicConstraintOrientation() == Qt::Vertical) + constraint.setWidth(cellWidth); + else + constraint.setHeight(cellHeight); + } + QSizeF size = effectiveMaxSize(constraint).boundedTo(QSizeF(cellWidth, cellHeight)); width = size.width(); height = size.height(); @@ -675,13 +700,13 @@ void QGridLayoutItem::insertOrRemoveRows(int row, int delta, Qt::Orientation ori Note that effectiveSizeHint does not take sizePolicy into consideration, (since it only evaluates the hints, as the name implies) */ -QSizeF QGridLayoutItem::effectiveMaxSize() const +QSizeF QGridLayoutItem::effectiveMaxSize(const QSizeF &constraint) const { - QSizeF size; + QSizeF size = constraint; bool vGrow = (sizePolicy(Qt::Vertical) & QSizePolicy::GrowFlag) == QSizePolicy::GrowFlag; bool hGrow = (sizePolicy(Qt::Horizontal) & QSizePolicy::GrowFlag) == QSizePolicy::GrowFlag; if (!vGrow || !hGrow) { - QSizeF pref = layoutItem()->effectiveSizeHint(Qt::PreferredSize); + QSizeF pref = layoutItem()->effectiveSizeHint(Qt::PreferredSize, constraint); if (!vGrow) size.setHeight(pref.height()); if (!hGrow) @@ -689,7 +714,7 @@ QSizeF QGridLayoutItem::effectiveMaxSize() const } if (!size.isValid()) { - QSizeF maxSize = layoutItem()->effectiveSizeHint(Qt::MaximumSize); + QSizeF maxSize = layoutItem()->effectiveSizeHint(Qt::MaximumSize, constraint); if (size.width() == -1) size.setWidth(maxSize.width()); if (size.height() == -1) @@ -1010,6 +1035,7 @@ void QGridLayoutEngine::invalidate() q_cachedEffectiveLastRows[Ver] = -1; q_cachedDataForStyleInfo.invalidate(); q_cachedSize = QSizeF(); + q_cachedConstraintOrientation = UnknownConstraint; } static void visualRect(QRectF *geom, Qt::LayoutDirection dir, const QRectF &contentsRect) @@ -1074,10 +1100,13 @@ QRectF QGridLayoutEngine::cellRect(const QLayoutStyleInfo &styleInfo, } QSizeF QGridLayoutEngine::sizeHint(const QLayoutStyleInfo &styleInfo, Qt::SizeHint which, - const QSizeF & /* constraint */) const + const QSizeF &constraint) const { ensureColumnAndRowData(styleInfo); + if (hasDynamicConstraint()) + return dynamicallyConstrainedSizeHint(which, constraint); + switch (which) { case Qt::MinimumSize: return QSizeF(q_totalBoxes[Hor].q_minimumSize, q_totalBoxes[Ver].q_minimumSize); @@ -1375,7 +1404,11 @@ void QGridLayoutEngine::fillRowData(QGridLayoutRowData *rowData, const QLayoutSt box = &multiCell.q_box; multiCell.q_stretch = itemStretch; } - box->combine(item->box(orientation)); + // Items with constraints are not included in the orientation that + // they are constrained (since it depends on the hfw/constraint function). + // They must be combined at a later stage. + if (!item->hasDynamicConstraint() || orientation != item->dynamicConstraintOrientation()) + box->combine(item->box(orientation)); if (effectiveRowSpan == 1) { QSizePolicy::ControlTypes controls = item->controlTypes(top); @@ -1532,6 +1565,138 @@ void QGridLayoutEngine::ensureColumnAndRowData(const QLayoutStyleInfo &styleInfo q_cachedDataForStyleInfo = styleInfo; } +QSizeF QGridLayoutEngine::dynamicallyConstrainedSizeHint(Qt::SizeHint which, + const QSizeF &constraint) const +{ + Q_ASSERT(hasDynamicConstraint()); + if (constraint.width() < 0 && constraint.height() < 0) { + // Process the hfw / wfh items that we did not process in fillRowData() + const Qt::Orientation constraintOrient = constraintOrientation(); + + QGridLayoutRowData rowData = constraintOrient == Qt::Vertical ? q_rowData : q_columnData; + for (int i = q_items.count() - 1; i >= 0; --i) { + QGridLayoutItem *item = q_items.at(i); + if (item->hasDynamicConstraint()) { + QGridLayoutBox box = item->box(constraintOrient); + QGridLayoutBox &rowBox = rowData.boxes[item->firstRow(constraintOrient)]; + rowBox.combine(box); + } + } + + QGridLayoutBox totalBoxes[2]; + if (constraintOrient == Qt::Vertical) { + totalBoxes[Hor] = q_columnData.totalBox(0, columnCount()); + totalBoxes[Ver] = rowData.totalBox(0, rowCount()); + } else { + totalBoxes[Hor] = rowData.totalBox(0, columnCount()); + totalBoxes[Ver] = q_rowData.totalBox(0, rowCount()); + } + return QSizeF(totalBoxes[Hor].q_sizes(which), totalBoxes[Ver].q_sizes(which)); + } + + + Q_ASSERT(constraint.width() >= 0 || constraint.height() >= 0); + q_xx.resize(columnCount()); + q_yy.resize(rowCount()); + q_widths.resize(columnCount()); + q_heights.resize(rowCount()); + q_descents.resize(rowCount()); + + + const Qt::Orientation orientation = constraintOrientation(); + QGridLayoutRowData *colData; + QGridLayoutRowData constrainedRowData; + QGridLayoutBox *totalBox; + qreal *sizes; + qreal *pos; + qreal *descents; + qreal targetSize; + qreal cCount; + qreal rCount; + + if (orientation == Qt::Vertical) { + // height for width + colData = &q_columnData; + totalBox = &q_totalBoxes[Hor]; + sizes = q_widths.data(); + pos = q_xx.data(); + descents = 0; + targetSize = constraint.width(); + cCount = columnCount(); + rCount = rowCount(); + constrainedRowData = q_rowData; + } else { + // width for height + colData = &q_rowData; + totalBox = &q_totalBoxes[Ver]; + sizes = q_heights.data(); + pos = q_yy.data(); + descents = q_descents.data(); + targetSize = constraint.height(); + cCount = rowCount(); + rCount = columnCount(); + constrainedRowData = q_columnData; + } + colData->calculateGeometries(0, cCount, targetSize, pos, sizes, descents, *totalBox); + for (int i = q_items.count() - 1; i >= 0; --i) { + QGridLayoutItem *item = q_items.at(i); + + if (item->hasDynamicConstraint()) { + const qreal size = sizes[item->firstColumn(orientation)]; + QGridLayoutBox box = item->box(orientation, size); + QGridLayoutBox &rowBox = constrainedRowData.boxes[item->firstRow(orientation)]; + rowBox.combine(box); + } + } + const qreal newSize = constrainedRowData.totalBox(0, rCount).q_sizes(which); + + return (orientation == Qt::Vertical) ? QSizeF(targetSize, newSize) : QSizeF(newSize, targetSize); +} + + +/** + returns false if the layout has contradicting constraints (i.e. some items with a horizontal + constraint and other items with a vertical constraint) + */ +bool QGridLayoutEngine::ensureDynamicConstraint() const +{ + if (q_cachedConstraintOrientation == UnknownConstraint) { + for (int i = q_items.count() - 1; i >= 0; --i) { + QGridLayoutItem *item = q_items.at(i); + if (item->hasDynamicConstraint()) { + Qt::Orientation itemConstraintOrientation = item->dynamicConstraintOrientation(); + if (q_cachedConstraintOrientation == UnknownConstraint) { + q_cachedConstraintOrientation = itemConstraintOrientation; + } else if (q_cachedConstraintOrientation != itemConstraintOrientation) { + q_cachedConstraintOrientation = UnfeasibleConstraint; + qWarning("QGridLayoutEngine: Unfeasible, cannot mix horizontal and" + " vertical constraint in the same layout"); + return false; + } + } + } + if (q_cachedConstraintOrientation == UnknownConstraint) + q_cachedConstraintOrientation = NoConstraint; + } + return true; +} + +bool QGridLayoutEngine::hasDynamicConstraint() const +{ + if (!ensureDynamicConstraint()) + return false; + return q_cachedConstraintOrientation != NoConstraint; +} + +/* + * return value is only valid if hasConstraint() returns true + */ +Qt::Orientation QGridLayoutEngine::constraintOrientation() const +{ + (void)ensureDynamicConstraint(); + return (Qt::Orientation)q_cachedConstraintOrientation; +} + void QGridLayoutEngine::ensureGeometries(const QLayoutStyleInfo &styleInfo, const QSizeF &size) const { @@ -1544,10 +1709,74 @@ void QGridLayoutEngine::ensureGeometries(const QLayoutStyleInfo &styleInfo, q_widths.resize(columnCount()); q_heights.resize(rowCount()); q_descents.resize(rowCount()); - q_columnData.calculateGeometries(0, columnCount(), size.width(), q_xx.data(), q_widths.data(), - 0, q_totalBoxes[Hor]); - q_rowData.calculateGeometries(0, rowCount(), size.height(), q_yy.data(), q_heights.data(), - q_descents.data(), q_totalBoxes[Ver]); + + + Qt::Orientation orientation = Qt::Vertical; + if (hasDynamicConstraint()) + orientation = constraintOrientation(); + + /* + In order to do hfw we need to first distribute the columns, then the rows. + In order to do wfh we need to first distribute the rows, then the columns. + + If there is no constraint, the order of distributing the rows or columns first is irrelevant. + We choose horizontal just to keep the same behaviour as before (however, there shouldn't + be any behaviour difference). + */ + + QGridLayoutRowData *colData; + QGridLayoutRowData rowData; + qreal *widths; + qreal *heights; + qreal *xx; + qreal *yy; + qreal *xdescents = 0; + qreal *ydescents = 0; + qreal cCount; + qreal rCount; + QSizeF oSize = size; + if (orientation == Qt::Vertical) { + // height for width + colData = &q_columnData; + rowData = q_rowData; + widths = q_widths.data(); + heights = q_heights.data(); + xx = q_xx.data(); + yy = q_yy.data(); + cCount = columnCount(); + rCount = rowCount(); + ydescents = q_descents.data(); + } else { + // width for height + colData = &q_rowData; + rowData = q_columnData; + widths = q_heights.data(); + heights = q_widths.data(); + xx = q_yy.data(); + yy = q_xx.data(); + cCount = rowCount(); + rCount = columnCount(); + xdescents = q_descents.data(); + oSize.transpose(); + } + + colData->calculateGeometries(0, cCount, oSize.width(), xx, widths, + xdescents, q_totalBoxes[orientation == Qt::Horizontal]); + for (int i = q_items.count() - 1; i >= 0; --i) { + QGridLayoutItem *item = q_items.at(i); + const int col = item->firstColumn(orientation); + const int row = item->firstRow(orientation); + if (item->hasDynamicConstraint()) { + const qreal sz = widths[col]; + QGridLayoutBox box = item->box(orientation, sz); + rowData.boxes[row].combine(box); + } + } + + QGridLayoutBox &totalBox = q_totalBoxes[orientation == Qt::Vertical]; + totalBox = rowData.totalBox(0, rCount); + rowData.calculateGeometries(0, rCount, oSize.height(), yy, heights, + ydescents, totalBox); q_cachedSize = size; } diff --git a/src/gui/graphicsview/qgridlayoutengine_p.h b/src/gui/graphicsview/qgridlayoutengine_p.h index 9ac9a8e..580af7e 100644 --- a/src/gui/graphicsview/qgridlayoutengine_p.h +++ b/src/gui/graphicsview/qgridlayoutengine_p.h @@ -91,6 +91,14 @@ enum LayoutSide { Bottom }; +enum { + NoConstraint, + HorizontalConstraint, + VerticalConstraint, + UnknownConstraint, // need to update cache + UnfeasibleConstraint // not feasible, it be has some items with Vertical and others with Horizontal constraints +}; + template class QLayoutParameter { @@ -270,6 +278,10 @@ public: inline void setAlignment(Qt::Alignment alignment) { q_alignment = alignment; } QSizePolicy::Policy sizePolicy(Qt::Orientation orientation) const; + + bool hasDynamicConstraint() const; + Qt::Orientation dynamicConstraintOrientation() const; + QSizePolicy::ControlTypes controlTypes(LayoutSide side) const; QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; QGridLayoutBox box(Qt::Orientation orientation, qreal constraint = -1.0) const; @@ -280,7 +292,7 @@ public: void setGeometry(const QRectF &rect); void transpose(); void insertOrRemoveRows(int row, int delta, Qt::Orientation orientation = Qt::Vertical); - QSizeF effectiveMaxSize() const; + QSizeF effectiveMaxSize(const QSizeF &constraint) const; #ifdef QT_DEBUG void dump(int indent = 0) const; @@ -372,6 +384,14 @@ public: int column, int rowSpan, int columnSpan) const; QSizeF sizeHint(const QLayoutStyleInfo &styleInfo, Qt::SizeHint which, const QSizeF &constraint) const; + + // heightForWidth / widthForHeight support + QSizeF dynamicallyConstrainedSizeHint(Qt::SizeHint which, const QSizeF &constraint) const; + bool ensureDynamicConstraint() const; + bool hasDynamicConstraint() const; + Qt::Orientation constraintOrientation() const; + + QSizePolicy::ControlTypes controlTypes(LayoutSide side) const; void transpose(); void setVisualDirection(Qt::LayoutDirection direction); @@ -405,6 +425,7 @@ private: // Lazily computed from the above user input mutable int q_cachedEffectiveFirstRows[NOrientations]; mutable int q_cachedEffectiveLastRows[NOrientations]; + mutable quint8 q_cachedConstraintOrientation : 2; // Layout item input mutable QLayoutStyleInfo q_cachedDataForStyleInfo; diff --git a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index d1d6860..28980cb 100644 --- a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -107,12 +107,13 @@ private slots: void avoidRecursionInInsertItem(); void styleInfoLeak(); void task236367_maxSizeHint(); + void heightForWidth(); }; class RectWidget : public QGraphicsWidget { public: - RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent){} + RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent), m_fnConstraint(0) {} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { @@ -125,9 +126,12 @@ public: QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const { - if (m_sizeHints[which].isValid()) { + if (constraint.width() < 0 && constraint.height() < 0 && m_sizeHints[which].isValid()) { return m_sizeHints[which]; } + if (m_fnConstraint) { + return m_fnConstraint(which, constraint); + } return QGraphicsWidget::sizeHint(which, constraint); } @@ -136,7 +140,13 @@ public: updateGeometry(); } + void setConstraintFunction(QSizeF (*fnConstraint)(Qt::SizeHint, const QSizeF &)) { + m_fnConstraint = fnConstraint; + } + QSizeF m_sizeHints[Qt::NSizeHints]; + QSizeF (*m_fnConstraint)(Qt::SizeHint, const QSizeF &); + }; struct ItemDesc @@ -146,7 +156,8 @@ struct ItemDesc m_rowSpan(1), m_colSpan(1), m_sizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred)), - m_align(0) + m_align(0), + m_fnConstraint(0) { } @@ -213,8 +224,20 @@ struct ItemDesc return (*this); } + ItemDesc &heightForWidth(QSizeF (*fnConstraint)(Qt::SizeHint, const QSizeF &)) { + m_fnConstraint = fnConstraint; + m_constraintOrientation = Qt::Vertical; + return (*this); + } + void apply(QGraphicsGridLayout *layout, QGraphicsWidget *item) { - item->setSizePolicy(m_sizePolicy); + QSizePolicy sp = m_sizePolicy; + if (m_fnConstraint) { + sp.setHeightForWidth(m_constraintOrientation == Qt::Vertical); + //sp.setWidthForHeight(m_constraintOrientation == Qt::Horizontal); + } + + item->setSizePolicy(sp); for (int i = 0; i < Qt::NSizeHints; ++i) { if (!m_sizes[i].isValid()) continue; @@ -233,6 +256,7 @@ struct ItemDesc break; } } + layout->addItem(item, m_pos.first, m_pos.second, m_rowSpan, m_colSpan); layout->setAlignment(item, m_align); } @@ -240,6 +264,7 @@ struct ItemDesc void apply(QGraphicsGridLayout *layout, RectWidget *item) { for (int i = 0; i < Qt::NSizeHints; ++i) item->setSizeHint((Qt::SizeHint)i, m_sizeHints[i]); + item->setConstraintFunction(m_fnConstraint); apply(layout, static_cast(item)); } @@ -251,6 +276,9 @@ struct ItemDesc QSizeF m_sizeHints[Qt::NSizeHints]; QSizeF m_sizes[Qt::NSizeHints]; Qt::Alignment m_align; + + Qt::Orientation m_constraintOrientation; + QSizeF (*m_fnConstraint)(Qt::SizeHint, const QSizeF &); }; typedef QList ItemList; @@ -2116,6 +2144,17 @@ void tst_QGraphicsGridLayout::alignment2() delete widget; } +static QSizeF hfw1(Qt::SizeHint, const QSizeF &constraint) +{ + QSizeF result(constraint); + if (constraint.width() < 0 && constraint.height() < 0) { + return QSizeF(50, 400); + } else if (constraint.width() >= 0) { + result.setHeight(20000./constraint.width()); + } + return result; +} + void tst_QGraphicsGridLayout::geometries_data() { @@ -2145,6 +2184,186 @@ void tst_QGraphicsGridLayout::geometries_data() << QRectF(0, 0, 60,10) << QRectF(0, 10, 60,10) ); + // change layout height and verify + QTest::newRow("hfw-h401") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(500, 500)) + .heightForWidth(hfw1) + ) + << QSizeF(100, 401) + << (RectList() + << QRectF(0, 0, 50, 1) << QRectF(50, 0, 50, 1) + << QRectF(0, 1, 50,100) << QRectF(50, 1, 50,400) + ); + + + QTest::newRow("hfw-h408") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(500, 500)) + .heightForWidth(hfw1) + ) + << QSizeF(100, 408) + << (RectList() + << QRectF(0, 0, 50, 8) << QRectF(50, 0, 50, 8) + << QRectF(0, 8, 50,100) << QRectF(50, 8, 50,400) + ); + + QTest::newRow("hfw-h410") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(500, 500)) + .heightForWidth(hfw1) + ) + << QSizeF(100, 410) + << (RectList() + << QRectF(0, 0, 50,10) << QRectF(50, 0, 50,10) + << QRectF(0, 10, 50,100) << QRectF(50, 10, 50,400) + ); + + QTest::newRow("hfw-h470") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(500, 500)) + .heightForWidth(hfw1) + ) + << QSizeF(100, 470) + << (RectList() + << QRectF(0, 0, 50,70) << QRectF(50, 0, 50,70) + << QRectF(0, 70, 50,100) << QRectF(50, 70, 50,400) + ); + + + // change layout width and verify + QTest::newRow("hfw-w100") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(5000, 5000)) + .heightForWidth(hfw1) + ) + << QSizeF(100, 401) + << (RectList() + << QRectF( 0, 0, 50, 1) << QRectF( 50, 0, 50, 1) + << QRectF( 0, 1, 50, 100) << QRectF( 50, 1, 50, 400) + ); + + QTest::newRow("hfw-w160") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(5000, 5000)) + .heightForWidth(hfw1) + ) + << QSizeF(160, 401) + << (RectList() + << QRectF( 0, 0, 80, 100) << QRectF( 80, 0, 80, 100) + << QRectF( 0, 100, 80, 100) << QRectF( 80, 100, 80, 250) + ); + + + QTest::newRow("hfw-w500") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(5000, 5000)) + .heightForWidth(hfw1) + ) + << QSizeF(500, 401) + << (RectList() + << QRectF( 0, 0, 100, 100) << QRectF(100, 0, 100, 100) + << QRectF( 0, 100, 100, 100) << QRectF(100, 100, 400, 50) + ); + } void tst_QGraphicsGridLayout::geometries() @@ -2215,6 +2434,143 @@ void tst_QGraphicsGridLayout::task236367_maxSizeHint() QCOMPARE(widget->size(), QSizeF(w, h)); } +/* +static qreal hfw(qreal w) +{ + if (w == 0) + return 20000; + return 20000/w; +} +*/ +static QSizeF hfw(Qt::SizeHint /*which*/, const QSizeF &constraint) +{ + QSizeF result(constraint); + const qreal cw = constraint.width(); + const qreal ch = constraint.height(); + if (cw < 0 && ch < 0) { + return QSizeF(200, 100); + } else if (cw >= 0) { + result.setHeight(20000./cw); + } else if (cw == 0) { + result.setHeight(20000); + } else if (ch >= 0) { + result.setWidth(20000./ch); + } else if (ch == 0) { + result.setWidth(20000); + } + + return result; +} + +static qreal growthFactorBelowPreferredSize(qreal desired, qreal sumAvailable, qreal sumDesired) +{ + Q_ASSERT(sumDesired != 0.0); + return desired * qPow(sumAvailable / sumDesired, desired / sumDesired); +} + +static void expectedWidth(qreal minSize1, qreal prefSize1, + qreal minSize2, qreal prefSize2, + qreal targetSize, qreal *width1, qreal *width2) +{ + qreal sumAvail,factor1,factor2; + // stretch behaviour is different below and above preferred size... + if (targetSize < prefSize1 + prefSize2) { + sumAvail = targetSize - minSize1 - minSize2; + const qreal desired1 = prefSize1 - minSize1; + const qreal desired2 = prefSize2 - minSize2; + const qreal sumDesired = desired1 + desired2; + factor1 = growthFactorBelowPreferredSize(desired1, sumAvail, sumDesired); + factor2 = growthFactorBelowPreferredSize(desired2, sumAvail, sumDesired); + const qreal sumFactors = factor1 + factor2; + *width1 = sumAvail*factor1/sumFactors + minSize1; + *width2 = sumAvail*factor2/sumFactors + minSize2; + } else { + sumAvail = targetSize - prefSize1 - prefSize2; + factor1 = prefSize1; + factor2 = prefSize2; + const qreal sumFactors = factor1 + factor2; + *width1 = sumAvail*factor1/sumFactors + prefSize1; + *width2 = sumAvail*factor2/sumFactors + prefSize2; + } +} + + +bool qFuzzyCompare(const QSizeF &a, const QSizeF &b) +{ + return qFuzzyCompare(a.width(), b.width()) && qFuzzyCompare(a.height(), b.height()); +} + +void tst_QGraphicsGridLayout::heightForWidth() +{ + QGraphicsWidget *widget = new QGraphicsWidget; + QGraphicsGridLayout *layout = new QGraphicsGridLayout; + widget->setLayout(layout); + layout->setContentsMargins(0, 0, 0, 0); + layout->setSpacing(0); + RectWidget *w00 = new RectWidget; + w00->setSizeHint(Qt::MinimumSize, QSizeF(1,1)); + w00->setSizeHint(Qt::PreferredSize, QSizeF(10,10)); + w00->setSizeHint(Qt::MaximumSize, QSizeF(100,100)); + layout->addItem(w00, 0, 0); + + RectWidget *w01 = new RectWidget; + w01->setSizeHint(Qt::MinimumSize, QSizeF(1,1)); + w01->setSizeHint(Qt::PreferredSize, QSizeF(10,10)); + w01->setSizeHint(Qt::MaximumSize, QSizeF(100,100)); + layout->addItem(w01, 0, 1); + + RectWidget *w10 = new RectWidget; + w10->setSizeHint(Qt::MinimumSize, QSizeF(1,1)); + w10->setSizeHint(Qt::PreferredSize, QSizeF(10,10)); + w10->setSizeHint(Qt::MaximumSize, QSizeF(100,100)); + layout->addItem(w10, 1, 0); + + RectWidget *w11 = new RectWidget; + w11->setSizeHint(Qt::MinimumSize, QSizeF(1,1)); + w11->setSizeHint(Qt::MaximumSize, QSizeF(30000,30000)); + w11->setConstraintFunction(hfw); + QSizePolicy sp(QSizePolicy::Preferred, QSizePolicy::Preferred); + sp.setHeightForWidth(true); + w11->setSizePolicy(sp); + layout->addItem(w11, 1, 1); + + QSizeF prefSize = layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(-1, -1)); + QCOMPARE(prefSize, QSizeF(10+200, 10+100)); + + QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(2, -1)), QSizeF(2, 20001)); + QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(2, -1)), QSizeF(2, 20010)); + QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(2, -1)), QSizeF(2, 20100)); + qreal width1; + qreal width2; + expectedWidth(1, 10, 1, 200, 20, &width1, &width2); + QSizeF expectedSize = hfw(Qt::MinimumSize, QSizeF(width2, -1)) + QSizeF(width1, 1); + QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(20, -1)), expectedSize); + expectedSize.rheight()+=9; + QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(20, -1)), expectedSize); + expectedSize.rheight()+=90; + QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(20, -1)), expectedSize); + + expectedWidth(1, 10, 1, 200, 300, &width1, &width2); + expectedSize = hfw(Qt::MinimumSize, QSizeF(width2, -1)) + QSizeF(width1, 1); + QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(300, -1)), expectedSize); + expectedSize.rheight()+=9; + QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(300, -1)), expectedSize); + // the height of the hfw widget is shorter than the one to the left, which is 100, so + // the total height of the last row is 100 (which leaves the layout height to be 200) + QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(300, -1)), QSizeF(300, 200)); + + // the hfw item is shorter than the item to the left + expectedWidth(1, 10, 1, 200, 500, &width1, &width2); + expectedSize = hfw(Qt::MinimumSize, QSizeF(width2, -1)) + QSizeF(width1, 1); + QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(500, -1)), expectedSize); + expectedSize.rheight()+=9; + QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(500, -1)), expectedSize); + // the height of the hfw widget is shorter than the one to the left, which is 100, so + // the total height of the last row is 100 (which leaves the layout height to be 200) + QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(500, -1)), QSizeF(500, 200)); + +} + QTEST_MAIN(tst_QGraphicsGridLayout) #include "tst_qgraphicsgridlayout.moc" -- cgit v0.12 From 1c959c35234838cbb69f676cd96e27dc30bd85c1 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Tue, 10 Aug 2010 12:46:41 +0200 Subject: Doc: Adding radius support for CSS3 and webkit --- doc/src/template/style/style.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index 9b37693..d6b0fda 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -114,6 +114,8 @@ { border: 1px solid #DDDDDD; -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; margin: 0 20px 10px 10px; padding: 20px 15px 20px 20px; overflow-x: auto; @@ -121,6 +123,8 @@ table, pre { -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; background-color: #F6F6F6; border: 1px solid #E6E6E6; border-collapse: separate; @@ -855,6 +859,8 @@ background-color:#F6F6F6; border:1px solid #E6E6E6; -moz-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; font-size:12pt; padding-left:10px; margin-top:10px; @@ -911,6 +917,8 @@ { display: none; -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; border: 1px solid #DDDDDD; position: fixed; top: 100px; @@ -974,6 +982,8 @@ { float: right; -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; background-color: #F6F6F6; border: 1px solid #DDDDDD; margin: 0 20px 10px 10px; @@ -1068,6 +1078,8 @@ .relpage { -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; border: 1px solid #DDDDDD; padding: 25px 25px; clear: both; @@ -1084,6 +1096,8 @@ h3.fn, span.fn { -moz-border-radius:7px 7px 7px 7px; + -webkit-border-radius:7px 7px 7px 7px; + border-radius:7px 7px 7px 7px; background-color: #F6F6F6; border-width: 1px; border-style: solid; @@ -1102,6 +1116,8 @@ border-style: solid; border-color: #E6E6E6; -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; width:100%; } -- cgit v0.12 From 2281a3a7a62a5a81de7fefaf0b84f130b16bd44f Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 10 Aug 2010 10:54:26 +0200 Subject: QMetaObject::normalizeSignature avoid reading past the string in case of invalid signature given. If passed "a(b", qNormalizeType would return a pointer to the \0 at the end of the string. We would add \0 to the result (thinking it is ',' or ')' ) And continue to process the memory after the string. Reviewed-by: Kent Hansen Task-number: QT-1591 --- src/corelib/kernel/qmetaobject.cpp | 5 ++++- tests/auto/qmetaobject/tst_qmetaobject.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 79a38cd..9854e68 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -1009,8 +1009,11 @@ QByteArray QMetaObject::normalizedSignature(const char *method) int argdepth = 0; int templdepth = 0; while (*d) { - if (argdepth == 1) + if (argdepth == 1) { d = qNormalizeType(d, templdepth, result); + if (!*d) //most likely an invalid signature. + break; + } if (*d == '(') ++argdepth; if (*d == ')') diff --git a/tests/auto/qmetaobject/tst_qmetaobject.cpp b/tests/auto/qmetaobject/tst_qmetaobject.cpp index 62416b1..bb96da1 100644 --- a/tests/auto/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/qmetaobject/tst_qmetaobject.cpp @@ -714,6 +714,8 @@ void tst_QMetaObject::normalizedSignature_data() QTest::newRow("const12") << "void foo(Fooconst*const *const)" << "void foo(Foo*const*const)"; QTest::newRow("const13") << "void foo(const Foo&)" << "void foo(Foo)"; QTest::newRow("const14") << "void foo(Fooconst&)" << "void foo(Foo)"; + + QTest::newRow("invalid1") << "a( b" << "a(b"; } void tst_QMetaObject::normalizedSignature() @@ -721,7 +723,7 @@ void tst_QMetaObject::normalizedSignature() QFETCH(QString, signature); QFETCH(QString, result); - QCOMPARE(QString::fromLatin1(QMetaObject::normalizedSignature(signature.toLatin1())), result); + QCOMPARE(QMetaObject::normalizedSignature(signature.toLatin1()), result.toLatin1()); } void tst_QMetaObject::normalizedType_data() @@ -759,7 +761,7 @@ void tst_QMetaObject::normalizedType() QFETCH(QString, type); QFETCH(QString, result); - QCOMPARE(QString::fromLatin1(QMetaObject::normalizedType(type.toLatin1())), result); + QCOMPARE(QMetaObject::normalizedType(type.toLatin1()), result.toLatin1()); } void tst_QMetaObject::customPropertyType() -- cgit v0.12 From c21f95aab2228168452d1d7bb4e332a8c6164a02 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 10 Aug 2010 11:35:51 +0200 Subject: Added one test for QRegExp Task-number: QT-1289 --- tests/auto/qregexp/tst_qregexp.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/auto/qregexp/tst_qregexp.cpp b/tests/auto/qregexp/tst_qregexp.cpp index ea07323..d0d26ee 100644 --- a/tests/auto/qregexp/tst_qregexp.cpp +++ b/tests/auto/qregexp/tst_qregexp.cpp @@ -105,6 +105,7 @@ private slots: void QTBUG_7049_data(); void QTBUG_7049(); + void interval(); }; // Testing get/set functions @@ -1426,5 +1427,22 @@ void tst_QRegExp::QTBUG_7049() QCOMPARE( re.cap(2), cap2 ); } +void tst_QRegExp::interval() +{ + { + QRegExp exp("a{0,1}"); + QVERIFY(exp.isValid()); + } + { + QRegExp exp("a{1,1}"); + QVERIFY(exp.isValid()); + } + { + QRegExp exp("a{1,0}"); + QVERIFY(!exp.isValid()); + } +} + + QTEST_APPLESS_MAIN(tst_QRegExp) #include "tst_qregexp.moc" -- cgit v0.12 From bfc32c590d797599ddfb814f023e5837c663ec23 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Tue, 10 Aug 2010 13:09:46 +0200 Subject: Mac: Fix crash when using style to draw on other things than widgets When drawing a complex control using the style, you are allowd to skip giving a widget as the last argument. But when doing so, it caused a crash in the mac style. Reviewed-by: Fabien Freling --- src/gui/styles/qmacstyle_mac.mm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index ae90d26..671a888 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -1440,6 +1440,9 @@ QMacStylePrivate::QMacStylePrivate(QMacStyle *style) bool QMacStylePrivate::animatable(QMacStylePrivate::Animates as, const QWidget *w) const { + if (!w) + return false; + if (as == AquaPushButton) { QPushButton *pb = const_cast(static_cast(w)); if (w->window()->isActiveWindow() && pb && !mouseDown) { -- cgit v0.12 From bc7a42be16c5218ba5022c95bf1334a15a9151a6 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Tue, 10 Aug 2010 13:33:38 +0200 Subject: doc: Some reorganization of top page topic hierarchy. --- doc/src/frameworks-technologies/dbus-adaptors.qdoc | 1 - doc/src/frameworks-technologies/dbus-intro.qdoc | 2 +- doc/src/frameworks-technologies/ipc.qdoc | 13 ++++++------- doc/src/modules.qdoc | 7 +++---- doc/src/xml-processing/xml-patterns.qdoc | 2 +- doc/src/xml-processing/xml-processing.qdoc | 8 +++++--- doc/src/xml-processing/xquery-introduction.qdoc | 2 +- 7 files changed, 17 insertions(+), 18 deletions(-) diff --git a/doc/src/frameworks-technologies/dbus-adaptors.qdoc b/doc/src/frameworks-technologies/dbus-adaptors.qdoc index 181a8d9..f193a67 100644 --- a/doc/src/frameworks-technologies/dbus-adaptors.qdoc +++ b/doc/src/frameworks-technologies/dbus-adaptors.qdoc @@ -30,7 +30,6 @@ \title Using QtDBus Adaptors \brief How to create and use DBus adaptors in Qt. - \ingroup technology-apis \ingroup best-practices Adaptors are special classes that are attached to any QObject-derived class diff --git a/doc/src/frameworks-technologies/dbus-intro.qdoc b/doc/src/frameworks-technologies/dbus-intro.qdoc index bccb6da..9d4cd95 100644 --- a/doc/src/frameworks-technologies/dbus-intro.qdoc +++ b/doc/src/frameworks-technologies/dbus-intro.qdoc @@ -27,7 +27,7 @@ /*! \page intro-to-dbus.html - \title Introduction to D-Bus + \title D-Bus \brief An introduction to Inter-Process Communication and Remote Procedure Calling with D-Bus. \keyword QtDBus diff --git a/doc/src/frameworks-technologies/ipc.qdoc b/doc/src/frameworks-technologies/ipc.qdoc index 23234ae..26a8cec 100644 --- a/doc/src/frameworks-technologies/ipc.qdoc +++ b/doc/src/frameworks-technologies/ipc.qdoc @@ -56,13 +56,12 @@ \section1 D-Bus - The \l{QtDBus} module is a Unix-only library - you can use to implement IPC using the D-Bus protocol. It extends - Qt's \l{signalsandslots.html} {Signals and Slots} mechanism to the - IPC level, allowing a signal emitted by one process to be - connected to a slot in another process. This \l {Introduction to - D-Bus} page has detailed information on how to use the \l{QtDBus} - module. + The \l{QtDBus} module is a Unix-only library you can use to + implement IPC using the D-Bus protocol. It extends Qt's + \l{signalsandslots.html} {Signals and Slots} mechanism to the IPC + level, allowing a signal emitted by one process to be connected to + a slot in another process. This \l {D-Bus} page has detailed + information on how to use the \l{QtDBus} module. \section1 Qt COmmunications Protocol (QCOP) diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index c35d71c..941459b 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -442,7 +442,7 @@ \section1 Further Reading General overviews of XQuery and XSchema can be found in the - \l{Using XML Technologies} document. + \l{XQuery} document. An introduction to the XQuery language can be found in \l{A Short Path to XQuery}. @@ -842,8 +842,7 @@ \target The QDBus compiler \brief The QtDBus module is a Unix-only library that you can use - to perform Inter-Process Communication using the \l{Introduction to - D-Bus}{D-Bus} protocol. + to perform Inter-Process Communication using the \l{D-Bus} protocol. Applications using the QtDBus module can provide services to other, remote applications by exporting objects, as well as use @@ -869,7 +868,7 @@ directory. When installing Qt from source, this module is built when Qt's tools are built. - See the \l {Introduction to D-Bus} page for detailed information on + See the \l {D-Bus} page for detailed information on how to use this module. This module is part of all \l{Qt editions}. diff --git a/doc/src/xml-processing/xml-patterns.qdoc b/doc/src/xml-processing/xml-patterns.qdoc index dcf92f6..d0c8709 100644 --- a/doc/src/xml-processing/xml-patterns.qdoc +++ b/doc/src/xml-processing/xml-patterns.qdoc @@ -27,7 +27,7 @@ /*! \page xmlprocessing.html - \title Using XML Technologies + \title XQuery \previouspage Working with the DOM Tree \contentspage XML Processing diff --git a/doc/src/xml-processing/xml-processing.qdoc b/doc/src/xml-processing/xml-processing.qdoc index 0d58301..dcdd8d1 100644 --- a/doc/src/xml-processing/xml-processing.qdoc +++ b/doc/src/xml-processing/xml-processing.qdoc @@ -32,13 +32,15 @@ \brief Classes that support XML, via, for example DOM and SAX. These classes are relevant to XML users. - + \generatelist{related} */ /*! \page xml-processing.html \title XML Processing + \ingroup technology-apis + \brief An Overview of the XML processing facilities in Qt. In addition to core XML support, classes for higher level querying @@ -57,7 +59,7 @@ \o \l {XML Streaming} \o \l {The SAX Interface} \o \l {Working with the DOM Tree} - \o \l {Using XML Technologies}{XQuery/XPath and XML Schema} + \o \l {XQuery}{XQuery/XPath and XML Schema} \list \o \l{A Short Path to XQuery} \endlist @@ -525,7 +527,7 @@ \previouspage The SAX Interface \contentspage XML Processing - \nextpage {Using XML Technologies}{XQuery/XPath and XML Schema} + \nextpage {XQuery}{XQuery/XPath and XML Schema} DOM Level 2 is a W3C Recommendation for XML interfaces that maps the constituents of an XML document to a tree structure. The specification diff --git a/doc/src/xml-processing/xquery-introduction.qdoc b/doc/src/xml-processing/xquery-introduction.qdoc index 09af688..b79c205 100644 --- a/doc/src/xml-processing/xquery-introduction.qdoc +++ b/doc/src/xml-processing/xquery-introduction.qdoc @@ -29,7 +29,7 @@ \page xquery-introduction.html \title A Short Path to XQuery -\startpage Using XML Technologies +\startpage XQuery \target XQuery-introduction XQuery is a language for querying XML data or non-XML data that can be -- cgit v0.12 From 846f1b44eea4bb34d080d055badb40a4a13d369e Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Tue, 10 Aug 2010 13:59:57 +0200 Subject: QSslSocket: fix security vulnerability with wildcard IP addresses This fixes Westpoint Security issue with Advisory ID#: wp-10-0001. Before, we would allow wildcards in IP addresses like *.2.3.4 ; now, IP addresses must match excatly. Patch-by: Richard J. Moore Task-number: QT-3704 --- src/network/ssl/qsslsocket_openssl.cpp | 5 +++++ tests/auto/qsslsocket/tst_qsslsocket.cpp | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index b4d030c..bb6910a 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -1288,6 +1288,11 @@ bool QSslSocketBackendPrivate::isMatchingHostname(const QString &cn, const QStri if (hostname.midRef(hostname.indexOf(QLatin1Char('.'))) != cn.midRef(firstCnDot)) return false; + // Check if the hostname is an IP address, if so then wildcards are not allowed + QHostAddress addr(hostname); + if (!addr.isNull()) + return false; + // Ok, I guess this was a wildcard CN and the hostname matches. return true; } diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp index 0c12974..6c1dd8f 100644 --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp @@ -1072,6 +1072,7 @@ void tst_QSslSocket::wildcardCertificateNames() QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example.com"), QString("www.example.com")), true ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("xxx*.example.com"), QString("xxxwww.example.com")), true ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("f*.example.com"), QString("foo.example.com")), true ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("192.168.0.0"), QString("192.168.0.0")), true ); // Failing CN matches QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("xxx.example.com"), QString("www.example.com")), false ); @@ -1085,6 +1086,7 @@ void tst_QSslSocket::wildcardCertificateNames() QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example."), QString("www.example")), false ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString(""), QString("www")), false ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*"), QString("www")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.168.0.0"), QString("192.168.0.0")), false ); } void tst_QSslSocket::wildcard() -- cgit v0.12 From 2b42bac65ae90f94b04ff556e5033014d37d223d Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Tue, 10 Aug 2010 14:14:25 +0200 Subject: doc: Changed some titles so lists of contents sort better. --- doc/src/deployment/deployment.qdoc | 2 +- doc/src/development/developing-with-qt.qdoc | 2 +- doc/src/frameworks-technologies/containers.qdoc | 2 +- doc/src/frameworks-technologies/model-view-programming.qdoc | 2 +- doc/src/getting-started/demos.qdoc | 2 +- doc/src/overviews.qdoc | 7 ++++--- doc/src/porting/porting4.qdoc | 4 ++-- doc/src/porting/qt4-tulip.qdoc | 2 +- doc/src/qt4-intro.qdoc | 2 +- src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc | 2 +- src/corelib/global/qglobal.cpp | 5 +++-- src/corelib/tools/qpair.qdoc | 4 ++-- src/dbus/qdbusargument.cpp | 4 ++-- src/xmlpatterns/api/qxmlquery.cpp | 7 +++---- 14 files changed, 24 insertions(+), 23 deletions(-) diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc index 4573f3c..020ca16 100644 --- a/doc/src/deployment/deployment.qdoc +++ b/doc/src/deployment/deployment.qdoc @@ -155,7 +155,7 @@ \row \o QtWebKit \o WebKit \o WebKit is licensed under the GNU LGPL version 2 or later. This has implications for developers of closed source applications. - Please see \l{QtWebKit Module#License Information}{the QtWebKit module + Please see \l{WebKit in Qt#License Information}{the QtWebKit module documentation} for more information. \row \o \l{Phonon Module}{Phonon} \o Phonon diff --git a/doc/src/development/developing-with-qt.qdoc b/doc/src/development/developing-with-qt.qdoc index f9b38b8..b88fe3f 100644 --- a/doc/src/development/developing-with-qt.qdoc +++ b/doc/src/development/developing-with-qt.qdoc @@ -83,7 +83,7 @@ \o \l {Known Issues} \o \l {Platform Notes} \o \l {Platform Notes - Symbian} - \o \l {Qt For ActiveX} + \o \l {ActiveX in Qt} \o \l {Qt for Embedded Linux Classes} \o \l {Qt for Embedded Platforms} \o \l {Qt for Mac OS X - Specific Issues} diff --git a/doc/src/frameworks-technologies/containers.qdoc b/doc/src/frameworks-technologies/containers.qdoc index 58061ad..797326e 100644 --- a/doc/src/frameworks-technologies/containers.qdoc +++ b/doc/src/frameworks-technologies/containers.qdoc @@ -43,7 +43,7 @@ /*! \page containers.html - \title Generic Containers + \title Container Classes \ingroup technology-apis \ingroup groups \keyword container class diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc index 131f063..7167f97 100644 --- a/doc/src/frameworks-technologies/model-view-programming.qdoc +++ b/doc/src/frameworks-technologies/model-view-programming.qdoc @@ -1011,7 +1011,7 @@ \snippet doc/src/snippets/reading-selections/window.cpp 0 - The above code uses Qt's convenient \l{Generic Containers}{foreach + The above code uses Qt's convenient \l{Container Classes}{foreach keyword} to iterate over, and modify, the items corresponding to the indexes returned by the selection model. diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc index ef16224..94b19c3 100644 --- a/doc/src/getting-started/demos.qdoc +++ b/doc/src/getting-started/demos.qdoc @@ -134,7 +134,7 @@ \section1 QtWebKit \list - \o \l{Web Browser} demonstrates how Qt's \l{QtWebKit Module}{WebKit module} + \o \l{Web Browser} demonstrates how Qt's \l{WebKit in Qt}{WebKit module} can be used to implement a small Web browser. \endlist diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index 3c02705..caf9404 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -91,11 +91,12 @@ /*! \group qt-activex - \title Qt For ActiveX - \brief Qt API's for using ActiveX controls, servers, and COM. + \title ActiveX in Qt \ingroup technology-apis \ingroup platform-specific + \brief Qt API's for using ActiveX controls, servers, and COM. + These pages document Qt's API's for developing with ActiveX controls, servers, and COM. @@ -104,7 +105,7 @@ /*! \group qt-sql - \title Using SQL in Qt + \title SQL in Qt \brief Qt API's for using SQL. \ingroup technology-apis \ingroup best-practices diff --git a/doc/src/porting/porting4.qdoc b/doc/src/porting/porting4.qdoc index 0bbf35f..7b80e13 100644 --- a/doc/src/porting/porting4.qdoc +++ b/doc/src/porting/porting4.qdoc @@ -2598,7 +2598,7 @@ seems feeble. \endomit - See \l{Generic Containers} for a list of Qt 4 containers. + See \l{Container Classes} for a list of Qt 4 containers. \section1 QPtrDict @@ -3939,7 +3939,7 @@ check the index against QVector::size() yourself. \endlist - See \l{Generic Containers} for an overview of the Qt 4 container + See \l{Container Classes} for an overview of the Qt 4 container classes. \section1 QVariant diff --git a/doc/src/porting/qt4-tulip.qdoc b/doc/src/porting/qt4-tulip.qdoc index 08542a6..333af84 100644 --- a/doc/src/porting/qt4-tulip.qdoc +++ b/doc/src/porting/qt4-tulip.qdoc @@ -97,7 +97,7 @@ you are iterating, that won't affect the loop. For details about the new containers, see the - \l{Generic Containers} and \l{Generic Algorithms} overview documents. + \l{Container Classes} and \l{Generic Algorithms} overview documents. In addition to the new containers, considerable work has also gone into QByteArray and QString. The Qt 3 QCString class has been diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index 8867fd9..88ef2a8 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -86,7 +86,7 @@ In Qt 4.4: \list - \o \l{QtWebkit Module}{Qt WebKit integration}, making it possible for developers + \o \l{Webkit in QT}{Qt WebKit integration}, making it possible for developers to use a fully-featured Web browser to display documents and access online services. \o A multimedia API provided by the \l{Phonon Overview}{Phonon Multimedia Framework}. diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc index d3f5502..0335d46 100644 --- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc +++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc @@ -1,6 +1,6 @@ /*! \module QtWebKit - \title QtWebKit Module + \title WebKit in Qt \contentspage All Qt Modules \previouspage QtSvg \nextpage QtXml diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 0e3a8d3..af35316 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -2914,8 +2914,9 @@ int qrand() \relates You can use this macro to specify information about a custom type - \a Type. With accurate type information, Qt's \l{generic - containers} can choose appropriate storage methods and algorithms. + \a Type. With accurate type information, Qt's \l{Container Classes} + {generic containers} can choose appropriate storage methods and + algorithms. \a Flags can be one of the following: diff --git a/src/corelib/tools/qpair.qdoc b/src/corelib/tools/qpair.qdoc index e60243f..d49c09e 100644 --- a/src/corelib/tools/qpair.qdoc +++ b/src/corelib/tools/qpair.qdoc @@ -35,7 +35,7 @@ pair type is not available. It stores one value of type T1 and one value of type T2. It can be used as a return value for a function that needs to return two values, or as the value type of - a \l{generic container}. + a \l{Container classes}{generic container}. Here's an example of a QPair that stores one QString and one \c double value: @@ -53,7 +53,7 @@ requirements; these requirements are documented on a per-function basis. - \sa {Generic Containers} + \sa {Container Classes} */ /*! \typedef QPair::first_type diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index fbbc6a2..0bde085 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -825,7 +825,7 @@ void QDBusArgument::endStructure() \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 6 If the type you want to marshall is a QList, QVector or any of the - Qt's \l {Generic Containers} that take one template parameter, + Qt's \l {Container Classes} that take one template parameter, you need not declare an \c{operator<<} function for it, since QtDBus provides generic templates to do the job of marshalling the data. The same applies for STL's sequence containers, such @@ -952,7 +952,7 @@ void QDBusArgument::endStructure() const \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 9 If the type you want to demarshall is a QList, QVector or any of the - Qt's \l {Generic Containers} that take one template parameter, you + Qt's \l {Container Classes} that take one template parameter, you need not declare an \c{operator>>} function for it, since QtDBus provides generic templates to do the job of demarshalling the data. The same applies for STL's sequence containers, such as \c {std::list}, diff --git a/src/xmlpatterns/api/qxmlquery.cpp b/src/xmlpatterns/api/qxmlquery.cpp index e106d74..55af49b 100644 --- a/src/xmlpatterns/api/qxmlquery.cpp +++ b/src/xmlpatterns/api/qxmlquery.cpp @@ -151,8 +151,8 @@ QT_BEGIN_NAMESPACE \endcode \note For the current release, XSLT support should be considered - experimental. See section \l{Using XML technologies#XSLT - 2.0}{XSLT conformance} for details. + experimental. See section \l{XQuery#XSLT 2.0} {XSLT conformance} for + details. Stylesheet parameters are bound using bindVariable(). @@ -291,8 +291,7 @@ QXmlQuery::QXmlQuery(const QXmlNamePool &np) : d(new QXmlQueryPrivate(np)) create instances of QXmlQuery for running XQueries. \note The XSL-T support in this release is considered experimental. - See the \l{Using XML technologies#XSLT 2.0}{XSLT conformance} for - details. + See the \l{XQuery#XSLT 2.0} {XSLT conformance} for details. \since 4.5 \sa queryLanguage() -- cgit v0.12 From ca9270722b4412d9f70efe1ef4ad51635deca75a Mon Sep 17 00:00:00 2001 From: "Richard J. Moore" Date: Sun, 6 Jun 2010 22:10:08 +0100 Subject: Fix handling of SSL certificates with wildcard domain names Merge-request: 731 Task-number: QTBUG-4455 Reviewed-by: Peter Hartmann --- src/network/ssl/qsslsocket_openssl.cpp | 42 +++++++++++++++++++++++++++++--- src/network/ssl/qsslsocket_openssl_p.h | 1 + tests/auto/qsslsocket/tst_qsslsocket.cpp | 24 ++++++++++++++++++ 3 files changed, 63 insertions(+), 4 deletions(-) diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 6f77600..6f0ccff 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -827,17 +827,16 @@ bool QSslSocketBackendPrivate::startHandshake() QString peerName = (verificationPeerName.isEmpty () ? q->peerName() : verificationPeerName); QString commonName = configuration.peerCertificate.subjectInfo(QSslCertificate::CommonName); - QRegExp regexp(commonName, Qt::CaseInsensitive, QRegExp::Wildcard); - if (!regexp.exactMatch(peerName)) { + if (!isMatchingHostname(commonName.lower(), peerName.lower())) { bool matched = false; foreach (const QString &altName, configuration.peerCertificate .alternateSubjectNames().values(QSsl::DnsEntry)) { - regexp.setPattern(altName); - if (regexp.exactMatch(peerName)) { + if (isMatchingHostname(altName.lower(), peerName.lower())) { matched = true; break; } } + if (!matched) { // No matches in common names or alternate names. QSslError error(QSslError::HostNameMismatch, configuration.peerCertificate); @@ -962,4 +961,39 @@ QList QSslSocketBackendPrivate::STACKOFX509_to_QSslCertificates return certificates; } +bool QSslSocketBackendPrivate::isMatchingHostname(const QString &cn, const QString &hostname) +{ + int wildcard = cn.indexOf(QLatin1Char('*')); + + // Check this is a wildcard cert, if not then just compare the strings + if (wildcard < 0) + return cn == hostname; + + int firstCnDot = cn.indexOf(QLatin1Char('.')); + int secondCnDot = cn.indexOf(QLatin1Char('.'), firstCnDot+1); + + // Check at least 3 components + if ((-1 == secondCnDot) || (secondCnDot+1 >= cn.length())) + return false; + + // Check * is last character of 1st component (ie. there's a following .) + if (wildcard+1 != firstCnDot) + return false; + + // Check only one star + if (cn.lastIndexOf(QLatin1Char('*')) != wildcard) + return false; + + // Check characters preceding * (if any) match + if (wildcard && (hostname.leftRef(wildcard) != cn.leftRef(wildcard))) + return false; + + // Check characters following first . match + if (hostname.midRef(hostname.indexOf(QLatin1Char('.'))) != cn.midRef(firstCnDot)) + return false; + + // Ok, I guess this was a wildcard CN and the hostname matches. + return true; +} + QT_END_NAMESPACE diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h index 836f064..05eb4fa 100644 --- a/src/network/ssl/qsslsocket_openssl_p.h +++ b/src/network/ssl/qsslsocket_openssl_p.h @@ -115,6 +115,7 @@ public: static QSslCipher QSslCipher_from_SSL_CIPHER(SSL_CIPHER *cipher); static QList STACKOFX509_to_QSslCertificates(STACK_OF(X509) *x509); + Q_AUTOTEST_EXPORT static bool isMatchingHostname(const QString &cn, const QString &hostname); }; QT_END_NAMESPACE diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp index 5dd7c19..225e2e8 100644 --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp @@ -55,6 +55,7 @@ #include #include "private/qhostinfo_p.h" +#include "private/qsslsocket_openssl_p.h" #include "../network-settings.h" @@ -163,6 +164,7 @@ private slots: void setDefaultCiphers(); void supportedCiphers(); void systemCaCertificates(); + void wildcardCertificateNames(); void wildcard(); void setEmptyKey(); void spontaneousWrite(); @@ -1048,6 +1050,28 @@ void tst_QSslSocket::systemCaCertificates() QCOMPARE(certs, QSslSocket::defaultCaCertificates()); } +void tst_QSslSocket::wildcardCertificateNames() +{ + // Passing CN matches + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("www.example.com"), QString("www.example.com")), true ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example.com"), QString("www.example.com")), true ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("xxx*.example.com"), QString("xxxwww.example.com")), true ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("f*.example.com"), QString("foo.example.com")), true ); + + // Failing CN matches + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("xxx.example.com"), QString("www.example.com")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*"), QString("www.example.com")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.*.com"), QString("www.example.com")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example.com"), QString("baa.foo.example.com")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("f*.example.com"), QString("baa.example.com")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.com"), QString("example.com")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*fail.com"), QString("example.com")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example."), QString("www.example.")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example."), QString("www.example")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString(""), QString("www")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*"), QString("www")), false ); +} + void tst_QSslSocket::wildcard() { QSKIP("TODO: solve wildcard problem", SkipAll); -- cgit v0.12 From b5f95fbf615b113e3e6d2b42f6b84309d6588b1f Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Mon, 12 Jul 2010 10:47:00 +0200 Subject: fix build for -no-qt3support QString::lower() is QT3_SUPPORT, the correct method is QString::toLower(). --- src/network/ssl/qsslsocket_openssl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 6f0ccff..103a7ef 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -827,11 +827,11 @@ bool QSslSocketBackendPrivate::startHandshake() QString peerName = (verificationPeerName.isEmpty () ? q->peerName() : verificationPeerName); QString commonName = configuration.peerCertificate.subjectInfo(QSslCertificate::CommonName); - if (!isMatchingHostname(commonName.lower(), peerName.lower())) { + if (!isMatchingHostname(commonName.toLower(), peerName.toLower())) { bool matched = false; foreach (const QString &altName, configuration.peerCertificate .alternateSubjectNames().values(QSsl::DnsEntry)) { - if (isMatchingHostname(altName.lower(), peerName.lower())) { + if (isMatchingHostname(altName.toLower(), peerName.toLower())) { matched = true; break; } -- cgit v0.12 From 87c62128266a4e2289c1854e35aba3fc17d44045 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Tue, 10 Aug 2010 13:59:57 +0200 Subject: QSslSocket: fix security vulnerability with wildcard IP addresses This fixes Westpoint Security issue with Advisory ID#: wp-10-0001. Before, we would allow wildcards in IP addresses like *.2.3.4 ; now, IP addresses must match excatly. Patch-by: Richard J. Moore Task-number: QT-3704 --- src/network/ssl/qsslsocket_openssl.cpp | 5 +++++ tests/auto/qsslsocket/tst_qsslsocket.cpp | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 103a7ef..625d739 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -992,6 +992,11 @@ bool QSslSocketBackendPrivate::isMatchingHostname(const QString &cn, const QStri if (hostname.midRef(hostname.indexOf(QLatin1Char('.'))) != cn.midRef(firstCnDot)) return false; + // Check if the hostname is an IP address, if so then wildcards are not allowed + QHostAddress addr(hostname); + if (!addr.isNull()) + return false; + // Ok, I guess this was a wildcard CN and the hostname matches. return true; } diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp index 225e2e8..8f7e0d9 100644 --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp @@ -1057,6 +1057,7 @@ void tst_QSslSocket::wildcardCertificateNames() QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example.com"), QString("www.example.com")), true ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("xxx*.example.com"), QString("xxxwww.example.com")), true ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("f*.example.com"), QString("foo.example.com")), true ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("192.168.0.0"), QString("192.168.0.0")), true ); // Failing CN matches QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("xxx.example.com"), QString("www.example.com")), false ); @@ -1070,6 +1071,7 @@ void tst_QSslSocket::wildcardCertificateNames() QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example."), QString("www.example")), false ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString(""), QString("www")), false ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*"), QString("www")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.168.0.0"), QString("192.168.0.0")), false ); } void tst_QSslSocket::wildcard() -- cgit v0.12 From 8229eded4cba85ae53c1b03ce87981ebabd2f3ae Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Tue, 10 Aug 2010 14:02:52 +0100 Subject: Fix regression with SSL connections failing on symbian Due to a wrong ifdef sequence, the unix code was being compiled instead of the symbian code for retrieving the system certificates. Task-number: QTBUG-12718 Reviewed-by: Peter Hartmann --- src/network/ssl/qsslsocket_openssl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index b4d030c..aea04a3 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -750,7 +750,7 @@ QList QSslSocketPrivate::systemCaCertificates() ptrCertCloseStore(hSystemStore, 0); } } -#elif defined(Q_OS_UNIX) +#elif defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) systemCerts.append(QSslCertificate::fromPath(QLatin1String("/var/ssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // AIX systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/local/ssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // Solaris systemCerts.append(QSslCertificate::fromPath(QLatin1String("/opt/openssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // HP-UX -- cgit v0.12 From 87b7587f25928272900900a106f360a4fbb4d6cd Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 10 Aug 2010 16:18:22 +0200 Subject: Updated WebKit to 72b1c38579ca1fdb3f242e29cd16e5bfb4925813 Integrated changes: || || [Qt] NPAPI plugins not drawn until page scrolled || --- src/3rdparty/webkit/.tag | 2 +- src/3rdparty/webkit/VERSION | 2 +- src/3rdparty/webkit/WebCore/ChangeLog | 10 ++++++++++ src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm | 5 ++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index fb2703e..d31a2b4 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -413404da27312051bb3ff2cfd0f3fca42aa4b245 +72b1c38579ca1fdb3f242e29cd16e5bfb4925813 diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index c256434..62aa8ce 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - 413404da27312051bb3ff2cfd0f3fca42aa4b245 + 72b1c38579ca1fdb3f242e29cd16e5bfb4925813 diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 5b78226..98d4d51 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,13 @@ +2010-08-10 Tor Arne Vestbø + + Reviewed by Simon Hausmann. + + Make sure NPAPI plugins get an initial setNPWindow on Mac + + https://bugs.webkit.org/show_bug.cgi?id=43782 + + * plugins/mac/PluginViewMac.mm: + 2010-06-14 Andreas Kling Reviewed by Tor Arne Vestbø. diff --git a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm index 57d74ab..c8781a8 100644 --- a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm +++ b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm @@ -227,7 +227,10 @@ bool PluginView::platformStart() #endif } - show(); + updatePluginWidget(); + + if (!m_plugin->quirks().contains(PluginQuirkDeferFirstSetWindowCall)) + setNPWindowIfNeeded(); // TODO: Implement null timer throttling depending on plugin activation m_nullEventTimer.set(new Timer(this, &PluginView::nullEventTimerFired)); -- cgit v0.12 From 05b9dc5a1cc649231b29807f2a87bb7164c5234a Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Tue, 10 Aug 2010 17:11:25 +0200 Subject: Fix memory leak in QtScript variable object The d-pointer is of type JSVariableObjectData*, but JSVariableObjectData doesn't have a virtual destructor. Hence we must cast the d-pointer to our subclass when deleting. In particular, this will ensure that the destructor of the symbolTable member is called, which will deallocate the table storage. (For QScriptActivationObject this did not cause a leak in practice, because its symbolTable is always empty, and JSC's hash table uses lazy allocation.) Task-number: QTBUG-12479 Reviewed-by: Olivier Goffart --- src/script/bridge/qscriptactivationobject.cpp | 2 +- src/script/bridge/qscriptstaticscopeobject.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/script/bridge/qscriptactivationobject.cpp b/src/script/bridge/qscriptactivationobject.cpp index 6a8ae56..85224d1 100644 --- a/src/script/bridge/qscriptactivationobject.cpp +++ b/src/script/bridge/qscriptactivationobject.cpp @@ -53,7 +53,7 @@ QScriptActivationObject::QScriptActivationObject(JSC::ExecState *callFrame, JSC: QScriptActivationObject::~QScriptActivationObject() { - delete d; + delete d_ptr(); } bool QScriptActivationObject::getOwnPropertySlot(JSC::ExecState* exec, const JSC::Identifier& propertyName, JSC::PropertySlot& slot) diff --git a/src/script/bridge/qscriptstaticscopeobject.cpp b/src/script/bridge/qscriptstaticscopeobject.cpp index 44548a4..940c859 100644 --- a/src/script/bridge/qscriptstaticscopeobject.cpp +++ b/src/script/bridge/qscriptstaticscopeobject.cpp @@ -87,7 +87,7 @@ QScriptStaticScopeObject::QScriptStaticScopeObject(WTF::NonNullPassRefPtr Date: Wed, 11 Aug 2010 10:04:53 +1000 Subject: Don't destroy ListModel child list nodes. These are owned by the root and must not be destroyed by child lists. Task-number: QTBUG-12771 Reviewed-by: Bea Lam --- src/declarative/util/qdeclarativelistmodel.cpp | 26 +++++++++++++--------- src/declarative/util/qdeclarativelistmodel_p_p.h | 13 +++++++++++ .../tst_qdeclarativelistmodel.cpp | 7 +++--- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index 3ede335..b0d47a9 100644 --- a/src/declarative/util/qdeclarativelistmodel.cpp +++ b/src/declarative/util/qdeclarativelistmodel.cpp @@ -108,9 +108,9 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM \snippet doc/src/snippets/declarative/listmodel-modify.qml delegate - When creating content dynamically, note that the set of available properties cannot be changed - except by first clearing the model. Whatever properties are first added to the model are then the - only permitted properties in the model until it is cleared. + Note that when creating content dynamically the set of available properties cannot be changed + once set. Whatever properties are first added to the model are the + only permitted properties in the model. \section2 Using threaded list models with WorkerScript @@ -283,8 +283,7 @@ int QDeclarativeListModel::count() const /*! \qmlmethod ListModel::clear() - Deletes all content from the model. The properties are cleared such that - different properties may be set on subsequent additions. + Deletes all content from the model. \sa append() remove() */ @@ -945,13 +944,14 @@ bool FlatListModel::addValue(const QScriptValue &value, QHash *ro } NestedListModel::NestedListModel(QDeclarativeListModel *base) - : _root(0), m_listModel(base), _rolesOk(false) + : _root(0), m_ownsRoot(false), m_listModel(base), _rolesOk(false) { } NestedListModel::~NestedListModel() { - delete _root; + if (m_ownsRoot) + delete _root; } QVariant NestedListModel::valueForNode(ModelNode *node, bool *hasNested) const @@ -1051,8 +1051,8 @@ void NestedListModel::clear() _rolesOk = false; roleStrings.clear(); - delete _root; - _root = 0; + if (_root) + _root->clear(); } void NestedListModel::remove(int index) @@ -1067,8 +1067,10 @@ void NestedListModel::remove(int index) bool NestedListModel::insert(int index, const QScriptValue& valuemap) { - if (!_root) + if (!_root) { _root = new ModelNode; + m_ownsRoot = true; + } ModelNode *mn = new ModelNode; mn->setObjectValue(valuemap); @@ -1099,8 +1101,10 @@ void NestedListModel::move(int from, int to, int n) bool NestedListModel::append(const QScriptValue& valuemap) { - if (!_root) + if (!_root) { _root = new ModelNode; + m_ownsRoot = true; + } ModelNode *mn = new ModelNode; mn->setObjectValue(valuemap); _root->values << qVariantFromValue(mn); diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h index 532eefa..c41f016 100644 --- a/src/declarative/util/qdeclarativelistmodel_p_p.h +++ b/src/declarative/util/qdeclarativelistmodel_p_p.h @@ -130,6 +130,7 @@ public: void checkRoles() const; ModelNode *_root; + bool m_ownsRoot; QDeclarativeListModel *m_listModel; private: @@ -157,6 +158,18 @@ struct ModelNode QList values; QHash properties; + void clear() { + ModelNode *node; + for (int ii = 0; ii < values.count(); ++ii) { + node = qvariant_cast(values.at(ii)); + if (node) { delete node; node = 0; } + } + values.clear(); + + qDeleteAll(properties.values()); + properties.clear(); + } + QDeclarativeListModel *model(const NestedListModel *model) { if (!modelCache) { modelCache = new QDeclarativeListModel; diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp index 858c26d..10805b4 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp +++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp @@ -271,6 +271,9 @@ void tst_qdeclarativelistmodel::dynamic_data() QTest::newRow("nested-insert") << "{append({'foo':123});insert(0,{'bars':[{'a':1},{'b':2},{'c':3}]});get(0).bars.get(0).a}" << 1 << ""; QTest::newRow("nested-set") << "{append({'foo':123});set(0,{'foo':[{'x':123}]});get(0).foo.get(0).x}" << 123 << ""; + QTest::newRow("nested-count") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]}); get(0).bars.count}" << 3 << ""; + QTest::newRow("nested-clear") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]}); get(0).bars.clear(); get(0).bars.count}" << 0 << ""; + // XXX //QTest::newRow("nested-setprop") << "{append({'foo':123});setProperty(0,'foo',[{'x':123}]);get(0).foo.get(0).x}" << 123 << ""; } @@ -344,9 +347,7 @@ void tst_qdeclarativelistmodel::dynamic_worker() waitForWorker(item); QDeclarativeExpression e(eng.rootContext(), &model, operations.last().toString()); - if (QByteArray(QTest::currentDataTag()).startsWith("nested")) - QVERIFY(e.evaluate().toInt() != result); - else + if (!QByteArray(QTest::currentDataTag()).startsWith("nested")) QCOMPARE(e.evaluate().toInt(), result); } -- cgit v0.12 From e8d3e8e0b93271bb41fcdc264fc10ec59be5aa20 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Wed, 11 Aug 2010 13:58:08 +1000 Subject: Compile on Symbian Task-number: QTBUG-12771 --- src/declarative/util/qdeclarativelistmodel.cpp | 12 +++++++++--- src/declarative/util/qdeclarativelistmodel_p_p.h | 12 +----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index b0d47a9..20fe3a9 100644 --- a/src/declarative/util/qdeclarativelistmodel.cpp +++ b/src/declarative/util/qdeclarativelistmodel.cpp @@ -1209,16 +1209,22 @@ ModelNode::ModelNode() ModelNode::~ModelNode() { - qDeleteAll(properties.values()); + clear(); + if (modelCache) { modelCache->m_nested->_root = 0/* ==this */; delete modelCache; modelCache = 0; } + if (objectCache) { delete objectCache; objectCache = 0; } +} +void ModelNode::clear() +{ ModelNode *node; for (int ii = 0; ii < values.count(); ++ii) { node = qvariant_cast(values.at(ii)); if (node) { delete node; node = 0; } } + values.clear(); - if (modelCache) { modelCache->m_nested->_root = 0/* ==this */; delete modelCache; modelCache = 0; } - if (objectCache) { delete objectCache; objectCache = 0; } + qDeleteAll(properties.values()); + properties.clear(); } void ModelNode::setObjectValue(const QScriptValue& valuemap) { diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h index c41f016..8231414 100644 --- a/src/declarative/util/qdeclarativelistmodel_p_p.h +++ b/src/declarative/util/qdeclarativelistmodel_p_p.h @@ -158,17 +158,7 @@ struct ModelNode QList values; QHash properties; - void clear() { - ModelNode *node; - for (int ii = 0; ii < values.count(); ++ii) { - node = qvariant_cast(values.at(ii)); - if (node) { delete node; node = 0; } - } - values.clear(); - - qDeleteAll(properties.values()); - properties.clear(); - } + void clear(); QDeclarativeListModel *model(const NestedListModel *model) { if (!modelCache) { -- cgit v0.12 From 0d4d065cc9757159c5b6fa817892f5707bc1ecae Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 11 Aug 2010 14:32:51 +1000 Subject: Don't build bearercloud example if Qt was build w/o SVG support Task-number: QTBUG-12791 Reviewed-by: David Laing --- examples/network/network.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/network/network.pro b/examples/network/network.pro index 16c4087..458561a 100644 --- a/examples/network/network.pro +++ b/examples/network/network.pro @@ -16,9 +16,12 @@ SUBDIRS = \ threadedfortuneserver \ googlesuggest \ torrent \ - bearercloud \ bearermonitor + contains(QT_CONFIG, svg) { + SUBDIRS += bearercloud + } + # no QProcess !vxworks:!qnx:SUBDIRS += network-chat -- cgit v0.12 From 0c1d29300c7248ead3392bb385ceae6889dc2834 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Wed, 11 Aug 2010 15:06:56 +1000 Subject: Fix cppextension examples. Print a useful message on error. Specify the QML url correctly. --- examples/declarative/cppextensions/referenceexamples/adding/main.cpp | 4 ++-- .../declarative/cppextensions/referenceexamples/attached/main.cpp | 4 ++-- examples/declarative/cppextensions/referenceexamples/binding/main.cpp | 4 ++-- .../declarative/cppextensions/referenceexamples/coercion/main.cpp | 4 ++-- examples/declarative/cppextensions/referenceexamples/default/main.cpp | 4 ++-- .../declarative/cppextensions/referenceexamples/extended/main.cpp | 4 ++-- examples/declarative/cppextensions/referenceexamples/grouped/main.cpp | 4 ++-- .../declarative/cppextensions/referenceexamples/properties/main.cpp | 4 ++-- examples/declarative/cppextensions/referenceexamples/signal/main.cpp | 4 ++-- .../declarative/cppextensions/referenceexamples/valuesource/main.cpp | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/examples/declarative/cppextensions/referenceexamples/adding/main.cpp b/examples/declarative/cppextensions/referenceexamples/adding/main.cpp index 391113c..19cf034 100644 --- a/examples/declarative/cppextensions/referenceexamples/adding/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/adding/main.cpp @@ -51,13 +51,13 @@ int main(int argc, char ** argv) //![0] QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); Person *person = qobject_cast(component.create()); if (person) { qWarning() << "The person's name is" << person->name(); qWarning() << "They wear a" << person->shoeSize() << "sized shoe"; } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return 0; diff --git a/examples/declarative/cppextensions/referenceexamples/attached/main.cpp b/examples/declarative/cppextensions/referenceexamples/attached/main.cpp index 5a39a98..65cbc93 100644 --- a/examples/declarative/cppextensions/referenceexamples/attached/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/attached/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char ** argv) qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -83,7 +83,7 @@ int main(int argc, char ** argv) } } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return 0; diff --git a/examples/declarative/cppextensions/referenceexamples/binding/main.cpp b/examples/declarative/cppextensions/referenceexamples/binding/main.cpp index fe1bbc8..150f961 100644 --- a/examples/declarative/cppextensions/referenceexamples/binding/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/binding/main.cpp @@ -57,7 +57,7 @@ int main(int argc, char ** argv) qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -85,7 +85,7 @@ int main(int argc, char ** argv) party->startParty(); } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return app.exec(); diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp b/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp index 5c53368..5b16f99 100644 --- a/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char ** argv) qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -70,7 +70,7 @@ int main(int argc, char ** argv) for (int ii = 0; ii < party->guestCount(); ++ii) qWarning() << " " << party->guest(ii)->name(); } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return 0; diff --git a/examples/declarative/cppextensions/referenceexamples/default/main.cpp b/examples/declarative/cppextensions/referenceexamples/default/main.cpp index f611bc4..bfba642 100644 --- a/examples/declarative/cppextensions/referenceexamples/default/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/default/main.cpp @@ -54,7 +54,7 @@ int main(int argc, char ** argv) qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -68,7 +68,7 @@ int main(int argc, char ** argv) for (int ii = 0; ii < party->guestCount(); ++ii) qWarning() << " " << party->guest(ii)->name(); } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return 0; diff --git a/examples/declarative/cppextensions/referenceexamples/extended/main.cpp b/examples/declarative/cppextensions/referenceexamples/extended/main.cpp index 65527c3..08c8440 100644 --- a/examples/declarative/cppextensions/referenceexamples/extended/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/extended/main.cpp @@ -51,14 +51,14 @@ int main(int argc, char ** argv) qmlRegisterExtendedType("People", 1,0, "QLineEdit"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); QLineEdit *edit = qobject_cast(component.create()); if (edit) { edit->show(); return app.exec(); } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); return 0; } } diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp b/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp index e56a14d..6f7f13f 100644 --- a/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp @@ -55,7 +55,7 @@ int main(int argc, char ** argv) qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -78,7 +78,7 @@ int main(int argc, char ** argv) qWarning() << bestShoe->name() << "is wearing the best shoes!"; } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return 0; diff --git a/examples/declarative/cppextensions/referenceexamples/properties/main.cpp b/examples/declarative/cppextensions/referenceexamples/properties/main.cpp index 80237ef..d974647 100644 --- a/examples/declarative/cppextensions/referenceexamples/properties/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/properties/main.cpp @@ -52,7 +52,7 @@ int main(int argc, char ** argv) qmlRegisterType("People", 1,0, "Person"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -61,7 +61,7 @@ int main(int argc, char ** argv) for (int ii = 0; ii < party->guestCount(); ++ii) qWarning() << " " << party->guest(ii)->name(); } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return 0; diff --git a/examples/declarative/cppextensions/referenceexamples/signal/main.cpp b/examples/declarative/cppextensions/referenceexamples/signal/main.cpp index 56c0809..ad87bee 100644 --- a/examples/declarative/cppextensions/referenceexamples/signal/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/signal/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char ** argv) qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -84,7 +84,7 @@ int main(int argc, char ** argv) party->startParty(); } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return 0; diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp b/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp index 40dc3cb..aa77665 100644 --- a/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp @@ -58,7 +58,7 @@ int main(int argc, char ** argv) qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -86,7 +86,7 @@ int main(int argc, char ** argv) party->startParty(); } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return app.exec(); -- cgit v0.12 From 83795c1348f879d6742b4ef20b2315e0055e45a6 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 10 Aug 2010 17:17:27 +0200 Subject: configure.exe: don't write the QT_NAMESPACE define to .qmake.cache Since 37fc9b6c3e10bb708d6c294ac37693b6df1d5351 we're already writing the QT_NAMESPACE variable to qconfig.pri. Feature file qt.prf adds the QT_NAMESPACE=MyNamespace define for us. Task-number: QTBUG-5221 Reviewed-by: ossi --- tools/configure/configureapp.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index e27e16d..a0ca33a 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -988,7 +988,6 @@ void Configure::parseCmdLine() ++i; if (i == argCount) break; - qmakeDefines += "QT_NAMESPACE="+configCmdLine.at(i); dictionary[ "QT_NAMESPACE" ] = configCmdLine.at(i); } else if (configCmdLine.at(i) == "-qtlibinfix") { ++i; -- cgit v0.12 From b1d5e111d8bb4dba3bd13f7af5ac2fb7c91db71e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 6 Aug 2010 18:16:18 +0200 Subject: add comment explaining why this file does magic instead of just voodoo Reviewed-by: joerg Reviewed-by: Simon Hausmann --- mkspecs/features/qt_config.prf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf index 0a2d985..b6fba65 100644 --- a/mkspecs/features/qt_config.prf +++ b/mkspecs/features/qt_config.prf @@ -1,3 +1,6 @@ +# This file is loaded by the mkspecs, before .qmake.cache has been loaded. +# Consequently, we have to do some stunts to get values out of the cache. + exists($$_QMAKE_CACHE_):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG) isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { !isEmpty(QT_BUILD_TREE):QMAKE_QT_CONFIG = $$QT_BUILD_TREE/mkspecs/qconfig.pri -- cgit v0.12 From bf992abf98056151def8ff0b853fce8f1924b02a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 6 Aug 2010 12:29:39 +0200 Subject: don't load modules from qt.prf they are already loaded in qconfig.pri, which is loaded from qt_config.prf, which is explicitly loaded by every qmake spec. Reviewed-by: Simon Hausmann Reviewed-by: joerg --- mkspecs/features/qt.prf | 3 --- 1 file changed, 3 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index aa0f06e..07c89dd 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -31,9 +31,6 @@ plugin { #Qt plugins } } -#handle modules -for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod) - #handle includes INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt -- cgit v0.12 From 199b7ccb2a82e6a87808c3873c158ca38120dfdf Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 6 Aug 2010 18:17:22 +0200 Subject: fix loading of module configs do it in qt_config.prf instead of in the autogenerated qconfig.pri files. this is waaaay more elegant, and allows us to easily use the magic in that file which avoids loading qt configuration from the qt install dir while building qt itself. Reviewed-by: joerg Reviewed-by: Simon Hausmann Task-number: QTBUG-12698 --- configure | 3 --- configure.exe | Bin 1309696 -> 1320448 bytes mkspecs/features/qt_config.prf | 1 + tools/configure/configureapp.cpp | 2 -- 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/configure b/configure index 25f1ef5..35fe2eb 100755 --- a/configure +++ b/configure @@ -7886,9 +7886,6 @@ QT_LIBINFIX = $QT_LIBINFIX QT_NAMESPACE = $QT_NAMESPACE QT_NAMESPACE_MAC_CRC = $QT_NAMESPACE_MAC_CRC -#modules -for(mod,\$\$list(\$\$files(\$\$[QMAKE_MKSPECS]/modules/qt_*.pri))):include(\$\$mod) - EOF if [ "$CFG_RPATH" = "yes" ]; then echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" >> "$QTCONFIG.tmp" diff --git a/configure.exe b/configure.exe index 220e605..c5bff85 100755 Binary files a/configure.exe and b/configure.exe differ diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf index b6fba65..19e01a1 100644 --- a/mkspecs/features/qt_config.prf +++ b/mkspecs/features/qt_config.prf @@ -11,6 +11,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { debug(1, "Cannot load qconfig.pri!") } else { debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)") + for(mod, $$list($$files($$dirname(QMAKE_QT_CONFIG)/modules/qt_*.pri))):include($$mod) } load(qt_functions) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index a0ca33a..0c716d1 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2944,8 +2944,6 @@ void Configure::generateCachefile() configStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl; } - configStream << "#modules" << endl << "for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod)" << endl; - configStream.flush(); configFile.close(); } -- cgit v0.12 From ebdc597eea6e44b66d6c98d252531af5d0da04f8 Mon Sep 17 00:00:00 2001 From: Henrik Hartz Date: Wed, 11 Aug 2010 10:01:59 +0200 Subject: Remember to reset clipping when overriding paint in QDeclarativeItem --- src/declarative/graphicsitems/qdeclarativeitem.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 9d782b9..17c094c 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -2500,7 +2500,9 @@ QDeclarativeListProperty QDeclarativeItemPrivate::transi This property holds whether clipping is enabled. if clipping is enabled, an item will clip its own painting, as well - as the painting of its children, to its bounding rectangle. + as the painting of its children, to its bounding rectangle. If you set + clipping during an item's paint operation, remember to re-set it to + prevent clipping the rest of your scene. Non-rectangular clipping regions are not supported for performance reasons. */ -- cgit v0.12 From bb696453f6f87cad58982af3455335478fedb8cc Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Wed, 11 Aug 2010 11:49:35 +0200 Subject: Disable minRightBearing optimization in QTextLayout on Mac Neither of the Mac font engines have implemented minimum right bearing, which will cause them to return 0 for the minimum value. This will cause the right bearing to never be calculated prior to breaking and thus never be a part of the breaking width. Since actually implementing the functions is too time consuming for right now, we will disable the optimization for the time being. Reviewed-by: Olivier --- src/gui/text/qtextlayout.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index da43913..7d5fa43 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -1952,7 +1952,9 @@ void QTextLine::layout_helper(int maxGlyphs) // expand the text beyond the edge. if (sb_or_ws|breakany) { QFixed rightBearing = lbh.rightBearing; // store previous right bearing +#if !defined(Q_WS_MAC) if (lbh.calculateNewWidth(line) - lbh.minimumRightBearing > line.width) +#endif lbh.adjustRightBearing(); if (lbh.checkFullOtherwiseExtend(line)) { // we are too wide, fix right bearing -- cgit v0.12 From 98b7e8ac793d95a6a8350c7fc25faebd6f44cd21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Wed, 11 Aug 2010 09:28:32 +0200 Subject: Layout items had the wrong size if the layout was resized to maximum. The problem was that if targetSize was the layouts maximum size, then sumAvailable could be reduced to exactly 0 in the "while (keepGoing)" loop. That would mean that we would not enter the block that actually copied the new sizes from the temporary "newSizes" array to the output "sizes" array due to the "if (sumAvailable > 0)" condition. Task-number: none, discovered while fixing QT-3570 Reviewed-by: Frederik Gladhorn --- src/gui/graphicsview/qgridlayoutengine.cpp | 15 +++++++------- .../tst_qgraphicsgridlayout.cpp | 24 +++++++++++----------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp index a084647..4fba5ff 100644 --- a/src/gui/graphicsview/qgridlayoutengine.cpp +++ b/src/gui/graphicsview/qgridlayoutengine.cpp @@ -250,6 +250,7 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz sumAvailable = targetSize - totalBox.q_preferredSize; if (sumAvailable > 0.0) { + qreal sumCurrentAvailable = sumAvailable; bool somethingHasAMaximumSize = false; qreal sumPreferredSizes = 0.0; @@ -308,12 +309,12 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz qreal ultimateFactor = (stretch * ultimateSumPreferredSizes / sumStretches) - (box.q_preferredSize); - qreal transitionalFactor = sumAvailable + qreal transitionalFactor = sumCurrentAvailable * (ultimatePreferredSize - box.q_preferredSize) / (ultimateSumPreferredSizes - sumPreferredSizes); - qreal alpha = qMin(sumAvailable, + qreal alpha = qMin(sumCurrentAvailable, ultimateSumPreferredSizes - sumPreferredSizes); qreal beta = ultimateSumPreferredSizes - sumPreferredSizes; @@ -321,7 +322,7 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz + ((beta - alpha) * transitionalFactor)) / beta; } sumFactors += factors[i]; - if (desired < sumAvailable) + if (desired < sumCurrentAvailable) somethingHasAMaximumSize = true; newSizes[i] = -1.0; @@ -337,12 +338,12 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz continue; const QGridLayoutBox &box = boxes.at(start + i); - qreal avail = sumAvailable * factors[i] / sumFactors; + qreal avail = sumCurrentAvailable * factors[i] / sumFactors; if (sizes[i] + avail >= box.q_maximumSize) { newSizes[i] = box.q_maximumSize; - sumAvailable -= box.q_maximumSize - sizes[i]; + sumCurrentAvailable -= box.q_maximumSize - sizes[i]; sumFactors -= factors[i]; - keepGoing = (sumAvailable > 0.0); + keepGoing = (sumCurrentAvailable > 0.0); if (!keepGoing) break; } @@ -352,7 +353,7 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz for (int i = 0; i < n; ++i) { if (newSizes[i] < 0.0) { qreal delta = (sumFactors == 0.0) ? 0.0 - : sumAvailable * factors[i] / sumFactors; + : sumCurrentAvailable * factors[i] / sumFactors; newSizes[i] = sizes[i] + delta; } } diff --git a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index d1d6860..5b03767 100644 --- a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -485,12 +485,12 @@ void tst_QGraphicsGridLayout::alignment() widget->resize(widget->effectiveSizeHint(Qt::MaximumSize)); QApplication::processEvents(); - QCOMPARE(layout->itemAt(0,0)->geometry(), QRectF(0, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,0)->geometry(), QRectF(0, 25, 50, 25)); - QCOMPARE(layout->itemAt(0,1)->geometry(), QRectF(125, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,1)->geometry(), QRectF(125, 25, 50, 25)); - QCOMPARE(layout->itemAt(0,2)->geometry(), QRectF(250, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,2)->geometry(), QRectF(250, 25, 50, 25)); + QCOMPARE(layout->itemAt(0,0)->geometry(), QRectF(0, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,0)->geometry(), QRectF(0, 50, 50, 50)); + QCOMPARE(layout->itemAt(0,1)->geometry(), QRectF(125, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,1)->geometry(), QRectF(125, 50, 50, 50)); + QCOMPARE(layout->itemAt(0,2)->geometry(), QRectF(250, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,2)->geometry(), QRectF(250, 50, 50, 50)); delete widget; } @@ -544,12 +544,12 @@ void tst_QGraphicsGridLayout::columnAlignment() | HCenter | Right | Left | +---------------------------------+ */ - QCOMPARE(layout->itemAt(0,0)->geometry(), QRectF(0, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,0)->geometry(), QRectF(25, 26, 50, 25)); // item is king - QCOMPARE(layout->itemAt(0,1)->geometry(), QRectF(126, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,1)->geometry(), QRectF(151, 26, 50, 25)); // item is king - QCOMPARE(layout->itemAt(0,2)->geometry(), QRectF(252, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,2)->geometry(), QRectF(202, 26, 50, 25)); // item is king + QCOMPARE(layout->itemAt(0,0)->geometry(), QRectF(0, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,0)->geometry(), QRectF(25, 51, 50, 50)); // item is king + QCOMPARE(layout->itemAt(0,1)->geometry(), QRectF(126, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,1)->geometry(), QRectF(151, 51, 50, 50)); // item is king + QCOMPARE(layout->itemAt(0,2)->geometry(), QRectF(252, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,2)->geometry(), QRectF(202, 51, 50, 50)); // item is king delete widget; } -- cgit v0.12 From 0cafff970c52f982d5acec368b5b5fdab319688d Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Wed, 11 Aug 2010 13:46:38 +0200 Subject: Fix typos in docs Reviewed-by: David Boddie --- src/declarative/graphicsitems/qdeclarativerepeater.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp index 2b268fb..68e7e9a 100644 --- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp +++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp @@ -133,13 +133,13 @@ QDeclarativeRepeaterPrivate::~QDeclarativeRepeaterPrivate() create items as they are required. Also, note that Repeater is \l {Item}-based, and can only repeat \l {Item}-derived objects. - For example, it cannot be used to repeat QtObjects: + For example, it cannot be used to repeat QObjects: \badcode Item { - //XXX does not work! Can't repeat QtObject as it doesn't derive from Item. + //XXX does not work! Can't repeat QObject as it doesn't derive from Item. Repeater { model: 10 - QtObject {} + QObject {} } } \endcode -- cgit v0.12