webtrayctl: add show

1 files changed, 19 insertions, 27 deletions

diff --git a/src/webwindow.cpp b/src/webwindow.cpp
index 823eec7..54634ad 100644
--- a/src/webwindow.cpp
+++ b/src/webwindow.cpp
@@ -48,25 +48,22 @@ WebWindow::web_configure()
 
 	this->profile->setPushServiceEnabled(true);
 
-	this->page->connect(this->page,
-	                    &QWebEnginePage::featurePermissionRequested,
-	                    [&](const QUrl origin, QWebEnginePage::Feature feature) {
-												this->permission_requested(origin, feature);
-											});
+	this->page->connect(this->page, &QWebEnginePage::permissionRequested,
+		[&](QWebEnginePermission permission) {
+			this->permission_requested(permission);
+		}
+	);
 
-	this->profile->connect(this->profile,
-	                       &QWebEngineProfile::downloadRequested,
-	                       [&](QWebEngineDownloadRequest *request) {
-													 const QUrl url = QFileDialog::getSaveFileUrl(
-														 this,
-														 "",
-														 QUrl(this->profile->downloadPath() + "/" +
-		                              request->downloadFileName()));
-													 if (!url.isEmpty()) {
-														 request->setDownloadFileName(url.path());
-														 request->accept();
-													 }
-												 });
+	this->profile->connect(this->profile, &QWebEngineProfile::downloadRequested,
+		[&](QWebEngineDownloadRequest *request) {
+			const QUrl path = QUrl(this->profile->downloadPath() + "/" + request->downloadFileName());
+			const QUrl url = QFileDialog::getSaveFileUrl(this, "", path);
+			if (!url.isEmpty()) {
+				request->setDownloadFileName(url.path());
+				request->accept();
+			}
+		}
+	);
 
 	this->page->connect(this->page,
 	                    &QWebEnginePage::newWindowRequested,
@@ -87,18 +84,13 @@ WebWindow::web_configure()
 }
 
 void
-WebWindow::permission_requested(const QUrl origin,
-                                QWebEnginePage::Feature feature)
+WebWindow::permission_requested(QWebEnginePermission permission)
 {
-	if (this->perm->get(feature)) {
-		this->page->setFeaturePermission(
-			origin, feature, QWebEnginePage::PermissionGrantedByUser);
+	if (this->perm->get(permission.permissionType())) {
+		permission.grant();
 	} else {
-		this->page->setFeaturePermission(
-			origin, feature, QWebEnginePage::PermissionDeniedByUser);
+		permission.deny();
 	}
-	this->page->setFeaturePermission(
-		origin, feature, QWebEnginePage::PermissionUnknown);
 }
 
 void