Module: nagvis Branch: master Commit: 768921ec02dd4d355c55dad873ad414750f2ef2f URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/commit/?id=768921ec02dd4d355c55dad873ad414750f2ef2f
Author: Andriy Skuratov <[email protected]> Date: Tue Jul 14 17:01:58 2009 +0300 Started the Relating UI --- uifx/deploy.wscp | 5 ++ uifx/libs/flexlib.swc | Bin 0 -> 297817 bytes uifx/libs/map_flex_1_9.swc | Bin 0 -> 73854 bytes .../gmap/{DialogLinks.mxml => DialogLink.mxml} | 7 --- .../gmap/{DialogEdit.mxml => DialogLocation.mxml} | 31 ------------ uifx/src/modules/gmap/DialogRelation.mxml | 51 ++++++++++++++++++++ uifx/src/modules/gmap/GMapModule.as | 6 +- uifx/src/modules/gmap/GMapModule.css | 13 +++++ uifx/src/modules/gmap/GMapModule.mxml | 22 +++++++- 9 files changed, 91 insertions(+), 44 deletions(-) diff --git a/uifx/deploy.wscp b/uifx/deploy.wscp new file mode 100644 index 0000000..54309f2 --- /dev/null +++ b/uifx/deploy.wscp @@ -0,0 +1,5 @@ +open scp://root:moni...@%server% +lcd bin/debug/ +cd %RPATH% +synchronize -mirror remote +exit \ No newline at end of file diff --git a/uifx/libs/flexlib.swc b/uifx/libs/flexlib.swc new file mode 100644 index 0000000..597c87b Binary files /dev/null and b/uifx/libs/flexlib.swc differ diff --git a/uifx/libs/map_flex_1_9.swc b/uifx/libs/map_flex_1_9.swc new file mode 100644 index 0000000..7b97c6c Binary files /dev/null and b/uifx/libs/map_flex_1_9.swc differ diff --git a/uifx/src/modules/gmap/DialogLinks.mxml b/uifx/src/modules/gmap/DialogLink.mxml similarity index 78% rename from uifx/src/modules/gmap/DialogLinks.mxml rename to uifx/src/modules/gmap/DialogLink.mxml index 3af7c8f..9b02213 100644 --- a/uifx/src/modules/gmap/DialogLinks.mxml +++ b/uifx/src/modules/gmap/DialogLink.mxml @@ -24,11 +24,4 @@ <mx:Button label="Link" right="20" bottom="10" click="dispatchEvent(new Event('link'))"/> <mx:ComboBox top="40" left="10" right="20" id="point1"></mx:ComboBox> <mx:ComboBox top="70" left="10" right="20" id="point2"></mx:ComboBox> - <mx:DataGrid top="100" left="10" right="20" id="services" height="160"> - <mx:columns> - <mx:DataGridColumn width="15" dataField="selected" itemRenderer="mx.controls.CheckBox"/> - <mx:DataGridColumn dataField="description"/> - <mx:DataGridColumn dataField="host"/> - </mx:columns> - </mx:DataGrid> </Dialog> diff --git a/uifx/src/modules/gmap/DialogEdit.mxml b/uifx/src/modules/gmap/DialogLocation.mxml similarity index 83% rename from uifx/src/modules/gmap/DialogEdit.mxml rename to uifx/src/modules/gmap/DialogLocation.mxml index aef655a..6dde1aa 100644 --- a/uifx/src/modules/gmap/DialogEdit.mxml +++ b/uifx/src/modules/gmap/DialogLocation.mxml @@ -56,28 +56,6 @@ } ]]> </mx:Script> - <mx:Style> - @font-face - { - fontFamily: embededArial; - src: local("Arial"); - font-weight: bold; - advancedAntiAliasing: true; - } - .accordion - { - borderStyle: none; - headerStyleName: accordionHeader; - headerWidth: 16; - } - .accordionHeader - { - fontFamily: embededArial; - fontWeight: bold; - fontSize: 10; - } - </mx:Style> - <flexlib:HAccordion left="10" right="20" top="40" bottom="40" styleName="accordion" creationPolicy="all"> <mx:Canvas label="General" width="100%" height="100%"> <flexlib:PromptingTextInput id="locName" prompt="Name" @@ -98,15 +76,6 @@ right="10" left="10" top="0" bottom="0" /> </mx:Canvas> - <mx:Canvas label="Hosts" width="100%" height="100%"> - <mx:DataGrid id="locHosts" height="100%" right="10" left="10" top="0" bottom="0"> - <mx:columns> - <mx:DataGridColumn width="15" dataField="selected" itemRenderer="mx.controls.CheckBox"/> - <mx:DataGridColumn dataField="name"/> - <mx:DataGridColumn dataField="address"/> - </mx:columns> - </mx:DataGrid> - </mx:Canvas> <mx:Canvas label="Actions" width="100%" height="100%" horizontalScrollPolicy="off"> <mx:RadioButtonGroup id="clickGroup"/> <mx:VBox left="5" right="0" top="10" bottom="0" borderStyle="solid" cornerRadius="4" borderColor="#000000" verticalAlign="middle"> diff --git a/uifx/src/modules/gmap/DialogRelation.mxml b/uifx/src/modules/gmap/DialogRelation.mxml new file mode 100644 index 0000000..0c11c5a --- /dev/null +++ b/uifx/src/modules/gmap/DialogRelation.mxml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + 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 xmlns="modules.gmap.*" + xmlns:mx="http://www.adobe.com/2006/mxml"; + xmlns:flexlib="http://code.google.com/p/flexlib/"; + xmlns:ns1="flexlib.controls.*"> + <flexlib:HAccordion left="10" right="20" top="40" bottom="40" styleName="accordion" creationPolicy="all" selectedIndex="1"> + <mx:Canvas label="Hosts" width="100%" height="100%"> + </mx:Canvas> + <mx:Canvas label="Services" width="100%" height="100%"> + <mx:DataGrid right="0" left="0" bottom="0" top="30" showHeaders="false" paddingLeft="2" paddingRight="2" paddingBottom="0" paddingTop="0"> + <mx:columns> + <mx:DataGridColumn dataField="col1"/> + <mx:DataGridColumn dataField="col2"/> + <mx:DataGridColumn dataField="col3"/> + <mx:DataGridColumn dataField="col4"/> + </mx:columns> + </mx:DataGrid> + <mx:HBox y="0" width="100%" horizontalGap="1"> + <ns1:PromptingTextInput width="100%" prompt="Name"/> + <ns1:PromptingTextInput width="100%" prompt="Host"/> + <ns1:PromptingTextInput width="100%" prompt="Location"/> + <ns1:PromptingTextInput width="100%" prompt="Service"/> + </mx:HBox> + </mx:Canvas> + <mx:Canvas label="HostGroups" width="100%" height="100%"> + </mx:Canvas> + <mx:Canvas label="ServiceGroups" width="100%" height="100%"> + </mx:Canvas> + </flexlib:HAccordion> + <mx:Button label="Relate with" right="340" bottom="10"/> + <mx:ComboBox width="150" right="180" bottom="10"></mx:ComboBox> + <mx:ComboBox width="150" right="20" bottom="10"></mx:ComboBox> +</Dialog> diff --git a/uifx/src/modules/gmap/GMapModule.as b/uifx/src/modules/gmap/GMapModule.as index a840f62..953a977 100644 --- a/uifx/src/modules/gmap/GMapModule.as +++ b/uifx/src/modules/gmap/GMapModule.as @@ -130,7 +130,7 @@ private function getLocations_handler(event : ResultEvent) : void linksBox.point1.dataProvider = locations; linksBox.point2.dataProvider = locations; - linksBox.services.dataProvider = services; + //linksBox.services.dataProvider = services; locationsView.showLocations(); @@ -216,7 +216,7 @@ private function getHosts_handler(event : ResultEvent) : void for each (var host : Host in result) hosts.addItem(host); - locationBox.locHosts.dataProvider = hosts; + //locationBox.locHosts.dataProvider = hosts; } private function getServices_handler(event : ResultEvent) : void @@ -227,7 +227,7 @@ private function getServices_handler(event : ResultEvent) : void for each (var service : Service in result) services.addItem(service); - linksBox.services.dataProvider = services; + //linksBox.services.dataProvider = services; } /*********************************************/ diff --git a/uifx/src/modules/gmap/GMapModule.css b/uifx/src/modules/gmap/GMapModule.css index ed50948..040f037 100644 --- a/uifx/src/modules/gmap/GMapModule.css +++ b/uifx/src/modules/gmap/GMapModule.css @@ -41,3 +41,16 @@ PromptingTextArea borderColor : #000000; cornerRadius : 4; } + +.accordion +{ + borderStyle: none; + headerStyleName: accordionHeader; + headerWidth: 16; +} +.accordionHeader +{ + fontFamily: embededArial; + fontWeight: bold; + fontSize: 10; +} diff --git a/uifx/src/modules/gmap/GMapModule.mxml b/uifx/src/modules/gmap/GMapModule.mxml index a35c64c..b46271d 100644 --- a/uifx/src/modules/gmap/GMapModule.mxml +++ b/uifx/src/modules/gmap/GMapModule.mxml @@ -24,6 +24,15 @@ 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[ @@ -54,16 +63,23 @@ currentState="right-contracted" /> <ui:EdgeBoxGroup id="ebg"/> - <gmap:DialogLinks id="linksBox" group="{ebg}" + <gmap:DialogRelation id="relationBox" group="{ebg}" + logo="{settingsImage}" + y="{linksBox.y + linksBox.height + 5}" right="-10" width="610" + expandedWidth="600" expandedHeight="300" + contractedWidth="40" contractedHeight="40" + currentState="right-contracted" + /> + <gmap:DialogLink id="linksBox" group="{ebg}" logo="{viewpointImage}" y="{locationBox.y + locationBox.height + 5}" right="-10" width="310" - expandedWidth="300" expandedHeight="300" + expandedWidth="300" expandedHeight="150" contractedWidth="40" contractedHeight="40" currentState="right-contracted" link="onLink()" expanded="onShowLinkBox()" /> - <gmap:DialogEdit id="locationBox" group="{ebg}" + <gmap:DialogLocation id="locationBox" group="{ebg}" logo="{editImage}" y="{searchBox.y + searchBox.height + 5}" right="-10" width="310" expandedWidth="300" expandedHeight="220" ------------------------------------------------------------------------------ Enter the BlackBerry Developer Challenge This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
