[XaraXtreme-dev] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 686
Date       : Sat Mar 18 14:17:17 GMT 2006

Changed paths:
   M /Trunk/XaraLX/Scripts/barconverter
   A /Trunk/XaraLX/testfiles/Broken Butt Cap.xar
   M /Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc

Bar adjustment
Test file with broken butt cap added


Diff:
Index: Trunk/XaraLX/Scripts/barconverter
===================================================================
--- Trunk/XaraLX/Scripts/barconverter	(revision 685)
+++ Trunk/XaraLX/Scripts/barconverter	(revision 686)
@@ -114,7 +114,10 @@
 		    "IDC_SEL_EDIT_XSCALE" => 30,
 		    "IDC_SEL_EDIT_YSCALE" => 30,
 		    "IDC_SEL_EDIT_SHEAR" => 30,
-		    "IDC_SEL_EDIT_ANGLE" => 30
+		    "IDC_SEL_EDIT_ANGLE" => 30,
+		    "IDC_BEVEL_TYPE_COMBO" => 96,
+		    "IDC_BEVEL_SLIDER_COMBO" => 96,
+		    "IDC_BEVELSLIDER" => 96
 		   );
     return $cnamemap{ $control } || $default;
 }
Index: Trunk/XaraLX/testfiles/Broken Butt Cap.xar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: Trunk/XaraLX/testfiles/Broken Butt Cap.xar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc	(revision 685)
+++ Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc	(revision 686)
@@ -4289,7 +4289,7 @@
                 <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
                 <border>0</border>
                 <object class="wxComboBox" name="IDC_BEVEL_TYPE_COMBO">
-                    <size>80,-1</size>
+                    <size>96,-1</size>
                     <font>
                         <size>8</size>
                     </font>
@@ -4307,7 +4307,7 @@
                 <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
                 <border>0</border>
                 <object class="wxComboBox" name="IDC_BEVEL_SLIDER_COMBO">
-                    <size>80,-1</size>
+                    <size>96,-1</size>
                     <font>
                         <size>8</size>
                     </font>
@@ -4325,7 +4325,7 @@
                 <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
                 <border>0</border>
                 <object class="wxSlider" name="IDC_BEVELSLIDER">
-                    <size>60,-1</size>
+                    <size>96,-1</size>
                     <style>wxSL_HORIZONTAL|wxSL_AUTOTICKS</style>
                     <value>0</value>
                     <min>0</min>


Xara