benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add rectangle button

Browse Source
This commit is contained in:
lupoDharkael
2017-06-02 01:59:43 +02:00
parent 1802d05fde
commit c4849142e8
10 changed files with 172 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/capture/button.cpp
View File

@@ -119,7 +119,7 @@ QIcon Button::getIcon(const Type t, bool isWhite) {
case Type::pencil:
path += "pencil.png";
break;
case Type::rectangle:
case Type::selection:
path += "square-outline.png";
break;
case Type::save:
@@ -134,6 +134,9 @@ QIcon Button::getIcon(const Type t, bool isWhite) {
case Type::move:
path += "cursor-move.png";
break;
case Type::rectangle:
path += "square.png";
break;
default:
break;
}
@@ -261,16 +264,17 @@ Button::typeData Button::typeTooltip = {
{Button::Type::exit, QT_TR_NOOP("Leaves the capture screen")},
{Button::Type::copy, QT_TR_NOOP("Copies the selecion into the clipboard")},
{Button::Type::save, QT_TR_NOOP("Opens the save image window")},
{Button::Type::pencil, QT_TR_NOOP("Sets the paint tool to a pencil")},
{Button::Type::line, QT_TR_NOOP("Sets the paint tool to a line drawer")},
{Button::Type::arrow, QT_TR_NOOP("Sets the paint tool to an arrow drawer")},
{Button::Type::rectangle, QT_TR_NOOP("Sets the paint tool to a rectagle drawer")},
{Button::Type::circle, QT_TR_NOOP("Sets the paint tool to a circle drawer")},
{Button::Type::marker, QT_TR_NOOP("Sets the paint tool to a marker")},
{Button::Type::text, QT_TR_NOOP("Sets the paint tool to a text creator")},
{Button::Type::pencil, QT_TR_NOOP("Sets the Pencil as the paint tool")},
{Button::Type::line, QT_TR_NOOP("Sets the Line as the paint tool")},
{Button::Type::arrow, QT_TR_NOOP("Sets the Arrow as the paint tool")},
{Button::Type::rectangle, QT_TR_NOOP("Sets the Rectangle as the paint tool")},
{Button::Type::circle, QT_TR_NOOP("Sets the Circle as the paint tool")},
{Button::Type::marker, QT_TR_NOOP("Sets the Marker as the paint tool")},
{Button::Type::text, QT_TR_NOOP("Sets the Text as the paint tool")},
{Button::Type::colorPicker, QT_TR_NOOP("Opens the color picker widget")},
{Button::Type::undo, QT_TR_NOOP("Undo the last modification")},
{Button::Type::imageUploader, QT_TR_NOOP("Upload the selection to Imgur")},
{Button::Type::imageUploader, QT_TR_NOOP("Uploads the selection to Imgur")},
{Button::Type::selection, QT_TR_NOOP("Sets the Selection as the paint tool")},
{Button::Type::move, QT_TR_NOOP("Move the selection area")}
};
@@ -290,6 +294,7 @@ Button::typeData Button::typeName = {
{Button::Type::colorPicker, QT_TR_NOOP("Color Picker")},
{Button::Type::undo, QT_TR_NOOP("Undo")},
{Button::Type::imageUploader, QT_TR_NOOP("Image Uploader")},
{Button::Type::selection, QT_TR_NOOP("Rectangular Selection")},
{Button::Type::move, QT_TR_NOOP("Move")}
};

1
src/capture/button.h
View File

@@ -43,6 +43,7 @@ public:
undo,
imageUploader,
move,
selection,
last, // used for iteration over the enum
text,
mouseVisibility,

18
src/capture/capturemodification.cpp
View File

@@ -25,9 +25,12 @@ CaptureModification::CaptureModification(const Button::Type t, const QPoint p,
const QColor c) : m_color(c), m_type(t)
{
m_coords.append(p);
if (m_type == Button::Type::circle || m_type == Button::Type::rectangle
|| m_type == Button::Type::arrow || m_type == Button::Type::line ||
m_type == Button::Type::marker) {
if (m_type == Button::Type::circle
|| m_type == Button::Type::rectangle
|| m_type == Button::Type::arrow
|| m_type == Button::Type::line
|| m_type == Button::Type::marker
|| m_type == Button::Type::selection) {
m_coords.append(p);
}
}
@@ -49,9 +52,12 @@ QVector<QPoint> CaptureModification::getPoints() const {
}
// addPoint adds a point to the vector of points
void CaptureModification::addPoint(const QPoint p) {
if (m_type == Button::Type::circle || m_type == Button::Type::rectangle
|| m_type == Button::Type::arrow || m_type == Button::Type::line ||
m_type == Button::Type::marker) {
if (m_type == Button::Type::circle
|| m_type == Button::Type::rectangle
|| m_type == Button::Type::arrow
|| m_type == Button::Type::line
|| m_type == Button::Type::marker
|| m_type == Button::Type::selection) {
m_coords[1] = p;
} else {
m_coords.append(p);

4
src/capture/screenshot.cpp
View File

@@ -228,7 +228,11 @@ void Screenshot::paintInPainter(QPainter &painter,
case Button::Type::pencil:
painter.drawPolyline(points.data(), points.size());
break;
case Button::Type::selection:
painter.drawRect(QRect(points[0], points[1]));
break;
case Button::Type::rectangle:
painter.setBrush(QBrush(modification.getColor()));
painter.drawRect(QRect(points[0], points[1]));
break;
default: