You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/08/20 02:49:58 UTC
svn commit: r987357 - in /pivot/trunk:
demos/src/org/apache/pivot/demos/styles/
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
Author: gbrown
Date: Fri Aug 20 00:49:57 2010
New Revision: 987357
URL: http://svn.apache.org/viewvc?rev=987357&view=rev
Log:
Consolidate some Terra skin colors to make it easier to define custom color schemes.
Modified:
pivot/trunk/demos/src/org/apache/pivot/demos/styles/sample_content.bxml
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraBorderSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraLinkButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSeparatorSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme_default.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_theme_styles.json
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/styles/sample_content.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/styles/sample_content.bxml?rev=987357&r1=987356&r2=987357&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/styles/sample_content.bxml (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/styles/sample_content.bxml Fri Aug 20 00:49:57 2010
@@ -71,7 +71,7 @@ limitations under the License.
<TablePane.Row>
<Border TablePane.columnSpan="2" styles="{color:10}">
<ScrollPane horizontalScrollBarPolicy="fill" preferredHeight="80">
- <TableView selectedIndex="0">
+ <TableView bxml:id="tableView" selectedIndex="0">
<columns>
<TableView.Column name="a" headerData="A" width="1*"/>
<TableView.Column name="b" headerData="B" width="1*"/>
@@ -92,6 +92,10 @@ limitations under the License.
</ArrayList>
</tableData>
</TableView>
+
+ <columnHeader>
+ <TableViewHeader tableView="$tableView"/>
+ </columnHeader>
</ScrollPane>
</Border>
</TablePane.Row>
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java?rev=987357&r1=987356&r2=987357&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java Fri Aug 20 00:49:57 2010
@@ -319,7 +319,7 @@ public class TerraAccordionSkin extends
borderColor = theme.getColor(7);
padding = new Insets(4);
buttonFont = theme.getFont().deriveFont(Font.BOLD);
- buttonColor = theme.getColor(15);
+ buttonColor = theme.getColor(13);
disabledButtonColor = theme.getColor(7);
buttonBackgroundColor = theme.getColor(10);
buttonPadding = new Insets(3, 4, 3, 4);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraBorderSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraBorderSkin.java?rev=987357&r1=987356&r2=987357&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraBorderSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraBorderSkin.java Fri Aug 20 00:49:57 2010
@@ -26,7 +26,7 @@ public class TerraBorderSkin extends Bor
public TerraBorderSkin() {
setBackgroundColor(4);
setColor(7);
- setTitleColor(13);
+ setTitleColor(12);
}
public final void setColor(int color) {
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java?rev=987357&r1=987356&r2=987357&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java Fri Aug 20 00:49:57 2010
@@ -64,7 +64,7 @@ public class TerraCheckboxSkin extends C
buttonColor = theme.getColor(4);
buttonBorderColor = theme.getColor(7);
- buttonSelectionColor = theme.getColor(13);
+ buttonSelectionColor = theme.getColor(12);
disabledButtonColor = theme.getColor(3);
disabledButtonBorderColor = theme.getColor(7);
disabledButtonSelectionColor = theme.getColor(7);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java?rev=987357&r1=987356&r2=987357&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java Fri Aug 20 00:49:57 2010
@@ -252,7 +252,7 @@ public class TerraExpanderSkin extends E
titleRow.add(titleBoxPane);
titleRow.add(buttonBoxPane);
- titleLabel.getStyles().put("color", theme.getColor(15));
+ titleLabel.getStyles().put("color", theme.getColor(13));
Font titleFont = theme.getFont().deriveFont(Font.BOLD);
titleLabel.getStyles().put("font", titleFont);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java?rev=987357&r1=987356&r2=987357&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java Fri Aug 20 00:49:57 2010
@@ -345,8 +345,8 @@ public class TerraFormSkin extends Conta
questionIcon = theme.getSmallMessageIcon(MessageType.QUESTION);
questionMessageColor = theme.getColor(4);
- questionMessageBackgroundColor = theme.getColor(16);
- questionHighlightColor = theme.getColor(15);
+ questionMessageBackgroundColor = theme.getColor(14);
+ questionHighlightColor = theme.getColor(13);
infoIcon = theme.getSmallMessageIcon(MessageType.INFO);
infoMessageColor = theme.getColor(1);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java?rev=987357&r1=987356&r2=987357&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java Fri Aug 20 00:49:57 2010
@@ -243,8 +243,8 @@ public class TerraFrameSkin extends Wind
setBackgroundColor(theme.getColor(10));
titleBarColor = theme.getColor(4);
- titleBarBackgroundColor = theme.getColor(16);
- titleBarBorderColor = theme.getColor(13);
+ titleBarBackgroundColor = theme.getColor(17);
+ titleBarBorderColor = theme.getColor(15);
inactiveTitleBarColor = theme.getColor(7);
inactiveTitleBarBackgroundColor = theme.getColor(9);
inactiveTitleBarBorderColor = theme.getColor(7);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraLinkButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraLinkButtonSkin.java?rev=987357&r1=987356&r2=987357&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraLinkButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraLinkButtonSkin.java Fri Aug 20 00:49:57 2010
@@ -40,7 +40,7 @@ public class TerraLinkButtonSkin extends
public TerraLinkButtonSkin() {
TerraTheme theme = (TerraTheme)Theme.getTheme();
font = theme.getFont();
- color = theme.getColor(13);
+ color = theme.getColor(12);
disabledColor = theme.getColor(7);
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSeparatorSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSeparatorSkin.java?rev=987357&r1=987356&r2=987357&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSeparatorSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSeparatorSkin.java Fri Aug 20 00:49:57 2010
@@ -26,7 +26,7 @@ public class TerraSeparatorSkin extends
public TerraSeparatorSkin() {
TerraTheme theme = (TerraTheme)Theme.getTheme();
setColor(theme.getColor(7));
- setHeadingColor(theme.getColor(13));
+ setHeadingColor(theme.getColor(12));
}
public void setColor(int color) {
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme_default.json
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme_default.json?rev=987357&r1=987356&r2=987357&view=diff
==============================================================================
Binary files - no diff available.
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_theme_styles.json
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_theme_styles.json?rev=987357&r1=987356&r2=987357&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_theme_styles.json (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_theme_styles.json Fri Aug 20 00:49:57 2010
@@ -17,8 +17,8 @@
{ commandButton: {
font: {bold:true},
color: 4,
- backgroundColor: 16,
- borderColor: 13,
+ backgroundColor: 17,
+ borderColor: 15,
disabledBackgroundColor: 10,
disabledBorderColor: 7,
padding: {top:3, left:4, bottom:3, right:4},