Move dialogs into a dialogs/ directory
authorRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 10:56:36 +0000 (11:56 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 10:56:36 +0000 (11:56 +0100)
l10n/map/LocalizationMap.mxml
net/systemeD/potlatch2/BackgroundSelector.mxml
net/systemeD/potlatch2/StyleSelector.mxml
net/systemeD/potlatch2/dialogs/BackgroundDialog.mxml [moved from net/systemeD/potlatch2/BackgroundDialog.mxml with 87% similarity]
net/systemeD/potlatch2/dialogs/MyGpxDialog.mxml [moved from net/systemeD/potlatch2/mygpx/MyGpxDialog.mxml with 100% similarity]
net/systemeD/potlatch2/dialogs/OptionsDialog.mxml [moved from net/systemeD/potlatch2/options/OptionsDialog.mxml with 100% similarity]
net/systemeD/potlatch2/dialogs/VectorSourceDialog.mxml [moved from net/systemeD/potlatch2/VectorSourceDialog.mxml with 100% similarity]
potlatch2.mxml

index 3b8d932..08e5ce9 100644 (file)
@@ -22,7 +22,7 @@
       import net.systemeD.potlatch2.save.OAuthPanel;
       import net.systemeD.potlatch2.save.SaveDialog;
 
-      import net.systemeD.potlatch2.options.OptionsDialog;
+      import net.systemeD.potlatch2.dialogs.OptionsDialog;
 
       private function onLocaleChanged(event:Event):void {
           var rMngr : IResourceManager = ResourceManager.getInstance();
index 4b339d0..9ae7f76 100644 (file)
@@ -27,6 +27,7 @@
                import net.systemeD.halcyon.*;
                import net.systemeD.halcyon.connection.*;
                import net.systemeD.potlatch2.*;
+               import net.systemeD.potlatch2.dialogs.*;
                import net.systemeD.potlatch2.collections.Imagery;
                import mx.core.*;
                import mx.collections.ArrayCollection;
index 057e6f8..331dd04 100644 (file)
@@ -18,6 +18,7 @@
                import net.systemeD.halcyon.connection.*;
                import net.systemeD.potlatch2.*;
                import net.systemeD.potlatch2.collections.Stylesheets;
+               import net.systemeD.potlatch2.dialogs.*;
                import mx.core.*;
     ]]></fx:Script>
 </mx:VBox>
         <mx:DataGridColumn editable="false" headerText="Key" width="70">
                        <mx:itemRenderer>
                                <fx:Component>
-                               <mx:ComboBox
-                                       selectedItem="{FunctionKeyManager.instance().getKeyFor(outerDocument.title,data.name)}"
-                                   dataProvider="{FunctionKeyManager.fkeysCollection}"
-                                       change="FunctionKeyManager.instance().setKeyFromFString(selectedItem as String,outerDocument.title,data.name)" />
+                                       <mx:ComboBox
+                                               selectedItem="{FunctionKeyManager.instance().getKeyFor(outerDocument.title,data.name)}"
+                                           dataProvider="{FunctionKeyManager.fkeysCollection}"
+                                               change="FunctionKeyManager.instance().setKeyFromFString(selectedItem as String,outerDocument.title,data.name)">
+                                               <fx:Script><![CDATA[ import net.systemeD.potlatch2.FunctionKeyManager; ]]></fx:Script>
+                                       </mx:ComboBox>
                                </fx:Component>
                        </mx:itemRenderer>
                </mx:DataGridColumn>
index 87c1e5c..b234f47 100644 (file)
@@ -99,7 +99,7 @@
                import net.systemeD.potlatch2.collections.*;
                import net.systemeD.potlatch2.controller.*;
                import net.systemeD.potlatch2.help.*;
-               import net.systemeD.potlatch2.options.*;
+               import net.systemeD.potlatch2.dialogs.*;
                import net.systemeD.potlatch2.utils.*;
         import net.systemeD.potlatch2.mygpx.*;
                import net.systemeD.controls.FloatingAlert;