From fe4c65d0aeae7003a4d2b1146b2510aa13d7deb8 Mon Sep 17 00:00:00 2001 From: shun-iwasawa Date: Fri, 15 Apr 2022 16:59:16 +0900 Subject: [PATCH] reword reverse sheet symbol --- stuff/config/loc/日本語/toonz.qm | Bin 223091 -> 223900 bytes toonz/sources/toonz/exportxsheetpdf.cpp | 36 +++++----- toonz/sources/toonz/xdtsimportpopup.cpp | 10 +-- toonz/sources/toonz/xdtsio.cpp | 24 ++++--- toonz/sources/translations/japanese/toonz.ts | 68 ++++++++++--------- 5 files changed, 75 insertions(+), 63 deletions(-) diff --git a/stuff/config/loc/日本語/toonz.qm b/stuff/config/loc/日本語/toonz.qm index 91c99292b7290c0d0e50e5af8b0bc4b9d20a8e53..497beefafd67659f391bc742c2d3571909b15941 100644 GIT binary patch delta 20460 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[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 delta 19846 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 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; @@ -1315,9 +1315,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; @@ -2079,13 +2079,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); @@ -2360,8 +2360,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(); @@ -2398,11 +2399,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)); @@ -2583,8 +2583,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; } @@ -2653,8 +2653,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 2d18545c..35d04124 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 98cdb4c9..2d1ae67f 100644 --- a/toonz/sources/toonz/xdtsio.cpp +++ b/toonz/sources/toonz/xdtsio.cpp @@ -109,7 +109,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 d76c092e..84f8de30 100644 --- a/toonz/sources/translations/japanese/toonz.ts +++ b/toonz/sources/translations/japanese/toonz.ts @@ -2258,26 +2258,6 @@ contain the dpi information, then the current camera dpi will be used. None - - All columns - - - - Only active columns - - - - Inbetween symbol mark - - - - Reverse sheet symbol mark - - - - Target column - - ExportXsheetPdfPopup @@ -2397,14 +2377,6 @@ contain the dpi information, then the current camera dpi will be used. Continuous line: - - Inbetween mark: - - - - Reverse sheet mark: - - Keyframe mark: @@ -2474,6 +2446,14 @@ Do you want to create it? Failed to create folder %1. + + Inbetween mark 1: + 中割り記号 1: + + + Inbetween mark 2: + 中割り記号 2: + ExpressionReferenceManager @@ -10138,6 +10118,10 @@ but a random crash might occur, use at your own risk: Edit Additional Style Sheet.. + + Highlight Line Every Second + + PreferencesPopup::AdditionalStyleEdit @@ -13023,6 +13007,26 @@ Do you want to continue? Explicit + + All columns + 全ての列 + + + Only active columns + 表示中の列のみ + + + Cell Mark for Inbetween Symbol 1 (O) + 中割り記号1 (○)に対応するコママーク + + + Cell Mark for Inbetween Symbol 2 (*) + 中割り記号2 (●)に対応するコママーク + + + Target column + 対象の列 + ReframePopup @@ -17196,12 +17200,12 @@ Please refer to the user guide for details. - Inbetween symbol mark - + Cell Mark for Inbetween Symbol 1 (O) + 中割り記号1 (○)に対応するコママーク - Reverse sheet symbol mark - + Cell Mark for Inbetween Symbol 2 (*) + 中割り記号2 (●)に対応するコママーク