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
=== modified file 'icons/CMakeLists.txt'
--- icons/CMakeLists.txt 2012-05-31 17:19:38 +0000
+++ icons/CMakeLists.txt 2012-07-14 12:52:21 +0000
@@ -1,5 +1,5 @@
1install(FILES thumbnail_frame.png DESTINATION share/pixmaps/marlin/)1install(FILES thumbnail_frame.png DESTINATION share/pixmaps/marlin/)
2install(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/)2install(FILES marlin.svg view-column-symbolic.svg DESTINATION share/icons/hicolor/scalable/apps/)
33
4option (ICON_UPDATE "Run gtk-update-icon-cache after the install." ON)4option (ICON_UPDATE "Run gtk-update-icon-cache after the install." ON)
5if (ICON_UPDATE)5if (ICON_UPDATE)
66
=== renamed file 'icons/view-list-column-symbolic.svg' => 'icons/view-column-symbolic.svg'
=== removed file 'icons/view-list-compact-symbolic.svg'
--- icons/view-list-compact-symbolic.svg 2010-11-13 23:10:54 +0000
+++ icons/view-list-compact-symbolic.svg 1970-01-01 00:00:00 +0000
@@ -1,151 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:dc="http://purl.org/dc/elements/1.1/"
6 xmlns:cc="http://creativecommons.org/ns#"
7 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8 xmlns:svg="http://www.w3.org/2000/svg"
9 xmlns="http://www.w3.org/2000/svg"
10 xmlns:xlink="http://www.w3.org/1999/xlink"
11 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
12 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
13 version="1.0"
14 width="16"
15 height="16"
16 id="svg3196"
17 inkscape:version="0.47 r22583"
18 sodipodi:docname="view-list-compact-symbolic.svg">
19 <metadata
20 id="metadata21">
21 <rdf:RDF>
22 <cc:Work
23 rdf:about="">
24 <dc:format>image/svg+xml</dc:format>
25 <dc:type
26 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
27 <dc:title></dc:title>
28 </cc:Work>
29 </rdf:RDF>
30 </metadata>
31 <sodipodi:namedview
32 pagecolor="#ffffff"
33 bordercolor="#666666"
34 borderopacity="1"
35 objecttolerance="10"
36 gridtolerance="10"
37 guidetolerance="10"
38 inkscape:pageopacity="0"
39 inkscape:pageshadow="2"
40 inkscape:window-width="839"
41 inkscape:window-height="562"
42 id="namedview19"
43 showgrid="false"
44 inkscape:zoom="9.8333333"
45 inkscape:cx="12"
46 inkscape:cy="11.79661"
47 inkscape:window-x="263"
48 inkscape:window-y="120"
49 inkscape:window-maximized="0"
50 inkscape:current-layer="svg3196" />
51 <defs
52 id="defs3198">
53 <linearGradient
54 id="linearGradient3587-6-5">
55 <stop
56 id="stop3589-9-2"
57 style="stop-color:#000000;stop-opacity:1"
58 offset="0" />
59 <stop
60 id="stop3591-7-4"
61 style="stop-color:#363636;stop-opacity:1"
62 offset="1" />
63 </linearGradient>
64 <linearGradient
65 x1="1.3333321"
66 y1="6.6666665"
67 x2="1.3333321"
68 y2="33.333332"
69 id="linearGradient2422"
70 xlink:href="#linearGradient3587-6-5"
71 gradientUnits="userSpaceOnUse"
72 gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
73 <linearGradient
74 x1="11"
75 y1="6"
76 x2="11"
77 y2="17"
78 id="linearGradient2427"
79 xlink:href="#linearGradient3587-6-5"
80 gradientUnits="userSpaceOnUse"
81 gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
82 <linearGradient
83 x1="11"
84 y1="6"
85 x2="11"
86 y2="17"
87 id="linearGradient2436"
88 xlink:href="#linearGradient3587-6-5"
89 gradientUnits="userSpaceOnUse"
90 gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
91 <linearGradient
92 x1="11"
93 y1="6"
94 x2="11"
95 y2="17"
96 id="linearGradient2442"
97 xlink:href="#linearGradient3587-6-5"
98 gradientUnits="userSpaceOnUse"
99 gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
100 </defs>
101 <path
102 d="m 6,8.5 8,0 m -8,-4 8,0 m -8,8 8,0"
103 id="path2407"
104 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" />
105 <rect
106 width="3"
107 height="3"
108 x="2"
109 y="4"
110 id="rect2415"
111 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" />
112 <rect
113 width="3"
114 height="3"
115 x="2"
116 y="3"
117 id="rect3728"
118 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" />
119 <rect
120 width="3"
121 height="3"
122 x="2"
123 y="12"
124 id="rect2432"
125 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" />
126 <rect
127 width="3"
128 height="3"
129 x="2"
130 y="11"
131 id="rect2434"
132 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" />
133 <rect
134 width="3"
135 height="3"
136 x="2"
137 y="8"
138 id="rect2438"
139 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" />
140 <rect
141 width="3"
142 height="3"
143 x="2"
144 y="7"
145 id="rect2440"
146 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" />
147 <path
148 d="m 6,9.5 8,0 m -8,-4 8,0 m -8,8 8,0"
149 id="path2444"
150 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" />
151</svg>
1520
=== removed file 'icons/view-list-details-symbolic.svg'
--- icons/view-list-details-symbolic.svg 2010-11-13 23:10:54 +0000
+++ icons/view-list-details-symbolic.svg 1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:dc="http://purl.org/dc/elements/1.1/"
6 xmlns:cc="http://creativecommons.org/ns#"
7 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8 xmlns:svg="http://www.w3.org/2000/svg"
9 xmlns="http://www.w3.org/2000/svg"
10 xmlns:xlink="http://www.w3.org/1999/xlink"
11 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
12 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
13 version="1.0"
14 width="16"
15 height="16"
16 id="svg3196"
17 sodipodi:version="0.32"
18 inkscape:version="0.47 r22583"
19 sodipodi:docname="view-list-details-symbolic.svg"
20 inkscape:output_extension="org.inkscape.output.svg.inkscape">
21 <metadata
22 id="metadata11">
23 <rdf:RDF>
24 <cc:Work
25 rdf:about="">
26 <dc:format>image/svg+xml</dc:format>
27 <dc:type
28 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
29 <dc:title></dc:title>
30 </cc:Work>
31 </rdf:RDF>
32 </metadata>
33 <sodipodi:namedview
34 inkscape:window-height="706"
35 inkscape:window-width="640"
36 inkscape:pageshadow="2"
37 inkscape:pageopacity="0.0"
38 guidetolerance="10.0"
39 gridtolerance="10.0"
40 objecttolerance="10.0"
41 borderopacity="1.0"
42 bordercolor="#666666"
43 pagecolor="#ffffff"
44 id="base"
45 showgrid="false"
46 inkscape:zoom="7.3362329"
47 inkscape:cx="12"
48 inkscape:cy="11.903614"
49 inkscape:window-x="399"
50 inkscape:window-y="49"
51 inkscape:current-layer="svg3196"
52 inkscape:window-maximized="0" />
53 <defs
54 id="defs3198">
55 <linearGradient
56 id="linearGradient3587-6-5">
57 <stop
58 id="stop3589-9-2"
59 style="stop-color:#000000;stop-opacity:1"
60 offset="0" />
61 <stop
62 id="stop3591-7-4"
63 style="stop-color:#363636;stop-opacity:1"
64 offset="1" />
65 </linearGradient>
66 <linearGradient
67 x1="1.3333321"
68 y1="6.6666665"
69 x2="1.3333321"
70 y2="33.333332"
71 id="linearGradient2422"
72 xlink:href="#linearGradient3587-6-5"
73 gradientUnits="userSpaceOnUse"
74 gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
75 </defs>
76 <path
77 d="m 2,6.5 12,0 m -12,-3 12,0 m -12,9 12,0 m -12,-3 12,0"
78 id="path2407"
79 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" />
80 <path
81 d="m 2,7.5 12,0 m -12,-3 12,0 m -12,9 12,0 m -12,-3 12,0"
82 id="path2424"
83 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" />
84</svg>
850
=== removed file 'icons/view-list-icons-symbolic.svg'
--- icons/view-list-icons-symbolic.svg 2010-11-13 23:10:54 +0000
+++ icons/view-list-icons-symbolic.svg 1970-01-01 00:00:00 +0000
@@ -1,159 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:dc="http://purl.org/dc/elements/1.1/"
6 xmlns:cc="http://creativecommons.org/ns#"
7 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8 xmlns:svg="http://www.w3.org/2000/svg"
9 xmlns="http://www.w3.org/2000/svg"
10 xmlns:xlink="http://www.w3.org/1999/xlink"
11 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
12 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
13 version="1.0"
14 width="16"
15 height="16"
16 id="svg3196"
17 sodipodi:version="0.32"
18 inkscape:version="0.47 r22583"
19 sodipodi:docname="view-list-icons-symbolic.svg"
20 inkscape:output_extension="org.inkscape.output.svg.inkscape">
21 <metadata
22 id="metadata20">
23 <rdf:RDF>
24 <cc:Work
25 rdf:about="">
26 <dc:format>image/svg+xml</dc:format>
27 <dc:type
28 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
29 <dc:title></dc:title>
30 </cc:Work>
31 </rdf:RDF>
32 </metadata>
33 <sodipodi:namedview
34 inkscape:window-height="706"
35 inkscape:window-width="640"
36 inkscape:pageshadow="2"
37 inkscape:pageopacity="0.0"
38 guidetolerance="10.0"
39 gridtolerance="10.0"
40 objecttolerance="10.0"
41 borderopacity="1.0"
42 bordercolor="#666666"
43 pagecolor="#ffffff"
44 id="base"
45 showgrid="false"
46 inkscape:zoom="7.3362329"
47 inkscape:cx="12"
48 inkscape:cy="11.903614"
49 inkscape:window-x="399"
50 inkscape:window-y="49"
51 inkscape:current-layer="svg3196"
52 inkscape:window-maximized="0" />
53 <defs
54 id="defs3198">
55 <linearGradient
56 id="linearGradient3587-6-5">
57 <stop
58 id="stop3589-9-2"
59 style="stop-color:#000000;stop-opacity:1"
60 offset="0" />
61 <stop
62 id="stop3591-7-4"
63 style="stop-color:#363636;stop-opacity:1"
64 offset="1" />
65 </linearGradient>
66 <linearGradient
67 x1="26.045763"
68 y1="9.6223383"
69 x2="26.045763"
70 y2="19.490837"
71 id="linearGradient3189"
72 xlink:href="#linearGradient3587-6-5"
73 gradientUnits="userSpaceOnUse"
74 gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
75 <linearGradient
76 x1="26.045763"
77 y1="9.6223383"
78 x2="26.045763"
79 y2="19.490837"
80 id="linearGradient3203"
81 xlink:href="#linearGradient3587-6-5"
82 gradientUnits="userSpaceOnUse"
83 gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
84 <linearGradient
85 x1="26.045763"
86 y1="9.6223383"
87 x2="26.045763"
88 y2="19.490837"
89 id="linearGradient3207"
90 xlink:href="#linearGradient3587-6-5"
91 gradientUnits="userSpaceOnUse"
92 gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
93 <linearGradient
94 x1="26.045763"
95 y1="9.6223383"
96 x2="26.045763"
97 y2="19.490837"
98 id="linearGradient3211"
99 xlink:href="#linearGradient3587-6-5"
100 gradientUnits="userSpaceOnUse"
101 gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
102 </defs>
103 <rect
104 width="3"
105 height="3"
106 x="10.5"
107 y="4.5"
108 id="rect3213"
109 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" />
110 <rect
111 width="3"
112 height="3"
113 x="2.5"
114 y="4.5"
115 id="rect3215"
116 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" />
117 <rect
118 width="3"
119 height="3"
120 x="10.5"
121 y="11.5"
122 id="rect3217"
123 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" />
124 <rect
125 width="3"
126 height="3"
127 x="2.5"
128 y="11.5"
129 id="rect3219"
130 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" />
131 <rect
132 width="3"
133 height="3"
134 x="10.5"
135 y="3.5"
136 id="rect3187"
137 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" />
138 <rect
139 width="3"
140 height="3"
141 x="2.5"
142 y="3.5"
143 id="rect3201"
144 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" />
145 <rect
146 width="3"
147 height="3"
148 x="10.5"
149 y="10.5"
150 id="rect3205"
151 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" />
152 <rect
153 width="3"
154 height="3"
155 x="2.5"
156 y="10.5"
157 id="rect3209"
158 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" />
159</svg>
1600
=== modified file 'src/View/Chrome/ViewSwicher.vala'
--- src/View/Chrome/ViewSwicher.vala 2012-06-30 03:53:07 +0000
+++ src/View/Chrome/ViewSwicher.vala 2012-07-14 12:52:21 +0000
@@ -82,16 +82,16 @@
82 Varka.IconFactory icon_factory = Varka.IconFactory.get_default ();82 Varka.IconFactory icon_factory = Varka.IconFactory.get_default ();
83 Gtk.StyleContext style = get_style_context ();83 Gtk.StyleContext style = get_style_context ();
8484
85 icon = new Image.from_pixbuf (icon_factory.load_symbolic_icon (style, "view-list-icons-symbolic", 16));85 icon = new Image.from_pixbuf (icon_factory.load_symbolic_icon (style, "view-grid-symbolic", 16));
86 icon.set_tooltip_text (_("View as icons"));86 icon.set_tooltip_text (_("View as grid"));
87 switcher.append(icon);87 switcher.append(icon);
88 list = new Image.from_pixbuf (icon_factory.load_symbolic_icon (style, "view-list-details-symbolic", 16));88 list = new Image.from_pixbuf (icon_factory.load_symbolic_icon (style, "view-list-symbolic", 16));
89 list.set_tooltip_text (_("View as list"));89 list.set_tooltip_text (_("View as list"));
90 switcher.append(list);90 switcher.append(list);
91 compact = new Image.from_pixbuf (icon_factory.load_symbolic_icon (style, "view-list-compact-symbolic", 16));91 compact = new Image.from_pixbuf (icon_factory.load_symbolic_icon (style, "view-compact-symbolic", 16));
92 compact.set_tooltip_text (_("View as compact list"));92 compact.set_tooltip_text (_("View as compact list"));
93 //switcher.append(compact);93 //switcher.append(compact);
94 miller = new Image.from_pixbuf (icon_factory.load_symbolic_icon (style, "view-list-column-symbolic", 16));94 miller = new Image.from_pixbuf (icon_factory.load_symbolic_icon (style, "view-column-symbolic", 16));
95 miller.set_tooltip_text(_("View as column"));95 miller.set_tooltip_text(_("View as column"));
96 switcher.append(miller);96 switcher.append(miller);
97 97

Subscribers

People subscribed via source and target branches

to all changes: