diff --git a/src/lib/tools/html5permissions/html5permissionsdialog.ui b/src/lib/tools/html5permissions/html5permissionsdialog.ui index 863bc8c4f..46d5e07d6 100644 --- a/src/lib/tools/html5permissions/html5permissionsdialog.ui +++ b/src/lib/tools/html5permissions/html5permissionsdialog.ui @@ -99,12 +99,12 @@ - Web Camera + Camera - Microphone and Web Camera + Microphone and Camera diff --git a/src/lib/tools/html5permissions/html5permissionsnotification.cpp b/src/lib/tools/html5permissions/html5permissionsnotification.cpp index 587f44b07..69add2609 100644 --- a/src/lib/tools/html5permissions/html5permissionsnotification.cpp +++ b/src/lib/tools/html5permissions/html5permissionsnotification.cpp @@ -55,12 +55,12 @@ HTML5PermissionsNotification::HTML5PermissionsNotification(const QUrl &origin, Q case QWebEnginePage::MediaVideoCapture: ui->iconLabel->setPixmap(QPixmap(":icons/other/webcam.png")); - ui->textLabel->setText(tr("Allow %1 to use your web camera?").arg(site)); + ui->textLabel->setText(tr("Allow %1 to use your camera?").arg(site)); break; case QWebEnginePage::MediaAudioVideoCapture: ui->iconLabel->setPixmap(QPixmap(":icons/other/microphone-webcam.png")); - ui->textLabel->setText(tr("Allow %1 to use your microphone and web camera?").arg(site)); + ui->textLabel->setText(tr("Allow %1 to use your microphone and camera?").arg(site)); break; case QWebEnginePage::MouseLock: diff --git a/src/lib/webkit/webpage.cpp b/src/lib/webkit/webpage.cpp index d6e2dc6e8..aa14d1dab 100644 --- a/src/lib/webkit/webpage.cpp +++ b/src/lib/webkit/webpage.cpp @@ -80,6 +80,7 @@ WebPage::WebPage(QObject* parent) , m_adjustingScheduled(false) { connect(this, &QWebEnginePage::featurePermissionRequested, this, &WebPage::featurePermissionRequested); + connect(this, &QWebEnginePage::windowCloseRequested, this, &WebPage::windowCloseRequested); #if QTWEBENGINE_DISABLED m_javaScriptEnabled = QWebEngineSettings::globalSettings()->testAttribute(QWebEngineSettings::JavascriptEnabled); @@ -98,7 +99,6 @@ WebPage::WebPage(QObject* parent) connect(this, SIGNAL(loadFinished(bool)), this, SLOT(finished())); connect(this, SIGNAL(printRequested(QWebFrame*)), this, SLOT(printFrame(QWebFrame*))); connect(this, SIGNAL(downloadRequested(QNetworkRequest)), this, SLOT(downloadRequested(QNetworkRequest))); - connect(this, SIGNAL(windowCloseRequested()), this, SLOT(windowCloseRequested())); frameCreated(mainFrame()); connect(this, SIGNAL(frameCreated(QWebFrame*)), this, SLOT(frameCreated(QWebFrame*)));