Add initial support for last rect area #150

ksnip · Sep 25, 2019 · 8378d18 · 8378d18
1 parent 8a61d15
commit 8378d18
Show file tree

Hide file tree

Showing 14 changed files with 80 additions and 14 deletions.
diff --git a/src/backend/config/KsnipConfig.cpp b/src/backend/config/KsnipConfig.cpp
@@ -469,6 +469,19 @@ void KsnipConfig::setSnippingCursorColor(const QColor& color)
 	saveValue(KsnipConfigOptions::snippingCursorColorString(), color);
 }
 
+QRect KsnipConfig::lastRectArea() const
+{
+	return loadValue(KsnipConfigOptions::lastRectAreaString(), QRect()).value<QRect>();
+}
+
+void KsnipConfig::setLastRectArea(const QRect &rectArea)
+{
+	if (lastRectArea() == rectArea) {
+		return;
+	}
+	saveValue(KsnipConfigOptions::lastRectAreaString(), rectArea);
+}
+
 // Imgur Uploader
 
 QString KsnipConfig::imgurUsername() const

diff --git a/src/backend/config/KsnipConfig.h b/src/backend/config/KsnipConfig.h
@@ -129,6 +129,9 @@ class KsnipConfig : public QObject
     QColor snippingCursorColor() const;
     void setSnippingCursorColor(const QColor &color);
 
+    QRect lastRectArea() const;
+    void setLastRectArea(const QRect &rectArea);
+
     // Imgur Uploader
 
     QString imgurUsername() const;

diff --git a/src/backend/config/KsnipConfigOptions.cpp b/src/backend/config/KsnipConfigOptions.cpp
@@ -149,6 +149,11 @@ QString KsnipConfigOptions::snippingCursorColorString()
 	return imageGrabberSectionString() + QStringLiteral("SnippingCursorColor");
 }
 
+QString KsnipConfigOptions::lastRectAreaString()
+{
+	return imageGrabberSectionString() + QStringLiteral("LastRectArea");
+}
+
 QString KsnipConfigOptions::imgurUsernameString()
 {
 	return imgurSectionString() + QStringLiteral("Username");

diff --git a/src/backend/config/KsnipConfigOptions.h b/src/backend/config/KsnipConfigOptions.h
@@ -51,6 +51,7 @@ class KsnipConfigOptions
 	static QString captureDelayString();
 	static QString snippingCursorSizeString();
 	static QString snippingCursorColorString();
+	static QString lastRectAreaString();
 	static QString imgurUsernameString();
 	static QString imgurClientIdString();
 	static QString imgurClientSecretString();

diff --git a/src/backend/imageGrabber/AbstractImageGrabber.cpp b/src/backend/imageGrabber/AbstractImageGrabber.cpp
@@ -22,6 +22,7 @@
 AbstractImageGrabber::AbstractImageGrabber(AbstractSnippingArea *snippingArea) : mSnippingArea(snippingArea)
 {
     Q_ASSERT(snippingArea != nullptr);
+	mConfig = KsnipConfig::instance();
 	connectSnippingAreaCancel();
 }
 
@@ -69,6 +70,16 @@ QRect AbstractImageGrabber::currentScreenRect() const
     return QApplication::desktop()->screenGeometry(screen);
 }
 
+QRect AbstractImageGrabber::lastRectArea() const
+{
+	auto rectArea = mConfig->lastRectArea();
+	if(rectArea.isNull()) {
+		qWarning("ImageGrabber: No RectArea found, capturing full screen.");
+		return fullScreenRect();
+	}
+	return rectArea;
+}
+
 void AbstractImageGrabber::addSupportedCaptureMode(CaptureModes captureMode)
 {
 	mSupportedCaptureModes.append(captureMode);
@@ -115,18 +126,26 @@ QPixmap AbstractImageGrabber::getScreenshot() const
 
 void AbstractImageGrabber::setCaptureRectFromCorrectSource()
 {
-	if (mCaptureMode == CaptureModes::RectArea) {
-		mCaptureRect = selectedSnippingAreaRect();
-	} else if (mCaptureMode == CaptureModes::FullScreen) {
-		mCaptureRect = fullScreenRect();
-	} else if (mCaptureMode == CaptureModes::CurrentScreen) {
-		mCaptureRect = currentScreenRect();
-	} else if (mCaptureMode == CaptureModes::ActiveWindow) {
-		mCaptureRect = activeWindowRect();
-		if (mCaptureRect.isNull()) {
-			qWarning("ImageGrabber::getActiveWindow: Found no window with focus.");
+	switch (mCaptureMode) {
+		case CaptureModes::RectArea:
+			mCaptureRect = selectedSnippingAreaRect();
+			break;
+		case CaptureModes::LastRectArea:
+			mCaptureRect = lastRectArea();
+			break;
+		case CaptureModes::FullScreen:
+			mCaptureRect = fullScreenRect();
+			break;
+		case CaptureModes::CurrentScreen:
 			mCaptureRect = currentScreenRect();
-		}
+			break;
+		case CaptureModes::ActiveWindow:
+			mCaptureRect = activeWindowRect();
+			if (mCaptureRect.isNull()) {
+				qWarning("ImageGrabber::getActiveWindow: Found no window with focus.");
+				mCaptureRect = currentScreenRect();
+			}
+			break;
 	}
 }
 

diff --git a/src/backend/imageGrabber/AbstractImageGrabber.h b/src/backend/imageGrabber/AbstractImageGrabber.h
@@ -28,7 +28,8 @@
 #include "CaptureDto.h"
 #include "src/common/enum/CaptureModes.h"
 #include "src/common/handler/DelayHandler.h"
-#include "gui/snippingArea/AbstractSnippingArea.h"
+#include "src/gui/snippingArea/AbstractSnippingArea.h"
+#include "src/backend/config/KsnipConfig.h"
 
 class AbstractImageGrabber : public QObject
 {
@@ -42,6 +43,7 @@ class AbstractImageGrabber : public QObject
 	virtual QRect currentScreenRect() const;
 	virtual QRect fullScreenRect() const = 0;
 	virtual QRect activeWindowRect() const = 0;
+	virtual QRect lastRectArea() const;
 
 signals:
     void finished(const CaptureDto &capture) const;
@@ -74,6 +76,7 @@ protected slots:
     AbstractSnippingArea *mSnippingArea;
 	bool mFreezeImageWhileSnipping;
 	QList<CaptureModes> mSupportedCaptureModes;
+	KsnipConfig *mConfig;
 
 	void openSnippingArea();
 	void connectSnippingAreaCancel();

diff --git a/src/backend/imageGrabber/GnomeWaylandImageGrabber.cpp b/src/backend/imageGrabber/GnomeWaylandImageGrabber.cpp
@@ -22,6 +22,7 @@
 GnomeWaylandImageGrabber::GnomeWaylandImageGrabber() : AbstractImageGrabber(new LinuxSnippingArea)
 {
 	addSupportedCaptureMode(CaptureModes::RectArea);
+	addSupportedCaptureMode(CaptureModes::LastRectArea);
 	addSupportedCaptureMode(CaptureModes::ActiveWindow);
 	addSupportedCaptureMode(CaptureModes::FullScreen);
 	addSupportedCaptureMode(CaptureModes::CurrentScreen);

diff --git a/src/backend/imageGrabber/MacImageGrabber.cpp b/src/backend/imageGrabber/MacImageGrabber.cpp
@@ -24,6 +24,7 @@ MacImageGrabber::MacImageGrabber() : AbstractImageGrabber(new MacSnippingArea),
                                      mMacWrapper(new MacWrapper)
 {
     addSupportedCaptureMode(CaptureModes::RectArea);
+	addSupportedCaptureMode(CaptureModes::LastRectArea);
     addSupportedCaptureMode(CaptureModes::FullScreen);
     addSupportedCaptureMode(CaptureModes::CurrentScreen);
 }

diff --git a/src/backend/imageGrabber/WinImageGrabber.cpp b/src/backend/imageGrabber/WinImageGrabber.cpp
@@ -23,6 +23,7 @@ WinImageGrabber::WinImageGrabber() : AbstractImageGrabber(new WinSnippingArea),
     mWinWrapper(new WinWrapper)
 {
 	addSupportedCaptureMode(CaptureModes::RectArea);
+	addSupportedCaptureMode(CaptureModes::LastRectArea);
 	addSupportedCaptureMode(CaptureModes::FullScreen);
 	addSupportedCaptureMode(CaptureModes::ActiveWindow);
 	addSupportedCaptureMode(CaptureModes::CurrentScreen);

diff --git a/src/backend/imageGrabber/X11ImageGrabber.cpp b/src/backend/imageGrabber/X11ImageGrabber.cpp
@@ -23,6 +23,7 @@
 X11ImageGrabber::X11ImageGrabber() : AbstractImageGrabber(new LinuxSnippingArea), mX11Wrapper(new X11Wrapper)
 {
 	addSupportedCaptureMode(CaptureModes::RectArea);
+	addSupportedCaptureMode(CaptureModes::LastRectArea);
 	addSupportedCaptureMode(CaptureModes::FullScreen);
 	addSupportedCaptureMode(CaptureModes::CurrentScreen);
 	addSupportedCaptureMode(CaptureModes::ActiveWindow);

diff --git a/src/common/enum/CaptureModes.h b/src/common/enum/CaptureModes.h
@@ -23,6 +23,7 @@
 enum class CaptureModes
 {
     RectArea,
+    LastRectArea,
     FullScreen,
     CurrentScreen,
     ActiveWindow,

diff --git a/src/gui/snippingArea/AbstractSnippingArea.cpp b/src/gui/snippingArea/AbstractSnippingArea.cpp
@@ -106,8 +106,7 @@ void AbstractSnippingArea::mouseReleaseEvent(QMouseEvent *event)
     }
 
 	setMouseIsDown(false);
-	emit finished();
-    closeSnippingArea();
+	finishSelection();
 }
 
 QPixmap AbstractSnippingArea::background() const
@@ -191,3 +190,10 @@ void AbstractSnippingArea::updateAdorner()
     auto currentMousePosition = getMousePosition();
 	mAdorner.update(currentMousePosition, snippingAreaGeometry, mCaptureArea);
 }
+
+void AbstractSnippingArea::finishSelection()
+{
+	emit finished();
+	mConfig->setLastRectArea(selectedRectArea());
+	closeSnippingArea();
+}
diff --git a/src/gui/snippingArea/AbstractSnippingArea.h b/src/gui/snippingArea/AbstractSnippingArea.h
@@ -75,6 +75,7 @@ class AbstractSnippingArea : public QWidget
     virtual void showSnippingArea();
 	void setMouseIsDown(bool isDown);
 	void updateAdorner();
+	void finishSelection();
 };
 
 #endif // KSNIP_ABSTRACTSNIPPINGAREA_H
diff --git a/src/widgets/CaptureModePicker.cpp b/src/widgets/CaptureModePicker.cpp
@@ -55,6 +55,16 @@ void CaptureModePicker::init(const QList<CaptureModes> &captureModes)
         menu->addAction(action);
     }
 
+	if (isCaptureModeSupported(captureModes, CaptureModes::LastRectArea)) {
+		auto action = createAction(
+			tr("Last Rectangular Area"),
+			tr("Capture a screenshot of the last selected rectangular area"),
+			QStringLiteral("drawRect.svg"),
+			CaptureModes::LastRectArea,
+			QKeySequence(Qt::SHIFT + Qt::Key_L));
+		menu->addAction(action);
+	}
+
     if (isCaptureModeSupported(captureModes, CaptureModes::FullScreen)) {
         auto action = createAction(
 				tr("Full Screen (All Monitors)"),