Module: nagvis Branch: master Commit: bdbc3a558d213e975d5180497e68dce8a38e5253 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/commit/?id=bdbc3a558d213e975d5180497e68dce8a38e5253
Author: Andriy Skuratov <[email protected]> Date: Mon Aug 3 16:32:15 2009 +0300 Some code changes according to new structure. --- uifx/src/modules/gmap/GMapModule.css | 50 --------------- uifx/src/modules/gmap/GMapModule.mxml | 77 +--------------------- uifx/src/modules/gmap/view/Dialog.as | 2 +- uifx/src/modules/gmap/view/DialogLink.mxml | 2 +- uifx/src/modules/gmap/view/DialogLocation.mxml | 2 +- uifx/src/modules/gmap/view/DialogSearch.mxml | 2 +- uifx/src/modules/gmap/view/DialogSettings.mxml | 2 +- uifx/src/modules/gmap/view/DialogViewpoint.mxml | 2 +- 8 files changed, 10 insertions(+), 129 deletions(-) diff --git a/uifx/src/modules/gmap/GMapModule.css b/uifx/src/modules/gmap/GMapModule.css deleted file mode 100644 index fd62d92..0000000 --- a/uifx/src/modules/gmap/GMapModule.css +++ /dev/null @@ -1,50 +0,0 @@ -/***************************************************************************** - * - * Copyright (C) 2009 NagVis Project - * - * License: - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - *****************************************************************************/ - -Dialog -{ - borderStyle : solid; - borderColor : #000000; - cornerRadius : 10; - backgroundAlpha : 1.0; - backgroundColor : #ffffff; -} - -PromptingTextInput, PromptingTextArea -{ - borderStyle : solid; - borderColor : #000000; - cornerRadius : 4; -} - -.accordion -{ - borderStyle: none; - headerStyleName: accordionHeader; - headerWidth: 16; -} -.accordionHeader -{ - fontFamily: embededArial; - fontWeight: bold; - fontSize: 10; - border-style : none; -} diff --git a/uifx/src/modules/gmap/GMapModule.mxml b/uifx/src/modules/gmap/GMapModule.mxml index 66e46c9..ffdd9cf 100644 --- a/uifx/src/modules/gmap/GMapModule.mxml +++ b/uifx/src/modules/gmap/GMapModule.mxml @@ -19,84 +19,15 @@ --> <mx:Module xmlns:mx="http://www.adobe.com/2006/mxml"; xmlns:gmap="modules.gmap.*" + xmlns:view="modules.gmap.view.*" xmlns:ui="lib.ui.*" - layout="absolute" width="100%" height="100%" + layout="vertical" width="100%" height="100%" horizontalScrollPolicy="off" verticalScrollPolicy="off" creationComplete="init()" > - <mx:Style> - @font-face - { - fontFamily: embededArial; - src: local("Arial"); - font-weight: bold; - advancedAntiAliasing: true; - } - </mx:Style> - <mx:Style source="GMapModule.css" /> - <mx:Script> - <![CDATA[ - [Bindable] [Embed(source="modules/gmap/img/locate.jpg")] - private var searchImage : Class; + + <view:Main width="100%" height="100%"/> - [Bindable] [Embed(source="modules/gmap/img/edit.png")] - private var editImage : Class; - - [Bindable] [Embed(source="modules/gmap/img/map.gif")] - private var viewpointImage : Class; - - [Bindable] [Embed(source="modules/gmap/img/settings.png")] - private var settingsImage : Class; - ]]> - </mx:Script> - <mx:Script source="GMapModule.as"/> - <mx:UIComponent id="mapContainer" width="100%" height="100%"/> - <gmap:DialogSettings id="settingsBox" - logo="{settingsImage}" - bottom="50" right="-10" width="310" - expandedWidth="300" expandedHeight="110" - contractedWidth="40" contractedHeight="40" - currentState="right-contracted" - /> - <ui:EdgeBoxGroup id="ebg"/> - <gmap:DialogLink id="linksBox" group="{ebg}" - logo="{viewpointImage}" - y="{locationBox.y + locationBox.height + 5}" right="-10" width="310" - expandedWidth="300" expandedHeight="150" - contractedWidth="40" contractedHeight="40" - currentState="right-contracted" - link="onLink()" - expanded="onShowLinkBox()" - /> - <gmap:DialogLocation id="locationBox" group="{ebg}" - logo="{editImage}" - y="{searchBox.y + searchBox.height + 5}" right="-10" width="310" - expandedWidth="300" expandedHeight="220" - contractedWidth="40" contractedHeight="40" - currentState="right-contracted" - save="onSaveLocation()" - remove="onDeleteLocation()" - contracted="onHideLocationBox()" - expanded="onShowLocationBox()" - /> - <gmap:DialogSearch id="searchBox" group="{ebg}" - logo="{searchImage}" - y="{viewpointBox.y + viewpointBox.height + 5}" right="-10" width="310" - expandedWidth="300" expandedHeight="130" - contractedWidth="40" contractedHeight="40" - currentState="right-contracted" - locate="onLocateAddress(searchBox.address.text)" - contracted="onHideSearchBox()" - /> - <gmap:DialogViewpoint id="viewpointBox" group="{ebg}" - logo="{viewpointImage}" - y="100" right="-10" width="310" - expandedWidth="300" expandedHeight="220" - contractedWidth="40" contractedHeight="40" - currentState="right-contracted" - save="onSaveViewpoint(viewpointBox.preName.text)" - change="onSelectViewpoint(event)" - /> <mx:RemoteObject id="rViewpoints" destination="zend" source="Viewpoint" fault="fault(event)"> <mx:method name="getAll" result="getViewpoints_handler(event)"/> <mx:method name="add" result="addViewpoint_handler(event)"/> diff --git a/uifx/src/modules/gmap/view/Dialog.as b/uifx/src/modules/gmap/view/Dialog.as index 69d1c5f..9c04ce5 100644 --- a/uifx/src/modules/gmap/view/Dialog.as +++ b/uifx/src/modules/gmap/view/Dialog.as @@ -19,7 +19,7 @@ * *****************************************************************************/ -package modules.gmap +package modules.gmap.view { import flash.events.MouseEvent; diff --git a/uifx/src/modules/gmap/view/DialogLink.mxml b/uifx/src/modules/gmap/view/DialogLink.mxml index 9b02213..a5cd587 100644 --- a/uifx/src/modules/gmap/view/DialogLink.mxml +++ b/uifx/src/modules/gmap/view/DialogLink.mxml @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> -<Dialog xmlns="modules.gmap.*" xmlns:mx="http://www.adobe.com/2006/mxml";> +<Dialog xmlns="modules.gmap.view.*" xmlns:mx="http://www.adobe.com/2006/mxml";> <mx:Metadata> [Event(name="link", type="flash.events.Event")] </mx:Metadata> diff --git a/uifx/src/modules/gmap/view/DialogLocation.mxml b/uifx/src/modules/gmap/view/DialogLocation.mxml index 35612c7..2645c40 100644 --- a/uifx/src/modules/gmap/view/DialogLocation.mxml +++ b/uifx/src/modules/gmap/view/DialogLocation.mxml @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> -<Dialog xmlns="modules.gmap.*" +<Dialog xmlns="modules.gmap.view.*" xmlns:mx="http://www.adobe.com/2006/mxml"; xmlns:flexlib="http://code.google.com/p/flexlib/"; xmlns:hc="com.hillelcoren.components.*" diff --git a/uifx/src/modules/gmap/view/DialogSearch.mxml b/uifx/src/modules/gmap/view/DialogSearch.mxml index d360c77..5bd2c46 100644 --- a/uifx/src/modules/gmap/view/DialogSearch.mxml +++ b/uifx/src/modules/gmap/view/DialogSearch.mxml @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> -<Dialog xmlns="modules.gmap.*" +<Dialog xmlns="modules.gmap.view.*" xmlns:mx="http://www.adobe.com/2006/mxml"; xmlns:flexlib="http://code.google.com/p/flexlib/"; > diff --git a/uifx/src/modules/gmap/view/DialogSettings.mxml b/uifx/src/modules/gmap/view/DialogSettings.mxml index c18382f..3630564 100644 --- a/uifx/src/modules/gmap/view/DialogSettings.mxml +++ b/uifx/src/modules/gmap/view/DialogSettings.mxml @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> -<Dialog xmlns="modules.gmap.*" +<Dialog xmlns="modules.gmap.view.*" xmlns:mx="http://www.adobe.com/2006/mxml"; xmlns:flexlib="http://code.google.com/p/flexlib/"; > diff --git a/uifx/src/modules/gmap/view/DialogViewpoint.mxml b/uifx/src/modules/gmap/view/DialogViewpoint.mxml index a9e4ad3..7612b33 100644 --- a/uifx/src/modules/gmap/view/DialogViewpoint.mxml +++ b/uifx/src/modules/gmap/view/DialogViewpoint.mxml @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> -<Dialog xmlns="modules.gmap.*" +<Dialog xmlns="modules.gmap.view.*" xmlns:mx="http://www.adobe.com/2006/mxml"; xmlns:flexlib="http://code.google.com/p/flexlib/"; > ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
