← Back to branch summary

~thomir-deactivatedaccount/camera-app/autopilot-tests-port

« back to all changes in this revision

Viewing changes to Toolbar.qml

  • Committer: Ugo Riboni
  • Date: 2012-10-17 12:29:52 UTC
  • Revision ID: ugo.riboni@canonical.com-20121017122952-hq0u75rlkhwrhljj
First step at integrating the QT Camera API and the new visual design: zoom control and flash control

Show diffs side-by-side

added added

removed removed

Lines of Context:
Toolbar.qml
1
1
import QtQuick 2.0
2
 
import "CameraEnums.js" as CameraEnums
 
2
import QtMultimedia 5.0
3
3
 
4
4
Item {
5
5
    id: toolbar
30
30
 
31
31
            flashAllowed: !camera.isRecording
32
32
 
33
 
            state: { switch (camera.flashMode) {
34
 
                case CameraEnums.FlashModeOff: return (flashAllowed) ? "off_flash" : "off_torch";
35
 
                case CameraEnums.FlashModeOn: return "on";
36
 
                case CameraEnums.FlashModeTorch: return "torch";
37
 
                case CameraEnums.FlashModeAuto: return "auto";
 
33
            state: { switch (camera.flash.mode) {
 
34
                case Camera.FlashOff: return (flashAllowed) ? "off_flash" : "off_torch";
 
35
                case Camera.FlashOn: return "on";
 
36
                case Camera.FlashTorch: return "torch";
 
37
                case Camera.FlashAuto: return "auto";
38
38
            }}
39
39
 
40
40
            onClicked: { switch (state) {
41
41
                case "off_torch":
42
 
                case "off_flash": camera.flashMode = (flashAllowed) ? CameraEnums.FlashModeOn :
43
 
                                                                      CameraEnums.FlashModeTorch; break;
44
 
                case "on": camera.flashMode = CameraEnums.FlashModeAuto; break;
45
 
                case "auto": camera.flashMode = CameraEnums.FlashModeTorch; break;
46
 
                case "torch": camera.flashMode = CameraEnums.FlashModeOff; break;
 
42
                case "off_flash": camera.flash.mode = (flashAllowed) ? Camera.FlashOn :
 
43
                                                                       Camera.FlashTorch; break;
 
44
                case "on": camera.flash.mode = Camera.FlashAuto; break;
 
45
                case "auto": camera.flash.mode = Camera.FlashTorch; break;
 
46
                case "torch": camera.flash.mode = Camera.FlashOff; break;
47
47
            }}
48
48
            enabled: toolbar.opacity > 0.0
49
49
        }