}
}
-static void replacePercentN(QString *result, int n)
-{
- if (n >= 0) {
- int percentPos = 0;
- int len = 0;
- while ((percentPos = result->indexOf(QLatin1Char('%'), percentPos + len)) != -1) {
- len = 1;
- QString fmt;
- if (result->at(percentPos + len) == QLatin1Char('L')) {
- ++len;
- fmt = QLatin1String("%L1");
- } else {
- fmt = QLatin1String("%1");
- }
- if (result->at(percentPos + len) == QLatin1Char('n')) {
- fmt = fmt.arg(n);
- ++len;
- result->replace(percentPos, len, fmt);
- len = fmt.length();
- }
- }
- }
-}
-
/*!
\reentrant
\since 4.5
\a context is typically a class name (e.g., "MyDialog") and \a
sourceText is either English text or a short identifying text.
- \a disambiguation is an identifying string, for when the same \a
- sourceText is used in different roles within the same context. By
- default, it is null.
-
See the \l QTranslator and \l QObject::tr() documentation for
- more information about contexts, disambiguations and comments.
+ more information.
\a encoding indicates the 8-bit encoding of character strings.
- \a n is used in conjunction with \c %n to support plural forms.
- See QObject::tr() for details.
-
If none of the translation files contain a translation for \a
sourceText in \a context, this function returns a QString
equivalent of \a sourceText. The encoding of \a sourceText is
*/
-QString QCoreApplication::translate(const char *context, const char *sourceText,
- const char *disambiguation, Encoding encoding, int n)
+QString QCoreApplication::translate(const char *context, const char *sourceText, Encoding encoding)
{
QString result;
if (self && !self->d_func()->translators.isEmpty()) {
foreach (const QTranslator *translationFile, self->d_func()->translators) {
- result = translationFile->translate(context, sourceText, disambiguation, n);
+ result = translationFile->translate(context, sourceText);
if (!result.isEmpty())
break;
}
result = QString::fromLatin1(sourceText);
}
- replacePercentN(&result, n);
return result;
}
#endif //QT_NO_TRANSLATE
static void removeTranslator(QTranslator * messageFile);
#endif
enum Encoding { CodecForTr, UnicodeUTF8, DefaultCodec = CodecForTr };
- static QString translate(const char * context,
- const char * sourceText,
- const char * disambiguation = Q_NULLPTR,
- Encoding encoding = CodecForTr,
- int n = -1);
+ static QString translate(const char *context,
+ const char *sourceText,
+ Encoding encoding = CodecForTr);
static void flush();
#ifdef QT_NO_TRANSLATION
// Simple versions
-inline QString QCoreApplication::translate(const char *, const char *sourceText,
- const char *, Encoding encoding, int)
+inline QString QCoreApplication::translate(const char *, const char *sourceText, Encoding encoding)
{
#ifndef QT_NO_TEXTCODEC
if (encoding == UnicodeUTF8)
#define Q_DECLARE_TR_FUNCTIONS(context) \
public: \
- static inline QString tr(const char *sourceText, const char *disambiguation = Q_NULLPTR, int n = -1) \
- { return QCoreApplication::translate(#context, sourceText, disambiguation, \
- QCoreApplication::CodecForTr, n); } \
- static inline QString trUtf8(const char *sourceText, const char *disambiguation = Q_NULLPTR, int n = -1) \
- { return QCoreApplication::translate(#context, sourceText, disambiguation, \
- QCoreApplication::UnicodeUTF8, n); } \
+ static inline QString tr(const char *sourceText) \
+ { return QCoreApplication::translate(#context, sourceText, QCoreApplication::CodecForTr); } \
+ static inline QString trUtf8(const char *sourceText) \
+ { return QCoreApplication::translate(#context, sourceText, QCoreApplication::UnicodeUTF8); } \
private:
typedef void (*QtCleanUpFunction)();
return Q_NULLPTR;
}
-#ifndef QT_NO_TRANSLATION
-/*!
- \internal
-*/
-QString QMetaObject::tr(const char *s, const char *c, int n) const
-{
- return QCoreApplication::translate(d.stringdata, s, c, QCoreApplication::CodecForTr, n);
-}
-
-/*!
- \internal
-*/
-QString QMetaObject::trUtf8(const char *s, const char *c, int n) const
-{
- return QCoreApplication::translate(d.stringdata, s, c, QCoreApplication::UnicodeUTF8, n);
-}
-#endif // QT_NO_TRANSLATION
-
/*!
Returns the method offset for this class; i.e. the index position
of this class's first member function.
}
/*!
- \fn QString QObject::tr(const char *sourceText, const char *disambiguation, int n)
+ \fn QString QObject::tr(const char *sourceText)
\reentrant
- Returns a translated version of \a sourceText, optionally based on a
- \a disambiguation string and value of \a n for strings containing plurals;
- otherwise returns \a sourceText itself if no appropriate translated string
- is available.
-
- Example:
- \snippet mainwindows/sdi/mainwindow.cpp implicit tr context
- \dots
-
- If the same \a sourceText is used in different roles within the
- same context, an additional identifying string may be passed in
- \a disambiguation (0 by default). In Qt 4.4 and earlier, this was
- the preferred way to pass comments to translators.
-
- Example:
-
- \snippet doc/src/snippets/code/src_corelib_kernel_qobject.cpp 17
- \dots
-
- See \l{Writing Source Code for Translation} for a detailed description of
- Qt's translation mechanisms in general, and the
- \l{Writing Source Code for Translation#Disambiguation}{Disambiguation}
- section for information on disambiguation.
+ Returns a translated version of \a sourceText. Returns \a sourceText
+ itself if no appropriate translated string is available.
\warning This method is reentrant only if all translators are
installed \e before calling this method. Installing or removing
*/
/*!
- \fn QString QObject::trUtf8(const char *sourceText, const char *disambiguation, int n)
+ \fn QString QObject::trUtf8(const char *sourceText)
\reentrant
- Returns a translated version of \a sourceText, or
- QString::fromUtf8(\a sourceText) if there is no appropriate
- version. It is otherwise identical to tr(\a sourceText, \a
- disambiguation, \a n).
-
- Note that using the Utf8 variants of the translation functions
- is not required if \c CODECFORTR is already set to UTF-8 in the
- qmake project file and QTextCodec::setCodecForTr("UTF-8") is
- used.
+ Returns a translated version of \a sourceText. Returns \a sourceText
+ itself if no appropriate translated string is available.
\warning This method is reentrant only if all translators are
installed \e before calling this method. Installing or removing
\sa tr(), QApplication::translate(), {Internationalization with Qt}
*/
+#ifndef QT_NO_TRANSLATION
+QString QObject::tr(const char *sourceText)
+{
+ return QCoreApplication::translate(Q_NULLPTR, sourceText, QCoreApplication::CodecForTr);
+}
-
-
+QString QObject::trUtf8(const char *sourceText)
+{
+ return QCoreApplication::translate(Q_NULLPTR, sourceText, QCoreApplication::UnicodeUTF8);
+}
+#endif
/*****************************************************************************
Signals and slots
virtual bool event(QEvent *);
virtual bool eventFilter(QObject *, QEvent *);
-#ifdef QT_NO_TRANSLATION
- static QString tr(const char *sourceText, const char * = Q_NULLPTR, int = -1)
+#ifndef QT_NO_TRANSLATION
+ static QString tr(const char *sourceText);
+ static QString trUtf8(const char *sourceText);
+#else
+ static QString tr(const char *sourceText)
{ return QString::fromLatin1(sourceText); }
#ifndef QT_NO_TEXTCODEC
- static QString trUtf8(const char *sourceText, const char * = Q_NULLPTR, int = -1)
+ static QString trUtf8(const char *sourceText)
{ return QString::fromUtf8(sourceText); }
#endif
#endif //QT_NO_TRANSLATION
#define Q_SIGNAL
#define Q_SLOT
-#ifndef QT_NO_TRANSLATION
-# ifndef QT_NO_TEXTCODEC
-// full set of tr functions
-# define QT_TR_FUNCTIONS \
- static inline QString tr(const char *s, const char *c = Q_NULLPTR, int n = -1) \
- { return staticMetaObject.tr(s, c, n); } \
- static inline QString trUtf8(const char *s, const char *c = Q_NULLPTR, int n = -1) \
- { return staticMetaObject.trUtf8(s, c, n); }
-# else
-// no QTextCodec, no utf8
-# define QT_TR_FUNCTIONS \
- static inline QString tr(const char *s, const char *c = Q_NULLPTR, int n = -1) \
- { return staticMetaObject.tr(s, c, n); }
-# endif
-#else
-// inherit the ones from QObject
-# define QT_TR_FUNCTIONS
-#endif
-
#if defined(QT_NO_QOBJECT_CHECK)
#define Q_OBJECT_CHECK
#else
Q_OBJECT_GETSTATICMETAOBJECT \
virtual const QMetaObject *metaObject() const; \
virtual void *qt_metacast(const char *); \
- QT_TR_FUNCTIONS \
virtual int qt_metacall(QMetaObject::Call, int, void **); \
private: \
Q_DECL_HIDDEN static void qt_static_metacall(QObject *, QMetaObject::Call, int, void **);
QObject *cast(QObject *obj) const;
const QObject *cast(const QObject *obj) const;
-#ifndef QT_NO_TRANSLATION
- QString tr(const char *s, const char *c, int n = -1) const;
- QString trUtf8(const char *s, const char *c, int n = -1) const;
-#endif // QT_NO_TRANSLATION
-
int methodOffset() const;
int enumeratorOffset() const;
int propertyOffset() const;
return unix_key;
if (key.isEmpty()) {
- errorString = QCoreApplication::tr("%1: key is empty", "QSystemSemaphore").arg(QLatin1String("QSystemSemaphore::handle"));
+ errorString = QCoreApplication::tr("%1: key is empty").arg(QLatin1String("QSystemSemaphore::handle"));
error = QSystemSemaphore::KeyError;
return -1;
}
// ftok requires that an actual file exists somewhere
int built = QSharedMemoryPrivate::createUnixKeyFile(fileName);
if (-1 == built) {
- errorString = QCoreApplication::tr("%1: unable to make key", "QSystemSemaphore").arg(QLatin1String("QSystemSemaphore::handle"));
+ errorString = QCoreApplication::tr("%1: unable to make key").arg(QLatin1String("QSystemSemaphore::handle"));
error = QSystemSemaphore::KeyError;
return -1;
}
// Get the unix key for the created file
unix_key = ftok(QFile::encodeName(fileName).constData(), 'Q');
if (-1 == unix_key) {
- errorString = QCoreApplication::tr("%1: ftok failed", "QSystemSemaphore").arg(QLatin1String("QSystemSemaphore::handle"));
+ errorString = QCoreApplication::tr("%1: ftok failed").arg(QLatin1String("QSystemSemaphore::handle"));
error = QSystemSemaphore::KeyError;
return -1;
}
return true; // we already have a semaphore
if (fileName.isEmpty()) {
- errorString = QCoreApplication::tr("%1: key is empty", "QSystemSemaphore").arg(QLatin1String("QSystemSemaphore::handle"));
+ errorString = QCoreApplication::tr("%1: key is empty").arg(QLatin1String("QSystemSemaphore::handle"));
error = QSystemSemaphore::KeyError;
return false;
}
Q_DECLARE_PUBLIC(QTranslator)
public:
- QTranslatorPrivate() : didload(false) {}
+ QTranslatorPrivate() {}
- bool didload;
+ QByteArray domain;
};
/*!
\list
\o The \e context - usually the class name for the tr() caller.
\o The \e {source text} - usually the argument to tr().
- \o The \e disambiguation - an optional string that helps disambiguate
- different uses of the same text in the same context.
\endlist
For example, the "Cancel" in a dialog might have "Anuluj" when the
name; there would normally be no comment, and the translated text
would be "Anuluj".
- But it's not always so simple. The Spanish version of a printer
- dialog with settings for two-sided printing and binding would
- probably require both "Activado" and "Activada" as translations
- for "Enabled". In this case the source text would be "Enabled" in
- both cases, and the context would be the dialog's class name, but
- the two items would have disambiguations such as "two-sided printing"
- for one and "binding" for the other. The disambiguation enables the
- translator to choose the appropriate gender for the Spanish version,
- and enables Qt to distinguish between translations.
-
\section1 Using Multiple Translations
Multiple translation files can be installed in an application.
The previous contents of this translator object are discarded.
- For example, an application running in the fr_CA locale
- (French-speaking Canada) might call load("foo", "fr_ca".
-
\sa QLibraryInfo
*/
-bool QTranslator::load(const QString &domain, const QLocale &locale)
+bool QTranslator::load(const QString &domain)
{
+ if (domain.isEmpty()) {
+ return false;
+ }
Q_D(QTranslator);
- Q_UNUSED(locale);
- QByteArray latindomain(domain.toLatin1());
- bind_textdomain_codeset(latindomain.constData(), "UTF-8");
- d->didload = true;
+ d->domain = domain.toLatin1();
return true;
}
/*!
- Returns the translation for the key (\a context, \a sourceText,
- \a disambiguation). If none is found, also tries (\a context, \a
- sourceText, ""). If that still fails, returns an empty string.
-
- If \a n is not -1, it is used to choose an appropriate form for
- the translation (e.g. "%n file found" vs. "%n files found").
+ Returns the translation for the key (\a context, \a sourceText).
+ The text will be translated depending on the system locale.
\sa load()
*/
-QString QTranslator::translate(const char *context, const char *sourceText, const char *disambiguation,
- int n) const
+QString QTranslator::translate(const char *context, const char *sourceText) const
{
- Q_UNUSED(disambiguation);
- return QString::fromUtf8(ngettext(context, sourceText, n));
+ Q_UNUSED(context);
+ Q_D(const QTranslator);
+ return QString::fromUtf8(dgettext(d->domain.constData(), sourceText));
}
/*!
bool QTranslator::isEmpty() const
{
Q_D(const QTranslator);
- return d->didload;
+ return d->domain.isEmpty();
}
-/*!
- \fn QString QTranslator::find(const char *context, const char *sourceText, const char * comment = 0) const
-
- Use translate(\a context, \a sourceText, \a comment) instead.
-*/
-
#include "moc_qtranslator.h"
QT_END_NAMESPACE
#define QTRANSLATOR_H
#include <QtCore/qobject.h>
-#include <QtCore/qlocale.h>
QT_BEGIN_HEADER
explicit QTranslator(QObject *parent = Q_NULLPTR);
~QTranslator();
- virtual QString translate(const char *context, const char *sourceText,
- const char *disambiguation = Q_NULLPTR,
- int n = -1) const;
+ virtual QString translate(const char *context, const char *sourceText) const;
virtual bool isEmpty() const;
- bool load(const QString &domain, const QLocale &locale = QLocale::system());
+ bool load(const QString &domain);
private:
if (selectedConnections.isEmpty())
return;
- undoStack()->beginMacro(tr("Remove %n buddies", 0, selectedConnections.size()));
+ undoStack()->beginMacro(tr("Remove %1 buddies").arg(selectedConnections.size()));
foreach (Connection *con, selectedConnections) {
setSelected(con, false);
con->update();
return;
const int count = labelList.size();
Q_ASSERT(count == buddies.size());
- undoStack()->beginMacro(tr("Add %n buddies", 0, count));
+ undoStack()->beginMacro(tr("Add %1 buddies").arg(count));
for (int i = 0; i < count; i++)
undoStack()->push(createBuddyCommand(m_formWindow, labelList.at(i), buddies.at(i)));
undoStack()->endMacro();
static inline QString pasteCommandDescription(int widgetCount, int actionCount)
{
if (widgetCount == 0)
- return FormWindow::tr("Paste %n action(s)", 0, actionCount);
+ return FormWindow::tr("Paste %1 action(s)").arg(actionCount);
if (actionCount == 0)
- return FormWindow::tr("Paste %n widget(s)", 0, widgetCount);
+ return FormWindow::tr("Paste %1 widget(s)").arg(widgetCount);
return FormWindow::tr("Paste (%1 widgets, %2 actions)").arg(widgetCount).arg(actionCount);
}
QString errorMessage;
if (!m_previewManager->showPreview(fw, style, deviceProfileIndex, &errorMessage)) {
- const QString title = tr("Could not create form preview", "Title of warning message box");
+ const QString title = tr("Could not create form preview");
core()->dialogGui()->message(fw, QDesignerDialogGuiInterface::FormEditorMessage, QMessageBox::Warning,
title, errorMessage);
}
QString path = QDir::cleanPath(m_formWindow->absoluteDir().absoluteFilePath(res->attributeLocation()));
while (!QFile::exists(path)) {
QWidget *dialogParent = m_formWindow->core()->topLevel();
- const QString promptTitle = QApplication::translate("qdesigner_internal::QDesignerResource", "Loading qrc file", 0, QApplication::UnicodeUTF8);
- const QString prompt = QApplication::translate("qdesigner_internal::QDesignerResource", "The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p>", 0, QApplication::UnicodeUTF8).arg(path);
+ const QString promptTitle = QApplication::translate("qdesigner_internal::QDesignerResource", "Loading qrc file", QApplication::UnicodeUTF8);
+ const QString prompt = QApplication::translate("qdesigner_internal::QDesignerResource", "The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p>", QApplication::UnicodeUTF8).arg(path);
const QMessageBox::StandardButton answer = core()->dialogGui()->message(dialogParent, QDesignerDialogGuiInterface::ResourceLoadFailureMessage,
QMessageBox::Warning, promptTitle, prompt, QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes);
if (answer == QMessageBox::Yes) {
const QFileInfo fi(path);
- const QString fileDialogTitle = QApplication::translate("qdesigner_internal::QDesignerResource", "New location for %1", 0, QApplication::UnicodeUTF8).arg(fi.fileName());
- const QString fileDialogPattern = QApplication::translate("qdesigner_internal::QDesignerResource", "Resource files (*.qrc)", 0, QApplication::UnicodeUTF8);
+ const QString fileDialogTitle = QApplication::translate("qdesigner_internal::QDesignerResource", "New location for %1", QApplication::UnicodeUTF8).arg(fi.fileName());
+ const QString fileDialogPattern = QApplication::translate("qdesigner_internal::QDesignerResource", "Resource files (*.qrc)", QApplication::UnicodeUTF8);
path = core()->dialogGui()->getOpenFileName(dialogParent, fileDialogTitle, fi.absolutePath(), fileDialogPattern);
if (path.isEmpty())
break;
const PaletteData data = m_paletteValues.value(const_cast<QtProperty *>(property));
const uint mask = data.val.resolve();
if (mask)
- return tr("Customized (%n roles)", 0, bitCount(mask));
+ return tr("Customized (%1 roles)").arg(bitCount(mask));
static const QString inherited = tr("Inherited");
return inherited;
}
setText(QApplication::translate("Command", "Changed '%1' of '%2'").arg(propertyName()).arg(propertyHelperList().at(0)->object()->objectName()));
} else {
int count = propertyHelperList().size();
- setText(QApplication::translate("Command", "Changed '%1' of %n objects", "", QCoreApplication::UnicodeUTF8, count).arg(propertyName()));
+ setText(QApplication::translate("Command", "Changed '%1' of %2 objects", QCoreApplication::UnicodeUTF8).arg(propertyName()).arg(count));
}
}
setText(QApplication::translate("Command", "Reset '%1' of '%2'").arg(propertyName()).arg(propertyHelperList().at(0)->object()->objectName()));
} else {
int count = propertyHelperList().size();
- setText(QApplication::translate("Command", "Reset '%1' of %n objects", "", QCoreApplication::UnicodeUTF8, count).arg(propertyName()));
+ setText(QApplication::translate("Command", "Reset '%1' of %2 objects", QCoreApplication::UnicodeUTF8).arg(propertyName()).arg(count));
}
}
setText(QApplication::translate("Command", "Add dynamic property '%1' to '%2'").arg(m_propertyName).arg(m_selection.first()->objectName()));
} else {
int count = m_selection.size();
- setText(QApplication::translate("Command", "Add dynamic property '%1' to %n objects", "", QCoreApplication::UnicodeUTF8, count).arg(m_propertyName));
+ setText(QApplication::translate("Command", "Add dynamic property '%1' to %2 objects", QCoreApplication::UnicodeUTF8).arg(m_propertyName).arg(count));
}
}
setText(QApplication::translate("Command", "Remove dynamic property '%1' from '%2'").arg(m_propertyName).arg(m_objectToValueAndChanged.constBegin().key()->objectName()));
} else {
int count = m_objectToValueAndChanged.size();
- setText(QApplication::translate("Command", "Remove dynamic property '%1' from %n objects", "", QCoreApplication::UnicodeUTF8, count).arg(m_propertyName));
+ setText(QApplication::translate("Command", "Remove dynamic property '%1' from %2 objects", QCoreApplication::UnicodeUTF8).arg(m_propertyName).arg(count));
}
}
const int mask = a->data().toInt();
const int size = selection.size();
- fw->commandHistory()->beginMacro(tr("Set size constraint on %n widget(s)", 0, size));
+ fw->commandHistory()->beginMacro(tr("Set size constraint on %1 widget(s)").arg(size));
for (int i = 0; i < size; i++)
createSizeCommand(fw, selection.at(i), mask);
fw->commandHistory()->endMacro();
static QString msgOverwrite(const QString &fname)
{
- return QApplication::translate("QtResourceEditorDialog", "%1 already exists.\nDo you want to replace it?", 0, QApplication::UnicodeUTF8).arg(fname);
+ return QApplication::translate("QtResourceEditorDialog", "%1 already exists.\nDo you want to replace it?", QApplication::UnicodeUTF8).arg(fname);
}
static QString msgTagMismatch(const QString &got, const QString &expected)
m_ignoreCurrentChanged = true;
QString prefix = resourcePrefix->prefix();
if (prefix.isEmpty())
- prefix = QApplication::translate("QtResourceEditorDialog", "<no prefix>", 0, QApplication::UnicodeUTF8);
+ prefix = QApplication::translate("QtResourceEditorDialog", "<no prefix>", QApplication::UnicodeUTF8);
item->setText(prefix);
item->setToolTip(prefix);
m_ignoreCurrentChanged = false;
void QtResourceEditorDialogPrivate::slotNewQrcFile()
{
const QString qrcPath = getSaveFileNameWithExtension(q_ptr,
- QApplication::translate("QtResourceEditorDialog", "New Resource File", 0, QApplication::UnicodeUTF8),
+ QApplication::translate("QtResourceEditorDialog", "New Resource File", QApplication::UnicodeUTF8),
m_firstQrcFileDialog ? qrcStartDirectory() : QString(),
- QApplication::translate("QtResourceEditorDialog", "Resource files (*.qrc)", 0, QApplication::UnicodeUTF8),
+ QApplication::translate("QtResourceEditorDialog", "Resource files (*.qrc)", QApplication::UnicodeUTF8),
QLatin1String("qrc"));
if (qrcPath.isEmpty())
return;
void QtResourceEditorDialogPrivate::slotImportQrcFile()
{
const QString qrcPath = m_dlgGui->getOpenFileName(q_ptr,
- QApplication::translate("QtResourceEditorDialog", "Import Resource File", 0, QApplication::UnicodeUTF8),
+ QApplication::translate("QtResourceEditorDialog", "Import Resource File", QApplication::UnicodeUTF8),
m_firstQrcFileDialog ? qrcStartDirectory() : QString(),
- QApplication::translate("QtResourceEditorDialog", "Resource files (*.qrc)", 0, QApplication::UnicodeUTF8));
+ QApplication::translate("QtResourceEditorDialog", "Resource files (*.qrc)", QApplication::UnicodeUTF8));
if (qrcPath.isEmpty())
return;
m_firstQrcFileDialog = false;
QtResourcePrefix *currentResourcePrefix = getCurrentResourcePrefix();
QtResourcePrefix *nextResourcePrefix = m_qrcManager->nextResourcePrefix(currentResourcePrefix);
QtResourcePrefix *newResourcePrefix = m_qrcManager->insertResourcePrefix(m_currentQrcFile,
- QApplication::translate("QtResourceEditorDialog", "newPrefix", 0, QApplication::UnicodeUTF8),
+ QApplication::translate("QtResourceEditorDialog", "newPrefix", QApplication::UnicodeUTF8),
QString(), nextResourcePrefix);
if (!newResourcePrefix)
return;
}
const QStringList resourcePaths = m_dlgGui->getOpenImageFileNames(q_ptr,
- QApplication::translate("QtResourceEditorDialog", "Add Files", 0, QApplication::UnicodeUTF8),
+ QApplication::translate("QtResourceEditorDialog", "Add Files", QApplication::UnicodeUTF8),
initialPath);
if (resourcePaths.isEmpty())
return;
QString relativePath = dir.relativeFilePath(resourcePath);
if (relativePath.startsWith(QLatin1String(".."))) {
QMessageBox msgBox(QMessageBox::Warning,
- QApplication::translate("QtResourceEditorDialog", "Incorrect Path", 0, QApplication::UnicodeUTF8),
+ QApplication::translate("QtResourceEditorDialog", "Incorrect Path", QApplication::UnicodeUTF8),
outOfPathWarning(relativePath), QMessageBox::Cancel);
msgBox.setInformativeText(outOfPathWarningInfo());
QPushButton *copyButton = msgBox.addButton(QApplication::translate("QtResourceEditorDialog",
- "Copy", 0, QApplication::UnicodeUTF8), QMessageBox::ActionRole);
+ "Copy", QApplication::UnicodeUTF8), QMessageBox::ActionRole);
QPushButton *copyAsButton = msgBox.addButton(QApplication::translate("QtResourceEditorDialog",
- "Copy As...", 0, QApplication::UnicodeUTF8), QMessageBox::ActionRole);
+ "Copy As...", QApplication::UnicodeUTF8), QMessageBox::ActionRole);
QPushButton *keepButton = msgBox.addButton(QApplication::translate("QtResourceEditorDialog",
- "Keep", 0, QApplication::UnicodeUTF8), QMessageBox::ActionRole);
+ "Keep", QApplication::UnicodeUTF8), QMessageBox::ActionRole);
QPushButton *skipButton = msgBox.addButton(QApplication::translate("QtResourceEditorDialog",
- "Skip", 0, QApplication::UnicodeUTF8), QMessageBox::ActionRole);
+ "Skip", QApplication::UnicodeUTF8), QMessageBox::ActionRole);
msgBox.setEscapeButton(QMessageBox::Cancel);
msgBox.setDefaultButton(copyButton);
msgBox.exec();
QDir dd(destDir);
destPath = dd.absoluteFilePath(resInfo.fileName());
if (dd.exists(resInfo.fileName())) {
- if (warning(QApplication::translate("QtResourceEditorDialog", "Copy", 0, QApplication::UnicodeUTF8),
+ if (warning(QApplication::translate("QtResourceEditorDialog", "Copy", QApplication::UnicodeUTF8),
msgOverwrite(resInfo.fileName()),
QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel) != QMessageBox::Yes)
continue;
return;
bool ok;
- QString suffix = QInputDialog::getText(q_ptr, QApplication::translate("QtResourceEditorDialog", "Clone Prefix", 0, QApplication::UnicodeUTF8),
+ QString suffix = QInputDialog::getText(q_ptr, QApplication::translate("QtResourceEditorDialog", "Clone Prefix", QApplication::UnicodeUTF8),
QApplication::translate("QtResourceEditorDialog", "Enter the suffix which you want to add to the names of the cloned files.\n"
- "This could for example be a language extension like \"_de\".", 0, QApplication::UnicodeUTF8),
+ "This could for example be a language extension like \"_de\".", QApplication::UnicodeUTF8),
QLineEdit::Normal, QString(), &ok);
if (!ok)
return;
const QString initialPath = rootDir.absoluteFilePath(fi.fileName());
while (1) {
QString newPath = m_dlgGui->getSaveFileName(q_ptr,
- QApplication::translate("QtResourceEditorDialog", "Copy As", 0, QApplication::UnicodeUTF8),
+ QApplication::translate("QtResourceEditorDialog", "Copy As", QApplication::UnicodeUTF8),
initialPath);
QString relativePath = rootDir.relativeFilePath(newPath);
if (relativePath.startsWith(QLatin1String(".."))) {
- if (warning(QApplication::translate("QtResourceEditorDialog", "Copy As", 0, QApplication::UnicodeUTF8),
+ if (warning(QApplication::translate("QtResourceEditorDialog", "Copy As", QApplication::UnicodeUTF8),
QApplication::translate("QtResourceEditorDialog", "<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>", 0,
+ "<p>Please select another path within this directory.<p>",
QApplication::UnicodeUTF8).arg(relativePath).arg(rootDir.absolutePath()),
QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok) != QMessageBox::Ok)
return QString();
QFileInfo fi(destPath);
if (fi.exists()) {
while (fi.exists() && !QFile::remove(destPath)) {
- if (warning(QApplication::translate("QtResourceEditorDialog", "Copy", 0, QApplication::UnicodeUTF8),
- QApplication::translate("QtResourceEditorDialog", "Could not overwrite %1.", 0, QApplication::UnicodeUTF8).arg(fi.fileName()),
+ if (warning(QApplication::translate("QtResourceEditorDialog", "Copy", QApplication::UnicodeUTF8),
+ QApplication::translate("QtResourceEditorDialog", "Could not overwrite %1.", QApplication::UnicodeUTF8).arg(fi.fileName()),
QMessageBox::Retry | QMessageBox::Cancel, QMessageBox::Cancel) != QMessageBox::Retry)
return QString();
}
}
while (!QFile::copy(resourceFile, destPath)) {
- if (warning(QApplication::translate("QtResourceEditorDialog", "Copy", 0, QApplication::UnicodeUTF8),
+ if (warning(QApplication::translate("QtResourceEditorDialog", "Copy", QApplication::UnicodeUTF8),
QApplication::translate("QtResourceEditorDialog", "Could not copy\n%1\nto\n%2",
- 0, QApplication::UnicodeUTF8).arg(resourceFile).arg(destPath),
+ QApplication::UnicodeUTF8).arg(resourceFile).arg(destPath),
QMessageBox::Retry | QMessageBox::Cancel, QMessageBox::Cancel) != QMessageBox::Retry)
return QString();
}
QFile file(qrcFileData.qrcPath);
while (!file.open(QIODevice::WriteOnly)) {
QMessageBox msgBox(QMessageBox::Warning,
- QApplication::translate("QtResourceEditorDialog", "Save Resource File", 0, QApplication::UnicodeUTF8),
- QApplication::translate("QtResourceEditorDialog", "Could not write %1: %2", 0, QApplication::UnicodeUTF8).arg(qrcFileData.qrcPath).arg(file.errorString()),
+ QApplication::translate("QtResourceEditorDialog", "Save Resource File", QApplication::UnicodeUTF8),
+ QApplication::translate("QtResourceEditorDialog", "Could not write %1: %2", QApplication::UnicodeUTF8).arg(qrcFileData.qrcPath).arg(file.errorString()),
QMessageBox::Cancel|QMessageBox::Ignore|QMessageBox::Retry);
msgBox.setEscapeButton(QMessageBox::Cancel);
msgBox.setDefaultButton(QMessageBox::Ignore);
break;
case 1: returnValue = tr("Size");
break;
- case 2: returnValue = tr("Type", "All other platforms");
+ case 2: returnValue = tr("Type");
break;
// Windows - Type
// OS X - Kind
switch (section) {
case 0: return tr("Name");
case 1: return tr("Size");
- case 2: return
- tr("Type", "All other platforms");
+ case 2: return tr("Type");
// Konqueror - File Type
// Nautilus - Type
case 3: return tr("Date Modified");
}
if (info.isDir())
- return QApplication::translate("QFileDialog", "Folder", "All other platforms");
+ return QApplication::translate("QFileDialog", "Folder");
// Konqueror - "Folder"
// Nautilus - "folder"
if (info.isSymLink())
- return QApplication::translate("QFileDialog", "Shortcut", "All other platforms");
+ return QApplication::translate("QFileDialog", "Shortcut");
// Konqueror - "Folder" or "TXT File" i.e. what it is pointing to
// Nautilus - "link to folder" or "link to object file", same as Konqueror
#ifndef QT_NO_TRANSLATION
static bool qt_detectRTLLanguage()
{
+ // Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right to left languages
return force_reverse ^
- (QApplication::tr("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.") == QLatin1String("RTL"));
+ (QApplication::tr("QT_LAYOUT_DIRECTION") == QLatin1String("RTL"));
}
#endif
{
QUndoAction *result = new QUndoAction(prefix, parent);
if (prefix.isEmpty())
- result->setTextFormat(tr("Undo %1"), tr("Undo", "Default text for undo action"));
+ result->setTextFormat(tr("Undo %1"), tr("Undo"));
result->setEnabled(canUndo());
result->setPrefixedText(undoText());
{
QUndoAction *result = new QUndoAction(prefix, parent);
if (prefix.isEmpty())
- result->setTextFormat(tr("Redo %1"), tr("Redo", "Default text for redo action"));
+ result->setTextFormat(tr("Redo %1"), tr("Redo"));
result->setEnabled(canRedo());
result->setPrefixedText(redoText());
{
QUndoAction *result = new QUndoAction(prefix, parent);
if (prefix.isEmpty())
- result->setTextFormat(tr("Undo %1"), tr("Undo", "Default text for undo action"));
+ result->setTextFormat(tr("Undo %1"), tr("Undo"));
result->setEnabled(canUndo());
result->setPrefixedText(undoText());
{
QUndoAction *result = new QUndoAction(prefix, parent);
if (prefix.isEmpty())
- result->setTextFormat(tr("Redo %1"), tr("Redo", "Default text for redo action"));
+ result->setTextFormat(tr("Redo %1"), tr("Redo"));
result->setEnabled(canRedo());
result->setPrefixedText(redoText());
if (!args.at(1).isString())
return JSC::throwError(exec, JSC::GeneralError, "qsTranslate(): second argument (text) must be a string");
if ((args.size() > 2) && !args.at(2).isString())
- return JSC::throwError(exec, JSC::GeneralError, "qsTranslate(): third argument (comment) must be a string");
- if ((args.size() > 3) && !args.at(3).isString())
return JSC::throwError(exec, JSC::GeneralError, "qsTranslate(): fourth argument (encoding) must be a string");
- if ((args.size() > 4) && !args.at(4).isNumber())
- return JSC::throwError(exec, JSC::GeneralError, "qsTranslate(): fifth argument (n) must be a number");
JSC::UString context = args.at(0).toString(exec);
JSC::UString text = args.at(1).toString(exec);
- JSC::UString comment;
- if (args.size() > 2)
- comment = args.at(2).toString(exec);
QCoreApplication::Encoding encoding = QCoreApplication::UnicodeUTF8;
- if (args.size() > 3) {
- JSC::UString encStr = args.at(3).toString(exec);
+ if (args.size() > 2) {
+ JSC::UString encStr = args.at(2).toString(exec);
if (encStr == "CodecForTr")
encoding = QCoreApplication::CodecForTr;
else if (encStr == "UnicodeUTF8")
else
return JSC::throwError(exec, JSC::GeneralError, QString::fromLatin1("qsTranslate(): invalid encoding '%0'").arg(encStr));
}
- int n = -1;
- if (args.size() > 4)
- n = args.at(4).toInt32(exec);
JSC::UString result = QCoreApplication::translate(context.UTF8String(),
text.UTF8String(),
- comment.UTF8String(),
- encoding, n);
+ encoding);
return JSC::jsString(exec, result);
}
return JSC::throwError(exec, JSC::GeneralError, "qsTr() requires at least one argument");
if (!args.at(0).isString())
return JSC::throwError(exec, JSC::GeneralError, "qsTr(): first argument (text) must be a string");
- if ((args.size() > 1) && !args.at(1).isString())
- return JSC::throwError(exec, JSC::GeneralError, "qsTr(): second argument (comment) must be a string");
- if ((args.size() > 2) && !args.at(2).isNumber())
- return JSC::throwError(exec, JSC::GeneralError, "qsTr(): third argument (n) must be a number");
QScriptEnginePrivate *engine = scriptEngineFromExec(exec);
JSC::UString context;
// The first non-empty source URL in the call stack determines the translation context.
}
}
JSC::UString text = args.at(0).toString(exec);
- JSC::UString comment;
- if (args.size() > 1)
- comment = args.at(1).toString(exec);
- int n = -1;
- if (args.size() > 2)
- n = args.at(2).toInt32(exec);
JSC::UString result = QCoreApplication::translate(context.UTF8String(),
text.UTF8String(),
- comment.UTF8String(),
- QCoreApplication::UnicodeUTF8, n);
+ QCoreApplication::UnicodeUTF8);
return JSC::jsString(exec, result);
}
if (type == QGradient::LinearGradient) {
startLinearXSpinBox = m_ui.spinBox1;
setSpinBox(startLinearXSpinBox, SLOT(slotStartLinearXChanged(double)));
- m_ui.label1->setText(QApplication::translate("QtGradientEditor", "Start X", 0, QApplication::UnicodeUTF8));
+ m_ui.label1->setText(QApplication::translate("QtGradientEditor", "Start X", QApplication::UnicodeUTF8));
startLinearYSpinBox = m_ui.spinBox2;
setSpinBox(startLinearYSpinBox, SLOT(slotStartLinearYChanged(double)));
- m_ui.label2->setText(QApplication::translate("QtGradientEditor", "Start Y", 0, QApplication::UnicodeUTF8));
+ m_ui.label2->setText(QApplication::translate("QtGradientEditor", "Start Y", QApplication::UnicodeUTF8));
endLinearXSpinBox = m_ui.spinBox3;
setSpinBox(endLinearXSpinBox, SLOT(slotEndLinearXChanged(double)));
- m_ui.label3->setText(QApplication::translate("QtGradientEditor", "Final X", 0, QApplication::UnicodeUTF8));
+ m_ui.label3->setText(QApplication::translate("QtGradientEditor", "Final X", QApplication::UnicodeUTF8));
endLinearYSpinBox = m_ui.spinBox4;
setSpinBox(endLinearYSpinBox, SLOT(slotEndLinearYChanged(double)));
- m_ui.label4->setText(QApplication::translate("QtGradientEditor", "Final Y", 0, QApplication::UnicodeUTF8));
+ m_ui.label4->setText(QApplication::translate("QtGradientEditor", "Final Y", QApplication::UnicodeUTF8));
setStartLinear(m_ui.gradientWidget->startLinear());
setEndLinear(m_ui.gradientWidget->endLinear());
} else if (type == QGradient::RadialGradient) {
centralRadialXSpinBox = m_ui.spinBox1;
setSpinBox(centralRadialXSpinBox, SLOT(slotCentralRadialXChanged(double)));
- m_ui.label1->setText(QApplication::translate("QtGradientEditor", "Central X", 0, QApplication::UnicodeUTF8));
+ m_ui.label1->setText(QApplication::translate("QtGradientEditor", "Central X", QApplication::UnicodeUTF8));
centralRadialYSpinBox = m_ui.spinBox2;
setSpinBox(centralRadialYSpinBox, SLOT(slotCentralRadialYChanged(double)));
- m_ui.label2->setText(QApplication::translate("QtGradientEditor", "Central Y", 0, QApplication::UnicodeUTF8));
+ m_ui.label2->setText(QApplication::translate("QtGradientEditor", "Central Y", QApplication::UnicodeUTF8));
focalRadialXSpinBox = m_ui.spinBox3;
setSpinBox(focalRadialXSpinBox, SLOT(slotFocalRadialXChanged(double)));
- m_ui.label3->setText(QApplication::translate("QtGradientEditor", "Focal X", 0, QApplication::UnicodeUTF8));
+ m_ui.label3->setText(QApplication::translate("QtGradientEditor", "Focal X", QApplication::UnicodeUTF8));
focalRadialYSpinBox = m_ui.spinBox4;
setSpinBox(focalRadialYSpinBox, SLOT(slotFocalRadialYChanged(double)));
- m_ui.label4->setText(QApplication::translate("QtGradientEditor", "Focal Y", 0, QApplication::UnicodeUTF8));
+ m_ui.label4->setText(QApplication::translate("QtGradientEditor", "Focal Y", QApplication::UnicodeUTF8));
radiusRadialSpinBox = m_ui.spinBox5;
setSpinBox(radiusRadialSpinBox, SLOT(slotRadiusRadialChanged(double)), 2.0);
- m_ui.label5->setText(QApplication::translate("QtGradientEditor", "Radius", 0, QApplication::UnicodeUTF8));
+ m_ui.label5->setText(QApplication::translate("QtGradientEditor", "Radius", QApplication::UnicodeUTF8));
setCentralRadial(m_ui.gradientWidget->centralRadial());
setFocalRadial(m_ui.gradientWidget->focalRadial());
} else if (type == QGradient::ConicalGradient) {
centralConicalXSpinBox = m_ui.spinBox1;
setSpinBox(centralConicalXSpinBox, SLOT(slotCentralConicalXChanged(double)));
- m_ui.label1->setText(QApplication::translate("QtGradientEditor", "Central X", 0, QApplication::UnicodeUTF8));
+ m_ui.label1->setText(QApplication::translate("QtGradientEditor", "Central X", QApplication::UnicodeUTF8));
centralConicalYSpinBox = m_ui.spinBox2;
setSpinBox(centralConicalYSpinBox, SLOT(slotCentralConicalYChanged(double)));
- m_ui.label2->setText(QApplication::translate("QtGradientEditor", "Central Y", 0, QApplication::UnicodeUTF8));
+ m_ui.label2->setText(QApplication::translate("QtGradientEditor", "Central Y", QApplication::UnicodeUTF8));
angleConicalSpinBox = m_ui.spinBox3;
setSpinBox(angleConicalSpinBox, SLOT(slotAngleConicalChanged(double)), 360.0, 1.0, 1);
- m_ui.label3->setText(QApplication::translate("QtGradientEditor", "Angle", 0, QApplication::UnicodeUTF8));
+ m_ui.label3->setText(QApplication::translate("QtGradientEditor", "Angle", QApplication::UnicodeUTF8));
setCentralConical(m_ui.gradientWidget->centralConical());
setAngleConical(m_ui.gradientWidget->angleConical());
void QtGradientStopsControllerPrivate::slotHsvClicked()
{
- QString h = QApplication::translate("qdesigner_internal::QtGradientStopsController", "H", 0, QApplication::UnicodeUTF8);
- QString s = QApplication::translate("qdesigner_internal::QtGradientStopsController", "S", 0, QApplication::UnicodeUTF8);
- QString v = QApplication::translate("qdesigner_internal::QtGradientStopsController", "V", 0, QApplication::UnicodeUTF8);
+ QString h = QApplication::translate("qdesigner_internal::QtGradientStopsController", "H", QApplication::UnicodeUTF8);
+ QString s = QApplication::translate("qdesigner_internal::QtGradientStopsController", "S", QApplication::UnicodeUTF8);
+ QString v = QApplication::translate("qdesigner_internal::QtGradientStopsController", "V", QApplication::UnicodeUTF8);
m_ui->hLabel->setText(h);
m_ui->sLabel->setText(s);
m_ui->vLabel->setText(v);
- h = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Hue", 0, QApplication::UnicodeUTF8);
- s = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Sat", 0, QApplication::UnicodeUTF8);
- v = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Val", 0, QApplication::UnicodeUTF8);
+ h = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Hue", QApplication::UnicodeUTF8);
+ s = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Sat", QApplication::UnicodeUTF8);
+ v = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Val", QApplication::UnicodeUTF8);
- const QString hue = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Hue", 0, QApplication::UnicodeUTF8);
- const QString saturation = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Saturation", 0, QApplication::UnicodeUTF8);
- const QString value = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Value", 0, QApplication::UnicodeUTF8);
+ const QString hue = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Hue", QApplication::UnicodeUTF8);
+ const QString saturation = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Saturation", QApplication::UnicodeUTF8);
+ const QString value = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Value", QApplication::UnicodeUTF8);
m_ui->hLabel->setToolTip(hue);
m_ui->hueLabel->setText(h);
void QtGradientStopsControllerPrivate::slotRgbClicked()
{
- QString r = QApplication::translate("qdesigner_internal::QtGradientStopsController", "R", 0, QApplication::UnicodeUTF8);
- QString g = QApplication::translate("qdesigner_internal::QtGradientStopsController", "G", 0, QApplication::UnicodeUTF8);
- QString b = QApplication::translate("qdesigner_internal::QtGradientStopsController", "B", 0, QApplication::UnicodeUTF8);
+ QString r = QApplication::translate("qdesigner_internal::QtGradientStopsController", "R", QApplication::UnicodeUTF8);
+ QString g = QApplication::translate("qdesigner_internal::QtGradientStopsController", "G", QApplication::UnicodeUTF8);
+ QString b = QApplication::translate("qdesigner_internal::QtGradientStopsController", "B", QApplication::UnicodeUTF8);
m_ui->hLabel->setText(r);
m_ui->sLabel->setText(g);
m_ui->vLabel->setText(b);
- QString red = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Red", 0, QApplication::UnicodeUTF8);
- QString green = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Green", 0, QApplication::UnicodeUTF8);
- QString blue = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Blue", 0, QApplication::UnicodeUTF8);
+ QString red = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Red", QApplication::UnicodeUTF8);
+ QString green = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Green", QApplication::UnicodeUTF8);
+ QString blue = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Blue", QApplication::UnicodeUTF8);
m_ui->hLabel->setToolTip(red);
m_ui->hueLabel->setText(red);
void setGradientManager(QtGradientManager *manager);
QtGradientManager *gradientManager() const;
- static QGradient getGradient(bool *ok, QtGradientManager *manager, QWidget *parent = Q_NULLPTR, const QString &caption = tr("Select Gradient", 0));
+ static QGradient getGradient(bool *ok, QtGradientManager *manager, QWidget *parent = Q_NULLPTR, const QString &caption = tr("Select Gradient"));
private slots:
void slotGradientSelected(const QString &id);
QtCursorDatabase::QtCursorDatabase()
{
- appendCursor(Qt::ArrowCursor, QApplication::translate("QtCursorDatabase", "Arrow", 0,
+ appendCursor(Qt::ArrowCursor, QApplication::translate("QtCursorDatabase", "Arrow",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-arrow.png")));
- appendCursor(Qt::UpArrowCursor, QApplication::translate("QtCursorDatabase", "Up Arrow", 0,
+ appendCursor(Qt::UpArrowCursor, QApplication::translate("QtCursorDatabase", "Up Arrow",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-uparrow.png")));
- appendCursor(Qt::CrossCursor, QApplication::translate("QtCursorDatabase", "Cross", 0,
+ appendCursor(Qt::CrossCursor, QApplication::translate("QtCursorDatabase", "Cross",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-cross.png")));
- appendCursor(Qt::WaitCursor, QApplication::translate("QtCursorDatabase", "Wait", 0,
+ appendCursor(Qt::WaitCursor, QApplication::translate("QtCursorDatabase", "Wait",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-wait.png")));
- appendCursor(Qt::IBeamCursor, QApplication::translate("QtCursorDatabase", "IBeam", 0,
+ appendCursor(Qt::IBeamCursor, QApplication::translate("QtCursorDatabase", "IBeam",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-ibeam.png")));
- appendCursor(Qt::SizeVerCursor, QApplication::translate("QtCursorDatabase", "Size Vertical", 0,
+ appendCursor(Qt::SizeVerCursor, QApplication::translate("QtCursorDatabase", "Size Vertical",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-sizev.png")));
- appendCursor(Qt::SizeHorCursor, QApplication::translate("QtCursorDatabase", "Size Horizontal", 0,
+ appendCursor(Qt::SizeHorCursor, QApplication::translate("QtCursorDatabase", "Size Horizontal",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-sizeh.png")));
- appendCursor(Qt::SizeFDiagCursor, QApplication::translate("QtCursorDatabase", "Size Backslash", 0,
+ appendCursor(Qt::SizeFDiagCursor, QApplication::translate("QtCursorDatabase", "Size Backslash",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-sizef.png")));
- appendCursor(Qt::SizeBDiagCursor, QApplication::translate("QtCursorDatabase", "Size Slash", 0,
+ appendCursor(Qt::SizeBDiagCursor, QApplication::translate("QtCursorDatabase", "Size Slash",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-sizeb.png")));
- appendCursor(Qt::SizeAllCursor, QApplication::translate("QtCursorDatabase", "Size All", 0,
+ appendCursor(Qt::SizeAllCursor, QApplication::translate("QtCursorDatabase", "Size All",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-sizeall.png")));
- appendCursor(Qt::BlankCursor, QApplication::translate("QtCursorDatabase", "Blank", 0,
+ appendCursor(Qt::BlankCursor, QApplication::translate("QtCursorDatabase", "Blank",
QApplication::UnicodeUTF8), QIcon());
- appendCursor(Qt::SplitVCursor, QApplication::translate("QtCursorDatabase", "Split Vertical", 0,
+ appendCursor(Qt::SplitVCursor, QApplication::translate("QtCursorDatabase", "Split Vertical",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-vsplit.png")));
- appendCursor(Qt::SplitHCursor, QApplication::translate("QtCursorDatabase", "Split Horizontal", 0,
+ appendCursor(Qt::SplitHCursor, QApplication::translate("QtCursorDatabase", "Split Horizontal",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-hsplit.png")));
- appendCursor(Qt::PointingHandCursor, QApplication::translate("QtCursorDatabase", "Pointing Hand", 0,
+ appendCursor(Qt::PointingHandCursor, QApplication::translate("QtCursorDatabase", "Pointing Hand",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-hand.png")));
- appendCursor(Qt::ForbiddenCursor, QApplication::translate("QtCursorDatabase", "Forbidden", 0,
+ appendCursor(Qt::ForbiddenCursor, QApplication::translate("QtCursorDatabase", "Forbidden",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-forbidden.png")));
- appendCursor(Qt::OpenHandCursor, QApplication::translate("QtCursorDatabase", "Open Hand", 0,
+ appendCursor(Qt::OpenHandCursor, QApplication::translate("QtCursorDatabase", "Open Hand",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-openhand.png")));
- appendCursor(Qt::ClosedHandCursor, QApplication::translate("QtCursorDatabase", "Closed Hand", 0,
+ appendCursor(Qt::ClosedHandCursor, QApplication::translate("QtCursorDatabase", "Closed Hand",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-closedhand.png")));
- appendCursor(Qt::WhatsThisCursor, QApplication::translate("QtCursorDatabase", "What's This", 0,
+ appendCursor(Qt::WhatsThisCursor, QApplication::translate("QtCursorDatabase", "What's This",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-whatsthis.png")));
- appendCursor(Qt::BusyCursor, QApplication::translate("QtCursorDatabase", "Busy", 0,
+ appendCursor(Qt::BusyCursor, QApplication::translate("QtCursorDatabase", "Busy",
QApplication::UnicodeUTF8), QIcon(QLatin1String(":/trolltech/qtpropertybrowser/images/cursor-busy.png")));
}
QString QtPropertyBrowserUtils::colorValueText(const QColor &c)
{
- return QApplication::translate("QtPropertyBrowserUtils", "[%1, %2, %3] (%4)", 0, QApplication::UnicodeUTF8)
+ return QApplication::translate("QtPropertyBrowserUtils", "[%1, %2, %3] (%4)", QApplication::UnicodeUTF8)
.arg(QString::number(c.red()))
.arg(QString::number(c.green()))
.arg(QString::number(c.blue()))
QString QtPropertyBrowserUtils::fontValueText(const QFont &f)
{
- return QApplication::translate("QtPropertyBrowserUtils", "[%1, %2]", 0, QApplication::UnicodeUTF8)
+ return QApplication::translate("QtPropertyBrowserUtils", "[%1, %2]", QApplication::UnicodeUTF8)
.arg(f.family())
.arg(f.pointSize());
}
m_treeWidget->setColumnCount(2);
QStringList labels;
- labels.append(QApplication::translate("QtTreePropertyBrowser", "Property", 0, QApplication::UnicodeUTF8));
- labels.append(QApplication::translate("QtTreePropertyBrowser", "Value", 0, QApplication::UnicodeUTF8));
+ labels.append(QApplication::translate("QtTreePropertyBrowser", "Property", QApplication::UnicodeUTF8));
+ labels.append(QApplication::translate("QtTreePropertyBrowser", "Value", QApplication::UnicodeUTF8));
m_treeWidget->setHeaderLabels(labels);
m_treeWidget->setAlternatingRowColors(true);
m_treeWidget->setEditTriggers(QAbstractItemView::EditKeyPressed);
m_newFormWidget(QDesignerNewFormWidgetInterface::createNewFormWidget(workbench->core())),
m_workbench(workbench),
m_chkShowOnStartup(new QCheckBox(tr("Show this Dialog on Startup"))),
- m_createButton(new QPushButton(QApplication::translate("NewForm", "C&reate", 0, QApplication::UnicodeUTF8))),
- m_recentButton(new QPushButton(QApplication::translate("NewForm", "Recent", 0, QApplication::UnicodeUTF8))),
+ m_createButton(new QPushButton(QApplication::translate("NewForm", "C&reate", QApplication::UnicodeUTF8))),
+ m_recentButton(new QPushButton(QApplication::translate("NewForm", "Recent", QApplication::UnicodeUTF8))),
m_buttonBox(0)
{
setWindowTitle(tr("New Form"));
{
// Dialog buttons with 'recent files'
QDialogButtonBox *buttonBox = new QDialogButtonBox;
- buttonBox->addButton(QApplication::translate("NewForm", "&Close", 0,
+ buttonBox->addButton(QApplication::translate("NewForm", "&Close",
QApplication::UnicodeUTF8), QDialogButtonBox::RejectRole);
buttonBox->addButton(m_createButton, QDialogButtonBox::AcceptRole);
- buttonBox->addButton(QApplication::translate("NewForm", "&Open...", 0,
+ buttonBox->addButton(QApplication::translate("NewForm", "&Open...",
QApplication::UnicodeUTF8), QDialogButtonBox::ActionRole);
buttonBox->addButton(m_recentButton, QDialogButtonBox::ActionRole);
QDesignerActions *da = m_workbench->actionManager();
} else {
int count = dirtyForms.size();
QMessageBox box(QMessageBox::Warning, tr("Save Forms?"),
- tr("There are %n forms with unsaved changes."
- " Do you want to review these changes before quitting?", "", count),
+ tr("There are %1 forms with unsaved changes."
+ " Do you want to review these changes before quitting?").arg(count),
QMessageBox::Cancel | QMessageBox::Discard | QMessageBox::Save);
box.setInformativeText(tr("If you do not review your documents, all your changes will be lost."));
box.button(QMessageBox::Discard)->setText(tr("Discard Changes"));
**
****************************************************************************/
+#include <QtCore/qtranslator.h>
#include <QtGui/qapplication.h>
#include <QtGui/qmainwindow.h>
#include <QtGui/qtabwidget.h>
Q_INIT_RESOURCE(qdbusviewer);
QApplication app(argc, argv);
+
+#ifndef QT_NO_TRANSLATION
+ QTranslator translator;
+ QTranslator qtTranslator;
+ if (translator.load(QLatin1String("qt_tools"))
+ && qtTranslator.load(QLatin1String("qt"))) {
+ app.installTranslator(&translator);
+ app.installTranslator(&qtTranslator);
+ }
+#endif
+
QMainWindow mw;
app.setWindowIcon(QIcon(QLatin1String(":/trolltech/qdbusviewer/qdbusviewer.png")));
mw.setWindowTitle(app.translate("QtDBusViewer", "Katie D-Bus Viewer"));
enableSorting(w, varName, tempName);
}
-QString WriteInitialization::trCall(const QString &str, const QString &commentHint) const
+QString WriteInitialization::trCall(const QString &str) const
{
if (str.isEmpty())
return QLatin1String("QString()");
QString result;
- const QString comment = commentHint.isEmpty() ? QString(QLatin1Char('0')) : fixString(commentHint, m_dindent);
if (m_option.translateFunction.isEmpty()) {
result = QLatin1String("QApplication::translate(\"");
}
result += fixString(str, m_dindent);
- result += QLatin1String(", ");
- result += comment;
if (m_option.translateFunction.isEmpty()) {
result += QLatin1String(", ");
QString WriteInitialization::trCall(DomString *str, const QString &defaultString) const
{
- QString value = defaultString;
- QString comment;
- if (str) {
- value = toString(str);
- comment = str->attributeComment();
- }
- return trCall(value, comment);
+ Q_UNUSED(str);
+ return trCall(defaultString);
}
QString WriteInitialization::noTrCall(DomString *str, const QString &defaultString) const
QString iconCall(const DomProperty *prop);
QString pixCall(const DomProperty *prop) const;
QString pixCall(const QString &type, const QString &text) const;
- QString trCall(const QString &str, const QString &comment = QString()) const;
+ QString trCall(const QString &str) const;
QString trCall(DomString *str, const QString &defaultString = QString()) const;
QString noTrCall(DomString *str, const QString &defaultString = QString()) const;
QString autoTrCall(DomString *str, const QString &defaultString = QString()) const;
if (!m_trEnabled)
return QString::fromUtf8(tsv.value().data());
return QVariant::fromValue(
- QApplication::translate(m_className, tsv.value(), tsv.comment(),
- QCoreApplication::UnicodeUTF8));
+ QApplication::translate(m_className, tsv.value(), QCoreApplication::UnicodeUTF8));
}
if (value.canConvert<QString>())
return QVariant::fromValue(qvariant_cast<QString>(value));
QVariant v = item->data(i, irs[j].shadowRole);
if (v.isValid()) {
QUiTranslatableStringValue tsv = qvariant_cast<QUiTranslatableStringValue>(v);
- const QString text = QApplication::translate(class_name,
- tsv.value(), tsv.comment(),
+ const QString text = QApplication::translate(class_name, tsv.value(),
QCoreApplication::UnicodeUTF8);
item->setData(i, irs[j].realRole, text);
}
QVariant v = item->data(irs[j].shadowRole);
if (v.isValid()) {
QUiTranslatableStringValue tsv = qvariant_cast<QUiTranslatableStringValue>(v);
- const QString text = QApplication::translate(class_name,
- tsv.value(), tsv.comment(),
+ const QString text = QApplication::translate(class_name, tsv.value(),
QCoreApplication::UnicodeUTF8);
item->setData(irs[j].realRole, text);
}
QVariant v = mainWidget->widget(i)->property(propName); \
if (v.isValid()) { \
QUiTranslatableStringValue tsv = qvariant_cast<QUiTranslatableStringValue>(v); \
- const QString text = QApplication::translate(m_className, \
- tsv.value(), tsv.comment(), \
+ const QString text = QApplication::translate(m_className, tsv.value(), \
QCoreApplication::UnicodeUTF8); \
mainWidget->setter(i, text); \
} \
const QByteArray propName = prop.mid(sizeof(PROP_GENERIC_PREFIX) - 1);
const QUiTranslatableStringValue tsv =
qvariant_cast<QUiTranslatableStringValue>(o->property(prop));
- const QString text = QApplication::translate(m_className,
- tsv.value(), tsv.comment(),
+ const QString text = QApplication::translate(m_className, tsv.value(),
QCoreApplication::UnicodeUTF8);
o->setProperty(propName, text);
}
const QVariant v = combow->itemData(i, Qt::DisplayPropertyRole);
if (v.isValid()) {
QUiTranslatableStringValue tsv = qvariant_cast<QUiTranslatableStringValue>(v);
- const QString text = QApplication::translate(m_className,
- tsv.value(), tsv.comment(),
+ const QString text = QApplication::translate(m_className, tsv.value(),
QCoreApplication::UnicodeUTF8);
combow->setItemText(i, text);
}
strVal->setComment(dom_str->attributeComment().toUtf8());
if (strVal->value().isEmpty() && strVal->comment().isEmpty())
return QString();
- return QApplication::translate(className,
- strVal->value(), strVal->comment(),
+ return QApplication::translate(className, strVal->value(),
QCoreApplication::UnicodeUTF8);
}
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-28 19:47+0000\n"
+"POT-Creation-Date: 2020-11-29 02:00+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr ""
#: src/gui/dialogs/qfilesystemmodel.cpp:655
-#: src/gui/itemviews/qdirmodel.cpp:1218
+#: src/gui/itemviews/qdirmodel.cpp:1217
msgid "%1 TB"
msgstr ""
#: src/gui/dialogs/qfilesystemmodel.cpp:657
-#: src/gui/itemviews/qdirmodel.cpp:1220
+#: src/gui/itemviews/qdirmodel.cpp:1219
msgid "%1 GB"
msgstr ""
#: src/gui/dialogs/qfilesystemmodel.cpp:659
-#: src/gui/itemviews/qdirmodel.cpp:1222
+#: src/gui/itemviews/qdirmodel.cpp:1221
msgid "%1 MB"
msgstr ""
#: src/gui/dialogs/qfilesystemmodel.cpp:661
-#: src/gui/itemviews/qdirmodel.cpp:1224
+#: src/gui/itemviews/qdirmodel.cpp:1223
msgid "%1 KB"
msgstr ""
msgid "Size"
msgstr ""
-#: src/gui/dialogs/qfilesystemmodel.cpp:801 src/gui/itemviews/qdirmodel.cpp:410
+#: src/gui/dialogs/qfilesystemmodel.cpp:801 src/gui/itemviews/qdirmodel.cpp:409
msgid "Type"
msgstr ""
-#: src/gui/dialogs/qfilesystemmodel.cpp:807 src/gui/itemviews/qdirmodel.cpp:413
+#: src/gui/dialogs/qfilesystemmodel.cpp:807 src/gui/itemviews/qdirmodel.cpp:412
msgid "Date Modified"
msgstr ""
msgid "*"
msgstr ""
-#: src/gui/kernel/qapplication.cpp:1832
+#: src/gui/kernel/qapplication.cpp:1833
msgid "QT_LAYOUT_DIRECTION"
msgstr ""
msgid "F%1"
msgstr ""
-#: src/gui/itemviews/qdirmodel.cpp:806
+#: src/gui/itemviews/qdirmodel.cpp:805
msgctxt "QFileDialog"
msgid "My Computer"
msgstr ""
-#: src/gui/itemviews/qdirmodel.cpp:1225
+#: src/gui/itemviews/qdirmodel.cpp:1224
msgid "%1 byte(s)"
msgstr ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-28 19:47+0000\n"
+"POT-Creation-Date: 2020-11-29 02:00+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgid "Choose a color for the selected effect color role."
msgstr ""
-#: src/tools/qdbusviewer/qdbusviewermain.cpp:51
+#: src/tools/qdbusviewer/qdbusviewermain.cpp:63
msgctxt "QtDBusViewer"
msgid "Katie D-Bus Viewer"
msgstr ""
-#: src/tools/qdbusviewer/qdbusviewermain.cpp:58
+#: src/tools/qdbusviewer/qdbusviewermain.cpp:70
msgid "Session Bus"
msgstr ""
-#: src/tools/qdbusviewer/qdbusviewermain.cpp:59
+#: src/tools/qdbusviewer/qdbusviewermain.cpp:71
msgid "System Bus"
msgstr ""
-#: src/tools/qdbusviewer/qdbusviewermain.cpp:61
+#: src/tools/qdbusviewer/qdbusviewermain.cpp:73
#: src/tools/designer/qdesigner_workbench.cpp:191
msgid "&File"
msgstr ""
-#: src/tools/qdbusviewer/qdbusviewermain.cpp:62
+#: src/tools/qdbusviewer/qdbusviewermain.cpp:74
#: src/tools/designer/qdesigner_actions.cpp:182
msgid "&Quit"
msgstr ""
-#: src/tools/qdbusviewer/qdbusviewermain.cpp:65
+#: src/tools/qdbusviewer/qdbusviewermain.cpp:77
#: src/tools/designer/qdesigner_workbench.cpp:208
msgid "&Help"
msgstr ""
-#: src/tools/qdbusviewer/qdbusviewermain.cpp:66
+#: src/tools/qdbusviewer/qdbusviewermain.cpp:78
msgid "&About"
msgstr ""
-#: src/tools/qdbusviewer/qdbusviewermain.cpp:70
+#: src/tools/qdbusviewer/qdbusviewermain.cpp:82
msgid "About &Katie"
msgstr ""
msgstr ""
#: src/tools/designer/qdesigner_workbench.cpp:687
-#, c-format
msgid ""
-"There are %n forms with unsaved changes. Do you want to review these changes "
+"There are %1 forms with unsaved changes. Do you want to review these changes "
"before quitting?"
msgstr ""
OSDN Git Service
