Tomdroid

Merge lp:~benoit.soyeux/tomdroid/sortingNote into lp:~tomdroid-maintainers/tomdroid/main

  1. sortingNote
  2. Merge into main
Proposed by Benoit Soyeux
Status: Rejected
Rejected by: Benoit Garret
Proposed branch: lp:~benoit.soyeux/tomdroid/sortingNote
Merge into: lp:~tomdroid-maintainers/tomdroid/main
Diff against target: 2357 lines (+2023/-31) (has conflicts)
21 files modified
.classpath (+2/-2)
AndroidManifest.xml (+5/-5)
data/icon-src/NotebookFilter.svg (+562/-0)
data/icon-src/icon-sort.svg (+248/-0)
data/icon-src/preferences.svg (+565/-0)
res/layout/notebooks.xml (+36/-0)
res/layout/notebooks_list_item.xml (+38/-0)
res/menu/main.xml (+15/-6)
res/values-fr/arrays.xml (+2/-2)
res/values-fr/strings.xml (+13/-0)
res/values/strings.xml (+12/-0)
res/xml/preferences.xml (+2/-1)
src/org/tomdroid/Note.java (+2/-2)
src/org/tomdroid/NoteManager.java (+134/-4)
src/org/tomdroid/NoteProvider.java (+2/-3)
src/org/tomdroid/Notebook.java (+7/-0)
src/org/tomdroid/NotebookProvider.java (+227/-0)
src/org/tomdroid/ui/Notebooks.java (+94/-0)
src/org/tomdroid/ui/PreferencesActivity.java (+10/-0)
src/org/tomdroid/ui/Tomdroid.java (+45/-4)
tests/org/tomdroid/NoteManagerTest.java (+2/-2)
Text conflict in res/values-fr/strings.xml
Text conflict in res/values/strings.xml
To merge this branch: bzr merge lp:~benoit.soyeux/tomdroid/sortingNote
Reviewer Review Type Date Requested Status
Benoit Garret Needs Fixing
Review via email: mp+42061@code.launchpad.net

Description of the change

I add two functionality :
- Modify note order. by modified date or by note title
- Filter notes on the notebook. Only notes from notebook selected will be displayed.

To post a comment you must log in.
Revision history for this message
Benoit Garret (benoit.garret) wrote :

The conflicts present in your translations branch are here as well. Are you really sure you did not do the translations twice (both in this branch and in the other)?

review: Needs Fixing
Revision history for this message
Benoit Garret (benoit.garret) wrote :

Looks like this branch has been superseded by lp:~benoit.soyeux/tomdroid/sortingNote .

Unmerged revisions

223. By Benoit Soyeux

the Notebook filter functionality is now ended. it could be merge.

222. By Benoit Soyeux

Add the new functionnality : filter list on notebook

221. By Benoit Soyeux

Add a list of notebook

220. By Benoit Soyeux

Add a notebookProvider and declare it to android manifest

219. By Benoit Soyeux

test to add notebook table

218. By Benoit Soyeux

another test to commit

217. By Benoit Soyeux

begin of notebook filter functionality

216. By Benoit Soyeux

Add the begin of notebook filter functionality

215. By Benoit Soyeux

Add icon forview sorting

214. By Benoit Soyeux

Add the function to sort note by date or by name

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.classpath'
2--- .classpath 2010-10-14 03:51:26 +0000
3+++ .classpath 2010-11-28 20:59:14 +0000
4@@ -1,10 +1,10 @@
5 <?xml version="1.0" encoding="UTF-8"?>
6 <classpath>
7- <classpathentry kind="src" path="src"/>
8 <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
9- <classpathentry kind="src" path="gen"/>
10 <classpathentry kind="lib" path="libs/signpost-commonshttp4-1.2.1.1.jar"/>
11 <classpathentry kind="lib" path="libs/signpost-core-1.2.1.1.jar"/>
12 <classpathentry kind="src" path="tests"/>
13+ <classpathentry kind="src" path="src"/>
14+ <classpathentry kind="src" path="gen"/>
15 <classpathentry kind="output" path="bin"/>
16 </classpath>
17
18=== modified file 'AndroidManifest.xml'
19--- AndroidManifest.xml 2010-10-23 04:04:07 +0000
20+++ AndroidManifest.xml 2010-11-28 20:59:14 +0000
21@@ -40,16 +40,16 @@
22 </intent-filter>
23 </activity>
24
25- <provider android:name="NoteProvider"
26- android:authorities="org.tomdroid.notes"
27- />
28+ <provider android:name="NoteProvider" android:authorities="org.tomdroid.notes"/>
29+ <provider android:name="NotebookProvider" android:authorities="org.tomdroid.notebooks"/>
30
31 <activity android:name=".ui.PreferencesActivity" android:label="@string/app_name">
32
33 </activity>
34
35- <uses-library android:name="android.test.runner" />
36- </application>
37+
38+ <activity android:name=".ui.Notebooks" android:label="@string/app_name"></activity>
39+</application>
40
41 <uses-permission android:name="android.permission.INTERNET" />
42 <instrumentation android:name="android.test.InstrumentationTestRunner" android:targetPackage="org.tomdroid"></instrumentation>
43
44=== added file 'data/icon-src/NotebookFilter.svg'
45--- data/icon-src/NotebookFilter.svg 1970-01-01 00:00:00 +0000
46+++ data/icon-src/NotebookFilter.svg 2010-11-28 20:59:14 +0000
47@@ -0,0 +1,562 @@
48+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
49+<!-- Created with Inkscape (http://www.inkscape.org/) -->
50+
51+<svg
52+ xmlns:dc="http://purl.org/dc/elements/1.1/"
53+ xmlns:cc="http://creativecommons.org/ns#"
54+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
55+ xmlns:svg="http://www.w3.org/2000/svg"
56+ xmlns="http://www.w3.org/2000/svg"
57+ xmlns:xlink="http://www.w3.org/1999/xlink"
58+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
59+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
60+ width="48.000000px"
61+ height="48.000000px"
62+ id="svg97"
63+ sodipodi:version="0.32"
64+ inkscape:version="0.48.0 r9654"
65+ sodipodi:docname="folder-saved-search.svg"
66+ inkscape:export-filename="/home/jimmac/Desktop/tango.png"
67+ inkscape:export-xdpi="90.000000"
68+ inkscape:export-ydpi="90.000000"
69+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
70+ version="1.1">
71+ <defs
72+ id="defs3">
73+ <inkscape:perspective
74+ sodipodi:type="inkscape:persp3d"
75+ inkscape:vp_x="0 : 24 : 1"
76+ inkscape:vp_y="0 : 1000 : 0"
77+ inkscape:vp_z="48 : 24 : 1"
78+ inkscape:persp3d-origin="24 : 16 : 1"
79+ id="perspective84" />
80+ <radialGradient
81+ inkscape:collect="always"
82+ xlink:href="#linearGradient5060"
83+ id="radialGradient6719"
84+ gradientUnits="userSpaceOnUse"
85+ gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
86+ cx="605.71429"
87+ cy="486.64789"
88+ fx="605.71429"
89+ fy="486.64789"
90+ r="117.14286" />
91+ <linearGradient
92+ inkscape:collect="always"
93+ id="linearGradient5060">
94+ <stop
95+ style="stop-color:black;stop-opacity:1;"
96+ offset="0"
97+ id="stop5062" />
98+ <stop
99+ style="stop-color:black;stop-opacity:0;"
100+ offset="1"
101+ id="stop5064" />
102+ </linearGradient>
103+ <radialGradient
104+ inkscape:collect="always"
105+ xlink:href="#linearGradient5060"
106+ id="radialGradient6717"
107+ gradientUnits="userSpaceOnUse"
108+ gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
109+ cx="605.71429"
110+ cy="486.64789"
111+ fx="605.71429"
112+ fy="486.64789"
113+ r="117.14286" />
114+ <linearGradient
115+ id="linearGradient5048">
116+ <stop
117+ style="stop-color:black;stop-opacity:0;"
118+ offset="0"
119+ id="stop5050" />
120+ <stop
121+ id="stop5056"
122+ offset="0.5"
123+ style="stop-color:black;stop-opacity:1;" />
124+ <stop
125+ style="stop-color:black;stop-opacity:0;"
126+ offset="1"
127+ id="stop5052" />
128+ </linearGradient>
129+ <linearGradient
130+ inkscape:collect="always"
131+ xlink:href="#linearGradient5048"
132+ id="linearGradient6715"
133+ gradientUnits="userSpaceOnUse"
134+ gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
135+ x1="302.85715"
136+ y1="366.64789"
137+ x2="302.85715"
138+ y2="609.50507" />
139+ <linearGradient
140+ id="linearGradient3344">
141+ <stop
142+ style="stop-color:#fecf8c;stop-opacity:1;"
143+ offset="0"
144+ id="stop3346" />
145+ <stop
146+ id="stop3352"
147+ offset="0.18421052"
148+ style="stop-color:#fcba58;stop-opacity:1;" />
149+ <stop
150+ style="stop-color:#fdc572;stop-opacity:1;"
151+ offset="1"
152+ id="stop3348" />
153+ </linearGradient>
154+ <linearGradient
155+ inkscape:collect="always"
156+ id="linearGradient10997">
157+ <stop
158+ style="stop-color:#ffffff;stop-opacity:1;"
159+ offset="0"
160+ id="stop10999" />
161+ <stop
162+ style="stop-color:#ffffff;stop-opacity:0;"
163+ offset="1"
164+ id="stop11001" />
165+ </linearGradient>
166+ <linearGradient
167+ id="linearGradient127"
168+ inkscape:collect="always">
169+ <stop
170+ id="stop128"
171+ offset="0"
172+ style="stop-color:#ffffff;stop-opacity:1;" />
173+ <stop
174+ id="stop129"
175+ offset="1"
176+ style="stop-color:#ffffff;stop-opacity:0;" />
177+ </linearGradient>
178+ <linearGradient
179+ inkscape:collect="always"
180+ id="linearGradient9806">
181+ <stop
182+ style="stop-color:#000000;stop-opacity:1;"
183+ offset="0"
184+ id="stop9808" />
185+ <stop
186+ style="stop-color:#000000;stop-opacity:0;"
187+ offset="1"
188+ id="stop9810" />
189+ </linearGradient>
190+ <linearGradient
191+ id="linearGradient9766">
192+ <stop
193+ style="stop-color:#6194cb;stop-opacity:1;"
194+ offset="0"
195+ id="stop9768" />
196+ <stop
197+ style="stop-color:#729fcf;stop-opacity:1;"
198+ offset="1"
199+ id="stop9770" />
200+ </linearGradient>
201+ <linearGradient
202+ id="linearGradient3096">
203+ <stop
204+ id="stop3098"
205+ offset="0"
206+ style="stop-color:#424242;stop-opacity:1;" />
207+ <stop
208+ id="stop3100"
209+ offset="1.0000000"
210+ style="stop-color:#777777;stop-opacity:1.0000000;" />
211+ </linearGradient>
212+ <linearGradient
213+ id="linearGradient319"
214+ inkscape:collect="always">
215+ <stop
216+ id="stop320"
217+ offset="0"
218+ style="stop-color:#ffffff;stop-opacity:1;" />
219+ <stop
220+ id="stop321"
221+ offset="1"
222+ style="stop-color:#ffffff;stop-opacity:0;" />
223+ </linearGradient>
224+ <linearGradient
225+ id="linearGradient1789">
226+ <stop
227+ style="stop-color:#202020;stop-opacity:1.0000000;"
228+ offset="0.0000000"
229+ id="stop1790" />
230+ <stop
231+ style="stop-color:#b9b9b9;stop-opacity:1.0000000;"
232+ offset="1.0000000"
233+ id="stop1791" />
234+ </linearGradient>
235+ <radialGradient
236+ inkscape:collect="always"
237+ xlink:href="#linearGradient1789"
238+ id="radialGradient238"
239+ gradientUnits="userSpaceOnUse"
240+ gradientTransform="matrix(1.056008,1.513357e-2,0.142618,1.251599,-2.276279,-10.28106)"
241+ cx="20.706017"
242+ cy="37.517986"
243+ fx="20.706017"
244+ fy="37.517986"
245+ r="30.905205" />
246+ <linearGradient
247+ id="linearGradient3983">
248+ <stop
249+ style="stop-color:#ffffff;stop-opacity:0.87628865;"
250+ offset="0.0000000"
251+ id="stop3984" />
252+ <stop
253+ style="stop-color:#fffffe;stop-opacity:0.0000000;"
254+ offset="1.0000000"
255+ id="stop3985" />
256+ </linearGradient>
257+ <linearGradient
258+ inkscape:collect="always"
259+ xlink:href="#linearGradient3983"
260+ id="linearGradient491"
261+ gradientUnits="userSpaceOnUse"
262+ gradientTransform="matrix(1.516844,0.000000,0.000000,0.708978,-0.879573,-1.318166)"
263+ x1="6.2297964"
264+ y1="13.773066"
265+ x2="9.8980894"
266+ y2="66.834053" />
267+ <linearGradient
268+ gradientUnits="userSpaceOnUse"
269+ y2="46.689312"
270+ x2="12.853771"
271+ y1="32.567184"
272+ x1="13.035696"
273+ gradientTransform="matrix(1.317489,0,0,0.816256,-0.879573,-1.318166)"
274+ id="linearGradient322"
275+ xlink:href="#linearGradient319"
276+ inkscape:collect="always" />
277+ <linearGradient
278+ gradientUnits="userSpaceOnUse"
279+ y2="6.1802502"
280+ x2="15.514889"
281+ y1="31.367750"
282+ x1="18.112709"
283+ id="linearGradient3104"
284+ xlink:href="#linearGradient3096"
285+ inkscape:collect="always" />
286+ <radialGradient
287+ inkscape:collect="always"
288+ xlink:href="#linearGradient9806"
289+ id="radialGradient9812"
290+ cx="24.35099"
291+ cy="41.591846"
292+ fx="24.35099"
293+ fy="41.591846"
294+ r="19.136078"
295+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.242494,-8.239935e-18,31.50606)"
296+ gradientUnits="userSpaceOnUse" />
297+ <linearGradient
298+ inkscape:collect="always"
299+ xlink:href="#linearGradient10997"
300+ id="linearGradient11003"
301+ x1="19.489662"
302+ y1="6.1438289"
303+ x2="19.387241"
304+ y2="8.1000004"
305+ gradientUnits="userSpaceOnUse" />
306+ <linearGradient
307+ inkscape:collect="always"
308+ xlink:href="#linearGradient127"
309+ id="linearGradient2296"
310+ gradientUnits="userSpaceOnUse"
311+ gradientTransform="matrix(1.207872,0.000000,0.000000,0.827902,-0.952004,-0.117547)"
312+ x1="21.354231"
313+ y1="26.383648"
314+ x2="20.796143"
315+ y2="50.770691" />
316+ <linearGradient
317+ inkscape:collect="always"
318+ xlink:href="#linearGradient127"
319+ id="linearGradient3289"
320+ gradientUnits="userSpaceOnUse"
321+ gradientTransform="matrix(1.207872,0,-4.031129e-2,0.827902,-29.59565,-0.117547)"
322+ x1="20.133097"
323+ y1="33.646938"
324+ x2="20.796143"
325+ y2="50.770691" />
326+ <linearGradient
327+ inkscape:collect="always"
328+ xlink:href="#linearGradient3344"
329+ id="linearGradient3350"
330+ x1="28.238476"
331+ y1="40.013306"
332+ x2="28.752831"
333+ y2="17.488001"
334+ gradientUnits="userSpaceOnUse" />
335+ <filter
336+ id="filter3061"
337+ inkscape:label="Desaturate"
338+ x="0"
339+ y="0"
340+ width="1"
341+ height="1"
342+ inkscape:menu="Color"
343+ inkscape:menu-tooltip="Render in shades of gray by reducing saturation to zero"
344+ color-interpolation-filters="sRGB">
345+ <feColorMatrix
346+ id="feColorMatrix3063"
347+ type="saturate"
348+ values="0" />
349+ </filter>
350+ </defs>
351+ <sodipodi:namedview
352+ fill="#fcaf3e"
353+ id="base"
354+ pagecolor="#ffffff"
355+ bordercolor="#666666"
356+ borderopacity="0.68235294"
357+ inkscape:pageopacity="0.0"
358+ inkscape:pageshadow="2"
359+ inkscape:zoom="4"
360+ inkscape:cx="38.390148"
361+ inkscape:cy="5.2709923"
362+ inkscape:current-layer="layer1"
363+ showgrid="false"
364+ inkscape:grid-bbox="true"
365+ inkscape:document-units="px"
366+ inkscape:window-width="1160"
367+ inkscape:window-height="818"
368+ inkscape:window-x="0"
369+ inkscape:window-y="30"
370+ inkscape:showpageshadow="false"
371+ stroke="#ce5c00"
372+ inkscape:window-maximized="0">
373+ <inkscape:grid
374+ id="GridFromPre046Settings"
375+ type="xygrid"
376+ originx="0px"
377+ originy="0px"
378+ spacingx="1px"
379+ spacingy="1px"
380+ color="#0000ff"
381+ empcolor="#0000ff"
382+ opacity="0.2"
383+ empopacity="0.4"
384+ empspacing="4" />
385+ </sodipodi:namedview>
386+ <metadata
387+ id="metadata4">
388+ <rdf:RDF>
389+ <cc:Work
390+ rdf:about="">
391+ <dc:format>image/svg+xml</dc:format>
392+ <dc:type
393+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
394+ <dc:title></dc:title>
395+ <dc:date />
396+ <dc:creator>
397+ <cc:Agent>
398+ <dc:title>Jakub Steiner</dc:title>
399+ </cc:Agent>
400+ </dc:creator>
401+ <cc:license
402+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
403+ <dc:source>http://jimmac.musichall.cz</dc:source>
404+ <dc:subject>
405+ <rdf:Bag>
406+ <rdf:li>folder</rdf:li>
407+ <rdf:li>directory</rdf:li>
408+ <rdf:li>home</rdf:li>
409+ <rdf:li>user</rdf:li>
410+ </rdf:Bag>
411+ </dc:subject>
412+ <dc:contributor>
413+ <cc:Agent>
414+ <dc:title>Garrett LeSage</dc:title>
415+ </cc:Agent>
416+ </dc:contributor>
417+ </cc:Work>
418+ <cc:License
419+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
420+ <cc:permits
421+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
422+ <cc:permits
423+ rdf:resource="http://creativecommons.org/ns#Distribution" />
424+ <cc:permits
425+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
426+ </cc:License>
427+ </rdf:RDF>
428+ </metadata>
429+ <g
430+ id="layer1"
431+ inkscape:label="Folder"
432+ inkscape:groupmode="layer">
433+ <g
434+ style="display:inline"
435+ transform="matrix(2.262383e-2,0,0,2.086758e-2,43.38343,36.36962)"
436+ id="g6707">
437+ <rect
438+ style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
439+ id="rect6709"
440+ width="1339.6335"
441+ height="478.35718"
442+ x="-1559.2523"
443+ y="-150.69685" />
444+ <path
445+ style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
446+ d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
447+ id="path6711"
448+ sodipodi:nodetypes="cccc" />
449+ <path
450+ sodipodi:nodetypes="cccc"
451+ id="path6713"
452+ d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
453+ style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
454+ </g>
455+ <path
456+ d="M 4.5217805,38.687417 C 4.5435766,39.103721 4.9816854,39.520026 5.39799,39.520026 L 36.725011,39.520026 C 37.141313,39.520026 37.535823,39.103721 37.514027,38.687417 L 36.577584,11.460682 C 36.555788,11.044379 36.117687,10.628066 35.701383,10.628066 L 22.43051,10.628066 C 21.945453,10.628066 21.196037,10.312477 21.028866,9.5214338 L 20.417475,6.6283628 C 20.262006,5.8926895 19.535261,5.5904766 19.118957,5.5904766 L 4.3400975,5.5904766 C 3.9237847,5.5904766 3.5292767,6.0067807 3.5510726,6.4230849 L 4.5217805,38.687417 z "
457+ id="path216"
458+ style="fill:url(#radialGradient238);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3104);stroke-width:0.99844444;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
459+ sodipodi:nodetypes="ccccccssssccc"
460+ transform="matrix(1.00104,0,0,1.002076,-5.390135e-2,-0.102084)"
461+ inkscape:r_cx="true"
462+ inkscape:r_cy="true" />
463+ <g
464+ id="g3953">
465+ <path
466+ style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
467+ d="M 5.0421736,18.5625 L 35.489104,18.5625"
468+ id="path9784"
469+ sodipodi:nodetypes="cc" />
470+ <path
471+ sodipodi:nodetypes="cc"
472+ id="path9778"
473+ d="M 4.9806965,12.5625 L 35.488057,12.5625"
474+ style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
475+ <path
476+ style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
477+ d="M 5.2265927,22.5625 L 35.492173,22.5625"
478+ id="path9788"
479+ sodipodi:nodetypes="cc" />
480+ <path
481+ sodipodi:nodetypes="cc"
482+ id="path9798"
483+ d="M 5.3861577,32.5625 L 35.494881,32.5625"
484+ style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
485+ <path
486+ style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
487+ d="M 5.5091398,34.5625 L 35.496893,34.5625"
488+ id="path9800"
489+ sodipodi:nodetypes="cc" />
490+ <path
491+ sodipodi:nodetypes="cc"
492+ id="path9782"
493+ d="M 5.0421736,16.5625 L 35.489104,16.5625"
494+ style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
495+ <path
496+ sodipodi:nodetypes="cc"
497+ id="path9786"
498+ d="M 5.1958537,20.5625 L 35.491649,20.5625"
499+ style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
500+ <path
501+ style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
502+ d="M 5.0114345,14.5625 L 35.48858,14.5625"
503+ id="path9780"
504+ sodipodi:nodetypes="cc" />
505+ <g
506+ inkscape:r_cy="true"
507+ inkscape:r_cx="true"
508+ inkscape:export-ydpi="74.800003"
509+ inkscape:export-xdpi="74.800003"
510+ inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/gnome-fs-directory.png"
511+ transform="matrix(1.040764,0,5.449252e-2,1.040764,-8.539401,2.452526)"
512+ id="g220"
513+ style="fill:#ffffff;fill-opacity:0.75706213;fill-rule:nonzero;stroke:none;stroke-width:0.99946535;stroke-miterlimit:4">
514+ <path
515+ inkscape:r_cy="true"
516+ inkscape:r_cx="true"
517+ sodipodi:nodetypes="cscscs"
518+ id="path221"
519+ d="M 42.417183,8.5151772 C 42.422267,8.4180642 42.289022,8.268189 42.182066,8.2681716 L 29.150665,8.2660527 C 29.150665,8.2660527 30.062379,8.8540072 31.352477,8.8622963 L 42.405974,8.9333167 C 42.41706,8.7215889 42.408695,8.6772845 42.417183,8.5151772 z "
520+ style="fill:#ffffff;fill-opacity:0.50847461" />
521+ </g>
522+ <path
523+ sodipodi:nodetypes="cc"
524+ id="path9790"
525+ d="M 5.2265927,24.5625 L 35.492173,24.5625"
526+ style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
527+ <path
528+ style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
529+ d="M 5.3246666,30.5625 L 35.493876,30.5625"
530+ id="path9796"
531+ sodipodi:nodetypes="cc" />
532+ <path
533+ sodipodi:nodetypes="cc"
534+ id="path9794"
535+ d="M 5.3246666,28.5625 L 35.493876,28.5625"
536+ style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
537+ <path
538+ sodipodi:nodetypes="cc"
539+ id="path9802"
540+ d="M 5.5091398,36.5625 L 35.496893,36.5625"
541+ style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
542+ <path
543+ sodipodi:nodetypes="cccccccccscccccc"
544+ id="path219"
545+ d="M 6.068343,38.864023 C 6.0846856,39.176251 5.8874317,39.384402 5.5697582,39.280326 L 5.5697582,39.280326 C 5.2520766,39.176251 5.033027,38.968099 5.0166756,38.65587 L 4.068956,6.5913839 C 4.0526131,6.2791558 4.2341418,6.0906134 4.5463699,6.0906134 L 18.96842,6.0429196 C 19.280648,6.0429196 19.900363,6.3433923 20.101356,7.3651014 L 20.674845,10.180636 C 20.247791,9.715379 20.255652,9.7010175 20.037287,9.0239299 L 19.631192,7.7647478 C 19.412142,7.0371009 18.932991,6.9328477 18.620763,6.9328477 L 5.7329889,6.9328477 C 5.4207613,6.9328477 5.2235075,7.1409999 5.2398583,7.4532364 L 6.1778636,38.968099 L 6.068343,38.864023 z "
546+ style="opacity:0.45142858;color:#000000;fill:url(#linearGradient491);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.21380496;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
547+ <path
548+ style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
549+ d="M 5.2880638,26.5625 L 35.493184,26.5625"
550+ id="path9792"
551+ sodipodi:nodetypes="cc" />
552+ <path
553+ sodipodi:nodetypes="cc"
554+ id="path9774"
555+ d="M 4.8737534,8.5624999 L 19.657487,8.5624999"
556+ style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
557+ <path
558+ style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
559+ d="M 4.9220969,10.5625 L 20.202912,10.5625"
560+ id="path9776"
561+ sodipodi:nodetypes="cc" />
562+ </g>
563+ <path
564+ style="color:#000000;fill:url(#linearGradient3350);fill-opacity:1;fill-rule:nonzero;stroke:#ce5c00;stroke-width:1.00452970999999991;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;filter:url(#filter3061)"
565+ d="M 39.783532,39.51062 C 40.927426,39.466556 41.746608,38.414321 41.830567,37.189615 C 42.622354,25.640928 43.489927,15.957666 43.489927,15.957666 C 43.562082,15.710182 43.322016,15.462699 43.009787,15.462699 L 8.6386304,15.462699 C 8.6386304,15.462699 6.7883113,37.329591 6.7883113,37.329591 C 6.6737562,38.311657 6.3223038,39.134309 5.2384755,39.513304 L 39.783532,39.51062 z "
566+ id="path233"
567+ sodipodi:nodetypes="cscccscc"
568+ inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/gnome-fs-directory.png"
569+ inkscape:export-xdpi="74.800003"
570+ inkscape:export-ydpi="74.800003"
571+ transform="matrix(0.993091,0,0,0.997896,0.297716,6.983586e-2)"
572+ inkscape:r_cx="true"
573+ inkscape:r_cy="true" />
574+ <path
575+ sodipodi:nodetypes="ccsscsc"
576+ id="path304"
577+ d="M 9.6202444,16.463921 L 42.411343,16.528735 L 40.837297,36.530714 C 40.752975,37.602225 40.386619,37.958929 38.964641,37.958929 C 37.093139,37.958929 10.286673,37.926522 7.569899,37.926522 C 7.8034973,37.605711 7.9036547,36.937899 7.9049953,36.92191 L 9.6202444,16.463921 z "
578+ style="opacity:0.46590911;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient322);stroke-width:1.00452948px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
579+ transform="matrix(0.993091,0,0,0.997896,0.297716,6.983586e-2)"
580+ inkscape:r_cx="true"
581+ inkscape:r_cy="true" />
582+ <path
583+ sodipodi:nodetypes="ccccc"
584+ id="path323"
585+ d="M 9.6202481,16.223182 L 8.4536014,31.866453 C 8.4536014,31.866453 16.749756,27.718375 27.119949,27.718375 C 37.490142,27.718375 42.675239,16.223182 42.675239,16.223182 L 9.6202481,16.223182 z "
586+ style="fill:#ffffff;fill-opacity:0.0892857;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
587+ transform="matrix(0.993091,0,0,0.997896,0.297716,6.983586e-2)"
588+ inkscape:r_cx="true"
589+ inkscape:r_cy="true" />
590+ <g
591+ inkscape:export-ydpi="74.800003"
592+ inkscape:export-xdpi="74.800003"
593+ inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/gnome-fs-directory.png"
594+ style="opacity:0.41477272;fill:url(#linearGradient11003);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-miterlimit:4"
595+ transform="matrix(1.040764,0.000000,5.449252e-2,1.365642,-8.358528,0.921788)"
596+ id="g217" />
597+ <path
598+ style="opacity:1;color:#000000;fill:url(#linearGradient3289);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3pt;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
599+ d="M 23.216296,20.483131 C 19.939735,20.734409 17.206653,23.494648 17.044768,26.819388 C 16.874921,30.307641 19.609265,33.181937 23.097519,33.181937 C 24.80758,33.181937 26.401076,32.506995 27.601545,31.394113 C 27.663282,31.574078 27.771542,31.746853 27.89272,31.893652 C 28.003194,32.022077 28.144609,32.146141 28.296742,32.235442 L 32.380491,34.759428 C 33.155782,35.238602 34.204249,34.979637 34.722309,34.181015 C 35.240368,33.382393 35.03184,32.346534 34.256549,31.867361 L 30.172801,29.343374 C 29.896967,29.166371 29.571731,29.069205 29.239107,29.080459 C 29.541227,28.380236 29.705093,27.609695 29.743574,26.819388 C 29.91342,23.331136 27.204088,20.483131 23.715835,20.483131 C 23.552322,20.483131 23.377438,20.470773 23.216296,20.483131 z M 23.43519,23.007117 C 23.484536,23.005278 23.543191,23.007117 23.59294,23.007117 C 25.715557,23.007118 27.32294,24.69677 27.219588,26.819388 C 27.116235,28.942007 25.344311,30.631659 23.221694,30.631659 C 21.099075,30.631659 19.491694,28.942007 19.595046,26.819388 C 19.695975,24.746519 21.379108,23.083765 23.43519,23.007117 z "
600+ id="path2347"
601+ inkscape:r_cx="true"
602+ inkscape:r_cy="true"
603+ transform="matrix(1.001682,0,0,0.964031,-6.59201e-2,1.258936)" />
604+ </g>
605+ <g
606+ inkscape:groupmode="layer"
607+ id="layer2"
608+ inkscape:label="pattern" />
609+</svg>
610
611=== added file 'data/icon-src/icon-sort.svg'
612--- data/icon-src/icon-sort.svg 1970-01-01 00:00:00 +0000
613+++ data/icon-src/icon-sort.svg 2010-11-28 20:59:14 +0000
614@@ -0,0 +1,248 @@
615+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
616+<!-- Created with Inkscape (http://www.inkscape.org/) -->
617+
618+<svg
619+ xmlns:dc="http://purl.org/dc/elements/1.1/"
620+ xmlns:cc="http://creativecommons.org/ns#"
621+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
622+ xmlns:svg="http://www.w3.org/2000/svg"
623+ xmlns="http://www.w3.org/2000/svg"
624+ xmlns:xlink="http://www.w3.org/1999/xlink"
625+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
626+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
627+ sodipodi:docname="go-jump.svg"
628+ inkscape:version="0.48.0 r9654"
629+ sodipodi:version="0.32"
630+ id="svg11300"
631+ height="48px"
632+ width="48px"
633+ inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
634+ inkscape:export-xdpi="90.000000"
635+ inkscape:export-ydpi="90.000000"
636+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
637+ version="1.1">
638+ <sodipodi:namedview
639+ inkscape:window-y="24"
640+ inkscape:window-x="0"
641+ inkscape:window-height="1123"
642+ inkscape:window-width="1920"
643+ inkscape:showpageshadow="false"
644+ inkscape:document-units="px"
645+ inkscape:grid-bbox="true"
646+ showgrid="false"
647+ inkscape:current-layer="layer1"
648+ inkscape:cy="46.696516"
649+ inkscape:cx="30.109761"
650+ inkscape:zoom="4"
651+ inkscape:pageshadow="2"
652+ inkscape:pageopacity="0.0"
653+ borderopacity="0.25490196"
654+ bordercolor="#666666"
655+ pagecolor="#ffffff"
656+ id="base"
657+ fill="#8ae234"
658+ stroke="#8ae234"
659+ inkscape:window-maximized="1" />
660+ <defs
661+ id="defs3">
662+ <inkscape:perspective
663+ id="perspective26"
664+ inkscape:persp3d-origin="24 : 16 : 1"
665+ inkscape:vp_z="48 : 24 : 1"
666+ inkscape:vp_y="0 : 1000 : 0"
667+ inkscape:vp_x="0 : 24 : 1"
668+ sodipodi:type="inkscape:persp3d" />
669+ <linearGradient
670+ id="linearGradient2702"
671+ inkscape:collect="always">
672+ <stop
673+ id="stop2704"
674+ offset="0"
675+ style="stop-color:#3a7304;stop-opacity:1;" />
676+ <stop
677+ id="stop2706"
678+ offset="1"
679+ style="stop-color:#3a7304;stop-opacity:0;" />
680+ </linearGradient>
681+ <linearGradient
682+ id="linearGradient2187"
683+ inkscape:collect="always">
684+ <stop
685+ id="stop2189"
686+ offset="0"
687+ style="stop-color:#ffffff;stop-opacity:1;" />
688+ <stop
689+ id="stop2191"
690+ offset="1"
691+ style="stop-color:#ffffff;stop-opacity:0;" />
692+ </linearGradient>
693+ <linearGradient
694+ id="linearGradient2161">
695+ <stop
696+ id="stop2163"
697+ offset="0"
698+ style="stop-color:#519e07;stop-opacity:1" />
699+ <stop
700+ id="stop2165"
701+ offset="1.0000000"
702+ style="stop-color:#6cc813;stop-opacity:1" />
703+ </linearGradient>
704+ <linearGradient
705+ inkscape:collect="always"
706+ id="linearGradient8662">
707+ <stop
708+ style="stop-color:#000000;stop-opacity:1;"
709+ offset="0"
710+ id="stop8664" />
711+ <stop
712+ style="stop-color:#000000;stop-opacity:0;"
713+ offset="1"
714+ id="stop8666" />
715+ </linearGradient>
716+ <radialGradient
717+ inkscape:collect="always"
718+ xlink:href="#linearGradient8662"
719+ id="radialGradient8668"
720+ cx="24.837126"
721+ cy="36.421127"
722+ fx="24.837126"
723+ fy="36.421127"
724+ r="15.644737"
725+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,-1.160225e-14,16.87306)"
726+ gradientUnits="userSpaceOnUse" />
727+ <linearGradient
728+ gradientTransform="matrix(1.171926,0.000000,0.000000,1.171926,-4.674553,-1.427903)"
729+ gradientUnits="userSpaceOnUse"
730+ y2="12.448164"
731+ x2="19.377108"
732+ y1="16.642263"
733+ x1="22.000000"
734+ id="linearGradient2167"
735+ xlink:href="#linearGradient2161"
736+ inkscape:collect="always" />
737+ <linearGradient
738+ gradientTransform="matrix(1.171926,0.000000,0.000000,1.171926,-4.674553,-1.427903)"
739+ gradientUnits="userSpaceOnUse"
740+ y2="23.105061"
741+ x2="10.022297"
742+ y1="15.230618"
743+ x1="14.296179"
744+ id="linearGradient2193"
745+ xlink:href="#linearGradient2187"
746+ inkscape:collect="always" />
747+ <linearGradient
748+ gradientUnits="userSpaceOnUse"
749+ y2="29.839863"
750+ x2="6.1056361"
751+ y1="24.589863"
752+ x1="12.105637"
753+ id="linearGradient2708"
754+ xlink:href="#linearGradient2702"
755+ inkscape:collect="always" />
756+ <linearGradient
757+ gradientTransform="matrix(1.171926,0.000000,0.000000,1.171926,-4.674553,-1.427903)"
758+ gradientUnits="userSpaceOnUse"
759+ y2="12.448164"
760+ x2="19.377108"
761+ y1="16.642263"
762+ x1="22.000000"
763+ id="linearGradient2167-784"
764+ xlink:href="#linearGradient2161-870"
765+ inkscape:collect="always" />
766+ <linearGradient
767+ id="linearGradient2161-870">
768+ <stop
769+ id="stop3037"
770+ offset="0"
771+ style="stop-color:#767676;stop-opacity:1" />
772+ <stop
773+ id="stop3039"
774+ offset="1.0000000"
775+ style="stop-color:#989898;stop-opacity:1" />
776+ </linearGradient>
777+ <linearGradient
778+ gradientUnits="userSpaceOnUse"
779+ y2="29.839863"
780+ x2="6.1056361"
781+ y1="24.589863"
782+ x1="12.105637"
783+ id="linearGradient2708-234"
784+ xlink:href="#linearGradient2702-493"
785+ inkscape:collect="always" />
786+ <linearGradient
787+ id="linearGradient2702-493"
788+ inkscape:collect="always">
789+ <stop
790+ id="stop3043"
791+ offset="0"
792+ style="stop-color:#555555;stop-opacity:1;" />
793+ <stop
794+ id="stop3045"
795+ offset="1"
796+ style="stop-color:#555555;stop-opacity:0;" />
797+ </linearGradient>
798+ </defs>
799+ <metadata
800+ id="metadata4">
801+ <rdf:RDF>
802+ <cc:Work
803+ rdf:about="">
804+ <dc:format>image/svg+xml</dc:format>
805+ <dc:type
806+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
807+ <dc:creator>
808+ <cc:Agent>
809+ <dc:title>Jakub Steiner</dc:title>
810+ </cc:Agent>
811+ </dc:creator>
812+ <dc:source>http://jimmac.musichall.cz</dc:source>
813+ <cc:license
814+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
815+ <dc:title></dc:title>
816+ <dc:subject>
817+ <rdf:Bag>
818+ <rdf:li>go</rdf:li>
819+ <rdf:li>jump</rdf:li>
820+ <rdf:li>seek</rdf:li>
821+ <rdf:li>arrow</rdf:li>
822+ <rdf:li>pointer</rdf:li>
823+ </rdf:Bag>
824+ </dc:subject>
825+ </cc:Work>
826+ <cc:License
827+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
828+ <cc:permits
829+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
830+ <cc:permits
831+ rdf:resource="http://creativecommons.org/ns#Distribution" />
832+ <cc:permits
833+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
834+ </cc:License>
835+ </rdf:RDF>
836+ </metadata>
837+ <g
838+ id="layer1"
839+ inkscape:label="Layer 1"
840+ inkscape:groupmode="layer">
841+ <path
842+ sodipodi:type="arc"
843+ style="opacity:0.14117648;color:#000000;fill:url(#radialGradient8668);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
844+ id="path8660"
845+ sodipodi:cx="24.837126"
846+ sodipodi:cy="36.421127"
847+ sodipodi:rx="15.644737"
848+ sodipodi:ry="8.3968935"
849+ d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1 9.1923885,36.421127 A 15.644737 8.3968935 0 1 1 40.481863 36.421127 z"
850+ transform="matrix(1.489736,0.000000,0.000000,-1.001252,-12.26794,72.07115)" />
851+ <path
852+ sodipodi:nodetypes="ccccccc"
853+ id="path1432"
854+ d="M 4.3920955,35.164045 C 3.0709563,-4.8617622 38.100746,1.7948935 36.928820,22.596580 L 46.304228,22.596580 L 31.655153,34.315840 L 16.420115,22.596580 C 16.420115,22.596580 26.088504,22.596580 26.088504,22.596580 C 26.674467,8.5334680 4.6559242,4.1065510 4.3920955,35.164045 z "
855+ style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2167-784);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient2708-234);stroke-width:1.0000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
856+ <path
857+ style="opacity:0.41764703;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient2193);stroke-width:0.99999970;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
858+ d="M 4.3609454,33.776714 C 4.4557415,-2.2986419 38.008172,2.0411991 35.829171,23.579043 L 43.433623,23.579043 L 31.618133,32.977887 L 19.387494,23.579043 C 19.387494,23.579043 27.066938,23.579043 27.066938,23.579043 C 28.105744,5.5081081 3.1989499,4.7058695 4.3609454,33.776714 z "
859+ id="path2177"
860+ sodipodi:nodetypes="ccccccc" />
861+ </g>
862+</svg>
863
864=== added file 'data/icon-src/preferences.svg'
865--- data/icon-src/preferences.svg 1970-01-01 00:00:00 +0000
866+++ data/icon-src/preferences.svg 2010-11-28 20:59:14 +0000
867@@ -0,0 +1,565 @@
868+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
869+<!-- Created with Inkscape (http://www.inkscape.org/) -->
870+
871+<svg
872+ xmlns:dc="http://purl.org/dc/elements/1.1/"
873+ xmlns:cc="http://creativecommons.org/ns#"
874+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
875+ xmlns:svg="http://www.w3.org/2000/svg"
876+ xmlns="http://www.w3.org/2000/svg"
877+ xmlns:xlink="http://www.w3.org/1999/xlink"
878+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
879+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
880+ inkscape:export-ydpi="90.000000"
881+ inkscape:export-xdpi="90.000000"
882+ inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
883+ width="48px"
884+ height="48px"
885+ id="svg11300"
886+ sodipodi:version="0.32"
887+ inkscape:version="0.48.0 r9654"
888+ sodipodi:docname="preferences-system.svg"
889+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
890+ version="1.1">
891+ <defs
892+ id="defs3">
893+ <inkscape:perspective
894+ sodipodi:type="inkscape:persp3d"
895+ inkscape:vp_x="0 : 24 : 1"
896+ inkscape:vp_y="0 : 1000 : 0"
897+ inkscape:vp_z="48 : 24 : 1"
898+ inkscape:persp3d-origin="24 : 16 : 1"
899+ id="perspective60" />
900+ <linearGradient
901+ inkscape:collect="always"
902+ id="linearGradient2250">
903+ <stop
904+ style="stop-color:#ffffff;stop-opacity:1;"
905+ offset="0"
906+ id="stop2252" />
907+ <stop
908+ style="stop-color:#ffffff;stop-opacity:0;"
909+ offset="1"
910+ id="stop2254" />
911+ </linearGradient>
912+ <linearGradient
913+ inkscape:collect="always"
914+ id="linearGradient2265">
915+ <stop
916+ style="stop-color:#000000;stop-opacity:1;"
917+ offset="0"
918+ id="stop2267" />
919+ <stop
920+ style="stop-color:#000000;stop-opacity:0;"
921+ offset="1"
922+ id="stop2269" />
923+ </linearGradient>
924+ <linearGradient
925+ inkscape:collect="always"
926+ id="linearGradient2257">
927+ <stop
928+ style="stop-color:#ffffff;stop-opacity:1;"
929+ offset="0"
930+ id="stop2259" />
931+ <stop
932+ style="stop-color:#ffffff;stop-opacity:0;"
933+ offset="1"
934+ id="stop2261" />
935+ </linearGradient>
936+ <linearGradient
937+ id="linearGradient3087">
938+ <stop
939+ style="stop-color:#3465a4;stop-opacity:1;"
940+ offset="0"
941+ id="stop3089" />
942+ <stop
943+ id="stop3095"
944+ offset="0"
945+ style="stop-color:#9fbce1;stop-opacity:1;" />
946+ <stop
947+ style="stop-color:#6b95ca;stop-opacity:1;"
948+ offset="0"
949+ id="stop2242" />
950+ <stop
951+ id="stop2244"
952+ offset="0.75"
953+ style="stop-color:#3d6aa5;stop-opacity:1;" />
954+ <stop
955+ style="stop-color:#386eb4;stop-opacity:1;"
956+ offset="1"
957+ id="stop3091" />
958+ </linearGradient>
959+ <linearGradient
960+ id="linearGradient3077">
961+ <stop
962+ style="stop-color:#98a0a9;stop-opacity:1;"
963+ offset="0"
964+ id="stop3079" />
965+ <stop
966+ style="stop-color:#c3d0dd;stop-opacity:1;"
967+ offset="1"
968+ id="stop3081" />
969+ </linearGradient>
970+ <linearGradient
971+ id="linearGradient3061">
972+ <stop
973+ style="stop-color:#ffffff;stop-opacity:1;"
974+ offset="0"
975+ id="stop3063" />
976+ <stop
977+ style="stop-color:#000000;stop-opacity:1;"
978+ offset="1"
979+ id="stop3065" />
980+ </linearGradient>
981+ <linearGradient
982+ id="linearGradient3049">
983+ <stop
984+ style="stop-color:#b6b6b6;stop-opacity:1;"
985+ offset="0"
986+ id="stop3051" />
987+ <stop
988+ id="stop2262"
989+ offset="0.5"
990+ style="stop-color:#f2f2f2;stop-opacity:1;" />
991+ <stop
992+ style="stop-color:#fafafa;stop-opacity:1;"
993+ offset="0.67612958"
994+ id="stop2264" />
995+ <stop
996+ id="stop2268"
997+ offset="0.84051722"
998+ style="stop-color:#d8d8d8;stop-opacity:1;" />
999+ <stop
1000+ id="stop2266"
1001+ offset="0.875"
1002+ style="stop-color:#f2f2f2;stop-opacity:1;" />
1003+ <stop
1004+ style="stop-color:#dbdbdb;stop-opacity:1;"
1005+ offset="1"
1006+ id="stop3053" />
1007+ </linearGradient>
1008+ <linearGradient
1009+ inkscape:collect="always"
1010+ id="linearGradient3041">
1011+ <stop
1012+ style="stop-color:#000000;stop-opacity:1;"
1013+ offset="0"
1014+ id="stop3043" />
1015+ <stop
1016+ style="stop-color:#000000;stop-opacity:0;"
1017+ offset="1"
1018+ id="stop3045" />
1019+ </linearGradient>
1020+ <radialGradient
1021+ inkscape:collect="always"
1022+ xlink:href="#linearGradient3041"
1023+ id="radialGradient3047"
1024+ cx="24.8125"
1025+ cy="39.125"
1026+ fx="24.8125"
1027+ fy="39.125"
1028+ r="17.6875"
1029+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.374558,7.194333e-15,24.47041)"
1030+ gradientUnits="userSpaceOnUse" />
1031+ <linearGradient
1032+ inkscape:collect="always"
1033+ xlink:href="#linearGradient3049"
1034+ id="linearGradient3055"
1035+ x1="19.648342"
1036+ y1="42.253601"
1037+ x2="20.631224"
1038+ y2="6.7758031"
1039+ gradientUnits="userSpaceOnUse"
1040+ gradientTransform="matrix(0.878270,0.000000,0.000000,0.878270,2.536988,4.967681)" />
1041+ <linearGradient
1042+ inkscape:collect="always"
1043+ xlink:href="#linearGradient3061"
1044+ id="linearGradient3067"
1045+ x1="50.152931"
1046+ y1="-3.6324477"
1047+ x2="25.291086"
1048+ y2="-4.3002653"
1049+ gradientUnits="userSpaceOnUse"
1050+ gradientTransform="matrix(0.878270,-1.375944e-15,1.375944e-15,0.878270,5.328299,1.650243)" />
1051+ <linearGradient
1052+ inkscape:collect="always"
1053+ xlink:href="#linearGradient3077"
1054+ id="linearGradient3083"
1055+ x1="38.227654"
1056+ y1="13.602527"
1057+ x2="37.53537"
1058+ y2="6.6285896"
1059+ gradientUnits="userSpaceOnUse"
1060+ gradientTransform="matrix(0.878270,0.000000,0.000000,0.878270,2.847503,5.588712)" />
1061+ <linearGradient
1062+ inkscape:collect="always"
1063+ xlink:href="#linearGradient3087"
1064+ id="linearGradient3093"
1065+ x1="9.7503242"
1066+ y1="32.28376"
1067+ x2="16.915297"
1068+ y2="39.443218"
1069+ gradientUnits="userSpaceOnUse"
1070+ gradientTransform="matrix(0.878270,0.000000,0.000000,0.878270,2.536988,4.967681)" />
1071+ <linearGradient
1072+ inkscape:collect="always"
1073+ xlink:href="#linearGradient2257"
1074+ id="linearGradient2263"
1075+ x1="12.004697"
1076+ y1="35.688461"
1077+ x2="10.650805"
1078+ y2="33.194965"
1079+ gradientUnits="userSpaceOnUse"
1080+ gradientTransform="matrix(1.007254,-2.636526e-2,2.636526e-2,1.007254,1.593411,7.919100e-2)" />
1081+ <linearGradient
1082+ inkscape:collect="always"
1083+ xlink:href="#linearGradient2265"
1084+ id="linearGradient2271"
1085+ x1="14.017542"
1086+ y1="36.942543"
1087+ x2="15.415793"
1088+ y2="38.268368"
1089+ gradientUnits="userSpaceOnUse"
1090+ gradientTransform="matrix(0.878099,-1.732370e-2,1.732370e-2,0.878099,2.163687,4.067899)" />
1091+ <linearGradient
1092+ inkscape:collect="always"
1093+ xlink:href="#linearGradient2250"
1094+ id="linearGradient2256"
1095+ x1="31.177404"
1096+ y1="19.821514"
1097+ x2="40.859177"
1098+ y2="9.6568537"
1099+ gradientUnits="userSpaceOnUse" />
1100+ <radialGradient
1101+ inkscape:collect="always"
1102+ xlink:href="#linearGradient3041"
1103+ id="radialGradient2260"
1104+ gradientUnits="userSpaceOnUse"
1105+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.374558,7.272829e-15,24.47041)"
1106+ cx="24.8125"
1107+ cy="39.125"
1108+ fx="24.8125"
1109+ fy="39.125"
1110+ r="17.6875" />
1111+ <filter
1112+ id="filter3036"
1113+ inkscape:label="Desaturate"
1114+ x="0"
1115+ y="0"
1116+ width="1"
1117+ height="1"
1118+ inkscape:menu="Color"
1119+ inkscape:menu-tooltip="Render in shades of gray by reducing saturation to zero"
1120+ color-interpolation-filters="sRGB">
1121+ <feColorMatrix
1122+ id="feColorMatrix3038"
1123+ type="saturate"
1124+ values="0" />
1125+ </filter>
1126+ <filter
1127+ id="filter3040"
1128+ inkscape:label="Desaturate"
1129+ x="0"
1130+ y="0"
1131+ width="1"
1132+ height="1"
1133+ inkscape:menu="Color"
1134+ inkscape:menu-tooltip="Render in shades of gray by reducing saturation to zero"
1135+ color-interpolation-filters="sRGB">
1136+ <feColorMatrix
1137+ id="feColorMatrix3042"
1138+ type="saturate"
1139+ values="0" />
1140+ </filter>
1141+ <filter
1142+ id="filter3044"
1143+ inkscape:label="Desaturate"
1144+ x="0"
1145+ y="0"
1146+ width="1"
1147+ height="1"
1148+ inkscape:menu="Color"
1149+ inkscape:menu-tooltip="Render in shades of gray by reducing saturation to zero"
1150+ color-interpolation-filters="sRGB">
1151+ <feColorMatrix
1152+ id="feColorMatrix3046"
1153+ type="saturate"
1154+ values="0" />
1155+ </filter>
1156+ <filter
1157+ id="filter3048"
1158+ inkscape:label="Desaturate"
1159+ x="0"
1160+ y="0"
1161+ width="1"
1162+ height="1"
1163+ inkscape:menu="Color"
1164+ inkscape:menu-tooltip="Render in shades of gray by reducing saturation to zero"
1165+ color-interpolation-filters="sRGB">
1166+ <feColorMatrix
1167+ id="feColorMatrix3050"
1168+ type="saturate"
1169+ values="0" />
1170+ </filter>
1171+ <filter
1172+ id="filter3052"
1173+ inkscape:label="Desaturate"
1174+ x="0"
1175+ y="0"
1176+ width="1"
1177+ height="1"
1178+ inkscape:menu="Color"
1179+ inkscape:menu-tooltip="Render in shades of gray by reducing saturation to zero"
1180+ color-interpolation-filters="sRGB">
1181+ <feColorMatrix
1182+ id="feColorMatrix3054"
1183+ type="saturate"
1184+ values="0" />
1185+ </filter>
1186+ <filter
1187+ id="filter3056"
1188+ inkscape:label="Desaturate"
1189+ x="0"
1190+ y="0"
1191+ width="1"
1192+ height="1"
1193+ inkscape:menu="Color"
1194+ inkscape:menu-tooltip="Render in shades of gray by reducing saturation to zero"
1195+ color-interpolation-filters="sRGB">
1196+ <feColorMatrix
1197+ id="feColorMatrix3058"
1198+ type="saturate"
1199+ values="0" />
1200+ </filter>
1201+ <filter
1202+ id="filter3060"
1203+ inkscape:label="Desaturate"
1204+ x="0"
1205+ y="0"
1206+ width="1"
1207+ height="1"
1208+ inkscape:menu="Color"
1209+ inkscape:menu-tooltip="Render in shades of gray by reducing saturation to zero"
1210+ color-interpolation-filters="sRGB">
1211+ <feColorMatrix
1212+ id="feColorMatrix3062"
1213+ type="saturate"
1214+ values="0" />
1215+ </filter>
1216+ <filter
1217+ id="filter3064"
1218+ inkscape:label="Desaturate"
1219+ x="0"
1220+ y="0"
1221+ width="1"
1222+ height="1"
1223+ inkscape:menu="Color"
1224+ inkscape:menu-tooltip="Render in shades of gray by reducing saturation to zero"
1225+ color-interpolation-filters="sRGB">
1226+ <feColorMatrix
1227+ id="feColorMatrix3066"
1228+ type="saturate"
1229+ values="0" />
1230+ </filter>
1231+ <filter
1232+ id="filter3068"
1233+ inkscape:label="Desaturate"
1234+ x="0"
1235+ y="0"
1236+ width="1"
1237+ height="1"
1238+ inkscape:menu="Color"
1239+ inkscape:menu-tooltip="Render in shades of gray by reducing saturation to zero"
1240+ color-interpolation-filters="sRGB">
1241+ <feColorMatrix
1242+ id="feColorMatrix3070"
1243+ type="saturate"
1244+ values="0" />
1245+ </filter>
1246+ <filter
1247+ id="filter3072"
1248+ inkscape:label="Desaturate"
1249+ x="0"
1250+ y="0"
1251+ width="1"
1252+ height="1"
1253+ inkscape:menu="Color"
1254+ inkscape:menu-tooltip="Render in shades of gray by reducing saturation to zero"
1255+ color-interpolation-filters="sRGB">
1256+ <feColorMatrix
1257+ id="feColorMatrix3074"
1258+ type="saturate"
1259+ values="0" />
1260+ </filter>
1261+ <filter
1262+ id="filter3076"
1263+ inkscape:label="Desaturate"
1264+ x="0"
1265+ y="0"
1266+ width="1"
1267+ height="1"
1268+ inkscape:menu="Color"
1269+ inkscape:menu-tooltip="Render in shades of gray by reducing saturation to zero"
1270+ color-interpolation-filters="sRGB">
1271+ <feColorMatrix
1272+ id="feColorMatrix3078"
1273+ type="saturate"
1274+ values="0" />
1275+ </filter>
1276+ </defs>
1277+ <sodipodi:namedview
1278+ stroke="#204a87"
1279+ fill="#3465a4"
1280+ id="base"
1281+ pagecolor="#ffffff"
1282+ bordercolor="#666666"
1283+ borderopacity="0.25490196"
1284+ inkscape:pageopacity="0.0"
1285+ inkscape:pageshadow="2"
1286+ inkscape:zoom="4"
1287+ inkscape:cx="19.425317"
1288+ inkscape:cy="26.37487"
1289+ inkscape:current-layer="layer1"
1290+ showgrid="false"
1291+ inkscape:grid-bbox="true"
1292+ inkscape:document-units="px"
1293+ inkscape:showpageshadow="false"
1294+ inkscape:window-width="1034"
1295+ inkscape:window-height="818"
1296+ inkscape:window-x="400"
1297+ inkscape:window-y="30"
1298+ inkscape:window-maximized="0" />
1299+ <metadata
1300+ id="metadata4">
1301+ <rdf:RDF>
1302+ <cc:Work
1303+ rdf:about="">
1304+ <dc:format>image/svg+xml</dc:format>
1305+ <dc:type
1306+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
1307+ <dc:creator>
1308+ <cc:Agent>
1309+ <dc:title>Jakub Steiner</dc:title>
1310+ </cc:Agent>
1311+ </dc:creator>
1312+ <dc:source>http://jimmac.musichall.cz</dc:source>
1313+ <cc:license
1314+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
1315+ <dc:title></dc:title>
1316+ <dc:subject>
1317+ <rdf:Bag>
1318+ <rdf:li>preferences</rdf:li>
1319+ <rdf:li>settings</rdf:li>
1320+ <rdf:li>control panel</rdf:li>
1321+ <rdf:li>tweaks</rdf:li>
1322+ <rdf:li>system</rdf:li>
1323+ </rdf:Bag>
1324+ </dc:subject>
1325+ </cc:Work>
1326+ <cc:License
1327+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
1328+ <cc:permits
1329+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
1330+ <cc:permits
1331+ rdf:resource="http://creativecommons.org/ns#Distribution" />
1332+ <cc:permits
1333+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
1334+ </cc:License>
1335+ </rdf:RDF>
1336+ </metadata>
1337+ <g
1338+ id="layer1"
1339+ inkscape:label="Layer 1"
1340+ inkscape:groupmode="layer">
1341+ <path
1342+ transform="matrix(0.751118,0.000000,0.000000,0.578703,17.04087,19.36341)"
1343+ d="M 42.5 39.125 A 17.6875 6.625 0 1 1 7.125,39.125 A 17.6875 6.625 0 1 1 42.5 39.125 z"
1344+ sodipodi:ry="6.625"
1345+ sodipodi:rx="17.6875"
1346+ sodipodi:cy="39.125"
1347+ sodipodi:cx="24.8125"
1348+ id="path2258"
1349+ style="opacity:0.19886367;color:#000000;fill:url(#radialGradient2260);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
1350+ sodipodi:type="arc" />
1351+ <path
1352+ sodipodi:type="arc"
1353+ style="opacity:0.3125;color:#000000;fill:url(#radialGradient3047);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
1354+ id="path3039"
1355+ sodipodi:cx="24.8125"
1356+ sodipodi:cy="39.125"
1357+ sodipodi:rx="17.6875"
1358+ sodipodi:ry="6.625"
1359+ d="M 42.5 39.125 A 17.6875 6.625 0 1 1 7.125,39.125 A 17.6875 6.625 0 1 1 42.5 39.125 z"
1360+ transform="matrix(0.836071,0.000000,0.000000,0.685436,-7.959607,15.71781)" />
1361+ <path
1362+ style="opacity:1;color:#000000;fill:url(#linearGradient3055);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.99999970000000005;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter3076)"
1363+ d="M 17.906713,21.215676 L 36.899302,40.6474 C 37.667788,41.52567 40.102812,42.204461 41.729787,40.6474 C 43.300913,39.143787 42.937408,37.024536 41.400436,35.487563 L 23.176333,15.946056 C 25.426333,9.696056 20.872444,4.446488 14.997444,5.571488 L 13.73493,6.7242174 L 17.687145,10.456865 L 17.906713,13.750381 L 14.955871,16.443984 L 11.429472,16.05584 L 7.8066086,12.652544 C 7.8066086,12.652544 6.5364873,13.907448 6.5364873,13.907448 C 5.9457238,19.548765 11.844213,24.590676 17.906713,21.215676 z "
1364+ id="path2140"
1365+ sodipodi:nodetypes="cczcccccccccsc" />
1366+ <path
1367+ sodipodi:nodetypes="cczccccccccccc"
1368+ id="path3057"
1369+ d="M 18.117385,19.9401 L 37.320267,39.967712 C 37.915174,40.647605 39.800194,41.173077 41.059681,39.967712 C 42.275934,38.803723 41.994534,37.163152 40.804721,35.973338 L 22.313189,16.352183 C 23.813189,9.852183 20.454401,6.3475455 15.454401,6.4725455 L 15.18427,6.7459223 L 18.787193,9.982189 L 18.917359,14.163983 L 15.303442,17.462466 L 11.061136,17.004257 L 7.8845536,14.012776 L 7.5319165,14.442835 C 7.2194165,20.411585 14.023635,23.1276 18.117385,19.9401 z "
1370+ style="opacity:0.42613638999999998;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999917000000005;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter3072)" />
1371+ <rect
1372+ style="opacity:0.17045456000000000;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3067);stroke-width:0.99999720000000003;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter3068)"
1373+ id="rect3059"
1374+ width="23.268276"
1375+ height="2.0554912"
1376+ x="28.185335"
1377+ y="-2.6184492"
1378+ rx="0.88388073"
1379+ ry="0.88388073"
1380+ transform="matrix(0.697938,0.716158,-0.716158,0.697938,0.000000,0.000000)" />
1381+ <path
1382+ style="opacity:1;color:#000000;fill:url(#linearGradient3083);fill-opacity:1;fill-rule:nonzero;stroke:#878f9d;stroke-width:0.99999970000000005;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter3064)"
1383+ d="M 22.498794,30.12538 C 23.332335,29.410917 35.782628,16.676871 35.782628,16.676871 L 38.856573,16.457303 L 43.687058,9.7604906 L 39.662731,6.1752987 L 33.405057,11.554705 L 33.405057,14.628651 L 20.670142,27.857593 C 20.066332,28.461403 21.730308,30.784082 22.498794,30.12538 z "
1384+ id="path2144"
1385+ sodipodi:nodetypes="ccccccccc" />
1386+ <path
1387+ sodipodi:nodetypes="ccccccccc"
1388+ id="path3085"
1389+ d="M 22.401987,29.085455 C 23.04876,28.531078 35.426388,15.855648 35.426388,15.855648 L 38.354971,15.607649 L 42.568887,9.945584 L 39.679156,7.3965946 L 34.202578,12.114067 L 34.357836,14.965022 L 21.681731,28.257345 C 21.213213,28.725863 21.805692,29.596565 22.401987,29.085455 z "
1390+ style="opacity:0.53977271999999998;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2256);stroke-width:1.00000024000000010;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter3060)" />
1391+ <path
1392+ style="color:#000000;fill:url(#linearGradient3093);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.99999970000000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3056)"
1393+ d="M 8.4653111,43.611561 C 9.7818986,45.07679 13.438996,45.739726 15.060755,42.901647 C 15.767862,41.664211 17.154698,38.198845 23.341883,32.630379 C 24.381029,31.696208 25.481792,29.559241 24.54863,28.406512 L 22.133387,25.991269 C 21.145334,24.893432 18.398973,25.40552 17.272212,26.942145 C 13.913455,31.538339 8.4261393,35.197025 7.1887023,35.638967 C 4.8207828,36.484652 5.0872917,39.975116 6.6538792,41.635454 L 8.4653111,43.611561 z "
1394+ id="path2142"
1395+ sodipodi:nodetypes="ccccccscc" />
1396+ <path
1397+ sodipodi:type="arc"
1398+ style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#a1a1a1;stroke-width:1.13860165999999996;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter3052)"
1399+ id="path2146"
1400+ sodipodi:cx="41.875"
1401+ sodipodi:cy="37.5"
1402+ sodipodi:rx="1.375"
1403+ sodipodi:ry="1.375"
1404+ d="M 43.25 37.5 A 1.375 1.375 0 1 1 40.5,37.5 A 1.375 1.375 0 1 1 43.25 37.5 z"
1405+ transform="matrix(0.878270,0.000000,0.000000,0.878270,2.427204,5.077464)" />
1406+ <path
1407+ sodipodi:type="arc"
1408+ style="opacity:0.60227271999999998;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter3048)"
1409+ id="path3101"
1410+ sodipodi:cx="19.003494"
1411+ sodipodi:cy="28.20101"
1412+ sodipodi:rx="1.767767"
1413+ sodipodi:ry="1.767767"
1414+ d="M 20.771261 28.20101 A 1.767767 1.767767 0 1 1 17.235727,28.20101 A 1.767767 1.767767 0 1 1 20.771261 28.20101 z"
1415+ transform="matrix(0.570876,0.000000,0.000000,0.570876,9.154848,11.25111)" />
1416+ <path
1417+ style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2263);stroke-width:2.29450916999999999;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter3044)"
1418+ d="M 18.678905,29.624807 C 18.678905,29.624807 11.509014,36.92442 8.1502573,38.161857"
1419+ id="path3103"
1420+ sodipodi:nodetypes="cc" />
1421+ <path
1422+ sodipodi:nodetypes="csccccscc"
1423+ id="path2270"
1424+ d="M 8.8060013,42.48669 C 10.247267,44.232307 13.405535,44.647919 14.397161,42.116101 C 15.078468,40.376589 17.730783,36.450314 22.594745,32.072748 C 23.411654,31.338363 24.277003,29.658419 23.543411,28.752218 L 21.644704,26.853511 C 20.867961,25.990463 18.708951,26.393033 17.823164,27.601028 C 15.182728,31.214257 9.3398194,35.940582 7.9274145,36.406654 C 5.7406198,37.128264 6.1504221,39.627953 7.3819713,40.933203 L 8.8060013,42.48669 z "
1425+ style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999945999999995;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;opacity:0.19886364000000001;filter:url(#filter3040)" />
1426+ <path
1427+ style="opacity:0.27840911000000002;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2271);stroke-width:2.29450916999999999;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter3036)"
1428+ d="M 20.824602,31.261024 C 20.824602,31.261024 13.501839,37.878429 11.910849,42.121069"
1429+ id="path2247"
1430+ sodipodi:nodetypes="cc" />
1431+ </g>
1432+</svg>
1433
1434=== added directory 'res/drawable-ldpi'
1435=== added file 'res/drawable/icon_notebookfilter.png'
1436Binary files res/drawable/icon_notebookfilter.png 1970-01-01 00:00:00 +0000 and res/drawable/icon_notebookfilter.png 2010-11-28 20:59:14 +0000 differ
1437=== added file 'res/drawable/icon_pref.png'
1438Binary files res/drawable/icon_pref.png 1970-01-01 00:00:00 +0000 and res/drawable/icon_pref.png 2010-11-28 20:59:14 +0000 differ
1439=== added file 'res/drawable/icon_sort.png'
1440Binary files res/drawable/icon_sort.png 1970-01-01 00:00:00 +0000 and res/drawable/icon_sort.png 2010-11-28 20:59:14 +0000 differ
1441=== added file 'res/layout/notebooks.xml'
1442--- res/layout/notebooks.xml 1970-01-01 00:00:00 +0000
1443+++ res/layout/notebooks.xml 2010-11-28 20:59:14 +0000
1444@@ -0,0 +1,36 @@
1445+<?xml version="1.0" encoding="UTF-8"?>
1446+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
1447+ android:layout_width="fill_parent"
1448+ android:layout_height="fill_parent"
1449+ android:orientation="vertical"
1450+ >
1451+
1452+ <include android:id="@+id/actionbar" layout="@layout/actionbar" />
1453+
1454+ <ListView android:id="@android:id/android:list"
1455+ android:layout_width="wrap_content"
1456+ android:layout_height="wrap_content"
1457+ android:divider="#00000000"
1458+ android:dividerHeight="0px"
1459+ android:cacheColorHint="#ffdddddd"
1460+ />
1461+
1462+ <TextView android:id="@android:id/android:empty"
1463+ android:layout_width="wrap_content"
1464+ android:layout_height="wrap_content"
1465+ android:text="@string/strListEmptyNoNotebooks"
1466+ />
1467+
1468+ <TextView android:id="@+id/allNotebooks"
1469+ android:layout_width="wrap_content"
1470+ android:layout_height="wrap_content"
1471+ android:textStyle="bold"
1472+ android:textColor="#FF555555"
1473+ android:textSize="18dp"
1474+ android:paddingTop="5dip"
1475+ android:paddingLeft="5dip"
1476+ android:paddingRight="5dip"
1477+ android:text="@string/allNotebooksFilter"
1478+ android:clickable="true"
1479+ />
1480+</LinearLayout>
1481\ No newline at end of file
1482
1483=== added file 'res/layout/notebooks_list_item.xml'
1484--- res/layout/notebooks_list_item.xml 1970-01-01 00:00:00 +0000
1485+++ res/layout/notebooks_list_item.xml 2010-11-28 20:59:14 +0000
1486@@ -0,0 +1,38 @@
1487+<?xml version="1.0" encoding="UTF-8"?>
1488+<!--
1489+ Tomdroid
1490+ Tomboy on Android
1491+ http://www.launchpad.net/tomdroid
1492+
1493+ Copyright 2008, 2009 Olivier Bilodeau <olivier@bottomlesspit.org>
1494+
1495+ This file is part of Tomdroid.
1496+
1497+ Tomdroid is free software: you can redistribute it and/or modify
1498+ it under the terms of the GNU General Public License as published by
1499+ the Free Software Foundation, either version 3 of the License, or
1500+ (at your option) any later version.
1501+
1502+ Tomdroid is distributed in the hope that it will be useful,
1503+ but WITHOUT ANY WARRANTY; without even the implied warranty of
1504+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1505+ GNU General Public License for more details.
1506+
1507+ You should have received a copy of the GNU General Public License
1508+ along with Tomdroid. If not, see <http://www.gnu.org/licenses/>.
1509+-->
1510+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
1511+ android:orientation="vertical"
1512+ android:layout_width="fill_parent"
1513+ android:layout_height="wrap_content" >
1514+ <TextView android:id="@+id/notebook_name" xmlns:android="http://schemas.android.com/apk/res/android"
1515+ android:layout_width="fill_parent"
1516+ android:layout_height="fill_parent"
1517+ android:textStyle="bold"
1518+ android:textColor="#FF555555"
1519+ android:textSize="18dp"
1520+ android:paddingTop="5dip"
1521+ android:paddingLeft="5dip"
1522+ android:paddingRight="5dip"
1523+ />
1524+</LinearLayout>
1525\ No newline at end of file
1526
1527=== modified file 'res/menu/main.xml'
1528--- res/menu/main.xml 2010-06-12 05:53:50 +0000
1529+++ res/menu/main.xml 2010-11-28 20:59:14 +0000
1530@@ -24,14 +24,23 @@
1531 <menu xmlns:android="http://schemas.android.com/apk/res/android">
1532
1533 <item
1534+ android:icon="@drawable/icon_notebookfilter"
1535+ android:id="@+id/menuFilterNotebook"
1536+ android:title="@string/menuFilterNotebook"
1537+ />
1538+ <item
1539+ android:icon="@drawable/icon_sort"
1540+ android:id="@+id/menuSort"
1541+ android:title="@string/menuSort"
1542+ />
1543+ <item
1544 android:icon="@drawable/icon_about"
1545+ android:id="@+id/menuAbout"
1546 android:title="@string/menuAbout"
1547- android:id="@+id/menuAbout"
1548- />
1549-
1550-
1551+ />
1552 <item
1553- android:icon="@android:drawable/ic_menu_preferences"
1554+ android:icon="@drawable/icon_pref"
1555+ android:id="@+id/menuPrefs"
1556 android:title="@string/menuPrefs"
1557- android:id="@+id/menuPrefs"/>
1558+ />
1559 </menu>
1560
1561=== modified file 'res/values-fr/arrays.xml'
1562--- res/values-fr/arrays.xml 2010-10-15 02:59:10 +0000
1563+++ res/values-fr/arrays.xml 2010-11-28 20:59:14 +0000
1564@@ -5,7 +5,7 @@
1565 <item>sort_title</item>
1566 </array>
1567 <array name="sortOrderValues">
1568- <item>Date Modified</item>
1569- <item>Note Title</item>
1570+ <item>Date de modification</item>
1571+ <item>Titre de la note</item>
1572 </array>
1573 </resources>
1574
1575=== modified file 'res/values-fr/strings.xml'
1576--- res/values-fr/strings.xml 2010-10-24 18:54:07 +0000
1577+++ res/values-fr/strings.xml 2010-11-28 20:59:14 +0000
1578@@ -72,6 +72,7 @@
1579 <string name="prefSyncConnectionFailed">La connexion au serveur a échoué, veuillez vérifier l\'adresse que vous avez entrée si elle est correcte.</string>
1580 <string name="prefServerEmpty">L\'adresse du serveur a changé mais la nouvelle valeur est vide</string>
1581
1582+<<<<<<< TREE
1583 <!--
1584 Information that goes into the Android Market Application Listing.
1585 I've put it in here so that it'll get translated by translators.
1586@@ -92,4 +93,16 @@
1587 <!-- 80 chars max -->
1588 <string name="market_promotext">Appli de prise de notes avec synchronisation en ligne compatible avec Tomboy</string>
1589
1590+=======
1591+ <!-- NoteSorting -->
1592+ <string name="menuSort">changer tri</string>
1593+ <string name="titleDefaultSorting">Choix du tri par défaut</string>
1594+ <string name="prefDefaultSorting">Tri par défaut</string>
1595+
1596+ <!-- NoteFiltering -->
1597+ <string name="menuFilterNotebook">Filtrer</string>
1598+ <string name="strListEmptyNoNotebooks">Il n\'y a aucun bloc-note dans la base de donnèes</string>
1599+ <string name="allNotebooksFilter">Tous les bloc-notes</string>
1600+
1601+>>>>>>> MERGE-SOURCE
1602 </resources>
1603
1604=== modified file 'res/values/strings.xml'
1605--- res/values/strings.xml 2010-10-24 18:54:07 +0000
1606+++ res/values/strings.xml 2010-11-28 20:59:14 +0000
1607@@ -69,6 +69,7 @@
1608 <string name="prefSyncConnectionFailed">The connection to the server has failed, please check that the address you entered is correct.</string>
1609 <string name="prefServerEmpty">The server address changed but the new value is empty</string>
1610
1611+<<<<<<< TREE
1612 <!--
1613 Information that goes into the Android Market Application Listing.
1614 I've put it in here so that it'll get translated by translators.
1615@@ -89,4 +90,15 @@
1616 <!-- 80 chars max -->
1617 <string name="market_promotext">Note-taking application with online synchronization compatible with Tomboy</string>
1618
1619+=======
1620+ <!-- NoteSorting -->
1621+ <string name="menuSort">change sort</string>
1622+ <string name="titleDefaultSorting">Choose the default sorting</string>
1623+ <string name="prefDefaultSorting">Default sort</string>
1624+
1625+ <!-- NotebookFiltering -->
1626+ <string name="menuFilterNotebook">Filter</string>
1627+ <string name="strListEmptyNoNotebooks">There are no notebooks in Tomdroid\'s database.</string>
1628+ <string name="allNotebooksFilter">All notebooks</string>
1629+>>>>>>> MERGE-SOURCE
1630 </resources>
1631
1632=== modified file 'res/xml/preferences.xml'
1633--- res/xml/preferences.xml 2010-09-26 11:34:42 +0000
1634+++ res/xml/preferences.xml 2010-11-28 20:59:14 +0000
1635@@ -13,6 +13,7 @@
1636 android:positiveButtonText="@string/prefAuthenticate"
1637 android:shouldDisableView="true"/>
1638
1639- </PreferenceCategory>
1640+ <ListPreference android:key="default_Sorting" android:entryValues="@array/sortOrderArray" android:entries="@array/sortOrderValues" android:title="@string/prefDefaultSorting" android:dialogTitle="@string/titleDefaultSorting"></ListPreference>
1641+</PreferenceCategory>
1642
1643 </PreferenceScreen>
1644\ No newline at end of file
1645
1646=== modified file 'src/org/tomdroid/Note.java'
1647--- src/org/tomdroid/Note.java 2010-10-14 03:51:26 +0000
1648+++ src/org/tomdroid/Note.java 2010-11-28 20:59:14 +0000
1649@@ -145,9 +145,9 @@
1650 // Tomboy's (C# library) format: 2010-01-23T12:07:38.7743020-05:00
1651 Matcher m = dateCleaner.matcher(lastChangeDateStr);
1652 if (m.find()) {
1653- Log.d(TAG, "I had to clean out extra sub-milliseconds from the date");
1654+ //Log.d(TAG, "I had to clean out extra sub-milliseconds from the date");
1655 lastChangeDateStr = m.group(1)+m.group(2);
1656- Log.v(TAG, "new date: "+lastChangeDateStr);
1657+ //Log.v(TAG, "new date: "+lastChangeDateStr);
1658 }
1659
1660 lastChangeDate = new Time();
1661
1662=== modified file 'src/org/tomdroid/NoteManager.java'
1663--- src/org/tomdroid/NoteManager.java 2010-10-09 19:48:21 +0000
1664+++ src/org/tomdroid/NoteManager.java 2010-11-28 20:59:14 +0000
1665@@ -30,9 +30,13 @@
1666 import android.content.ContentResolver;
1667 import android.content.ContentValues;
1668 import android.database.Cursor;
1669+import android.database.sqlite.SQLiteDatabase;
1670+import android.database.sqlite.SQLiteQueryBuilder;
1671 import android.net.Uri;
1672+import android.test.IsolatedContext;
1673 import android.util.Log;
1674 import android.widget.ListAdapter;
1675+import android.widget.SimpleCursorAdapter;
1676
1677 public class NoteManager {
1678
1679@@ -42,6 +46,10 @@
1680 public static final String[] GUID_PROJECTION = { Note.ID, Note.GUID };
1681 public static final String[] ID_PROJECTION = { Note.ID };
1682 public static final String[] EMPTY_PROJECTION = {};
1683+ public static final String[] LIST_NOTEBOOK = {Notebook.ID, Notebook.NAME };
1684+
1685+ public static final int SORT_BY_DATE=1;
1686+ public static final int SORT_BY_NAME=2;
1687
1688 // static properties
1689 private static final String TAG = "NoteManager";
1690@@ -71,7 +79,7 @@
1691
1692 // puts a note in the content provider
1693 public static void putNote(Activity activity, Note note) {
1694-
1695+
1696 // verify if the note is already in the content provider
1697
1698 // TODO make the query prettier (use querybuilder)
1699@@ -114,6 +122,9 @@
1700
1701 if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"Note updated in content provider. TITLE:"+note.getTitle()+" GUID:"+note.getGuid());
1702 }
1703+
1704+ // put TAGS in notebooks table
1705+ putNotebook(activity, note.getTags());
1706 }
1707
1708 public static boolean deleteNote(Activity activity, int id)
1709@@ -129,7 +140,7 @@
1710 return false;
1711 }
1712
1713- public static Cursor getAllNotes(Activity activity, Boolean includeNotebookTemplates) {
1714+ public static Cursor getAllNotes(Activity activity, Boolean includeNotebookTemplates,int sort,String notebook) {
1715 // get a cursor representing all notes from the NoteProvider
1716 Uri notes = Tomdroid.CONTENT_URI;
1717 String where = null;
1718@@ -137,14 +148,31 @@
1719 if (!includeNotebookTemplates) {
1720 where = Note.TAGS + " NOT LIKE '%" + "system:template" + "%'";
1721 }
1722+
1723+ if (notebook!=null){
1724+ if (where!=null){
1725+ where += " AND ";
1726+ }
1727+ where = Note.TAGS + " LIKE '%" + notebook + "%'";
1728+ Log.i(TAG,"where : " + where);
1729+ }
1730+
1731 orderBy = Note.MODIFIED_DATE + " DESC";
1732+ if (sort==SORT_BY_DATE){
1733+ orderBy = Note.MODIFIED_DATE + " DESC";
1734+ }
1735+
1736+ if (sort==SORT_BY_NAME){
1737+ orderBy = Note.TITLE;
1738+ }
1739+
1740 return activity.managedQuery(notes, LIST_PROJECTION, where, null, orderBy);
1741 }
1742
1743
1744- public static ListAdapter getListAdapter(Activity activity) {
1745+ public static ListAdapter getListAdapter(Activity activity,int sort,String notebook) {
1746
1747- Cursor notesCursor = getAllNotes(activity, false);
1748+ Cursor notesCursor = getAllNotes(activity, false,sort,notebook);
1749
1750 // set up an adapter binding the TITLE field of the cursor to the list item
1751 String[] from = new String[] { Note.TITLE, Note.MODIFIED_DATE };
1752@@ -187,4 +215,106 @@
1753
1754 return id;
1755 }
1756+
1757+ public static Cursor getAllNotebooks(Activity activity, Boolean includeNotebookTemplates) {
1758+ // get a cursor representing all notes from the NoteProvider
1759+ Uri notebooks = Tomdroid.CONTENT_URI_NOTEBOOK;
1760+ String order = Notebook.NAME;
1761+ return activity.managedQuery(notebooks, LIST_NOTEBOOK, null, null, order);
1762+ }
1763+
1764+ public static Cursor getAllNotebooksOLD(Activity activity, Boolean includeNotebookTemplates) {
1765+ // get a cursor representing all notes from the NoteProvider
1766+ Uri notes = Tomdroid.CONTENT_URI;
1767+ String where = null;
1768+ String orderBy;
1769+ if (!includeNotebookTemplates) {
1770+ where = Note.TAGS + " NOT LIKE '%" + "system:template" + "%'";
1771+ }
1772+ orderBy = Note.TAGS + " DESC";
1773+
1774+ SQLiteDatabase db = null;
1775+ Cursor notebooksCursor = null;
1776+ Log.i(TAG,"Avant ouverture de la base");
1777+ try{
1778+ db = SQLiteDatabase.openDatabase("/data/data/org.tomdroid/databases/tomdroid-notes.db",null,SQLiteDatabase.OPEN_READONLY);
1779+ if (!db.isOpen()){
1780+ Log.e(TAG,"Impossible d'ouvir la base");
1781+ }
1782+ Log.i(TAG,"Apres ouverture de la base");
1783+ //SQLiteOpenHelper mOpenHelper = new SQLiteOpenHelper(activity.getApplicationContext(), "notes", null, 1);
1784+
1785+ SQLiteQueryBuilder qb = new SQLiteQueryBuilder ();
1786+ qb.setDistinct(true);
1787+ Log.i(TAG,"setDistinct OK");
1788+ qb.setTables("notes");
1789+ Log.i(TAG,"setTables OK");
1790+ try{
1791+ notebooksCursor = qb.query(db, LIST_NOTEBOOK, null, null, null, null, orderBy);
1792+ Log.i(TAG,"query OK");
1793+ } catch (Exception e) {
1794+ e.printStackTrace();
1795+ Log.e(TAG,"query KO");
1796+ }
1797+ } catch (Exception e) {
1798+ e.printStackTrace();
1799+ }
1800+
1801+
1802+ return notebooksCursor;
1803+ //return activity.managedQuery(notes, LIST_NOTEBOOK, where, null, orderBy);
1804+ }
1805+
1806+
1807+ public static ListAdapter getListAdapterNotebook(Activity activity) {
1808+ Cursor notebooksCursor = getAllNotebooks(activity, false);
1809+ String[] from = new String[] { Notebook.NAME };
1810+ int[] to = new int[] { R.id.notebook_name };
1811+ return new SimpleCursorAdapter(activity, R.layout.notebooks_list_item, notebooksCursor, from, to);
1812+ }
1813+
1814+ // puts a note in the content provider
1815+ public static void putNotebook(Activity activity, String notebook) {
1816+ if (notebook.compareTo("")!=0){
1817+ //Log.i(TAG,"putNotebook : "+notebook);
1818+ String[] notebooks = notebook.split(",");
1819+ for (int i = 0; i < notebooks.length; i++) {
1820+ notebook = notebooks[i];
1821+
1822+ if (notebook.startsWith(Notebook.PATERN)){
1823+ notebook = notebook.substring(Notebook.PATERN.length());
1824+ // verify if the notebook is already in the content provider
1825+
1826+ // TODO make the query prettier (use querybuilder)
1827+ Uri uriNotebooks = Tomdroid.CONTENT_URI_NOTEBOOK;
1828+ String[] whereArgs = new String[1];
1829+ whereArgs[0] = notebook;
1830+
1831+
1832+ // The note identifier is the guid
1833+ ContentResolver cr = activity.getContentResolver();
1834+ Cursor managedCursor = cr.query(uriNotebooks,EMPTY_PROJECTION,"notebook= ?",whereArgs, null);
1835+ activity.startManagingCursor(managedCursor);
1836+
1837+ // Preparing the values to be either inserted or updated
1838+ // depending on the result of the previous query
1839+ ContentValues values = new ContentValues();
1840+ values.put("notebook", notebook);
1841+
1842+ if (managedCursor.getCount() == 0) {
1843+
1844+ // This note is not in the database yet we need to insert it
1845+ if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"A new notebook has been detected (not yet in db)");
1846+
1847+ Log.i(TAG,"putNotebook : ajout de "+notebook);
1848+ Uri uri = cr.insert(uriNotebooks, values);
1849+
1850+ if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"notebook inserted in content provider. ID: "+uri+" notebook:"+notebook);
1851+ }
1852+ }
1853+ }
1854+
1855+
1856+ }
1857+ }
1858 }
1859
1860=== modified file 'src/org/tomdroid/NoteProvider.java'
1861--- src/org/tomdroid/NoteProvider.java 2010-09-17 20:37:42 +0000
1862+++ src/org/tomdroid/NoteProvider.java 2010-11-28 20:59:14 +0000
1863@@ -108,10 +108,9 @@
1864 @Override
1865 public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
1866 if (Tomdroid.LOGGING_ENABLED) {
1867- Log.d(TAG, "Upgrading database from version " + oldVersion + " to "
1868- + newVersion + ", which will destroy all old data");
1869+ Log.d(TAG, "Upgrading database from version " + oldVersion + " to " + newVersion + ", which will destroy all old data");
1870 }
1871- db.execSQL("DROP TABLE IF EXISTS notes");
1872+ db.execSQL("DROP TABLE IF EXISTS " + DB_TABLE_NOTES);
1873 onCreate(db);
1874 }
1875 }
1876
1877=== added file 'src/org/tomdroid/Notebook.java'
1878--- src/org/tomdroid/Notebook.java 1970-01-01 00:00:00 +0000
1879+++ src/org/tomdroid/Notebook.java 2010-11-28 20:59:14 +0000
1880@@ -0,0 +1,7 @@
1881+package org.tomdroid;
1882+
1883+public class Notebook {
1884+ public static final String ID = "_id";
1885+ public static final String NAME = "notebook";
1886+ public static final String PATERN = "system:notebook:";
1887+}
1888
1889=== added file 'src/org/tomdroid/NotebookProvider.java'
1890--- src/org/tomdroid/NotebookProvider.java 1970-01-01 00:00:00 +0000
1891+++ src/org/tomdroid/NotebookProvider.java 2010-11-28 20:59:14 +0000
1892@@ -0,0 +1,227 @@
1893+package org.tomdroid;
1894+
1895+import java.util.HashMap;
1896+
1897+import org.tomdroid.ui.Tomdroid;
1898+
1899+import android.content.ContentUris;
1900+import android.content.UriMatcher;
1901+import android.content.ContentProvider;
1902+import android.content.ContentValues;
1903+import android.content.Context;
1904+import android.content.res.Resources;
1905+import android.database.Cursor;
1906+import android.database.SQLException;
1907+import android.database.sqlite.SQLiteDatabase;
1908+import android.database.sqlite.SQLiteOpenHelper;
1909+import android.database.sqlite.SQLiteQueryBuilder;
1910+import android.net.Uri;
1911+import android.text.TextUtils;
1912+import android.util.Log;
1913+
1914+public class NotebookProvider extends ContentProvider {
1915+
1916+ // ContentProvider stuff
1917+ // --
1918+ private static final String DATABASE_NAME = "tomdroid-notes.db";
1919+ private static final String DB_TABLE_NOTEBOOKS = "notebooks";
1920+ private static final int DB_VERSION = 5;
1921+ private static final String DEFAULT_SORT_ORDER = "notebook";
1922+
1923+ private static HashMap<String, String> notesProjectionMap;
1924+
1925+ private static final int NOTEBOOKS = 1;
1926+ private static final int NOTEBOOK_ID = 2;
1927+ private static final int NOTEBOOK_TITLE = 3;
1928+
1929+ private static final UriMatcher uriMatcher;
1930+
1931+ // Logging info
1932+ private static final String TAG = "NotebookProvider";
1933+
1934+ /**
1935+ * This class helps open, create, and upgrade the database file.
1936+ */
1937+ private static class DatabaseHelper extends SQLiteOpenHelper {
1938+
1939+ DatabaseHelper(Context context) {
1940+ super(context, DATABASE_NAME, null, DB_VERSION);
1941+ }
1942+
1943+ @Override
1944+ public void onCreate(SQLiteDatabase db) {
1945+ db.execSQL("CREATE TABLE " + DB_TABLE_NOTEBOOKS + " (" + Notebook.ID + " INTEGER PRIMARY KEY, " + Notebook.NAME + " STRING);");
1946+ if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"Table notebook has been created");
1947+ }
1948+
1949+ @Override
1950+ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
1951+ if (Tomdroid.LOGGING_ENABLED) {
1952+ Log.d(TAG, "Upgrading database from version " + oldVersion + " to " + newVersion + ", which will destroy all old data");
1953+ }
1954+ db.execSQL("DROP TABLE IF EXISTS " + DB_TABLE_NOTEBOOKS);
1955+ onCreate(db);
1956+ }
1957+ }
1958+
1959+ private DatabaseHelper dbHelper;
1960+
1961+
1962+ @Override
1963+ public boolean onCreate() {
1964+ dbHelper = new DatabaseHelper(getContext());
1965+ return false;
1966+ }
1967+
1968+ @Override
1969+ public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
1970+ SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
1971+
1972+ switch (uriMatcher.match(uri)) {
1973+ case NOTEBOOKS:
1974+ qb.setTables(DB_TABLE_NOTEBOOKS);
1975+ qb.setProjectionMap(notesProjectionMap);
1976+ break;
1977+
1978+ case NOTEBOOK_ID:
1979+ qb.setTables(DB_TABLE_NOTEBOOKS);
1980+ qb.setProjectionMap(notesProjectionMap);
1981+ qb.appendWhere(Notebook.ID + "=" + uri.getPathSegments().get(1));
1982+ break;
1983+
1984+ case NOTEBOOK_TITLE:
1985+ qb.setTables(DB_TABLE_NOTEBOOKS);
1986+ qb.setProjectionMap(notesProjectionMap);
1987+ // TODO appendWhere + whereArgs instead (new String[] whereArgs = uri.getLas..)?
1988+ qb.appendWhere(Notebook.NAME + " LIKE '" + uri.getLastPathSegment()+"'");
1989+ break;
1990+
1991+ default:
1992+ throw new IllegalArgumentException("Unknown URI " + uri);
1993+ }
1994+
1995+ // If no sort order is specified use the default
1996+ String orderBy;
1997+ if (TextUtils.isEmpty(sortOrder)) {
1998+ orderBy = DEFAULT_SORT_ORDER;
1999+ } else {
2000+ orderBy = sortOrder;
2001+ }
2002+
2003+ // Get the database and run the query
2004+ SQLiteDatabase db = dbHelper.getReadableDatabase();
2005+ Cursor c = qb.query(db, projection, selection, selectionArgs, null, null, orderBy);
2006+
2007+ // Tell the cursor what uri to watch, so it knows when its source data changes
2008+ c.setNotificationUri(getContext().getContentResolver(), uri);
2009+ return c;
2010+ }
2011+
2012+ @Override
2013+ public String getType(Uri uri) {
2014+ Log.i(TAG,"getType");
2015+ switch (uriMatcher.match(uri)) {
2016+ case NOTEBOOKS:
2017+ return Tomdroid.CONTENT_TYPE;
2018+
2019+ case NOTEBOOK_ID:
2020+ return Tomdroid.CONTENT_ITEM_TYPE;
2021+
2022+ case NOTEBOOK_TITLE:
2023+ return Tomdroid.CONTENT_ITEM_TYPE;
2024+
2025+ default:
2026+ throw new IllegalArgumentException("Unknown URI " + uri);
2027+ }
2028+ }
2029+
2030+
2031+ // TODO the following method is probably never called and probably wouldn't work
2032+ @Override
2033+ public Uri insert(Uri uri, ContentValues initialValues) {
2034+ // Validate the requested uri
2035+ if (uriMatcher.match(uri) != NOTEBOOKS) {
2036+ throw new IllegalArgumentException("Unknown URI " + uri);
2037+ }
2038+
2039+ ContentValues values;
2040+ if (initialValues != null) {
2041+ values = new ContentValues(initialValues);
2042+ } else {
2043+ values = new ContentValues();
2044+ }
2045+
2046+
2047+ // TODO does this make sense?
2048+ if (values.containsKey(Notebook.NAME) == false) {
2049+ Resources r = Resources.getSystem();
2050+ values.put(Notebook.NAME, r.getString(android.R.string.untitled));
2051+ }
2052+
2053+ SQLiteDatabase db = dbHelper.getWritableDatabase();
2054+ long rowId = db.insert(DB_TABLE_NOTEBOOKS, Notebook.NAME, values); // not so sure I did the right thing here
2055+ if (rowId > 0) {
2056+ Uri notebookUri = ContentUris.withAppendedId(Tomdroid.CONTENT_URI_NOTEBOOK, rowId);
2057+ getContext().getContentResolver().notifyChange(notebookUri, null);
2058+ return notebookUri;
2059+ }
2060+
2061+ throw new SQLException("Failed to insert row into " + uri);
2062+ }
2063+
2064+ @Override
2065+ public int delete(Uri uri, String where, String[] whereArgs) {
2066+ SQLiteDatabase db = dbHelper.getWritableDatabase();
2067+ int count;
2068+ switch (uriMatcher.match(uri)) {
2069+ case NOTEBOOKS:
2070+ count = db.delete(DB_TABLE_NOTEBOOKS, where, whereArgs);
2071+ break;
2072+
2073+ case NOTEBOOK_ID:
2074+ String notebookId = uri.getPathSegments().get(1);
2075+ count = db.delete(DB_TABLE_NOTEBOOKS, Notebook.ID + "=" + notebookId + (!TextUtils.isEmpty(where) ? " AND (" + where + ')' : ""), whereArgs);
2076+ break;
2077+
2078+ default:
2079+ throw new IllegalArgumentException("Unknown URI " + uri);
2080+ }
2081+
2082+ getContext().getContentResolver().notifyChange(uri, null);
2083+ return count;
2084+ }
2085+
2086+ @Override
2087+ public int update(Uri uri, ContentValues values, String where, String[] whereArgs) {
2088+ SQLiteDatabase db = dbHelper.getWritableDatabase();
2089+ int count;
2090+ switch (uriMatcher.match(uri)) {
2091+ case NOTEBOOKS:
2092+ count = db.update(DB_TABLE_NOTEBOOKS, values, where, whereArgs);
2093+ break;
2094+
2095+ case NOTEBOOK_ID:
2096+ String noteId = uri.getPathSegments().get(1);
2097+ count = db.update(DB_TABLE_NOTEBOOKS, values, Notebook.ID + "=" + noteId + (!TextUtils.isEmpty(where) ? " AND (" + where + ')' : ""), whereArgs);
2098+ break;
2099+
2100+ default:
2101+ throw new IllegalArgumentException("Unknown URI " + uri);
2102+ }
2103+
2104+ getContext().getContentResolver().notifyChange(uri, null);
2105+ return count;
2106+ }
2107+
2108+ static {
2109+ uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
2110+ uriMatcher.addURI(Tomdroid.AUTHORITY_NOTEBOOK, "notebooks", NOTEBOOKS);
2111+ uriMatcher.addURI(Tomdroid.AUTHORITY_NOTEBOOK, "notebooks/#", NOTEBOOK_ID);
2112+ uriMatcher.addURI(Tomdroid.AUTHORITY_NOTEBOOK, "notebooks/*", NOTEBOOK_TITLE);
2113+
2114+ notesProjectionMap = new HashMap<String, String>();
2115+ notesProjectionMap.put(Notebook.ID, Notebook.ID);
2116+ notesProjectionMap.put(Notebook.NAME, Notebook.NAME);
2117+ }
2118+
2119+}
2120
2121=== added file 'src/org/tomdroid/ui/Notebooks.java'
2122--- src/org/tomdroid/ui/Notebooks.java 1970-01-01 00:00:00 +0000
2123+++ src/org/tomdroid/ui/Notebooks.java 2010-11-28 20:59:14 +0000
2124@@ -0,0 +1,94 @@
2125+package org.tomdroid.ui;
2126+
2127+import org.tomdroid.Note;
2128+import org.tomdroid.NoteManager;
2129+import org.tomdroid.Notebook;
2130+import org.tomdroid.R;
2131+import org.tomdroid.sync.SyncManager;
2132+
2133+import android.app.AlertDialog;
2134+import android.app.ListActivity;
2135+import android.content.DialogInterface;
2136+import android.content.Intent;
2137+import android.content.DialogInterface.OnClickListener;
2138+import android.database.Cursor;
2139+import android.net.Uri;
2140+import android.os.Bundle;
2141+import android.util.Log;
2142+import android.view.Menu;
2143+import android.view.MenuItem;
2144+import android.view.View;
2145+import android.widget.ImageView;
2146+import android.widget.ListAdapter;
2147+import android.widget.ListView;
2148+import android.widget.TextView;
2149+import android.widget.Toast;
2150+
2151+public class Notebooks extends ListActivity {
2152+
2153+ // Logging info
2154+ private static final String TAG = "Notebooks";
2155+
2156+ // UI to data model glue
2157+ private TextView listEmptyView;
2158+ private ListAdapter adapter;
2159+
2160+ /** Called when the activity is created. */
2161+ @Override
2162+ public void onCreate(Bundle savedInstanceState) {
2163+ super.onCreate(savedInstanceState);
2164+ setContentView(R.layout.notebooks);
2165+
2166+ // adapter that binds the ListView UI to the notebooks in the note manager
2167+ adapter = NoteManager.getListAdapterNotebook(this);
2168+ setListAdapter(adapter);
2169+
2170+ // all notebooks
2171+ final TextView allNotebooks = (TextView) findViewById(R.id.allNotebooks);
2172+ allNotebooks.setOnClickListener(new View.OnClickListener() {
2173+
2174+ public void onClick(View v) {
2175+ Bundle bundle = new Bundle();
2176+ bundle.putString("notebook", null);
2177+
2178+ Intent i = new Intent(v.getContext(), Tomdroid.class);
2179+ i.putExtras(bundle);
2180+ startActivity(i);
2181+ }
2182+ });
2183+
2184+ }
2185+
2186+ @Override
2187+ public boolean onCreateOptionsMenu(Menu menu) {
2188+ return true;
2189+ }
2190+
2191+ @Override
2192+ public boolean onOptionsItemSelected(MenuItem item) {
2193+ return super.onOptionsItemSelected(item);
2194+ }
2195+
2196+ public void onResume() {
2197+ super.onResume();
2198+ }
2199+
2200+
2201+ @Override
2202+ protected void onListItemClick(ListView l, View v, int position, long id) {
2203+ Log.i(TAG,"onListItemClick");
2204+
2205+ Cursor item = (Cursor) adapter.getItem(position);
2206+ String notebook = item.getString(item.getColumnIndexOrThrow(Notebook.NAME));
2207+
2208+ Bundle bundle = new Bundle();
2209+ bundle.putString("notebook", notebook);
2210+
2211+ Intent i = new Intent(this.getApplicationContext(), Tomdroid.class);
2212+ i.putExtras(bundle);
2213+ startActivity(i);
2214+
2215+ //Intent i = new Intent(Intent.ACTION_VIEW,Tomdroid.CONTENT_URI, this, Tomdroid.class);
2216+ //startActivity(i);
2217+ }
2218+}
2219
2220=== modified file 'src/org/tomdroid/ui/PreferencesActivity.java'
2221--- src/org/tomdroid/ui/PreferencesActivity.java 2010-10-09 19:58:11 +0000
2222+++ src/org/tomdroid/ui/PreferencesActivity.java 2010-11-28 20:59:14 +0000
2223@@ -57,6 +57,7 @@
2224 // TODO: put the various preferences in fields and figure out what to do on activity suspend/resume
2225 private EditTextPreference syncServer = null;
2226 private ListPreference syncService = null;
2227+ private ListPreference defaultSorting = null;
2228
2229 @Override
2230 protected void onCreate(Bundle savedInstanceState) {
2231@@ -67,6 +68,7 @@
2232 // Fill the Preferences fields
2233 syncServer = (EditTextPreference)findPreference(Preferences.Key.SYNC_SERVER.getName());
2234 syncService = (ListPreference)findPreference(Preferences.Key.SYNC_SERVICE.getName());
2235+ //defaultSorting = (ListPreference)findPreference(Preferences.Key.SORT_ORDER.getName());
2236
2237 // Set the default values if nothing exists
2238 this.setDefaults();
2239@@ -188,6 +190,14 @@
2240 syncService.setDefaultValue(defaultService);
2241 if(syncService.getValue() == null)
2242 syncService.setValue(defaultService);
2243+
2244+ /*
2245+ *
2246+ String defaultDefaultSorting = (String)Preferences.Key.SORT_ORDER.getDefault();
2247+ defaultSorting.setDefaultValue(defaultDefaultSorting);
2248+ if(defaultSorting.getValue() == null)
2249+ defaultSorting.setValue(defaultService);
2250+ */
2251
2252 }
2253
2254
2255=== modified file 'src/org/tomdroid/ui/Tomdroid.java'
2256--- src/org/tomdroid/ui/Tomdroid.java 2010-10-09 19:58:11 +0000
2257+++ src/org/tomdroid/ui/Tomdroid.java 2010-11-28 20:59:14 +0000
2258@@ -59,9 +59,9 @@
2259
2260 // Global definition for Tomdroid
2261 public static final String AUTHORITY = "org.tomdroid.notes";
2262- public static final Uri CONTENT_URI = Uri
2263- .parse("content://" + AUTHORITY
2264- + "/notes");
2265+ public static final String AUTHORITY_NOTEBOOK = "org.tomdroid.notebooks";
2266+ public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/notes");
2267+ public static final Uri CONTENT_URI_NOTEBOOK= Uri.parse("content://" + AUTHORITY_NOTEBOOK + "/notebooks");
2268 public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.tomdroid.note";
2269 public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.tomdroid.note";
2270 public static final String PROJECT_HOMEPAGE = "http://www.launchpad.net/tomdroid/";
2271@@ -81,6 +81,8 @@
2272 // UI to data model glue
2273 private TextView listEmptyView;
2274 private ListAdapter adapter;
2275+ private int currentSort;
2276+ private String currentNotebook;
2277
2278 // UI feedback handler
2279 private Handler syncMessageHandler = new SyncMessageHandler(this);
2280@@ -111,7 +113,22 @@
2281 }
2282
2283 // adapter that binds the ListView UI to the notes in the note manager
2284- adapter = NoteManager.getListAdapter(this);
2285+ currentSort = NoteManager.SORT_BY_DATE;
2286+ Log.i(TAG,"currentSort OK : " + currentSort);
2287+ Bundle bundle = this.getIntent().getExtras();
2288+ Log.i(TAG,"bundle OK");
2289+ try {
2290+ currentNotebook = bundle.getString("notebook");
2291+ } catch (Exception e) {
2292+ // TODO: handle exception
2293+ Log.i(TAG,"erreur dans bundle.getString(notebook)");
2294+ currentNotebook = null;
2295+ }
2296+
2297+ //currentNotebook = savedInstanceState.getString("notebook");
2298+ Log.i(TAG,"currentNotebook OK : " + currentNotebook);
2299+ adapter = NoteManager.getListAdapter(this,currentSort,currentNotebook);
2300+ Log.i(TAG,"adapter OK");
2301 setListAdapter(adapter);
2302
2303 // set the view shown when the list is empty
2304@@ -140,6 +157,14 @@
2305 case R.id.menuPrefs:
2306 startActivity(new Intent(this, PreferencesActivity.class));
2307 return true;
2308+
2309+ case R.id.menuSort:
2310+ changeSort();
2311+ return true;
2312+
2313+ case R.id.menuFilterNotebook:
2314+ startActivity(new Intent(this, Notebooks.class));
2315+ return true;
2316 }
2317
2318 return super.onOptionsItemSelected(item);
2319@@ -220,5 +245,21 @@
2320 Intent i = new Intent(Intent.ACTION_VIEW, intentUri, this, ViewNote.class);
2321 startActivity(i);
2322 }
2323+
2324+ private void changeSort(){
2325+ if (currentSort==NoteManager.SORT_BY_DATE){
2326+ currentSort=NoteManager.SORT_BY_NAME;
2327+ } else {
2328+ currentSort=NoteManager.SORT_BY_DATE;
2329+ }
2330+ adapter = NoteManager.getListAdapter(this,currentSort,currentNotebook);
2331+ setListAdapter(adapter);
2332+
2333+ // set the view shown when the list is empty
2334+ // TODO default empty-list text is butt-ugly!
2335+ listEmptyView = (TextView) findViewById(R.id.list_empty);
2336+ getListView().setEmptyView(listEmptyView);
2337+ }
2338+
2339
2340 }
2341
2342=== modified file 'tests/org/tomdroid/NoteManagerTest.java'
2343--- tests/org/tomdroid/NoteManagerTest.java 2010-09-17 21:11:04 +0000
2344+++ tests/org/tomdroid/NoteManagerTest.java 2010-11-28 20:59:14 +0000
2345@@ -22,11 +22,11 @@
2346 putNotes(activity);
2347 Cursor cursor;
2348 // Get all notes excluding the notebook template ones.
2349- cursor = NoteManager.getAllNotes(activity, false);
2350+ cursor = NoteManager.getAllNotes(activity, false,NoteManager.SORT_BY_NAME,null);
2351 assertEquals(1, cursor.getCount());
2352
2353 // Get all notes, including notebook templates this time.
2354- cursor = NoteManager.getAllNotes(activity, true);
2355+ cursor = NoteManager.getAllNotes(activity, true,NoteManager.SORT_BY_NAME,null);
2356 assertEquals(2, cursor.getCount());
2357 }
2358

Subscribers

People subscribed via source and target branches