make it look purty

hakuchi · Dec 6, 2010 · 682ea0b · 682ea0b
1 parent 0adda4b
commit 682ea0b
Show file tree

Hide file tree

Showing 11 changed files with 289 additions and 97 deletions.
diff --git a/embedded/information.svg b/embedded/information.svg
diff --git a/net/systemeD/potlatch2/RelationSelectPanel.mxml b/net/systemeD/potlatch2/RelationSelectPanel.mxml
@@ -60,8 +60,8 @@
     <mx:List width="100%" height="100%" id="relationSelector" verticalScrollPolicy="on"> 
     </mx:List>
     <mx:ControlBar>
-      <mx:Button label="New Relation..." click="closeAndNewRelation();"/>
+      <mx:Button label="New Relation..." click="closeAndNewRelation();" styleName="titleWindowButton" />
       <mx:Spacer width="100%"/>
-      <mx:Button label="Select" click="updateEntityAndClose();" enabled="{relationSelector.selectedItem != null? true : false}"/>
+      <mx:Button label="Select" click="updateEntityAndClose();" enabled="{relationSelector.selectedItem != null? true : false}" styleName="titleWindowButton" />
     </mx:ControlBar>
 </mx:TitleWindow>
diff --git a/net/systemeD/potlatch2/TagViewer.mxml b/net/systemeD/potlatch2/TagViewer.mxml
@@ -12,8 +12,10 @@
 <mx:ViewStack id="sidebar" width="100%" height="100%" creationPolicy="all">
   <mx:VBox id="dndPanel" width="100%" height="100%" horizontalScrollPolicy="off" styleName="dndPanelVbox">
     <mx:Text id="dndPanelText" text="{dndPrompt}" width="100%" styleName="helpInfo" />
-	<mx:Repeater id="dndRep" dataProvider="{MapFeatures.getInstance().getCategoriesForType('point')}">
-		<mx:HBox width="100%"><mx:Label text="{dndRep.currentItem.name}:" styleName="dndPanelCategoryLabel"/></mx:HBox>
+	<mx:Repeater id="dndRep" dataProvider="{MapFeatures.getInstance().getCategoriesForType('point')}" styleName="dndRepeater">
+		<mx:HBox width="100%" styleName="dndPanelCategory">
+			<mx:Label text="{dndRep.currentItem.name}:" styleName="dndPanelCategoryLabel"/>
+		</mx:HBox>
 
 		<mx:TileList dataProvider="{dndRep.currentItem.getFeaturesForType('point')}" width="100%" height="1"
 			             rowHeight="32" columnWidth="32" updateComplete="resizePOIGrid(event)" styleName="dndPanelTileList">
@@ -54,9 +56,11 @@
           <mx:HBox width="100%" id="iconContainer" styleName="featureSelector">
             <mx:Image id="iconImage"/>
             <mx:Text condenseWhite="true" width="100%" id="iconText" styleName="dndIconText"/>
-            <mx:LinkButton label="?" click="openDescription()" id="helpLabel" styleName="helpInfo"/>
           </mx:HBox>
-          <mx:PopUpButton id="popupChange" creationComplete="initFeatureBox()" openAlways="true" width="100%" styleName="dndTagPopUpMenu"/>
+          <mx:HBox width="100%">
+            <mx:PopUpButton id="popupChange" creationComplete="initFeatureBox()" openAlways="true" width="100%" styleName="dndTagPopUpMenu"/>
+            <mx:LinkButton icon="@Embed('../../../embedded/information.svg')" click="openDescription()" id="helpLabel" styleName="helpInfo"/>
+          </mx:HBox>
         </mx:VBox>
       </mx:VBox>
       <mx:VBox width="100%" height="100%" label="Advanced" id="advancedContainer" initialize="checkAdvanced()" verticalGap="1">
@@ -257,10 +261,10 @@
 			iconText.htmlText = "<i>Nothing selected</i>";
             tw.setNoSelectedFeature();
 		  } else if (entity.hasTags()) {
-			iconText.htmlText = "<b>Not recognised</b><br/>Try looking at the tags under the advanced properties";
+			iconText.htmlText = "<b>Not recognised</b><br/><font size='10pt'>Try looking at the tags under the advanced properties</font>";
             tw.setSelectedFeature(null);
 		  } else {
-			iconText.htmlText = "<b>No tags set</b><br/>Please use the menu below to define what this "+entity.getType()+" is";
+			iconText.htmlText = "<b>No tags set</b><br/><font size='10pt'>Please use the menu below to define what this "+entity.getType()+" is</font>";
             tw.setSelectedFeature(null);
           }
           helpLabel.visible = false;

diff --git a/net/systemeD/potlatch2/Toolbox.mxml b/net/systemeD/potlatch2/Toolbox.mxml
@@ -2,10 +2,7 @@
 <mx:Panel
 	xmlns:mx="http://www.adobe.com/2006/mxml"
 	xmlns:potlatch2="net.systemeD.potlatch2.*"
-	height="76" width="129" 
-	headerHeight="6" headerColors="[black, gray]" 
-	borderThicknessRight="0" borderThicknessLeft="0" borderThicknessBottom="0" 
-	paddingLeft="4" paddingTop="4" layout="absolute"
+	height="76" width="129" layout="absolute"
 	styleName="theToolBox">
 
 		<mx:Image data="@Embed('../../../embedded/close_small.png')"

diff --git a/net/systemeD/potlatch2/help/HelpDialog.mxml b/net/systemeD/potlatch2/help/HelpDialog.mxml
@@ -342,7 +342,7 @@
   <mx:ControlBar>
     <mx:Label text="Version: {Application.application.version} Build: {Application.application.build_number}" />
     <mx:Spacer width="100%"/>
-    <mx:Button label="Ok" click="PopUpManager.removePopUp(this);"/>
+    <mx:Button label="Ok" click="PopUpManager.removePopUp(this);" styleName="titleWindowButton" />
   </mx:ControlBar>
 
 </mx:TitleWindow>
diff --git a/net/systemeD/potlatch2/options/OptionsDialog.mxml b/net/systemeD/potlatch2/options/OptionsDialog.mxml
@@ -43,12 +43,12 @@
 	<mx:CheckBox width="100%" label="Use custom cursors" selected="true" id="cursorcheck"
 	    change="Application.application.theController.cursorsEnabled=cursorcheck.selected" />
 
-    <mx:CheckBox width="100%" label="Highlight Unedited TIGER" selected="false" id="tigercheck"
+    <mx:CheckBox width="100%" label="Highlight unedited TIGER (US roads)" selected="false" id="tigercheck"
         change="tigerToggle()" />
 
   <mx:ControlBar>
     <mx:Spacer width="100%"/>
-    <mx:Button label="Ok" click="PopUpManager.removePopUp(this);"/>
+    <mx:Button label="Ok" click="PopUpManager.removePopUp(this);" styleName="titleWindowButton" />
   </mx:ControlBar>
 
-</mx:TitleWindow>
+</mx:TitleWindow>
diff --git a/net/systemeD/potlatch2/save/OAuthPanel.mxml b/net/systemeD/potlatch2/save/OAuthPanel.mxml
@@ -62,8 +62,8 @@
 	        indeterminate="true"/>
         <mx:Spacer width="100%"/>
 
-	    <mx:Button label="Cancel" click="PopUpManager.removePopUp(this);"/>
-	    <mx:Button id="tryAccessButton" label="Try Access" click="getAccessToken()" enabled="false"/>
+	    <mx:Button label="Cancel" click="PopUpManager.removePopUp(this);" styleName="titleWindowButton" />
+	    <mx:Button id="tryAccessButton" label="Try Access" click="getAccessToken()" enabled="false" styleName="titleWindowButton" />
 	</mx:ControlBar>
 
 	<mx:Script><![CDATA[

diff --git a/net/systemeD/potlatch2/save/SaveDialog.mxml b/net/systemeD/potlatch2/save/SaveDialog.mxml
@@ -70,8 +70,8 @@
 
   <mx:ControlBar>
     <mx:Spacer width="100%"/>
-    <mx:Button id="cancelButton" label="Cancel" click="close();"/>
-    <mx:Button id="saveButton" label="Save >" click="startSave();"/>
+    <mx:Button id="cancelButton" label="Cancel" click="close();" styleName="titleWindowButton" />
+    <mx:Button id="saveButton" label="Save >" click="startSave();" styleName="titleWindowButton" />
   </mx:ControlBar>
 
   <mx:Script><![CDATA[

diff --git a/potlatch2.mxml b/potlatch2.mxml
@@ -25,11 +25,12 @@
     <mx:WipeRight id="wipeIn" duration="250"/>
 
     <mx:ApplicationControlBar dock="true">
-        <mx:PopUpButton id="bgButton" label="Background" openAlways="true"
+        <mx:PopUpButton id="bgButton" label="Background" openAlways="true" styleName="appBarButton"
             creationComplete="bgButton.popUp = new BackgroundSelector();"/>
-        <mx:PopUpButton id="styleButton" label="Map Style" openAlways="true"
+        <mx:PopUpButton id="styleButton" label="Map Style" openAlways="true" styleName="appBarButton"
             creationComplete="styleButton.popUp = new StyleSelector();"/>
-		<mx:PopUpMenuButton id="gpsButton" itemClick="if (event.index==0) { trackLoader.load(); } else { new MyGpxDialog().init(); }">
+		<mx:PopUpMenuButton id="gpsButton" styleName="appBarButton"
+		    itemClick="if (event.index==0) { trackLoader.load(); } else { new MyGpxDialog().init(); }">
 			<mx:dataProvider>
 				<mx:Array>
 					<mx:Object label="GPS data" />
@@ -38,15 +39,15 @@
 			</mx:dataProvider>
 		</mx:PopUpMenuButton>
         <mx:Spacer width="100%"/>
-        <mx:Button label="Undo" click="MainUndoStack.getGlobalStack().undo();"
+        <mx:Button label="Undo" click="MainUndoStack.getGlobalStack().undo();" styleName="appBarButton"
             enabled="{MainUndoStack.getGlobalStack().canUndo()}"/>
-        <mx:Button label="Redo" click="MainUndoStack.getGlobalStack().redo();"
+        <mx:Button label="Redo" click="MainUndoStack.getGlobalStack().redo();" styleName="appBarButton"
             enabled="{MainUndoStack.getGlobalStack().canRedo()}"/>
         <mx:Spacer width="100%"/>
-        <mx:Button label="Help" click="new HelpDialog().init();" />
-        <mx:Button label="Options" click="new OptionsDialog().init();" /> 
-        <mx:Button label="Save" icon="@Embed('embedded/save.svg')" disabledIcon="@Embed('embedded/save_disabled.svg')" click="SaveManager.saveChanges();" id="saveButton"
-			enabled="false"/>
+        <mx:Button label="Help" click="new HelpDialog().init();" styleName="appBarButton" />
+        <mx:Button label="Options" click="new OptionsDialog().init();" styleName="appBarButton" /> 
+        <mx:Button label="Save" icon="@Embed('embedded/save.svg')" disabledIcon="@Embed('embedded/save_disabled.svg')" styleName="appBarButton"
+			click="SaveManager.saveChanges();" id="saveButton" enabled="false"/>
     </mx:ApplicationControlBar>
 
     <mx:HDividedBox width="100%" height="100%">

diff --git a/resources/map_features.xml b/resources/map_features.xml
@@ -450,11 +450,11 @@ Quick documentation:
         name="Bike lanes" category="Cycle" description="Road has bike lanes within the road surface"
         key="cycleway" layout="horizontal">
       <choice value="no" text="No bike lanes"/>
-      <choice value="opposite" text="No, but two-way bicycle traffic permitted" description="The route may be cycled in the direction opposite of other traffic, but does not have a dedicated lane. Common in Belgium, Netherlands, Denmark."/>
-      <choice value="lane" text="Standard bike lane" description="Separated by painted line"/>
-      <choice value="track" text="Copenhagen-style bike lane" description="Separated by kerb or parked cars"/>
-      <choice value="opposite_lane" text="Two-way bike lane" description="Separated by painted line, and allowing bicycles in both directions in an otherwise one-way street."/>
-      <choice value="opposite_track" text="Two-way Copenhagen-style bike lane" description="Separated by kerb or parked cars, and allowing bicycles in both directions in an otherwise one-way street."/>
+      <choice value="lane" text="On-road bike lane" description="Separated by painted line"/>
+      <choice value="track" text="Parallel track" description="Separated by kerb or parked cars"/>
+      <choice value="opposite_lane" text="Contraflow lane" description="Separated by painted line, and allowing bicycles in both directions in an otherwise one-way street."/>
+      <choice value="opposite_track" text="Contraflow track" description="Separated by kerb or parked cars, and allowing bicycles in both directions in an otherwise one-way street."/>
+      <choice value="opposite" text="Contraflow unmarked" description="The route may be cycled in the direction opposite of other traffic, but does not have a dedicated lane."/>
       <help>http://wiki.openstreetmap.org/wiki/Key:cycleway</help>
     </input>
   </inputSet>