Skip to content
This repository has been archived by the owner on Jan 22, 2022. It is now read-only.

add the caller parameter (this) to the PopupUtils.show(...) calls #173

Merged
merged 3 commits into from Apr 8, 2019
Merged

add the caller parameter (this) to the PopupUtils.show(...) calls #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1cd46e9
add the caller parameter (this) to the PopupUtils.show(...) calls
balcy Mar 30, 2019
03b690a
replace Non-Suru main menu icons
balcy Mar 30, 2019
d8717f1
clickable.json: dependencies -> dependencies_target
balcy Mar 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion clickable.json
View file
Open in desktop
@@ -1,7 +1,7 @@
{
"template": "cmake",
"kill": "morph-browser",
"dependencies": [
"dependencies_target": [
"qtwebengine5-dev"
]
}
4 changes: 2 additions & 2 deletions src/app/SavePageDialog.qml
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@ ModalDialog {

Button {
text: i18n.tr("Save as HTML")
color: theme.palette.normal.positive
color: theme.palette.normal.foreground
objectName: "savehtml"
onClicked: saveAsHtml()
}
Expand All @@ -42,7 +42,7 @@ ModalDialog {

Button {
text: i18n.tr("Save as PDF")
color: theme.palette.normal.positive
color: theme.palette.normal.foreground
objectName: "savepdf"
onClicked: saveAsPdf()
}
Expand Down
28 changes: 14 additions & 14 deletions src/app/WebViewImpl.qml
View file
Open in desktop
Expand Up @@ -96,7 +96,7 @@ WebView {

function save() {
viewSpecificZoom = false
var confirmDialog = PopupUtils.open(Qt.resolvedUrl("ConfirmDialog.qml"));
var confirmDialog = PopupUtils.open(Qt.resolvedUrl("ConfirmDialog.qml"), this);
confirmDialog.title = i18n.tr("Default Zoom")
confirmDialog.message = i18n.tr("Set current zoom as default zoom for morph-browser ? (You can change it in the settings menu)")
confirmDialog.accept.connect(function() {browser.settings.zoomFactor = currentZoomFactor});
Expand Down Expand Up @@ -129,22 +129,22 @@ WebView {
{
case JavaScriptDialogRequest.DialogTypeAlert:
request.accepted = true;
var alertDialog = PopupUtils.open(Qt.resolvedUrl("AlertDialog.qml"));
var alertDialog = PopupUtils.open(Qt.resolvedUrl("AlertDialog.qml"), this);
alertDialog.message = request.message;
alertDialog.accept.connect(request.dialogAccept);
break;

case JavaScriptDialogRequest.DialogTypeConfirm:
request.accepted = true;
var confirmDialog = PopupUtils.open(Qt.resolvedUrl("ConfirmDialog.qml"));
var confirmDialog = PopupUtils.open(Qt.resolvedUrl("ConfirmDialog.qml"), this);
confirmDialog.message = request.message;
confirmDialog.accept.connect(request.dialogAccept);
confirmDialog.reject.connect(request.dialogReject);
break;

case JavaScriptDialogRequest.DialogTypePrompt:
request.accepted = true;
var promptDialog = PopupUtils.open(Qt.resolvedUrl("PromptDialog.qml"));
var promptDialog = PopupUtils.open(Qt.resolvedUrl("PromptDialog.qml"), this);
promptDialog.message = request.message;
promptDialog.defaultValue = request.defaultText;
promptDialog.accept.connect(request.dialogAccept);
Expand All @@ -155,7 +155,7 @@ WebView {
//case JavaScriptDialogRequest.DialogTypeUnload:
case 3:
request.accepted = true;
var beforeUnloadDialog = PopupUtils.open(Qt.resolvedUrl("BeforeUnloadDialog.qml"));
var beforeUnloadDialog = PopupUtils.open(Qt.resolvedUrl("BeforeUnloadDialog.qml"), this);
beforeUnloadDialog.message = request.message;
beforeUnloadDialog.accept.connect(request.dialogAccept);
beforeUnloadDialog.reject.connect(request.dialogReject);
Expand All @@ -170,15 +170,15 @@ WebView {
{
case FileDialogRequest.FileModeOpen:
request.accepted = true;
var fileDialogSingle = PopupUtils.open(Qt.resolvedUrl("ContentPickerDialog.qml"));
var fileDialogSingle = PopupUtils.open(Qt.resolvedUrl("ContentPickerDialog.qml"), this);
fileDialogSingle.allowMultipleFiles = false;
fileDialogSingle.accept.connect(request.dialogAccept);
fileDialogSingle.reject.connect(request.dialogReject);
break;

case FileDialogRequest.FileModeOpenMultiple:
request.accepted = true;
var fileDialogMultiple = PopupUtils.open(Qt.resolvedUrl("ContentPickerDialog.qml"));
var fileDialogMultiple = PopupUtils.open(Qt.resolvedUrl("ContentPickerDialog.qml"), this);
fileDialogMultiple.allowMultipleFiles = true;
fileDialogMultiple.accept.connect(request.dialogAccept);
fileDialogMultiple.reject.connect(request.dialogReject);
Expand All @@ -194,7 +194,7 @@ WebView {

onColorDialogRequested: function(request) {
request.accepted = true;
var colorDialog = PopupUtils.open(Qt.resolvedUrl("ColorSelectDialog.qml"));
var colorDialog = PopupUtils.open(Qt.resolvedUrl("ColorSelectDialog.qml"), this);
colorDialog.defaultValue = request.color;
colorDialog.accept.connect(request.dialogAccept);
colorDialog.reject.connect(request.dialogReject);
Expand All @@ -208,7 +208,7 @@ WebView {
//case WebEngineAuthenticationDialogRequest.AuthenticationTypeHTTP:
case 0:
request.accepted = true;
var authDialog = PopupUtils.open(Qt.resolvedUrl("HttpAuthenticationDialog.qml"), webview.currentWebview);
var authDialog = PopupUtils.open(Qt.resolvedUrl("HttpAuthenticationDialog.qml"), this);
authDialog.host = UrlUtils.extractHost(request.url);
authDialog.realm = request.realm;
authDialog.accept.connect(request.dialogAccept);
Expand All @@ -232,7 +232,7 @@ WebView {

// TODO: we might want to store the answer to avoid requesting
// the permission everytime the user visits this site.
var geoPermissionDialog = PopupUtils.open(Qt.resolvedUrl("GeolocationPermissionRequest.qml"));
var geoPermissionDialog = PopupUtils.open(Qt.resolvedUrl("GeolocationPermissionRequest.qml"), this);
geoPermissionDialog.origin = securityOrigin;
geoPermissionDialog.feature = feature;
break;
Expand All @@ -241,7 +241,7 @@ WebView {
case WebEngineView.MediaVideoCapture:
case WebEngineView.MediaAudioVideoCapture:

var mediaAccessDialog = PopupUtils.open(Qt.resolvedUrl("MediaAccessDialog.qml"));
var mediaAccessDialog = PopupUtils.open(Qt.resolvedUrl("MediaAccessDialog.qml"), this);
mediaAccessDialog.origin = securityOrigin;
mediaAccessDialog.feature = feature;
break;
Expand All @@ -251,7 +251,7 @@ WebView {
onCertificateError: function(certificateError) {

certificateError.defer()
var certificateVerificationDialog = PopupUtils.open(Qt.resolvedUrl("CertificateVerificationDialog.qml"));
var certificateVerificationDialog = PopupUtils.open(Qt.resolvedUrl("CertificateVerificationDialog.qml"), this);
certificateVerificationDialog.host = UrlUtils.extractHost(certificateError.url);
certificateErrorsMap[certificateVerificationDialog.host] = certificateError
certificateErrorsMapChanged()
Expand All @@ -263,7 +263,7 @@ WebView {

function showMessage(text) {

var alertDialog = PopupUtils.open(Qt.resolvedUrl("AlertDialog.qml"));
var alertDialog = PopupUtils.open(Qt.resolvedUrl("AlertDialog.qml"), this);
alertDialog.message = text;
}

Expand All @@ -285,7 +285,7 @@ WebView {

if (request.linkUrl.toString() || request.mediaType)
{
var contextMenu = PopupUtils.open(Qt.resolvedUrl("webbrowser/ContextMenuMobile.qml"));
var contextMenu = PopupUtils.open(Qt.resolvedUrl("webbrowser/ContextMenuMobile.qml"), this);
contextMenu.actions = contextualactions;
contextMenu.titleContent = request.linkUrl;
}
Expand Down
8 changes: 4 additions & 4 deletions src/app/webbrowser/Browser.qml
View file
Open in desktop
Expand Up @@ -669,7 +669,7 @@ BrowserView {
Action {
objectName: "downloads"
text: i18n.tr("Downloads")
iconName: "save"
iconName: "save-to"
enabled: downloadHandlerLoader.status == Loader.Ready && contentHandlerLoader.status == Loader.Ready
onTriggered: downloadsViewLoader.active = true
},
Expand All @@ -682,17 +682,17 @@ BrowserView {
Action {
objectName: "view source"
text: i18n.tr("View source")
iconName: "preview-file"
iconName: "text-xml-symbolic"
enabled: currentWebview && (currentWebview.url.toString().substring(0,12) !== "view-source:")
onTriggered: openLinkInNewTabRequested("view-source:%1".arg(currentWebview.url), false);
},
Action {
objectName: "save"
text: i18n.tr("Save as HTML / PDF")
iconName: "document-export"
iconName: "save-as"
enabled: currentWebview
onTriggered: {
var savePageDialog = PopupUtils.open(Qt.resolvedUrl("../SavePageDialog.qml"));
var savePageDialog = PopupUtils.open(Qt.resolvedUrl("../SavePageDialog.qml"), this);
savePageDialog.saveAsHtml.connect( function() { currentWebview.triggerWebAction(WebEngineView.SavePage) } )
// the filename of the PDF is determined from the title (replace not allowed / problematic chars with '_')
// the QtWebEngine does give the filename (.mhtml) for the SavePage action with that pattern as well
Expand Down