noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

removed default image uploader

Browse source
This commit is contained in:
fourtf 2020-08-22 18:33:37 +02:00
parent a569ee915f
commit a8c61980ac
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/singletons/Settings.hpp
View file

@ -281,10 +281,11 @@ public:
QStringSetting customURIScheme = {"/external/urischeme"}; QStringSetting customURIScheme = {"/external/urischeme"};
// Image Uploader // Image Uploader
QStringSetting imageUploaderUrl = {"/external/imageUploader/url", BoolSetting imageUploaderEnabled = {"/external/imageUploader/enabled",
"https://i.nuuls.com/upload"}; false};
QStringSetting imageUploaderUrl = {"/external/imageUploader/url", ""};
QStringSetting imageUploaderFormField = { QStringSetting imageUploaderFormField = {
"/external/imageUploader/formField", "attachment"}; "/external/imageUploader/formField", ""};
QStringSetting imageUploaderHeaders = {"/external/imageUploader/headers", QStringSetting imageUploaderHeaders = {"/external/imageUploader/headers",
""}; ""};
QStringSetting imageUploaderLink = {"/external/imageUploader/link", ""}; QStringSetting imageUploaderLink = {"/external/imageUploader/link", ""};

3
src/widgets/settingspages/ExternalToolsPage.cpp
View file

@ -119,6 +119,9 @@ ExternalToolsPage::ExternalToolsPage()
groupLayout->setWidget(0, QFormLayout::SpanningRole, description); groupLayout->setWidget(0, QFormLayout::SpanningRole, description);
groupLayout->addRow(this->createCheckBox(
"Enable image uploader", getSettings()->imageUploaderEnabled));
groupLayout->addRow( groupLayout->addRow(
"Request URL: ", "Request URL: ",
this->createLineEdit(getSettings()->imageUploaderUrl)); this->createLineEdit(getSettings()->imageUploaderUrl));

14
src/widgets/splits/Split.cpp
View file

@ -209,6 +209,9 @@ Split::Split(QWidget *parent)
[this] { this->focusLost.invoke(); }); [this] { this->focusLost.invoke(); });
this->input_->ui_.textEdit->imagePasted.connect( this->input_->ui_.textEdit->imagePasted.connect(
[this](const QMimeData *source) { [this](const QMimeData *source) {
if (!getSettings()->imageUploaderEnabled)
return;
if (getSettings()->askOnImageUpload.getValue()) if (getSettings()->askOnImageUpload.getValue())
{ {
QMessageBox msgBox; QMessageBox msgBox;
@ -235,7 +238,10 @@ Split::Split(QWidget *parent)
} }
upload(source, this->getChannel(), *this->input_->ui_.textEdit); upload(source, this->getChannel(), *this->input_->ui_.textEdit);
}); });
setAcceptDrops(true);
getSettings()->imageUploaderEnabled.connect(
[this](const bool &val) { this->setAcceptDrops(val); },
this->managedConnections_);
} }
Split::~Split() Split::~Split()
@ -742,7 +748,8 @@ void Split::reloadChannelAndSubscriberEmotes()
void Split::dragEnterEvent(QDragEnterEvent *event) void Split::dragEnterEvent(QDragEnterEvent *event)
{ {
if (event->mimeData()->hasImage() || event->mimeData()->hasUrls()) if (getSettings()->imageUploaderEnabled &&
(event->mimeData()->hasImage() || event->mimeData()->hasUrls()))
{ {
event->acceptProposedAction(); event->acceptProposedAction();
} }
@ -754,7 +761,8 @@ void Split::dragEnterEvent(QDragEnterEvent *event)
void Split::dropEvent(QDropEvent *event) void Split::dropEvent(QDropEvent *event)
{ {
if (event->mimeData()->hasImage() || event->mimeData()->hasUrls()) if (getSettings()->imageUploaderEnabled &&
(event->mimeData()->hasImage() || event->mimeData()->hasUrls()))
{ {
this->input_->ui_.textEdit->imagePasted.invoke(event->mimeData()); this->input_->ui_.textEdit->imagePasted.invoke(event->mimeData());
} }