Module: nagvis Branch: master Commit: 20c6903e3be8d2b35c245d7a6d0e5e55f3271c26 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/commit/?id=20c6903e3be8d2b35c245d7a6d0e5e55f3271c26
Author: Andriy Skuratov <[email protected]> Date: Thu Aug 27 13:43:13 2009 +0300 gmap:Now object selection is not available until user selects object type. --- uifx/src/modules/gmap/view/DialogLink.mxml | 47 +++++++++++------------ uifx/src/modules/gmap/view/DialogLocation.mxml | 48 +++++++++++------------ 2 files changed, 45 insertions(+), 50 deletions(-) diff --git a/uifx/src/modules/gmap/view/DialogLink.mxml b/uifx/src/modules/gmap/view/DialogLink.mxml index 3ce71ad..789eaba 100644 --- a/uifx/src/modules/gmap/view/DialogLink.mxml +++ b/uifx/src/modules/gmap/view/DialogLink.mxml @@ -273,30 +273,31 @@ switch (lnkNObjectType.selectedIndex) { case 0: - lnkNObject.textInput.enabled = false; + lnkNObject.visible = false; lnkNObject.dataProvider = null; lnkNObject.browserFields = null; lnkNObject.labelFunction = null; + break; case 1: - lnkNObject.textInput.enabled = true; + lnkNObject.visible = true; lnkNObject.dataProvider = hosts; lnkNObject.browserFields = ["name", "address", "alias"]; lnkNObject.labelFunction = hostLabelFunction; break; case 2: - lnkNObject.textInput.enabled = true; + lnkNObject.visible = true; lnkNObject.dataProvider = services; lnkNObject.browserFields = ["host", "description"]; lnkNObject.labelFunction = serviceLabelFunction; break; case 3: - lnkNObject.textInput.enabled = true; + lnkNObject.visible = true; lnkNObject.dataProvider = hostgroups; lnkNObject.browserFields = ["name", "alias"]; lnkNObject.labelFunction = groupLabelFunction; break; case 4: - lnkNObject.textInput.enabled = true; + lnkNObject.visible = true; lnkNObject.dataProvider = servicegroups; lnkNObject.browserFields = ["name", "alias"]; lnkNObject.labelFunction = groupLabelFunction; @@ -407,6 +408,12 @@ } ]]> </mx:Script> + <mx:Style> + .noObject + { + fontWeight: bold; + } + </mx:Style> <mx:XML format="e4x" id="autoCompleteMenu"> <root> <menuitem data="browse" label="Browse..."/> @@ -449,14 +456,9 @@ <mx:Canvas label="Monitored Object" width="100%" height="100%"> <mx:VBox left="5" right="5" top="10" bottom="0" borderStyle="solid" cornerRadius="4" borderColor="#000000" verticalAlign="middle"> <mx:Spacer/> - <mx:HBox width="100%"> - <mx:Spacer/> - <mx:Label text="Type:" left="10" top="10" height="18"/> - <mx:Spacer/> - </mx:HBox> - <mx:HBox width="100%"> - <mx:Spacer/> - <mx:ComboBox id="lnkNObjectType" width="100%" change="onObjectTypeChange()"> + <mx:Canvas width="100%"> + <mx:Label text="Type:" left="5" right="5" top="0"/> + <mx:ComboBox id="lnkNObjectType" left="5" right="5" top="20" change="onObjectTypeChange()"> <mx:ArrayCollection> <mx:String></mx:String> <mx:String>Host</mx:String> @@ -465,24 +467,19 @@ <mx:String>Service Group</mx:String> </mx:ArrayCollection> </mx:ComboBox> - <mx:Spacer/> - </mx:HBox> - <mx:HBox width="100%"> - <mx:Spacer/> - <mx:Label text="Object:" top="70" left="10"/> - <mx:Spacer/> - </mx:HBox> - <mx:HBox width="100%"> - <mx:Spacer/> - <hc:AdvancedAutoComplete id="lnkNObject" width="100%" + <mx:Label text="Object:" left="5" right="5" top="50"/> + <mx:Label text="None" styleName="noObject" + left="50" right="5" top="70" + /> + <hc:AdvancedAutoComplete id="lnkNObject" + left="5" right="5" top="70" visible="false" creationComplete="initNObject()" focusIn="loadNagiosData()" selectedItemStyleName="underline" labelFunction="groupLabelFunction" matchType="anyPart" allowMultipleSelection="false" showRemoveIcon="true" actionsMenuDataProvider="{autoCompleteMenu}" itemClick="objectItemClick(event)" browserFields="{['name', 'alias']}" /> - <mx:Spacer/> - </mx:HBox> + </mx:Canvas> </mx:VBox> <mx:TextInput cornerRadius="10" text=" Associate with" top="0" left="15" width="90" borderStyle="solid" editable="false"/> </mx:Canvas> diff --git a/uifx/src/modules/gmap/view/DialogLocation.mxml b/uifx/src/modules/gmap/view/DialogLocation.mxml index 4997a12..c593b47 100644 --- a/uifx/src/modules/gmap/view/DialogLocation.mxml +++ b/uifx/src/modules/gmap/view/DialogLocation.mxml @@ -115,6 +115,7 @@ { locNObjectType.selectedIndex = 0; onObjectTypeChange(); + locNObject.selectedItem = null; } if (location.action && location.action.length > 0) @@ -251,30 +252,31 @@ switch (locNObjectType.selectedIndex) { case 0: - locNObject.textInput.enabled = false; + locNObject.visible = false; locNObject.dataProvider = null; locNObject.browserFields = null; locNObject.labelFunction = null; + break; case 1: - locNObject.textInput.enabled = true; + locNObject.visible = true; locNObject.dataProvider = hosts; locNObject.browserFields = ["name", "address", "alias"]; locNObject.labelFunction = hostLabelFunction; break; case 2: - locNObject.textInput.enabled = true; + locNObject.visible = true; locNObject.dataProvider = services; locNObject.browserFields = ["host", "description"]; locNObject.labelFunction = serviceLabelFunction; break; case 3: - locNObject.textInput.enabled = true; + locNObject.visible = true; locNObject.dataProvider = hostgroups; locNObject.browserFields = ["name", "alias"]; locNObject.labelFunction = groupLabelFunction; break; case 4: - locNObject.textInput.enabled = true; + locNObject.visible = true; locNObject.dataProvider = servicegroups; locNObject.browserFields = ["name", "alias"]; locNObject.labelFunction = groupLabelFunction; @@ -384,6 +386,12 @@ } ]]> </mx:Script> + <mx:Style> + .noObject + { + fontWeight: bold; + } + </mx:Style> <mx:XML format="e4x" id="autoCompleteMenu"> <root> <menuitem data="browse" label="Browse..."/> @@ -425,14 +433,9 @@ <mx:Canvas label="Monitored Object" width="100%" height="100%"> <mx:VBox left="5" right="5" top="10" bottom="0" borderStyle="solid" cornerRadius="4" borderColor="#000000" verticalAlign="middle"> <mx:Spacer/> - <mx:HBox width="100%"> - <mx:Spacer/> - <mx:Label text="Type:" left="10" top="10" height="18"/> - <mx:Spacer/> - </mx:HBox> - <mx:HBox width="100%"> - <mx:Spacer/> - <mx:ComboBox id="locNObjectType" width="100%" change="onObjectTypeChange()"> + <mx:Canvas width="100%"> + <mx:Label text="Type:" left="5" right="5" top="0"/> + <mx:ComboBox id="locNObjectType" left="5" right="5" top="20" change="onObjectTypeChange()"> <mx:ArrayCollection> <mx:String></mx:String> <mx:String>Host</mx:String> @@ -441,24 +444,19 @@ <mx:String>Service Group</mx:String> </mx:ArrayCollection> </mx:ComboBox> - <mx:Spacer/> - </mx:HBox> - <mx:HBox width="100%"> - <mx:Spacer/> - <mx:Label text="Object:" top="70" left="10"/> - <mx:Spacer/> - </mx:HBox> - <mx:HBox width="100%"> - <mx:Spacer/> - <hc:AdvancedAutoComplete id="locNObject" width="100%" + <mx:Label text="Object:" left="5" right="5" top="50"/> + <mx:Label text="None" styleName="noObject" + left="50" right="5" top="70" + /> + <hc:AdvancedAutoComplete id="locNObject" + left="5" right="5" top="70" visible="false" creationComplete="initNObject()" focusIn="loadNagiosData()" selectedItemStyleName="underline" labelFunction="groupLabelFunction" matchType="anyPart" allowMultipleSelection="false" showRemoveIcon="true" actionsMenuDataProvider="{autoCompleteMenu}" itemClick="objectItemClick(event)" browserFields="{['name', 'alias']}" /> - <mx:Spacer/> - </mx:HBox> + </mx:Canvas> </mx:VBox> <mx:TextInput cornerRadius="10" text=" Associate with" top="0" left="15" width="90" borderStyle="solid" editable="false"/> </mx:Canvas> ------------------------------------------------------------------------------ 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
