diff --git a/cropeditor/cropscene.cpp b/cropeditor/cropscene.cpp
index c63de90..63a0c32 100644
--- a/cropeditor/cropscene.cpp
+++ b/cropeditor/cropscene.cpp
@@ -60,42 +60,38 @@ CropScene::CropScene(QObject *parent, QPixmap pixmap)
}
});
- QAction *reset = menu->addAction("Reset pen selection");
- connect(reset, &QAction::triggered, [this] {
- menu->setActiveAction(0);
- setDrawingSelection("None", [] { return nullptr; });
- });
+ addDrawingAction(menu, "Crop", ":/icons/crop.svg", [] { return nullptr; });
menu->addSeparator();
- QAction *settings = new QAction;
- settings->setToolTip("Settings");
- settings->setIcon(QIcon(":/icons/settings.svg"));
+ QAction *action = new QAction;
+ action->setToolTip("Settings");
+ action->setIcon(QIcon(":/icons/settings.svg"));
menu->addSeparator();
display = menu->addAction(drawingName);
display->setDisabled(true);
- connect(settings, &QAction::triggered, [&] {
+ connect(action, &QAction::triggered, [&] {
hide();
BrushPenSelection(this).exec();
show();
});
- QAction *font = menu->addAction("");
- font->setIcon(QIcon(":/icons/fontsettings.svg"));
- connect(font, &QAction::triggered, this, &CropScene::fontAsk);
+ action = menu->addAction("");
+ action->setIcon(QIcon(":/icons/fontsettings.svg"));
+ connect(action, &QAction::triggered, this, &CropScene::fontAsk);
- menu->addAction(settings);
+ menu->addAction(action);
menu->addSeparator();
- QAction *confirm = menu->addAction("");
- confirm->setToolTip("Confirm");
- confirm->setIcon(QIcon(":/icons/accept.svg"));
- connect(confirm, &QAction::triggered, [this] { done(true); });
- menu->addAction(confirm);
+ action = menu->addAction("");
+ action->setToolTip("Confirm");
+ action->setIcon(QIcon(":/icons/accept.svg"));
+ connect(action, &QAction::triggered, [this] { done(true); });
+ menu->addAction(action);
- QAction *cancel = menu->addAction("");
- cancel->setToolTip("Cancel");
- cancel->setIcon(QIcon(":/icons/cancel.svg"));
- connect(cancel, &QAction::triggered, [this] { done(false); });
- menu->addAction(cancel);
+ action = menu->addAction("");
+ action->setToolTip("Cancel");
+ action->setIcon(QIcon(":/icons/cancel.svg"));
+ connect(action, &QAction::triggered, [this] { done(false); });
+ menu->addAction(action);
QPolygonF cursorPoly;
cursorPoly << QPoint(-10, 0) //
diff --git a/icon.qrc b/icon.qrc
index ee9e8d0..f19863d 100644
--- a/icon.qrc
+++ b/icon.qrc
@@ -9,12 +9,13 @@
icons/text.svg
icons/delete.svg
icons/arrow.svg
- icons/circle.svg
icons/settings.svg
icons/fontsettings.svg
icons/erase.svg
icons/blur.png
icons/accept.svg
icons/cancel.svg
+ icons/crop.svg
+ icons/circle.svg
diff --git a/icons/blur.png b/icons/blur.png
index d0daf57..d105e5b 100644
Binary files a/icons/blur.png and b/icons/blur.png differ
diff --git a/icons/blur.svg b/icons/blur.svg
index 80e2423..9eae77a 100644
--- a/icons/blur.svg
+++ b/icons/blur.svg
@@ -11,21 +11,24 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="1024"
height="1024"
- viewBox="0 0 270.93333 270.93334"
+ viewBox="0 0 270.93333 270.93333"
version="1.1"
id="svg8"
- sodipodi:docname="TEXT.svg"
+ sodipodi:docname="blur.svg"
+ inkscape:export-filename="/media/arsen/Data/CandCPP/KShare/icons/blur.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96"
inkscape:version="0.92.1 r">
+ id="filter878">
+ id="feGaussianBlur876" />
-
+ transform="translate(0,-26.066725)">
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:21.41490173;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill;filter:url(#filter878)"
+ id="rect10"
+ width="181.7851"
+ height="181.7851"
+ x="44.574112"
+ y="70.640831"
+ ry="0" />
diff --git a/icons/crop.svg b/icons/crop.svg
new file mode 100644
index 0000000..fb234b0
--- /dev/null
+++ b/icons/crop.svg
@@ -0,0 +1,76 @@
+
+
+
+
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 7bcc344..a2522bb 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -6,6 +6,7 @@
#include "ui_mainwindow.h"
#include
#include
+#include
#include
#include
#include
diff --git a/mainwindow.ui b/mainwindow.ui
index 4c409dc..e3c21b1 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -96,6 +96,9 @@
&Quit
+
+ Ctrl+Q
+