Browse Source

Add more icons

tags/v5.0.0^2
ArsenArsen 5 years ago
parent
commit
687c378456
No known key found for this signature in database
GPG Key ID: C631EC9C50708CF4
  1. 44
      cropeditor/cropscene.cpp
  2. 3
      icon.qrc
  3. BIN
      icons/blur.png
  4. 44
      icons/blur.svg
  5. 76
      icons/crop.svg
  6. 1
      mainwindow.cpp
  7. 3
      mainwindow.ui

44
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);
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("Confirm");
action->setIcon(QIcon(":/icons/accept.svg"));
connect(action, &QAction::triggered, [this] { done(true); });
menu->addAction(action);
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) //

3
icon.qrc

@ -9,12 +9,13 @@
<file>icons/text.svg</file>
<file>icons/delete.svg</file>
<file>icons/arrow.svg</file>
<file>icons/circle.svg</file>
<file>icons/settings.svg</file>
<file>icons/fontsettings.svg</file>
<file>icons/erase.svg</file>
<file>icons/blur.png</file>
<file>icons/accept.svg</file>
<file>icons/cancel.svg</file>
<file>icons/crop.svg</file>
<file>icons/circle.svg</file>
</qresource>
</RCC>

BIN
icons/blur.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 59 KiB

44
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">
<defs
id="defs2">
<filter
style="color-interpolation-filters:sRGB;"
inkscape:label="Blur"
id="filter8705">
id="filter878">
<feGaussianBlur
stdDeviation="20 20"
result="blur"
id="feGaussianBlur8703" />
id="feGaussianBlur876" />
</filter>
</defs>
<sodipodi:namedview
@ -35,9 +38,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.5"
inkscape:cx="883.00002"
inkscape:cy="511.99997"
inkscape:zoom="0.35"
inkscape:cx="2043.7881"
inkscape:cy="126.79149"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
@ -63,25 +66,14 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-26.06665)">
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:361.58081055px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:9.03952026"
x="5.47505"
y="298.96558"
id="text4544"
transform="scale(1.0496228,0.95272321)"><tspan
sodipodi:role="line"
id="tspan4542"
x="5.47505"
y="618.87982"
style="stroke-width:9.03952026" /></text>
transform="translate(0,-26.066725)">
<rect
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:33.86666667;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill;filter:url(#filter8705)"
id="rect6112"
width="237.06667"
height="237.06667"
x="16.933334"
y="42.999985" />
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" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

76
icons/crop.svg

@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="1024"
height="1024"
viewBox="0 0 270.93333 270.93333"
version="1.1"
id="svg8"
inkscape:version="0.92.1 r"
sodipodi:docname="crop.svg">
<defs
id="defs2" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.35"
inkscape:cx="1550.9309"
inkscape:cy="126.79149"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1920"
inkscape:window-height="1055"
inkscape:window-x="1971"
inkscape:window-y="25"
inkscape:window-maximized="0" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-26.066725)">
<rect
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"
id="rect10"
width="181.7851"
height="181.7851"
x="44.574112"
y="70.640831"
ry="0" />
<path
style="fill:none;stroke:#000000;stroke-width:21.16666667;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d="M 44.57411,70.64083 43.845239,25.613154"
id="path12"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:21.16666603;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M -0.45356506,71.369702 44.574112,70.640831"
id="path12-3"
inkscape:connector-curvature="0" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.5 KiB

1
mainwindow.cpp

@ -6,6 +6,7 @@
#include "ui_mainwindow.h"
#include <QDebug>
#include <QMessageBox>
#include <QShortcut>
#include <colorpicker/colorpickerscene.hpp>
#include <formats.hpp>
#include <hotkeying.hpp>

3
mainwindow.ui

@ -96,6 +96,9 @@
<property name="text">
<string>&amp;Quit</string>
</property>
<property name="shortcut">
<string>Ctrl+Q</string>
</property>
</action>
<action name="actionFullscreen">
<property name="text">

Loading…
Cancel
Save