Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport release-3_4] Fix layer login popup getting into the top / bottom system OS margins #5801

Merged
merged 2 commits into from
Nov 10, 2024
Merged

[Backport release-3_4] Fix layer login popup getting into the top / bottom system OS margins #5801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c85c825
Fix layer login popup getting into the top / bottom system OS margins
nirvn Nov 9, 2024
9af30d1
Fix untranslatable authentication string, use service name when host …
nirvn Nov 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/core/qfieldappauthrequesthandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,5 +223,14 @@ QString QFieldAppAuthRequestHandler::getCredentialTitle( const QString &realm )
if ( uri.database().isEmpty() )
return realm;

return "Please enter credentials for database <b>" + uri.database() + "</b> at host <b>" + uri.host() + ".</b>";
QString title = tr( "Please enter credentials for database" ) + QStringLiteral( " <b>%1</b> " ).arg( uri.database() );
if ( !uri.host().isEmpty() )
{
title += tr( "at host" ) + QStringLiteral( " <b>%1</b> " ).arg( uri.host() );
}
else if ( !uri.service().isEmpty() )
{
title += tr( "at service" ) + QStringLiteral( " <b>%1</b> " ).arg( uri.service() );
}
return title;
}
8 changes: 4 additions & 4 deletions src/qml/qgismobileapp.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3581,10 +3581,10 @@ ApplicationWindow {
Popup {
id: loginDialogPopup
parent: Overlay.overlay
x: 24
y: 24
width: parent.width - 48
height: parent.height - 48
x: Theme.popupScreenEdgeMargin
y: Theme.popupScreenEdgeMargin
width: parent.width - Theme.popupScreenEdgeMargin * 2
height: parent.height - Theme.popupScreenEdgeMargin * 2
padding: 0
modal: true
closePolicy: Popup.CloseOnEscape
Expand Down
Loading