← Back to branch summary

~mterry/unity8/greeter-misc-cleanups

« back to all changes in this revision

Viewing changes to qml/Shell.qml

  • Committer: Michael Terry
  • Date: 2014-07-28 11:44:58 UTC
  • mfrom: (981.1.18 locking-hash)
  • Revision ID: michael.terry@canonical.com-20140728114458-o6e5nph059ruh7oi
Merge in locking-hash

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Shell.qml
490
490
        width: parent.width
491
491
        height: parent.height - panel.panelHeight
492
492
        background: shell.background
 
493
        alphaNumeric: AccountsService.passwordDisplayHint === AccountsService.Keyboard
493
494
        minPinLength: 4
494
495
        maxPinLength: 4
495
496
 
504
505
        onShownChanged: if (shown) greeter.fakeActiveForApp = ""
505
506
 
506
507
        Component.onCompleted: {
507
 
            if (LightDM.Users.count == 1) {
 
508
            if (greeter.narrowMode) {
508
509
                LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
509
510
            }
510
511
        }
516
517
        onShowGreeter: greeter.show()
517
518
 
518
519
        onShowPrompt: {
519
 
            if (LightDM.Users.count == 1) {
520
 
                // TODO: There's no better way for now to determine if its a PIN or a passphrase.
521
 
                if (text == "PIN") {
522
 
                    lockscreen.alphaNumeric = false
523
 
                } else {
524
 
                    lockscreen.alphaNumeric = true
525
 
                }
526
 
                lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text);
 
520
            if (greeter.narrowMode) {
 
521
                lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text.toLowerCase());
 
522
                lockscreen.show();
 
523
            }
 
524
        }
 
525
 
 
526
        onPromptlessChanged: {
 
527
            if (LightDM.Greeter.promptless) {
 
528
                lockscreen.hide()
 
529
            } else {
 
530
                lockscreen.reset();
527
531
                lockscreen.show();
528
532
            }
529
533
        }
537
541
                greeter.login();
538
542
            } else {
539
543
                lockscreen.clear(true);
 
544
                if (greeter.narrowMode) {
 
545
                    LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
 
546
                }
540
547
            }
541
548
        }
542
549
    }
590
597
 
591
598
            function login() {
592
599
                enabled = false;
593
 
                LightDM.Greeter.startSessionSync();
594
 
                sessionStarted();
595
 
                greeter.hide();
596
 
                lockscreen.hide();
597
 
                launcher.hide();
 
600
                if (LightDM.Greeter.startSessionSync()) {
 
601
                    sessionStarted();
 
602
                    greeter.hide();
 
603
                    lockscreen.hide();
 
604
                    launcher.hide();
 
605
                }
598
606
                enabled = true;
599
607
            }
600
608
 
601
609
            onShownChanged: {
602
610
                if (shown) {
603
 
                    lockscreen.reset();
 
611
                    if (greeter.narrowMode) {
 
612
                        LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
 
613
                    }
604
614
                    if (!LightDM.Greeter.promptless) {
605
 
                       lockscreen.show();
606
 
                    }
607
 
                    // If there is only one user, we start authenticating with that one here.
608
 
                    // If there are more users, the Greeter will handle that
609
 
                    if (LightDM.Users.count == 1) {
610
 
                        LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
 
615
                        lockscreen.reset();
 
616
                        lockscreen.show();
611
617
                    }
612
618
                    greeter.fakeActiveForApp = "";
613
619
                    greeter.forceActiveFocus();