You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by yi...@apache.org on 2021/06/18 10:13:30 UTC

[royale-asjs] branch develop updated: Trying to add default skin for required indicator.

This is an automated email from the ASF dual-hosted git repository.

yishayw pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/develop by this push:
     new 25073ec  Trying to add default skin for required indicator.
     new b2134e2  Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
25073ec is described below

commit 25073eceb104175f4355554838b49978c6d38810
Author: Yishay Weiss <yi...@hotmail.com>
AuthorDate: Fri Jun 18 13:10:55 2021 +0300

    Trying to add default skin for required indicator.
    
    May still be an issue with png source path.
    
    Reference #1119
---
 frameworks/projects/MXRoyale/pom.xml               |   8 ++++
 .../src/main/config/compile-swf-config.xml         |   8 ++++
 .../main/resources/assets/icon_error_indicator.png | Bin 0 -> 62212 bytes
 .../resources/assets/icon_required_indicator.png   | Bin 0 -> 47683 bytes
 .../MXRoyale/src/main/resources/defaults.css       |   1 +
 .../src/main/resources/mx-royale-manifest.xml      |   1 +
 .../royale/mx/supportClasses/FormItemRequired.as   |  41 +++++++++++++++++++++
 7 files changed, 59 insertions(+)

diff --git a/frameworks/projects/MXRoyale/pom.xml b/frameworks/projects/MXRoyale/pom.xml
index 6c0de2a..a25a675 100644
--- a/frameworks/projects/MXRoyale/pom.xml
+++ b/frameworks/projects/MXRoyale/pom.xml
@@ -86,6 +86,14 @@
                   <name>assets/icon_style_underline.png</name>
                   <path>../src/main/resources/assets/icon_style_underline.png</path>
               </include-file>
+	      <include-file>
+                  <name>assets/icon_required_indicator.png</name>
+                  <path>../src/main/resources/assets/icon_required_indicator.png</path>
+              </include-file>
+	      <include-file>
+                  <name>assets/icon_error_indicator.png</name>
+                  <path>../src/main/resources/assets/icon_error_indicator.png</path>
+              </include-file>
           </includeFiles>
           <skipExtern>true</skipExtern>
           <skipAS>${royale.skipAS}</skipAS>
diff --git a/frameworks/projects/MXRoyale/src/main/config/compile-swf-config.xml b/frameworks/projects/MXRoyale/src/main/config/compile-swf-config.xml
index 06d5442..51ae658 100644
--- a/frameworks/projects/MXRoyale/src/main/config/compile-swf-config.xml
+++ b/frameworks/projects/MXRoyale/src/main/config/compile-swf-config.xml
@@ -137,6 +137,14 @@
         <name>assets/icon_style_underline.png</name>
         <path>../resources/assets/icon_style_underline.png</path>
     </include-file>
+    <include-file>
+        <name>assets/icon_required_indicator.png</name>
+        <path>../resources/assets/icon_required_indicator.png</path>
+    </include-file>
+    <include-file>
+        <name>assets/icon_error_indicator.png</name>
+        <path>../resources/assets/icon_error_indicator.png</path>
+    </include-file>
 
     <include-lookup-only>true</include-lookup-only>
 
diff --git a/frameworks/projects/MXRoyale/src/main/resources/assets/icon_error_indicator.png b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_error_indicator.png
new file mode 100644
index 0000000..9abe003
Binary files /dev/null and b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_error_indicator.png differ
diff --git a/frameworks/projects/MXRoyale/src/main/resources/assets/icon_required_indicator.png b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_required_indicator.png
new file mode 100644
index 0000000..743beb0
Binary files /dev/null and b/frameworks/projects/MXRoyale/src/main/resources/assets/icon_required_indicator.png differ
diff --git a/frameworks/projects/MXRoyale/src/main/resources/defaults.css b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
index 1404dec..2e23507 100644
--- a/frameworks/projects/MXRoyale/src/main/resources/defaults.css
+++ b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
@@ -298,6 +298,7 @@ FormItem
 {
 	IBeadView: ClassReference("mx.containers.beads.FormItemView");
 	IContentView: ClassReference("mx.containers.beads.FormItemContainer");
+	indicatorSkin: ClassReference("mx.supportClasses.FormItemRequired");
 	indicatorGap: 14px;
 }
 
diff --git a/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml b/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
index 8732f23..b14ee7a 100644
--- a/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
+++ b/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
@@ -80,6 +80,7 @@
     <component id="Transition" class="mx.states.Transition" />
 	<component id="ListItemRenderer" class="mx.controls.listClasses.ListItemRenderer" />
 	<component id="ButtonItemRenderer" class="mx.supportClasses.ButtonItemRenderer" />
+	<component id="FormItemRequired" class="mx.supportClasses.FormItemRequired" />
 	<component id="ArrayList" class="mx.collections.ArrayList"/>
 	<component id="UIComponent" class="mx.core.UIComponent"/>
 	<component id="Container" class="mx.core.Container"/>
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/supportClasses/FormItemRequired.as b/frameworks/projects/MXRoyale/src/main/royale/mx/supportClasses/FormItemRequired.as
new file mode 100644
index 0000000..a64a94f
--- /dev/null
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/supportClasses/FormItemRequired.as
@@ -0,0 +1,41 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package mx.supportClasses
+{
+	import mx.controls.Image;
+
+	/**
+	 * The FormItemRequired class is the default skin for the required indicator
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion Royale 0.9.8
+	 */
+	public class FormItemRequired extends Image
+	{
+		public function FormItemRequired()
+		{
+			super();
+			width = 23;
+			height = 23;
+			source = "assets/icon_required_indicator.png";
+		}
+	}
+}