Add lastRectArea to cli #150

ksnip · Sep 25, 2019 · 2e2f931 · 2e2f931
1 parent 8378d18
commit 2e2f931
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/backend/KsnipCommandLine.cpp b/src/backend/KsnipCommandLine.cpp
@@ -32,6 +32,7 @@ KsnipCommandLine::KsnipCommandLine(const QCoreApplication &app, const QList<Capt
 KsnipCommandLine::~KsnipCommandLine()
 {
     delete mRectAreaOption;
+    delete mLastRectAreaOption;
     delete mFullScreenOption;
     delete mCurrentScreenOption;
     delete mActiveWindowOption;
@@ -48,8 +49,11 @@ void KsnipCommandLine::addImageGrabberOptions(const QList<CaptureModes> &capture
     if (captureModes.contains(CaptureModes::RectArea)) {
         mRectAreaOption = addOption(QStringLiteral("r"), QStringLiteral("rectarea"), QStringLiteral("Select a rectangular area from where to take a screenshot."));
     }
+	if (captureModes.contains(CaptureModes::LastRectArea)) {
+		mLastRectAreaOption = addOption(QStringLiteral("l"), QStringLiteral("lastrectarea"), QStringLiteral("Take a screenshot using last selected rectangular area."));
+	}
     if (captureModes.contains(CaptureModes::FullScreen)) {
-        mFullScreenOption = addOption(QStringLiteral("f"), QStringLiteral("fullscreen"), QStringLiteral("\"Capture the fullscreen including all monitors."));
+        mFullScreenOption = addOption(QStringLiteral("f"), QStringLiteral("fullscreen"), QStringLiteral("Capture the fullscreen including all monitors."));
     }
     if (captureModes.contains(CaptureModes::CurrentScreen)) {
         mCurrentScreenOption = addOption(QStringLiteral("m"), QStringLiteral("current"), QStringLiteral("Capture the screen (monitor) where the mouse cursor is currently located."));
@@ -99,6 +103,11 @@ bool KsnipCommandLine::isRectAreaSet() const
     return mRectAreaOption != nullptr && isSet(*mRectAreaOption);
 }
 
+bool KsnipCommandLine::isLastRectAreaSet() const
+{
+	return mLastRectAreaOption != nullptr && isSet(*mLastRectAreaOption);
+}
+
 bool KsnipCommandLine::isFullScreenSet() const
 {
     return mFullScreenOption != nullptr && isSet(*mFullScreenOption);
@@ -162,7 +171,7 @@ QString KsnipCommandLine::image() const
 
 bool KsnipCommandLine::isCaptureModeSet() const
 {
-    return isRectAreaSet() || isFullScreenSet() || isCurrentScreenSet() || isActiveWindowSet() || isWindowsUnderCursorSet();
+    return isRectAreaSet() || isLastRectAreaSet() || isFullScreenSet() || isCurrentScreenSet() || isActiveWindowSet() || isWindowsUnderCursorSet();
 }
 
 CaptureModes KsnipCommandLine::captureMode() const
@@ -175,6 +184,8 @@ CaptureModes KsnipCommandLine::captureMode() const
         return CaptureModes::ActiveWindow;
     } else if (isWindowsUnderCursorSet()) {
         return CaptureModes::WindowUnderCursor;
+    } else if (isLastRectAreaSet()) {
+	    return CaptureModes::LastRectArea;
     } else {
         return CaptureModes::RectArea;
     }

diff --git a/src/backend/KsnipCommandLine.h b/src/backend/KsnipCommandLine.h
@@ -33,6 +33,7 @@ class KsnipCommandLine : public QCommandLineParser
     KsnipCommandLine(const QCoreApplication &app, const QList<CaptureModes> &captureModes);
     ~KsnipCommandLine();
     bool isRectAreaSet() const;
+    bool isLastRectAreaSet() const;
     bool isFullScreenSet() const;
     bool isCurrentScreenSet() const;
     bool isActiveWindowSet() const;
@@ -49,6 +50,7 @@ class KsnipCommandLine : public QCommandLineParser
 
 private:
     QCommandLineOption *mRectAreaOption = nullptr;
+    QCommandLineOption *mLastRectAreaOption = nullptr;
     QCommandLineOption *mFullScreenOption = nullptr;
     QCommandLineOption *mCurrentScreenOption = nullptr;
     QCommandLineOption *mActiveWindowOption = nullptr;