Merge branch 'master' of gitorious.org:birdfont/birdfont

Changed files (2)

• modified fonts/Downstream.bf
• modified libbirdfont/FileChooser.vala

Diff

diff --git a/fonts/Downstream.bf b/fonts/Downstream.bfindex 436970a..d363dbc 100644--- a/fonts/Downstream.bf+++ b/fonts/Downstream.bf@@ -21,8 +21,8 @@ 	<bottom_limit>-27.0000000000</bottom_limit> </horizontal> -<grid width="4.000"/> <grid width="2.000"/>+<grid width="4.000"/>  <background scale="1.000" /> @@ -139,8 +139,22 @@ <collection unicode="U+36"> 	<selected id="1"/> 	<glyph id="1" left="-28" right="28">-		<path stroke="0" data="S 16.0374376040,59.9975041597 Q 11.7061883544,60.0273752397 9.1550195134,59.9369060453 Q -7.6889335813,59.5439090240 -7.3835274542,43.0058236273 Q 3.5083440409,51.7258255660 16.4966722130,45.7612312812 Q 28.0975773773,39.9673487371 27.9775374376,24.0241264559 T Q 27.7978022583,0.1524223957 -0.0357737105,-0.0091514143 Q -28.0490848586,-0.0091514143 -28.0490848586,35.9642262895 Q -28.0490848586,76.0707154742 16.0374376040,71.9376039933 Q 16.0374376040,65.9675540765 16.0374376040,59.9975041597" />-		<path stroke="0" data="S 6.3935108153,24.6364392679 Q 6.4152567378,36.0605978804 -0.3419301165,35.8111480865 T Q -3.7140223681,35.6866631884 -7.5182811427,34.6271703003 L -7.3835274542,24.4833610649 Q -7.3096606909,12.8742458253 -0.8011647255,12.6963394343 Q 7.0817728300,12.3589226200 6.3935108153,24.6364392679" />+		<path stroke="0" data="S 16.0374376040,59.9975041597 Q 11.7061883544,60.0273752397 9.1550195134,59.9369060453 Q -7.6889335813,59.5439090240 -7.3835274542,43.0058236273 Q 3.5083440409,51.7258255660 16.4966722130,45.7612312812 Q 28.0975773773,39.9673487371 27.9775374376,24.0241264559 Q 27.7978022583,0.1524223957 -0.0357737105,-0.0091514143 Q -28.0490848586,-0.0091514143 -28.0490848586,35.9642262895 Q -28.0490848586,76.0707154742 16.0374376040,71.9376039933 Q 16.0374376040,65.9675540765 16.0374376040,59.9975041597" />+		<path stroke="0" data="S 6.3935108153,24.6364392679 Q 6.4152567378,36.0605978803 -0.3419301165,35.8111480865 Q -3.7140223681,35.6866631884 -7.5182811427,34.6271703003 L -7.3835274542,24.4833610649 Q -7.3096606909,12.8742458253 -0.8011647255,12.6963394343 Q 7.0817728300,12.3589226200 6.3935108153,24.6364392679" />+	</glyph>+</collection>+<collection unicode="U+37">+	<selected id="1"/>+	<glyph id="1" left="-28" right="30">+		<path stroke="0" data="S -24.0423340961,59.9176201373 L 3.9347826087,60.0000000000 L -24.0423340961,-0.0549199085 L -4.0514874142,-0.0549199085 L 18.0882043872,51.5709969789 L 22.0217391304,60.0000000000 L 22.0217391304,72.0000000000 L -24.0423340961,72.0549199085 L -24.0423340961,59.9176201373" />+	</glyph>+</collection>+<collection unicode="U+38">+	<selected id="1"/>+	<glyph id="1" left="-28" right="28">+		<path stroke="0" data="S -21.9782608696,58.0869565217 Q -21.9782608696,46.0869565217 -8.0652173913,42.0869565217 Q -28.0652173913,36.0000000000 -28.0652173913,22.0869565217 Q -28.0652173913,0.0000000000 -0.0652173913,0.0000000000 Q 27.9347826087,0.0000000000 27.9347826087,20.0000000000 Q 27.9347826087,41.9130434783 7.9347826087,44.0000000000 Q 22.0217391304,50.0869565217 22.0217391304,58.0869565217 Q 22.0217391304,72.0000000000 -0.0652173913,72.0000000000 T Q -21.4917477561,72.0000000000 -21.9782608696,58.0869565217" />+		<path stroke="0" data="S -0.0652173913,60.0000000000 Q 3.9347826087,60.0000000000 3.9347826087,56.0000000000 Q 3.9347826087,48.0000000000 -0.0652173913,48.0000000000 Q -4.0652173913,48.0000000000 -4.0652173913,56.0000000000 Q -4.0652173913,60.0000000000 -0.0652173913,60.0000000000 T" />+		<path stroke="0" data="S -0.0652173913,40.0000000000 Q 7.9347826087,40.0000000000 7.9347826087,24.0000000000 Q 7.9347826087,12.0000000000 -0.0652173913,12.0000000000 Q -8.0652173913,12.0000000000 -8.0652173913,24.0000000000 Q -8.0652173913,40.0000000000 -0.0652173913,40.0000000000" /> 	</glyph> </collection> <collection unicode="U+3a">@@ -338,8 +352,7 @@ <collection unicode="U+54"> 	<selected id="1"/> 	<glyph id="1" left="-18" right="48">-		<path stroke="0" data="S 0.0178173719,72.0412371134 L 20.0934187465,72.0412371134 L 0.0178173719,72.0412371134 O" />-		<path stroke="0" data="S 0.1866574393,0.0000000000 D 2.1809020436,0.0438848921 14.9959787977,0.0109988294 19.9324192505,0.0146651058 Q 19.7378120652,24.4955102921 20.0047365778,60.0043599343 C 28.9869043714,59.9918706888 33.4779882682,59.9856260660 37.9690721649,59.9793814433 L 38.0429553265,72.0412371134 L 20.7924260555,72.0560567010 L 14.3338945651,72.0616050974 L -17.9587628866,72.0893470790 L -18.0738831615,60.0274914089 L 0.0088910701,60.0043599343 Q 0.0230812142,29.9807463613 0.1866574393,0.0000000000" />+		<path stroke="0" data="S -17.9587628866,72.0893470790 L -18.0738831615,60.0274914089 L 0.0088910701,60.0043599343 Q 0.0230812142,29.9807463613 0.1866574393,0.0000000000 D 2.1809020436,0.0438848921 14.9959787977,0.0109988294 19.9324192505,0.0146651058 Q 19.7378120652,24.4955102921 20.0047365778,60.0043599343 C 28.9869043714,59.9918706888 33.4779882682,59.9856260660 37.9690721649,59.9793814433 L 38.0429553265,72.0412371134 L 12.6421759941,72.0630584192 L -17.9587628866,72.0893470790" /> 	</glyph> </collection> <collection unicode="U+55">diff --git a/libbirdfont/FileChooser.vala b/libbirdfont/FileChooser.valaindex 32aea66..290f849 100644--- a/libbirdfont/FileChooser.vala+++ b/libbirdfont/FileChooser.vala@@ -16,9 +16,9 @@ namespace BirdFont {  public class FileChooser : GLib.Object { 	-	public static uint NONE = 0;-	public static uint SAVE = 1;-	public static uint LOAD = 1 << 1;+	public static const uint NONE = 0;+	public static const uint SAVE = 1;+	public static const uint LOAD = 1 << 1; 	 	public signal void file_selected  (string? path);