Rename capture overlay

screen-translator.pro

@@ -30,7 +30,7 @@ INCLUDEPATH += src src/service src/capture src/ocr \
   src/represent src/translate src/correct
 
 HEADERS += \
-  src/capture/captureoverlay.h \
+  src/capture/captureareaselector.h \
   src/capture/capturer.h \
   src/correct/corrector.h \
   src/languagecodes.h \
@@ -58,7 +58,7 @@ HEADERS += \
   src/trayicon.h
 
 SOURCES += \
-  src/capture/captureoverlay.cpp \
+  src/capture/captureareaselector.cpp \
   src/capture/capturer.cpp \
   src/correct/corrector.cpp \
   src/languagecodes.cpp \

src/capture/captureareaselector.cpp

@@ -1,4 +1,4 @@
-#include "captureoverlay.h"
+#include "captureareaselector.h"
 #include "capturer.h"
 #include "task.h"
 
@@ -6,7 +6,7 @@
 #include <QPainter>
 #include <QScreen>
 
-CaptureOverlay::CaptureOverlay(Capturer &capturer)
+CaptureAreaSelector::CaptureAreaSelector(Capturer &capturer)
   : capturer_(capturer)
 {
   setWindowFlags(Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint |
@@ -14,7 +14,7 @@ CaptureOverlay::CaptureOverlay(Capturer &capturer)
   setCursor(Qt::CrossCursor);
 }
 
-void CaptureOverlay::setScreen(QScreen &screen)
+void CaptureAreaSelector::setScreen(QScreen &screen)
 {
   const auto geometry = screen.availableGeometry();
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
@@ -32,18 +32,18 @@ void CaptureOverlay::setScreen(QScreen &screen)
   setGeometry(geometry);
 }
 
-void CaptureOverlay::showEvent(QShowEvent * /*event*/)
+void CaptureAreaSelector::showEvent(QShowEvent * /*event*/)
 {
   startSelectPos_ = currentSelectPos_ = QPoint();
 }
 
-void CaptureOverlay::keyPressEvent(QKeyEvent *event)
+void CaptureAreaSelector::keyPressEvent(QKeyEvent *event)
 {
   if (event->key() == Qt::Key_Escape)
     capturer_.canceled();
 }
 
-void CaptureOverlay::paintEvent(QPaintEvent * /*event*/)
+void CaptureAreaSelector::paintEvent(QPaintEvent * /*event*/)
 {
   auto selection = QRect(startSelectPos_, currentSelectPos_).normalized();
   if (!selection.isValid())
@@ -54,13 +54,13 @@ void CaptureOverlay::paintEvent(QPaintEvent * /*event*/)
   painter.drawRect(selection);
 }
 
-void CaptureOverlay::mousePressEvent(QMouseEvent *event)
+void CaptureAreaSelector::mousePressEvent(QMouseEvent *event)
 {
   if (startSelectPos_.isNull())
     startSelectPos_ = event->pos();
 }
 
-void CaptureOverlay::mouseMoveEvent(QMouseEvent *event)
+void CaptureAreaSelector::mouseMoveEvent(QMouseEvent *event)
 {
   if (startSelectPos_.isNull())
     return;
@@ -69,7 +69,7 @@ void CaptureOverlay::mouseMoveEvent(QMouseEvent *event)
   repaint();
 }
 
-void CaptureOverlay::mouseReleaseEvent(QMouseEvent *event)
+void CaptureAreaSelector::mouseReleaseEvent(QMouseEvent *event)
 {
   if (startSelectPos_.isNull() || pixmap_.isNull())
     return;

src/capture/captureareaselector.h

@@ -1,16 +1,17 @@
 #pragma once
 
+#include "stfwd.h"
+
 #include <QWidget>
 
-class Capturer;
 class QScreen;
 
-class CaptureOverlay : public QWidget
+class CaptureAreaSelector : public QWidget
 {
   Q_OBJECT
 
 public:
-  explicit CaptureOverlay(Capturer &capturer);
+  explicit CaptureAreaSelector(Capturer &capturer);
 
   void setScreen(QScreen &screen);
 

src/capture/capturer.cpp

@@ -1,5 +1,5 @@
 #include "capturer.h"
-#include "captureoverlay.h"
+#include "captureareaselector.h"
 #include "manager.h"
 #include "settings.h"
 #include "task.h"
@@ -48,18 +48,18 @@ void Capturer::showOverlays(bool capturePixmap)
 {
   const auto screens = QApplication::screens();
   const auto screensSize = screens.size();
-  int overlaysSize = overlays_.size();
+  int overlaysSize = selectors_.size();
   if (screensSize > overlaysSize)
-    overlays_.reserve(screensSize);
+    selectors_.reserve(screensSize);
 
   for (auto i = 0, end = screensSize; i < end; ++i) {
     if (i == overlaysSize) {
-      overlays_.push_back(new CaptureOverlay(*this));
+      selectors_.push_back(new CaptureAreaSelector(*this));
       ++overlaysSize;
     }
 
     const auto screen = screens[i];
-    auto &overlay = overlays_[i];
+    auto &overlay = selectors_[i];
     overlay->hide();
     if (capturePixmap)
       overlay->setScreen(*screen);
@@ -69,11 +69,11 @@ void Capturer::showOverlays(bool capturePixmap)
 
   if (screensSize < overlaysSize) {
     for (auto i = overlaysSize - 1; i >= screensSize; --i)
-      overlays_[i]->deleteLater();
+      selectors_[i]->deleteLater();
   }
 }
 
 void Capturer::hideOverlays()
 {
-  for (const auto &overlay : overlays_) overlay->hide();
+  for (const auto &overlay : selectors_) overlay->hide();
 }

src/capture/capturer.h

@@ -4,8 +4,6 @@
 
 #include <vector>
 
-class CaptureOverlay;
-
 class Capturer
 {
 public:
@@ -24,5 +22,5 @@ private:
 
   Manager &manager_;
   const Settings &settings_;
-  std::vector<CaptureOverlay *> overlays_;
+  std::vector<CaptureAreaSelector *> selectors_;
 };

src/stfwd.h

@@ -15,6 +15,7 @@ class Representer;
 class Translator;
 class Corrector;
 class Recognizer;
+class CaptureAreaSelector;
 
 namespace update
 {