removed references to 'flash' in web capture feature

preferencesAboutTextFull
Clément Fauconnier 3 years ago
parent bc3921ebdd
commit 569cbb7ab4
  1. 6
      resources/forms/mainWindow.ui
  2. 2
      resources/forms/trapFlash.ui
  3. 2
      src/gui/UBWebToolsPalette.cpp
  4. 2
      src/web/UBWebController.cpp

@ -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">

@ -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>

@ -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;

@ -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()));

Loading…
Cancel
Save