Nux

Merge lp:~unity-team/nux/nux.round-corner-assets into lp:nux/2.0

  1. nux.round-corner-assets
  2. Merge into 2.0
Proposed by Jay Taoko
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 600
Merged at revision: 600
Proposed branch: lp:~unity-team/nux/nux.round-corner-assets
Merge into: lp:nux/2.0
Diff against target: 78 lines (+9/-3)
5 files modified
Nux/Theme.cpp (+2/-0)
Nux/Theme.h (+2/-2)
configure.ac (+1/-1)
data/Makefile.am (+2/-0)
data/UITextures/Painter.xml (+2/-0)
To merge this branch: bzr merge lp:~unity-team/nux/nux.round-corner-assets
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve
Review via email: mp+97918@code.launchpad.net

Commit message

Added round corner rectangle assets for radius 5 and 6.

Description of the change

* Added round corned rectangle assets for radius 5 and 6.

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

Tested, works fine, thanks

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

No commit message specified.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Nux/Theme.cpp'
2--- Nux/Theme.cpp 2011-10-21 22:06:35 +0000
3+++ Nux/Theme.cpp 2012-03-16 16:29:19 +0000
4@@ -48,6 +48,8 @@
5 INT_TO_ENUM_ELEMENT(eSHAPE_CORNER_ROUND1),
6 INT_TO_ENUM_ELEMENT(eSHAPE_CORNER_ROUND2),
7 INT_TO_ENUM_ELEMENT(eSHAPE_CORNER_ROUND4),
8+ INT_TO_ENUM_ELEMENT(eSHAPE_CORNER_ROUND5),
9+ INT_TO_ENUM_ELEMENT(eSHAPE_CORNER_ROUND6),
10 INT_TO_ENUM_ELEMENT(eSHAPE_CORNER_ROUND10),
11
12 INT_TO_ENUM_ELEMENT(eSHAPE_CORNER_ROUND10_SHADOW),
13
14=== modified file 'Nux/Theme.h'
15--- Nux/Theme.h 2011-12-06 16:29:06 +0000
16+++ Nux/Theme.h 2012-03-16 16:29:19 +0000
17@@ -40,6 +40,8 @@
18 eSHAPE_CORNER_ROUND1,
19 eSHAPE_CORNER_ROUND2,
20 eSHAPE_CORNER_ROUND4,
21+ eSHAPE_CORNER_ROUND5,
22+ eSHAPE_CORNER_ROUND6,
23 eSHAPE_CORNER_ROUND10,
24
25 eSHAPE_CORNER_ROUND10_SHADOW,
26@@ -150,8 +152,6 @@
27 std::list<PainterImage *> m_PainterImageList;
28
29 };
30-
31-
32 }
33
34 #endif // UXTHEME_H
35
36=== modified file 'configure.ac'
37--- configure.ac 2012-03-13 01:17:25 +0000
38+++ configure.ac 2012-03-16 16:29:19 +0000
39@@ -22,7 +22,7 @@
40 # The number format is : year/month/day
41 # e.g.: december 5th, 2011 is: 20111205
42 # To make more than one API change in a day, add a number to the date. Like 20111205.xx
43-m4_define([nux_abi_version], [20120312.02])
44+m4_define([nux_abi_version], [20120316.01])
45
46 m4_define([nux_version],
47 [nux_major_version.nux_minor_version.nux_micro_version])
48
49=== modified file 'data/Makefile.am'
50--- data/Makefile.am 2012-02-11 05:26:49 +0000
51+++ data/Makefile.am 2012-03-16 16:29:19 +0000
52@@ -52,6 +52,8 @@
53 UITextures/RoundCorner_1pxrad.tga \
54 UITextures/RoundCorner_2pxrad.tga \
55 UITextures/RoundCorner_4pxrad.tga \
56+ UITextures/RoundCorner_5pxrad.tga \
57+ UITextures/RoundCorner_6pxrad.tga \
58 UITextures/RoundCorner_4px_shadow.tga \
59 UITextures/ScrollBarTriangleDown.tga \
60 UITextures/ScrollBarTriangleLeft.tga \
61
62=== modified file 'data/UITextures/Painter.xml'
63--- data/UITextures/Painter.xml 2011-10-21 02:42:16 +0000
64+++ data/UITextures/Painter.xml 2012-03-16 16:29:19 +0000
65@@ -7,6 +7,8 @@
66 <Image Name="Stroke_1pxrad_2px.tga" type="Stroke" style="eSTROKE_CORNER_ROUND1" border_left="1" border_right="1" border_top="1" border_bottom="1" border_only="true" />
67
68 <Image Name="RoundCorner_10pxrad.tga" type="Shape" style="eSHAPE_CORNER_ROUND10" border_left="10" border_right="10" border_top="10" border_bottom="10" border_only="false" />
69+ <Image Name="RoundCorner_6pxrad.tga" type="Shape" style="eSHAPE_CORNER_ROUND6" border_left="6" border_right="6" border_top="6" border_bottom="6" border_only="false" />
70+ <Image Name="RoundCorner_5pxrad.tga" type="Shape" style="eSHAPE_CORNER_ROUND5" border_left="5" border_right="5" border_top="5" border_bottom="5" border_only="false" />
71 <Image Name="RoundCorner_4pxrad.tga" type="Shape" style="eSHAPE_CORNER_ROUND4" border_left="4" border_right="4" border_top="4" border_bottom="4" border_only="false" />
72 <Image Name="RoundCorner_2pxrad.tga" type="Shape" style="eSHAPE_CORNER_ROUND2" border_left="2" border_right="2" border_top="2" border_bottom="2" border_only="false" />
73 <Image Name="RoundCorner_1pxrad.tga" type="Shape" style="eSHAPE_CORNER_ROUND1" border_left="1" border_right="1" border_top="1" border_bottom="1" border_only="false" />
74
75=== added file 'data/UITextures/RoundCorner_5pxrad.tga'
76Binary files data/UITextures/RoundCorner_5pxrad.tga 1970-01-01 00:00:00 +0000 and data/UITextures/RoundCorner_5pxrad.tga 2012-03-16 16:29:19 +0000 differ
77=== added file 'data/UITextures/RoundCorner_6pxrad.tga'
78Binary files data/UITextures/RoundCorner_6pxrad.tga 1970-01-01 00:00:00 +0000 and data/UITextures/RoundCorner_6pxrad.tga 2012-03-16 16:29:19 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: