Gurkengewuerz/KShare
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Great reformat of 2k17

Browse Source
This commit is contained in:
ArsenArsen 2017-05-06 13:21:12 +02:00
parent b601b958c9
commit 7737b77671
47 changed files with 1174 additions and 1343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cropeditor/cropeditor.cpp
View File

@ -8,8 +8,7 @@
#include <QTimer>
#include <settings.hpp>
CropEditor::CropEditor(QPixmap *image, QObject *parent) : QObject(parent)
{
CropEditor::CropEditor(QPixmap *image, QObject *parent) : QObject(parent) {
scene = new CropScene(parent, image);
view = new CropView(scene);
QPixmap *scaled = new QPixmap();
@ -26,13 +25,9 @@ CropEditor::CropEditor(QPixmap *image, QObject *parent) : QObject(parent)
connect(scene, &CropScene::closedWithRect, this, &CropEditor::crop);
}
CropEditor::~CropEditor()
{
delete scene;
}
CropEditor::~CropEditor() { delete scene; }
void CropEditor::crop(QRect rect)
{
void CropEditor::crop(QRect rect) {
QPixmap map = view->grab(rect);
QPixmap *cropp = new QPixmap;
map.swap(*cropp);

9
cropeditor/cropeditor.hpp
View File

@ -8,16 +8,15 @@
#include <QObject>
#include <QPixmap>
class CropEditor : public QObject
{
class CropEditor : public QObject {
Q_OBJECT
public:
public:
CropEditor(QPixmap *image, QObject *parent = 0);
~CropEditor();
signals:
signals:
QPixmap *cropped(QPixmap *pixmap);
private:
private:
void crop(QRect rect);
CropScene *scene = nullptr;
CropView *view = nullptr;

70
cropeditor/cropscene.cpp
View File

@ -17,12 +17,18 @@
#include <settings.hpp>
CropScene::CropScene(QObject *parent, QPixmap *pixmap)
: QGraphicsScene(parent), prevButtons(Qt::NoButton), drawingSelectionMaker([] { return nullptr; }),
: QGraphicsScene(parent), prevButtons(Qt::NoButton),
drawingSelectionMaker([] { return nullptr; }),
_font(settings::settings().value("font", QFont()).value<QFont>()) {
pen().setColor(settings::settings().value("penColor", pen().color()).value<QColor>());
pen().setCosmetic(settings::settings().value("penCosmetic", pen().isCosmetic()).toBool());
pen().setWidthF(settings::settings().value("penWidth", pen().widthF()).toFloat());
brush().setColor(settings::settings().value("brushColor", brush().color()).value<QColor>());
pen().setColor(
settings::settings().value("penColor", pen().color()).value<QColor>());
pen().setCosmetic(
settings::settings().value("penCosmetic", pen().isCosmetic()).toBool());
pen().setWidthF(
settings::settings().value("penWidth", pen().widthF()).toFloat());
brush().setColor(settings::settings()
.value("brushColor", brush().color())
.value<QColor>());
addDrawingAction(menu, "Dot", [] { return new DotItem; });
addDrawingAction(menu, "Path", [] { return new PathItem; });
@ -31,7 +37,8 @@ CropScene::CropScene(QObject *parent, QPixmap *pixmap)
addDrawingAction(menu, "Text", [] { return new TextItem; });
QAction *reset = menu.addAction("Reset");
connect(reset, &QAction::triggered, [&] { setDrawingSelection("None", [] { return nullptr; }); });
connect(reset, &QAction::triggered,
[&] { setDrawingSelection("None", [] { return nullptr; }); });
menu.addSeparator();
QAction *settings = new QAction;
@ -39,10 +46,12 @@ CropScene::CropScene(QObject *parent, QPixmap *pixmap)
menu.addSeparator();
display = menu.addAction(drawingName);
display->setDisabled(true);
connect(settings, &QAction::triggered, [&] { BrushPenSelection(this).exec(); });
connect(settings, &QAction::triggered,
[&] { BrushPenSelection(this).exec(); });
menu.addAction(settings);
connect(menu.addAction("Set Font"), &QAction::triggered, this, &CropScene::fontAsk);
connect(menu.addAction("Set Font"), &QAction::triggered, this,
&CropScene::fontAsk);
_pixmap = pixmap;
QTimer::singleShot(0, [&] {
@ -58,33 +67,28 @@ CropScene::CropScene(QObject *parent, QPixmap *pixmap)
});
}
CropScene::~CropScene() {
delete drawingSelection;
}
CropScene::~CropScene() { delete drawingSelection; }
QPen &CropScene::pen() {
return _pen;
}
QPen &CropScene::pen() { return _pen; }
QBrush &CropScene::brush() {
return _brush;
}
QBrush &CropScene::brush() { return _brush; }
QFont &CropScene::font() {
return _font;
}
QFont &CropScene::font() { return _font; }
void CropScene::setDrawingSelection(QString name, std::function<DrawItem *()> drawAction) {
void CropScene::setDrawingSelection(QString name,
std::function<DrawItem *()> drawAction) {
drawingSelectionMaker = drawAction;
drawingSelection = drawAction();
drawingName = name;
if (drawingSelection) drawingSelection->init(this);
if (drawingSelection)
drawingSelection->init(this);
}
void CropScene::fontAsk() {
bool ok = false;
QFont font = QFontDialog::getFont(&ok, this->font(), nullptr, "Font to use");
if (ok) _font = font;
if (ok)
_font = font;
}
void CropScene::mouseMoveEvent(QGraphicsSceneMouseEvent *e) {
@ -106,12 +110,14 @@ void CropScene::mouseMoveEvent(QGraphicsSceneMouseEvent *e) {
initPos = p;
rect->setRect(p.x(), p.y(), 1, 1);
} else {
rect->setRect(QRect(qMin(initPos.x(), p.x()), qMin(initPos.y(), p.y()), qAbs(initPos.x() - p.x()),
qAbs(initPos.y() - p.y())));
rect->setRect(
QRect(qMin(initPos.x(), p.x()), qMin(initPos.y(), p.y()),
qAbs(initPos.x() - p.x()), qAbs(initPos.y() - p.y())));
}
}
QPolygonF poly;
QPointF theMagicWikipediaPoint(rect->rect().right(), sceneRect().bottom());
QPointF theMagicWikipediaPoint(rect->rect().right(),
sceneRect().bottom());
poly << sceneRect().topLeft();
poly << sceneRect().topRight();
poly << sceneRect().bottomRight();
@ -138,15 +144,18 @@ void CropScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *e) {
drawingSelection->mouseDragEndEvent(e, this);
delete drawingSelection;
drawingSelection = drawingSelectionMaker();
if (drawingSelection) drawingSelection->init(this);
if (drawingSelection)
drawingSelection->init(this);
}
prevButtons = Qt::NoButton;
}
void CropScene::addDrawingAction(QMenu &menu, QString name, std::function<DrawItem *()> item) {
void CropScene::addDrawingAction(QMenu &menu, QString name,
std::function<DrawItem *()> item) {
QAction *action = new QAction;
action->setText(name);
connect(action, &QAction::triggered, [this, item, name](bool) { setDrawingSelection(name, item); });
connect(action, &QAction::triggered,
[this, item, name](bool) { setDrawingSelection(name, item); });
menu.addAction(action);
}
@ -157,7 +166,8 @@ void CropScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *e) {
}
void CropScene::keyReleaseEvent(QKeyEvent *event) {
if (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) done(); // Segfault
if (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter)
done(); // Segfault
}
void CropScene::done() {

20
cropeditor/cropscene.hpp
View File

@ -15,32 +15,32 @@ class CropScene;
class CropScene : public QGraphicsScene {
Q_OBJECT
public:
public:
CropScene(QObject *parent, QPixmap *pixmap);
~CropScene();
QPen &pen();
QBrush &brush();
QFont &font();
void setDrawingSelection(QString name, std::function<DrawItem *()> drawAction);
QPixmap *pixmap() {
return _pixmap;
}
void setDrawingSelection(QString name,
std::function<DrawItem *()> drawAction);
QPixmap *pixmap() { return _pixmap; }
public slots:
public slots:
void fontAsk();
signals:
signals:
void closedWithRect(QRect rect);
protected:
protected:
void mouseMoveEvent(QGraphicsSceneMouseEvent *e) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent *e) override;
void contextMenuEvent(QGraphicsSceneContextMenuEvent *e) override;
void keyReleaseEvent(QKeyEvent *e) override;
private:
void addDrawingAction(QMenu &menu, QString name, std::function<DrawItem *()> item);
private:
void addDrawingAction(QMenu &menu, QString name,
std::function<DrawItem *()> item);
void done();
std::function<DrawItem *()> drawingSelectionMaker;
QFlags<Qt::MouseButton> prevButtons;

15
cropeditor/cropview.cpp
View File

@ -1,19 +1,18 @@
#include "cropview.hpp"
CropView::CropView(QGraphicsScene *scene) : QGraphicsView(scene)
{
setFrameShape(QFrame::NoFrame); // Time taken to solve: A george99g and 38 minutes.
CropView::CropView(QGraphicsScene *scene) : QGraphicsView(scene) {
setFrameShape(
QFrame::NoFrame); // Time taken to solve: A george99g and 38 minutes.
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setWindowFlags(Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint);
setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform | QPainter::HighQualityAntialiasing);
setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform |
QPainter::HighQualityAntialiasing);
setCursor(QCursor(Qt::CrossCursor));
}
void CropView::keyPressEvent(QKeyEvent *e)
{
if (e->key() == Qt::Key_Escape)
{
void CropView::keyPressEvent(QKeyEvent *e) {
if (e->key() == Qt::Key_Escape) {
close();
e->accept();
return;

7
cropeditor/cropview.hpp
View File

@ -4,12 +4,11 @@
#include <QGraphicsView>
#include <QKeyEvent>
class CropView : public QGraphicsView
{
public:
class CropView : public QGraphicsView {
public:
CropView(QGraphicsScene *scene);
protected:
protected:
void keyPressEvent(QKeyEvent *e) override;
};

25
cropeditor/drawing/bluritem.cpp
View File

@ -3,33 +3,30 @@
#include <QDebug>
#include <cropeditor/settings/blurdialog.hpp>
void BlurItem::init(CropScene *)
{
void BlurItem::init(CropScene *) {
effect = new QGraphicsBlurEffect;
BlurDialog(effect).exec();
}
void BlurItem::mouseDragEvent(QGraphicsSceneMouseEvent *e, CropScene *scene)
{
if (pos.isNull())
{
void BlurItem::mouseDragEvent(QGraphicsSceneMouseEvent *e, CropScene *scene) {
if (pos.isNull()) {
pos = e->scenePos();
rect = scene->addRect(QRect(e->scenePos().toPoint(), QSize(1, 1)), QPen(Qt::cyan), Qt::NoBrush);
rect = scene->addRect(QRect(e->scenePos().toPoint(), QSize(1, 1)),
QPen(Qt::cyan), Qt::NoBrush);
pixmap = scene->addPixmap(scene->pixmap()->copy(rect->rect().toRect()));
pixmap->setPos(e->scenePos());
pixmap->setZValue(rect->zValue() - 0.1);
pixmap->setGraphicsEffect(effect);
}
else
{
} else {
QPointF p = e->scenePos();
rect->setRect(QRect(qMin(pos.x(), p.x()), qMin(pos.y(), p.y()), qAbs(pos.x() - p.x()), qAbs(pos.y() - p.y())));
rect->setRect(QRect(qMin(pos.x(), p.x()), qMin(pos.y(), p.y()),
qAbs(pos.x() - p.x()), qAbs(pos.y() - p.y())));
pixmap->setPixmap(scene->pixmap()->copy(rect->rect().toRect()));
pixmap->setPos(rect->rect().topLeft());
}
}
void BlurItem::mouseDragEndEvent(QGraphicsSceneMouseEvent *, CropScene *)
{
if (rect != nullptr) rect->setPen(Qt::NoPen);
void BlurItem::mouseDragEndEvent(QGraphicsSceneMouseEvent *, CropScene *) {
if (rect != nullptr)
rect->setPen(Qt::NoPen);
}

16
cropeditor/drawing/bluritem.hpp
View File

@ -5,22 +5,16 @@
#include <QGraphicsEffect>
class BlurItem : public DrawItem
{
public:
QString name()
{
return "Blur";
}
~BlurItem()
{
}
class BlurItem : public DrawItem {
public:
QString name() { return "Blur"; }
~BlurItem() {}
void init(CropScene *) override;
void mouseDragEvent(QGraphicsSceneMouseEvent *e, CropScene *scene) override;
void mouseDragEndEvent(QGraphicsSceneMouseEvent *, CropScene *) override;
private:
private:
QGraphicsBlurEffect *effect;
QPointF pos;
QGraphicsRectItem *rect;

24
cropeditor/drawing/dotitem.cpp
View File

@ -1,18 +1,14 @@
#include "dotitem.hpp"
DotItem::DotItem()
{
DotItem::DotItem() {}
DotItem::~DotItem() {}
void DotItem::mouseDragEvent(QGraphicsSceneMouseEvent *e, CropScene *scene) {
scene
->addEllipse(e->pos().x() - 1.5, e->pos().y() - 1.5, 3, 3, scene->pen(),
scene->brush())
->setPos(e->scenePos());
}
DotItem::~DotItem()
{
}
void DotItem::mouseDragEvent(QGraphicsSceneMouseEvent *e, CropScene *scene)
{
scene->addEllipse(e->pos().x() - 1.5, e->pos().y() - 1.5, 3, 3, scene->pen(), scene->brush())->setPos(e->scenePos());
}
void DotItem::mouseDragEndEvent(QGraphicsSceneMouseEvent *, CropScene *)
{
}
void DotItem::mouseDragEndEvent(QGraphicsSceneMouseEvent *, CropScene *) {}

10
cropeditor/drawing/dotitem.hpp
View File

@ -4,15 +4,11 @@
#include "../cropscene.hpp"
#include "drawitem.hpp"
class DotItem : public DrawItem
{
public:
class DotItem : public DrawItem {
public:
DotItem();
~DotItem();
QString name()
{
return "Dots (drag to add)";
}
QString name() { return "Dots (drag to add)"; }
void mouseDragEvent(QGraphicsSceneMouseEvent *e, CropScene *scene);
void mouseDragEndEvent(QGraphicsSceneMouseEvent *e, CropScene *scene);
};

20
cropeditor/drawing/drawitem.hpp
View File

@ -6,19 +6,15 @@ class DrawItem;
#include <QString>
#include <cropeditor/cropscene.hpp>
class DrawItem
{
public:
virtual ~DrawItem()
{
}
class DrawItem {
public:
virtual ~DrawItem() {}
virtual QString name() = 0;
virtual void init(CropScene *scene)
{
Q_UNUSED(scene)
}
virtual void mouseDragEvent(QGraphicsSceneMouseEvent *e, CropScene *scene) = 0;
virtual void mouseDragEndEvent(QGraphicsSceneMouseEvent *e, CropScene *scene) = 0;
virtual void init(CropScene *scene) { Q_UNUSED(scene) }
virtual void mouseDragEvent(QGraphicsSceneMouseEvent *e,
CropScene *scene) = 0;
virtual void mouseDragEndEvent(QGraphicsSceneMouseEvent *e,
CropScene *scene) = 0;
};
#endif // DRAWITEM_HPP

18
cropeditor/drawing/lineitem.cpp
View File

@ -1,22 +1,14 @@
#include "lineitem.hpp"
LineItem::LineItem()
{
}
LineItem::LineItem() {}
void LineItem::mouseDragEvent(QGraphicsSceneMouseEvent *e, CropScene *scene)
{
if (init.isNull())
{
void LineItem::mouseDragEvent(QGraphicsSceneMouseEvent *e, CropScene *scene) {
if (init.isNull()) {
init = e->scenePos();
line = scene->addLine(QLineF(init, init), scene->pen());
}
else
{
} else {
line->setLine(QLineF(init, e->scenePos()));
}
}
void LineItem::mouseDragEndEvent(QGraphicsSceneMouseEvent *, CropScene *)
{
}
void LineItem::mouseDragEndEvent(QGraphicsSceneMouseEvent *, CropScene *) {}

12
cropeditor/drawing/lineitem.hpp
View File

@ -3,18 +3,14 @@
#include "drawitem.hpp"
class LineItem : public DrawItem
{
public:
class LineItem : public DrawItem {
public:
LineItem();
QString name() override
{
return "Straight line";
}
QString name() override { return "Straight line"; }
void mouseDragEvent(QGraphicsSceneMouseEvent *e, CropScene *scene) override;
void mouseDragEndEvent(QGraphicsSceneMouseEvent *, CropScene *) override;
private:
private:
QPointF init;
QGraphicsLineItem *line;
};

23
cropeditor/drawing/pathitem.cpp
View File

@ -1,28 +1,17 @@
#include "pathitem.hpp"
PathItem::PathItem()
{
}
PathItem::PathItem() {}
PathItem::~PathItem()
{
delete path;
}
PathItem::~PathItem() { delete path; }
void PathItem::mouseDragEvent(QGraphicsSceneMouseEvent *e, CropScene *scene)
{
if (path == nullptr)
{
void PathItem::mouseDragEvent(QGraphicsSceneMouseEvent *e, CropScene *scene) {
if (path == nullptr) {
path = new QPainterPath(e->scenePos());
pathItem = scene->addPath(*path, scene->pen(), scene->brush());
}
else
{
} else {
path->quadTo(path->currentPosition(), e->scenePos());
pathItem->setPath(*path);
}
}
void PathItem::mouseDragEndEvent(QGraphicsSceneMouseEvent *, CropScene *)
{
}
void PathItem::mouseDragEndEvent(QGraphicsSceneMouseEvent *, CropScene *) {}

12
cropeditor/drawing/pathitem.hpp
View File

@ -4,19 +4,15 @@
#include "../cropscene.hpp"
#include "drawitem.hpp"
class PathItem : public DrawItem
{
public:
class PathItem : public DrawItem {
public:
PathItem();
~PathItem();
QString name()
{
return "Path";
}
QString name() { return "Path"; }
void mouseDragEvent(QGraphicsSceneMouseEvent *e, CropScene *scene);
void mouseDragEndEvent(QGraphicsSceneMouseEvent *e, CropScene *scene);
private:
private:
QPainterPath *path = nullptr;
QGraphicsPathItem *pathItem = nullptr;
};

12
cropeditor/drawing/textitem.cpp
View File

@ -13,15 +13,13 @@ void TextItem::mouseDragEvent(QGraphicsSceneMouseEvent *e, CropScene *scene) {
textItem->setPen(scene->pen());
textItem->setBrush(scene->brush());
} else {
auto ee
= 180 + qRadiansToDegrees(qAtan2((textItem->pos().y() - e->scenePos().y()), (textItem->pos().x() - e->scenePos().x())));
auto ee = 180 + qRadiansToDegrees(
qAtan2((textItem->pos().y() - e->scenePos().y()),
(textItem->pos().x() - e->scenePos().x())));
textItem->setRotation(ee);
}
}
void TextItem::mouseDragEndEvent(QGraphicsSceneMouseEvent *, CropScene *) {
}
void TextItem::mouseDragEndEvent(QGraphicsSceneMouseEvent *, CropScene *) {}
QString TextItem::name() {
return "Text";
}
QString TextItem::name() { return "Text"; }

4
cropeditor/drawing/textitem.hpp
View File

@ -5,13 +5,13 @@
#include <QGraphicsSimpleTextItem>
class TextItem : public DrawItem {
public:
public:
QString name() override;
void init(CropScene *) override;
void mouseDragEvent(QGraphicsSceneMouseEvent *e, CropScene *scene) override;
void mouseDragEndEvent(QGraphicsSceneMouseEvent *, CropScene *) override;
private:
private:
QGraphicsSimpleTextItem *textItem = nullptr;
QString text;
};

30
cropeditor/settings/blurdialog.cpp
View File

@ -6,19 +6,24 @@
#include <QDoubleSpinBox>
#include <QSlider>
BlurDialog::BlurDialog(QGraphicsBlurEffect *e, QWidget *parent) : QDialog(parent), ui(new Ui::BlurDialog)
{
BlurDialog::BlurDialog(QGraphicsBlurEffect *e, QWidget *parent)
: QDialog(parent), ui(new Ui::BlurDialog) {
effect = e;
ui->setupUi(this);
ui->animated->setChecked(effect->blurHints().testFlag(QGraphicsBlurEffect::AnimationHint));
ui->performance->setChecked(effect->blurHints().testFlag(QGraphicsBlurEffect::PerformanceHint));
ui->quality->setChecked(effect->blurHints().testFlag(QGraphicsBlurEffect::QualityHint));
ui->animated->setChecked(
effect->blurHints().testFlag(QGraphicsBlurEffect::AnimationHint));
ui->performance->setChecked(
effect->blurHints().testFlag(QGraphicsBlurEffect::PerformanceHint));
ui->quality->setChecked(
effect->blurHints().testFlag(QGraphicsBlurEffect::QualityHint));
ui->radSlider->setValue(effect->blurRadius() * 100);
ui->radSpinner->setValue(effect->blurRadius());
connect(ui->buttonBox, &QDialogButtonBox::accepted, [&] {
QFlags<QGraphicsBlurEffect::BlurHint> hints;
hints.setFlag(QGraphicsBlurEffect::AnimationHint, ui->animated->isChecked());
hints.setFlag(QGraphicsBlurEffect::PerformanceHint, ui->performance->isChecked());
hints.setFlag(QGraphicsBlurEffect::AnimationHint,
ui->animated->isChecked());
hints.setFlag(QGraphicsBlurEffect::PerformanceHint,
ui->performance->isChecked());
hints.setFlag(QGraphicsBlurEffect::QualityHint, ui->quality->isChecked());
effect->setBlurHints(hints);
effect->setBlurRadius(ui->radSpinner->value());
@ -27,17 +32,12 @@ BlurDialog::BlurDialog(QGraphicsBlurEffect *e, QWidget *parent) : QDialog(parent
connect(ui->buttonBox, &QDialogButtonBox::rejected, [&] { close(); });
}
BlurDialog::~BlurDialog()
{
delete ui;
}
BlurDialog::~BlurDialog() { delete ui; }
void BlurDialog::on_radSpinner_valueChanged(double arg1)
{
void BlurDialog::on_radSpinner_valueChanged(double arg1) {
ui->radSlider->setValue(arg1 * 100);
}
void BlurDialog::on_radSlider_sliderMoved(int position)
{
void BlurDialog::on_radSlider_sliderMoved(int position) {
ui->radSpinner->setValue(position / 100.);
}

12
cropeditor/settings/blurdialog.hpp
View File

@ -4,24 +4,22 @@
#include <QDialog>
#include <QGraphicsBlurEffect>
namespace Ui
{
namespace Ui {
class BlurDialog;
}
class BlurDialog : public QDialog
{
class BlurDialog : public QDialog {
Q_OBJECT
public:
public:
explicit BlurDialog(QGraphicsBlurEffect *effect, QWidget *parent = 0);
~BlurDialog();
private slots:
private slots:
void on_radSpinner_valueChanged(double arg1);
void on_radSlider_sliderMoved(int position);
private:
private:
Ui::BlurDialog *ui;
QGraphicsBlurEffect *effect;
};

29
cropeditor/settings/brushpenselection.cpp
View File

@ -9,8 +9,8 @@
#include <cropeditor/cropview.hpp>
#include <settings.hpp>
BrushPenSelection::BrushPenSelection(CropScene *scene) : QDialog(), ui(new Ui::BrushPenSelection)
{
BrushPenSelection::BrushPenSelection(CropScene *scene)
: QDialog(), ui(new Ui::BrushPenSelection) {
ui->setupUi(this);
ui->cosmetic->setChecked(scene->pen().isCosmetic());
ui->widthSlider->setValue(scene->pen().width());
@ -20,23 +20,17 @@ BrushPenSelection::BrushPenSelection(CropScene *scene) : QDialog(), ui(new Ui::B
this->scene = scene;
}
BrushPenSelection::~BrushPenSelection()
{
delete ui;
}
BrushPenSelection::~BrushPenSelection() { delete ui; }
void BrushPenSelection::on_penColor_clicked(bool)
{
void BrushPenSelection::on_penColor_clicked(bool) {
pen = QColorDialog::getColor(pen, this, "Pen Color");
}
void BrushPenSelection::on_brushColor_clicked(bool)
{
void BrushPenSelection::on_brushColor_clicked(bool) {
brush = QColorDialog::getColor(brush, this, "Brush Color");
}
void BrushPenSelection::on_buttonBox_accepted()
{
void BrushPenSelection::on_buttonBox_accepted() {
scene->pen().setColor(pen);
scene->pen().setCosmetic(ui->cosmetic->isChecked());
scene->pen().setWidthF(ui->widthSpinner->value());
@ -48,17 +42,12 @@ void BrushPenSelection::on_buttonBox_accepted()
close();
}
void BrushPenSelection::on_buttonBox_rejected()
{
close();
}
void BrushPenSelection::on_buttonBox_rejected() { close(); }
void BrushPenSelection::on_widthSlider_sliderMoved(int position)
{
void BrushPenSelection::on_widthSlider_sliderMoved(int position) {
ui->widthSpinner->setValue(position / 100.);
}
void BrushPenSelection::on_widthSpinner_valueChanged(double arg)
{
void BrushPenSelection::on_widthSpinner_valueChanged(double arg) {
ui->widthSlider->setValue(arg * 100);
}

12
cropeditor/settings/brushpenselection.hpp
View File

@ -4,20 +4,18 @@
#include <QDialog>
#include <cropeditor/cropscene.hpp>
namespace Ui
{
namespace Ui {
class BrushPenSelection;
}
class BrushPenSelection : public QDialog
{
class BrushPenSelection : public QDialog {
Q_OBJECT
public:
public:
explicit BrushPenSelection(CropScene *scene);
~BrushPenSelection();
private slots:
private slots:
void on_penColor_clicked(bool);
void on_brushColor_clicked(bool);
@ -27,7 +25,7 @@ class BrushPenSelection : public QDialog
void on_widthSlider_sliderMoved(int position);
void on_widthSpinner_valueChanged(double arg1);
private:
private:
Ui::BrushPenSelection *ui;
CropScene *scene;
QColor brush, pen;

9
formatter.cpp
View File

@ -3,16 +3,15 @@
#include <QDateTime>
#include <QStringList>
QString formatter::format(QString toFormat)
{
QString formatter::format(QString toFormat) {
QRegExp dateRegex("%\\((.+)\\)date");
dateRegex.indexIn(toFormat);
QStringList capturedTexts(dateRegex.capturedTexts());
QString formatted(toFormat);
QDateTime date = QDateTime::currentDateTime();
for (int i = 0; i < capturedTexts.length(); i += 2)
{
formatted = formatted.replace(capturedTexts.at(i), date.toString(capturedTexts.at(i + 1)));
for (int i = 0; i < capturedTexts.length(); i += 2) {
formatted = formatted.replace(capturedTexts.at(i),
date.toString(capturedTexts.at(i + 1)));
}
return formatted;
}

3
formatter.hpp
View File

@ -4,8 +4,7 @@
#include <QRegExp>
#include <QString>
namespace formatter
{
namespace formatter {
QString format(QString toFormat);
}

23
hotkeying.cpp
View File

@ -8,12 +8,11 @@
QMap<QString, QHotkey *> hotkeys;
// func gets bound only on first set, or load
void hotkeying::hotkey(QString seqName, QKeySequence seq, std::function<void()> func)
{
void hotkeying::hotkey(QString seqName, QKeySequence seq,
std::function<void()> func) {
if (hotkeys.contains(seqName))
hotkeys.value(seqName)->setShortcut(seq, true);
else
{
else {
QHotkey *hotkey = new QHotkey(seq, true);
QObject::connect(hotkey, &QHotkey::activated, func);
hotkeys.insert(seqName, hotkey);
@ -22,25 +21,25 @@ void hotkeying::hotkey(QString seqName, QKeySequence seq, std::function<void()>
}
// forces the hotkey from settings
void hotkeying::load(QString seqName, std::function<void()> func)
{
void hotkeying::load(QString seqName, std::function<void()> func) {
QHotkey *h;
QString name = seqName;
name.prepend("hotkey_");
if (settings::settings().contains(name))
h = new QHotkey(QKeySequence(settings::settings().value(name).toString()), true);
h = new QHotkey(QKeySequence(settings::settings().value(name).toString()),
true);
else
h = new QHotkey;
QObject::connect(h, &QHotkey::activated, func);
hotkeys.insert(seqName, h);
}
bool hotkeying::valid(QString seq)
{
bool hotkeying::valid(QString seq) {
return seq.isEmpty() || !QKeySequence(seq).toString().isEmpty();
}
QString hotkeying::sequence(QString seqName)
{
return hotkeys.contains(seqName) ? hotkeys.value(seqName)->shortcut().toString() : "";
QString hotkeying::sequence(QString seqName) {
return hotkeys.contains(seqName)
? hotkeys.value(seqName)->shortcut().toString()
: "";
}

3
hotkeying.hpp
View File

@ -5,8 +5,7 @@
#include <QString>
#include <functional>
namespace hotkeying
{
namespace hotkeying {
void hotkey(QString seqName, QKeySequence seq, std::function<void()> func);
bool valid(QString seq);
void load(QString seqName, std::function<void()> func);

41
io/ioutils.cpp
View File

@ -4,16 +4,15 @@
#include <QNetworkReply>
#include <QNetworkRequest>
namespace ioutils
{
namespace ioutils {
QNetworkAccessManager networkManager;
}
void ioutils::getJson(QUrl target, QList<QPair<QString, QString>> headers, std::function<void(QJsonDocument, QNetworkReply *)> callback)
{
void ioutils::getJson(
QUrl target, QList<QPair<QString, QString>> headers,
std::function<void(QJsonDocument, QNetworkReply *)> callback) {
QNetworkRequest req(target);
for (auto header : headers)
{
for (auto header : headers) {
req.setRawHeader(header.first.toUtf8(), header.second.toUtf8());
}
QNetworkReply *reply = networkManager.get(req);
@ -23,14 +22,11 @@ void ioutils::getJson(QUrl target, QList<QPair<QString, QString>> headers, std::
});
}
void ioutils::postJson(QUrl target,
QList<QPair<QString, QString>> headers,
QByteArray body,
std::function<void(QJsonDocument, QNetworkReply *)> callback)
{
void ioutils::postJson(
QUrl target, QList<QPair<QString, QString>> headers, QByteArray body,
std::function<void(QJsonDocument, QNetworkReply *)> callback) {
QNetworkRequest req(target);
for (auto header : headers)
{
for (auto header : headers) {
req.setRawHeader(header.first.toUtf8(), header.second.toUtf8());
}
QNetworkReply *reply = networkManager.post(req, body);
@ -40,11 +36,11 @@ void ioutils::postJson(QUrl target,
});
}
void ioutils::getData(QUrl target, QList<QPair<QString, QString>> headers, std::function<void(QByteArray, QNetworkReply *)> callback)
{
void ioutils::getData(
QUrl target, QList<QPair<QString, QString>> headers,
std::function<void(QByteArray, QNetworkReply *)> callback) {
QNetworkRequest req(target);
for (auto header : headers)
{
for (auto header : headers) {
req.setRawHeader(header.first.toUtf8(), header.second.toUtf8());
}
QNetworkReply *reply = networkManager.get(req);
@ -54,14 +50,11 @@ void ioutils::getData(QUrl target, QList<QPair<QString, QString>> headers, std::
});
}
void ioutils::postData(QUrl target,
QList<QPair<QString, QString>> headers,
QByteArray body,
std::function<void(QByteArray, QNetworkReply *)> callback)
{
void ioutils::postData(
QUrl target, QList<QPair<QString, QString>> headers, QByteArray body,
std::function<void(QByteArray, QNetworkReply *)> callback) {
QNetworkRequest req(target);
for (auto header : headers)
{
for (auto header : headers) {
req.setRawHeader(header.first.toUtf8(), header.second.toUtf8());
}
QNetworkReply *reply = networkManager.post(req, body);

17
io/ioutils.hpp
View File

@ -7,13 +7,18 @@
#include <QUrl>
#include <functional>
namespace ioutils
{
namespace ioutils {
extern QNetworkAccessManager networkManager;
void getJson(QUrl target, QList<QPair<QString, QString>> headers, std::function<void(QJsonDocument, QNetworkReply *)> callback);
void postJson(QUrl target, QList<QPair<QString, QString>> headers, QByteArray body, std::function<void(QJsonDocument, QNetworkReply *)> callback);
void getData(QUrl target, QList<QPair<QString, QString>> headers, std::function<void(QByteArray, QNetworkReply *)> callback);
void postData(QUrl target, QList<QPair<QString, QString>> headers, QByteArray body, std::function<void(QByteArray, QNetworkReply *)> callback);
void getJson(QUrl target, QList<QPair<QString, QString>> headers,
std::function<void(QJsonDocument, QNetworkReply *)> callback);
void postJson(QUrl target, QList<QPair<QString, QString>> headers,
QByteArray body,
std::function<void(QJsonDocument, QNetworkReply *)> callback);
void getData(QUrl target, QList<QPair<QString, QString>> headers,
std::function<void(QByteArray, QNetworkReply *)> callback);
void postData(QUrl target, QList<QPair<QString, QString>> headers,
QByteArray body,
std::function<void(QByteArray, QNetworkReply *)> callback);
}
#endif // IOUTILS_HPP

20
main.cpp
View File

@ -7,13 +7,12 @@
bool verbose = false;
void handler(QtMsgType type, const QMessageLogContext &, const QString &msg)
{
void handler(QtMsgType type, const QMessageLogContext &, const QString &msg) {
QByteArray localMsg = msg.toLocal8Bit();
switch (type)
{
switch (type) {
case QtDebugMsg:
if (verbose) fprintf(stderr, "DEBUG: %s\n", localMsg.constData());
if (verbose)
fprintf(stderr, "DEBUG: %s\n", localMsg.constData());
break;
case QtInfoMsg:
fprintf(stderr, "INFO: %s\n", localMsg.constData());
@ -30,8 +29,7 @@ void handler(QtMsgType type, const QMessageLogContext &, const QString &msg)
}
}
int main(int argc, char *argv[])
{
int main(int argc, char *argv[]) {
qInstallMessageHandler(handler);
QApplication a(argc, argv);
a.setApplicationName("KShare");
@ -41,8 +39,9 @@ int main(int argc, char *argv[])
QCommandLineParser parser;
parser.addHelpOption();
QCommandLineOption h({ "b", "background" }, "Does not show the main window, starts in tray.");
QCommandLineOption v({ "v", "verbose" }, "Enables QtDebugMsg outputs");
QCommandLineOption h({"b", "background"},
"Does not show the main window, starts in tray.");
QCommandLineOption v({"v", "verbose"}, "Enables QtDebugMsg outputs");
parser.addOption(h);
parser.addOption(v);
parser.process(a);
@ -51,7 +50,8 @@ int main(int argc, char *argv[])
MainWindow w;
w.show();
QTimer::singleShot(0, [&] {
if (parser.isSet(h)) w.hide();
if (parser.isSet(h))
w.hide();
});
return a.exec();
}

123
mainwindow.cpp
View File

@ -19,17 +19,16 @@
MainWindow *MainWindow::instance;
void addHotkeyItem(QString text, QString name, std::function<void()> *func)
{
QListWidgetItem *item = new QListWidgetItem(text, MainWindow::inst()->ui->hotkeys);
void addHotkeyItem(QString text, QString name, std::function<void()> *func) {
QListWidgetItem *item =
new QListWidgetItem(text, MainWindow::inst()->ui->hotkeys);
item->setData(Qt::UserRole + 1, name);
MainWindow::inst()->fncs.insert(name, func);
hotkeying::load(name, *func);
}
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow)
{
MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent), ui(new Ui::MainWindow) {
instance = this;
ui->setupUi(this);
setWindowIcon(QIcon(":/icons/icon.png"));
@ -41,25 +40,32 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
QAction *shtoggle = new QAction("Show/Hide", this);
QAction *fullscreen = new QAction("Take fullscreen shot", this);
QAction *area = new QAction("Take area shot", this);
menu->addActions({ quit, shtoggle });
menu->addActions({quit, shtoggle});
menu->addSeparator();
menu->addActions({ fullscreen, area });
menu->addActions({fullscreen, area});
connect(quit, &QAction::triggered, this, &MainWindow::quit);
connect(shtoggle, &QAction::triggered, this, &MainWindow::toggleVisible);
connect(tray, &QSystemTrayIcon::messageClicked, this, &MainWindow::toggleVisible);
connect(tray, &QSystemTrayIcon::activated, this, [this](QSystemTrayIcon::ActivationReason reason) {
if (reason == QSystemTrayIcon::DoubleClick) toggleVisible();
connect(tray, &QSystemTrayIcon::messageClicked, this,
&MainWindow::toggleVisible);
connect(tray, &QSystemTrayIcon::activated, this,
[this](QSystemTrayIcon::ActivationReason reason) {
if (reason == QSystemTrayIcon::DoubleClick)
toggleVisible();
});
connect(fullscreen, &QAction::triggered, this, [] { screenshotter::fullscreenDelayed(); });
connect(area, &QAction::triggered, this, [] { screenshotter::areaDelayed(); });
connect(fullscreen, &QAction::triggered, this,
[] { screenshotter::fullscreenDelayed(); });
connect(area, &QAction::triggered, this,
[] { screenshotter::areaDelayed(); });
tray->setContextMenu(menu);
ui->uploaderList->setSelectionBehavior(QAbstractItemView::SelectRows);
ui->uploaderList->setSelectionMode(QAbstractItemView::SingleSelection);
// Add items to uploader selection
for (Uploader *u : UploaderSingleton::inst().uploaderList()) newUploader(u);
connect(&UploaderSingleton::inst(), &UploaderSingleton::newUploader, this, &MainWindow::newUploader);
for (Uploader *u : UploaderSingleton::inst().uploaderList())
newUploader(u);
connect(&UploaderSingleton::inst(), &UploaderSingleton::newUploader, this,
&MainWindow::newUploader);
// Set filename scheme
if ((settings::settings().contains("fileFormat")))
@ -71,7 +77,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
if (errors.length() == 1)
statusBar()->showMessage(errors.at(0).what());
else
statusBar()->showMessage(QString("Errors visible in console (if present). Count: " + QString::number(errors.size())));
statusBar()->showMessage(
QString("Errors visible in console (if present). Count: " +
QString::number(errors.size())));
// Set delay
if ((settings::settings().contains("delay")))
@ -81,100 +89,73 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
ui->hotkeys->setSelectionMode(QListWidget::SingleSelection);
addHotkeyItem("Fullscreen image", "fullscreen", new std::function<void()>([] { screenshotter::fullscreen(); }));
addHotkeyItem("Area image", "area", new std::function<void()>([] { screenshotter::area(); }));
addHotkeyItem("Fullscreen image", "fullscreen",
new std::function<void()>([] { screenshotter::fullscreen(); }));
addHotkeyItem("Area image", "area",
new std::function<void()>([] { screenshotter::area(); }));
}
MainWindow::~MainWindow()
{
delete ui;
}
MainWindow::~MainWindow() { delete ui; }
void MainWindow::setScheme(QString scheme)
{
ui->nameScheme->setText(scheme);
}
void MainWindow::setScheme(QString scheme) { ui->nameScheme->setText(scheme); }
QDoubleSpinBox *MainWindow::delay()
{
return ui->delay;
}
QDoubleSpinBox *MainWindow::delay() { return ui->delay; }
MainWindow *MainWindow::inst()
{
return instance;
}
MainWindow *MainWindow::inst() { return instance; }
void MainWindow::closeEvent(QCloseEvent *event)
{
void MainWindow::closeEvent(QCloseEvent *event) {
event->ignore();
QTimer::singleShot(0, this, &MainWindow::hide);
}
void MainWindow::quit()
{
QCoreApplication::quit();
}
void MainWindow::quit() { QCoreApplication::quit(); }
void MainWindow::toggleVisible()
{
void MainWindow::toggleVisible() {
this->setVisible(!this->isVisible());
if (this->isVisible())
{
if (this->isVisible()) {
this->raise();
}
}
void MainWindow::newUploader(Uploader *u)
{
void MainWindow::newUploader(Uploader *u) {
QListWidgetItem *item = new QListWidgetItem(u->name());
item->setToolTip(u->description());
ui->uploaderList->addItem(item);
if (u->name() == UploaderSingleton::inst().selectedUploader()) item->setSelected(true);
if (u->name() == UploaderSingleton::inst().selectedUploader())
item->setSelected(true);
}
void MainWindow::on_actionQuit_triggered()
{
quit();
}
void MainWindow::on_actionQuit_triggered() { quit(); }
void MainWindow::on_actionFullscreen_triggered()
{
void MainWindow::on_actionFullscreen_triggered() {
screenshotter::fullscreenDelayed();
}
void MainWindow::on_actionArea_triggered()
{
screenshotter::areaDelayed();
}
void MainWindow::on_actionArea_triggered() { screenshotter::areaDelayed(); }
void MainWindow::on_uploaderList_clicked(const QModelIndex &)
{
void MainWindow::on_uploaderList_clicked(const QModelIndex &) {
QList<QListWidgetItem *> index = ui->uploaderList->selectedItems();
if (index.size() == 1)
{
if (index.size() == 1) {
UploaderSingleton::inst().set(index.at(0)->text());
}
}
void MainWindow::on_nameScheme_textEdited(const QString &arg1)
{
void MainWindow::on_nameScheme_textEdited(const QString &arg1) {
settings::settings().setValue("fileFormat", arg1);
}
void MainWindow::on_delay_valueChanged(double arg1)
{
void MainWindow::on_delay_valueChanged(double arg1) {
settings::settings().setValue("delay", arg1);
}
void MainWindow::on_hotkeys_doubleClicked(const QModelIndex &)
{
if (ui->hotkeys->selectedItems().length() == 1)
{
void MainWindow::on_hotkeys_doubleClicked(const QModelIndex &) {
if (ui->hotkeys->selectedItems().length() == 1) {
QListWidgetItem *i = ui->hotkeys->selectedItems().at(0);
QString str = i->data(Qt::UserRole + 1).toString();
QString seq = QInputDialog::getText(ui->centralWidget, "Hotkey Input", "Insert hotkey:", QLineEdit::Normal,
QString seq = QInputDialog::getText(ui->centralWidget, "Hotkey Input",
"Insert hotkey:", QLineEdit::Normal,
hotkeying::sequence(str));
if (hotkeying::valid(seq)) hotkeying::hotkey(str, QKeySequence(seq), *fncs.value(str));
if (hotkeying::valid(seq))
hotkeying::hotkey(str, QKeySequence(seq), *fncs.value(str));
}
}

14
mainwindow.hpp
View File

@ -9,15 +9,13 @@
#include <uploaders/uploader.hpp>
namespace Ui
{
namespace Ui {
class MainWindow;
}
class MainWindow : public QMainWindow
{
class MainWindow : public QMainWindow {
Q_OBJECT
private slots:
private slots:
void quit();
void toggleVisible();
void newUploader(Uploader *u);
@ -32,7 +30,7 @@ class MainWindow : public QMainWindow
void on_hotkeys_doubleClicked(const QModelIndex &index);
public:
public:
explicit MainWindow(QWidget *parent = 0);
~MainWindow();
Ui::MainWindow *ui;
@ -44,10 +42,10 @@ class MainWindow : public QMainWindow
static MainWindow *inst();
QMap<QString, std::function<void()> *> fncs;
private:
private:
static MainWindow *instance;
protected:
protected:
void closeEvent(QCloseEvent *event);
};

4
notifications.cpp
View File

@ -3,8 +3,8 @@
#include "mainwindow.hpp"
#include <QStatusBar>
void notifications::notify(QString title, QString body, QSystemTrayIcon::MessageIcon icon)
{
void notifications::notify(QString title, QString body,
QSystemTrayIcon::MessageIcon icon) {
MainWindow::inst()->tray->showMessage(title, body, icon, 5000);
MainWindow::inst()->statusBar()->showMessage(title + ": " + body);
}

6
notifications.hpp
View File

@ -4,9 +4,9 @@
#include <QString>
#include <QSystemTrayIcon>
namespace notifications
{
void notify(QString title, QString body, QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information);
namespace notifications {
void notify(QString title, QString body,
QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information);
}
#endif // NOTIFICATIONS_HPP

22
screenshotter.cpp
View File

@ -6,23 +6,23 @@
#include <QDoubleSpinBox>
#include <QTimer>
void screenshotter::area()
{
void screenshotter::area() {
CropEditor *editor = new CropEditor(screenshotutil::fullscreen());
QObject::connect(editor, &CropEditor::cropped, [&](QPixmap *pixmap) { UploaderSingleton::inst().upload(pixmap); });
QObject::connect(editor, &CropEditor::cropped, [&](QPixmap *pixmap) {
UploaderSingleton::inst().upload(pixmap);
});
}
void screenshotter::fullscreen()
{
void screenshotter::fullscreen() {
UploaderSingleton::inst().upload(screenshotutil::fullscreen());
}
void screenshotter::areaDelayed()
{
QTimer::singleShot(MainWindow::inst()->delay()->value() * 1000, &screenshotter::area);
void screenshotter::areaDelayed() {
QTimer::singleShot(MainWindow::inst()->delay()->value() * 1000,
&screenshotter::area);
}
void screenshotter::fullscreenDelayed()
{
QTimer::singleShot(MainWindow::inst()->delay()->value() * 1000, &screenshotter::fullscreen);
void screenshotter::fullscreenDelayed() {
QTimer::singleShot(MainWindow::inst()->delay()->value() * 1000,
&screenshotter::fullscreen);
}

3
screenshotter.hpp
View File

@ -1,8 +1,7 @@
#ifndef SCREENSHOTTER_HPP
#define SCREENSHOTTER_HPP
namespace screenshotter
{
namespace screenshotter {
void fullscreen();
void area();
void fullscreenDelayed();

11
screenshotutil.cpp
View File

@ -5,13 +5,9 @@
#include <QPixmap>
#include <QScreen>
QPixmap *screenshotutil::fullscreen()
{
return window(0);
}
QPixmap *screenshotutil::fullscreen() { return window(0); }
QPixmap *screenshotutil::window(long wid)
{
QPixmap *screenshotutil::window(long wid) {
QScreen *w = QApplication::primaryScreen();
QPixmap screen = w->grabWindow(wid);
QPixmap *pm = new QPixmap(screen.size());
@ -19,7 +15,6 @@ QPixmap *screenshotutil::window(long wid)
return pm;
}
void screenshotutil::toClipboard(QString value)
{
void screenshotutil::toClipboard(QString value) {
QApplication::clipboard()->setText(value);
}

3
screenshotutil.hpp
View File

@ -3,8 +3,7 @@
#include <QPixmap>
namespace screenshotutil
{
namespace screenshotutil {
QPixmap *fullscreen();
QPixmap *window(long wid);
void toClipboard(QString value);

13
settings.cpp
View File

@ -2,14 +2,15 @@
#include <QStandardPaths>
QSettings &settings::settings()
{
static QDir configDir(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation));
if (configDir.path() == QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation))
{
QSettings &settings::settings() {
static QDir configDir(
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation));
if (configDir.path() ==
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation)) {
configDir.mkdir("KShare");
configDir.cd("KShare");
}
static QSettings settings(configDir.absoluteFilePath("settings.ini"), QSettings::IniFormat);
static QSettings settings(configDir.absoluteFilePath("settings.ini"),
QSettings::IniFormat);
return settings;
}

3
settings.hpp
View File

@ -4,8 +4,7 @@
#include <QDir>
#include <QSettings>
namespace settings
{
namespace settings {
QSettings &settings();
}

299
uploaders/customuploader.cpp
View File

@ -12,13 +12,13 @@
using std::runtime_error;
void error(QString absFilePath, QString err)
{
throw runtime_error((QString("Invalid file: ").append(absFilePath) + ": " + err).toStdString());
void error(QString absFilePath, QString err) {
throw runtime_error(
(QString("Invalid file: ").append(absFilePath) + ": " + err)
.toStdString());
}
CustomUploader::CustomUploader(QString absFilePath)
{
CustomUploader::CustomUploader(QString absFilePath) {
types.insert("PNG", "image/png"); // This is a list of supported formats, too
types.insert("GIF", "image/gif");
types.insert("JPG", "image/jpeg");
@ -27,10 +27,10 @@ CustomUploader::CustomUploader(QString absFilePath)
types.insert("MP4", "video/mp4");
// Let's go
QFile file(absFilePath);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) error(absFilePath, file.errorString());
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
error(absFilePath, file.errorString());
QJsonDocument doc = QJsonDocument::fromJson(file.readAll());
if (!doc.isObject())
{
if (!doc.isObject()) {
error(absFilePath, "Root not an object");
}
QJsonObject obj = doc.object();
@ -38,19 +38,17 @@ CustomUploader::CustomUploader(QString absFilePath)
error(absFilePath, "name is not a string");
else
uName = obj["name"].toString();
if (!obj.contains("desc"))
{
if (!obj.contains("desc")) {
if (!obj["desc"].isString())
/*t*/ error(absFilePath, "desc not a string");
else
desc = obj["desc"].toString();
}
else
} else
desc = absFilePath;
QJsonValue m = obj["method"];
if (!m.isUndefined() && !m.isNull())
{
if (!m.isString()) error(absFilePath, "method not a string");
if (!m.isUndefined() && !m.isNull()) {
if (!m.isString())
error(absFilePath, "method not a string");
QString toCheck = m.toString().toLower();
if (toCheck == "post")
method = HttpMethod::POST;
@ -58,18 +56,16 @@ CustomUploader::CustomUploader(QString absFilePath)
error(absFilePath, "method invalid");
}
QJsonValue url = obj["target"];
if (!url.isString())
{
if (!url.isString()) {
error(absFilePath, "target missing");
}
QUrl target(url.toString());
if (!target.isValid()) error(absFilePath, "target not URL");
if (!target.isValid())
error(absFilePath, "target not URL");
this->target = target;
QJsonValue formatValue = obj["format"];
if (!formatValue.isUndefined() && !formatValue.isNull())
{
if (formatValue.isString())
{
if (!formatValue.isUndefined() && !formatValue.isNull()) {
if (formatValue.isString()) {
QString formatString = formatValue.toString().toLower();
if (formatString == "x-www-form-urlencoded")
format = RequestFormat::X_WWW_FORM_URLENCODED;
@ -80,71 +76,53 @@ CustomUploader::CustomUploader(QString absFilePath)
else
error(absFilePath, "format invalid");
}
}
else
} else
error(absFilePath, "format provided but not string");
QJsonValue imageValue = obj["imageformat"];
if (!imageValue.isString())
{
if (!imageValue.isString()) {
error(absFilePath, "imageformat not string");
}
QString imageFormat = imageValue.toString();
if (imageFormat == "base64" || QRegExp("base64\\([^+]+\\+[^+]+)").exactMatch(imageFormat)
|| QRegExp("[^+]+\\+[^+]+").exactMatch(imageFormat))
{
if (imageFormat == "base64" ||
QRegExp("base64\\([^+]+\\+[^+]+)").exactMatch(imageFormat) ||
QRegExp("[^+]+\\+[^+]+").exactMatch(imageFormat)) {
this->iFormat = imageFormat;
}
else
} else
error(absFilePath, "imageformat invalid");
QJsonValue bodyValue = obj["body"];
if (format != RequestFormat::PLAIN)
{
if (bodyValue.isUndefined()) error(absFilePath, "body not set");
if (format != RequestFormat::PLAIN) {
if (bodyValue.isUndefined())
error(absFilePath, "body not set");
if (bodyValue.isObject())
body = bodyValue;
else
error(absFilePath, "body not object");
}
else
{
if (bodyValue.isString())
{
} else {
if (bodyValue.isString()) {
body = bodyValue;
}
else
} else
error(absFilePath, "body not string (reason: format: PLAIN)");
}
QJsonValue headerVal = obj["headers"];
if (!(headerVal.isUndefined() || headerVal.isNull()))
{
if (!headerVal.isObject()) error(absFilePath, "headers must be object");
if (!(headerVal.isUndefined() || headerVal.isNull())) {
if (!headerVal.isObject())
error(absFilePath, "headers must be object");
headers = headerVal.toObject();
}
else
} else
headers = QJsonObject();
QJsonValue returnPsVal = obj["return"];
if (returnPsVal.isString())
{
if (returnPsVal.isString()) {
returnPathspec = returnPsVal.toString();
}
else
} else
error(absFilePath, "return invalid");
}
QString CustomUploader::name()
{
return uName;
}
QString CustomUploader::name() { return uName; }
QString CustomUploader::description()
{
return desc;
}
QString CustomUploader::description() { return desc; }
QString getCType(RequestFormat format, QString plainType)
{
switch (format)
{
QString getCType(RequestFormat format, QString plainType) {
switch (format) {
case RequestFormat::X_WWW_FORM_URLENCODED:
return "application/x-www-form-urlencoded";
case RequestFormat::JSON:
@ -155,24 +133,26 @@ QString getCType(RequestFormat format, QString plainType)
return plainType;
}
QList<QPair<QString, QString>> getHeaders(QJsonObject h, QString imageFormat, QMap<QString, QString> types, RequestFormat format)
{
QList<QPair<QString, QString>> getHeaders(QJsonObject h, QString imageFormat,
QMap<QString, QString> types,
RequestFormat format) {
QList<QPair<QString, QString>> headers;
for (QString s : h.keys())
{
if (s.toLower() == "content-type") continue;
for (QString s : h.keys()) {
if (s.toLower() == "content-type")
continue;
QJsonValue v = h[s];
if (!v.isString())
headers << QPair<QString, QString>(s, QJsonDocument::fromVariant(v.toVariant()).toJson());
headers << QPair<QString, QString>(
s, QJsonDocument::fromVariant(v.toVariant()).toJson());
else
headers << QPair<QString, QString>(s, v.toString());
}
headers << QPair<QString, QString>("Content-Type", getCType(format, types.value(imageFormat)));
headers << QPair<QString, QString>(
"Content-Type", getCType(format, types.value(imageFormat)));
return headers;
}
QByteArray imageBytes(QPixmap *pixmap, QString format)
{
QByteArray imageBytes(QPixmap *pixmap, QString format) {
QByteArray returnVal;
QBuffer buff(&returnVal);
buff.open(QIODevice::WriteOnly);
@ -180,8 +160,7 @@ QByteArray imageBytes(QPixmap *pixmap, QString format)
return returnVal;
}
QString CustomUploader::getFormatString(bool animated)
{
QString CustomUploader::getFormatString(bool animated) {
if (iFormat == "base64")
return animated ? "GIF" : "PNG";
else if (QRegExp("[^+]+\\+[^+]+").exactMatch(iFormat))
@ -191,43 +170,37 @@ QString CustomUploader::getFormatString(bool animated)
return "";
}
QJsonObject recurseAndReplace(QJsonObject &body, QByteArray &data, QString contentType)
{
QJsonObject recurseAndReplace(QJsonObject &body, QByteArray &data,
QString contentType) {
QJsonObject o;
for (QString s : body.keys())
{
for (QString s : body.keys()) {
QJsonValue v = body[s];
if (v.isObject())
{
if (v.isObject()) {
QJsonObject vo = v.toObject();
o.insert(s, recurseAndReplace(vo, data, contentType));
}
else if (v.isString())
{
} else if (v.isString()) {
QString str = v.toString();
if (str.startsWith("/") && str.endsWith("/"))
{
o.insert(s, str.replace("%image", data).replace("%contenttype", contentType));
if (str.startsWith("/") && str.endsWith("/")) {
o.insert(
s,
str.replace("%image", data).replace("%contenttype", contentType));
}
}
}
return o;
}
QString parsePathspec(QJsonDocument &response, QString &pathspec)
{
if (!pathspec.startsWith("."))
{
QString parsePathspec(QJsonDocument &response, QString &pathspec) {
if (!pathspec.startsWith(".")) {
// Does not point to anything
return "";
}
else
{
if (!response.isObject()) return "";
QStringList fields = pathspec.right(pathspec.length() - 1).split('.', QString::SkipEmptyParts);
} else {
if (!response.isObject())
return "";
QStringList fields = pathspec.right(pathspec.length() - 1)
.split('.', QString::SkipEmptyParts);
QJsonObject o = response.object();
if (pathspec == ".")
{
if (pathspec == ".") {
return QString::fromUtf8(response.toJson());
}
QJsonValue val = o[fields.at(0)];
@ -236,15 +209,16 @@ QString parsePathspec(QJsonDocument &response, QString &pathspec)
else if (val.isString())
return val.toString();
else if (!val.isObject())
return QString::fromUtf8(QJsonDocument::fromVariant(val.toVariant()).toJson());
for (int i = 1; i < fields.size(); i++)
{
return QString::fromUtf8(
QJsonDocument::fromVariant(val.toVariant()).toJson());
for (int i = 1; i < fields.size(); i++) {
if (val.isUndefined() || val.isNull())
return "";
else if (val.isString())
return val.toString();
else if (!val.isObject())
return QString::fromUtf8(QJsonDocument::fromVariant(val.toVariant()).toJson());
return QString::fromUtf8(
QJsonDocument::fromVariant(val.toVariant()).toJson());
else
val = val.toObject()[fields.at(i)];
}
@ -253,108 +227,101 @@ QString parsePathspec(QJsonDocument &response, QString &pathspec)
else if (val.isString())
return val.toString();
else if (!val.isObject())
return QString::fromUtf8(QJsonDocument::fromVariant(val.toVariant()).toJson());
return QString::fromUtf8(
QJsonDocument::fromVariant(val.toVariant()).toJson());
}
return "";
}
void parseResult(QJsonDocument result, QString returnPathspec, QString name)
{
if (result.isObject())
{
void parseResult(QJsonDocument result, QString returnPathspec, QString name) {
if (result.isObject()) {
qDebug() << result.object()[".url"];
QString url = parsePathspec(result, returnPathspec);
if (!url.isEmpty())
{
if (!url.isEmpty()) {
QApplication::clipboard()->setText(url);
notifications::notify("KShare Custom Uploader " + name, "Copied upload link to clipboard!");
}
else
notifications::notify("KShare Custom Uploader " + name, "Upload done, but result empty!");
}
else
notifications::notify("KShare Custom Uploader " + name, "Upload done, but result is not JSON Object!");
notifications::notify("KShare Custom Uploader " + name,
"Copied upload link to clipboard!");
} else
notifications::notify("KShare Custom Uploader " + name,
"Upload done, but result empty!");
} else
notifications::notify("KShare Custom Uploader " + name,
"Upload done, but result is not JSON Object!");
}
void CustomUploader::doUpload(QPixmap *pixmap)
{
void CustomUploader::doUpload(QPixmap *pixmap) {
auto h = getHeaders(headers, getFormatString(false), types, this->format);
QString format = getFormatString(false); // Soon:tm:
QByteArray data;
QByteArray imgData = imageBytes(pixmap, format);
if (iFormat == "base64" || QRegExp("base64\\([^+]\\+[^+]\\)").exactMatch(iFormat)) imgData = imgData.toBase64();
switch (this->format)
{
case RequestFormat::PLAIN:
{
if (iFormat == "base64" ||
QRegExp("base64\\([^+]\\+[^+]\\)").exactMatch(iFormat))
imgData = imgData.toBase64();
switch (this->format) {
case RequestFormat::PLAIN: {
data = imgData;
}
break;
case RequestFormat::JSON:
{
if (body.isString())
{
QStringList split = body.toString().replace("%contenttype", types.value(format)).split("%imagedata");
for (int i = 0; i < split.size(); i++)
{
} break;
case RequestFormat::JSON: {
if (body.isString()) {
QStringList split = body.toString()
.replace("%contenttype", types.value(format))
.split("%imagedata");
for (int i = 0; i < split.size(); i++) {
data.append(split[i]);
if (i < split.size() - 1) data.append(imgData);
if (i < split.size() - 1)
data.append(imgData);
}
}
else
{
} else {
QJsonObject vo = body.toObject();
data = QJsonDocument::fromVariant(recurseAndReplace(vo, imgData, types.value(format)).toVariantMap()).toJson();
data = QJsonDocument::fromVariant(
recurseAndReplace(vo, imgData, types.value(format))
.toVariantMap())
.toJson();
}
}
break;
case RequestFormat::X_WWW_FORM_URLENCODED:
{
} break;
case RequestFormat::X_WWW_FORM_URLENCODED: {
QJsonObject body = this->body.toObject();
for (QString key : body.keys())
{
for (QString key : body.keys()) {
QJsonValue val = body[key];
if (val.isString())
{
if (val.isString()) {
QString str = val.toString();
QByteArray strB;
if (str.startsWith("/") && str.endsWith("/"))
{
if (str.startsWith("/") && str.endsWith("/")) {
str = str.mid(1, str.length() - 2);
QStringList split = str.replace("%contenttype", types.value(format)).split("%imagedata");
for (int i = 0; i < split.size(); i++)
{
QStringList split = str.replace("%contenttype", types.value(format))
.split("%imagedata");
for (int i = 0; i < split.size(); i++) {
strB.append(split[i]);
if (i < split.size() - 1) strB.append(imgData);
if (i < split.size() - 1)
strB.append(imgData);
}
}
data.append(QUrl::toPercentEncoding(key)).append('=').append(strB);
}
else
{
if (!data.isEmpty()) data.append('&');
} else {
if (!data.isEmpty())
data.append('&');
data.append(QUrl::toPercentEncoding(key))
.append('=')
.append(QUrl::toPercentEncoding(QJsonDocument::fromVariant(body[key].toVariant()).toJson()));
.append(QUrl::toPercentEncoding(
QJsonDocument::fromVariant(body[key].toVariant()).toJson()));
}
}
} break;
}
break;
}
switch (method)
{
switch (method) {
case HttpMethod::POST:
if (returnPathspec == "|")
{
ioutils::postData(target, h, data, [&](QByteArray result, QNetworkReply *) {
if (returnPathspec == "|") {
ioutils::postData(
target, h, data, [&](QByteArray result, QNetworkReply *) {
QApplication::clipboard()->setText(QString::fromUtf8(result));
notifications::notify("KShare Custom Uploader " + name(), "Copied upload result to clipboard!");
notifications::notify("KShare Custom Uploader " + name(),
"Copied upload result to clipboard!");
});
}
else
{
} else {
ioutils::postJson(target, h, data,
[&](QJsonDocument result, QNetworkReply *) { parseResult(result, returnPathspec, name()); });
[&](QJsonDocument result, QNetworkReply *) {
parseResult(result, returnPathspec, name());
});
}
break;
}

19
uploaders/customuploader.hpp
View File

@ -6,21 +6,12 @@
#include <QMap>
#include <QUrl>
enum class HttpMethod
{
POST
};
enum class HttpMethod { POST };
enum class RequestFormat
{
X_WWW_FORM_URLENCODED,
JSON,
PLAIN
};
enum class RequestFormat { X_WWW_FORM_URLENCODED, JSON, PLAIN };
class CustomUploader : public Uploader
{
public:
class CustomUploader : public Uploader {
public:
CustomUploader(QString absFilePath);
QString name();
QString description();
@ -28,7 +19,7 @@ class CustomUploader : public Uploader
QString getFormatString(bool animated);
QMap<QString, QString> types;
private:
private:
QString desc;
QString uName;
RequestFormat format = RequestFormat::JSON;

3
uploaders/default/clipboarduploader.cpp
View File

@ -4,8 +4,7 @@
#include <QClipboard>
#include <notifications.hpp>
void ClipboardUploader::doUpload(QPixmap *pixmap)
{
void ClipboardUploader::doUpload(QPixmap *pixmap) {
QApplication::clipboard()->setImage(pixmap->toImage());
notifications::notify("KShare", "Copied to clipboard!");
}

15
uploaders/default/clipboarduploader.hpp
View File

@ -4,17 +4,10 @@
#include <QPixmap>
#include <uploaders/uploader.hpp>
class ClipboardUploader : public Uploader
{
public:
QString name()
{
return "clipboard";
}
QString description()
{
return "Copies the image to clipboard";
}
class ClipboardUploader : public Uploader {
public:
QString name() { return "clipboard"; }
QString description() { return "Copies the image to clipboard"; }
void doUpload(QPixmap *pixmap);
};

16
uploaders/default/imguruploader.cpp
View File

@ -7,19 +7,23 @@
#include <notifications.hpp>
#include <screenshotutil.hpp>
void ImgurUploader::doUpload(QPixmap *pixmap)
{
void ImgurUploader::doUpload(QPixmap *pixmap) {
QByteArray byteArray;
QBuffer buffer(&byteArray);
pixmap->save(&buffer, "PNG");
ioutils::postJson(QUrl("https://api.imgur.com/3/image"),
ioutils::postJson(
QUrl("https://api.imgur.com/3/image"),
QList<QPair<QString, QString>>()
<< QPair<QString, QString>("Content-Type", "application/x-www-form-urlencoded")
<< QPair<QString, QString>("Authorization", "Client-ID 8a98f183fc895da"),
<< QPair<QString, QString>("Content-Type",
"application/x-www-form-urlencoded")
<< QPair<QString, QString>("Authorization",
"Client-ID 8a98f183fc895da"),
byteArray, [](QJsonDocument res, QNetworkReply *) {
QString result = res.object()["data"].toObject()["link"].toString();
screenshotutil::toClipboard(result);
notifications::notify("KShare imgur Uploader ",
result.isEmpty() ? "Failed upload!" : "Upload done, but result empty!");
result.isEmpty()
? "Failed upload!"
: "Upload done, but result empty!");
});
}

15
uploaders/default/imguruploader.hpp
View File

@ -3,17 +3,10 @@
#include "../uploader.hpp"
class ImgurUploader : public Uploader
{
public:
QString name()
{
return "imgur";
}
QString description()
{
return "imgur.com uploader";
}
class ImgurUploader : public Uploader {
public:
QString name() { return "imgur"; }
QString description() { return "imgur.com uploader"; }
void doUpload(QPixmap *pixmap);
};

5
uploaders/uploader.hpp
View File

@ -4,9 +4,8 @@
#include <QPixmap>
#include <QString>
class Uploader
{
public:
class Uploader {
public:
virtual void doUpload(QPixmap *pixmap) = 0;
virtual QString name() = 0;
virtual QString description() = 0;

62
uploaders/uploadersingleton.cpp
View File

@ -8,20 +8,16 @@
#include <formatter.hpp>
#include <settings.hpp>
UploaderSingleton::UploaderSingleton() : QObject()
{
QDir configDir(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation));
UploaderSingleton::UploaderSingleton() : QObject() {
QDir configDir(
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation));
configDir.mkpath("KShare/uploaders");
configDir.cd("KShare/uploaders");
configDir.setNameFilters({ "*.uploader" });
for (QString file : configDir.entryList())
{
try
{
configDir.setNameFilters({"*.uploader"});
for (QString file : configDir.entryList()) {
try {
registerUploader(new CustomUploader(configDir.absoluteFilePath(file)));
}
catch (std::runtime_error e)
{
} catch (std::runtime_error e) {
qWarning() << e.what();
errs << e;
}
@ -36,31 +32,28 @@ UploaderSingleton::UploaderSingleton() : QObject()
uploader = settings::settings().value("uploader").toString();
else
settings::settings().setValue("uploader", uploader);
if (!uploaders.contains(uploader))
{
if (!uploaders.contains(uploader)) {
settings::settings().setValue("uploader", uploader);
uploader = "imgur";
}
}
void UploaderSingleton::registerUploader(Uploader *uploader)
{
if (uploaders.contains(uploader->name()))
{
throw std::runtime_error(("Ambigious uploader " + uploader->name()).toStdString());
void UploaderSingleton::registerUploader(Uploader *uploader) {
if (uploaders.contains(uploader->name())) {
throw std::runtime_error(
("Ambigious uploader " + uploader->name()).toStdString());
}
uploaders.insert(uploader->name(), uploader);
emit newUploader(uploader);
}
void UploaderSingleton::upload(QPixmap *pixmap)
{
if (settings::settings().contains("fileFormat"))
{
void UploaderSingleton::upload(QPixmap *pixmap) {
if (settings::settings().contains("fileFormat")) {
QString format = settings::settings().value("fileFormat").toString();
if (!format.isEmpty())
{
pixmap->save(QDir(QStandardPaths::writableLocation(QStandardPaths::PicturesLocation)).absoluteFilePath(formatter::format(format) + ".png"),
if (!format.isEmpty()) {
pixmap->save(QDir(QStandardPaths::writableLocation(
QStandardPaths::PicturesLocation))
.absoluteFilePath(formatter::format(format) + ".png"),
"PNG");
}
}
@ -68,26 +61,17 @@ void UploaderSingleton::upload(QPixmap *pixmap)
delete pixmap;
}
QList<Uploader *> UploaderSingleton::uploaderList()
{
QList<Uploader *> UploaderSingleton::uploaderList() {
return uploaders.values();
}
void UploaderSingleton::set(QString uploader)
{
if (uploaders.contains(uploader))
{
void UploaderSingleton::set(QString uploader) {
if (uploaders.contains(uploader)) {
this->uploader = uploader;
settings::settings().setValue("uploader", uploader);
}
}
QString UploaderSingleton::selectedUploader()
{
return uploader;
}
QString UploaderSingleton::selectedUploader() { return uploader; }
QList<std::runtime_error> UploaderSingleton::errors()
{
return errs;
}
QList<std::runtime_error> UploaderSingleton::errors() { return errs; }

12
uploaders/uploadersingleton.hpp
View File

@ -4,12 +4,10 @@
#include "uploader.hpp"
#include <QMap>
class UploaderSingleton : public QObject
{
class UploaderSingleton : public QObject {
Q_OBJECT
public:
static UploaderSingleton &inst()
{
public:
static UploaderSingleton &inst() {
static UploaderSingleton inst;
return inst;
}
@ -19,10 +17,10 @@ class UploaderSingleton : public QObject
void set(QString uploader);
QString selectedUploader();
QList<std::runtime_error> errors();
signals:
signals:
void newUploader(Uploader *u);
private:
private:
UploaderSingleton();
QMap<QString, Uploader *> uploaders;
QString uploader = "imgur";