Merge lp:~mzanetti/big-moving-text/unityscreen into lp:big-moving-text
- unityscreen
- Merge into trunk
Proposed by
Michael Zanetti
Status: | Needs review |
---|---|
Proposed branch: | lp:~mzanetti/big-moving-text/unityscreen |
Merge into: | lp:big-moving-text |
Diff against target: |
1048 lines (+226/-679) 17 files modified
BigMovingText.pro (+35/-0) BigMovingText.qmlproject (+0/-59) BigMovingText.qmlproject.user (+0/-560) Makefile (+0/-49) app/BigMovingText.apparmor (+0/-1) app/BigMovingText.apparmor.openstore (+6/-0) app/BigMovingText.desktop (+2/-2) app/Main.qml (+5/-0) app/app.pro (+31/-0) backend/UnityScreen/UnityScreen.pro (+35/-0) backend/UnityScreen/backend.cpp (+17/-0) backend/UnityScreen/backend.h (+18/-0) backend/UnityScreen/qmldir (+3/-0) backend/UnityScreen/unityscreen.cpp (+37/-0) backend/UnityScreen/unityscreen.h (+29/-0) manifest.json.in (+3/-3) po/template.pot (+5/-5) |
To merge this branch: | bzr merge lp:~mzanetti/big-moving-text/unityscreen |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michal Predotka | Pending | ||
Review via email: mp+254500@code.launchpad.net |
Commit message
adds a unityscreen plugin that allows keeping the display on
Description of the change
With a 15.04 Kit in QtCreator it should fine and also run on 14.10/RTM devices.
For publishing in Open App Store, the BigMovingText.
Also dropped the "network" policy from the apparmor file as I couldn't see anything that actually uses networking. Let me know if I missed something.
To post a comment you must log in.
Unmerged revisions
- 4. By Michael Zanetti
-
drop qdebus
- 3. By Michael Zanetti
-
add a unityscreen plugin that allows keeping the display on
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'BigMovingText.pro' |
2 | --- BigMovingText.pro 1970-01-01 00:00:00 +0000 |
3 | +++ BigMovingText.pro 2015-03-29 18:56:23 +0000 |
4 | @@ -0,0 +1,35 @@ |
5 | +# This is the basic qmake template for the Ubuntu-SDK |
6 | +# it handles creation and installation of the manifest |
7 | +# file and takes care of subprojects |
8 | +TEMPLATE = subdirs |
9 | + |
10 | +#load Ubuntu specific features |
11 | +load(ubuntu-click) |
12 | + |
13 | +SUBDIRS += app \ |
14 | + backend/UnityScreen |
15 | + |
16 | +# specify the manifest file, this file is required for click |
17 | +# packaging and for the IDE to create runconfigurations |
18 | +UBUNTU_MANIFEST_FILE=manifest.json.in |
19 | + |
20 | +# specify translation domain, this must be equal with the |
21 | +# app name in the manifest file |
22 | +UBUNTU_TRANSLATION_DOMAIN="bigmovingtext.mivoligo" |
23 | + |
24 | +# specify the source files that should be included into |
25 | +# the translation file, from those files a translation |
26 | +# template is created in po/template.pot, to create a |
27 | +# translation copy the template to e.g. de.po and edit the sources |
28 | +UBUNTU_TRANSLATION_SOURCES+= \ |
29 | + $$files(*.qml,true) \ |
30 | + $$files(*.js,true) \ |
31 | + $$files(*.cpp,true) \ |
32 | + $$files(*.h,true) |
33 | + |
34 | +# specifies all translations files and makes sure they are |
35 | +# compiled and installed into the right place in the click package |
36 | +UBUNTU_PO_FILES+=$$files(po/*.po) |
37 | + |
38 | + |
39 | + |
40 | |
41 | === removed file 'BigMovingText.qmlproject' |
42 | --- BigMovingText.qmlproject 2015-03-27 22:47:07 +0000 |
43 | +++ BigMovingText.qmlproject 1970-01-01 00:00:00 +0000 |
44 | @@ -1,59 +0,0 @@ |
45 | -import QmlProject 1.1 |
46 | - |
47 | -Project { |
48 | - mainFile: "Main.qml" |
49 | - |
50 | - /* Include .qml, .js, and image files from current directory and subdirectories */ |
51 | - QmlFiles { |
52 | - directory: "." |
53 | - } |
54 | - JavaScriptFiles { |
55 | - directory: "." |
56 | - } |
57 | - ImageFiles { |
58 | - directory: "." |
59 | - } |
60 | - Files { |
61 | - filter: "*.desktop" |
62 | - } |
63 | - Files { |
64 | - filter: "www/*.html" |
65 | - } |
66 | - Files { |
67 | - filter: "Makefile" |
68 | - } |
69 | - Files { |
70 | - filter: "*.apparmor" |
71 | - } |
72 | - Files { |
73 | - directory: "." |
74 | - paths: ["manifest.json",".excludes"] |
75 | - } |
76 | - Files { |
77 | - directory: "www" |
78 | - filter: "*" |
79 | - } |
80 | - Files { |
81 | - directory: "www/img/" |
82 | - filter: "*" |
83 | - } |
84 | - Files { |
85 | - directory: "www/css/" |
86 | - filter: "*" |
87 | - } |
88 | - Files { |
89 | - directory: "www/js/" |
90 | - filter: "*" |
91 | - } |
92 | - Files { |
93 | - directory: "tests/" |
94 | - filter: "*" |
95 | - } |
96 | - Files { |
97 | - directory: "debian" |
98 | - filter: "*" |
99 | - } |
100 | - /* List of plugin directories passed to QML runtime */ |
101 | - importPaths: [ "." ,"/usr/bin","/usr/lib/x86_64-linux-gnu/qt5/qml" ] |
102 | -} |
103 | - |
104 | |
105 | === removed file 'BigMovingText.qmlproject.user' |
106 | --- BigMovingText.qmlproject.user 2015-03-28 16:00:05 +0000 |
107 | +++ BigMovingText.qmlproject.user 1970-01-01 00:00:00 +0000 |
108 | @@ -1,560 +0,0 @@ |
109 | -<?xml version="1.0" encoding="UTF-8"?> |
110 | -<!DOCTYPE QtCreatorProject> |
111 | -<!-- Written by QtCreator 3.1.1, 2015-03-28T09:43:07. --> |
112 | -<qtcreator> |
113 | - <data> |
114 | - <variable>ProjectExplorer.Project.ActiveTarget</variable> |
115 | - <value type="int">2</value> |
116 | - </data> |
117 | - <data> |
118 | - <variable>ProjectExplorer.Project.EditorSettings</variable> |
119 | - <valuemap type="QVariantMap"> |
120 | - <value type="bool" key="EditorConfiguration.AutoIndent">true</value> |
121 | - <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> |
122 | - <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> |
123 | - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> |
124 | - <value type="QString" key="language">Cpp</value> |
125 | - <valuemap type="QVariantMap" key="value"> |
126 | - <value type="QByteArray" key="CurrentPreferences">CppGlobal</value> |
127 | - </valuemap> |
128 | - </valuemap> |
129 | - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> |
130 | - <value type="QString" key="language">QmlJS</value> |
131 | - <valuemap type="QVariantMap" key="value"> |
132 | - <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value> |
133 | - </valuemap> |
134 | - </valuemap> |
135 | - <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> |
136 | - <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> |
137 | - <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> |
138 | - <value type="int" key="EditorConfiguration.IndentSize">4</value> |
139 | - <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> |
140 | - <value type="int" key="EditorConfiguration.MarginColumn">80</value> |
141 | - <value type="bool" key="EditorConfiguration.MouseHiding">true</value> |
142 | - <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> |
143 | - <value type="int" key="EditorConfiguration.PaddingMode">1</value> |
144 | - <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> |
145 | - <value type="bool" key="EditorConfiguration.ShowMargin">false</value> |
146 | - <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> |
147 | - <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> |
148 | - <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> |
149 | - <value type="int" key="EditorConfiguration.TabSize">8</value> |
150 | - <value type="bool" key="EditorConfiguration.UseGlobal">true</value> |
151 | - <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> |
152 | - <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> |
153 | - <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> |
154 | - <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> |
155 | - <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> |
156 | - </valuemap> |
157 | - </data> |
158 | - <data> |
159 | - <variable>ProjectExplorer.Project.PluginSettings</variable> |
160 | - <valuemap type="QVariantMap"/> |
161 | - </data> |
162 | - <data> |
163 | - <variable>ProjectExplorer.Project.Target.0</variable> |
164 | - <valuemap type="QVariantMap"> |
165 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value> |
166 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value> |
167 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{bdc1d909-c69b-4f9c-b9b5-bc96c535756c}</value> |
168 | - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> |
169 | - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> |
170 | - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> |
171 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> |
172 | - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/michal/Devel/build-BigMovingText-Desktop-default</value> |
173 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
174 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
175 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
176 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Update translations template</value> |
177 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
178 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuQml.UpdateTranslationTemplateMakeStep</value> |
179 | - </valuemap> |
180 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> |
181 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
182 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build translations</value> |
183 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
184 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuQml.BuildTranslationMakeStep</value> |
185 | - </valuemap> |
186 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> |
187 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> |
188 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
189 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> |
190 | - </valuemap> |
191 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> |
192 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> |
193 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> |
194 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
195 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> |
196 | - </valuemap> |
197 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> |
198 | - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> |
199 | - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> |
200 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Default</value> |
201 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
202 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuQml.BuildConfiguration</value> |
203 | - </valuemap> |
204 | - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value> |
205 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> |
206 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
207 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> |
208 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> |
209 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
210 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> |
211 | - </valuemap> |
212 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> |
213 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value> |
214 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
215 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> |
216 | - </valuemap> |
217 | - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> |
218 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> |
219 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> |
220 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> |
221 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> |
222 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> |
223 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> |
224 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> |
225 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> |
226 | - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> |
227 | - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> |
228 | - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> |
229 | - <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value> |
230 | - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> |
231 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> |
232 | - <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value> |
233 | - <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> |
234 | - <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value> |
235 | - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> |
236 | - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> |
237 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> |
238 | - <value type="int">0</value> |
239 | - <value type="int">1</value> |
240 | - <value type="int">2</value> |
241 | - <value type="int">3</value> |
242 | - <value type="int">4</value> |
243 | - <value type="int">5</value> |
244 | - <value type="int">6</value> |
245 | - <value type="int">7</value> |
246 | - <value type="int">8</value> |
247 | - <value type="int">9</value> |
248 | - <value type="int">10</value> |
249 | - <value type="int">11</value> |
250 | - <value type="int">12</value> |
251 | - <value type="int">13</value> |
252 | - <value type="int">14</value> |
253 | - </valuelist> |
254 | - <value type="int" key="PE.EnvironmentAspect.Base">0</value> |
255 | - <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> |
256 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value> |
257 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Scene</value> |
258 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmlProjectManager.QmlRunConfiguration.QmlScene</value> |
259 | - <value type="QString" key="QmlProjectManager.QmlRunConfiguration.MainScript">CurrentFile</value> |
260 | - <value type="QString" key="QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"></value> |
261 | - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> |
262 | - <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> |
263 | - <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> |
264 | - <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> |
265 | - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> |
266 | - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> |
267 | - </valuemap> |
268 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1"> |
269 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> |
270 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> |
271 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> |
272 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> |
273 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> |
274 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> |
275 | - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> |
276 | - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> |
277 | - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> |
278 | - <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value> |
279 | - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> |
280 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> |
281 | - <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value> |
282 | - <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> |
283 | - <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value> |
284 | - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> |
285 | - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> |
286 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> |
287 | - <value type="int">0</value> |
288 | - <value type="int">1</value> |
289 | - <value type="int">2</value> |
290 | - <value type="int">3</value> |
291 | - <value type="int">4</value> |
292 | - <value type="int">5</value> |
293 | - <value type="int">6</value> |
294 | - <value type="int">7</value> |
295 | - <value type="int">8</value> |
296 | - <value type="int">9</value> |
297 | - <value type="int">10</value> |
298 | - <value type="int">11</value> |
299 | - <value type="int">12</value> |
300 | - <value type="int">13</value> |
301 | - <value type="int">14</value> |
302 | - </valuelist> |
303 | - <value type="int" key="PE.EnvironmentAspect.Base">-1</value> |
304 | - <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> |
305 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value> |
306 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Viewer</value> |
307 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmlProjectManager.QmlRunConfiguration</value> |
308 | - <value type="QString" key="QmlProjectManager.QmlRunConfiguration.MainScript">CurrentFile</value> |
309 | - <value type="QString" key="QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"></value> |
310 | - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> |
311 | - <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> |
312 | - <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> |
313 | - <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> |
314 | - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> |
315 | - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> |
316 | - </valuemap> |
317 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.2"> |
318 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> |
319 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> |
320 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> |
321 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> |
322 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> |
323 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> |
324 | - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> |
325 | - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> |
326 | - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> |
327 | - <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value> |
328 | - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> |
329 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> |
330 | - <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value> |
331 | - <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> |
332 | - <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value> |
333 | - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> |
334 | - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> |
335 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> |
336 | - <value type="int">0</value> |
337 | - <value type="int">1</value> |
338 | - <value type="int">2</value> |
339 | - <value type="int">3</value> |
340 | - <value type="int">4</value> |
341 | - <value type="int">5</value> |
342 | - <value type="int">6</value> |
343 | - <value type="int">7</value> |
344 | - <value type="int">8</value> |
345 | - <value type="int">9</value> |
346 | - <value type="int">10</value> |
347 | - <value type="int">11</value> |
348 | - <value type="int">12</value> |
349 | - <value type="int">13</value> |
350 | - <value type="int">14</value> |
351 | - </valuelist> |
352 | - <value type="int" key="PE.EnvironmentAspect.Base">-1</value> |
353 | - <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> |
354 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value> |
355 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">BigMovingText</value> |
356 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuRunConfiguration.AppBigMovingText</value> |
357 | - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> |
358 | - <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> |
359 | - <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> |
360 | - <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> |
361 | - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> |
362 | - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> |
363 | - </valuemap> |
364 | - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">3</value> |
365 | - </valuemap> |
366 | - </data> |
367 | - <data> |
368 | - <variable>ProjectExplorer.Project.Target.1</variable> |
369 | - <valuemap type="QVariantMap"> |
370 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">emulator3 (GCC i386-ubuntu-sdk-15.04-vivid)</value> |
371 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">emulator3 (GCC i386-ubuntu-sdk-15.04-vivid)</value> |
372 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{39a78495-129b-4146-91d4-bd515768ccab}</value> |
373 | - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> |
374 | - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> |
375 | - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> |
376 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> |
377 | - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/michal/Devel/build-BigMovingText-emulator3_GCC_i386_ubuntu_sdk_15_04_vivid-default</value> |
378 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
379 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
380 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
381 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Update translations template</value> |
382 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
383 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuQml.UpdateTranslationTemplateMakeStep</value> |
384 | - </valuemap> |
385 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> |
386 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
387 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build translations</value> |
388 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
389 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuQml.BuildTranslationMakeStep</value> |
390 | - </valuemap> |
391 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> |
392 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> |
393 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
394 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> |
395 | - </valuemap> |
396 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> |
397 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> |
398 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> |
399 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
400 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> |
401 | - </valuemap> |
402 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> |
403 | - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> |
404 | - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> |
405 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Default</value> |
406 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
407 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuQml.BuildConfiguration</value> |
408 | - </valuemap> |
409 | - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value> |
410 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> |
411 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
412 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
413 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
414 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">UbuntuSDK Click build</value> |
415 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
416 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.ClickPackageStep</value> |
417 | - <value type="int" key="Ubuntu.UbuntuPackageStep.PackageMode">1</value> |
418 | - </valuemap> |
419 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> |
420 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
421 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Upload files to Ubuntu Device</value> |
422 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
423 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UploadStep</value> |
424 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles"> |
425 | - <value type="QString">/home/michal/Devel/build-BigMovingText-emulator3_GCC_i386_ubuntu_sdk_15_04_vivid-default/bigmovingtext.mivoligo_0.1_all.click</value> |
426 | - <value type="QString">/usr/share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py</value> |
427 | - </valuelist> |
428 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts"> |
429 | - <value type="QString">127.0.0.1</value> |
430 | - <value type="QString">127.0.0.1</value> |
431 | - </valuelist> |
432 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths"> |
433 | - <value type="QString">/tmp</value> |
434 | - <value type="QString">/tmp</value> |
435 | - </valuelist> |
436 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedSysroots"> |
437 | - <value type="QString">/var/lib/schroot/chroots/click-ubuntu-sdk-15.04-i386</value> |
438 | - <value type="QString">/var/lib/schroot/chroots/click-ubuntu-sdk-15.04-i386</value> |
439 | - </valuelist> |
440 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes"> |
441 | - <value type="QDateTime">2015-03-26T09:31:33</value> |
442 | - <value type="QDateTime">2015-03-26T09:31:33</value> |
443 | - </valuelist> |
444 | - </valuemap> |
445 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> |
446 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> |
447 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
448 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> |
449 | - </valuemap> |
450 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> |
451 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy to Ubuntu Device</value> |
452 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
453 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.DeployConfiguration</value> |
454 | - </valuemap> |
455 | - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> |
456 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> |
457 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> |
458 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> |
459 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> |
460 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> |
461 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> |
462 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> |
463 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> |
464 | - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> |
465 | - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> |
466 | - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> |
467 | - <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value> |
468 | - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> |
469 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> |
470 | - <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value> |
471 | - <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> |
472 | - <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value> |
473 | - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> |
474 | - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> |
475 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> |
476 | - <value type="int">0</value> |
477 | - <value type="int">1</value> |
478 | - <value type="int">2</value> |
479 | - <value type="int">3</value> |
480 | - <value type="int">4</value> |
481 | - <value type="int">5</value> |
482 | - <value type="int">6</value> |
483 | - <value type="int">7</value> |
484 | - <value type="int">8</value> |
485 | - <value type="int">9</value> |
486 | - <value type="int">10</value> |
487 | - <value type="int">11</value> |
488 | - <value type="int">12</value> |
489 | - <value type="int">13</value> |
490 | - <value type="int">14</value> |
491 | - </valuelist> |
492 | - <value type="int" key="PE.EnvironmentAspect.Base">1</value> |
493 | - <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> |
494 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value> |
495 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">BigMovingText</value> |
496 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.RemoteRunConfiguration.AppBigMovingText</value> |
497 | - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> |
498 | - <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> |
499 | - <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> |
500 | - <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> |
501 | - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> |
502 | - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> |
503 | - <value type="bool" key="UbuntuRemoteRunConfiguration.ForceInstall">false</value> |
504 | - <value type="bool" key="UbuntuRemoteRunConfiguration.Uninstall">true</value> |
505 | - </valuemap> |
506 | - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> |
507 | - </valuemap> |
508 | - </data> |
509 | - <data> |
510 | - <variable>ProjectExplorer.Project.Target.2</variable> |
511 | - <valuemap type="QVariantMap"> |
512 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">UbuntuSDK for armhf (GCC ubuntu-sdk-14.10-utopic)</value> |
513 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">UbuntuSDK for armhf (GCC ubuntu-sdk-14.10-utopic)</value> |
514 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{f45d5433-3aba-4708-b603-3e1de61a656c}</value> |
515 | - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> |
516 | - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> |
517 | - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> |
518 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> |
519 | - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/michal/Devel/build-BigMovingText-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_14_10_utopic-default</value> |
520 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
521 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
522 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
523 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Update translations template</value> |
524 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
525 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuQml.UpdateTranslationTemplateMakeStep</value> |
526 | - </valuemap> |
527 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> |
528 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
529 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build translations</value> |
530 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
531 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuQml.BuildTranslationMakeStep</value> |
532 | - </valuemap> |
533 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> |
534 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> |
535 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
536 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> |
537 | - </valuemap> |
538 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> |
539 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> |
540 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> |
541 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
542 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> |
543 | - </valuemap> |
544 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> |
545 | - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> |
546 | - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> |
547 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Default</value> |
548 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
549 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuQml.BuildConfiguration</value> |
550 | - </valuemap> |
551 | - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value> |
552 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> |
553 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
554 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
555 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
556 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">UbuntuSDK Click build</value> |
557 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
558 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.ClickPackageStep</value> |
559 | - <value type="int" key="Ubuntu.UbuntuPackageStep.PackageMode">1</value> |
560 | - </valuemap> |
561 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> |
562 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
563 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Upload files to Ubuntu Device</value> |
564 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
565 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UploadStep</value> |
566 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles"> |
567 | - <value type="QString">/usr/share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py</value> |
568 | - <value type="QString">/home/michal/Devel/build-BigMovingText-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_14_10_utopic-default/bigmovingtext.mivoligo_0.2_all.click</value> |
569 | - <value type="QString">/home/michal/Devel/build-BigMovingText-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_14_10_utopic-default/bigmovingtext.mivoligo_0.1_all.click</value> |
570 | - </valuelist> |
571 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts"> |
572 | - <value type="QString">127.0.0.1</value> |
573 | - <value type="QString">127.0.0.1</value> |
574 | - <value type="QString">127.0.0.1</value> |
575 | - </valuelist> |
576 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths"> |
577 | - <value type="QString">/tmp</value> |
578 | - <value type="QString">/tmp</value> |
579 | - <value type="QString">/tmp</value> |
580 | - </valuelist> |
581 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedSysroots"> |
582 | - <value type="QString">/var/lib/schroot/chroots/click-ubuntu-sdk-14.10-armhf</value> |
583 | - <value type="QString">/var/lib/schroot/chroots/click-ubuntu-sdk-14.10-armhf</value> |
584 | - <value type="QString">/var/lib/schroot/chroots/click-ubuntu-sdk-14.10-armhf</value> |
585 | - </valuelist> |
586 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes"> |
587 | - <value type="QDateTime">2015-03-28T09:22:20</value> |
588 | - <value type="QDateTime">2015-03-28T09:22:20</value> |
589 | - <value type="QDateTime">2015-03-27T22:05:26</value> |
590 | - </valuelist> |
591 | - </valuemap> |
592 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> |
593 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> |
594 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
595 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> |
596 | - </valuemap> |
597 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> |
598 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy to Ubuntu Device</value> |
599 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
600 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.DeployConfiguration</value> |
601 | - </valuemap> |
602 | - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> |
603 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> |
604 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> |
605 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> |
606 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> |
607 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> |
608 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> |
609 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> |
610 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> |
611 | - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> |
612 | - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> |
613 | - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> |
614 | - <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value> |
615 | - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> |
616 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> |
617 | - <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value> |
618 | - <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> |
619 | - <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value> |
620 | - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> |
621 | - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> |
622 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> |
623 | - <value type="int">0</value> |
624 | - <value type="int">1</value> |
625 | - <value type="int">2</value> |
626 | - <value type="int">3</value> |
627 | - <value type="int">4</value> |
628 | - <value type="int">5</value> |
629 | - <value type="int">6</value> |
630 | - <value type="int">7</value> |
631 | - <value type="int">8</value> |
632 | - <value type="int">9</value> |
633 | - <value type="int">10</value> |
634 | - <value type="int">11</value> |
635 | - <value type="int">12</value> |
636 | - <value type="int">13</value> |
637 | - <value type="int">14</value> |
638 | - </valuelist> |
639 | - <value type="int" key="PE.EnvironmentAspect.Base">1</value> |
640 | - <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> |
641 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value> |
642 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">BigMovingText</value> |
643 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.RemoteRunConfiguration.AppBigMovingText</value> |
644 | - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> |
645 | - <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> |
646 | - <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> |
647 | - <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> |
648 | - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> |
649 | - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> |
650 | - <value type="bool" key="UbuntuRemoteRunConfiguration.ForceInstall">false</value> |
651 | - <value type="bool" key="UbuntuRemoteRunConfiguration.Uninstall">true</value> |
652 | - </valuemap> |
653 | - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> |
654 | - </valuemap> |
655 | - </data> |
656 | - <data> |
657 | - <variable>ProjectExplorer.Project.TargetCount</variable> |
658 | - <value type="int">3</value> |
659 | - </data> |
660 | - <data> |
661 | - <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> |
662 | - <value type="QByteArray">{22200fb2-5648-449b-8606-f17e0552c677}</value> |
663 | - </data> |
664 | - <data> |
665 | - <variable>ProjectExplorer.Project.Updater.FileVersion</variable> |
666 | - <value type="int">15</value> |
667 | - </data> |
668 | -</qtcreator> |
669 | |
670 | === removed file 'Makefile' |
671 | --- Makefile 2015-03-27 22:47:07 +0000 |
672 | +++ Makefile 1970-01-01 00:00:00 +0000 |
673 | @@ -1,49 +0,0 @@ |
674 | -# More information: https://wiki.ubuntu.com/Touch/Testing |
675 | -# |
676 | -# Notes for autopilot tests: |
677 | -# --------------------------------------------------------------- |
678 | -# In order to run autopilot tests: |
679 | -# sudo apt-add-repository ppa:autopilot/ppa |
680 | -# sudo apt-get update |
681 | -# sudo apt-get install python-autopilot autopilot-qt |
682 | -# |
683 | -# Notes for translations: |
684 | -# --------------------------------------------------------------- |
685 | -# In order to create translation files manually: |
686 | -# 1) run make once to create and update the po/template.pot |
687 | -# 2) copy the template file and set the name to the language you want to |
688 | -# translate to: cp po/template.pot po/de.po |
689 | -# 3) edit the po file |
690 | -# 4) run make build-translations to build the translation files |
691 | -# |
692 | -# Steps 1) and 4) are automatically executed by QtCreator |
693 | -################################################################# |
694 | - |
695 | -#APP_ID needs to match the "name" field of the click manifest |
696 | -APP_ID=mivoligo.bigmovingtext |
697 | - |
698 | -#provides a way for the IDE to set a specific target folder for the translations |
699 | -TRANSLATION_ROOT=. |
700 | - |
701 | -MO_FILES=$(shell for infile in `find po -name "*.po"`; do basename -s .po $$infile | awk '{print "$(TRANSLATION_ROOT)/share/locale/" $$0 "/LC_MESSAGES/$(APP_ID).mo";}' ; done) |
702 | -QMLJS_FILES=$(shell find . -name "*.qml" -o -name "*.js" | grep -v ./tests) |
703 | - |
704 | -all: po/template.pot |
705 | - |
706 | -autopilot: |
707 | - chmod +x tests/autopilot/run |
708 | - tests/autopilot/run |
709 | - |
710 | -check: |
711 | - qmltestrunner -input tests/qml |
712 | - |
713 | -#translation targets |
714 | - |
715 | -build-translations: $(MO_FILES) |
716 | - |
717 | -po/template.pot: $(QMLJS_FILES) |
718 | - mkdir -p $(CURDIR)/po && xgettext -o po/template.pot --qt --c++ --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 $(QMLJS_FILES) --from-code=UTF-8 |
719 | - |
720 | -$(TRANSLATION_ROOT)/share/locale/%/LC_MESSAGES/$(APP_ID).mo: po/%.po |
721 | - mkdir -p $(TRANSLATION_ROOT)/share/locale/$*/LC_MESSAGES && msgfmt -o $(@) $(<) |
722 | - |
723 | |
724 | === added directory 'app' |
725 | === renamed file 'BigMovingText.apparmor' => 'app/BigMovingText.apparmor' |
726 | --- BigMovingText.apparmor 2015-03-27 22:47:07 +0000 |
727 | +++ app/BigMovingText.apparmor 2015-03-29 18:56:23 +0000 |
728 | @@ -1,6 +1,5 @@ |
729 | { |
730 | "policy_groups": [ |
731 | - "networking" |
732 | ], |
733 | "policy_version": 1.2 |
734 | } |
735 | |
736 | === added file 'app/BigMovingText.apparmor.openstore' |
737 | --- app/BigMovingText.apparmor.openstore 1970-01-01 00:00:00 +0000 |
738 | +++ app/BigMovingText.apparmor.openstore 2015-03-29 18:56:23 +0000 |
739 | @@ -0,0 +1,6 @@ |
740 | +{ |
741 | + "policy_groups": [ |
742 | + ], |
743 | + "policy_version": 1.2, |
744 | + "template": "unconfined" |
745 | +} |
746 | |
747 | === renamed file 'BigMovingText.desktop' => 'app/BigMovingText.desktop' |
748 | --- BigMovingText.desktop 2015-03-28 16:00:05 +0000 |
749 | +++ app/BigMovingText.desktop 2015-03-29 18:56:23 +0000 |
750 | @@ -1,7 +1,7 @@ |
751 | [Desktop Entry] |
752 | Name=Big Moving Text |
753 | -Exec=qmlscene $@ Main.qml |
754 | -Icon=BigMovingText.png |
755 | +Exec=qmlscene $@ app/Main.qml |
756 | +Icon=app/BigMovingText.png |
757 | Terminal=false |
758 | Type=Application |
759 | X-Ubuntu-Touch=true |
760 | |
761 | === renamed file 'BigMovingText.png' => 'app/BigMovingText.png' |
762 | === renamed file 'Main.qml' => 'app/Main.qml' |
763 | --- Main.qml 2015-03-28 16:00:05 +0000 |
764 | +++ app/Main.qml 2015-03-29 18:56:23 +0000 |
765 | @@ -7,6 +7,7 @@ |
766 | import "graphics" |
767 | import "qml" |
768 | import QtSystemInfo 5.0 |
769 | +import UnityScreen 1.0 |
770 | |
771 | |
772 | Window { |
773 | @@ -15,6 +16,10 @@ |
774 | width: units.gu(40) |
775 | height: units.gu(70) |
776 | |
777 | + UnityScreen { |
778 | + id: screen |
779 | + keepDisplayOn: display_animation.running && Qt.application.active |
780 | + } |
781 | |
782 | |
783 | MainView { |
784 | |
785 | === added file 'app/app.pro' |
786 | --- app/app.pro 1970-01-01 00:00:00 +0000 |
787 | +++ app/app.pro 2015-03-29 18:56:23 +0000 |
788 | @@ -0,0 +1,31 @@ |
789 | +TEMPLATE = aux |
790 | +TARGET = app |
791 | + |
792 | +RESOURCES += app.qrc |
793 | + |
794 | +QML_FILES += $$files(*.qml,false) \ |
795 | + $$files(*.js,false) |
796 | + |
797 | +CONF_FILES += BigMovingText.apparmor \ |
798 | + BigMovingText.desktop \ |
799 | + BigMovingText.png |
800 | + |
801 | +OTHER_FILES += $${CONF_FILES} \ |
802 | + $${QML_FILES} |
803 | + |
804 | +#specify where the qml/js files are installed to |
805 | +qml_files.path = /app |
806 | +qml_files.files += $${QML_FILES} |
807 | + |
808 | +qml_files_qml.path = /app/qml |
809 | +qml_files_qml.files += $$files(qml/*qml,false) |
810 | + |
811 | +qml_files_graphics.path = /app/graphics |
812 | +qml_files_graphics.files = $$files(graphics/*png) |
813 | + |
814 | +#specify where the config files are installed to |
815 | +config_files.path = /app |
816 | +config_files.files += $${CONF_FILES} |
817 | + |
818 | +INSTALLS+=config_files qml_files qml_files_qml qml_files_graphics |
819 | + |
820 | |
821 | === renamed directory 'graphics' => 'app/graphics' |
822 | === renamed directory 'qml' => 'app/qml' |
823 | === added directory 'backend' |
824 | === added directory 'backend/UnityScreen' |
825 | === added file 'backend/UnityScreen/UnityScreen.pro' |
826 | --- backend/UnityScreen/UnityScreen.pro 1970-01-01 00:00:00 +0000 |
827 | +++ backend/UnityScreen/UnityScreen.pro 2015-03-29 18:56:23 +0000 |
828 | @@ -0,0 +1,35 @@ |
829 | +TEMPLATE = lib |
830 | +TARGET = UnityScreenPlugin |
831 | +QT += qml quick dbus |
832 | +CONFIG += qt plugin |
833 | + |
834 | +load(ubuntu-click) |
835 | + |
836 | +TARGET = $$qtLibraryTarget($$TARGET) |
837 | + |
838 | +# Input |
839 | +SOURCES += \ |
840 | + backend.cpp \ |
841 | + unityscreen.cpp |
842 | + |
843 | +HEADERS += \ |
844 | + backend.h \ |
845 | + unityscreen.h |
846 | + |
847 | +OTHER_FILES = qmldir |
848 | + |
849 | +!equals(_PRO_FILE_PWD_, $$OUT_PWD) { |
850 | + copy_qmldir.target = $$OUT_PWD/qmldir |
851 | + copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir |
852 | + copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\" |
853 | + QMAKE_EXTRA_TARGETS += copy_qmldir |
854 | + PRE_TARGETDEPS += $$copy_qmldir.target |
855 | +} |
856 | + |
857 | +qmldir.files = qmldir |
858 | +installPath = $${UBUNTU_CLICK_PLUGIN_PATH}/UnityScreen |
859 | +qmldir.path = $$installPath |
860 | +target.path = $$installPath |
861 | +INSTALLS += target qmldir |
862 | + |
863 | + |
864 | |
865 | === added file 'backend/UnityScreen/backend.cpp' |
866 | --- backend/UnityScreen/backend.cpp 1970-01-01 00:00:00 +0000 |
867 | +++ backend/UnityScreen/backend.cpp 2015-03-29 18:56:23 +0000 |
868 | @@ -0,0 +1,17 @@ |
869 | +#include <QtQml> |
870 | +#include <QtQml/QQmlContext> |
871 | +#include "backend.h" |
872 | +#include "unityscreen.h" |
873 | + |
874 | + |
875 | +void BackendPlugin::registerTypes(const char *uri) |
876 | +{ |
877 | + Q_ASSERT(uri == QLatin1String("UnityScreen")); |
878 | + qmlRegisterType<UnityScreen>(uri, 1, 0, "UnityScreen"); |
879 | +} |
880 | + |
881 | +void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri) |
882 | +{ |
883 | + QQmlExtensionPlugin::initializeEngine(engine, uri); |
884 | +} |
885 | + |
886 | |
887 | === added file 'backend/UnityScreen/backend.h' |
888 | --- backend/UnityScreen/backend.h 1970-01-01 00:00:00 +0000 |
889 | +++ backend/UnityScreen/backend.h 2015-03-29 18:56:23 +0000 |
890 | @@ -0,0 +1,18 @@ |
891 | +#ifndef BACKEND_PLUGIN_H |
892 | +#define BACKEND_PLUGIN_H |
893 | + |
894 | +#include <QtQml/QQmlEngine> |
895 | +#include <QtQml/QQmlExtensionPlugin> |
896 | + |
897 | +class BackendPlugin : public QQmlExtensionPlugin |
898 | +{ |
899 | + Q_OBJECT |
900 | + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") |
901 | + |
902 | +public: |
903 | + void registerTypes(const char *uri); |
904 | + void initializeEngine(QQmlEngine *engine, const char *uri); |
905 | +}; |
906 | +#endif // BACKEND_PLUGIN_H |
907 | + |
908 | + |
909 | |
910 | === added file 'backend/UnityScreen/qmldir' |
911 | --- backend/UnityScreen/qmldir 1970-01-01 00:00:00 +0000 |
912 | +++ backend/UnityScreen/qmldir 2015-03-29 18:56:23 +0000 |
913 | @@ -0,0 +1,3 @@ |
914 | +module UnityScreen |
915 | +plugin UnityScreenPlugin |
916 | + |
917 | |
918 | === added file 'backend/UnityScreen/unityscreen.cpp' |
919 | --- backend/UnityScreen/unityscreen.cpp 1970-01-01 00:00:00 +0000 |
920 | +++ backend/UnityScreen/unityscreen.cpp 2015-03-29 18:56:23 +0000 |
921 | @@ -0,0 +1,37 @@ |
922 | +#include "unityscreen.h" |
923 | + |
924 | +#include <QDBusInterface> |
925 | +#include <QDBusPendingCall> |
926 | + |
927 | +UnityScreen::UnityScreen(QObject *parent) : |
928 | + QObject(parent), |
929 | + m_keepDisplayOnRequest(-1) |
930 | +{ |
931 | + m_iface = new QDBusInterface("com.canonical.Unity.Screen", "/com/canonical/Unity/Screen", "com.canonical.Unity.Screen", QDBusConnection::systemBus()); |
932 | +} |
933 | + |
934 | +UnityScreen::~UnityScreen() { |
935 | + |
936 | +} |
937 | + |
938 | +bool UnityScreen::keepDisplayOn() const |
939 | +{ |
940 | + return m_keepDisplayOnRequest != -1; |
941 | +} |
942 | + |
943 | +void UnityScreen::setKeepDisplayOn(bool keepDisplayOn) |
944 | +{ |
945 | + if (m_keepDisplayOnRequest == -1 && keepDisplayOn) { |
946 | + // set request |
947 | + QDBusMessage reply = m_iface->call("keepDisplayOn"); |
948 | + if (reply.arguments().count() > 0) { |
949 | + m_keepDisplayOnRequest = reply.arguments().first().toInt(); |
950 | + emit keepDisplayOnChanged(); |
951 | + } |
952 | + } else if (m_keepDisplayOnRequest != -1 && !keepDisplayOn) { |
953 | + // clear request |
954 | + m_iface->asyncCall("removeDisplayOnRequest", m_keepDisplayOnRequest); |
955 | + m_keepDisplayOnRequest = -1; |
956 | + emit keepDisplayOnChanged(); |
957 | + } |
958 | +} |
959 | |
960 | === added file 'backend/UnityScreen/unityscreen.h' |
961 | --- backend/UnityScreen/unityscreen.h 1970-01-01 00:00:00 +0000 |
962 | +++ backend/UnityScreen/unityscreen.h 2015-03-29 18:56:23 +0000 |
963 | @@ -0,0 +1,29 @@ |
964 | +#ifndef UNITYSCREEN_H |
965 | +#define UNITYSCREEN_H |
966 | + |
967 | +#include <QObject> |
968 | + |
969 | +class QDBusInterface; |
970 | + |
971 | +class UnityScreen : public QObject |
972 | +{ |
973 | + Q_OBJECT |
974 | + Q_PROPERTY(bool keepDisplayOn READ keepDisplayOn WRITE setKeepDisplayOn NOTIFY keepDisplayOnChanged) |
975 | + |
976 | +public: |
977 | + explicit UnityScreen(QObject *parent = 0); |
978 | + ~UnityScreen(); |
979 | + |
980 | +Q_SIGNALS: |
981 | + void keepDisplayOnChanged(); |
982 | + |
983 | +protected: |
984 | + bool keepDisplayOn() const; |
985 | + void setKeepDisplayOn(bool keepDisplayOn); |
986 | + |
987 | + int m_keepDisplayOnRequest; |
988 | + QDBusInterface *m_iface; |
989 | +}; |
990 | + |
991 | +#endif // UNITYSCREEN_H |
992 | + |
993 | |
994 | === renamed file 'manifest.json' => 'manifest.json.in' |
995 | --- manifest.json 2015-03-28 16:00:05 +0000 |
996 | +++ manifest.json.in 2015-03-29 18:56:23 +0000 |
997 | @@ -1,12 +1,12 @@ |
998 | { |
999 | "name": "bigmovingtext.mivoligo", |
1000 | "description": "Move some text on your screen", |
1001 | - "architecture": "all", |
1002 | + "architecture": "@CLICK_ARCH@", |
1003 | "title": "Big Moving Text", |
1004 | "hooks": { |
1005 | "BigMovingText": { |
1006 | - "apparmor": "BigMovingText.apparmor", |
1007 | - "desktop": "BigMovingText.desktop" |
1008 | + "apparmor": "app/BigMovingText.apparmor", |
1009 | + "desktop": "app/BigMovingText.desktop" |
1010 | } |
1011 | }, |
1012 | "version": "0.3", |
1013 | |
1014 | === modified file 'po/template.pot' |
1015 | --- po/template.pot 2015-03-28 16:00:05 +0000 |
1016 | +++ po/template.pot 2015-03-29 18:56:23 +0000 |
1017 | @@ -8,7 +8,7 @@ |
1018 | msgstr "" |
1019 | "Project-Id-Version: PACKAGE VERSION\n" |
1020 | "Report-Msgid-Bugs-To: \n" |
1021 | -"POT-Creation-Date: 2015-03-28 15:53+0000\n" |
1022 | +"POT-Creation-Date: 2015-03-29 20:52+0200\n" |
1023 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
1024 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
1025 | "Language-Team: LANGUAGE <LL@li.org>\n" |
1026 | @@ -17,18 +17,18 @@ |
1027 | "Content-Type: text/plain; charset=CHARSET\n" |
1028 | "Content-Transfer-Encoding: 8bit\n" |
1029 | |
1030 | -#: Main.qml:86 |
1031 | +#: /home/mzanetti/Develop/big-moving-text/app/Main.qml:91 |
1032 | msgid "Big Moving Text" |
1033 | msgstr "" |
1034 | |
1035 | -#: Main.qml:94 |
1036 | +#: /home/mzanetti/Develop/big-moving-text/app/Main.qml:99 |
1037 | msgid "Info" |
1038 | msgstr "" |
1039 | |
1040 | -#: Main.qml:177 |
1041 | +#: /home/mzanetti/Develop/big-moving-text/app/Main.qml:182 |
1042 | msgid "Text" |
1043 | msgstr "" |
1044 | |
1045 | -#: Main.qml:370 |
1046 | +#: /home/mzanetti/Develop/big-moving-text/app/Main.qml:375 |
1047 | msgid "Display" |
1048 | msgstr "" |