reword reverse sheet symbol
This commit is contained in:
parent
e1d56eec48
commit
fe4c65d0ae
5 changed files with 75 additions and 63 deletions
Binary file not shown.
|
@ -1234,7 +1234,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;
|
||||
|
@ -1250,7 +1250,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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -2258,26 +2258,6 @@ contain the dpi information, then the current camera dpi will be used.
|
|||
<source>None</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>All columns</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Only active columns</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Inbetween symbol mark</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Reverse sheet symbol mark</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Target column</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ExportXsheetPdfPopup</name>
|
||||
|
@ -2397,14 +2377,6 @@ contain the dpi information, then the current camera dpi will be used.
|
|||
<source>Continuous line:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Inbetween mark:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Reverse sheet mark:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Keyframe mark:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
|
@ -2474,6 +2446,14 @@ Do you want to create it?</source>
|
|||
<source>Failed to create folder %1.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Inbetween mark 1:</source>
|
||||
<translation>中割り記号 1:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Inbetween mark 2:</source>
|
||||
<translation>中割り記号 2:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ExpressionReferenceManager</name>
|
||||
|
@ -10138,6 +10118,10 @@ but a random crash might occur, use at your own risk:</source>
|
|||
<source>Edit Additional Style Sheet..</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Highlight Line Every Second</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PreferencesPopup::AdditionalStyleEdit</name>
|
||||
|
@ -13023,6 +13007,26 @@ Do you want to continue?</source>
|
|||
<source>Explicit</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>All columns</source>
|
||||
<translation>全ての列</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Only active columns</source>
|
||||
<translation>表示中の列のみ</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Cell Mark for Inbetween Symbol 1 (O)</source>
|
||||
<translation>中割り記号1 (○)に対応するコママーク</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Cell Mark for Inbetween Symbol 2 (*)</source>
|
||||
<translation>中割り記号2 (●)に対応するコママーク</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Target column</source>
|
||||
<translation>対象の列</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ReframePopup</name>
|
||||
|
@ -17196,12 +17200,12 @@ Please refer to the user guide for details.</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Inbetween symbol mark</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<source>Cell Mark for Inbetween Symbol 1 (O)</source>
|
||||
<translation>中割り記号1 (○)に対応するコママーク</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Reverse sheet symbol mark</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<source>Cell Mark for Inbetween Symbol 2 (*)</source>
|
||||
<translation>中割り記号2 (●)に対応するコママーク</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
|
Loading…
Reference in a new issue