Files

Merge lp:~codygarver/pantheon-files/fix-1021550 into lp:~elementary-apps/pantheon-files/trunk

  1. fix-1021550
  2. Merge into trunk
Proposed by Cody Garver
Status: Merged
Merged at revision: 889
Proposed branch: lp:~codygarver/pantheon-files/fix-1021550
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 445 lines (+6/-400)
5 files modified
icons/CMakeLists.txt (+1/-1)
icons/view-list-compact-symbolic.svg (+0/-151)
icons/view-list-details-symbolic.svg (+0/-84)
icons/view-list-icons-symbolic.svg (+0/-159)
src/View/Chrome/ViewSwicher.vala (+5/-5)
To merge this branch: bzr merge lp:~codygarver/pantheon-files/fix-1021550
Reviewer Review Type Date Requested Status
Danielle Foré Approve
Review via email: mp+114060@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) wrote :

I submitted this upstream to Marlin but it was rejected.

"Sorry i don't see any reason to change. This term is widespread and used for decades across any file managers. The name of the views focus on the main content or the main characteristic of the view. Which is view of icons in the case of the "icon view" term. If i follow your logic list view should be renamed as treeview and so on ;)

Is this a Not Invented Here syndrome?"

Revision history for this message
Cassidy James Blaede (cassidyjames) wrote :

Wow awesome. Apparently someone didn't read the bug report. :P

In order to increase compatability with other icons sets, and for saner
> naming...

Oh well, his loss I suppose. elementary icons will be more compatible with
more apps, and Files will be more compatible with more icon sets.

On Mon, Jul 9, 2012 at 5:24 PM, Cody Garver <email address hidden> wrote:

> I submitted this upstream to Marlin but it was rejected.
>
> "Sorry i don't see any reason to change. This term is widespread and used
> for decades across any file managers. The name of the views focus on the
> main content or the main characteristic of the view. Which is view of icons
> in the case of the "icon view" term. If i follow your logic list view
> should be renamed as treeview and so on ;)
>
> Is this a Not Invented Here syndrome?"
> --
>
> https://code.launchpad.net/~codygarver/pantheon-files/fix-1021550/+merge/114060
> Your team elementary Apps team is requested to review the proposed merge
> of lp:~codygarver/pantheon-files/fix-1021550 into lp:pantheon-files.
>

Revision history for this message
Danielle Foré (danrabbit) wrote :

Hey Cody, We probably don't need to ship view-grid and view-list because they already ship with GNOME and elementary.

But, where you have "view-details" it should be "view-list"

Also, it looks like we dropped compact view? So you shouldn't have to ship that icon either.

Don't know if you want to roll it into this merge or do that separately, but the one name "view-details" does need to be "view-list"

review: Needs Fixing
Revision history for this message
Danielle Foré (danrabbit) :
review: Approve
Revision history for this message
xapantu (xapantu) wrote :
Download full text (3.5 KiB)

With ubuntu-mono-dark as icon-theme:
(gdb) r
Starting program: /home/xapantu/Dev/elementary/pantheon-files/build/src/pantheon-files
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
[New Thread 0x7fffed7c3700 (LWP 18455)]
[New Thread 0x7fffe7fff700 (LWP 18456)]
[_LOG_LEVEL_INFO 22:15:26.243654] Welcome to Pantheon Files
[_LOG_LEVEL_INFO 22:15:26.243706] Version: 0.1
[_LOG_LEVEL_INFO 22:15:26.243842] Report any issues/bugs you might find to http://bugs.launchpad.net/pantheon-files
[New Thread 0x7fffe5709700 (LWP 18457)]
[New Thread 0x7fffe4f08700 (LWP 18458)]

Program received signal SIGSEGV, Segmentation fault.
gtk_icon_info_load_symbolic_for_context (icon_info=0x0, context=0x9a6630, was_symbolic=0x0, error=0x7fffffffd678) at /build/buildd/gtk+3.0-3.4.2/./gtk/gtkicontheme.c:3347
3347 /build/buildd/gtk+3.0-3.4.2/./gtk/gtkicontheme.c: Aucun fichier ou dossier de ce type.
(gdb) bt
#0 gtk_icon_info_load_symbolic_for_context (icon_info=0x0, context=0x9a6630, was_symbolic=0x0, error=0x7fffffffd678) at /build/buildd/gtk+3.0-3.4.2/./gtk/gtkicontheme.c:3347
#1 0x000000000047b8d1 in varka_icon_factory_load_symbolic_icon (self=<optimized out>, style=0x9a6630, iconname=<optimized out>, size=16) at /home/xapantu/Dev/elementary/pantheon-files/build/src/View/Chrome/IconFactory.c:150
#2 0x000000000047a7ff in marlin_view_chrome_view_switcher_construct (object_type=<optimized out>, action_group=<optimized out>) at /home/xapantu/Dev/elementary/pantheon-files/build/src/View/Chrome/ViewSwicher.c:282
#3 0x0000000000479e29 in marlin_view_chrome_top_menu_setup_items (self=0x99d000) at /home/xapantu/Dev/elementary/pantheon-files/build/src/View/Chrome/TopMenu.c:568
#4 0x000000000047a1af in marlin_view_chrome_top_menu_construct (object_type=<optimized out>, window=<optimized out>) at /home/xapantu/Dev/elementary/pantheon-files/build/src/View/Chrome/TopMenu.c:273
#5 0x0000000000467af5 in marlin_view_window_construct (object_type=<optimized out>, app=0x6be100, myscreen=<optimized out>) at /home/xapantu/Dev/elementary/pantheon-files/build/src/View/Window.c:1012
#6 0x000000000042f9d6 in open_window (application=0x6be100, location=0x83b500, screen=<optimized out>) at /home/xapantu/Dev/elementary/pantheon-files/src/marlin-application.c:77
#7 0x00000000004306de in open_windows (screen=0x71c080, n_files=0, files=0x0, application=0x6be100) at /home/xapantu/Dev/elementary/pantheon-files/src/marlin-application.c:93
#8 marlin_application_open_location (n_files=0, files=0x0, app=<optimized out>) at /home/xapantu/Dev/elementary/pantheon-files/src/marlin-application.c:397
#9 marlin_application_cmd (app=<optimized out>, cmd=<optimized out>) at /home/xapantu/Dev/elementary/pantheon-files/src/marlin-application.c:492
#10 0x00007ffff0c07a14 in ffi_call_unix64 () from /usr/lib/x86_64-linux-gnu/libffi.so.6
#11 0x00007ffff0c07435 in ffi_call () from /usr/lib/x86_64-linux-gnu/libffi.so.6
#12 0x00007ffff4f64b16 in g_cclosure_marshal_generic_va () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#13 0x00007ffff4f63eca in ?? () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#14 0x00007ffff4f7c741 in g_signal...

Read more...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'icons/CMakeLists.txt'
2--- icons/CMakeLists.txt 2012-05-31 17:19:38 +0000
3+++ icons/CMakeLists.txt 2012-07-14 12:52:21 +0000
4@@ -1,5 +1,5 @@
5 install(FILES thumbnail_frame.png DESTINATION share/pixmaps/marlin/)
6-install(FILES marlin.svg view-list-column-symbolic.svg view-list-compact-symbolic.svg view-list-details-symbolic.svg view-list-icons-symbolic.svg DESTINATION share/icons/hicolor/scalable/apps/)
7+install(FILES marlin.svg view-column-symbolic.svg DESTINATION share/icons/hicolor/scalable/apps/)
8
9 option (ICON_UPDATE "Run gtk-update-icon-cache after the install." ON)
10 if (ICON_UPDATE)
11
12=== renamed file 'icons/view-list-column-symbolic.svg' => 'icons/view-column-symbolic.svg'
13=== removed file 'icons/view-list-compact-symbolic.svg'
14--- icons/view-list-compact-symbolic.svg 2010-11-13 23:10:54 +0000
15+++ icons/view-list-compact-symbolic.svg 1970-01-01 00:00:00 +0000
16@@ -1,151 +0,0 @@
17-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
18-<!-- Created with Inkscape (http://www.inkscape.org/) -->
19-
20-<svg
21- xmlns:dc="http://purl.org/dc/elements/1.1/"
22- xmlns:cc="http://creativecommons.org/ns#"
23- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
24- xmlns:svg="http://www.w3.org/2000/svg"
25- xmlns="http://www.w3.org/2000/svg"
26- xmlns:xlink="http://www.w3.org/1999/xlink"
27- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
28- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
29- version="1.0"
30- width="16"
31- height="16"
32- id="svg3196"
33- inkscape:version="0.47 r22583"
34- sodipodi:docname="view-list-compact-symbolic.svg">
35- <metadata
36- id="metadata21">
37- <rdf:RDF>
38- <cc:Work
39- rdf:about="">
40- <dc:format>image/svg+xml</dc:format>
41- <dc:type
42- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
43- <dc:title></dc:title>
44- </cc:Work>
45- </rdf:RDF>
46- </metadata>
47- <sodipodi:namedview
48- pagecolor="#ffffff"
49- bordercolor="#666666"
50- borderopacity="1"
51- objecttolerance="10"
52- gridtolerance="10"
53- guidetolerance="10"
54- inkscape:pageopacity="0"
55- inkscape:pageshadow="2"
56- inkscape:window-width="839"
57- inkscape:window-height="562"
58- id="namedview19"
59- showgrid="false"
60- inkscape:zoom="9.8333333"
61- inkscape:cx="12"
62- inkscape:cy="11.79661"
63- inkscape:window-x="263"
64- inkscape:window-y="120"
65- inkscape:window-maximized="0"
66- inkscape:current-layer="svg3196" />
67- <defs
68- id="defs3198">
69- <linearGradient
70- id="linearGradient3587-6-5">
71- <stop
72- id="stop3589-9-2"
73- style="stop-color:#000000;stop-opacity:1"
74- offset="0" />
75- <stop
76- id="stop3591-7-4"
77- style="stop-color:#363636;stop-opacity:1"
78- offset="1" />
79- </linearGradient>
80- <linearGradient
81- x1="1.3333321"
82- y1="6.6666665"
83- x2="1.3333321"
84- y2="33.333332"
85- id="linearGradient2422"
86- xlink:href="#linearGradient3587-6-5"
87- gradientUnits="userSpaceOnUse"
88- gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
89- <linearGradient
90- x1="11"
91- y1="6"
92- x2="11"
93- y2="17"
94- id="linearGradient2427"
95- xlink:href="#linearGradient3587-6-5"
96- gradientUnits="userSpaceOnUse"
97- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
98- <linearGradient
99- x1="11"
100- y1="6"
101- x2="11"
102- y2="17"
103- id="linearGradient2436"
104- xlink:href="#linearGradient3587-6-5"
105- gradientUnits="userSpaceOnUse"
106- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
107- <linearGradient
108- x1="11"
109- y1="6"
110- x2="11"
111- y2="17"
112- id="linearGradient2442"
113- xlink:href="#linearGradient3587-6-5"
114- gradientUnits="userSpaceOnUse"
115- gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
116- </defs>
117- <path
118- d="m 6,8.5 8,0 m -8,-4 8,0 m -8,8 8,0"
119- id="path2407"
120- style="opacity:0.7;fill:none;stroke:url(#linearGradient2422);stroke-width:0.99999994;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
121- <rect
122- width="3"
123- height="3"
124- x="2"
125- y="4"
126- id="rect2415"
127- style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
128- <rect
129- width="3"
130- height="3"
131- x="2"
132- y="3"
133- id="rect3728"
134- style="opacity:0.7;fill:url(#linearGradient2427);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
135- <rect
136- width="3"
137- height="3"
138- x="2"
139- y="12"
140- id="rect2432"
141- style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
142- <rect
143- width="3"
144- height="3"
145- x="2"
146- y="11"
147- id="rect2434"
148- style="opacity:0.7;fill:url(#linearGradient2436);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
149- <rect
150- width="3"
151- height="3"
152- x="2"
153- y="8"
154- id="rect2438"
155- style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
156- <rect
157- width="3"
158- height="3"
159- x="2"
160- y="7"
161- id="rect2440"
162- style="opacity:0.7;fill:url(#linearGradient2442);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
163- <path
164- d="m 6,9.5 8,0 m -8,-4 8,0 m -8,8 8,0"
165- id="path2444"
166- style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
167-</svg>
168
169=== removed file 'icons/view-list-details-symbolic.svg'
170--- icons/view-list-details-symbolic.svg 2010-11-13 23:10:54 +0000
171+++ icons/view-list-details-symbolic.svg 1970-01-01 00:00:00 +0000
172@@ -1,84 +0,0 @@
173-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
174-<!-- Created with Inkscape (http://www.inkscape.org/) -->
175-
176-<svg
177- xmlns:dc="http://purl.org/dc/elements/1.1/"
178- xmlns:cc="http://creativecommons.org/ns#"
179- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
180- xmlns:svg="http://www.w3.org/2000/svg"
181- xmlns="http://www.w3.org/2000/svg"
182- xmlns:xlink="http://www.w3.org/1999/xlink"
183- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
184- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
185- version="1.0"
186- width="16"
187- height="16"
188- id="svg3196"
189- sodipodi:version="0.32"
190- inkscape:version="0.47 r22583"
191- sodipodi:docname="view-list-details-symbolic.svg"
192- inkscape:output_extension="org.inkscape.output.svg.inkscape">
193- <metadata
194- id="metadata11">
195- <rdf:RDF>
196- <cc:Work
197- rdf:about="">
198- <dc:format>image/svg+xml</dc:format>
199- <dc:type
200- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
201- <dc:title></dc:title>
202- </cc:Work>
203- </rdf:RDF>
204- </metadata>
205- <sodipodi:namedview
206- inkscape:window-height="706"
207- inkscape:window-width="640"
208- inkscape:pageshadow="2"
209- inkscape:pageopacity="0.0"
210- guidetolerance="10.0"
211- gridtolerance="10.0"
212- objecttolerance="10.0"
213- borderopacity="1.0"
214- bordercolor="#666666"
215- pagecolor="#ffffff"
216- id="base"
217- showgrid="false"
218- inkscape:zoom="7.3362329"
219- inkscape:cx="12"
220- inkscape:cy="11.903614"
221- inkscape:window-x="399"
222- inkscape:window-y="49"
223- inkscape:current-layer="svg3196"
224- inkscape:window-maximized="0" />
225- <defs
226- id="defs3198">
227- <linearGradient
228- id="linearGradient3587-6-5">
229- <stop
230- id="stop3589-9-2"
231- style="stop-color:#000000;stop-opacity:1"
232- offset="0" />
233- <stop
234- id="stop3591-7-4"
235- style="stop-color:#363636;stop-opacity:1"
236- offset="1" />
237- </linearGradient>
238- <linearGradient
239- x1="1.3333321"
240- y1="6.6666665"
241- x2="1.3333321"
242- y2="33.333332"
243- id="linearGradient2422"
244- xlink:href="#linearGradient3587-6-5"
245- gradientUnits="userSpaceOnUse"
246- gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
247- </defs>
248- <path
249- d="m 2,6.5 12,0 m -12,-3 12,0 m -12,9 12,0 m -12,-3 12,0"
250- id="path2407"
251- style="opacity:0.7;fill:none;stroke:url(#linearGradient2422);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
252- <path
253- d="m 2,7.5 12,0 m -12,-3 12,0 m -12,9 12,0 m -12,-3 12,0"
254- id="path2424"
255- style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
256-</svg>
257
258=== removed file 'icons/view-list-icons-symbolic.svg'
259--- icons/view-list-icons-symbolic.svg 2010-11-13 23:10:54 +0000
260+++ icons/view-list-icons-symbolic.svg 1970-01-01 00:00:00 +0000
261@@ -1,159 +0,0 @@
262-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
263-<!-- Created with Inkscape (http://www.inkscape.org/) -->
264-
265-<svg
266- xmlns:dc="http://purl.org/dc/elements/1.1/"
267- xmlns:cc="http://creativecommons.org/ns#"
268- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
269- xmlns:svg="http://www.w3.org/2000/svg"
270- xmlns="http://www.w3.org/2000/svg"
271- xmlns:xlink="http://www.w3.org/1999/xlink"
272- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
273- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
274- version="1.0"
275- width="16"
276- height="16"
277- id="svg3196"
278- sodipodi:version="0.32"
279- inkscape:version="0.47 r22583"
280- sodipodi:docname="view-list-icons-symbolic.svg"
281- inkscape:output_extension="org.inkscape.output.svg.inkscape">
282- <metadata
283- id="metadata20">
284- <rdf:RDF>
285- <cc:Work
286- rdf:about="">
287- <dc:format>image/svg+xml</dc:format>
288- <dc:type
289- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
290- <dc:title></dc:title>
291- </cc:Work>
292- </rdf:RDF>
293- </metadata>
294- <sodipodi:namedview
295- inkscape:window-height="706"
296- inkscape:window-width="640"
297- inkscape:pageshadow="2"
298- inkscape:pageopacity="0.0"
299- guidetolerance="10.0"
300- gridtolerance="10.0"
301- objecttolerance="10.0"
302- borderopacity="1.0"
303- bordercolor="#666666"
304- pagecolor="#ffffff"
305- id="base"
306- showgrid="false"
307- inkscape:zoom="7.3362329"
308- inkscape:cx="12"
309- inkscape:cy="11.903614"
310- inkscape:window-x="399"
311- inkscape:window-y="49"
312- inkscape:current-layer="svg3196"
313- inkscape:window-maximized="0" />
314- <defs
315- id="defs3198">
316- <linearGradient
317- id="linearGradient3587-6-5">
318- <stop
319- id="stop3589-9-2"
320- style="stop-color:#000000;stop-opacity:1"
321- offset="0" />
322- <stop
323- id="stop3591-7-4"
324- style="stop-color:#363636;stop-opacity:1"
325- offset="1" />
326- </linearGradient>
327- <linearGradient
328- x1="26.045763"
329- y1="9.6223383"
330- x2="26.045763"
331- y2="19.490837"
332- id="linearGradient3189"
333- xlink:href="#linearGradient3587-6-5"
334- gradientUnits="userSpaceOnUse"
335- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
336- <linearGradient
337- x1="26.045763"
338- y1="9.6223383"
339- x2="26.045763"
340- y2="19.490837"
341- id="linearGradient3203"
342- xlink:href="#linearGradient3587-6-5"
343- gradientUnits="userSpaceOnUse"
344- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
345- <linearGradient
346- x1="26.045763"
347- y1="9.6223383"
348- x2="26.045763"
349- y2="19.490837"
350- id="linearGradient3207"
351- xlink:href="#linearGradient3587-6-5"
352- gradientUnits="userSpaceOnUse"
353- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
354- <linearGradient
355- x1="26.045763"
356- y1="9.6223383"
357- x2="26.045763"
358- y2="19.490837"
359- id="linearGradient3211"
360- xlink:href="#linearGradient3587-6-5"
361- gradientUnits="userSpaceOnUse"
362- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
363- </defs>
364- <rect
365- width="3"
366- height="3"
367- x="10.5"
368- y="4.5"
369- id="rect3213"
370- style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
371- <rect
372- width="3"
373- height="3"
374- x="2.5"
375- y="4.5"
376- id="rect3215"
377- style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
378- <rect
379- width="3"
380- height="3"
381- x="10.5"
382- y="11.5"
383- id="rect3217"
384- style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
385- <rect
386- width="3"
387- height="3"
388- x="2.5"
389- y="11.5"
390- id="rect3219"
391- style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
392- <rect
393- width="3"
394- height="3"
395- x="10.5"
396- y="3.5"
397- id="rect3187"
398- style="opacity:0.7;fill:none;stroke:url(#linearGradient3189);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
399- <rect
400- width="3"
401- height="3"
402- x="2.5"
403- y="3.5"
404- id="rect3201"
405- style="opacity:0.7;fill:none;stroke:url(#linearGradient3203);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
406- <rect
407- width="3"
408- height="3"
409- x="10.5"
410- y="10.5"
411- id="rect3205"
412- style="opacity:0.7;fill:none;stroke:url(#linearGradient3207);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
413- <rect
414- width="3"
415- height="3"
416- x="2.5"
417- y="10.5"
418- id="rect3209"
419- style="opacity:0.7;fill:none;stroke:url(#linearGradient3211);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
420-</svg>
421
422=== modified file 'src/View/Chrome/ViewSwicher.vala'
423--- src/View/Chrome/ViewSwicher.vala 2012-06-30 03:53:07 +0000
424+++ src/View/Chrome/ViewSwicher.vala 2012-07-14 12:52:21 +0000
425@@ -82,16 +82,16 @@
426 Varka.IconFactory icon_factory = Varka.IconFactory.get_default ();
427 Gtk.StyleContext style = get_style_context ();
428
429- icon = new Image.from_pixbuf (icon_factory.load_symbolic_icon (style, "view-list-icons-symbolic", 16));
430- icon.set_tooltip_text (_("View as icons"));
431+ icon = new Image.from_pixbuf (icon_factory.load_symbolic_icon (style, "view-grid-symbolic", 16));
432+ icon.set_tooltip_text (_("View as grid"));
433 switcher.append(icon);
434- list = new Image.from_pixbuf (icon_factory.load_symbolic_icon (style, "view-list-details-symbolic", 16));
435+ list = new Image.from_pixbuf (icon_factory.load_symbolic_icon (style, "view-list-symbolic", 16));
436 list.set_tooltip_text (_("View as list"));
437 switcher.append(list);
438- compact = new Image.from_pixbuf (icon_factory.load_symbolic_icon (style, "view-list-compact-symbolic", 16));
439+ compact = new Image.from_pixbuf (icon_factory.load_symbolic_icon (style, "view-compact-symbolic", 16));
440 compact.set_tooltip_text (_("View as compact list"));
441 //switcher.append(compact);
442- miller = new Image.from_pixbuf (icon_factory.load_symbolic_icon (style, "view-list-column-symbolic", 16));
443+ miller = new Image.from_pixbuf (icon_factory.load_symbolic_icon (style, "view-column-symbolic", 16));
444 miller.set_tooltip_text(_("View as column"));
445 switcher.append(miller);
446

Subscribers

People subscribed via source and target branches

to all changes: