[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]

[XaraXtreme-commits] Commit Complete



Commit by  : alex
Repository : xara
Revision   : 871
Date       : Mon Apr 24 16:13:06 BST 2006

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

Make font heights consistent in bars


Diff:
Index: Trunk/XaraLX/Scripts/barconverter
===================================================================
--- Trunk/XaraLX/Scripts/barconverter	(revision 870)
+++ Trunk/XaraLX/Scripts/barconverter	(revision 871)
@@ -171,6 +171,13 @@
     }
 }
 
+sub WriteFont
+{
+    print STDOUT $ddindent."                    <font>
";
+    printf STDOUT $ddindent."                        <size>%d</size>
",$dd?7:8;
+    print STDOUT $ddindent."                    </font>
";
+}
+
 sub WriteFileHead
 {
     print STDOUT "<?xml version=\"1.0\" ?>
<resource>
";
@@ -293,9 +300,7 @@
     print STDOUT $ddindent."                <border>0</border>
";
     print STDOUT $ddindent."                <object class=\"wxComboBox\" name=\"$name\">
";
     printf STDOUT $ddindent."                    <size>%d,-1</size>
",GetSize($name, 80);
-    print STDOUT $ddindent."                    <font>
";
-    print STDOUT $ddindent."                        <size>8</size>
";
-    print STDOUT $ddindent."                    </font>
";
+    WriteFont();
     print STDOUT $ddindent."                    <style>wxCB_DROPDOWN</style>
";
     ConvertOptoken($optoken) if ($optoken ne "");
     BubbleHelp();
@@ -331,9 +336,7 @@
     printf STDOUT $ddindent."                <flag>wxALIGN_CENTER_%s|wxALL</flag>
", IsVertical()?"HORIZONTAL":"VERTICAL";;
     print STDOUT $ddindent."                <border>1</border>
";
     print STDOUT $ddindent."                <object class=\"wxStaticText\" name=\"$name\">
";
-    print STDOUT $ddindent."                    <font>
";
-    print STDOUT $ddindent."                        <size>7</size>
";
-    print STDOUT $ddindent."                    </font>
";
+    WriteFont();
     printf STDOUT $ddindent."                    <label>%s</label>
",$label if ($label ne "");
     printf STDOUT $ddindent."                    <size>%d,-1</size>
",($label eq "")?GetSize($name,80):-1;
     print STDOUT $ddindent."                    <style>wxALIGN_CENTRE|wxSUNKEN_BORDER</style>
";
@@ -357,9 +360,7 @@
     printf STDOUT $ddindent."                <flag>wxALIGN_CENTER_%s|wxALL</flag>
", IsVertical()?"HORIZONTAL":"VERTICAL";;
     print STDOUT $ddindent."                <border>0</border>
";
     print STDOUT $ddindent."                <object class=\"wxButton\" name=\"$name\">
";
-    print STDOUT $ddindent."                    <font>
";
-    printf STDOUT $ddindent."                        <size>%d</size>
",$dd?8:6;
-    print STDOUT $ddindent."                    </font>
";
+    WriteFont();
     printf STDOUT $ddindent."                    <label>%s</label>
",$label if ($label ne "");
     printf STDOUT $ddindent."                    <size>%d,%d</size>
",($label eq "")?GetSize($name,20):-1,$dd?-1:-1;
     ConvertOptoken($optoken) if ($optoken ne "");
@@ -376,9 +377,7 @@
     printf STDOUT $ddindent."                <flag>wxALIGN_CENTER_%s|wxALL</flag>
", IsVertical()?"HORIZONTAL":"VERTICAL";;
     print STDOUT $ddindent."                <border>0</border>
";
     print STDOUT $ddindent."                <object class=\"wxTextCtrl\" name=\"$name\">
";
-    print STDOUT $ddindent."                    <font>
";
-    print STDOUT $ddindent."                        <size>7</size>
";
-    print STDOUT $ddindent."                    </font>
";
+    WriteFont();
     printf STDOUT $ddindent."                    <size>%d,14</size>
",GetSize($name, 50);
     print STDOUT $ddindent."                    <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>
";
     ConvertOptoken($optoken) if ($optoken ne "");
Index: Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc	(revision 870)
+++ Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc	(revision 871)
@@ -3339,7 +3339,7 @@
                 <border>1</border>
                 <object class="wxStaticText" name="IDC_REGSHAPETOOL_ADDCHANGE">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <size>80,-1</size>
                     <style>wxALIGN_CENTRE|wxSUNKEN_BORDER</style>
@@ -3608,7 +3608,7 @@
                 <border>1</border>
                 <object class="wxStaticText" name="IDC_REGSHAPETOOL_ADDCHANGE">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <size>80,-1</size>
                     <style>wxALIGN_CENTRE|wxSUNKEN_BORDER</style>
@@ -3808,7 +3808,7 @@
                 <border>1</border>
                 <object class="wxStaticText" name="IDC_REGSHAPETOOL_ADDCHANGE">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <size>80,-1</size>
                     <style>wxALIGN_CENTRE|wxSUNKEN_BORDER</style>
@@ -4080,7 +4080,7 @@
                 <border>1</border>
                 <object class="wxStaticText" name="IDC_SELPOINT">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <size>80,-1</size>
                     <style>wxALIGN_CENTRE|wxSUNKEN_BORDER</style>
@@ -4098,7 +4098,7 @@
                 <border>1</border>
                 <object class="wxStaticText" name="IDC_SELCOLOUR">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <size>80,-1</size>
                     <style>wxALIGN_CENTRE|wxSUNKEN_BORDER</style>
@@ -4211,7 +4211,7 @@
                 <border>1</border>
                 <object class="wxStaticText" name="IDC_SELPOINT">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <size>80,-1</size>
                     <style>wxALIGN_CENTRE|wxSUNKEN_BORDER</style>
@@ -4247,7 +4247,7 @@
                 <border>1</border>
                 <object class="wxStaticText" name="IDC_SELCOLOUR">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <size>80,-1</size>
                     <style>wxALIGN_CENTRE|wxSUNKEN_BORDER</style>
@@ -4269,7 +4269,7 @@
                 <border>1</border>
                 <object class="wxStaticText" name="IDC_BEZTOOLADDCHANGE">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <size>80,-1</size>
                     <style>wxALIGN_CENTRE|wxSUNKEN_BORDER</style>
@@ -4858,7 +4858,7 @@
                 <border>1</border>
                 <object class="wxStaticText" name="IDC_SMOOTHPERCENT">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <label>100%</label>
                     <size>-1,-1</size>
@@ -5534,7 +5534,7 @@
                 <border>1</border>
                 <object class="wxStaticText" name="IDC_FREEHANDPERCENT">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <label>100%</label>
                     <size>-1,-1</size>
@@ -5553,7 +5553,7 @@
                 <border>1</border>
                 <object class="wxStaticText" name="IDC_FREEHANDRETRO">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <size>80,-1</size>
                     <style>wxALIGN_CENTRE|wxSUNKEN_BORDER</style>
@@ -5571,7 +5571,7 @@
                 <border>0</border>
                 <object class="wxButton" name="IDC_CREATEBRUSH">
                     <font>
-                        <size>6</size>
+                        <size>8</size>
                     </font>
                     <label>Create Brush</label>
                     <size>-1,-1</size>
@@ -5589,7 +5589,7 @@
                 <border>0</border>
                 <object class="wxButton" name="IDC_EDITBRUSH">
                     <font>
-                        <size>6</size>
+                        <size>8</size>
                     </font>
                     <label>Edit Brush</label>
                     <size>-1,-1</size>
@@ -5670,7 +5670,7 @@
                 <border>0</border>
                 <object class="wxTextCtrl" name="IDC_BLENDSTEPS">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <size>50,14</size>
                     <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>
@@ -5688,7 +5688,7 @@
                 <border>0</border>
                 <object class="wxButton" name="IDC_REMOVEBLEND">
                     <font>
-                        <size>6</size>
+                        <size>8</size>
                     </font>
                     <label>Remove</label>
                     <size>-1,-1</size>
@@ -5823,7 +5823,7 @@
                 <border>0</border>
                 <object class="wxButton" name="IDC_REMOVEMOULD">
                     <font>
-                        <size>6</size>
+                        <size>8</size>
                     </font>
                     <label>Remove</label>
                     <size>-1,-1</size>
@@ -6013,7 +6013,7 @@
                 <border>0</border>
                 <object class="wxTextCtrl" name="IDC_CONTOURSTEPS">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <size>50,14</size>
                     <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>
@@ -6031,7 +6031,7 @@
                 <border>0</border>
                 <object class="wxButton" name="IDC_REMOVECONTOUR">
                     <font>
-                        <size>6</size>
+                        <size>8</size>
                     </font>
                     <label>Remove</label>
                     <size>-1,-1</size>
@@ -6084,7 +6084,7 @@
                 <border>0</border>
                 <object class="wxTextCtrl" name="IDC_CONTOURSLIDEREDIT">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <size>50,14</size>
                     <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>
@@ -6252,7 +6252,7 @@
                 <border>0</border>
                 <object class="wxTextCtrl" name="IDC_BEVEL_SLIDER_EDIT">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <size>50,14</size>
                     <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>
@@ -6367,7 +6367,7 @@
                 <border>0</border>
                 <object class="wxTextCtrl" name="IDC_ASPECTEDIT">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <size>50,14</size>
                     <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>
@@ -6770,7 +6770,7 @@
                 <border>0</border>
                 <object class="wxTextCtrl" name="IDC_SHADOW_SLIDER_EDIT">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <size>50,14</size>
                     <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>
@@ -6806,7 +6806,7 @@
                 <border>0</border>
                 <object class="wxTextCtrl" name="IDC_SHADOWTRANSP_EDIT">
                     <font>
-                        <size>7</size>
+                        <size>8</size>
                     </font>
                     <size>50,14</size>
                     <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>


Xara