Merge lp:~elementary-pantheon/granite/open-menu into lp:~elementary-pantheon/granite/granite

Proposed by Danielle Foré
Status: Merged
Approved by: Danielle Foré
Approved revision: 748
Merged at revision: 748
Proposed branch: lp:~elementary-pantheon/granite/open-menu
Merge into: lp:~elementary-pantheon/granite/granite
Diff against target: 115 lines (+14/-45)
2 files modified
icons/scalable/open-menu-symbolic.svg (+11/-41)
lib/Widgets/AppMenu.vala (+3/-4)
To merge this branch: bzr merge lp:~elementary-pantheon/granite/open-menu
Reviewer Review Type Date Requested Status
Robert Roth (community) Approve
Review via email: mp+226391@code.launchpad.net

Commit message

move application-menu to open-menu

Description of the change

Moves "application-menu" to "open-menu" to follow GNOME's change in naming for this icon

To post a comment you must log in.
Revision history for this message
Robert Roth (evfool) wrote :

OK.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'icons/16x16/application-menu.svg' => 'icons/16x16/open-menu.svg'
2=== renamed file 'icons/22x22/application-menu.svg' => 'icons/22x22/open-menu.svg'
3=== renamed file 'icons/24x24/application-menu.svg' => 'icons/24x24/open-menu.svg'
4=== renamed file 'icons/32x32/application-menu.svg' => 'icons/32x32/open-menu.svg'
5=== renamed file 'icons/48x48/application-menu.svg' => 'icons/48x48/open-menu.svg'
6=== renamed file 'icons/scalable/application-menu-symbolic.svg' => 'icons/scalable/open-menu-symbolic.svg'
7--- icons/scalable/application-menu-symbolic.svg 2012-05-20 20:49:51 +0000
8+++ icons/scalable/open-menu-symbolic.svg 2014-07-10 23:41:57 +0000
9@@ -7,7 +7,7 @@
10 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
11 xmlns:svg="http://www.w3.org/2000/svg"
12 xmlns="http://www.w3.org/2000/svg"
13- xmlns:xlink="http://www.w3.org/1999/xlink"
14+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
15 version="1.1"
16 width="16"
17 height="16"
18@@ -15,38 +15,7 @@
19 <title
20 id="title9167">Gnome Symbolic Icon Theme</title>
21 <defs
22- id="defs11">
23- <linearGradient
24- x1="8.2128801"
25- y1="0.95885509"
26- x2="8.2128801"
27- y2="14.985587"
28- id="linearGradient3899"
29- xlink:href="#linearGradient3798-3"
30- gradientUnits="userSpaceOnUse"
31- gradientTransform="matrix(1,0,0,-1,0,16)" />
32- <linearGradient
33- id="linearGradient3798-3">
34- <stop
35- id="stop3800-9"
36- style="stop-color:#bebebe;stop-opacity:0.69800001"
37- offset="0" />
38- <stop
39- id="stop3802-0"
40- style="stop-color:#bebebe;stop-opacity:1"
41- offset="1" />
42- </linearGradient>
43- <radialGradient
44- cx="8"
45- cy="13.70627"
46- r="5.4887881"
47- fx="8"
48- fy="13.70627"
49- id="radialGradient3922"
50- xlink:href="#linearGradient3798-3"
51- gradientUnits="userSpaceOnUse"
52- gradientTransform="matrix(2.0028749,0,0,2.103321,-27.472015,-17.454038)" />
53- </defs>
54+ id="defs9" />
55 <metadata
56 id="metadata90">
57 <rdf:RDF>
58@@ -59,12 +28,13 @@
59 </cc:Work>
60 </rdf:RDF>
61 </metadata>
62- <path
63- d="m 6.75,15 0,-2.1875 C 6.3012128,12.695122 5.8902797,12.510894 5.5,12.28125 L 3.9375,13.84375 2.15625,12.0625 3.71875,10.5 C 3.4891059,10.10972 3.3048778,9.6987872 3.1875,9.25 L 1,9.25 l 0,-2.5 2.1875,0 C 3.3048778,6.3012128 3.4891059,5.89028 3.71875,5.5 L 2.15625,3.9375 3.9375,2.15625 5.5,3.71875 C 5.8902797,3.489106 6.3012128,3.304878 6.75,3.1875 L 6.75,1 l 2.5,0 0,2.1875 c 0.4487872,0.117378 0.85972,0.301606 1.25,0.53125 L 12.0625,2.15625 13.84375,3.9375 12.28125,5.5 c 0.229644,0.39028 0.413872,0.8012128 0.53125,1.25 l 2.1875,0 0,2.5 -2.1875,0 c -0.117378,0.4487872 -0.301606,0.85972 -0.53125,1.25 l 1.5625,1.5625 L 12.0625,13.84375 10.5,12.28125 C 10.10972,12.510894 9.6987872,12.695122 9.25,12.8125 L 9.25,15 6.75,15 z M 8,10 C 9.1045695,10 10,9.1045695 10,8 10,6.8954305 9.1045695,6 8,6 6.8954305,6 6,6.8954305 6,8 c 0,1.1045695 0.8954305,2 2,2 z"
64- id="path3002"
65- style="color:#bebebe;fill:url(#linearGradient3899);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
66- <path
67- d="m 6.75,1 0,2.1875 C 6.3012128,3.304878 5.8902797,3.489106 5.5,3.71875 L 3.9375,2.15625 2.15625,3.9375 3.71875,5.5 C 3.4891059,5.89028 3.3048778,6.3012128 3.1875,6.75 L 1,6.75 l 0,2.5 2.1875,0 c 0.1173778,0.4487872 0.3016059,0.85972 0.53125,1.25 L 2.15625,12.0625 3.9375,13.84375 5.5,12.28125 c 0.3902797,0.229644 0.8012128,0.413872 1.25,0.53125 l 0,2.1875 2.5,0 0,-2.1875 c 0.4487872,-0.117378 0.85972,-0.301606 1.25,-0.53125 l 1.5625,1.5625 1.78125,-1.78125 -1.5625,-1.5625 c 0.229644,-0.39028 0.413872,-0.8012128 0.53125,-1.25 l 2.1875,0 0,-2.5 -2.1875,0 C 12.695122,6.3012128 12.510894,5.89028 12.28125,5.5 L 13.84375,3.9375 12.0625,2.15625 10.5,3.71875 C 10.10972,3.489106 9.6987872,3.304878 9.25,3.1875 L 9.25,1 6.75,1 z m 0.875,1 0.75,0 0,2.03125 c 0.827336,0.077246 1.5840203,0.4025641 2.1875,0.90625 L 11.96875,3.5 12.5,4.03125 11.0625,5.4375 c 0.503686,0.6034797 0.829004,1.3601641 0.90625,2.1875 l 2.03125,0 0,0.75 -2.03125,0 c -0.07725,0.827336 -0.402564,1.5840203 -0.90625,2.1875 L 12.5,11.96875 11.96875,12.5 10.5625,11.0625 C 9.9590203,11.566186 9.202336,11.891504 8.375,11.96875 l 0,2.03125 -0.75,0 0,-2.03125 C 6.797664,11.891504 6.0409797,11.566186 5.4375,11.0625 L 4.03125,12.5 3.5,11.96875 4.9375,10.5625 C 4.4338141,9.9590203 4.1084962,9.202336 4.03125,8.375 L 2,8.375 l 0,-0.75 2.03125,0 C 4.1084962,6.7976641 4.4338141,6.0409797 4.9375,5.4375 L 3.5,4.03125 4.03125,3.5 5.4375,4.9375 C 6.0409797,4.4338141 6.797664,4.1084962 7.625,4.03125 L 7.625,2 z"
68- id="path3002-1"
69- style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
70+ <g
71+ transform="translate(-441,-401)"
72+ id="layer15">
73+ <path
74+ d="m 449,402 c -0.22065,0 -0.44081,0.0113 -0.65625,0.0312 l -0.40625,2.0938 c -0.33446,0.0733 -0.66305,0.17589 -0.96875,0.3125 l -1.5312,-1.4688 c -0.38863,0.23011 -0.72695,0.51408 -1.0625,0.8125 l 0.90625,1.9062 c -0.22242,0.24899 -0.42425,0.5225 -0.59375,0.8125 l -2.0938,-0.28125 c -0.17772,0.40877 -0.30872,0.83637 -0.40625,1.2812 l 1.8438,1 c -0.0171,0.16809 -0.0312,0.3274 -0.0312,0.5 0,0.1726 0.0142,0.33191 0.0312,0.5 l -1.8438,1 c 0.0975,0.44488 0.22853,0.87248 0.40625,1.2812 l 2.0938,-0.28125 c 0.1695,0.29 0.37133,0.56351 0.59375,0.8125 l -0.90625,1.9062 c 0.33555,0.29842 0.67387,0.58239 1.0625,0.8125 l 1.5312,-1.4688 c 0.3057,0.13661 0.63429,0.23916 0.96875,0.3125 l 0.40625,2.0938 c 0.21544,0.02 0.4356,0.0312 0.65625,0.0312 0.22065,0 0.44081,-0.0113 0.65625,-0.0312 l 0.40625,-2.0938 c 0.33446,-0.0733 0.66305,-0.17589 0.96875,-0.3125 l 1.5312,1.4688 c 0.38863,-0.23011 0.72695,-0.51408 1.0625,-0.8125 l -0.90625,-1.9062 c 0.22242,-0.24899 0.42425,-0.5225 0.59375,-0.8125 l 2.0938,0.28125 c 0.17772,-0.40877 0.30872,-0.83637 0.40625,-1.2812 l -1.8438,-1 c 0.0171,-0.16809 0.0312,-0.3274 0.0312,-0.5 0,-0.1726 -0.0142,-0.33191 -0.0312,-0.5 l 1.8438,-1 c -0.0975,-0.44488 -0.22853,-0.87248 -0.40625,-1.2812 l -2.0938,0.28125 c -0.1695,-0.29 -0.37133,-0.56351 -0.59375,-0.8125 l 0.90625,-1.9062 c -0.33555,-0.29842 -0.67387,-0.58239 -1.0625,-0.8125 l -1.5312,1.4688 c -0.3057,-0.13661 -0.63429,-0.23916 -0.96875,-0.3125 l -0.40625,-2.0938 C 449.44081,402.0112 449.22065,402 449,402 z m 0,4 c 1.6568,0 3,1.3432 3,3 0,1.6568 -1.3432,3 -3,3 -1.6568,0 -3,-1.3432 -3,-3 0,-1.6568 1.3432,-3 3,-3 z"
75+ inkscape:connector-curvature="0"
76+ id="path35543-6-4"
77+ style="color:#000000;fill:#bebebe" />
78+ </g>
79 </svg>
80
81=== modified file 'lib/Widgets/AppMenu.vala'
82--- lib/Widgets/AppMenu.vala 2013-03-20 15:42:25 +0000
83+++ lib/Widgets/AppMenu.vala 2014-07-10 23:41:57 +0000
84@@ -45,7 +45,7 @@
85 */
86 public AppMenu (Gtk.Menu menu) {
87
88- base (new Image.from_icon_name ("application-menu", IconSize.MENU), _("Menu"), menu);
89+ base (new Image.from_icon_name ("open-menu", IconSize.MENU), _("Menu"), menu);
90 }
91
92 /**
93@@ -56,7 +56,7 @@
94 */
95 public AppMenu.with_app (Granite.Application? application, Gtk.Menu menu) {
96
97- base (new Image.from_icon_name ("application-menu", IconSize.MENU), _("Menu"), menu);
98+ base (new Image.from_icon_name ("open-menu", IconSize.MENU), _("Menu"), menu);
99
100 this.add_items (menu);
101
102@@ -69,7 +69,7 @@
103 [Deprecated (since = "granite-0.1")]
104 public AppMenu.with_urls (Gtk.Menu menu, string help_url, string translate_url, string bug_url) {
105 critical("This is a deprecated creation method: AppMenu.with_urls");
106- base (new Image.from_icon_name ("application-menu", IconSize.MENU), _("Menu"), menu);
107+ base (new Image.from_icon_name ("open-menu", IconSize.MENU), _("Menu"), menu);
108 }
109
110 /**
111@@ -90,4 +90,3 @@
112
113 }
114
115-

Subscribers

People subscribed via source and target branches