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

Custom server UX enhancement #3470

Merged
merged 2 commits into from
May 28, 2024
Merged

Custom server UX enhancement #3470

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
3b95c42
custom server UX enhancement
VitorVieiraZ May 27, 2024
5379652
custom server placeholder text not translatable
VitorVieiraZ May 28, 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
6 changes: 6 additions & 0 deletions app/qml/account/MMAccountController.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ Item {
}

onChangeServerClicked: function ( newServer ) {
// Ensure the newServer string ends with a '/'
// to format it as "https://my-server-app.com/"
if ( newServer && newServer.slice( -1 ) !== '/' ) {
newServer += '/';
}

__merginApi.apiRoot = newServer
}

Expand Down
1 change: 1 addition & 0 deletions app/qml/account/MMLoginPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ MMPage {
textFieldBackground.color: __style.lightGreenColor

text: root.apiRoot
placeholderText: "https://my-server-app.com/"
textField.inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase | Qt.ImhUrlCharactersOnly
}

Expand Down
Loading