X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiClipboard.cpp;h=ec6b916e4506c46e86be8620a63b8c1b98defd0f;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=fb62a3b0ce981f860dc54290440c97c7f3a16bed;hpb=88293cbcfb546a8aa5484f2c62a8b9b3ce3b4317;p=lyx.git diff --git a/src/frontends/qt4/GuiClipboard.cpp b/src/frontends/qt4/GuiClipboard.cpp index fb62a3b0ce..ec6b916e45 100644 --- a/src/frontends/qt4/GuiClipboard.cpp +++ b/src/frontends/qt4/GuiClipboard.cpp @@ -17,113 +17,49 @@ #include "GuiClipboard.h" #include "qt_helpers.h" -#include "frontends/alert.h" - #include "Buffer.h" #include "BufferView.h" #include "Cursor.h" +#include "support/lassert.h" #include "support/convert.h" #include "support/debug.h" #include "support/filetools.h" -#include "support/FileFilterList.h" #include "support/gettext.h" #include "support/lstrings.h" +#ifdef Q_WS_MACX +#include "support/linkback/LinkBackProxy.h" +#endif // Q_WS_MACX + +#include "frontends/alert.h" + #include #include #include #include #include #include -#include #include #include #include -#include "boost/assert.hpp" - +#include #include -#ifdef Q_WS_MACX -#include "support/linkback/LinkBackProxy.h" -#endif // Q_WS_MACX - using namespace std; using namespace lyx::support; -static char const * const lyx_mime_type = "application/x-lyx"; -static char const * const pdf_mime_type = "application/pdf"; namespace lyx { namespace frontend { -#ifdef Q_WS_MACX -class QMacPasteboardMimeGraphics : public QMacPasteboardMime { -public: - QMacPasteboardMimeGraphics() - : QMacPasteboardMime(MIME_QT_CONVERTOR|MIME_ALL) - {} - ~QMacPasteboardMimeGraphics() {} - QString convertorName(); - QString flavorFor(const QString & mime); - QString mimeFor(QString flav); - bool canConvert(const QString & mime, QString flav); - QVariant convertToMime(const QString & mime, QList data, QString flav); - QList convertFromMime(const QString &mime, QVariant data, QString flav); -}; - - -QString QMacPasteboardMimeGraphics::convertorName() -{ - return "Graphics"; -} - - -QString QMacPasteboardMimeGraphics::flavorFor(const QString & mime) -{ - LYXERR(Debug::ACTION, "flavorFor " << fromqstr(mime)); - if (mime == QLatin1String(pdf_mime_type)) - return QLatin1String("com.adobe.pdf"); - return QString(); -} - - -QString QMacPasteboardMimeGraphics::mimeFor(QString flav) -{ - LYXERR(Debug::ACTION, "mimeFor " << fromqstr(flav)); - if (flav == QLatin1String("com.adobe.pdf")) - return QLatin1String(pdf_mime_type); - return QString(); -} - - -bool QMacPasteboardMimeGraphics::canConvert(const QString & mime, QString flav) -{ - return mimeFor(flav) == mime; -} - - -QVariant QMacPasteboardMimeGraphics::convertToMime(const QString & mime, QList data, QString) -{ - if(data.count() > 1) - qWarning("QMacPasteboardMimeGraphics: Cannot handle multiple member data"); - return data.first(); -} - - -QList QMacPasteboardMimeGraphics::convertFromMime(const QString &mime, QVariant data, QString) -{ - QList ret; - ret.append(data.toByteArray()); - return ret; -} - -static QMacPasteboardMimeGraphics * graphicsPasteboardMime; - -#endif // Q_WS_MACX +QString const lyxMimeType(){ return "application/x-lyx"; } +QString const pdfMimeType(){ return "application/pdf"; } +QString const emfMimeType(){ return "image/x-emf"; } +QString const wmfMimeType(){ return "image/x-wmf"; } GuiClipboard::GuiClipboard() @@ -132,19 +68,6 @@ GuiClipboard::GuiClipboard() this, SLOT(on_dataChanged())); // initialize clipboard status. on_dataChanged(); - -#ifdef Q_WS_MACX - if (!graphicsPasteboardMime) - graphicsPasteboardMime = new QMacPasteboardMimeGraphics(); -#endif // Q_WS_MACX -} - - -GuiClipboard::~GuiClipboard() -{ -#ifdef Q_WS_MACX - closeAllLinkBackLinks(); -#endif // Q_WS_MACX } @@ -160,9 +83,9 @@ string const GuiClipboard::getAsLyX() const return string(); } - if (source->hasFormat(lyx_mime_type)) { + if (source->hasFormat(lyxMimeType())) { // data from ourself or some other LyX instance - QByteArray const ar = source->data(lyx_mime_type); + QByteArray const ar = source->data(lyxMimeType()); string const s(ar.data(), ar.count()); LYXERR(Debug::ACTION, s << "'"); return s; @@ -177,6 +100,10 @@ FileName GuiClipboard::getPastedGraphicsFileName(Cursor const & cur, { // create file dialog filter according to the existing types in the clipboard vector types; + if (hasGraphicsContents(Clipboard::EmfGraphicsType)) + types.push_back(Clipboard::EmfGraphicsType); + if (hasGraphicsContents(Clipboard::WmfGraphicsType)) + types.push_back(Clipboard::WmfGraphicsType); if (hasGraphicsContents(Clipboard::LinkBackGraphicsType)) types.push_back(Clipboard::LinkBackGraphicsType); if (hasGraphicsContents(Clipboard::PdfGraphicsType)) @@ -186,7 +113,7 @@ FileName GuiClipboard::getPastedGraphicsFileName(Cursor const & cur, if (hasGraphicsContents(Clipboard::JpegGraphicsType)) types.push_back(Clipboard::JpegGraphicsType); - BOOST_ASSERT(!types.empty()); + LASSERT(!types.empty(), /**/); // select prefered type if AnyGraphicsType was passed if (type == Clipboard::AnyGraphicsType) @@ -196,18 +123,22 @@ FileName GuiClipboard::getPastedGraphicsFileName(Cursor const & cur, map extensions; map typeNames; + extensions[Clipboard::EmfGraphicsType] = "emf"; + extensions[Clipboard::WmfGraphicsType] = "wmf"; extensions[Clipboard::LinkBackGraphicsType] = "linkback"; extensions[Clipboard::PdfGraphicsType] = "pdf"; extensions[Clipboard::PngGraphicsType] = "png"; extensions[Clipboard::JpegGraphicsType] = "jpeg"; + typeNames[Clipboard::EmfGraphicsType] = _("Enhanced Metafile"); + typeNames[Clipboard::WmfGraphicsType] = _("Windows Metafile"); typeNames[Clipboard::LinkBackGraphicsType] = _("LinkBack PDF"); typeNames[Clipboard::PdfGraphicsType] = _("PDF"); typeNames[Clipboard::PngGraphicsType] = _("PNG"); typeNames[Clipboard::JpegGraphicsType] = _("JPEG"); // find unused filename with primary extension - string document_path = cur.buffer().fileName().onlyPath().absFilename(); + string document_path = cur.buffer()->fileName().onlyPath().absFilename(); unsigned newfile_number = 0; FileName filename; do { @@ -220,16 +151,16 @@ FileName GuiClipboard::getPastedGraphicsFileName(Cursor const & cur, while (true) { // create file type filter, putting the prefered on to the front - docstring filterSpec; + QStringList filter; for (size_t i = 0; i != types.size(); ++i) { docstring s = bformat(_("%1$s Files"), typeNames[types[i]]) + " (*." + from_ascii(extensions[types[i]]) + ")"; if (types[i] == type) - filterSpec = s + filterSpec; + filter.prepend(toqstr(s)); else - filterSpec += ";;" + s; + filter.append(toqstr(s)); } - FileFilterList const filter(filterSpec); + filter = fileFilters(filter.join(";;")); // show save dialog for the graphic FileDialog dlg(qt_("Choose a filename to save the pasted graphic as")); @@ -273,7 +204,7 @@ FileName GuiClipboard::getPastedGraphicsFileName(Cursor const & cur, break; int ret = frontend::Alert::prompt( _("Overwrite external file?"), - bformat(_("File %1$s already exists, do you want to overwrite it"), + bformat(_("File %1$s already exists, do you want to overwrite it?"), from_utf8(filename.absFilename())), 1, 1, _("&Overwrite"), _("&Cancel")); if (ret == 0) // overwrite, hence break the dialog loop @@ -311,7 +242,7 @@ FileName GuiClipboard::getAsGraphics(Cursor const & cur, GraphicsType type) cons else if (type == JpegGraphicsType) image.save(toqstr(filename.absFilename()), "JPEG"); else - BOOST_ASSERT(false); + LASSERT(false, /**/); return filename; } @@ -327,9 +258,11 @@ FileName GuiClipboard::getAsGraphics(Cursor const & cur, GraphicsType type) cons // get mime for type QString mime; switch (type) { - case PdfGraphicsType: mime = pdf_mime_type; break; - case LinkBackGraphicsType: mime = pdf_mime_type; break; - default: BOOST_ASSERT(false); + case PdfGraphicsType: mime = pdfMimeType(); break; + case LinkBackGraphicsType: mime = pdfMimeType(); break; + case EmfGraphicsType: mime = emfMimeType(); break; + case WmfGraphicsType: mime = wmfMimeType(); break; + default: LASSERT(false, /**/); } // get data @@ -360,7 +293,7 @@ FileName GuiClipboard::getAsGraphics(Cursor const & cur, GraphicsType type) cons ds << pdfLen; // big endian by default #else // only non-Mac this should never happen - BOOST_ASSERT(false); + LASSERT(false, /**/); #endif // Q_WS_MACX } @@ -374,11 +307,11 @@ docstring const GuiClipboard::getAsText() const // text data from other applications QString const str = qApp->clipboard()->text(QClipboard::Clipboard) .normalized(QString::NormalizationForm_C); - LYXERR(Debug::ACTION, "GuiClipboard::getAsText(): `" << fromqstr(str) << "'"); + LYXERR(Debug::ACTION, "GuiClipboard::getAsText(): `" << str << "'"); if (str.isNull()) return docstring(); - return internalLineEnding(qstring_to_ucs4(str)); + return internalLineEnding(str); } @@ -391,7 +324,7 @@ void GuiClipboard::put(string const & lyx, docstring const & text) QMimeData * data = new QMimeData; if (!lyx.empty()) { QByteArray const qlyx(lyx.c_str(), lyx.size()); - data->setData(lyx_mime_type, qlyx); + data->setData(lyxMimeType(), qlyx); } // Don't test for text.empty() since we want to be able to clear the // clipboard. @@ -405,7 +338,15 @@ bool GuiClipboard::hasLyXContents() const { QMimeData const * const source = qApp->clipboard()->mimeData(QClipboard::Clipboard); - return source && source->hasFormat(lyx_mime_type); + return source && source->hasFormat(lyxMimeType()); +} + + +bool GuiClipboard::hasTextContents() const +{ + QMimeData const * const source = + qApp->clipboard()->mimeData(QClipboard::Clipboard); + return source && source->hasText(); } @@ -415,37 +356,39 @@ bool GuiClipboard::hasGraphicsContents(Clipboard::GraphicsType type) const return hasGraphicsContents(PdfGraphicsType) || hasGraphicsContents(PngGraphicsType) || hasGraphicsContents(JpegGraphicsType) + || hasGraphicsContents(EmfGraphicsType) + || hasGraphicsContents(WmfGraphicsType) || hasGraphicsContents(LinkBackGraphicsType); } QMimeData const * const source = qApp->clipboard()->mimeData(QClipboard::Clipboard); - + // handle image cases first if (type == PngGraphicsType || type == JpegGraphicsType) return source->hasImage(); // handle LinkBack for Mac -#ifdef Q_WS_MACX if (type == LinkBackGraphicsType) +#ifdef Q_WS_MACX return isLinkBackDataInPasteboard(); #else - if (type == LinkBackGraphicsType) return false; #endif // Q_WS_MACX // get mime data QStringList const & formats = source->formats(); LYXERR(Debug::ACTION, "We found " << formats.size() << " formats"); - for (int i = 0; i < formats.size(); ++i) { - LYXERR(Debug::ACTION, "Found format " << fromqstr(formats[i])); - } + for (int i = 0; i < formats.size(); ++i) + LYXERR(Debug::ACTION, "Found format " << formats[i]); // compute mime for type QString mime; switch (type) { - case PdfGraphicsType: mime = pdf_mime_type; break; - default: BOOST_ASSERT(false); + case EmfGraphicsType: mime = emfMimeType(); break; + case WmfGraphicsType: mime = wmfMimeType(); break; + case PdfGraphicsType: mime = pdfMimeType(); break; + default: LASSERT(false, /**/); } return source && source->hasFormat(mime); @@ -481,9 +424,8 @@ void GuiClipboard::on_dataChanged() qApp->clipboard()->mimeData(QClipboard::Clipboard); QStringList l = source->formats(); LYXERR(Debug::ACTION, "Qt Clipboard changed. We found the following mime types:"); - for (int i = 0; i < l.count(); i++) { - LYXERR(Debug::ACTION, fromqstr(l.value(i))); - } + for (int i = 0; i < l.count(); i++) + LYXERR(Debug::ACTION, l.value(i)); text_clipboard_empty_ = qApp->clipboard()-> text(QClipboard::Clipboard).isEmpty(); @@ -507,4 +449,4 @@ bool GuiClipboard::empty() const } // namespace frontend } // namespace lyx -#include "GuiClipboard_moc.cpp" +#include "moc_GuiClipboard.cpp"