diff options
| -rw-r--r-- | src/gui/dialogs/qdialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/dialogs/qinputdialog.cpp | 3 | ||||
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 22 | ||||
| -rw-r--r-- | src/gui/styles/qs60style_p.h | 1 | ||||
| -rw-r--r-- | src/plugins/s60/feedback/feedback.pro | 2 | ||||
| -rw-r--r-- | tools/linguist/shared/ts.dtd | 23 | ||||
| -rw-r--r-- | tools/qdoc3/qdoc3.pro | 4 | ||||
| -rw-r--r-- | translations/assistant_de.ts | 37 | ||||
| -rw-r--r-- | translations/qt_de.ts | 4 |
9 files changed, 68 insertions, 30 deletions
diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp index 5a791fc..6970b76 100644 --- a/src/gui/dialogs/qdialog.cpp +++ b/src/gui/dialogs/qdialog.cpp @@ -1111,7 +1111,7 @@ QSize QDialog::sizeHint() const // if size is not fixed, try to adjust it according to S60 layoutting if (minimumSize() != maximumSize()) { // In S60, dialogs are always the width of screen (in portrait, regardless of current layout) - return QSize(qMax(S60->screenHeightInPixels, S60->screenWidthInPixels), QWidget::sizeHint().height()); + return QSize(qMin(S60->screenHeightInPixels, S60->screenWidthInPixels), QWidget::sizeHint().height()); } else { return QWidget::sizeHint(); } diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/gui/dialogs/qinputdialog.cpp index 2d13c9a..778e796 100644 --- a/src/gui/dialogs/qinputdialog.cpp +++ b/src/gui/dialogs/qinputdialog.cpp @@ -231,7 +231,10 @@ void QInputDialogPrivate::ensureLayout() QObject::connect(buttonBox, SIGNAL(rejected()), q, SLOT(reject())); mainLayout = new QVBoxLayout(q); + //we want to let the input dialog grow to available size on Symbian. +#ifndef Q_OS_SYMBIAN mainLayout->setSizeConstraint(QLayout::SetMinAndMaxSize); +#endif mainLayout->addWidget(label); mainLayout->addWidget(inputWidget); mainLayout->addWidget(buttonBox); diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index c93efca..1262340 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -112,6 +112,8 @@ const short QS60StylePrivate::data[][MAX_PIXELMETRICS] = { // *** End of generated data *** }; +QSet<const QWidget *> *QS60StylePrivate::m_autoFillDisabledWidgets = 0; + const short *QS60StylePrivate::m_pmPointer = QS60StylePrivate::data[0]; // theme background texture @@ -152,6 +154,8 @@ const double KTabFontMul = 0.72; QS60StylePrivate::~QS60StylePrivate() { + delete m_autoFillDisabledWidgets; + m_autoFillDisabledWidgets = 0; clearCaches(); //deletes also background image deleteThemePalette(); #ifdef Q_WS_S60 @@ -2521,9 +2525,9 @@ int QS60Style::pixelMetric(PixelMetric metric, const QStyleOption *option, const metricValue = QS60StylePrivate::pixelMetric(PM_LayoutLeftMargin); } - if (widget && (metric == PM_LayoutTopMargin)) + if (widget && (metric == PM_LayoutTopMargin || metric == PM_LayoutLeftMargin || metric == PM_LayoutRightMargin)) if (widget->windowType() == Qt::Dialog) - //double the top layout margin for dialogs, it is very close to real value + //double the layout margins (except bottom) for dialogs, it is very close to real value //without having to define custom pixel metric metricValue *= 2; @@ -3184,6 +3188,13 @@ void QS60Style::polish(QWidget *widget) } d->setThemePalette(widget); d->setFont(widget); + + if (widget->autoFillBackground()) { + if (!d->m_autoFillDisabledWidgets) + d->m_autoFillDisabledWidgets = new QSet<const QWidget *>; + widget->setAutoFillBackground(false); + d->m_autoFillDisabledWidgets->insert(widget); + } } /*! @@ -3218,6 +3229,13 @@ void QS60Style::unpolish(QWidget *widget) if (widget) widget->setPalette(QPalette()); + + if (d->m_autoFillDisabledWidgets && + !d->m_autoFillDisabledWidgets->isEmpty() && + d->m_autoFillDisabledWidgets->contains(widget)) { + widget->setAutoFillBackground(true); + d->m_autoFillDisabledWidgets->remove(widget); + } #if defined(Q_WS_S60) && !defined(QT_NO_PROGRESSBAR) if (QProgressBar *bar = qobject_cast<QProgressBar *>(widget)) { diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h index b46f75e..3d66c40 100644 --- a/src/gui/styles/qs60style_p.h +++ b/src/gui/styles/qs60style_p.h @@ -625,6 +625,7 @@ private: static qint64 m_webPaletteKey; static QPointer<QWidget> m_pressedWidget; + static QSet<const QWidget *> *m_autoFillDisabledWidgets; #ifdef Q_WS_S60 //list of progress bars having animation running diff --git a/src/plugins/s60/feedback/feedback.pro b/src/plugins/s60/feedback/feedback.pro index 32ddf6f..1069220 100644 --- a/src/plugins/s60/feedback/feedback.pro +++ b/src/plugins/s60/feedback/feedback.pro @@ -2,6 +2,8 @@ include(../../qpluginbase.pri) TARGET = qtactilefeedback$${QT_LIBINFIX} +QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/s60/feedback + INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) { diff --git a/tools/linguist/shared/ts.dtd b/tools/linguist/shared/ts.dtd index 4d2cdeb..12d3562 100644 --- a/tools/linguist/shared/ts.dtd +++ b/tools/linguist/shared/ts.dtd @@ -4,8 +4,6 @@ ! ! The location element is set as optional since it was introduced first in Qt 4.2. ! The userdata element is set as optional since it was introduced first in Qt 4.4. - ! The source and translation elements are optional starting with version 3.0 - ! (Qt 4.6) to support S60 blank messages. ! --> <!-- @@ -36,13 +34,10 @@ language CDATA #IMPLIED> <!-- The encoding to use in the QM file by default. Default is ISO-8859-1. --> <!ELEMENT defaultcodec (#PCDATA) > -<!ELEMENT context (name?, comment?, (context|message)+) > +<!ELEMENT context (name, comment?, (context|message)+) > <!ATTLIST context encoding CDATA #IMPLIED> <!ELEMENT name %evilstring; > -<!-- If "no", then the context nesting is for informational puposes only --> -<!ATTLIST name - nest (yes|no) "yes"> <!-- This is "disambiguation" in the (new) API, or "msgctxt" in gettext speak --> <!ELEMENT comment %evilstring; > <!-- Previous content of comment (result of merge) --> @@ -53,12 +48,13 @@ <!ELEMENT translatorcomment %evilstring; > <!ELEMENT message (location*, source?, oldsource?, comment?, oldcomment?, extracomment?, translatorcomment?, translation?, userdata?, extra-**) > <!-- - ! If utf8 is true, the defaultcodec is overridden and the message is encoded - ! in UTF-8 in the QM file. + ! If utf8 is "true", the defaultcodec is overridden and the message is encoded + ! in UTF-8 in the QM file. If it is "both", both source encodings are stored + ! in the QM file. --> <!ATTLIST message id CDATA #IMPLIED - utf8 (true|false) "false" + utf8 (true|false|both) "false" numerus (yes|no) "no"> <!ELEMENT location EMPTY> <!-- @@ -100,14 +96,5 @@ --> <!ELEMENT numerusform (#PCDATA|byte|lengthvariant)* > <!ATTLIST numerusform - plurality (nullar|singular|dual|trial|paucal|greaterpaucal|plural|greaterplural) #IMPLIED> variants (yes|no) "no"> <!ELEMENT lengthvariant %evilstring; > -<!-- - ! The translation variants have a priority between 1 ("highest") and 9 ("lowest") - ! Typically longer translations get a higher priority. - ! If omitted, the order of appearance of the variants in the TS files is used. - --> -<!ATTLIST lengthvariant - priority (1|2|3|4|5|6|7|8|9) #IMPLIED> - diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro index ae0bf25..d47e066 100644 --- a/tools/qdoc3/qdoc3.pro +++ b/tools/qdoc3/qdoc3.pro @@ -120,9 +120,9 @@ SOURCES += apigenerator.cpp \ qtPrepareTool(QDOC, qdoc3) -docs.commands = $$QDOC qdoc-manual.qdocconf +html-docs.commands = cd \"$$PWD/doc\" && $$QDOC qdoc-manual.qdocconf -QMAKE_EXTRA_TARGETS += docs +QMAKE_EXTRA_TARGETS += html-docs target.path = $$[QT_INSTALL_BINS] INSTALLS += target diff --git a/translations/assistant_de.ts b/translations/assistant_de.ts index 95fabaf..3648fdd 100644 --- a/translations/assistant_de.ts +++ b/translations/assistant_de.ts @@ -67,7 +67,7 @@ Grund: </message> <message> <source>Error reading collection file '%1': %2.</source> - <translation>Fehler beim Lesen der Katalogdatei '%1': %2</translation> + <translation>Fehler beim Lesen der Katalogdatei '%1': %2.</translation> </message> <message> <source>Error creating collection file '%1': %2.</source> @@ -741,7 +741,7 @@ Grund: </message> <message> <source>Input File</source> - <translation>Eingabedatei:</translation> + <translation>Datei eingeben</translation> </message> <message> <source>Specify the .adp or .dcf file you want to convert to the new Qt help project format and/or collection format.</source> @@ -989,7 +989,7 @@ Grund: </message> <message> <source><center><h3>%1</h3><p>Version %2</p></center><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p></source> - <translation type="unfinished"></translation> + <translation><center><h3>%1</h3><p>Version %2</p></center><p>Copyright (C) 2010 Nokia Corporation und/oder ihre Tochtergesellschaft(en).</p></translation> </message> <message> <source>Could not register file '%1': %2</source> @@ -1354,7 +1354,19 @@ qcollectiongenerator <collection-config-file> [options] qcollectiongenerator. </source> - <translation type="unfinished"></translation> + <translation> +Aufruf: + +qcollectiongenerator <collection-Konfigurationsdatei> [Optionen] + + -o <collection-Datei> Erstellt eine Collection-Datei mit + dem Namen <collection-Datei>. Wenn + diese Option nicht angegeben ist, wird + der Standardname verwendet. + -v Zeigt die Versionsnummer von + qcollectiongenerator an. + +</translation> </message> <message> <source>Could not open %1. @@ -1435,7 +1447,22 @@ qhelpgenerator <help-project-file> [options] qhelpgenerator. </source> - <translation type="unfinished"></translation> + <translation> +Aufruf: + +qhelpgenerator <Hilfe-Projektdatei> [Optionen] + -o <komprimierte-Datei> Erstellt eine komprimierte + Qt-Hilfedatei mit dem Namen + <komprimierte-Datei>. Wenn diese + Option nicht angegeben ist, wird + ein Standardname verwendet. + -c Prüft, ob alle Verknüpfungen in + HTML-Dateien auf Dateien in diesem + Hilfeprojekt verweisen. + -v Zeigt die Versionsnummer von + qhelpgenerator an. + +</translation> </message> <message> <source>Could not open %1. diff --git a/translations/qt_de.ts b/translations/qt_de.ts index 3b9bbb0..d167434 100644 --- a/translations/qt_de.ts +++ b/translations/qt_de.ts @@ -3700,7 +3700,7 @@ Möchten Sie die Datei trotzdem löschen?</translation> </message> <message> <source><h3>About Qt</h3><p>This program uses Qt version %1.</p></source> - <translation type="unfinished"></translation> + <translation><h3>Über Qt</h3><p>Dieses Programm verwendet Qt Version %1.</p></translation> </message> <message> <source><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></source> @@ -5186,7 +5186,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation> </message> <message> <source>Find &Previous</source> - <translation>Vorhergehende Fundstelle</translation> + <translation>&Vorhergehende Fundstelle</translation> </message> <message> <source>Shift+F3</source> |