Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion src/tiled/clipboardmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "tile.h"
#include "tilelayer.h"
#include "tmxmapformat.h"
#include "preferences.h"

#include <QApplication>
#include <QClipboard>
Expand All @@ -47,7 +48,6 @@

#include <algorithm>

static const char * const TMX_MIMETYPE = "text/tmx";

using namespace Tiled;

Expand All @@ -60,6 +60,9 @@ ClipboardManager::ClipboardManager()
this, &ClipboardManager::update,
Qt::QueuedConnection);

connect(Preferences::instance(), &Preferences::enableTextPasteChanged,
this, &ClipboardManager::update);

update();
}

Expand All @@ -79,6 +82,12 @@ ClipboardManager *ClipboardManager::instance()
*/
std::unique_ptr<Map> ClipboardManager::map() const
{

const char* TMX_MIMETYPE =
Preferences::instance()->enableTextPaste()
? "text/plain"
: "text/tmx";

const auto mimeData = mClipboard->mimeData();
const QByteArray data = mimeData->data(QLatin1String(TMX_MIMETYPE));
if (data.isEmpty())
Expand All @@ -95,6 +104,11 @@ void ClipboardManager::setMap(const Map &map)
{
TmxMapFormat format;

const char* TMX_MIMETYPE =
Preferences::instance()->enableTextPaste()
? "text/plain"
: "text/tmx";

auto mimeData = new QMimeData;
mimeData->setData(QLatin1String(TMX_MIMETYPE), format.toByteArray(&map));

Expand Down Expand Up @@ -274,6 +288,12 @@ void ClipboardManager::update()
bool hasListValues = false;

if (const auto data = mClipboard->mimeData()) {

const char* TMX_MIMETYPE =
Preferences::instance()->enableTextPaste()
? "text/plain"
: "text/tmx";

hasMap = data->hasFormat(QLatin1String(TMX_MIMETYPE));
hasProperties = data->hasFormat(QLatin1String(PROPERTIES_MIMETYPE));
hasListValues = data->hasFormat(QLatin1String(LIST_VALUES_MIMETYPE));
Expand Down
11 changes: 11 additions & 0 deletions src/tiled/preferences.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,17 @@ void Preferences::setSafeSavingEnabled(bool enabled)
SaveFile::setSafeSavingEnabled(enabled);
}

bool Preferences::enableTextPaste() const
{
return get("Storage/enableTextPaste", false);
}

void Preferences::setEnableTextPaste(bool enabled)
{
setValue(QLatin1String("Storage/enableTextPaste"), enabled);
emit enableTextPasteChanged(enabled);
}

bool Preferences::exportOnSave() const
{
return get("Storage/ExportOnSave", false);
Expand Down
5 changes: 5 additions & 0 deletions src/tiled/preferences.h
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ class TILED_EDITOR_EXPORT Preferences : public QSettings
bool exportOnSave() const;
void setExportOnSave(bool enabled);

bool enableTextPaste() const;
void setEnableTextPaste(bool enabled);

enum ExportOption {
EmbedTilesets = 0x1,
DetachTemplateInstances = 0x2,
Expand Down Expand Up @@ -260,6 +263,8 @@ public slots:
void checkForUpdatesChanged(bool on);
void displayNewsChanged(bool on);

void enableTextPasteChanged(bool enabled);

void aboutToSwitchSession();

private:
Expand Down
5 changes: 5 additions & 0 deletions src/tiled/preferencesdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ PreferencesDialog::PreferencesDialog(QWidget *parent)
preferences, &Preferences::setSafeSavingEnabled);
connect(mUi->exportOnSave, &QCheckBox::toggled,
preferences, &Preferences::setExportOnSave);
connect(mUi->enableTextPaste, &QCheckBox::toggled,
preferences, &Preferences::setEnableTextPaste);

connect(mUi->naturalSorting, &QCheckBox::toggled,
preferences, &Preferences::setNaturalSorting);

Expand Down Expand Up @@ -220,6 +223,8 @@ void PreferencesDialog::fromPreferences()
mUi->restoreSession->setChecked(prefs->restoreSessionOnStartup());
mUi->safeSaving->setChecked(prefs->safeSavingEnabled());
mUi->exportOnSave->setChecked(prefs->exportOnSave());
mUi->enableTextPaste->setChecked(prefs->enableTextPaste());

mUi->naturalSorting->setChecked(prefs->naturalSorting());

mUi->embedTilesets->setChecked(prefs->exportOption(Preferences::EmbedTilesets));
Expand Down
12 changes: 12 additions & 0 deletions src/tiled/preferencesdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,16 @@
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="enableTextPaste">
<property name="toolTip">
<string>Enable to copy TMX as text from other programs.</string>
</property>
<property name="text">
<string>Set clipboard to use plain text</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -687,6 +697,8 @@
<tabstop>restoreSession</tabstop>
<tabstop>safeSaving</tabstop>
<tabstop>exportOnSave</tabstop>
<tabstop>enableTextPaste</tabstop>

<tabstop>embedTilesets</tabstop>
<tabstop>detachTemplateInstances</tabstop>
<tabstop>resolveObjectTypesAndProperties</tabstop>
Expand Down