Add more behavior with the local test env.
This commit is contained in:
1 parent
acb58142d9
commit
df847becc8
10 files changed
+450
-114
No files matched your search
+30
-5
@@ -8,6 +8,7 @@ Page {
|
||||
|
||||
property string username: ""
|
||||
property bool quickConnect: false
|
||||
property bool quickConnectAvailable: false
|
||||
property string quickConnectCode: ""
|
||||
property bool busy: false
|
||||
property string error: ""
|
||||
@@ -39,13 +40,34 @@ Page {
|
||||
error = "";
|
||||
quickConnect = enabled;
|
||||
if (enabled) {
|
||||
quickConnectCode = page.session.startQuickConnect();
|
||||
quickConnectCode = "";
|
||||
passwordModeButton.forceActiveFocus();
|
||||
page.session.startQuickConnect(function (err, code) {
|
||||
if (err) {
|
||||
page.error = err;
|
||||
return;
|
||||
}
|
||||
page.quickConnectCode = code;
|
||||
}, function (err) {
|
||||
if (err) {
|
||||
page.error = err;
|
||||
return;
|
||||
}
|
||||
page.navigator.reset("Home");
|
||||
});
|
||||
} else {
|
||||
page.session.stopQuickConnect();
|
||||
page.initialFocus.forceActiveFocus();
|
||||
}
|
||||
}
|
||||
|
||||
// Le bouton Quick Connect n'est proposé que si le serveur l'autorise.
|
||||
Component.onCompleted: {
|
||||
page.session.isQuickConnectEnabled(function (err, enabled) {
|
||||
page.quickConnectAvailable = enabled;
|
||||
});
|
||||
}
|
||||
|
||||
Component.onDestruction: if (page.session) page.session.cancel()
|
||||
|
||||
Column {
|
||||
@@ -90,12 +112,13 @@ Page {
|
||||
primary: true
|
||||
text: page.busy ? "Connexion…" : "Se connecter"
|
||||
KeyNavigation.up: passwordField
|
||||
KeyNavigation.right: quickConnectButton
|
||||
KeyNavigation.right: page.quickConnectAvailable ? quickConnectButton : null
|
||||
onClicked: page.signIn()
|
||||
}
|
||||
|
||||
FocusButton {
|
||||
id: quickConnectButton
|
||||
visible: page.quickConnectAvailable
|
||||
text: "Utiliser Quick Connect"
|
||||
KeyNavigation.up: passwordField
|
||||
KeyNavigation.left: signInButton
|
||||
@@ -119,7 +142,7 @@ Page {
|
||||
}
|
||||
|
||||
Text {
|
||||
text: page.quickConnectCode
|
||||
text: page.quickConnectCode !== "" ? page.quickConnectCode : "…"
|
||||
color: Theme.accent
|
||||
font.pixelSize: Theme.fontCode
|
||||
font.bold: true
|
||||
@@ -127,8 +150,10 @@ Page {
|
||||
}
|
||||
|
||||
Text {
|
||||
text: "En attente d'autorisation…"
|
||||
color: Theme.textMuted
|
||||
width: parent.width
|
||||
text: page.error !== "" ? page.error : "En attente d'autorisation…"
|
||||
color: page.error !== "" ? Theme.error : Theme.textMuted
|
||||
wrapMode: Text.WordWrap
|
||||
font.pixelSize: Theme.fontSmall
|
||||
}
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@ Page {
|
||||
FocusButton {
|
||||
id: connectButton
|
||||
primary: true
|
||||
text: page.busy ? "Connexion…" : "Se connecter"
|
||||
text: page.busy ? "Recherche du serveur…" : "Se connecter"
|
||||
KeyNavigation.up: portField
|
||||
onClicked: page.connect()
|
||||
}
|
||||
|
||||
@@ -31,11 +31,18 @@ Page {
|
||||
spacing: Theme.spacingS
|
||||
model: page.session ? page.session.servers : null
|
||||
|
||||
// Serveur ajouté après l'affichage (dev-config) : on y place le focus.
|
||||
onCountChanged: {
|
||||
if (count > 0 && addButton.activeFocus) {
|
||||
currentIndex = 0;
|
||||
forceActiveFocus();
|
||||
}
|
||||
}
|
||||
|
||||
delegate: ServerItem {
|
||||
width: serverList.width
|
||||
name: model.name
|
||||
address: model.address
|
||||
discovered: model.discovered
|
||||
highlighted: ListView.isCurrentItem && serverList.activeFocus
|
||||
onClicked: {
|
||||
serverList.currentIndex = index;
|
||||
|
||||
@@ -4,10 +4,15 @@ import "../Shared"
|
||||
import "../Shared/Remote.js" as Remote
|
||||
|
||||
// Écran 3 : choix de l'utilisateur parmi les comptes publics du serveur.
|
||||
// Si le serveur masque ses comptes, seule la carte « Ajouter un compte » est proposée,
|
||||
// plus les comptes de test éventuels (tools/deploy.py --user).
|
||||
Page {
|
||||
id: page
|
||||
|
||||
property var users: page.session ? page.session.publicUsers() : []
|
||||
property var publicUsers: []
|
||||
// Comptes publics + comptes de test absents de la liste publique.
|
||||
property var users: mergeUsers(publicUsers, page.session ? page.session.devUsers : [])
|
||||
property bool loading: true
|
||||
property bool busy: false
|
||||
property string error: ""
|
||||
|
||||
@@ -17,6 +22,31 @@ Page {
|
||||
: ""
|
||||
initialFocus: userList
|
||||
|
||||
function mergeUsers(publicList, devList) {
|
||||
var result = publicList.slice();
|
||||
for (var i = 0; i < devList.length; i++) {
|
||||
var known = false;
|
||||
for (var j = 0; j < publicList.length; j++)
|
||||
known = known || publicList[j].name.toLowerCase() === devList[i].name.toLowerCase();
|
||||
if (!known)
|
||||
result.push({ name: devList[i].name, hasPassword: true, devPassword: devList[i].password });
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
function signInAs(name, password) {
|
||||
error = "";
|
||||
busy = true;
|
||||
page.session.authenticate(name, password, function (err) {
|
||||
page.busy = false;
|
||||
if (err) {
|
||||
page.error = err;
|
||||
return;
|
||||
}
|
||||
page.navigator.reset("Home");
|
||||
});
|
||||
}
|
||||
|
||||
function openUser(index) {
|
||||
if (busy)
|
||||
return;
|
||||
@@ -26,20 +56,27 @@ Page {
|
||||
return;
|
||||
}
|
||||
var user = users[index];
|
||||
// Compte de test avec mot de passe fourni : connexion directe.
|
||||
if (user.devPassword !== undefined) {
|
||||
signInAs(user.name, user.devPassword);
|
||||
return;
|
||||
}
|
||||
if (user.hasPassword) {
|
||||
page.navigator.push("Login", { username: user.name });
|
||||
return;
|
||||
}
|
||||
// Compte sans mot de passe : connexion directe, comme sur Android TV.
|
||||
error = "";
|
||||
busy = true;
|
||||
page.session.authenticate(user.name, "", function (err) {
|
||||
page.busy = false;
|
||||
signInAs(user.name, "");
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
page.session.loadPublicUsers(function (err, users) {
|
||||
page.loading = false;
|
||||
if (err) {
|
||||
page.error = err;
|
||||
return;
|
||||
}
|
||||
page.navigator.reset("Home");
|
||||
page.publicUsers = users;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -85,8 +122,12 @@ Page {
|
||||
right: parent.right
|
||||
}
|
||||
visible: text !== ""
|
||||
text: page.busy ? "Connexion…" : page.error
|
||||
color: page.busy ? Theme.textMuted : Theme.error
|
||||
text: page.busy ? "Connexion…"
|
||||
: page.loading ? "Chargement des utilisateurs…"
|
||||
: page.error !== "" ? page.error
|
||||
: page.users.length === 0 ? "Les comptes de ce serveur ne sont pas affichés publiquement : choisissez « Ajouter un compte » pour vous connecter."
|
||||
: ""
|
||||
color: page.error !== "" && !page.busy ? Theme.error : Theme.textMuted
|
||||
font.pixelSize: Theme.fontBody
|
||||
wrapMode: Text.WordWrap
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user