Merge lp:~rpadovani/reminders-app/remove-unused-components into lp:reminders-app

Proposed by Riccardo Padovani
Status: Needs review
Proposed branch: lp:~rpadovani/reminders-app/remove-unused-components
Merge into: lp:reminders-app
Diff against target: 237 lines (+2/-168)
3 files modified
src/app/qml/components/NoteHeader.qml (+1/-3)
src/app/qml/components/NotesDelegate.qml (+1/-1)
src/app/qml/images/tags.svg (+0/-164)
To merge this branch: bzr merge lp:~rpadovani/reminders-app/remove-unused-components
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Needs Fixing
Jenkins Bot continuous-integration Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+271850@code.launchpad.net

Commit message

Remove unused files

Description of the change

Remove unused CameraComponents/ directory
Replace our custom tag icon with the one from the suru theme

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:494
http://91.189.93.70:8080/job/reminders-app-ci/790/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/212

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/790/rebuild

review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

This fails to launch here for me...

file:///opt/click.ubuntu.com/com.ubuntu.reminders/0.5.494/qml/reminders.qml:564:23: Type NotesPage unavailable
                     page: NotesPage {
                           ^
file:///opt/click.ubuntu.com/com.ubuntu.reminders/0.5.494/qml/ui/NotesPage.qml:44:30: Type EditNotePage unavailable
         bottomEdgePageComponent: EditNotePage {
                                  ^
file:///opt/click.ubuntu.com/com.ubuntu.reminders/0.5.494/qml/ui/EditNotePage.qml:39:5: Type EditNoteView unavailable
         EditNoteView {
         ^
file:///opt/click.ubuntu.com/com.ubuntu.reminders/0.5.494/qml/ui/EditNoteView.qml:158:22: Type NoteHeader unavailable
                          NoteHeader {
                          ^
file:///opt/click.ubuntu.com/com.ubuntu.reminders/0.5.494/qml/components/NoteHeader.qml:129:29: Cannot assign to non-existent property "icon"
                                 icon: "tag"
                                 ^
UbuntuClipboard - Got invalid serialized mime data. Ignoring it.

review: Needs Fixing

Unmerged revisions

494. By Riccardo Padovani

Use tag icon from the suru icon theme

493. By Riccardo Padovani

Remove CameraComponents images, we now use content hub

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/components/NoteHeader.qml'
2--- src/app/qml/components/NoteHeader.qml 2015-09-15 14:50:55 +0000
3+++ src/app/qml/components/NoteHeader.qml 2015-09-21 18:20:37 +0000
4@@ -126,7 +126,7 @@
5 }
6 RtfButton {
7 id: tagsButton
8- iconSource: "../images/tags.svg"
9+ icon: "tag"
10 height: parent.height
11 width: height
12 visible: index == notebookSelector.selectedIndex
13@@ -143,5 +143,3 @@
14 ThinDivider {}
15 }
16 }
17-
18-
19
20=== modified file 'src/app/qml/components/NotesDelegate.qml'
21--- src/app/qml/components/NotesDelegate.qml 2015-09-15 14:50:55 +0000
22+++ src/app/qml/components/NotesDelegate.qml 2015-09-21 18:20:37 +0000
23@@ -76,7 +76,7 @@
24 }
25 },
26 Action {
27- iconSource: "../images/tags.svg"
28+ icon: "tag"
29 text: i18n.tr("Tags")
30 onTriggered: {
31 root.editTags();
32
33=== removed file 'src/app/qml/images/tags.svg'
34--- src/app/qml/images/tags.svg 2014-11-13 18:58:32 +0000
35+++ src/app/qml/images/tags.svg 1970-01-01 00:00:00 +0000
36@@ -1,164 +0,0 @@
37-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
38-<!-- Created with Inkscape (http://www.inkscape.org/) -->
39-
40-<svg
41- xmlns:dc="http://purl.org/dc/elements/1.1/"
42- xmlns:cc="http://creativecommons.org/ns#"
43- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
44- xmlns:svg="http://www.w3.org/2000/svg"
45- xmlns="http://www.w3.org/2000/svg"
46- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
47- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
48- width="90"
49- height="90"
50- id="svg4874"
51- version="1.1"
52- inkscape:version="0.48.5 r10040"
53- viewBox="0 0 90 90.000001"
54- sodipodi:docname="block-align.svg">
55- <defs
56- id="defs4876" />
57- <sodipodi:namedview
58- id="base"
59- pagecolor="#ffffff"
60- bordercolor="#666666"
61- borderopacity="1.0"
62- inkscape:pageopacity="0.0"
63- inkscape:pageshadow="2"
64- inkscape:zoom="9.9475981"
65- inkscape:cx="47.350055"
66- inkscape:cy="43.829909"
67- inkscape:document-units="px"
68- inkscape:current-layer="g1708"
69- showgrid="true"
70- showborder="true"
71- fit-margin-top="0"
72- fit-margin-left="0"
73- fit-margin-right="0"
74- fit-margin-bottom="0"
75- inkscape:snap-bbox="true"
76- inkscape:bbox-paths="true"
77- inkscape:bbox-nodes="true"
78- inkscape:snap-bbox-edge-midpoints="true"
79- inkscape:snap-bbox-midpoints="true"
80- inkscape:object-paths="true"
81- inkscape:snap-intersection-paths="true"
82- inkscape:object-nodes="true"
83- inkscape:snap-smooth-nodes="true"
84- inkscape:snap-midpoints="true"
85- inkscape:snap-object-midpoints="true"
86- inkscape:snap-center="true"
87- showguides="true"
88- inkscape:guide-bbox="true"
89- inkscape:window-width="1920"
90- inkscape:window-height="1023"
91- inkscape:window-x="0"
92- inkscape:window-y="28"
93- inkscape:window-maximized="1">
94- <inkscape:grid
95- type="xygrid"
96- id="grid5451"
97- empspacing="6" />
98- <sodipodi:guide
99- orientation="1,0"
100- position="6,77"
101- id="guide4063" />
102- <sodipodi:guide
103- orientation="1,0"
104- position="3,78"
105- id="guide4065" />
106- <sodipodi:guide
107- orientation="0,1"
108- position="55,84"
109- id="guide4067" />
110- <sodipodi:guide
111- orientation="0,1"
112- position="53,87"
113- id="guide4069" />
114- <sodipodi:guide
115- orientation="0,1"
116- position="20,3"
117- id="guide4071" />
118- <sodipodi:guide
119- orientation="0,1"
120- position="20,6"
121- id="guide4073" />
122- <sodipodi:guide
123- orientation="1,0"
124- position="87,7"
125- id="guide4075" />
126- <sodipodi:guide
127- orientation="1,0"
128- position="84,7"
129- id="guide4077" />
130- <sodipodi:guide
131- orientation="0,1"
132- position="58,81"
133- id="guide4074" />
134- <sodipodi:guide
135- orientation="1,0"
136- position="9,74"
137- id="guide4076" />
138- <sodipodi:guide
139- orientation="0,1"
140- position="21,9"
141- id="guide4078" />
142- <sodipodi:guide
143- orientation="1,0"
144- position="81,4"
145- id="guide4080" />
146- </sodipodi:namedview>
147- <metadata
148- id="metadata4879">
149- <rdf:RDF>
150- <cc:Work
151- rdf:about="">
152- <dc:format>image/svg+xml</dc:format>
153- <dc:type
154- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
155- <dc:title></dc:title>
156- </cc:Work>
157- </rdf:RDF>
158- </metadata>
159- <g
160- inkscape:label="Layer 1"
161- inkscape:groupmode="layer"
162- id="layer1"
163- transform="translate(67.857146,-84.50504)">
164- <g
165- transform="matrix(0,-1,-1,0,373.50506,516.50504)"
166- id="g4845"
167- style="display:inline">
168- <g
169- inkscape:label="Layer 1"
170- id="g1708"
171- transform="matrix(0,-1,-1,0,1394.3622,441.36221)"
172- inkscape:export-filename="add01.png"
173- inkscape:export-xdpi="90"
174- inkscape:export-ydpi="90">
175- <rect
176- style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
177- id="rect1710"
178- width="90"
179- height="90"
180- x="0"
181- y="962.36218" />
182- <path
183- style="fill:#e6e6e6;fill-opacity:1;stroke:none"
184- d="M 14.6875 37 L 31.3125 58.28125 L 49.21875 81.21875 L 73.875 61.96875 L 55.96875 39.0625 L 54.34375 37 L 14.6875 37 z "
185- transform="translate(3.5e-6,962.3622)"
186- id="rect3986" />
187- <path
188- style="fill:#cccccc;fill-opacity:1;stroke:none"
189- d="M 14.40625 36.5 L 35.21875 57.375 L 55.75 78 L 77.875 55.90625 L 58.53125 36.5 L 14.40625 36.5 z "
190- transform="translate(3.5e-6,962.3622)"
191- id="rect3982" />
192- <path
193- style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
194- d="m 12.486709,978.15492 c -5.1865812,6.93589 -4.5538256,16.11522 1.418723,20.58149 l 1.73885,1.30019 23.995985,17.9441 23.300378,17.4237 18.724124,-25.0391 -23.300396,-17.42399 -23.995964,-17.94395 -1.738853,-1.3003 c -5.972549,-4.46621 -14.956266,-2.47801 -20.142847,4.45786 z m 5.912049,4.42098 c 1.723507,-2.30479 4.989094,-2.77602 7.293888,-1.05252 2.304802,1.7235 2.776041,4.9891 1.052534,7.29395 -1.723512,2.30474 -4.989105,2.77599 -7.293905,1.05249 -2.3048,-1.72353 -2.776029,-4.98913 -1.052517,-7.29392 z"
195- id="rect3858-0-7"
196- inkscape:connector-curvature="0" />
197- </g>
198- </g>
199- </g>
200-</svg>
201
202=== removed directory 'src/app/qml/ui/CameraComponents'
203=== removed directory 'src/app/qml/ui/CameraComponents/assets'
204=== removed file 'src/app/qml/ui/CameraComponents/assets/camera@18.png'
205Binary files src/app/qml/ui/CameraComponents/assets/camera@18.png 2014-02-19 00:05:24 +0000 and src/app/qml/ui/CameraComponents/assets/camera@18.png 1970-01-01 00:00:00 +0000 differ
206=== removed file 'src/app/qml/ui/CameraComponents/assets/close@18.png'
207Binary files src/app/qml/ui/CameraComponents/assets/close@18.png 2014-02-19 11:18:42 +0000 and src/app/qml/ui/CameraComponents/assets/close@18.png 1970-01-01 00:00:00 +0000 differ
208=== removed file 'src/app/qml/ui/CameraComponents/assets/flash_auto@18.png'
209Binary files src/app/qml/ui/CameraComponents/assets/flash_auto@18.png 2014-02-19 00:05:24 +0000 and src/app/qml/ui/CameraComponents/assets/flash_auto@18.png 1970-01-01 00:00:00 +0000 differ
210=== removed file 'src/app/qml/ui/CameraComponents/assets/flash_off@18.png'
211Binary files src/app/qml/ui/CameraComponents/assets/flash_off@18.png 2014-02-19 00:05:24 +0000 and src/app/qml/ui/CameraComponents/assets/flash_off@18.png 1970-01-01 00:00:00 +0000 differ
212=== removed file 'src/app/qml/ui/CameraComponents/assets/flash_on@18.png'
213Binary files src/app/qml/ui/CameraComponents/assets/flash_on@18.png 2014-02-19 00:05:24 +0000 and src/app/qml/ui/CameraComponents/assets/flash_on@18.png 1970-01-01 00:00:00 +0000 differ
214=== removed file 'src/app/qml/ui/CameraComponents/assets/focus_ring@18.png'
215Binary files src/app/qml/ui/CameraComponents/assets/focus_ring@18.png 2014-02-19 00:05:24 +0000 and src/app/qml/ui/CameraComponents/assets/focus_ring@18.png 1970-01-01 00:00:00 +0000 differ
216=== removed file 'src/app/qml/ui/CameraComponents/assets/record_picture@18.png'
217Binary files src/app/qml/ui/CameraComponents/assets/record_picture@18.png 2014-02-19 00:05:24 +0000 and src/app/qml/ui/CameraComponents/assets/record_picture@18.png 1970-01-01 00:00:00 +0000 differ
218=== removed file 'src/app/qml/ui/CameraComponents/assets/shoot@18.png'
219Binary files src/app/qml/ui/CameraComponents/assets/shoot@18.png 2014-02-19 00:05:24 +0000 and src/app/qml/ui/CameraComponents/assets/shoot@18.png 1970-01-01 00:00:00 +0000 differ
220=== removed file 'src/app/qml/ui/CameraComponents/assets/toolbar-left@18.png'
221Binary files src/app/qml/ui/CameraComponents/assets/toolbar-left@18.png 2014-02-19 00:05:24 +0000 and src/app/qml/ui/CameraComponents/assets/toolbar-left@18.png 1970-01-01 00:00:00 +0000 differ
222=== removed file 'src/app/qml/ui/CameraComponents/assets/toolbar-middle@18.png'
223Binary files src/app/qml/ui/CameraComponents/assets/toolbar-middle@18.png 2014-02-19 00:05:24 +0000 and src/app/qml/ui/CameraComponents/assets/toolbar-middle@18.png 1970-01-01 00:00:00 +0000 differ
224=== removed file 'src/app/qml/ui/CameraComponents/assets/toolbar-right@18.png'
225Binary files src/app/qml/ui/CameraComponents/assets/toolbar-right@18.png 2014-02-19 00:05:24 +0000 and src/app/qml/ui/CameraComponents/assets/toolbar-right@18.png 1970-01-01 00:00:00 +0000 differ
226=== removed file 'src/app/qml/ui/CameraComponents/assets/torch_off@18.png'
227Binary files src/app/qml/ui/CameraComponents/assets/torch_off@18.png 2014-02-19 00:05:24 +0000 and src/app/qml/ui/CameraComponents/assets/torch_off@18.png 1970-01-01 00:00:00 +0000 differ
228=== removed file 'src/app/qml/ui/CameraComponents/assets/torch_on@18.png'
229Binary files src/app/qml/ui/CameraComponents/assets/torch_on@18.png 2014-02-19 00:05:24 +0000 and src/app/qml/ui/CameraComponents/assets/torch_on@18.png 1970-01-01 00:00:00 +0000 differ
230=== removed file 'src/app/qml/ui/CameraComponents/assets/zoom_bar@18.png'
231Binary files src/app/qml/ui/CameraComponents/assets/zoom_bar@18.png 2014-02-19 00:05:24 +0000 and src/app/qml/ui/CameraComponents/assets/zoom_bar@18.png 1970-01-01 00:00:00 +0000 differ
232=== removed file 'src/app/qml/ui/CameraComponents/assets/zoom_minus@18.png'
233Binary files src/app/qml/ui/CameraComponents/assets/zoom_minus@18.png 2014-02-19 00:05:24 +0000 and src/app/qml/ui/CameraComponents/assets/zoom_minus@18.png 1970-01-01 00:00:00 +0000 differ
234=== removed file 'src/app/qml/ui/CameraComponents/assets/zoom_plus@18.png'
235Binary files src/app/qml/ui/CameraComponents/assets/zoom_plus@18.png 2014-02-19 00:05:24 +0000 and src/app/qml/ui/CameraComponents/assets/zoom_plus@18.png 1970-01-01 00:00:00 +0000 differ
236=== removed file 'src/app/qml/ui/CameraComponents/assets/zoom_point@18.png'
237Binary files src/app/qml/ui/CameraComponents/assets/zoom_point@18.png 2014-02-19 00:05:24 +0000 and src/app/qml/ui/CameraComponents/assets/zoom_point@18.png 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches