Skip to content

Commit

Permalink
Updating to compile under the release version of Flash Builder 4.
Browse files Browse the repository at this point in the history
Adding a ton of Iptscrae commands.
Fixing some bugs.
Sorry for the over-loaded commit. :-(
  • Loading branch information
theturtle32 committed Apr 8, 2010
1 parent 9914e17 commit 6659639
Show file tree
Hide file tree
Showing 30 changed files with 409 additions and 99 deletions.
1 change: 1 addition & 0 deletions AS3Iptscrae/.actionScriptProperties
Expand Up @@ -17,3 +17,4 @@
<modules/>
<buildCSSFiles/>
</actionScriptProperties>

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<s:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:s="library://ns.adobe.com/flex/spark"
xmlns:mx="library://ns.adobe.com/flex/halo">
xmlns:mx="library://ns.adobe.com/flex/halo" xmlns:mx1="library://ns.adobe.com/flex/mx">

<fx:Script>
<![CDATA[
Expand Down Expand Up @@ -139,7 +139,7 @@
</s:HGroup>

<s:VGroup height="60" width="100%">
<mx:Text id="scriptContextDisplay" width="100%" truncateToFit="true" fontFamily="Courier New" />
<mx1:Text id="scriptContextDisplay" width="100%" truncateToFit="true" fontFamily="Courier New" />
</s:VGroup>

<s:HGroup>
Expand Down
2 changes: 1 addition & 1 deletion FlashPalace/.actionScriptProperties
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<actionScriptProperties mainApplicationPath="FlashPalace.mxml" projectUUID="1c0dca64-10f6-4eba-bc70-654fd09d859a" version="6">
<compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="true" copyDependentFiles="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
<compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="true" copyDependentFiles="true" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
<compilerSourcePath/>
<libraryPath defaultLinkType="3">
<libraryPathEntry kind="4" path=""/>
Expand Down
4 changes: 2 additions & 2 deletions FlashPalace/src/FlashPalace.mxml
Expand Up @@ -2,7 +2,7 @@
<s:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:s="library://ns.adobe.com/flex/spark" xmlns:mx="library://ns.adobe.com/flex/halo" minWidth="800" minHeight="450"
skinClass="FlashPalaceApplicationSkin"
applicationComplete="handleApplicationComplete()"
creationComplete="handleCreationComplete()" xmlns:code="http://code.google.com/p/flexlib/" xmlns:view="net.codecomposer.palace.view.*" xmlns:local="*">
creationComplete="handleCreationComplete()" xmlns:code="http://code.google.com/p/flexlib/" xmlns:view="net.codecomposer.palace.view.*" xmlns:local="*" xmlns:mx1="library://ns.adobe.com/flex/mx">
<s:layout>
<s:BasicLayout/>
</s:layout>
Expand Down Expand Up @@ -452,7 +452,7 @@
<s:ToggleButton id="propsButton" label="Props" click="handlePropsClick(event)" />
<s:ToggleButton id="preferencesButton" label="Preferences" click="handlePreferencesClick(event)" />
<s:ToggleButton id="debugButton" label="Debug" click="handleDebugClick(event)" visible="false" includeInLayout="false" />
<mx:Spacer width="15" />
<mx1:Spacer width="15" />
<s:Label text="Zoom:" />
<s:HSlider id="zoomSlider" width="75" value="1.0" minimum="0.5" maximum="1.5" snapInterval="0.01" liveDragging="true" change="handleZoomChange(event)" />
</s:HGroup>
Expand Down
20 changes: 10 additions & 10 deletions FlashPalace/src/PalaceDirectoryList.mxml
Expand Up @@ -2,7 +2,7 @@
<s:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:s="library://ns.adobe.com/flex/spark"
xmlns:mx="library://ns.adobe.com/flex/halo" width="500" height="350"
creationComplete="handleCreationComplete()">
creationComplete="handleCreationComplete()" xmlns:mx1="library://ns.adobe.com/flex/mx">
<fx:Declarations>
<!-- Place non-visual elements (e.g., services, value objects) here -->
</fx:Declarations>
Expand Down Expand Up @@ -85,16 +85,16 @@
<s:VerticalLayout horizontalAlign="right" />
</s:layout>

<mx:DataGrid itemDoubleClick="handleConnectClick()" id="directoryList" dataProvider="{directory}" width="100%" height="100%" enabled="{!loading}">
<mx1:DataGrid itemDoubleClick="handleConnectClick()" id="directoryList" dataProvider="{directory}" width="100%" height="100%" enabled="{!loading}">

<mx:columns>
<mx:DataGridColumn headerText="Name" dataField="name" width="200" />
<mx:DataGridColumn headerText="Category" dataField="category" width="100" />
<mx:DataGridColumn headerText="Language" dataField="language" width="100" />
<mx:DataGridColumn headerText="Rooms" dataField="roomCount" width="50" />
<mx:DataGridColumn headerText="Users" dataField="population" width="50" />
</mx:columns>
</mx:DataGrid>
<mx1:columns>
<mx1:DataGridColumn headerText="Name" dataField="name" width="200" />
<mx1:DataGridColumn headerText="Category" dataField="category" width="100" />
<mx1:DataGridColumn headerText="Language" dataField="language" width="100" />
<mx1:DataGridColumn headerText="Rooms" dataField="roomCount" width="50" />
<mx1:DataGridColumn headerText="Users" dataField="population" width="50" />
</mx1:columns>
</mx1:DataGrid>

<s:Group right="0">
<s:layout>
Expand Down
14 changes: 7 additions & 7 deletions FlashPalace/src/PreferencesWindow.mxml
Expand Up @@ -4,7 +4,7 @@
layout="absolute"
label="Preferences"
resizable="false"
creationComplete="handleCreationComplete()">
creationComplete="handleCreationComplete()" xmlns:mx1="library://ns.adobe.com/flex/mx">

<fx:Script>
<![CDATA[
Expand Down Expand Up @@ -35,8 +35,8 @@
]]>
</fx:Script>

<mx:TabNavigator top="5" left="5" right="5" bottom="35">
<mx:Canvas width="100%" height="100%" label="General">
<mx1:TabNavigator top="5" left="5" right="5" bottom="35">
<mx1:Canvas width="100%" height="100%" label="General">
<s:VGroup left="5" right="5" bottom="5" top="0">
<s:HGroup gap="3" verticalAlign="middle">
<s:Label text="Name:" />
Expand All @@ -47,13 +47,13 @@
<s:TextInput id="regCode" text="{preferences.regCode}" />
</s:HGroup>
</s:VGroup>
</mx:Canvas>
<mx:Canvas width="100%" height="100%" label="Cyborg">
</mx1:Canvas>
<mx1:Canvas width="100%" height="100%" label="Cyborg">
<s:TextArea width="100%" height="100%"
left="5" right="5" bottom="5" top="0"
id="cyborg" text="{preferences.cyborg}" />
</mx:Canvas>
</mx:TabNavigator>
</mx1:Canvas>
</mx1:TabNavigator>

<s:Button bottom="5" right="5" label="Save" click="handleSave()" />

Expand Down
4 changes: 2 additions & 2 deletions FlashPalace/src/PropsWindow.mxml
Expand Up @@ -4,7 +4,7 @@
xmlns:mx="library://ns.adobe.com/flex/halo" xmlns:code="http://code.google.com/p/flexlib/"
width="250" minWidth="250" minHeight="300" height="410" xmlns:local="*"
layout="absolute"
creationComplete="loadUsersProps();">
creationComplete="loadUsersProps();" xmlns:mx1="library://ns.adobe.com/flex/mx">
<fx:Declarations>
<!-- Place non-visual elements (e.g., services, value objects) here -->
</fx:Declarations>
Expand Down Expand Up @@ -370,7 +370,7 @@
<s:State name="hovered" />
<s:State name="selected" />
</s:states>
<mx:Image left="2" right="2" top="2" bottom="2" loaderContext="{loaderContext}"
<mx1:Image left="2" right="2" top="2" bottom="2" loaderContext="{loaderContext}"
source="{data.imageDataURL}" width="44" height="44" maintainAspectRatio="true"
smoothBitmapContent="true" />
<s:Rect width="100%" height="100%">
Expand Down
4 changes: 2 additions & 2 deletions FlashPalace/src/TestBubble.mxml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<s:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:s="library://ns.adobe.com/flex/spark" xmlns:mx="library://ns.adobe.com/flex/halo" xmlns:local="*" xmlns:view="net.codecomposer.palace.view.*"
backgroundColor="0xCCCCCC"
creationComplete="handleCreationComplete()">
creationComplete="handleCreationComplete()" xmlns:mx1="library://ns.adobe.com/flex/mx">
<s:layout>
<s:BasicLayout/>
</s:layout>
Expand Down Expand Up @@ -38,7 +38,7 @@
isWhisper="{whisperCheckbox.selected}"
click="trace('Click');" />

<mx:ColorPicker left="10" bottom="80" id="colorPicker" change="handleColorChange(event)" />
<mx1:ColorPicker left="10" bottom="80" id="colorPicker" change="handleColorChange(event)" />

<s:Button bottom="10" left="10" label="Try Next Position"
click="chatBubble.tryNextPosition()" />
Expand Down
1 change: 0 additions & 1 deletion IptTest/.actionScriptProperties
Expand Up @@ -8,7 +8,6 @@
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/flex.swc" useDefaultLinkType="false"/>
</excludedEntries>
</libraryPathEntry>
<libraryPathEntry kind="1" linkType="1" path="libs"/>
<libraryPathEntry kind="3" linkType="1" path="/AS3Iptscrae/bin/AS3Iptscrae.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="/PalaceClient/bin/PalaceClient.swc" useDefaultLinkType="false"/>
</libraryPath>
Expand Down
2 changes: 2 additions & 0 deletions IptTest/src/IptTest.mxml
Expand Up @@ -14,6 +14,8 @@ For log output, use the "_TRACE" command:
"Hello there!" _TRACE

To add a breakpoint, type the keyword "_BREAKPOINT" into the code where you want to pause execution.

Apologies, the code display pointer in the step-debugger is a little bit buggy... :)
</fx:String>
</fx:Declarations>

Expand Down
2 changes: 1 addition & 1 deletion PalaceClient/.actionScriptProperties
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<actionScriptProperties mainApplicationPath="PalaceClient.as" projectUUID="5eda4edb-37da-4577-961b-729e470e6d8e" version="6">
<compiler additionalCompilerArguments="" autoRSLOrdering="true" copyDependentFiles="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="true" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
<compiler additionalCompilerArguments="" autoRSLOrdering="true" copyDependentFiles="false" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="true" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
<compilerSourcePath/>
<libraryPath defaultLinkType="1">
<libraryPathEntry kind="4" path=""/>
Expand Down
8 changes: 8 additions & 0 deletions PalaceClient/.flexLibProperties
Expand Up @@ -170,6 +170,14 @@
<classEntry path="net.codecomposer.palace.iptscrae.command.PROPDIMENSIONSCommand"/>
<classEntry path="net.codecomposer.palace.iptscrae.command.LOADPROPSCommand"/>
<classEntry path="net.codecomposer.palace.event.PalaceSecurityErrorEvent"/>
<classEntry path="net.codecomposer.palace.iptscrae.command.SETPICOPACITYCommand"/>
<classEntry path="net.codecomposer.palace.iptscrae.command.GETPICLOCCommand"/>
<classEntry path="net.codecomposer.palace.iptscrae.command.GETSPOTLOCCommand"/>
<classEntry path="net.codecomposer.palace.iptscrae.command.IPTVERSIONCommand"/>
<classEntry path="net.codecomposer.palace.iptscrae.command.SETPICBRIGHTNESSCommand"/>
<classEntry path="net.codecomposer.palace.iptscrae.command.SETPICSATURATIONCommand"/>
<classEntry path="net.codecomposer.palace.iptscrae.command.SETLOCLOCALCommand"/>
<classEntry path="net.codecomposer.palace.iptscrae.command.GETPICDIMENSIONSCommand"/>
</includeClasses>
<includeResources/>
<namespaceManifests/>
Expand Down
Expand Up @@ -8,8 +8,10 @@ package net.codecomposer.palace.event
{
public static const STATE_CHANGED:String = "stateChanged";
public static const MOVED:String = "moved";
public static const OPACITY_CHANGED:String = "opacityChanged";

public var state:int;
public var previousState:int;

public function HotspotEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false)
{
Expand Down
10 changes: 5 additions & 5 deletions PalaceClient/src/net/codecomposer/palace/iptscrae/DebugView.mxml
Expand Up @@ -2,7 +2,7 @@
<s:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:s="library://ns.adobe.com/flex/spark"
xmlns:mx="library://ns.adobe.com/flex/halo" xmlns:local="*"
creationComplete="handleCreationComplete()">
creationComplete="handleCreationComplete()" xmlns:mx1="library://ns.adobe.com/flex/mx" xmlns:view="org.openpalace.iptscrae.view.*">
<fx:Declarations>
<!-- Place non-visual elements (e.g., services, value objects) here -->
</fx:Declarations>
Expand All @@ -29,14 +29,14 @@
<s:CheckBox id="debugModeCheckbox" label="Debug Mode" change="handleDebugModeCheckboxChange()" />
<s:HGroup verticalAlign="middle">
<s:Label text="Hotspot:" />
<mx:ComboBox id="hotspotList" dataProvider="{client.debugData.hotspots}" change="eventHandlerList.selectedIndex = 0;" />
<s:ComboBox id="hotspotList" dataProvider="{client.debugData.hotspots}" change="eventHandlerList.selectedIndex = 0;" />
</s:HGroup>
<s:HGroup verticalAlign="middle">
<s:Label text="Event:" />
<mx:ComboBox id="eventHandlerList" dataProvider="{client.debugData.eventHandlers(PalaceHotspot(hotspotList.selectedItem))}" />
<s:ComboBox id="eventHandlerList" dataProvider="{client.debugData.eventHandlers(PalaceHotspot(hotspotList.selectedItem))}" />
</s:HGroup>
<mx:Text width="100%" height="50%" text="{IptEventHandler(eventHandlerList.selectedItem).script}" />
<local:DebugConsole iptManager="{client.palaceController.scriptManager}" width="100%" height="50%" />
<mx1:Text width="100%" height="50%" text="{IptEventHandler(eventHandlerList.selectedItem).script}" />
<view:DebugConsole iptManager="{client.palaceController.scriptManager}" width="100%" height="50%" />
</s:VGroup>

</s:Group>
Expand Up @@ -7,11 +7,11 @@ package net.codecomposer.palace.iptscrae
public static const TYPE_SELECT:int = 0;
public static const TYPE_LOCK:int = 1;
public static const TYPE_UNLOCK:int = 2;
public static const TYPE_HIDE:int = 3; // Unused
public static const TYPE_SHOW:int = 4; // Unused
public static const TYPE_STARTUP:int = 5; // Unused
public static const TYPE_STATECHANGE:int = 3;
public static const TYPE_MOUSEDRAG:int = 4;
public static const TYPE_MOUSEDOWN:int = 5;
public static const TYPE_ALARM:int = 6;
public static const TYPE_CUSTOM:int = 7; // Unused
public static const TYPE_MOUSEUP:int = 7;
public static const TYPE_INCHAT:int = 8;
public static const TYPE_PROPCHANGE:int = 9; // Unused
public static const TYPE_ENTER:int = 10;
Expand All @@ -29,24 +29,24 @@ package net.codecomposer.palace.iptscrae
public static const TYPE_MACRO7:int = 22;
public static const TYPE_MACRO8:int = 23;
public static const TYPE_MACRO9:int = 24;
public static const TYPE_PPA_MACRO:int = 25; // ?? Unused.. PalacePresents
public static const TYPE_PPA_MACRO:int = 25; // ?? Unused.. Palace Plugin Macro
public static const TYPE_MOUSEMOVE:int = 26;
public static const TYPE_UNHANDLED:int = 27;
public static const TYPE_ROLLOVER:int = 28;
public static const TYPE_ROLLOUT:int = 29;
public static const TYPE_USERMOVE:int = 30;
public static const TYPE_USERENTER:int = 31;
public static const TYPE_PPA_MESSAGE:int = 32; // Unused... PalacePresents Message
public static const TYPE_PPA_MESSAGE:int = 32; // Unused... Palace Plugin Message

public static const EVENT_NAME:Object = {
0: "SELECT",
1: "LOCK",
2: "UNLOCK",
3: "HIDE",
4: "SHOW",
5: "STARTUP",
3: "STATECHANGE",
4: "MOUSEDRAG",
5: "MOUSEDOWN",
6: "ALARM",
7: "CUSTOM",
7: "MOUSEUP",
8: "INCHAT",
9: "PROPCHANGE",
10: "ENTER",
Expand Down Expand Up @@ -85,8 +85,11 @@ package net.codecomposer.palace.iptscrae
case "SELECT":
return IptEventHandler.TYPE_SELECT;
break;
case "LOCK":
return IptEventHandler.TYPE_LOCK;
case "MOUSEDOWN":
return IptEventHandler.TYPE_MOUSEDOWN;
break;
case "STATECHANGE":
return IptEventHandler.TYPE_STATECHANGE;
break;
case "UNLOCK":
return IptEventHandler.TYPE_UNLOCK;
Expand Down Expand Up @@ -157,6 +160,12 @@ package net.codecomposer.palace.iptscrae
case "USERENTER":
return IptEventHandler.TYPE_USERENTER;
break;
case "MOUSEUP":
return IptEventHandler.TYPE_MOUSEUP;
break;
case "MOUSEDRAG":
return IptEventHandler.TYPE_MOUSEDRAG;
break;
default:
return IptEventHandler.TYPE_UNHANDLED;
break;
Expand Down

0 comments on commit 6659639

Please sign in to comment.