From 11bfb1c959a083b04de00586ff2f27c0b28d5c7a Mon Sep 17 00:00:00 2001 From: Rodney Date: Apr 18 2022 04:17:16 +0000 Subject: Merge pull request #4398 from shun-iwasawa/reword_reverse_sheet_symbol Reword "Reverse sheet symbol" to "Inbetween symbol 2" --- diff --git "a/stuff/config/loc/\346\227\245\346\234\254\350\252\236/toonz.qm" "b/stuff/config/loc/\346\227\245\346\234\254\350\252\236/toonz.qm" index de270fe..bf6f8db 100644 Binary files "a/stuff/config/loc/\346\227\245\346\234\254\350\252\236/toonz.qm" and "b/stuff/config/loc/\346\227\245\346\234\254\350\252\236/toonz.qm" differ diff --git a/toonz/sources/toonz/exportxsheetpdf.cpp b/toonz/sources/toonz/exportxsheetpdf.cpp index 8f1e018..10ce82a 100644 --- a/toonz/sources/toonz/exportxsheetpdf.cpp +++ b/toonz/sources/toonz/exportxsheetpdf.cpp @@ -1229,7 +1229,7 @@ void XSheetPDFTemplate::drawDialogue(QPainter& painter, int framePage) { if (row < drawStart) { int partialBlockLength = rowTo - drawStart + 1; int partialTextCount = (int)std::round( - (double)(textCount * partialBlockLength) / (double)blockLength); + (double)(textCount * partialBlockLength) / (double)blockLength); text = text.mid(textCount - partialTextCount); textCount = partialTextCount; row = drawStart; @@ -1245,7 +1245,7 @@ void XSheetPDFTemplate::drawDialogue(QPainter& painter, int framePage) { if (rowTo > drawEnd) { int partialBlockLength = drawEnd - row + 1; int partialTextCount = (int)std::round( - (double)(textCount * partialBlockLength) / (double)blockLength); + (double)(textCount * partialBlockLength) / (double)blockLength); text = text.mid(0, partialTextCount); textCount = partialTextCount; rowTo = drawEnd; @@ -1310,9 +1310,9 @@ XSheetPDFTemplate::XSheetPDFTemplate( void XSheetPDFTemplate::setInfo(const XSheetPDFFormatInfo& info) { m_info = info; thinPen = QPen(info.lineColor, param(ThinLineWidth, mm2px(0.25)), - Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin); + Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin); thickPen = QPen(info.lineColor, param(ThickLineWidth, mm2px(0.5)), - Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin); + Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin); bodyOutlinePen = QPen(info.lineColor, param(BodyOutlineWidth, mm2px(0.5)), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin); blockBorderPen = (param(IsBlockBorderThick, 0) > 0) ? thickPen : thinPen; @@ -2074,13 +2074,13 @@ ExportXsheetPdfPopup::ExportXsheetPdfPopup() checksLay->setColumnStretch(2, 1); exportLay->addLayout(checksLay, 3, 0, 1, 3); - exportLay->addWidget(new QLabel(tr("Inbetween mark:"), this), 4, 0, + exportLay->addWidget(new QLabel(tr("Inbetween mark 1:"), this), 4, 0, Qt::AlignRight | Qt::AlignVCenter); exportLay->addWidget(m_tick1IdCombo, 4, 1); exportLay->addWidget(m_tick1MarkCombo, 4, 2, Qt::AlignLeft | Qt::AlignVCenter); - exportLay->addWidget(new QLabel(tr("Reverse sheet mark:"), this), 5, - 0, Qt::AlignRight | Qt::AlignVCenter); + exportLay->addWidget(new QLabel(tr("Inbetween mark 2:"), this), 5, 0, + Qt::AlignRight | Qt::AlignVCenter); exportLay->addWidget(m_tick2IdCombo, 5, 1); exportLay->addWidget(m_tick2MarkCombo, 5, 2, Qt::AlignLeft | Qt::AlignVCenter); @@ -2355,8 +2355,9 @@ void ExportXsheetPdfPopup::saveSettings() { ContinuousLineMode clMode = (ContinuousLineMode)(m_continuousLineCombo->currentData().toInt()); - XShPdfExportContinuousLineThres = - (clMode == Line_Always) ? 0 : (clMode == Line_None) ? -1 : 3; + XShPdfExportContinuousLineThres = (clMode == Line_Always) ? 0 + : (clMode == Line_None) ? -1 + : 3; XShPdfExportTick1Id = m_tick1IdCombo->currentData().toInt(); XShPdfExportTick2Id = m_tick2IdCombo->currentData().toInt(); @@ -2393,11 +2394,10 @@ void ExportXsheetPdfPopup::loadSettings() { m_logoTextEdit->setText(QString::fromStdString(XShPdfExportLogoText)); m_logoImgPathField->setPath(QString::fromStdString(XShPdfExportImgPath)); - ContinuousLineMode clMode = (XShPdfExportContinuousLineThres == 0) - ? Line_Always - : (XShPdfExportContinuousLineThres == -1) - ? Line_None - : Line_MoreThan3s; + ContinuousLineMode clMode = + (XShPdfExportContinuousLineThres == 0) ? Line_Always + : (XShPdfExportContinuousLineThres == -1) ? Line_None + : Line_MoreThan3s; m_continuousLineCombo->setCurrentIndex( m_continuousLineCombo->findData(clMode)); @@ -2578,8 +2578,8 @@ void ExportXsheetPdfPopup::onExport() { QString question = tr("The file %1 already exists.\nDo you want to overwrite it?") .arg(fp.getQString()); - int ret = - DVGui::MsgBox(question, QObject::tr("Overwrite"), QObject::tr("Cancel")); + int ret = DVGui::MsgBox(question, QObject::tr("Overwrite"), + QObject::tr("Cancel")); if (ret == 0 || ret == 2) { return; } @@ -2648,8 +2648,8 @@ void ExportXsheetPdfPopup::onExportPNG() { QString question = tr("The file %1 already exists.\nDo you want to overwrite it?") .arg(fp.getQString()); - int ret = - DVGui::MsgBox(question, QObject::tr("Overwrite"), QObject::tr("Cancel")); + int ret = DVGui::MsgBox(question, QObject::tr("Overwrite"), + QObject::tr("Cancel")); if (ret == 0 || ret == 2) { return; } diff --git a/toonz/sources/toonz/xdtsimportpopup.cpp b/toonz/sources/toonz/xdtsimportpopup.cpp index c426f8a..8af17cc 100644 --- a/toonz/sources/toonz/xdtsimportpopup.cpp +++ b/toonz/sources/toonz/xdtsimportpopup.cpp @@ -101,12 +101,14 @@ XDTSImportPopup::XDTSImportPopup(QStringList levelNames, ToonzScene* scene, markLay->setHorizontalSpacing(10); markLay->setVerticalSpacing(10); { - markLay->addWidget(new QLabel(tr("Inbetween symbol mark"), this), 0, 0, - Qt::AlignRight | Qt::AlignVCenter); + markLay->addWidget( + new QLabel(tr("Cell Mark for Inbetween Symbol 1 (O)"), this), 0, 0, + Qt::AlignRight | Qt::AlignVCenter); markLay->addWidget(m_tick1Combo, 0, 1); - markLay->addWidget(new QLabel(tr("Reverse sheet symbol mark"), this), 1, 0, - Qt::AlignRight | Qt::AlignVCenter); + markLay->addWidget( + new QLabel(tr("Cell Mark for Inbetween Symbol 2 (*)"), this), 1, 0, + Qt::AlignRight | Qt::AlignVCenter); markLay->addWidget(m_tick2Combo, 1, 1); } markLay->setColumnStretch(2, 1); diff --git a/toonz/sources/toonz/xdtsio.cpp b/toonz/sources/toonz/xdtsio.cpp index 21bdcca..8f57c4f 100644 --- a/toonz/sources/toonz/xdtsio.cpp +++ b/toonz/sources/toonz/xdtsio.cpp @@ -110,7 +110,9 @@ void XdtsFrameDataItem::read(const QJsonObject &json) { void XdtsFrameDataItem::write(QJsonObject &json) const { json["id"] = int(m_id); QJsonArray valuesArray; - foreach (const QString &value, m_values) { valuesArray.append(value); } + foreach (const QString &value, m_values) { + valuesArray.append(value); + } json["values"] = valuesArray; } @@ -351,7 +353,9 @@ void XdtsTimeTableHeaderItem::read(const QJsonObject &json) { void XdtsTimeTableHeaderItem::write(QJsonObject &json) const { json["fieldId"] = int(m_fieldId); QJsonArray namesArray; - foreach (const QString name, m_names) { namesArray.append(name); } + foreach (const QString name, m_names) { + namesArray.append(name); + } json["names"] = namesArray; } @@ -684,21 +688,23 @@ void ExportXDTSCommand::execute() { tick1Id->setCurrentIndex(tick1Id->findData(0)); tick2Id->setCurrentIndex(tick2Id->findData(1)); targetColumnCombo = new QComboBox(); - targetColumnCombo->addItem(tr("All columns"), true); - targetColumnCombo->addItem(tr("Only active columns"), false); + targetColumnCombo->addItem(QObject::tr("All columns"), true); + targetColumnCombo->addItem(QObject::tr("Only active columns"), false); targetColumnCombo->setCurrentIndex(targetColumnCombo->findData(true)); QGridLayout *customLay = new QGridLayout(); customLay->setMargin(0); customLay->setSpacing(10); { - customLay->addWidget(new QLabel(tr("Inbetween symbol mark")), 0, 0, - Qt::AlignRight | Qt::AlignVCenter); + customLay->addWidget( + new QLabel(QObject::tr("Cell Mark for Inbetween Symbol 1 (O)")), 0, 0, + Qt::AlignRight | Qt::AlignVCenter); customLay->addWidget(tick1Id, 0, 1); - customLay->addWidget(new QLabel(tr("Reverse sheet symbol mark")), 1, 0, - Qt::AlignRight | Qt::AlignVCenter); + customLay->addWidget( + new QLabel(QObject::tr("Cell Mark for Inbetween Symbol 2 (*)")), 1, 0, + Qt::AlignRight | Qt::AlignVCenter); customLay->addWidget(tick2Id, 1, 1); - customLay->addWidget(new QLabel(tr("Target column")), 2, 0, + customLay->addWidget(new QLabel(QObject::tr("Target column")), 2, 0, Qt::AlignRight | Qt::AlignVCenter); customLay->addWidget(targetColumnCombo, 2, 1); } diff --git a/toonz/sources/translations/japanese/toonz.ts b/toonz/sources/translations/japanese/toonz.ts index 6b268be..31d4ecd 100644 --- a/toonz/sources/translations/japanese/toonz.ts +++ b/toonz/sources/translations/japanese/toonz.ts @@ -2327,23 +2327,31 @@ contain the dpi information, then the current camera dpi will be used. All columns - 全ての列 + 全ての列 Only active columns - 表示中の列のみ + 表示中の列のみ Inbetween symbol mark - 中割り記号 + 中割り記号 Reverse sheet symbol mark - 逆シート記号 + 逆シート記号 Target column - 対象の列 + 対象の列 + + + Cell Mark for Inbetween Symbol 2 (*) + 中割り記号2 （●）に対応するコママーク + + + Cell Mark for Inbetween Symbol 1 (O) + 中割り記号1 （○）に対応するコママーク @@ -2536,11 +2544,11 @@ Do you want to create it? Inbetween mark: - 中割り記号： + 中割り記号： Reverse sheet mark: - 逆シート記号： + 逆シート記号： Keyframe mark: @@ -2550,6 +2558,14 @@ Do you want to create it? Col%1 列%1 + + Inbetween mark 1: + 中割り記号 1： + + + Inbetween mark 2: + 中割り記号 2： + ExpressionReferenceManager @@ -11936,6 +11952,26 @@ Do you wish to continue loading the last good save or stop and try to salvage th Apply Auto Lip Sync 自動リップシンクの適用 + + All columns + 全ての列 + + + Only active columns + 表示中の列のみ + + + Cell Mark for Inbetween Symbol 1 (O) + 中割り記号1 （○）に対応するコママーク + + + Cell Mark for Inbetween Symbol 2 (*) + 中割り記号2 （●）に対応するコママーク + + + Target column + 対象の列 + ReframePopup @@ -15614,11 +15650,19 @@ Please refer to the user guide for details. Inbetween symbol mark - 中割り記号 + 中割り記号 Reverse sheet symbol mark - 逆シート記号 + 逆シート記号 + + + Cell Mark for Inbetween Symbol 2 (*) + 中割り記号2 （●）に対応するコママーク + + + Cell Mark for Inbetween Symbol 1 (O) + 中割り記号1 （○）に対応するコママーク