[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 874
Date       : Mon Apr 24 16:25:16 BST 2006

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

Make full height buttons on bars smaller


Diff:
Index: Trunk/XaraLX/Scripts/barconverter
===================================================================
--- Trunk/XaraLX/Scripts/barconverter	(revision 873)
+++ Trunk/XaraLX/Scripts/barconverter	(revision 874)
@@ -362,7 +362,8 @@
     print STDOUT $ddindent."                <object class=\"wxButton\" name=\"$name\">
";
     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;
+    printf STDOUT $ddindent."                    <style>wxBU_EXACTFIT</style>
";
+    printf STDOUT $ddindent."                    <size>%d,%d</size>
",($label eq "")?GetSize($name,20):-1,$dd?24:24;
     ConvertOptoken($optoken) if ($optoken ne "");
     BubbleHelp();
     print STDOUT $ddindent."                </object>
";
Index: Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc	(revision 873)
+++ Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc	(revision 874)
@@ -5574,7 +5574,8 @@
                         <size>8</size>
                     </font>
                     <label>Create Brush</label>
-                    <size>-1,-1</size>
+                    <style>wxBU_EXACTFIT</style>
+                    <size>-1,24</size>
                     <tooltip>Create a new brush</tooltip>
                     <help>Create a new brush</help>
                 </object>
@@ -5592,7 +5593,8 @@
                         <size>8</size>
                     </font>
                     <label>Edit Brush</label>
-                    <size>-1,-1</size>
+                    <style>wxBU_EXACTFIT</style>
+                    <size>-1,24</size>
                     <tooltip>Edit an existing brush</tooltip>
                     <help>Edit an existing brush</help>
                 </object>
@@ -5691,7 +5693,8 @@
                         <size>8</size>
                     </font>
                     <label>Remove</label>
-                    <size>-1,-1</size>
+                    <style>wxBU_EXACTFIT</style>
+                    <size>-1,24</size>
                     <optoken>RemoveBlend</optoken>
                 </object>
             </object>
@@ -5826,7 +5829,8 @@
                         <size>8</size>
                     </font>
                     <label>Remove</label>
-                    <size>-1,-1</size>
+                    <style>wxBU_EXACTFIT</style>
+                    <size>-1,24</size>
                     <optoken>RemoveMould</optoken>
                 </object>
             </object>
@@ -6034,7 +6038,8 @@
                         <size>8</size>
                     </font>
                     <label>Remove</label>
-                    <size>-1,-1</size>
+                    <style>wxBU_EXACTFIT</style>
+                    <size>-1,24</size>
                     <optoken>RemoveContour</optoken>
                 </object>
             </object>


Xara