Move dialogs into a dialogs/ directory

diff --git a/l10n/map/LocalizationMap.mxml b/l10n/map/LocalizationMap.mxml
index 3b8d9322b4187c524e4c73698061d8ca1ce4011f..08e5ce942cda63f89bf481dbb1a817560476b2fd 100644 (file)
--- a/l10n/map/LocalizationMap.mxml
+++ b/l10n/map/LocalizationMap.mxml
@@ -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();

diff --git a/net/systemeD/potlatch2/BackgroundSelector.mxml b/net/systemeD/potlatch2/BackgroundSelector.mxml
index 4b339d0e115b70c3519d5eb60ab3ece6ba48397c..9ae7f763804a1ed37fd390acb08ecef2202cbd15 100644 (file)
--- a/net/systemeD/potlatch2/BackgroundSelector.mxml
+++ b/net/systemeD/potlatch2/BackgroundSelector.mxml
@@ -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;

diff --git a/net/systemeD/potlatch2/StyleSelector.mxml b/net/systemeD/potlatch2/StyleSelector.mxml
index 057e6f817730232910f6ef0b85d1e6f134f9dd7c..331dd04c8dd9ca75764c63aff95b616c9ae26b31 100644 (file)
--- a/net/systemeD/potlatch2/StyleSelector.mxml
+++ b/net/systemeD/potlatch2/StyleSelector.mxml
@@ -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>

diff --git a/net/systemeD/potlatch2/BackgroundDialog.mxml b/net/systemeD/potlatch2/dialogs/BackgroundDialog.mxml
similarity index 87%
rename from net/systemeD/potlatch2/BackgroundDialog.mxml
rename to net/systemeD/potlatch2/dialogs/BackgroundDialog.mxml
index 4c21149bcf385a106e9b8996a4d71ab64a4a8e97..dfca76ed40c6866a21c5e9698917dc5aa46ce112 100644 (file)
--- a/net/systemeD/potlatch2/BackgroundDialog.mxml
+++ b/net/systemeD/potlatch2/dialogs/BackgroundDialog.mxml
@@ -13,10 +13,12 @@
         <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>

diff --git a/net/systemeD/potlatch2/mygpx/MyGpxDialog.mxml b/net/systemeD/potlatch2/dialogs/MyGpxDialog.mxml
similarity index 100%
rename from net/systemeD/potlatch2/mygpx/MyGpxDialog.mxml
rename to net/systemeD/potlatch2/dialogs/MyGpxDialog.mxml

diff --git a/net/systemeD/potlatch2/options/OptionsDialog.mxml b/net/systemeD/potlatch2/dialogs/OptionsDialog.mxml
similarity index 100%
rename from net/systemeD/potlatch2/options/OptionsDialog.mxml
rename to net/systemeD/potlatch2/dialogs/OptionsDialog.mxml

diff --git a/net/systemeD/potlatch2/VectorSourceDialog.mxml b/net/systemeD/potlatch2/dialogs/VectorSourceDialog.mxml
similarity index 100%
rename from net/systemeD/potlatch2/VectorSourceDialog.mxml
rename to net/systemeD/potlatch2/dialogs/VectorSourceDialog.mxml

diff --git a/potlatch2.mxml b/potlatch2.mxml
index 87c1e5c1f3c95e941833598ed395539555c98d56..b234f47801acadb940d34f40041c2da66fb599bf 100644 (file)
--- a/potlatch2.mxml
+++ b/potlatch2.mxml
@@ -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;