royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlosrov...@apache.org
Subject [royale-asjs] branch feature/jewel-ui-set updated: viewbeads inlib and theme (commented)
Date Sat, 17 Mar 2018 22:19:24 GMT
This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a commit to branch feature/jewel-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/feature/jewel-ui-set by this push:
     new 06d0155  viewbeads inlib and theme  (commented)
06d0155 is described below

commit 06d015502cf9a488778df98e224eb6f7e7178b26
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Sat Mar 17 23:19:21 2018 +0100

    viewbeads inlib and theme  (commented)
---
 .../projects/Jewel/src/main/resources/defaults.css |  5 ++++-
 .../Jewel/src/main/resources/jewel-manifest.xml    |  2 ++
 .../projects/Jewel/src/main/royale/JewelClasses.as |  3 +++
 .../jewel/beads/views/JewelLabelViewBead.mxml}     | 23 ++++++++++---------
 .../projects/Jewel/src/main/sass/_global.sass      |  7 +++---
 frameworks/themes/JewelTheme/pom.xml               | 11 +++++++++
 .../JewelTheme/src/main/resources/defaults.css     |  4 ----
 .../src/main/resources/jeweltheme-as-manifest.xml  | 25 +++++++++++++++++++++
 .../src/main/resources/jeweltheme-manifest.xml     | 26 ++++++++++++++++++++++
 .../src/main/royale/JewelThemeClasses.as           |  2 +-
 .../{ => jewel}/beads/views/LabelViewBead.mxml     |  2 +-
 .../src/main/sass/components/_label.sass           |  9 ++++----
 12 files changed, 93 insertions(+), 26 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 0c58f7b..ece389d 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -30,8 +30,11 @@
   display: block !important;
 }
 
+Label {
+  iBeadModel: ClassReference("org.apache.royale.html.beads.models.TextModel");
+}
+
 .jewel.label {
-  IBeadModel: ClassReference("org.apache.royale.html.beads.models.TextModel");
   white-space: nowrap;
 }
 
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index b57f9a2..c0840b8 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -35,5 +35,7 @@
     <component id="VerticalLayout" class="org.apache.royale.jewel.beads.layouts.VerticalLayout"/>
     <component id="HorizontalLayoutWithPaddingAndGap" class="org.apache.royale.jewel.beads.layouts.HorizontalLayoutWithPaddingAndGap"/>
     <component id="VerticalLayoutWithPaddingAndGap" class="org.apache.royale.jewel.beads.layouts.VerticalLayoutWithPaddingAndGap"/>
+
+    <!-- <component id="JewelLabelViewBead" class="org.apache.royale.jewel.beads.views.JewelLabelViewBead"/>
-->
     
 </componentPackage>
diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
index 547acc3..4f909d2 100644
--- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
+++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
@@ -43,6 +43,9 @@ package
         import org.apache.royale.jewel.beads.layouts.VerticalLayout; VerticalLayout;
         import org.apache.royale.jewel.beads.layouts.HorizontalLayoutWithPaddingAndGap; HorizontalLayoutWithPaddingAndGap;
         import org.apache.royale.jewel.beads.layouts.VerticalLayoutWithPaddingAndGap; VerticalLayoutWithPaddingAndGap;
+
+        //import org.apache.royale.jewel.beads.views.JewelLabelViewBead; JewelLabelViewBead;
+
     }
 
 }
\ No newline at end of file
diff --git a/frameworks/themes/JewelTheme/src/main/royale/org/apache/royale/beads/views/LabelViewBead.mxml
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
similarity index 82%
copy from frameworks/themes/JewelTheme/src/main/royale/org/apache/royale/beads/views/LabelViewBead.mxml
copy to frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
index 815c4dd..6489b46 100644
--- a/frameworks/themes/JewelTheme/src/main/royale/org/apache/royale/beads/views/LabelViewBead.mxml
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
@@ -18,31 +18,32 @@ limitations under the License.
 
 -->
 <js:MXMLBeadView xmlns:fx="http://ns.adobe.com/mxml/2009"
-                 xmlns:js="library://ns.apache.org/royale/basic">
+                 xmlns:js="library://ns.apache.org/royale/basic"
+                 xmlns:j="library://ns.apache.org/royale/jewel">
 				  
     <fx:Script>
         <![CDATA[
-            // import org.apache.royale.core.ITitleBarModel;
-            // import org.apache.royale.core.UIBase;
-            // import org.apache.royale.events.Event;
-            // import com.transpiledactionscript.puremvc.royale.employeeadmin.model.CustomPanelWithControlBarModel;
-     
+            import org.apache.royale.html.beads.models.TextModel;
+
             // private function clickHandler():void
             // {
             //     var newEvent:org.apache.royale.events.Event = new org.apache.royale.events.Event('close');
             //     UIBase(_strand).dispatchEvent(newEvent);   
             // }
+
         ]]>
     </fx:Script>
 
-    <js:TextButton text="VIEWBEAD!!"/>
-    
-    <!-- <js:beads>
+    <js:beads>
         <js:MXMLBeadViewDataBinding />
-        <js:LayoutChangeNotifier watchedProperty="{titleLabel.text}" />
-        <js:LayoutChangeNotifier watchedProperty="{additionalInfoLabel.text}" />
     </js:beads>
 
+    <j:TextButton id="textButton"  text="A view bead" primary="true"/>
+    
+<!--
+    
+        <js:LayoutChangeNotifier watchedProperty="{additionalInfoLabel.text}" />
+    
     <js:Label id="titleLabel" text="{CustomPanelWithControlBarModel(model).title}" className="TitleBarTitle"
>
         <js:style>
             <js:SimpleCSSStyles fontWeight="inherit" marginLeft="5" />
diff --git a/frameworks/projects/Jewel/src/main/sass/_global.sass b/frameworks/projects/Jewel/src/main/sass/_global.sass
index c886218..707946e 100644
--- a/frameworks/projects/Jewel/src/main/sass/_global.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_global.sass
@@ -29,10 +29,11 @@
 	> *
 		display: block !important
 
-.jewel.label
-	IBeadModel: ClassReference("org.apache.royale.html.beads.models.TextModel")
-	//IBeadView: ClassReference("org.apache.royale.jewel.beads.TextFieldView")
+Label
+	iBeadModel: ClassReference("org.apache.royale.html.beads.models.TextModel")
+	//iBeadView: ClassReference("org.apache.royale.jewel.beads.views.JewelLabelViewBead")
 	//iMeasurementBead: ClassReference("org.apache.royale.html.beads.TextFieldLabelMeasurementBead")
+.jewel.label	
 	white-space: nowrap
 
 TextField
diff --git a/frameworks/themes/JewelTheme/pom.xml b/frameworks/themes/JewelTheme/pom.xml
index 84e7e1e..4eda5c7 100644
--- a/frameworks/themes/JewelTheme/pom.xml
+++ b/frameworks/themes/JewelTheme/pom.xml
@@ -41,6 +41,17 @@
         <version>${royale.compiler.version}</version>
         <extensions>true</extensions>
         <configuration>
+          <namespaces>
+            <namespace>
+              <uri>library://ns.apache.org/royale/jewel</uri>
+              <manifest>${project.basedir}/src/main/resources/jeweltheme-manifest.xml</manifest>
+            </namespace>
+            <namespace>
+              <type>as</type>
+              <uri>library://ns.apache.org/royale/jewel</uri>
+              <manifest>${project.basedir}/src/main/resources/jeweltheme-as-manifest.xml</manifest>
+            </namespace>
+          </namespaces>
           <includeClasses>
             <includeClass>JewelThemeClasses</includeClass>
           </includeClasses>
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 9022239..cc10a23 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -217,11 +217,7 @@
   cursor: unset;
 }
 
-/**
- * Jewel Label
- */
 .jewel.label {
-  IBeadView: ClassReference("org.apache.royale.beads.views.LabelViewBead");
   font-family: "Lato", sans-serif;
   font-size: 0.75rem;
 }
diff --git a/frameworks/themes/JewelTheme/src/main/resources/jeweltheme-as-manifest.xml b/frameworks/themes/JewelTheme/src/main/resources/jeweltheme-as-manifest.xml
new file mode 100644
index 0000000..e38496a
--- /dev/null
+++ b/frameworks/themes/JewelTheme/src/main/resources/jeweltheme-as-manifest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+
+  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.
+
+-->
+
+
+<componentPackage>
+
+    
+</componentPackage>
diff --git a/frameworks/themes/JewelTheme/src/main/resources/jeweltheme-manifest.xml b/frameworks/themes/JewelTheme/src/main/resources/jeweltheme-manifest.xml
new file mode 100644
index 0000000..95e305d
--- /dev/null
+++ b/frameworks/themes/JewelTheme/src/main/resources/jeweltheme-manifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+
+  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.
+
+-->
+
+
+<componentPackage>
+
+    <!-- <component id="LabelViewBead" class="org.apache.royale.beads.views.LabelViewBead"/>
-->
+    
+</componentPackage>
diff --git a/frameworks/themes/JewelTheme/src/main/royale/JewelThemeClasses.as b/frameworks/themes/JewelTheme/src/main/royale/JewelThemeClasses.as
index cb5d275..433d387 100644
--- a/frameworks/themes/JewelTheme/src/main/royale/JewelThemeClasses.as
+++ b/frameworks/themes/JewelTheme/src/main/royale/JewelThemeClasses.as
@@ -27,7 +27,7 @@ package
      */
     internal class JewelThemeClasses
     {
-       import org.apache.royale.beads.views.LabelViewBead; LabelViewBead;
+       //import org.apache.royale.jewwl.beads.views.LabelViewBead; LabelViewBead;
     }
 
 }
\ No newline at end of file
diff --git a/frameworks/themes/JewelTheme/src/main/royale/org/apache/royale/beads/views/LabelViewBead.mxml
b/frameworks/themes/JewelTheme/src/main/royale/org/apache/royale/jewel/beads/views/LabelViewBead.mxml
similarity index 97%
rename from frameworks/themes/JewelTheme/src/main/royale/org/apache/royale/beads/views/LabelViewBead.mxml
rename to frameworks/themes/JewelTheme/src/main/royale/org/apache/royale/jewel/beads/views/LabelViewBead.mxml
index 815c4dd..e8963bb 100644
--- a/frameworks/themes/JewelTheme/src/main/royale/org/apache/royale/beads/views/LabelViewBead.mxml
+++ b/frameworks/themes/JewelTheme/src/main/royale/org/apache/royale/jewel/beads/views/LabelViewBead.mxml
@@ -35,7 +35,7 @@ limitations under the License.
         ]]>
     </fx:Script>
 
-    <js:TextButton text="VIEWBEAD!!"/>
+    <js:TextButton text="LABELVIEWBEAD!!"/>
     
     <!-- <js:beads>
         <js:MXMLBeadViewDataBinding />
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_label.sass b/frameworks/themes/JewelTheme/src/main/sass/components/_label.sass
index 27906d1..8accaa7 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components/_label.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components/_label.sass
@@ -17,12 +17,11 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-/**
- * Jewel Label
- */
-.jewel.label
+Label
+	//iBeadView: ClassReference("org.apache.royale.jewel.beads.views.LabelViewBead")
 	//IBeadView: ClassReference("org.apache.royale.html.beads.TextFieldView")
-	IBeadView: ClassReference("org.apache.royale.beads.views.LabelViewBead")
+	
+.jewel.label
 	font:
 		family: $font-stack
 		size: $font-size
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
carlosrovira@apache.org.

Mime
View raw message