[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1110
Date       : Wed May 17 19:34:45 BST 2006

Changed paths:
   M /Trunk/XaraLX/Scripts/barconverter
   M /Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc

Fixed text-tool control sizes (bug 1067)


Diff:
Index: Trunk/XaraLX/Scripts/barconverter
===================================================================
--- Trunk/XaraLX/Scripts/barconverter	(revision 1109)
+++ Trunk/XaraLX/Scripts/barconverter	(revision 1110)
@@ -146,7 +146,14 @@
 		    "IDC_SOFTSHADOWSLIDER" => 96,
 		    "IDC_SOFTSHADOWTRANSPSLIDER" => 96,
 		    "IDC_EDIT_REGSHAPETOOL_POS" => 128,
-		    "IDC_FONT_COMBO" => 128
+		    "IDC_FONT_COMBO" => 128,
+		    "IDCB_LINEWIDTH_COMBO_BOX" => 64,
+		    "IDC_POINT_COMBO" => 64,
+		    "IDC_ASPECTEDIT" => 30,
+		    "IDC_SPACING_EDIT" => 30,
+		    "IDC_TRACKING_EDIT" => 30,
+		    "IDC_KERN_EDIT_Y" => 40,
+		    "IDC_KERN_EDIT_X" => 40
 		   );
     return $cnamemap{ $control } || $default;
 }
Index: Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc	(revision 1109)
+++ Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc	(revision 1110)
@@ -1022,7 +1022,7 @@
                 <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
                 <border>0</border>
                 <object class="wxOwnerDrawnComboBox" name="IDCB_LINEWIDTH_COMBO_BOX">
-                    <size>80,-1</size>
+                    <size>64,-1</size>
                     <font>
                         <size>8</size>
                     </font>
@@ -2378,7 +2378,7 @@
                 <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
                 <border>0</border>
                 <object class="wxOwnerDrawnComboBox" name="IDCB_LINEWIDTH_COMBO_BOX">
-                    <size>80,-1</size>
+                    <size>64,-1</size>
                     <font>
                         <size>8</size>
                     </font>
@@ -6613,7 +6613,7 @@
                 <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
                 <border>0</border>
                 <object class="wxOwnerDrawnComboBox" name="IDC_POINT_COMBO">
-                    <size>80,-1</size>
+                    <size>64,-1</size>
                     <font>
                         <size>8</size>
                     </font>
@@ -6643,7 +6643,7 @@
                     <font>
                         <size>8</size>
                     </font>
-                    <size>50,14</size>
+                    <size>30,14</size>
                     <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>
                     <tooltip>Aspect ratio</tooltip>
                     <help>Set font aspect ratio</help>
@@ -6785,7 +6785,7 @@
                                     <font>
                                         <size>7</size>
                                     </font>
-                                    <size>50,14</size>
+                                    <size>30,14</size>
                                     <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>
                                     <tooltip>Line spacing</tooltip>
                                     <help>Apply line spacing</help>
@@ -6805,7 +6805,7 @@
                                     <font>
                                         <size>7</size>
                                     </font>
-                                    <size>50,14</size>
+                                    <size>30,14</size>
                                     <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>
                                     <tooltip>Tracking (ems/1000)</tooltip>
                                     <help>Apply tracking; units of ems/1000</help>
@@ -6900,7 +6900,7 @@
                                     <font>
                                         <size>7</size>
                                     </font>
-                                    <size>50,14</size>
+                                    <size>40,14</size>
                                     <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>
                                     <tooltip>Baseline shift</tooltip>
                                     <help>Apply a vertical baseline shift</help>
@@ -6920,7 +6920,7 @@
                                     <font>
                                         <size>7</size>
                                     </font>
-                                    <size>50,14</size>
+                                    <size>40,14</size>
                                     <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>
                                     <tooltip>Kerning (ems/1000)</tooltip>
                                     <help>Insert or edit a horizontal kern code; units of ems/10000</help>


Xara