1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2013-09-23 12:40:33 +0000
3
+++ CMakeLists.txt	2013-09-26 21:51:29 +0000
4
@@ -15,7 +15,23 @@
5
15
# Standard install paths
15
# Standard install paths
6
16
include(GNUInstallDirs)
16
include(GNUInstallDirs)
7
17
17
9
18
set(CAMERA_APP_DIR ${CMAKE_INSTALL_DATADIR}/camera-app)
18
option(INSTALL_TESTS "Install the tests on make install" on)
10
19
option(CLICK_MODE "Installs to a contained location" off)
11
20
12
21
if(CLICK_MODE)
13
22
    set(CAMERA_APP camera)
14
23
    set(CMAKE_INSTALL_PREFIX /)
15
24
    set(CAMERA_APP_DIR /)
16
25
    set(CMAKE_INSTALL_BINDIR /)
17
26
    set(PLUGIN_BASE lib/${CMAKE_LIBRARY_ARCHITECTURE})
18
27
    set(PLUGIN_DIR ${PLUGIN_BASE}/CameraApp)
19
28
    set(DESKTOP_EXEC "./${CAMERA_APP}")
20
29
    set(CLICK_TAG click)
21
30
else(CLICK_MODE)
22
31
    set(CAMERA_APP camera-app)
23
32
    set(CAMERA_APP_DIR ${CMAKE_INSTALL_DATADIR}/${CAMERA_APP})
24
33
    set(DESKTOP_EXEC ${CAMERA_APP})
25
34
endif(CLICK_MODE)
26
19
35
27
20
configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
36
configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
28
21
37
29
@@ -27,8 +43,6 @@
30
27
    ${Qt5Multimedia_INCLUDE_DIRS}
43
    ${Qt5Multimedia_INCLUDE_DIRS}
31
28
    )
44
    )
32
29
45
33
30
set(CAMERA_APP camera-app)
34
31
35
32
set(camera_app_HDRS
46
set(camera_app_HDRS
36
33
    cameraapplication.h)
47
    cameraapplication.h)
37
34
48
38
@@ -74,6 +88,8 @@
39
74
file(STRINGS ${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
88
file(STRINGS ${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
40
75
foreach(LINE ${DESKTOP_FILE_CONTENTS})
89
foreach(LINE ${DESKTOP_FILE_CONTENTS})
41
76
    string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
90
    string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
42
91
    string(REGEX REPLACE "\@DESKTOP_EXEC\@" 
43
92
        "${DESKTOP_EXEC}" LINE "${LINE}")
44
77
    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
93
    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
45
78
endforeach(LINE)
94
endforeach(LINE)
46
79
95
47
@@ -82,6 +98,7 @@
48
82
    )
98
    )
49
83
99
50
84
add_subdirectory(CameraApp)
100
add_subdirectory(CameraApp)
51
101
add_subdirectory(click)
52
85
102
53
86
file(GLOB_RECURSE I18N_SRC_FILES
103
file(GLOB_RECURSE I18N_SRC_FILES
54
87
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
104
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
55
88
105
56
=== modified file 'CameraApp/CMakeLists.txt'
57
--- CameraApp/CMakeLists.txt	2013-01-18 16:09:32 +0000
58
+++ CameraApp/CMakeLists.txt	2013-09-26 21:51:29 +0000
59
@@ -20,18 +20,19 @@
60
20
20
61
21
21
62
22
# Qt5's cmake does not export QT_IMPORTS_DIR, lets query qmake on our own for now
22
# Qt5's cmake does not export QT_IMPORTS_DIR, lets query qmake on our own for now
63
23
if(NOT CLICK_MODE)
64
23
get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION) 
24
get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION) 
71
24
function(QUERY_QMAKE VAR RESULT) 
25
    function(QUERY_QMAKE VAR RESULT) 
72
25
  exec_program(${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output ) 
26
    exec_program(${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output ) 
73
26
  if(NOT return_code) 
27
    if(NOT return_code) 
74
27
    file(TO_CMAKE_PATH "${output}" output) 
28
        file(TO_CMAKE_PATH "${output}" output) 
75
28
    set(${RESULT} ${output} PARENT_SCOPE) 
29
        set(${RESULT} ${output} PARENT_SCOPE) 
76
29
  endif(NOT return_code) 
30
    endif(NOT return_code) 
77
30
endfunction(QUERY_QMAKE) 
31
endfunction(QUERY_QMAKE) 
78
31
query_qmake(QT_INSTALL_QML QT_IMPORTS_DIR)
32
query_qmake(QT_INSTALL_QML QT_IMPORTS_DIR)
79
32
80
33
81
34
set(PLUGIN_DIR ${QT_IMPORTS_DIR}/CameraApp)
33
set(PLUGIN_DIR ${QT_IMPORTS_DIR}/CameraApp)
82
34
endif(NOT CLICK_MODE)
83
35
84
35
install(TARGETS camera-qml DESTINATION ${PLUGIN_DIR})
36
install(TARGETS camera-qml DESTINATION ${PLUGIN_DIR})
85
36
install(FILES qmldir DESTINATION ${PLUGIN_DIR})
37
install(FILES qmldir DESTINATION ${PLUGIN_DIR})
86
37
38
87
38
39
88
=== added file 'README.click'
89
--- README.click	1970-01-01 00:00:00 +0000
90
+++ README.click	2013-09-26 21:51:29 +0000
91
@@ -0,0 +1,15 @@
92
1
Building for click
93
2
==================
94
3
95
4
To build for a click package configure cmake as:
96
5
97
6
mkdir build
98
7
cd build
99
8
cmake [path_to_this_location] -DINSTALL_TESTS=off -DCLICK_MODE=on \
100
9
    -DBZR_REVNO=$(cd [path_to_this_location]; bzr revno)
101
10
make DESTDIR=package install
102
11
click build package
103
12
104
13
This package can be installed by running:
105
14
106
15
pkcon install-local com.ubuntu.camera_*.click
107
0
16
108
=== modified file 'camera-app.desktop.in'
109
--- camera-app.desktop.in	2013-06-11 16:05:35 +0000
110
+++ camera-app.desktop.in	2013-09-26 21:51:29 +0000
111
@@ -3,7 +3,7 @@
112
3
Name=tr("Camera")
3
Name=tr("Camera")
113
4
GenericName=camera-app
4
GenericName=camera-app
114
5
Comment=tr("Camera application")
5
Comment=tr("Camera application")
116
6
Exec=camera-app --fullscreen %u
6
Exec=@DESKTOP_EXEC@ --fullscreen %u
117
7
Terminal=false
7
Terminal=false
118
8
Icon=camera-app
8
Icon=camera-app
119
9
#MimeType=x-scheme-handler/contact;x-scheme-handler/call
9
#MimeType=x-scheme-handler/contact;x-scheme-handler/call
120
10
10
121
=== modified file 'cameraapplication.cpp'
122
--- cameraapplication.cpp	2013-09-23 12:40:33 +0000
123
+++ cameraapplication.cpp	2013-09-26 21:51:29 +0000
124
@@ -76,8 +76,13 @@
125
76
    m_view->setTitle("Camera");
76
    m_view->setTitle("Camera");
126
77
    m_view->rootContext()->setContextProperty("application", this);
77
    m_view->rootContext()->setContextProperty("application", this);
127
78
    m_view->engine()->setBaseUrl(QUrl::fromLocalFile(cameraAppDirectory()));
78
    m_view->engine()->setBaseUrl(QUrl::fromLocalFile(cameraAppDirectory()));
128
79
    if (isClick()) {
129
80
        m_view->engine()->addImportPath(cameraAppImportDirectory());
130
81
        qDebug() << "Import path added" << cameraAppImportDirectory();
131
82
    }
132
83
    qDebug() << "Camera app directory" << cameraAppDirectory();
133
79
    QObject::connect(m_view->engine(), SIGNAL(quit()), this, SLOT(quit()));
84
    QObject::connect(m_view->engine(), SIGNAL(quit()), this, SLOT(quit()));
135
80
    m_view->setSource(QUrl::fromLocalFile("camera-app.qml"));
85
    m_view->setSource(QUrl::fromLocalFile(sourceQml()));
136
81
    if (arguments().contains(QLatin1String("--fullscreen"))) m_view->showFullScreen();
86
    if (arguments().contains(QLatin1String("--fullscreen"))) m_view->showFullScreen();
137
82
    else m_view->show();
87
    else m_view->show();
138
83
88
139
84
89
140
=== added directory 'click'
141
=== added file 'click/CMakeLists.txt'
142
--- click/CMakeLists.txt	1970-01-01 00:00:00 +0000
143
+++ click/CMakeLists.txt	2013-09-26 21:51:29 +0000
144
@@ -0,0 +1,10 @@
145
1
if(CLICK_MODE)
146
2
    if(NOT BZR_REVNO)
147
3
        set(BZR_REVNO "latest")
148
4
    endif(NOT BZR_REVNO)
149
5
    configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
150
6
    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
151
7
            DESTINATION ${CMAKE_INSTALL_PREFIX})
152
8
    install(FILES camera-apparmor.json
153
9
            DESTINATION ${CMAKE_INSTALL_PREFIX})
154
10
endif(CLICK_MODE)
155
0
11
156
=== added file 'click/camera-apparmor.json'
157
--- click/camera-apparmor.json	1970-01-01 00:00:00 +0000
158
+++ click/camera-apparmor.json	2013-09-26 21:51:29 +0000
159
@@ -0,0 +1,7 @@
160
1
{
161
2
    "policy_groups": ["picture_files",
162
3
                      "camera",
163
4
                      "audio"
164
5
                      ], 
165
6
    "policy_version": 1.0
166
7
}
167
0
8
168
=== added file 'click/manifest.json.in'
169
--- click/manifest.json.in	1970-01-01 00:00:00 +0000
170
+++ click/manifest.json.in	2013-09-26 21:51:29 +0000
171
@@ -0,0 +1,21 @@
172
1
{
173
2
    "description": 
174
3
        "An application to take pictures and videos with the device cameras",
175
4
    "framework": "ubuntu-sdk-13.10", 
176
5
    "architecture": "armhf",
177
6
    "hooks": {
178
7
        "camera": {
179
8
            "apparmor": "camera-apparmor.json", 
180
9
            "desktop": "@CMAKE_INSTALL_DATADIR@/applications/@DESKTOP_FILE@"
181
10
        }
182
11
    }, 
183
12
    "icon": "camera-app",
184
13
    "maintainer": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
185
14
    "name": "com.ubuntu.camera", 
186
15
    "title": "Camera", 
187
16
    "version": "2.9.1",
188
17
    "x-source": {
189
18
        "vcs-bzr": "lp:camera-app", 
190
19
        "vcs-bzr-revno": "@BZR_REVNO@"
191
20
    }
192
21
}
193
0
22
194
=== modified file 'config.h.in'
195
--- config.h.in	2012-10-30 15:48:34 +0000
196
+++ config.h.in	2013-09-26 21:51:29 +0000
197
@@ -21,6 +21,11 @@
198
21
#include <QtCore/QCoreApplication>
21
#include <QtCore/QCoreApplication>
199
22
#include <QtCore/QDir>
22
#include <QtCore/QDir>
200
23
23
201
24
inline bool isClick() {
202
25
    static bool click = (QString("@CLICK_TAG@") == QString("click"));
203
26
    return click;
204
27
}
205
28
206
24
inline bool isRunningInstalled() {
29
inline bool isRunningInstalled() {
207
25
    static bool installed = (QCoreApplication::applicationDirPath() ==
30
    static bool installed = (QCoreApplication::applicationDirPath() ==
208
26
                             QDir(("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath());
31
                             QDir(("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath());
209
@@ -28,10 +33,24 @@
210
28
}
33
}
211
29
34
212
30
inline QString cameraAppDirectory() {
35
inline QString cameraAppDirectory() {
214
31
    if (isRunningInstalled()) {
36
    if (isClick()) {
215
37
        return QDir::currentPath();
216
38
    } else if (isRunningInstalled()) {
217
32
        return QString("@CMAKE_INSTALL_PREFIX@/@CAMERA_APP_DIR@/");
39
        return QString("@CMAKE_INSTALL_PREFIX@/@CAMERA_APP_DIR@/");
218
33
    } else {
40
    } else {
219
34
        return QString("@CMAKE_SOURCE_DIR@/");
41
        return QString("@CMAKE_SOURCE_DIR@/");
220
35
    }
42
    }
221
36
}
43
}
222
37
44
223
45
inline QString cameraAppImportDirectory() {
224
46
    return QDir::currentPath() + "/@PLUGIN_BASE@";
225
47
}
226
48
227
49
inline QString sourceQml() {
228
50
    static QString qmlFile("camera-app.qml");
229
51
    if (isClick()) {
230
52
        return QDir::currentPath() + "/" + qmlFile;
231
53
    } else {
232
54
        return qmlFile;
233
55
    }
234
56
}
235
38
57
236
=== modified file 'tests/autopilot/CMakeLists.txt'
237
--- tests/autopilot/CMakeLists.txt	2013-01-08 13:44:38 +0000
238
+++ tests/autopilot/CMakeLists.txt	2013-09-26 21:51:29 +0000
239
@@ -3,7 +3,8 @@
240
3
execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
3
execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
241
4
    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
4
    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
242
5
5
243
6
if(INSTALL_TESTS)
244
6
install(DIRECTORY ${AUTOPILOT_DIR}
7
install(DIRECTORY ${AUTOPILOT_DIR}
245
7
    DESTINATION ${PYTHON_PACKAGE_DIR}
8
    DESTINATION ${PYTHON_PACKAGE_DIR}
246
8
    )
9
    )
248
9
10
endif(INSTALL_TESTS)
249
10
11
250
=== modified file 'tests/autopilot/camera_app/tests/__init__.py'
251
--- tests/autopilot/camera_app/tests/__init__.py	2013-05-25 07:16:22 +0000
252
+++ tests/autopilot/camera_app/tests/__init__.py	2013-09-26 21:51:29 +0000
253
@@ -33,14 +33,17 @@
254
33
        ('with touch', dict(input_device_class=Touch))]
33
        ('with touch', dict(input_device_class=Touch))]
255
34
34
256
35
    local_location = "../../camera-app"
35
    local_location = "../../camera-app"
257
36
    deb_location = '/usr/bin/camera-app'
258
36
37
259
37
    def setUp(self):
38
    def setUp(self):
260
38
        self.pointing_device = Pointer(self.input_device_class.create())
39
        self.pointing_device = Pointer(self.input_device_class.create())
261
39
        super(CameraAppTestCase, self).setUp()
40
        super(CameraAppTestCase, self).setUp()
262
40
        if os.path.exists(self.local_location):
41
        if os.path.exists(self.local_location):
263
41
            self.launch_test_local()
42
            self.launch_test_local()
265
42
        else:
43
        elif os.path.exists(self.deb_location):
266
43
            self.launch_test_installed()
44
            self.launch_test_installed()
267
45
        else:
268
46
            self.launch_click_installed()
269
44
47
270
45
    def launch_test_local(self):
48
    def launch_test_local(self):
271
46
        self.app = self.launch_test_application(
49
        self.app = self.launch_test_application(
272
@@ -57,6 +60,10 @@
273
57
                "--desktop_file_hint=/usr/share/applications/camera-app.desktop",
60
                "--desktop_file_hint=/usr/share/applications/camera-app.desktop",
274
58
                app_type='qt')
61
                app_type='qt')
275
59
62
276
63
    def launch_click_installed(self):
277
64
        self.app = self.launch_click_package(
278
65
            "com.ubuntu.camera")
279
66
280
60
    def get_center(self, object_proxy):
67
    def get_center(self, object_proxy):
281
61
        x, y, w, h = object_proxy.globalRect
68
        x, y, w, h = object_proxy.globalRect
282
62
        return [x + (w / 2), y + (h / 2)]
69
        return [x + (w / 2), y + (h / 2)]
Status:	Merged
Approved by:	Gustavo Pichorim Boiko on 2013-09-26
Approved revision:	194
Merged at revision:	201
Proposed branch:	lp:~sergiusens/camera-app/click
Merge into:	lp:camera-app
Diff against target:	282 lines (+119/-16) 11 files modified CMakeLists.txt (+20/-3) CameraApp/CMakeLists.txt (+9/-8) README.click (+15/-0) camera-app.desktop.in (+1/-1) cameraapplication.cpp (+6/-1) click/CMakeLists.txt (+10/-0) click/camera-apparmor.json (+7/-0) click/manifest.json.in (+21/-0) config.h.in (+20/-1) tests/autopilot/CMakeLists.txt (+2/-1) tests/autopilot/camera_app/tests/__init__.py (+8/-1)
To merge this branch:	bzr merge lp:~sergiusens/camera-app/click
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)		2013-09-26	Approve on 2013-09-26
PS Jenkins bot	continuous-integration		Approve on 2013-09-26
Review via email: mp+187800@code.launchpad.net
1	=== modified file 'CMakeLists.txt'
2	--- CMakeLists.txt 2013-09-23 12:40:33 +0000
3	+++ CMakeLists.txt 2013-09-26 21:51:29 +0000
4	@@ -15,7 +15,23 @@
5	15	# Standard install paths	15	# Standard install paths
6	16	include(GNUInstallDirs)	16	include(GNUInstallDirs)
7	17		17
9	18	set(CAMERA_APP_DIR ${CMAKE_INSTALL_DATADIR}/camera-app)	18	option(INSTALL_TESTS "Install the tests on make install" on)
10			19	option(CLICK_MODE "Installs to a contained location" off)
11			20
12			21	if(CLICK_MODE)
13			22	set(CAMERA_APP camera)
14			23	set(CMAKE_INSTALL_PREFIX /)
15			24	set(CAMERA_APP_DIR /)
16			25	set(CMAKE_INSTALL_BINDIR /)
17			26	set(PLUGIN_BASE lib/${CMAKE_LIBRARY_ARCHITECTURE})
18			27	set(PLUGIN_DIR ${PLUGIN_BASE}/CameraApp)
19			28	set(DESKTOP_EXEC "./${CAMERA_APP}")
20			29	set(CLICK_TAG click)
21			30	else(CLICK_MODE)
22			31	set(CAMERA_APP camera-app)
23			32	set(CAMERA_APP_DIR ${CMAKE_INSTALL_DATADIR}/${CAMERA_APP})
24			33	set(DESKTOP_EXEC ${CAMERA_APP})
25			34	endif(CLICK_MODE)
26	19		35
27	20	configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)	36	configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
28	21		37
29	@@ -27,8 +43,6 @@
30	27	${Qt5Multimedia_INCLUDE_DIRS}	43	${Qt5Multimedia_INCLUDE_DIRS}
31	28	)	44	)
32	29		45
33	30	set(CAMERA_APP camera-app)
34	31
35	32	set(camera_app_HDRS	46	set(camera_app_HDRS
36	33	cameraapplication.h)	47	cameraapplication.h)
37	34		48
38	@@ -74,6 +88,8 @@
39	74	file(STRINGS ${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)	88	file(STRINGS ${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
40	75	foreach(LINE ${DESKTOP_FILE_CONTENTS})	89	foreach(LINE ${DESKTOP_FILE_CONTENTS})
41	76	string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")	90	string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
42			91	string(REGEX REPLACE "\@DESKTOP_EXEC\@"
43			92	"${DESKTOP_EXEC}" LINE "${LINE}")
44	77	file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")	93	file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
45	78	endforeach(LINE)	94	endforeach(LINE)
46	79		95
47	@@ -82,6 +98,7 @@
48	82	)	98	)
49	83		99
50	84	add_subdirectory(CameraApp)	100	add_subdirectory(CameraApp)
51			101	add_subdirectory(click)
52	85		102
53	86	file(GLOB_RECURSE I18N_SRC_FILES	103	file(GLOB_RECURSE I18N_SRC_FILES
54	87	RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}	104	RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
55	88		105
56	=== modified file 'CameraApp/CMakeLists.txt'
57	--- CameraApp/CMakeLists.txt 2013-01-18 16:09:32 +0000
58	+++ CameraApp/CMakeLists.txt 2013-09-26 21:51:29 +0000
59	@@ -20,18 +20,19 @@
60	20		20
61	21		21
62	22	# Qt5's cmake does not export QT_IMPORTS_DIR, lets query qmake on our own for now	22	# Qt5's cmake does not export QT_IMPORTS_DIR, lets query qmake on our own for now
63			23	if(NOT CLICK_MODE)
64	23	get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)	24	get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
71	24	function(QUERY_QMAKE VAR RESULT)	25	function(QUERY_QMAKE VAR RESULT)
72	25	exec_program(${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output )	26	exec_program(${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output )
73	26	if(NOT return_code)	27	if(NOT return_code)
74	27	file(TO_CMAKE_PATH "${output}" output)	28	file(TO_CMAKE_PATH "${output}" output)
75	28	set(${RESULT} ${output} PARENT_SCOPE)	29	set(${RESULT} ${output} PARENT_SCOPE)
76	29	endif(NOT return_code)	30	endif(NOT return_code)
77	30	endfunction(QUERY_QMAKE)	31	endfunction(QUERY_QMAKE)
78	31	query_qmake(QT_INSTALL_QML QT_IMPORTS_DIR)	32	query_qmake(QT_INSTALL_QML QT_IMPORTS_DIR)
79	32
80	33
81	34	set(PLUGIN_DIR ${QT_IMPORTS_DIR}/CameraApp)	33	set(PLUGIN_DIR ${QT_IMPORTS_DIR}/CameraApp)
82			34	endif(NOT CLICK_MODE)
83			35
84	35	install(TARGETS camera-qml DESTINATION ${PLUGIN_DIR})	36	install(TARGETS camera-qml DESTINATION ${PLUGIN_DIR})
85	36	install(FILES qmldir DESTINATION ${PLUGIN_DIR})	37	install(FILES qmldir DESTINATION ${PLUGIN_DIR})
86	37		38
87	38		39
88	=== added file 'README.click'
89	--- README.click 1970-01-01 00:00:00 +0000
90	+++ README.click 2013-09-26 21:51:29 +0000
91	@@ -0,0 +1,15 @@
92			1	Building for click
93			2	==================
94			3
95			4	To build for a click package configure cmake as:
96			5
97			6	mkdir build
98			7	cd build
99			8	cmake [path_to_this_location] -DINSTALL_TESTS=off -DCLICK_MODE=on \
100			9	-DBZR_REVNO=$(cd [path_to_this_location]; bzr revno)
101			10	make DESTDIR=package install
102			11	click build package
103			12
104			13	This package can be installed by running:
105			14
106			15	pkcon install-local com.ubuntu.camera_*.click
107	0		16
108	=== modified file 'camera-app.desktop.in'
109	--- camera-app.desktop.in 2013-06-11 16:05:35 +0000
110	+++ camera-app.desktop.in 2013-09-26 21:51:29 +0000
111	@@ -3,7 +3,7 @@
112	3	Name=tr("Camera")	3	Name=tr("Camera")
113	4	GenericName=camera-app	4	GenericName=camera-app
114	5	Comment=tr("Camera application")	5	Comment=tr("Camera application")
116	6	Exec=camera-app --fullscreen %u	6	Exec=@DESKTOP_EXEC@ --fullscreen %u
117	7	Terminal=false	7	Terminal=false
118	8	Icon=camera-app	8	Icon=camera-app
119	9	#MimeType=x-scheme-handler/contact;x-scheme-handler/call	9	#MimeType=x-scheme-handler/contact;x-scheme-handler/call
120	10		10
121	=== modified file 'cameraapplication.cpp'
122	--- cameraapplication.cpp 2013-09-23 12:40:33 +0000
123	+++ cameraapplication.cpp 2013-09-26 21:51:29 +0000
124	@@ -76,8 +76,13 @@
125	76	m_view->setTitle("Camera");	76	m_view->setTitle("Camera");
126	77	m_view->rootContext()->setContextProperty("application", this);	77	m_view->rootContext()->setContextProperty("application", this);
127	78	m_view->engine()->setBaseUrl(QUrl::fromLocalFile(cameraAppDirectory()));	78	m_view->engine()->setBaseUrl(QUrl::fromLocalFile(cameraAppDirectory()));
128			79	if (isClick()) {
129			80	m_view->engine()->addImportPath(cameraAppImportDirectory());
130			81	qDebug() << "Import path added" << cameraAppImportDirectory();
131			82	}
132			83	qDebug() << "Camera app directory" << cameraAppDirectory();
133	79	QObject::connect(m_view->engine(), SIGNAL(quit()), this, SLOT(quit()));	84	QObject::connect(m_view->engine(), SIGNAL(quit()), this, SLOT(quit()));
135	80	m_view->setSource(QUrl::fromLocalFile("camera-app.qml"));	85	m_view->setSource(QUrl::fromLocalFile(sourceQml()));
136	81	if (arguments().contains(QLatin1String("--fullscreen"))) m_view->showFullScreen();	86	if (arguments().contains(QLatin1String("--fullscreen"))) m_view->showFullScreen();
137	82	else m_view->show();	87	else m_view->show();
138	83		88
139	84		89
140	=== added directory 'click'
141	=== added file 'click/CMakeLists.txt'
142	--- click/CMakeLists.txt 1970-01-01 00:00:00 +0000
143	+++ click/CMakeLists.txt 2013-09-26 21:51:29 +0000
144	@@ -0,0 +1,10 @@
145			1	if(CLICK_MODE)
146			2	if(NOT BZR_REVNO)
147			3	set(BZR_REVNO "latest")
148			4	endif(NOT BZR_REVNO)
149			5	configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
150			6	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
151			7	DESTINATION ${CMAKE_INSTALL_PREFIX})
152			8	install(FILES camera-apparmor.json
153			9	DESTINATION ${CMAKE_INSTALL_PREFIX})
154			10	endif(CLICK_MODE)
155	0		11
156	=== added file 'click/camera-apparmor.json'
157	--- click/camera-apparmor.json 1970-01-01 00:00:00 +0000
158	+++ click/camera-apparmor.json 2013-09-26 21:51:29 +0000
159	@@ -0,0 +1,7 @@
160			1	{
161			2	"policy_groups": ["picture_files",
162			3	"camera",
163			4	"audio"
164			5	],
165			6	"policy_version": 1.0
166			7	}
167	0		8
168	=== added file 'click/manifest.json.in'
169	--- click/manifest.json.in 1970-01-01 00:00:00 +0000
170	+++ click/manifest.json.in 2013-09-26 21:51:29 +0000
171	@@ -0,0 +1,21 @@
172			1	{
173			2	"description":
174			3	"An application to take pictures and videos with the device cameras",
175			4	"framework": "ubuntu-sdk-13.10",
176			5	"architecture": "armhf",
177			6	"hooks": {
178			7	"camera": {
179			8	"apparmor": "camera-apparmor.json",
180			9	"desktop": "@CMAKE_INSTALL_DATADIR@/applications/@DESKTOP_FILE@"
181			10	}
182			11	},
183			12	"icon": "camera-app",
184			13	"maintainer": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
185			14	"name": "com.ubuntu.camera",
186			15	"title": "Camera",
187			16	"version": "2.9.1",
188			17	"x-source": {
189			18	"vcs-bzr": "lp:camera-app",
190			19	"vcs-bzr-revno": "@BZR_REVNO@"
191			20	}
192			21	}
193	0		22
194	=== modified file 'config.h.in'
195	--- config.h.in 2012-10-30 15:48:34 +0000
196	+++ config.h.in 2013-09-26 21:51:29 +0000
197	@@ -21,6 +21,11 @@
198	21	#include <QtCore/QCoreApplication>	21	#include <QtCore/QCoreApplication>
199	22	#include <QtCore/QDir>	22	#include <QtCore/QDir>
200	23		23
201			24	inline bool isClick() {
202			25	static bool click = (QString("@CLICK_TAG@") == QString("click"));
203			26	return click;
204			27	}
205			28
206	24	inline bool isRunningInstalled() {	29	inline bool isRunningInstalled() {
207	25	static bool installed = (QCoreApplication::applicationDirPath() ==	30	static bool installed = (QCoreApplication::applicationDirPath() ==
208	26	QDir(("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath());	31	QDir(("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath());
209	@@ -28,10 +33,24 @@
210	28	}	33	}
211	29		34
212	30	inline QString cameraAppDirectory() {	35	inline QString cameraAppDirectory() {
214	31	if (isRunningInstalled()) {	36	if (isClick()) {
215			37	return QDir::currentPath();
216			38	} else if (isRunningInstalled()) {
217	32	return QString("@CMAKE_INSTALL_PREFIX@/@CAMERA_APP_DIR@/");	39	return QString("@CMAKE_INSTALL_PREFIX@/@CAMERA_APP_DIR@/");
218	33	} else {	40	} else {
219	34	return QString("@CMAKE_SOURCE_DIR@/");	41	return QString("@CMAKE_SOURCE_DIR@/");
220	35	}	42	}
221	36	}	43	}
222	37		44
223			45	inline QString cameraAppImportDirectory() {
224			46	return QDir::currentPath() + "/@PLUGIN_BASE@";
225			47	}
226			48
227			49	inline QString sourceQml() {
228			50	static QString qmlFile("camera-app.qml");
229			51	if (isClick()) {
230			52	return QDir::currentPath() + "/" + qmlFile;
231			53	} else {
232			54	return qmlFile;
233			55	}
234			56	}
235	38		57
236	=== modified file 'tests/autopilot/CMakeLists.txt'
237	--- tests/autopilot/CMakeLists.txt 2013-01-08 13:44:38 +0000
238	+++ tests/autopilot/CMakeLists.txt 2013-09-26 21:51:29 +0000
239	@@ -3,7 +3,8 @@
240	3	execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"	3	execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
241	4	OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)	4	OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
242	5		5
243			6	if(INSTALL_TESTS)
244	6	install(DIRECTORY ${AUTOPILOT_DIR}	7	install(DIRECTORY ${AUTOPILOT_DIR}
245	7	DESTINATION ${PYTHON_PACKAGE_DIR}	8	DESTINATION ${PYTHON_PACKAGE_DIR}
246	8	)	9	)
248	9		10	endif(INSTALL_TESTS)
249	10		11
250	=== modified file 'tests/autopilot/camera_app/tests/__init__.py'
251	--- tests/autopilot/camera_app/tests/__init__.py 2013-05-25 07:16:22 +0000
252	+++ tests/autopilot/camera_app/tests/__init__.py 2013-09-26 21:51:29 +0000
253	@@ -33,14 +33,17 @@
254	33	('with touch', dict(input_device_class=Touch))]	33	('with touch', dict(input_device_class=Touch))]
255	34		34
256	35	local_location = "../../camera-app"	35	local_location = "../../camera-app"
257			36	deb_location = '/usr/bin/camera-app'
258	36		37
259	37	def setUp(self):	38	def setUp(self):
260	38	self.pointing_device = Pointer(self.input_device_class.create())	39	self.pointing_device = Pointer(self.input_device_class.create())
261	39	super(CameraAppTestCase, self).setUp()	40	super(CameraAppTestCase, self).setUp()
262	40	if os.path.exists(self.local_location):	41	if os.path.exists(self.local_location):
263	41	self.launch_test_local()	42	self.launch_test_local()
265	42	else:	43	elif os.path.exists(self.deb_location):
266	43	self.launch_test_installed()	44	self.launch_test_installed()
267			45	else:
268			46	self.launch_click_installed()
269	44		47
270	45	def launch_test_local(self):	48	def launch_test_local(self):
271	46	self.app = self.launch_test_application(	49	self.app = self.launch_test_application(
272	@@ -57,6 +60,10 @@
273	57	"--desktop_file_hint=/usr/share/applications/camera-app.desktop",	60	"--desktop_file_hint=/usr/share/applications/camera-app.desktop",
274	58	app_type='qt')	61	app_type='qt')
275	59		62
276			63	def launch_click_installed(self):
277			64	self.app = self.launch_click_package(
278			65	"com.ubuntu.camera")
279			66
280	60	def get_center(self, object_proxy):	67	def get_center(self, object_proxy):
281	61	x, y, w, h = object_proxy.globalRect	68	x, y, w, h = object_proxy.globalRect
282	62	return [x + (w / 2), y + (h / 2)]	69	return [x + (w / 2), y + (h / 2)]