Integrating search functionality from AntTheLimey

[potlatch2.git] / net / systemeD / potlatch2 / Toolbox.mxml

diff --git a/net/systemeD/potlatch2/Toolbox.mxml b/net/systemeD/potlatch2/Toolbox.mxml
index 241d5f42adc75a754a3db32ee79ccdab9ac9de1a..a553ab6a26ee6b7be38e1db1e0e386dbac23adcf 100644 (file)
--- a/net/systemeD/potlatch2/Toolbox.mxml
+++ b/net/systemeD/potlatch2/Toolbox.mxml
@@ -2,13 +2,18 @@
 <mx:Panel
        xmlns:mx="http://www.adobe.com/2006/mxml"
        xmlns:potlatch2="net.systemeD.potlatch2.*"
-       borderThicknessRight="1" borderThicknessLeft="1" borderThicknessBottom="3"
-       title="Edit Pathways and Areas" layout="horizontal" styleName="theToolBox">
+       height="76" width="129" layout="absolute"
+       styleName="theToolBox">
 
         <!-- the animation effect that controls the rotation of the reverse arrow.
               We could get more fancy by using previous angle in angleFrom, and a longer duration, to give a nice animated effect -->
         <mx:Rotate id="rotate" angleFrom="{angle-1}" angleTo="{angle}" target="{arrowBox}" originX="{arrowBox.width/2}" originY="{arrowBox.height/2}" duration="4"/>
 
+
+               <mx:Image data="@Embed('../../../embedded/close_small.png')"
+                       includeInLayout="false" id="toolboxClose" click="toggle();" 
+                       y="-6" x="115" />
+
                <!-- Top row -->
 
                <mx:Button icon="@Embed('../../../embedded/delete.svg')"
@@ -16,10 +21,10 @@
                        enabled="{canDo('delete')}" 
                        alpha="{getAlpha('delete')}" 
                        toolTip="{deleteToolTipText()}" 
-                       width="24" height="24" />
+                       width="28" height="28" textAlign="left" y="4" x="6" paddingLeft="6" paddingRight="0" />
 
-        <mx:HBox id="reverseButton" width="24" height="24" y="4" x="36" borderStyle="solid" cornerRadius="12" 
-                         click="reverseClicked();" horizontalAlign="center" verticalAlign="middle" toolTip="Reverse direction (V)">
+        <mx:HBox id="reverseButton" width="28" height="28" y="4" x="36" borderStyle="solid" cornerRadius="4"
+                  click="reverseClicked();" horizontalAlign="center" verticalAlign="middle" toolTip="Reverse direction (V)">
             <mx:ViewStack id="rotateButtonStack" creationPolicy="all">
                 <mx:HBox id="arrowBoxWrapper"><!-- changing the viewstack back onto a rotated hbox causes positioning glitches, hence this wrapper -->
                     <!-- I can totally recommend adding borderStyle="solid" to arrowBox when debugging -->
@@ -49,14 +54,14 @@
                        enabled="{canDo('split')}" 
                        alpha="{getAlpha('split')}" 
                        toolTip="Split way (X)" 
-                       width="24" height="24" />
+                       width="28" height="28" textAlign="left" y="4" x="66" paddingLeft="8" paddingRight="0" />
                <mx:Button icon="@Embed('../../../embedded/merge.svg')" 
                        id="mergeButton"
                        click='doMerge();'
                        enabled="{canDo('merge')}" 
                        alpha="{getAlpha('merge')}" 
                        toolTip="Merge ways" 
-                       width="24" height="24" />
+                       width="28" height="28" textAlign="left" y="4" x="96" paddingLeft="3" paddingRight="0" />
 
                <!-- Second row -->
 
@@ -66,28 +71,28 @@
                        enabled="{canDo('straighten')}" 
                        alpha="{getAlpha('straighten')}" 
                        toolTip="Straighten way" 
-                       width="24" height="24" />
+                       width="28" height="28" textAlign="left" y="34" x="6" paddingLeft="5" paddingRight="0" />
                <mx:Button icon="@Embed('../../../embedded/circle.svg')" 
                        id="circulariseButton"
                        click='doCircularise();' 
                        enabled="{canDo('circularise')}" 
                        alpha="{getAlpha('circularise')}" 
                        toolTip="Make circular" 
-                       width="24" height="24" />
+                       width="28" height="28" textAlign="left" y="34" x="36" paddingLeft="4" paddingRight="0" />
                <mx:Button icon="@Embed('../../../embedded/quadrilateralise.svg')" 
                        id="quadrilateraliseButton"
                        click='doQuadrilateralise();' 
                        enabled="{canDo('quadrilateralise')}" 
                        alpha="{getAlpha('quadrilateralise')}" 
-                       toolTip="Make right-angled (Q)" 
-                       width="24" height="24" />
+                       toolTip="Make right-angled (Q)"
+                       width="28" height="28" textAlign="left" y="34" x="66" paddingLeft="6" paddingRight="0" />
                <mx:Button icon="@Embed('../../../embedded/parallel.svg')" 
                        id="parralleliseButton"
                        click='doParallelise();' 
                        enabled="{canDo('parallelise')}" 
                        alpha="{getAlpha('parallelise')}" 
                        toolTip="Create parallel way (P)" 
-                       width="24" height="24" />
+                       width="28" height="28" textAlign="left" y="34" x="96" paddingLeft="8" paddingRight="0" />
 
        <mx:Script><![CDATA[