From 569cbb7ab4a9a24a40cd8b80c639f8066ce275ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fauconnier?= <fc86@outlook.fr>
Date: Wed, 30 Mar 2022 09:31:25 +0200
Subject: [PATCH] removed references to 'flash' in web capture feature

---
 resources/forms/mainWindow.ui | 6 +++---
 resources/forms/trapFlash.ui  | 2 +-
 src/gui/UBWebToolsPalette.cpp | 2 +-
 src/web/UBWebController.cpp   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui
index 8b08f03c..d4ef4ff9 100644
--- a/resources/forms/mainWindow.ui
+++ b/resources/forms/mainWindow.ui
@@ -1497,16 +1497,16 @@
     <string>Configure Podcast Recording</string>
    </property>
   </action>
-  <action name="actionWebTrapFlash">
+  <action name="actionCaptureWebContent">
    <property name="icon">
     <iconset resource="../OpenBoard.qrc">
      <normaloff>:/images/toolbar/addToolToLibrary.png</normaloff>:/images/toolbar/addToolToLibrary.png</iconset>
    </property>
    <property name="text">
-    <string>Flash Trap</string>
+    <string>Capture Wep Content</string>
    </property>
    <property name="toolTip">
-    <string>Trap Flash Content</string>
+    <string>Capture Web Content</string>
    </property>
   </action>
   <action name="actionWebTrap">
diff --git a/resources/forms/trapFlash.ui b/resources/forms/trapFlash.ui
index 2a7f4a69..00c36a00 100644
--- a/resources/forms/trapFlash.ui
+++ b/resources/forms/trapFlash.ui
@@ -19,7 +19,7 @@
      <item>
       <widget class="QLabel" name="selectFlashLabel">
        <property name="text">
-        <string>Select a flash to trap</string>
+        <string>Select a content to capture</string>
        </property>
       </widget>
      </item>
diff --git a/src/gui/UBWebToolsPalette.cpp b/src/gui/UBWebToolsPalette.cpp
index dcca8fce..3149dc79 100644
--- a/src/gui/UBWebToolsPalette.cpp
+++ b/src/gui/UBWebToolsPalette.cpp
@@ -49,7 +49,7 @@ UBWebToolsPalette::UBWebToolsPalette(QWidget *parent)
 {
     QList<QAction*> actions;
 
-    actions << UBApplication::mainWindow->actionWebTrapFlash;
+    actions << UBApplication::mainWindow->actionCaptureWebContent;
 
     actions << UBApplication::mainWindow->actionWebCustomCapture;
     actions << UBApplication::mainWindow->actionWebWindowCapture;
diff --git a/src/web/UBWebController.cpp b/src/web/UBWebController.cpp
index c8d53216..eb6e65bb 100644
--- a/src/web/UBWebController.cpp
+++ b/src/web/UBWebController.cpp
@@ -304,7 +304,7 @@ void UBWebController::setupPalettes()
                     UBApplication::boardController->paletteManager()->mKeyboardPalette, SLOT(onDeactivated()));
 #endif
 
-        connect(mMainWindow->actionWebTrapFlash, SIGNAL(triggered()), this, SLOT(trapFlash()));
+        connect(mMainWindow->actionCaptureWebContent, SIGNAL(triggered()), this, SLOT(trapFlash()));
         connect(mMainWindow->actionWebCustomCapture, SIGNAL(triggered()), this, SLOT(customCapture()));
         connect(mMainWindow->actionWebWindowCapture, SIGNAL(triggered()), this, SLOT(captureWindow()));
         connect(mMainWindow->actionWebOEmbed, SIGNAL(triggered()), this, SLOT(captureoEmbed()));