diff --git a/sources/dialogs.cpp b/sources/dialogs.cpp index 561f9bc..68b6f12 100644 --- a/sources/dialogs.cpp +++ b/sources/dialogs.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -19,9 +20,12 @@ #include #include #include +#include #include #include #include +#include +#include namespace { void frame2SecKoma(int frame, int& sec, int& koma) { @@ -822,6 +826,106 @@ void PreferencesDialog::onSuffixEdited() { //----------------------------------------------------------------------------- +CspLinkChooserDialog::CspLinkChooserDialog(const QStringList& openPaths, + QWidget* parent) + : QDialog(parent) + , m_useOpenRadio(nullptr) + , m_openFilesCombo(nullptr) + , m_needsOverwriteConfirm(false) { + setWindowTitle(tr("Sync Clip Studio Paint Timesheet")); + + QVBoxLayout* layout = new QVBoxLayout(); + layout->addWidget(new QLabel( + tr("Choose how to sync the Clip Studio Paint export with XDTS Viewer."), + this)); + + QButtonGroup* group = new QButtonGroup(this); + + // Only offered when at least one window is already open. + // 既に開いているウィンドウが1つ以上ある場合のみ提示する。 + if (!openPaths.isEmpty()) { + m_useOpenRadio = + new QRadioButton(tr("Sync with an already-open file:"), this); + group->addButton(m_useOpenRadio); + layout->addWidget(m_useOpenRadio); + + m_openFilesCombo = new QComboBox(this); + for (const QString& path : openPaths) + m_openFilesCombo->addItem(QFileInfo(path).fileName(), path); + layout->addWidget(m_openFilesCombo); + + m_useOpenRadio->setChecked(true); + } + + // A single field covers both "sync with a different existing file" and + // "export as a new file": which one applies is decided in onAccept() from + // whether the entered path exists on disk, not from how it was entered. + // 「別の既存ファイルと同期」と「新規ファイルとしてエクスポート」を単一の + // フィールドにまとめる。どちらになるかはonAccept()で入力パスがディスク上 + // に実在するかどうかから判定し、入力方法では区別しない。 + m_useFileRadio = new QRadioButton( + tr("Sync with an existing file, or export as a new file:"), this); + group->addButton(m_useFileRadio); + layout->addWidget(m_useFileRadio); + { + QHBoxLayout* row = new QHBoxLayout(); + m_filePathField = new QLineEdit(this); + m_filePathField->setReadOnly(true); + QPushButton* browseBtn = new QPushButton("...", this); + row->addWidget(m_filePathField); + row->addWidget(browseBtn); + layout->addLayout(row); + connect(browseBtn, SIGNAL(clicked()), this, SLOT(onBrowseFile())); + } + + if (!m_useOpenRadio) m_useFileRadio->setChecked(true); + + QHBoxLayout* buttonRow = new QHBoxLayout(); + buttonRow->addStretch(); + QPushButton* okButton = new QPushButton(tr("OK"), this); + QPushButton* cancelButton = new QPushButton(tr("Cancel"), this); + buttonRow->addWidget(okButton); + buttonRow->addWidget(cancelButton); + layout->addLayout(buttonRow); + + connect(okButton, SIGNAL(clicked()), this, SLOT(onAccept())); + connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject())); + + setLayout(layout); +} + +void CspLinkChooserDialog::onBrowseFile() { + // DontConfirmOverwrite: our own confirmation in InstanceManager (which + // explains this will be overwritten with the CSP export) replaces the + // native one, rather than showing both back to back. + // DontConfirmOverwrite: + // ネイティブの上書き確認の代わりに、InstanceManager側の（CSP書き出しで + // 上書きされる旨を説明する）確認を表示するため、二重に確認しない。 + QString path = QFileDialog::getSaveFileName( + this, tr("Select or Enter XDTS File"), QString(), + tr("XDTS files (*.xdts)"), nullptr, QFileDialog::DontConfirmOverwrite); + if (path.isEmpty()) return; + if (!path.endsWith(".xdts")) path += ".xdts"; + m_filePathField->setText(path); + m_useFileRadio->setChecked(true); +} + +void CspLinkChooserDialog::onAccept() { + if (m_useOpenRadio && m_useOpenRadio->isChecked()) { + m_resultPath = m_openFilesCombo->currentData().toString(); + m_needsOverwriteConfirm = true; + } else if (m_useFileRadio->isChecked()) { + if (m_filePathField->text().isEmpty()) return; + m_resultPath = m_filePathField->text(); + m_needsOverwriteConfirm = QFileInfo(m_resultPath).exists(); + } else { + return; + } + accept(); +} + +//----------------------------------------------------------------------------- + AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent) { setFixedSize(500, 500); setWindowTitle(tr("About %1").arg(qApp->applicationName())); diff --git a/sources/dialogs.h b/sources/dialogs.h index bcd27ce..05af67b 100644 --- a/sources/dialogs.h +++ b/sources/dialogs.h @@ -1,9 +1,10 @@ -#pragma once +#pragma once #ifndef DIALOGS_H #define DIALOGS_H #include #include +#include class QComboBox; class QLineEdit; @@ -12,6 +13,7 @@ class QColorDialog; class QFontComboBox; class QCheckBox; class QGroupBox; +class QRadioButton; class SettingsDialog : public QDialog { Q_OBJECT @@ -98,6 +100,41 @@ protected slots: void onSuffixEdited(); }; +// Lets the user choose how to sync a Clip Studio Paint timesheet export +// (always written to the same fixed path) with a real XDTS file: reuse an +// already-open window, or sync/export to a file path they enter (an +// existing path is overwritten in place; a not-yet-existing path is +// exported as new — decided from disk state at OK time, not from how the +// path was entered). Used only by InstanceManager (the mothership process). +// Clip Studio Paintのタイムシート書き出し（常に同一の固定パスに書かれる）を +// 実体のあるXDTSファイルと同期する方法をユーザーに選ばせるダイアログ。 +// 既に開いているウィンドウの再利用、または入力したパスへの同期／新規 +// エクスポート（既存パスならその場で上書き、未存在のパスなら新規 +// エクスポート——OKクリック時のディスク上の状態で判定し、入力方法では +// 区別しない）から選ぶ。InstanceManager（母艦プロセス）専用。 +class CspLinkChooserDialog : public QDialog { + Q_OBJECT + + QRadioButton* m_useOpenRadio; + QComboBox* m_openFilesCombo; + QRadioButton* m_useFileRadio; + QLineEdit* m_filePathField; + + QString m_resultPath; + bool m_needsOverwriteConfirm; + +public: + CspLinkChooserDialog(const QStringList& openPaths, QWidget* parent = nullptr); + + // Valid only once exec() returns QDialog::Accepted. + QString resultPath() const { return m_resultPath; } + bool needsOverwriteConfirm() const { return m_needsOverwriteConfirm; } + +protected slots: + void onBrowseFile(); + void onAccept(); +}; + class AboutDialog : public QDialog { Q_OBJECT diff --git a/sources/instancemanager.cpp b/sources/instancemanager.cpp index 30e69c0..47cbe3f 100644 --- a/sources/instancemanager.cpp +++ b/sources/instancemanager.cpp @@ -1,5 +1,7 @@ #include "instancemanager.h" #include "pathutils.h" +#include "xdtsio.h" +#include "dialogs.h" #include #include @@ -8,9 +10,21 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include +#ifdef WIN32 +#include +#endif + namespace { // Fixed identifiers shared by every process of this app so they can find // each other. Kept in one place rather than as class statics to avoid @@ -66,7 +80,25 @@ InstanceManager::Role InstanceManager::bootstrap(const QStringList& args, QLocalSocket socket; socket.connectToServer(kServerName); if (socket.waitForConnected(1000)) { - sendFrame(&socket, Command::Open, requestedPath); + bool sent = sendFrame(&socket, Command::Open, requestedPath); + // This process exits right after returning (the Forwarded role skips + // a.exec() entirely in main.cpp), tearing down the pipe handle almost + // immediately after the write above. On Windows this occasionally + // races the mothership's asynchronous read of that same data: if the + // pipe's "closing" notification is dispatched before the "data + // arrived" one, the write can be silently lost even though it + // reached the OS-level buffer. A brief pause here gives the + // mothership's event loop time to actually read the frame before + // this process's handle goes away. + // ̃vZXreturnɏIiForwarded[main.cpp + // a.exec()̂Ă΂Ȃ߁j߁AwriteɂقڑɃpCv + // nh‚BWindowsł́A͑̔񓯊ǂݎƂꂪ + // Hɋ邱Ƃ: uؒfv̒ʒmuf[^v̒ʒm + // ɔzƁAOSx̃obt@ɂ͓͂Ă݂ + // ÂɎ邱ƂBňċzuƂŁÃvZX + // nhOɕ͂̃Cxg[vmɃt[ǂ + // 悤ɂB + if (sent) QThread::msleep(50); socket.disconnectFromServer(); m_role = Role::Forwarded; return m_role; @@ -124,10 +156,41 @@ void InstanceManager::startMothership(const QString& initialPath) { connect(m_server, &QLocalServer::newConnection, this, &InstanceManager::onNewConnection); m_role = Role::Mothership; + + // The mothership has no MyWindow of its own; its only ever-visible + // window is a transient CSP sync dialog. Qt's default + // quitOnLastWindowClosed=true would otherwise quit the whole process + // (killing the QLocalServer and orphaning every worker) the moment that + // dialog closes. This process's lifetime is instead driven explicitly by + // onServerSocketDisconnected() (quits once m_workers is empty). + // ͂MyWindowAB\ꂤ̂CSPp̈ꎞI + // _CAÔ݁BQt̊łquitOnLastWindowClosed=truê܂܂ƁA + // ̃_CAO‚uԂɃvZXŜIĂ܂ + // iQLocalServerAS[J[ǗjB̃vZX̎ + // onServerSocketDisconnected()im_workersɂȂIj + // Iɐ䂷B + qApp->setQuitOnLastWindowClosed(false); + // Treat our own launch argument the same way as a request coming from // another process (always spawns a worker, since nothing is registered // yet at this point). handleOpenRequest(initialPath); + + // If the initial request ended without spawning any worker (e.g. the user + // cancelled the CSP sync dialog above), this invisible process has nothing + // to manage and must not linger: setQuitOnLastWindowClosed(false) above + // also disabled the implicit quit that used to end it, and a lingering + // mothership would keep holding the shared-memory lock and the IPC pipe. + // quit() called before exec() is ignored, so post it to run as soon as + // exec() starts instead. + // ŏ̗v[J[1‚NɏIꍇi:CSP + // _CAO[U[LZꍇjA̕sŽvZXɂ + // ǗΏۂȂAcĂ͂ȂȂBsetQuitOnLastWindowClosed + // (false)ɂ]̈ÖُIĂAc͂͋L + // bNIPCpCv葱Ă܂Bexec()Oquit()͖ + // 邽߁Aexec()JnɎs悤ĂB + if (!m_spawnedAnyWorker && m_workers.isEmpty()) + QTimer::singleShot(0, qApp, &QCoreApplication::quit); } void InstanceManager::onNewConnection() { @@ -165,11 +228,48 @@ void InstanceManager::onServerSocketReadyRead() { // Registers one path this worker currently has open. A paired // genga/douga sheet sends both paths, so either one resolves to this // window. - m_workers.insert(PathUtils::canonicalizePath(path), socket); + QString registeredPath = PathUtils::canonicalizePath(path); + m_workers.insert(registeredPath, socket); + // Covers the case where this socket belongs to a worker just spawned + // for a CSP link (performCspSync() couldn't notify it directly since + // it wasn't registered yet at that point). + // performCspSync()CSPAĝ߂ɋN΂̃[J[́A + // _ł͖o^̂ߒڒʒmłȂB̃P[XŃJo[ + // B + if (!m_linkedDestPath.isEmpty() && registeredPath == m_linkedDestPath) { + m_linkedWorkerSocket = socket; + sendFrame(socket, Command::LinkStatusChanged, QStringLiteral("1")); + } } else if (cmd == Command::Open) { // A short-lived forwarder is relaying an open request; it will - // disconnect on its own right after this. - handleOpenRequest(path); + // disconnect on its own right after this. Defer the handling to the + // event loop instead of calling it here: handleOpenRequest() can show + // a modal CSP dialog, and that dialog's nested event loop delivers + // this very socket's disconnected() signal while this slot is still + // on the stack. onServerSocketDisconnected() then destroys `buffer` + // and deletes `socket`, so resuming the loop below after the dialog + // would touch freed memory and hang/crash the mothership (which then + // silently stops serving IPC while its pipe still accepts connects). + // Z̓]vZXI[vv𒆌pĂAMɎ + // ؒfĂBŒڏACxg[v֒x: + // handleOpenRequest()̓[_CSP_CAO\邱ƂA + // ̃_CAÕlXgCxg[vÃXbg̎s + // ܂ɂ̃\Pbgdisconnected()zĂ܂B + // onServerSocketDisconnected()`buffer`j`socket`폜 + // ߁A_CAOɉ̃[vĊJƉς݃ɐGA + // ͂nO^NbVipCv͐ڑ󂯕t܂܁A + // IPCւ̉قjB + const QString requestedPath = path; + QTimer::singleShot(0, this, [this, requestedPath]() { + handleOpenRequest(requestedPath); + }); + } else if (cmd == Command::Unlink) { + // Explicit CSP unlink request from a worker window's menu action. + if (m_linkedWorkerSocket == socket) { + m_linkedWorkerSocket = nullptr; + m_linkedDestPath.clear(); + sendFrame(socket, Command::LinkStatusChanged, QString()); + } } } } @@ -187,6 +287,15 @@ void InstanceManager::onServerSocketDisconnected() { it.next(); if (it.value() == socket) it.remove(); } + + // This window closing also breaks the CSP link if it was the linked one. + // ̃EBhE‚邱ƂŁAꂪCSPAg̕RÂ悾ꍇ + // RÂB + if (m_linkedWorkerSocket == socket) { + m_linkedWorkerSocket = nullptr; + m_linkedDestPath.clear(); + } + socket->deleteLater(); // All windows are closed: the mothership has no reason to keep running. @@ -194,6 +303,11 @@ void InstanceManager::onServerSocketDisconnected() { } void InstanceManager::handleOpenRequest(const QString& path) { + if (isCspExchangePath(path)) { + handleCspSyncRequest(path); + return; + } + QString canonical = PathUtils::canonicalizePath(path); if (!canonical.isEmpty() && m_workers.contains(canonical)) { // Already open in a worker window: ask it to reload and come forward @@ -205,6 +319,7 @@ void InstanceManager::handleOpenRequest(const QString& path) { } void InstanceManager::spawnWorker(const QString& path) { + m_spawnedAnyWorker = true; QStringList args; args << kWorkerFlag; if (!path.isEmpty()) args << path; @@ -239,13 +354,21 @@ void InstanceManager::notifyPathChanged(const QStringList& paths) { } } +void InstanceManager::requestUnlink() { + if (m_role != Role::Worker || !m_workerSocket) return; + sendFrame(m_workerSocket, Command::Unlink, QString()); +} + void InstanceManager::onWorkerSocketReadyRead() { m_workerRecvBuffer.append(m_workerSocket->readAll()); Command cmd; QString path; while (tryReadFrame(m_workerRecvBuffer, cmd, path)) { - if (cmd == Command::Reload) emit reloadAndActivateRequested(); + if (cmd == Command::Reload) + emit reloadAndActivateRequested(); + else if (cmd == Command::LinkStatusChanged) + emit cspLinkStatusChanged(!path.isEmpty()); } } @@ -269,8 +392,19 @@ bool InstanceManager::sendFrame(QLocalSocket* socket, Command cmd, frame.append(reinterpret_cast(&len), sizeof(len)); frame.append(payload); - socket->write(frame); - return socket->waitForBytesWritten(1000); + if (socket->write(frame) != frame.size()) return false; + + // write() for a small local-socket message often completes synchronously, + // leaving nothing buffered to flush. waitForBytesWritten() has nothing to + // wait for in that case and can return false immediately -- that must not + // be mistaken for a failure, which is why bytesToWrite() is checked first. + // write()̓[J\Pbg̏ȃbZ[WłΓIɊ + // 邱ƂȀꍇtbVׂf[^͎cĂȂB + // ԂłwaitForBytesWritten()ɂ͑҂‚ׂ̂Ȃfalse + // Ԃ邪A𑗐MsƌFĂ͂Ȃ߁A + // bytesToWrite()mFB + if (socket->bytesToWrite() == 0) return true; + return socket->waitForBytesWritten(1000) || socket->bytesToWrite() == 0; } bool InstanceManager::tryReadFrame(QByteArray& buffer, Command& cmd, @@ -290,3 +424,196 @@ bool InstanceManager::tryReadFrame(QByteArray& buffer, Command& cmd, path = QString::fromUtf8(payload.mid(1)); return true; } +//----------------------------------------------------------------------------- +// CLIP STUDIO PAINT integration +//----------------------------------------------------------------------------- + +namespace { +// Forces a just-shown top-level widget (e.g. a QMessageBox/QDialog) to the +// real foreground. The mothership has no window of its own and isn't the +// active process, so it hits the same Windows foreground-lock restriction +// worked around in MyWindow::reloadAndActivate() (mywindow.cpp): a Z-order +// change via the native HWND's topmost flag isn't subject to that +// restriction, unlike activateWindow()/SetForegroundWindow(). +// ̓vZXɂ̓EBhEȂAANeBuvZXłȂ߁A +// mywindow.cppreloadAndActivate()ƓWindowstHAOEhbN +// 󂯂BactivateWindow()/SetForegroundWindowƈقȂAlCeBu +// HWND̍őOʃtOɂZ̕ύX͂̐󂯂ȂB +void forceToForeground(QWidget* widget) { +#ifdef WIN32 + widget->show(); + HWND hwnd = reinterpret_cast(widget->winId()); + SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); + SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); +#endif +} + +// Reads src's raw bytes and writes them to dst as-is (no XDTS +// parse/re-serialize), overwriting dst if it already exists. +// src̐oCĝ܂dst֏ށiXDTS̉́EăVACY +// sȂjBdstɑ݂ꍇ͏㏑B +bool copyFileOverwrite(const QString& src, const QString& dst) { + QFile in(src); + if (!in.open(QIODevice::ReadOnly)) return false; + QByteArray data = in.readAll(); + in.close(); + + QFile out(dst); + if (!out.open(QIODevice::WriteOnly | QIODevice::Truncate)) return false; + out.write(data); + return true; +} +} // namespace + +// CSP always writes its export to this same fixed path (see +// "WindowsfW^^CV[gAg@.pdf"). Computed once via +// QDir::tempPath(), which matches the GetTempPath() API the document +// describes. +// CSP͏ɂ̌ŒpX֏oi"WindowsfW^^CV[gAg@.pdf" +// QƁjBhLgɋLڂGetTempPath() APIɑΉQDir::tempPath() +// xvZB +bool InstanceManager::isCspExchangePath(const QString& path) const { + static const QString kCspExchangePath = PathUtils::canonicalizePath( + QDir::tempPath() + "/ExchangeDigitalTimeSheet/animation.xdts"); + return !path.isEmpty() && + PathUtils::canonicalizePath(path) == kCspExchangePath; +} + +bool InstanceManager::getXdtsMetadata(const QString& path, int& layerCount, + int& duration) const { + XdtsData data; + if (!loadXdtsScene(&data, path)) return false; + if (data.isEmpty() || data.timeTable().isEmpty()) return false; + layerCount = data.timeTable().getCellHeader().getLayerNames().size(); + duration = data.timeTable().getDuration(); + return true; +} + +// One representative path per distinct open window (a paired genga/douga +// window contributes two entries to m_workers for the same socket). +// JĂEBhE1‚ɂ‚\pX1•Ԃi^yA +// EBhE͓\Pbgɑ΂m_workers2Gg‚߁jB +QStringList InstanceManager::currentlyOpenDestPaths() const { + QStringList result; + QSet seen; + for (auto it = m_workers.constBegin(); it != m_workers.constEnd(); ++it) { + if (seen.contains(it.value())) continue; + seen.insert(it.value()); + result << it.key(); + } + return result; +} + +void InstanceManager::handleCspSyncRequest(const QString& animationXdtsPath) { + int newLayerCount, newDuration; + if (!getXdtsMetadata(animationXdtsPath, newLayerCount, newDuration)) { + QMessageBox box(QMessageBox::Critical, tr("CSP Sync"), + tr("Failed to read the Clip Studio Paint export (%1).") + .arg(animationXdtsPath), + QMessageBox::Ok); + forceToForeground(&box); + box.exec(); + return; + } + + bool hasActiveLink = (m_linkedWorkerSocket != nullptr); + + if (hasActiveLink) { + int oldLayerCount, oldDuration; + bool ok = getXdtsMetadata(m_linkedDestPath, oldLayerCount, oldDuration); + // C[2ȏA܂duration6t[ȏقȂꍇ + // ʂCSPvWFNg̉”\Ƃ݂ȂAmFށB + bool differsSignificantly = !ok || + qAbs(newLayerCount - oldLayerCount) >= 2 || + qAbs(newDuration - oldDuration) >= 6; + + if (!differsSignificantly) { + // Quiet auto-update: content looks like the same clip, no dialog. + performCspSync(m_linkedDestPath, animationXdtsPath); + return; + } + + QMessageBox box(QMessageBox::Question, tr("CSP Sync"), + tr("The Clip Studio Paint export looks very different " + "from the currently linked file (%1). Continue " + "updating it, or choose a different file?") + .arg(QFileInfo(m_linkedDestPath).fileName())); + QPushButton* continueBtn = + box.addButton(tr("Continue"), QMessageBox::AcceptRole); + QPushButton* differentBtn = + box.addButton(tr("Choose Different File"), QMessageBox::ActionRole); + box.addButton(QMessageBox::Cancel); + forceToForeground(&box); + box.exec(); + + if (box.clickedButton() == continueBtn) { + performCspSync(m_linkedDestPath, animationXdtsPath); + return; + } + if (box.clickedButton() != differentBtn) return; // Cancel: do nothing + if (m_linkedWorkerSocket) { + sendFrame(m_linkedWorkerSocket, Command::LinkStatusChanged, QString()); + } + m_linkedWorkerSocket = nullptr; + m_linkedDestPath.clear(); + // Fall through to the picker below. + } + + CspLinkChooserDialog dlg(currentlyOpenDestPaths()); + forceToForeground(&dlg); + if (dlg.exec() != QDialog::Accepted) return; + + QString destPath = dlg.resultPath(); + if (destPath.isEmpty()) return; + + if (dlg.needsOverwriteConfirm()) { + QMessageBox confirm( + QMessageBox::Question, tr("CSP Sync"), + tr("This will overwrite %1 with the Clip Studio Paint export. " + "Continue?") + .arg(QFileInfo(destPath).fileName()), + QMessageBox::Yes | QMessageBox::No); + forceToForeground(&confirm); + if (confirm.exec() != QMessageBox::Yes) return; + } + + performCspSync(destPath, animationXdtsPath); +} + +void InstanceManager::performCspSync(QString destPath, + const QString& animationXdtsPath) { + if (!copyFileOverwrite(animationXdtsPath, destPath)) { + QMessageBox box(QMessageBox::Critical, tr("CSP Sync"), + tr("Failed to write %1.").arg(destPath), QMessageBox::Ok); + forceToForeground(&box); + box.exec(); + return; + } + + QLocalSocket* previousLinkedSocket = m_linkedWorkerSocket; + m_linkedDestPath = PathUtils::canonicalizePath(destPath); + QLocalSocket* targetSocket = m_workers.value(m_linkedDestPath, nullptr); + + // Tell the previously linked window (if it's a different one, and still + // open) that it's no longer linked. + // ȑORÂĂEBhEidestPathƈقȂA܂JĂꍇjցA + // RÂꂽƂʒmB + if (previousLinkedSocket && previousLinkedSocket != targetSocket) { + sendFrame(previousLinkedSocket, Command::LinkStatusChanged, QString()); + } + + if (targetSocket) { + m_linkedWorkerSocket = targetSocket; + sendFrame(targetSocket, Command::Reload, QString()); + sendFrame(targetSocket, Command::LinkStatusChanged, QStringLiteral("1")); + } else { + // The new worker isn't registered yet; the Command::Register handler + // in onServerSocketReadyRead() will notify it (and set + // m_linkedWorkerSocket) once it connects. + // V[J[͂܂o^̂߁AonServerSocketReadyRead() + // Command::RegisternhAڑɉ߂Ēʒm + // im_linkedWorkerSocketŐݒ肳jB + m_linkedWorkerSocket = nullptr; + spawnWorker(destPath); + } +} diff --git a/sources/instancemanager.h b/sources/instancemanager.h index c20a016..ed0e781 100644 --- a/sources/instancemanager.h +++ b/sources/instancemanager.h @@ -57,6 +57,14 @@ class InstanceManager : public QObject { // ĂяoB void notifyPathChanged(const QStringList& paths); + // Clears the CSP link if it currently points at this worker window. + // No-op unless this process's role is Worker. Non-destructive (only + // affects future CSP syncs), so callers need not confirm before calling. + // ̃[J[EBhECSPAg̕RÂłꍇA̕R + // BWorkerȊȌꍇ͉ȂBjIȑ + // iȌCSPɂ̂݉ejȂ̂ŁAĂяoO̊mF͕svB + void requestUnlink(); + signals: // Worker role only: emitted when the mothership asks this window to // reload its XDTS data and come to the foreground, because another @@ -66,6 +74,14 @@ class InstanceManager : public QObject { // wꂽۂɃVOiB void reloadAndActivateRequested(); + // Worker role only: emitted when the mothership reports that this + // window's CSP link status changed (established, moved to another + // window, or explicitly/implicitly unlinked). + // Workerł̂ݔ΂B̃EBhECSPAg̕RÂԂω + // iEEBhEւ̈ړÊꂩjƂ͂ + // ʒmꂽۂɃVOiB + void cspLinkStatusChanged(bool linked); + private slots: void onNewConnection(); // mothership: a new incoming connection void onServerSocketReadyRead(); // mothership: data from a worker/forwarder @@ -79,7 +95,9 @@ private slots: Register = 0, Open = 1, Reload = 2, - ClearRegistration = 3 + ClearRegistration = 3, + Unlink = 4, + LinkStatusChanged = 5 }; bool tryAcquireLock(); @@ -90,6 +108,26 @@ private slots: static bool tryReadFrame(QByteArray& buffer, Command& cmd, QString& path); void spawnWorker(const QString& path); + // CLIP STUDIO PAINT integration: CSP always writes its export to the + // same fixed path and launches XDTS Viewer with that path as argv[1]. + // This is treated as a request to sync a real XDTS file (m_linkedDestPath) + // rather than a request to open that fixed path directly. + // CLIP STUDIO PAINTAg: CSP͏ɓ̌ŒpX֏oÃpX + // XDTS ViewerNBŒpX̂JvƂĂł͂ȂA + // ̂̂XDTSt@Cim_linkedDestPathj𓯊vƂĈB + bool isCspExchangePath(const QString& path) const; + void handleCspSyncRequest(const QString& animationXdtsPath); + // destPath is taken by value (not const&): callers sometimes pass + // m_linkedDestPath itself, and this function reassigns m_linkedDestPath + // partway through, so a reference parameter would alias it. + // destPath͒lniconstQƂł͂Ȃj: Ăяom_linkedDestPath + // gnƂA{֐̓rm_linkedDestPathđ + // ߁AQƓnƃGCAVOĂ܂B + void performCspSync(QString destPath, const QString& animationXdtsPath); + bool getXdtsMetadata(const QString& path, int& layerCount, + int& duration) const; + QStringList currentlyOpenDestPaths() const; + Role m_role = Role::Standalone; QSharedMemory* m_lock = nullptr; QLocalServer* m_server = nullptr; @@ -103,6 +141,28 @@ private slots: // Worker-side receive buffer for messages pushed by the mothership. QByteArray m_workerRecvBuffer; + + // CLIP STUDIO PAINT integration: canonical path of the XDTS file + // currently linked to CSP's export, and the worker socket that owns it + // (nullptr if unlinked). m_linkedWorkerSocket is the authoritative + // "is there an active link" signal (a plain pointer check, kept in sync + // eagerly on link/unlink/disconnect) -- m_linkedDestPath is only for + // display and metadata comparison. + // CLIP STUDIO PAINTAg: CSP̏oɌݕRÂĂXDTSt@C + // KpXƁAL郏[J[̃\PbgiRÂȂnullptrjB + // uݕRÂv̔m_linkedWorkerSocket̒Pȃ|C^ + // ƂiRÂ^^ؒf̂тɑXVjAm_linkedDestPath + // \ƃ^f[^r̂߂ɎgB + QString m_linkedDestPath; + QLocalSocket* m_linkedWorkerSocket = nullptr; + + // Whether this mothership has ever spawned a worker process. Used only + // by startMothership() to detect the "initial request ended with nothing + // to manage" case (see the comment there). + // ͂̕[J[vZXxłNǂBstartMothership() + // Łuŏ̗vǗΏۂȂŏIvꍇ̌ô݂Ɏg + // iڍׂ͂̃RgQƁjB + bool m_spawnedAnyWorker = false; }; #endif diff --git a/sources/loc/XDTS_Viewer_ja.qm b/sources/loc/XDTS_Viewer_ja.qm index 8e16098..9dda1b6 100644 Binary files a/sources/loc/XDTS_Viewer_ja.qm and b/sources/loc/XDTS_Viewer_ja.qm differ diff --git a/sources/main.cpp b/sources/main.cpp index 67e76bd..3808b98 100644 --- a/sources/main.cpp +++ b/sources/main.cpp @@ -27,6 +27,19 @@ int main(int argc, char* argv[]) { a.setAttribute(Qt::AA_CompressHighFrequencyEvents); a.setAttribute(Qt::AA_CompressTabletEvents); + MyParams::instance()->initialize(); + + QTranslator tra; + QString lang = MyParams::instance()->language(); + if (lang != "en") { + QString qmFileName = QString("XDTS_Viewer_%1").arg(lang); + if (QDir(PathUtils::getTranslationFolderPath()) + .exists(qmFileName + ".qm")) { + tra.load(qmFileName, PathUtils::getTranslationFolderPath()); + a.installTranslator(&tra); + } + } + // Single-instance / multi-window coordination. Use QApplication::arguments() // (not raw argv) so non-ASCII paths survive on Windows. A Forwarded process // has already handed its request to the running mothership and must exit @@ -43,18 +56,6 @@ int main(int argc, char* argv[]) { if (role == InstanceManager::Role::Forwarded) return 0; if (role == InstanceManager::Role::Mothership) return a.exec(); - MyParams::instance()->initialize(); - - QTranslator tra; - QString lang = MyParams::instance()->language(); - if (lang != "en") { - QString qmFileName = QString("XDTS_Viewer_%1").arg(lang); - if (QDir(PathUtils::getTranslationFolderPath()) - .exists(qmFileName + ".qm")) { - tra.load(qmFileName, PathUtils::getTranslationFolderPath()); - a.installTranslator(&tra); - } - } MyParams::instance()->initStamps(); #ifndef __MACOS__ @@ -73,6 +74,9 @@ int main(int argc, char* argv[]) { QObject::connect(InstanceManager::instance(), &InstanceManager::reloadAndActivateRequested, &w, &MyWindow::reloadAndActivate); + QObject::connect(InstanceManager::instance(), + &InstanceManager::cspLinkStatusChanged, &w, + &MyWindow::onCspLinkStatusChanged); } QRect geometry = MyParams::instance()->loadWindowGeometry(); diff --git a/sources/myparams.cpp b/sources/myparams.cpp index a910503..392e2ca 100644 --- a/sources/myparams.cpp +++ b/sources/myparams.cpp @@ -842,9 +842,6 @@ void MyParams::setCurrentXdtsPath(const QString& path) { MyParams* p = MyParams::instance(); m_currentXdtsPaths.clear(); QString fileName = QFileInfo(path).fileName(); - std::cout << "fileName = " << fileName.toStdString() << std::endl; - std::cout << "p->suffix(Genga) = " << p->suffix(Genga).toStdString() - << std::endl; if (fileName.contains(p->suffix(Genga))) { m_currentXdtsPaths.insert(Area_Actions, path); fileName = fileName.replace(p->suffix(Genga), p->suffix(Douga), diff --git a/sources/mywindow.cpp b/sources/mywindow.cpp index efbb9c6..bf5c59e 100644 --- a/sources/mywindow.cpp +++ b/sources/mywindow.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -67,7 +68,10 @@ class MyToolButtonProxyStyle : public QProxyStyle { //----------------------------- MyWindow::MyWindow() - : m_data(nullptr), m_settingsDialog(nullptr), m_preferencesDialog(nullptr) { + : m_data(nullptr) + , m_settingsDialog(nullptr) + , m_preferencesDialog(nullptr) + , m_isCspLinked(false) { setAcceptDrops(true); m_previewPane = new XsheetPdfPreviewPane(this); @@ -341,6 +345,9 @@ MyWindow::MyWindow() QMenu* menu = new QMenu(this); QAction* prefAct = menu->addAction(tr("Preferences")); QAction* aboutAct = menu->addAction(tr("About")); + m_unlinkCspAct = menu->addAction(tr("Unlink from CSP")); + m_unlinkCspAct->setVisible( + false); // shown only while this window is CSP-linked QToolButton* menuBtn = qobject_cast(toolBar->widgetForAction(menuAct)); menuBtn->setMenu(menu); @@ -413,6 +420,7 @@ MyWindow::MyWindow() connect(settingsAct, SIGNAL(triggered()), m_settingsDialog, SLOT(show())); connect(prefAct, SIGNAL(triggered()), m_preferencesDialog, SLOT(show())); connect(aboutAct, SIGNAL(triggered()), this, SLOT(onAbout())); + connect(m_unlinkCspAct, SIGNAL(triggered()), this, SLOT(onUnlinkCsp())); connect(currentColorGroup, SIGNAL(triggered(QAction*)), this, SLOT(onCurrentColorActionTriggered(QAction*))); @@ -978,6 +986,7 @@ void MyWindow::updateTitleBar() { else str = QFileInfo(MyParams::instance()->currentXdtsPath()).fileName(); if (MyParams::instance()->somethingIsDirty()) str += " *"; + if (m_isCspLinked) str += tr(" [Linked with Clip Studio Paint]"); str += " - " + qApp->applicationName(); setWindowTitle(str); @@ -1246,7 +1255,22 @@ void MyWindow::reloadXdtsDataOnly() { QString path = MyParams::instance()->currentXdtsPath(areaId); + // A CSP sync notification can arrive an instant after the mothership + // process finishes writing this same file; on Windows, briefly + // reopening a just-written file can transiently fail (e.g. real-time + // antivirus scanning triggered by the write) even though the write + // itself is already complete. A short retry absorbs that window + // instead of surfacing a spurious error to the user. + // CSP̒ʒḿA̓vZXt@Cւ݂̏I + // ɓ͂ƂBWindowsł́Aݎ̂͊ĂĂA + // ̍ăI[vߐɎs邱Ƃi:݂_@ + // ECX΍̃A^CXLjB̗P\gC + // zA[U[ɋUz̃G[Ȃ悤ɂB bool ok = loadXdtsScene(m_data, path); + for (int retry = 0; !ok && retry < 5; ++retry) { + QThread::msleep(100); + ok = loadXdtsScene(m_data, path); + } if (!ok) { QMessageBox::critical(this, tr("Error"), tr("%1 is not a valid XDTS file.").arg(path)); @@ -1308,4 +1332,16 @@ void MyWindow::reloadAndActivate() { #endif raise(); activateWindow(); +} + +// Non-destructive: only affects future CSP syncs, so no confirmation is +// asked here (see InstanceManager::requestUnlink()). +// jIȑiȌCSPɂ̂݉eĵ߁Ał͊mF +// sȂiInstanceManager::requestUnlink()QƁjB +void MyWindow::onUnlinkCsp() { InstanceManager::instance()->requestUnlink(); } + +void MyWindow::onCspLinkStatusChanged(bool linked) { + m_isCspLinked = linked; + m_unlinkCspAct->setVisible(linked); + updateTitleBar(); } \ No newline at end of file diff --git a/sources/mywindow.h b/sources/mywindow.h index 404a76e..33020d5 100644 --- a/sources/mywindow.h +++ b/sources/mywindow.h @@ -43,6 +43,11 @@ class MyWindow : public QMainWindow { QAction* m_currentColorAction; + // CLIP STUDIO PAINT integration UI state. + // CLIP STUDIO PAINTAgpUIԁB + QAction* m_unlinkCspAct; + bool m_isCspLinked; + // Re-reads the XDTS timing data only, leaving hand-drawn overlays / undo // history / format settings untouched. Used by reloadAndActivate(). // `I[o[CEUndoEtH[}bgݒ͂̂܂܂ɁAXDTS @@ -65,6 +70,12 @@ class MyWindow : public QMainWindow { // f[^͕ێ܂܁jAEBhEOʉB void reloadAndActivate(); + // Updates the title bar / Unlink menu visibility to reflect the current + // CSP link status (InstanceManager::cspLinkStatusChanged()). + // ݂CSPAg̕RÂԂA^Cgo[Unlinkj[̕\ + // fiInstanceManager::cspLinkStatusChanged()jB + void onCspLinkStatusChanged(bool linked); + protected: void closeEvent(QCloseEvent* event) override; @@ -105,6 +116,12 @@ protected slots: void onDelete(); void onBacksideImgPathChanged(); void onAbout(); + + // Explicitly unlinks this window from a Clip Studio Paint sync, if it + // is currently the linked window (see InstanceManager::requestUnlink()). + // ̃EBhEClip Studio PaintAg̕RÂłꍇAI + // RÂiInstanceManager::requestUnlink()QƁjB + void onUnlinkCsp(); }; #endif \ No newline at end of file diff --git a/sources/pathutils.cpp b/sources/pathutils.cpp index 7519a85..974d9f4 100644 --- a/sources/pathutils.cpp +++ b/sources/pathutils.cpp @@ -37,16 +37,22 @@ QString getLicenseFolderPath() { return getResourceDirPath() + "/LICENSE"; } QString getTranslationFolderPath() { return getResourceDirPath() + "/loc"; } -// Falls back to a cleaned absolute path when the file doesn't exist yet, and -// folds case on Windows (NTFS is case-insensitive). -// t@C܂݂Ȃꍇ͐΃pXN[AbvlɃtH[obNA -// Windows ł͑啶𖳎iNTFS͑啶ʂȂ߁jB +// Always a pure string normalization (no OS round-trip via +// QFileInfo::canonicalFilePath()), so two processes calling this for the +// same path get identical results regardless of timing or whether the file +// exists yet in either process (this matters for InstanceManager, where the +// mothership and a worker process each canonicalize the same path +// independently). Folds case on Windows (NTFS is case-insensitive). +// QFileInfo::canonicalFilePath()ɂOSւ̖₢킹͍sȂAȕ +// K݂̂sBɂAʁX̃vZXpXɑ΂Ă̊֐ +// ĂłA^C~Ot@C̑ݗLɊւ炸̌ʂ +// iInstanceManagerŕ͂ƃ[J[pXꂼƗɐKۂ +// dvjBWindows ł͑啶𖳎iNTFS͑啶ʂ +// Ȃ߁jB QString canonicalizePath(const QString& path) { if (path.isEmpty()) return QString(); - QString canonical = QFileInfo(path).canonicalFilePath(); - if (canonical.isEmpty()) - canonical = QDir::cleanPath(QFileInfo(path).absoluteFilePath()); + QString canonical = QDir::cleanPath(QFileInfo(path).absoluteFilePath()); #ifndef __MACOS__ canonical = canonical.toLower(); diff --git a/sources/translations/XDTS_Viewer_ja.ts b/sources/translations/XDTS_Viewer_ja.ts index 1ec2273..23b5dbe 100644 --- a/sources/translations/XDTS_Viewer_ja.ts +++ b/sources/translations/XDTS_Viewer_ja.ts @@ -4,31 +4,31 @@ AETool - + The following frames were not copied because they contain non-numeric strings. - %1 以下のフレームには数値以外の文字列が含まれていたため、コピーされませんでした。 - %1 - + There is a cell with the same number as the one reserved for empty frames. 空コマのために予約されている番号と同じ番号が入ったコマがあります。 - - - + + + Copy After Effects Keyframe Data To Clipboard AEタイムリマップデータをクリップボードにコピー - + This tool requires XDTS to be displayed in the Cell area. このツールを使用するためには、セル（動画）欄にXDTSを表示する必要があります。 - + There are mix-up columns in the Cell area. Please turn off the "Mix-up Columns" checkbox in the Settings in order to use this tool. セル（動画）欄にテレコ列があります。 @@ -38,21 +38,105 @@ Please turn off the "Mix-up Columns" checkbox in the Settings in order AboutDialog - + About %1 %1 について - + Built %1 ビルドした日 %1 - + Licenses ライセンス表示 + + CspLinkChooserDialog + + + Sync Clip Studio Paint Timesheet + Clip Studio Paintのタイムシート情報の読み込みと同期 + + + + Choose how to sync the Clip Studio Paint export with XDTS Viewer. + Clip Studio Paintから出力されたタイムシート情報を、どのファイルに適用するか選択してください。 + + + + Sync with an already-open file: + 既に開いているファイルに上書きして適用する： + + + + Sync with an existing file, or export as a new file: + 既存のファイルを選択して適用するか、新規XDTSファイルとしてエクスポートする： + + + + OK + OK + + + + Cancel + キャンセル + + + + Select or Enter XDTS File + XDTSファイルを選択するか、ファイル名を入力してください + + + + XDTS files (*.xdts) + XDTSファイル (*.xdts) + + + + InstanceManager + + + + + + CSP Sync + CSPとの同期 + + + + Failed to read the Clip Studio Paint export (%1). + Clip Studio Paintから出力されたXDTSファイルを読み込めませんでした（%1）。 + + + + The Clip Studio Paint export looks very different from the currently linked file (%1). Continue updating it, or choose a different file? + Clip Studio Paintから出力されたタイムシート情報が、現在リンクしているファイル（%1）と大きく異なっています。同期して更新を続けますか、それともリンクするファイルを変更しますか？ + + + + Continue + 同期を継続する + + + + Choose Different File + 別のファイルでリンクを再設定する + + + + This will overwrite %1 with the Clip Studio Paint export. Continue? + Clip Studio Paintから出力されたXDTSデータで、%1を上書きします。続けますか？ + + + + Failed to write %1. + %1の書き込みに失敗しました。 + + MixupKeyDialog @@ -114,51 +198,51 @@ Please turn off the "Mix-up Columns" checkbox in the Settings in order MyParams - + Circle 丸 - + Triangle 三角 - + Approve 承認印 - + Save Empty XDTS File 空のXDTSファイルを保存する - + XDTS Files (*.xdts) XDTSファイル (*.xdts) - + The file %1 already exists. ファイル%1は既に存在します。 - + The folder %1 already exists. フォルダ%1は既に存在します。 - + Do you want to overwrite it? 上書きしてよろしいですか？ - + Question 質問 @@ -166,262 +250,274 @@ Please turn off the "Mix-up Columns" checkbox in the Settings in order MyWindow - + < Prev < 前ページ - + Next > 次ページ > - + Load (Ctrl+O) 開く (Ctrl+O) - + Save (Ctrl+S) 保存 (Ctrl+S) - - + + Export Image (Ctrl+E) シート画像を書き出し (Ctrl+E) - + Undo (Ctrl+Z) 元に戻す (Ctrl+Z) - + Redo (Ctrl+Y) やり直す (Ctrl+Y) - + Zoom In (Ctrl+Plus) ズームイン (Ctrl+Plus) - + Zoom Out (Ctrl+Minus) ズームアウト (Ctrl+Minus) - + Current Color 描画色 - + Brush (B) ペン (B) - + Large 大サイズ - + Small 小サイズ - + Eraser (E) 消しゴム (E) - + Selection (M) 選択 （M） - + Rectangle 四角形 - + Freehand なげなわ - + Line (U) 線 （U） - + Thin Line 細い線 - + Thick Line 太い線 - + Thin Arrow 細い矢印 - + Thick Arrow 太い矢印 - + Double Line 二重線 - + Dotted Line 点線 - + Stamp (S) スタンプ （S） - + Dye Numbers (D) 動画番号を着色 （D） - + Copy After Effects Keyframe Data To Clipboard AEタイムリマップデータをクリップボードにコピー - + Settings タイムシート設定 - + Menu メニュー - + Preferences 環境設定 - + About XDTS Viewerについて - + + Unlink from CSP + CSPとのリンクを解除 + + + Cut 切り取り - + Copy コピー - + Paste 貼り付け - + Delete 消去 - + Previous Page 前ページ - + Next Page 次ページ - - + + + Error エラー - + The preset file %1 is not valid. プリセットファイル %1 を正しく読み込めません。 - + Undo 元に戻す - + No more Undo operations available. これ以上元に戻す操作がありません。 - + Redo やり直す - + No more Redo operations available. これ以上やり直す操作がありません。 - + Open XDTS File XDTSファイルを開く - + XDTS files (*.xdts) XDTSファイル (*.xdts) - + + %1 is not a valid XDTS file. %1 は正しくXDTSファイルとして読み込めません。 - + Untitled 名称未設定 - + + [Linked with Clip Studio Paint] + [Clip Studio Paint とリンク中] + + + PNG (*.png);;PSD files (*.psd) PNG (*.png);;Photoshop (*.psd) - - - + + + Export Images シート画像を書き出し - + PNG (*.png) PNG (*.png) - + Following file(s) are already exist. Do you want to overwrite them? 以下のファイルはすでに存在します。上書きしてよろしいですか？ @@ -434,31 +530,31 @@ Do you want to overwrite them? - + OK OK - + Open containing folder フォルダを開く - + Xsheet images are exported properly. シート画像の書き出しが完了しました。 - - + + Question 質問 - + The document has been modified. Do you want to save your changes? ドキュメントは変更されました。保存しますか？ @@ -467,143 +563,143 @@ Do you want to save your changes? PreferencesDialog - + Preferences 環境設定 - + Put Serial Frame Numbers Over Pages 秒数、フレーム番号を通しで表示する - + Print Level Names On The Bottom レベル名をページ下部にも出力する - + Capitalize the first letter of level name (ACTIONS area only) セル名の1文字目を大文字にする（原画欄のみ） - + Empty Frame for AE Keyframe Data: AEタイムリマップの 空コマ用のフレーム： - + OK OK - + Always 常に描く - + More Than 3 Continuous Cells 4コマ以上連続したコマに描く - + None 常に描かない - + When using "Copy After Effects Keyframe Data To Clipboard" tool, this value will be the frame number for empty cells. 「AEタイムリマップデータをクリップボードにコピー」ツールを使うとき、 この値が空コマのフレーム番号として使用されます。 - + Language: 言語： - + Line Color: 線の色： - + Continuous Line: 連続コマの線： - + Minimum Frame Length for "REPEAT" symbol: 「リピート」表示の 最小繰り返し長さ： - + User Stamps Folder: ユーザースタンプフォルダ： - + Approval Stamp Name: 承認印の名前： - + File Suffixes ファイル接尾辞 - + LO: LO： - + RoughGen: ラフ原： - + Genga: 原画： - + Douga: 動画： - + Language has been changed. 言語が変更されました。 - + Changes will take effect the next time you run XDTS Viewer. 変更は次回のXDTSViewer起動時に適用されます。 - + Specify User Stamp Folder ユーザースタンプフォルダを指定して下さい - + Stamp Folder Has Specified. スタンプフォルダが指定されました。 - - + + The Change Will Be Applied When You Launch the Application Next Time. 変更は次回アプリケーション起動時に適用されます。 - + Approval Stamp Name Has Specified. 承認印の名前が設定されました。 @@ -659,50 +755,50 @@ for "REPEAT" symbol: セル - + CAMERA XSheetPDF カメラ - + HOLD 止メ - + REPEAT リピ|ト - + (Start OL %1+%2) （前O.L. %1秒+%2コマ） - + (End OL %1+%2) （後O.L. %1秒+%2コマ） - + Warning 警告 - + The saved mix-up columns keyframes does not match the currently displayed columns, so the mix-up columns keyframes were automatically adjusted. You may need to verify whether the adjustment was performed correctly. 保存されているテレコ列キーフレームが現在表示されている列と一致しないため、テレコキーフレームが自動的に調整されました。 調整が正しく行われたかどうか、確認が必要かもしれません。 - + %1-%2 %1～%2 - + Skipped Frames: 動画欠番 @@ -714,37 +810,37 @@ The keyframe will be cleared. キーフレームはクリアされます。 - + EPISODE XSheetPDF 第　　話 - + SEQ. XSheetPDF シーン - + SCENE XSheetPDF カット - + TIME XSheetPDF タイム - + NAME XSheetPDF 原画 - + SHEET XSheetPDF シート @@ -753,17 +849,17 @@ The keyframe will be cleared. SelectionTool - + Fill Selection 選択範囲を塗りつぶす - + Remove Matte Color 地色の消去 - + Choose Matte Color 地色を選択してください @@ -771,7 +867,7 @@ The keyframe will be cleared. SettingsDialog - + Adaptively Expand Columns セル数に合わせて列を増やす @@ -780,7 +876,7 @@ The keyframe will be cleared. テレコ表示 - + Attach Composite Voucher シート裏面に合成伝票を表示する @@ -789,82 +885,82 @@ The keyframe will be cleared. 紙原画シートを使用 （原画欄の罫線を隠す） - + OK OK - + ACTIONS アクション - + CELLS セル - + Settings タイムシート設定 - + Edit Mix-up Keys キーフレームの編集 - + Show Skipped Drawings Information 動画欠番情報を表示する - + Scanned Genga Sheet Mode ( Hide Genga && Camera Area Lines ) 紙原画シートを使用 （原画欄とカメラ欄の罫線を隠す） - + Manually Specify Mix-up Keys テレコ列キーフレームを手動で指定する - + Automatically Detect from Data XDTSデータからテレコ列を自動で判別する - + Template: テンプレート： - + Mix-up Columns: テレコ表示： - + Logo Image: ロゴ画像： - + Backside Image: シート裏面の画像： - + Output area: 出力エリア： - + Skipped Levels: 表示しないセル名： - + Genga Levels Count: 原画セル数： @@ -873,64 +969,64 @@ The keyframe will be cleared. 動画列のオフセット： - + Page Amount: ページ数： - + Camera Column Addition: カメラ列の追加： - + Overlap At the Start: カット頭 O.L.： - - + + sec + 秒 + - - + + k コマ - + Overlap At the End: カット尻 O.L.： - - - + + + Warning 警告 - + No columns found! 表示される列がありません！ - - + + Overlap length cannot be longer than XDTS duration. O.L.の尺はXDTSのフレーム長より長くすることはできません。 - - + + Images 画像ファイル - - + + Specify logo image file ロゴ画像のファイルを指定して下さい @@ -938,7 +1034,7 @@ The keyframe will be cleared. XsheetPdfPreviewArea - + Fit To Window ウィンドウにフィット diff --git a/sources/translations/XDTS_Viewer_zh_CN.ts b/sources/translations/XDTS_Viewer_zh_CN.ts index 6fbaca0..8b51a82 100644 --- a/sources/translations/XDTS_Viewer_zh_CN.ts +++ b/sources/translations/XDTS_Viewer_zh_CN.ts @@ -4,31 +4,31 @@ AETool - + The following frames were not copied because they contain non-numeric strings. - %1 由于包含非数字的字符，以下帧未能复制 - %1 - + There is a cell with the same number as the one reserved for empty frames. 存在一个或多个帧格的编号与为空白帧预留的编号相同。 - - - + + + Copy After Effects Keyframe Data To Clipboard 复制AE关键帧数据到剪贴板 - + This tool requires XDTS to be displayed in the Cell area. 使用该工具需要加载动画的xdts。 - + There are mix-up columns in the Cell area. Please turn off the "Mix-up Columns" checkbox in the Settings in order to use this tool. 在动画栏中有混合列。 @@ -38,21 +38,105 @@ Please turn off the "Mix-up Columns" checkbox in the Settings in order AboutDialog - + About %1 关于 %1 - + Built %1 构建于 %1 - + Licenses 许可证 + + CspLinkChooserDialog + + + Sync Clip Studio Paint Timesheet + + + + + Choose how to sync the Clip Studio Paint export with XDTS Viewer. + + + + + Sync with an already-open file: + + + + + Sync with an existing file, or export as a new file: + + + + + OK + 确认 + + + + Cancel + + + + + Select or Enter XDTS File + + + + + XDTS files (*.xdts) + XDTS 文件 (*.xdts) + + + + InstanceManager + + + + + + CSP Sync + + + + + Failed to read the Clip Studio Paint export (%1). + + + + + The Clip Studio Paint export looks very different from the currently linked file (%1). Continue updating it, or choose a different file? + + + + + Continue + + + + + Choose Different File + + + + + This will overwrite %1 with the Clip Studio Paint export. Continue? + + + + + Failed to write %1. + + + MixupKeyDialog @@ -114,51 +198,51 @@ Please turn off the "Mix-up Columns" checkbox in the Settings in order MyParams - + Circle 圆 - + Triangle 三角形 - + Approve 确认 - + Save Empty XDTS File 保存空的xdts文件 - + XDTS Files (*.xdts) XDTS 文件 (*.xdts) - + The file %1 already exists. 文件%1已经存在。 - + The folder %1 already exists. 文件夹%1已经存在。 - + Do you want to overwrite it? 确定要覆盖它吗？ - + Question 问题 @@ -173,293 +257,305 @@ Do you want to overwrite them? - - + + Question 问题 - + OK 确认 - + Open containing folder 打开文件夹 - - - + + + Export Images 导出图像 - + Xsheet images are exported properly. 摄影表图片已导出。 - + < Prev < 上一页 - + Next > 下一页 > - + Load (Ctrl+O) 加载（Ctrl+O） - + Save (Ctrl+S) 保存（Ctrl+S） - - + + Export Image (Ctrl+E) 导出图像（Ctrl+E） - + Undo (Ctrl+Z) 撤销（Ctrl+Z） - + Redo (Ctrl+Y) 重做（Ctrl+Y) - + Zoom In (Ctrl+Plus) 缩小（Ctrl+加号） - + Zoom Out (Ctrl+Minus) 放大（Ctrl+减号） - + Current Color 当前颜色 - + Brush (B) 画笔 - + Large 大 - + Small 小 - + Eraser (E) 橡皮 - + Selection (M) 选择工具（M） - + Rectangle 长方形 - + Freehand 手形 - + Thin Line 细线 - + Thick Line 粗线 - + Thin Arrow 细箭头 - + Thick Arrow 粗箭头 - + Double Line 双线 - + Dotted Line 虚线 - + Line (U) 线（U） - + Stamp (S) 印章（S） - + Dye Numbers (D) 编号染色（D） - + Copy After Effects Keyframe Data To Clipboard 复制AE关键帧数据到剪贴板 - + Settings 设置 - + Menu 菜单 - + Preferences 首选项 - + About 关于 - + + Unlink from CSP + + + + Cut 剪切 - + Copy 复制 - + Paste 粘贴 - + Delete 删除 - + Previous Page 上一页 - + Next Page 下一页 - - + + + Error 错误 - + The preset file %1 is not valid. %1是无效的预设文件。 - + Undo 撤销 - + No more Undo operations available. 没有可用的撤销操作。 - + Redo 重做 - + No more Redo operations available. 没有可用的重做操作。 - + Open XDTS File 打开xdts文件 - + XDTS files (*.xdts) XDTS 文件 (*.xdts) - + + %1 is not a valid XDTS file. %1是无效的xdts文件。 - + Untitled 未命名 - + + [Linked with Clip Studio Paint] + + + + The document has been modified. Do you want to save your changes? 文件已经被修改。 需要保存吗？ - + PNG (*.png);;PSD files (*.psd) PNG (*.png);;PSD 文件 (*.psd) - + PNG (*.png) PNG（*.png） - + Following file(s) are already exist. Do you want to overwrite them? 以下文件已经存在。是否覆盖？ @@ -467,141 +563,141 @@ Do you want to save your changes? PreferencesDialog - + Preferences 首选项 - + Put Serial Frame Numbers Over Pages 跨页显示帧序号 - + Print Level Names On The Bottom 在底部显示列名 - + Capitalize the first letter of level name (ACTIONS area only) 层级首字母自动大写（仅限原画） - + Empty Frame for AE Keyframe Data: 复制AE关键帧时空帧默认值： - + OK 确认 - + Always 总是 - + More Than 3 Continuous Cells 超过3个重复帧 - + None 无 - + When using "Copy After Effects Keyframe Data To Clipboard" tool, this value will be the frame number for empty cells. 当“复制AE关键帧数据到剪贴板”时， 该值为空帧的默认值。 - + Language: 语言： - + Line Color: 框线颜色： - + Continuous Line: 连续线： - + Minimum Frame Length for "REPEAT" symbol: 重复（REPEAT）符号的最小帧长度： - + User Stamps Folder: 用户印章文件夹: - + Approval Stamp Name: 印章名： - + File Suffixes 文件后缀 - + LO: LO（设计稿）： - + RoughGen: 草稿原画： - + Genga: 原画： - + Douga: 动画： - + Language has been changed. 语言已变更。 - + Changes will take effect the next time you run XDTS Viewer. 更改将在下次启动生效。 - + Specify User Stamp Folder 指定用户印章文件夹 - + Stamp Folder Has Specified. 印章文件夹已指定。 - - + + The Change Will Be Applied When You Launch the Application Next Time. 更改将在下次启动生效。 - + Approval Stamp Name Has Specified. 印章名已指定。 @@ -657,85 +753,85 @@ for "REPEAT" symbol: 动画 - + CAMERA XSheetPDF 相机 - + REPEAT 重复 - + HOLD - + (Start OL %1+%2) （开始OL（交叠） %1+%2) - + (End OL %1+%2) （结束OL（交叠） %1+%2） - + Warning 警告 - + The saved mix-up columns keyframes does not match the currently displayed columns, so the mix-up columns keyframes were automatically adjusted. You may need to verify whether the adjustment was performed correctly. 已保存的列混合关键帧与当前显示的列不匹配，已自动调整关键帧。 请确认调整是否正确。 - + %1-%2 - + Skipped Frames: 已跳过的帧： - + EPISODE XSheetPDF 集数 - + SEQ. XSheetPDF 镜头号 - + SCENE XSheetPDF 镜头 - + TIME XSheetPDF 时间 - + NAME XSheetPDF 名称 - + SHEET XSheetPDF 页数 @@ -744,17 +840,17 @@ You may need to verify whether the adjustment was performed correctly. SelectionTool - + Fill Selection 填充已选择区域 - + Remove Matte Color 移除哑光色 - + Choose Matte Color 选择哑光色 @@ -762,154 +858,154 @@ You may need to verify whether the adjustment was performed correctly. SettingsDialog - + Settings 设置 - + Adaptively Expand Columns 自动扩展列数 - + Edit Mix-up Keys 编辑列混合关键帧 - + Attach Composite Voucher 附加合成传票 - + Show Skipped Drawings Information 显示被跳过的绘图(原画/动画)的信息 - + Scanned Genga Sheet Mode ( Hide Genga && Camera Area Lines ) 扫描原画表模式（隐藏原画与相机列的框线） - + OK 确认 - + ACTIONS 原画 - + CELLS 动画 - + Manually Specify Mix-up Keys 手动指定列混合关键帧 - + Automatically Detect from Data 从数据中自动识别 - + Template: 模版： - + Mix-up Columns: 列混合： - + Logo Image: Logo图像： - + Backside Image: 背面图像: - + Output area: 帧格加载区域： - + Skipped Levels: 忽略层级： - + Genga Levels Count: 原画层级总数： - + Page Amount: 页数： - + Camera Column Addition: 增加相机列宽度： - + Overlap At the Start: 开头的交叠效果持续时间： - - + + sec + 秒 + - - + + k 帧 - + Overlap At the End: 结尾的交叠效果持续时间： - - - + + + Warning 警告 - + No columns found! 未找到任何列！ - - + + Overlap length cannot be longer than XDTS duration. 交叠效果时长不能超过xdts的总时长 - - + + Images 图像文件 - - + + Specify logo image file 指定Logo图像文件 @@ -917,7 +1013,7 @@ You may need to verify whether the adjustment was performed correctly. XsheetPdfPreviewArea - + Fit To Window 适应窗口 diff --git a/xdts_viewer_resources/loc/XDTS_Viewer_ja.qm b/xdts_viewer_resources/loc/XDTS_Viewer_ja.qm index 365e2e5..9dda1b6 100644 Binary files a/xdts_viewer_resources/loc/XDTS_Viewer_ja.qm and b/xdts_viewer_resources/loc/XDTS_Viewer_ja.qm differ