Author: rwhitcomb
Date: Thu Dec 7 18:26:56 2017
New Revision: 1817403
URL: http://svn.apache.org/viewvc?rev=1817403&view=rev
Log:
PIVOT-1014: Update one of the test TerraTheme*.json files to add the
new theme defaults and theme styles file name overrides, with comments
as an example of how to change things with the new paradigm. Add these
new files (but for now unchanged from the defaults).
Added:
pivot/trunk/tests/src/org/apache/pivot/tests/terra_theme_defaults_test.json
pivot/trunk/tests/src/org/apache/pivot/tests/terra_theme_styles_test.json
Modified:
pivot/trunk/tests/src/org/apache/pivot/tests/TerraTheme_test.json
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/TerraTheme_test.json
URL:
http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/TerraTheme_test.json?rev=1817403&r1=1817402&r2=1817403&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/TerraTheme_test.json (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/TerraTheme_test.json Thu Dec
7 18:26:56 2017
@@ -35,6 +35,10 @@
"#eb0000"
],
+ defaultStylesFile : "terra_theme_defaults_test.json",
+
+ namedStylesFile : "terra_theme_styles_test.json",
+
messageIcons: {
error: "message_type-error-32x32.png",
warning: "message_type-warning-32x32.png",
Added:
pivot/trunk/tests/src/org/apache/pivot/tests/terra_theme_defaults_test.json
URL:
http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/terra_theme_defaults_test.json?rev=1817403&view=auto
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/terra_theme_defaults_test.json
(added)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/terra_theme_defaults_test.json
Thu Dec 7 18:26:56 2017
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+/*
+ * Default styles (colors, padding, etc.) for each of the TerraThemeXXXSkin
classes.
+ */
+{
+ TerraExpanderSkin : {
+ backgroundColor : 4,
+ titleBarBackgroundColor : 10,
+ titleBarBorderColor : 7,
+ titleBarColor : 12,
+ shadeButtonColor : 12,
+ disabledShadeButtonColor : 7,
+ borderColor : 7,
+ padding : 4
+ },
+
+ TerraRollupSkin : {
+ buttonColor : 1,
+ disabledButtonColor : 7,
+ spacing : 4,
+ buffer : 4,
+ fill : false,
+ headingToggles : true
+ }
+
+ /* More to come ... */
+
+}
Added: pivot/trunk/tests/src/org/apache/pivot/tests/terra_theme_styles_test.json
URL:
http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/terra_theme_styles_test.json?rev=1817403&view=auto
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/terra_theme_styles_test.json
(added)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/terra_theme_styles_test.json
Thu Dec 7 18:26:56 2017
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+{ commandButton: {
+ font: {bold:true},
+ color: 4,
+ backgroundColor: 14,
+ borderColor: 12,
+ disabledBackgroundColor: 10,
+ disabledBorderColor: 7,
+ padding: {top:3, left:4, bottom:3, right:4},
+ minimumAspectRatio: 3
+ }
+}
