|
From: <yu...@us...> - 2021-07-09 22:27:22
|
Revision: 2534
http://sourceforge.net/p/swingme/code/2534
Author: yuranet
Date: 2021-07-09 22:27:19 +0000 (Fri, 09 Jul 2021)
Log Message:
-----------
default ios look for all components works
Modified Paths:
--------------
iOSME/res/iOS_theme.xml
iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java
Added Paths:
-----------
iOSME/iosmeimg/button_focus.png
iOSME/iosmeimg/select_row.png
iOSME/iosmeimg/textbox.png
iOSME/iosmeimg/textbox_focus.png
Added: iOSME/iosmeimg/button_focus.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/button_focus.png
===================================================================
--- iOSME/iosmeimg/button_focus.png 2021-07-09 16:16:19 UTC (rev 2533)
+++ iOSME/iosmeimg/button_focus.png 2021-07-09 22:27:19 UTC (rev 2534)
Property changes on: iOSME/iosmeimg/button_focus.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/select_row.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/select_row.png
===================================================================
--- iOSME/iosmeimg/select_row.png 2021-07-09 16:16:19 UTC (rev 2533)
+++ iOSME/iosmeimg/select_row.png 2021-07-09 22:27:19 UTC (rev 2534)
Property changes on: iOSME/iosmeimg/select_row.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/textbox.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/textbox.png
===================================================================
--- iOSME/iosmeimg/textbox.png 2021-07-09 16:16:19 UTC (rev 2533)
+++ iOSME/iosmeimg/textbox.png 2021-07-09 22:27:19 UTC (rev 2534)
Property changes on: iOSME/iosmeimg/textbox.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/textbox_focus.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/textbox_focus.png
===================================================================
--- iOSME/iosmeimg/textbox_focus.png 2021-07-09 16:16:19 UTC (rev 2533)
+++ iOSME/iosmeimg/textbox_focus.png 2021-07-09 22:27:19 UTC (rev 2534)
Property changes on: iOSME/iosmeimg/textbox_focus.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: iOSME/res/iOS_theme.xml
===================================================================
--- iOSME/res/iOS_theme.xml 2021-07-09 16:16:19 UTC (rev 2533)
+++ iOSME/res/iOS_theme.xml 2021-07-09 22:27:19 UTC (rev 2534)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE synth SYSTEM "SynthME.dtd">
-
<synth>
<style id="global">
@@ -19,7 +18,6 @@
</style>
<bind style="tooltip" key="ToolTip"/>
-
<style id="button">
<insets top="5" left="5" bottom="5" right="5"/>
<state>
@@ -28,7 +26,7 @@
<color type="FOREGROUND" value="#000000"/>
</state>
<state value="FOCUSED"> <!-- top, left, bottom, right -->
- <imagePainter path="/iosmeimg/highlight.png" sourceInsets="12 10 11 10" paintCenter="false"/>
+ <imagePainter path="/iosmeimg/button_focus.png" sourceInsets="12 10 11 10" paintCenter="false"/>
<color type="BORDERFILL" value="#8f9dac"/>
</state>
<state value="DISABLED">
@@ -37,16 +35,15 @@
</style>
<bind style="button" key="Button"/>
-
<style id="text">
<insets top="3" left="6" bottom="3" right="6"/>
<state value="ENABLED">
- <imagePainter path="/iosmeimg/textbox2.png" sourceInsets="13 15 13 15" paintCenter="false"/>
+ <imagePainter path="/iosmeimg/textbox.png" sourceInsets="13 15 13 15" paintCenter="false"/>
<color type="BORDERFILL" value="#d3dae4"/>
<color type="FOREGROUND" value="#000000"/>
</state>
<state value="FOCUSED"> <!-- top, left, bottom, right -->
- <imagePainter path="/iosmeimg/textbox.png" sourceInsets="13 15 13 15" paintCenter="false"/>
+ <imagePainter path="/iosmeimg/textbox_focus.png" sourceInsets="13 15 13 15" paintCenter="false"/>
<color type="BORDERFILL" value="#ffffff"/>
<color type="FOREGROUND" value="#000000"/>
</state>
@@ -54,8 +51,6 @@
<bind style="text" key="TextField"/>
<bind style="text" key="TextArea"/>
-
-
<style id="window">
<insets top="0" left="0" bottom="0" right="0"/>
<state>
@@ -65,17 +60,15 @@
</style>
<bind style="window" key="Frame"/>
-
<style id="dialog">
- <insets top="30" left="30" bottom="30" right="30"/>
+ <insets top="15" left="15" bottom="20" right="20"/>
<state>
- <imagePainter path="/iosmeimg/dialog.png" sourceInsets="30 30 30 30" paintCenter="true"/>
+ <imagePainter path="/iosmeimg/dialog.png" sourceInsets="40 80 25 85" paintCenter="true"/>
<color type="FOREGROUND" value="#FFFFFF"/>
</state>
</style>
<bind style="dialog" key="Dialog"/>
-
<style id="dialogTitle">
<state>
<property key="titleAlignment" type="string" value="center"/>
@@ -90,16 +83,6 @@
</style>
<bind style="titleLabel" key="TitleBarLabel"/>
- <style id="menu">
- <state>
- <color type="BACKGROUND" value="#000000"/>
- <color type="FOREGROUND" value="#FFFFFF"/>
- </state>
- </style>
- <bind style="menu" key="Menu"/>
- <bind style="menu" key="Popup"/>
- <bind style="menu" key="TitleBar"/>
-
<style id="checkbox">
<insets top="5" left="5" bottom="5" right="5"/>
<imageIcon id="check_on" path="/iosmeimg/iconGrid.png" x="0" y="0" width="16" height="16"/>
@@ -121,7 +104,6 @@
</style>
<bind style="checkbox" key="CheckBox"/>
-
<style id="radioButton">
<insets top="5" left="5" bottom="5" right="5"/>
<imageIcon id="radio_on" path="/iosmeimg/iconGrid.png" x="0" y="64" width="16" height="16"/>
@@ -148,10 +130,12 @@
<state>
<imagePainter path="/iosmeimg/control_dropdown.png" sourceInsets="2 2 2 30" paintCenter="false"/>
<color type="FOREGROUND" value="#000000"/>
+ <color type="BORDERFILL" value="#ffffff"/>
</state>
<state value="FOCUSED">
<imagePainter path="/iosmeimg/control_dropdown_focus.png" sourceInsets="2 2 2 30" paintCenter="false"/>
<color type="FOREGROUND" value="#000000"/>
+ <color type="BORDERFILL" value="#ffffff"/>
</state>
</style>
<bind style="comboBox" key="ComboBox"/>
@@ -183,27 +167,39 @@
</style>
<bind style="sliderThumb" key="SliderThumb"/>
+
+
+ <style id="titleBar">
+ <state>
+ <color type="BACKGROUND" value="#000000"/>
+ <color type="FOREGROUND" value="#FFFFFF"/>
+ </state>
+ </style>
+ <bind style="titleBar" key="TitleBar"/>
+
<style id="listRenderer">
- <insets top="3" left="3" bottom="3" right="3"/>
+ <insets top="0" left="0" bottom="1" right="0"/>
<state>
<imagePainter path="/iosmeimg/select_row.png" sourceInsets="0 0 1 0" paintCenter="false"/>
- <color type="BORDERFILL" value="#FFFFFF"/>
+ <color type="BACKGROUND" value="#FFFFFF"/>
</state>
<state value="SELECTED">
- <imagePainter path="/iosmeimg/select_row.png" sourceInsets="43 0 1 0" paintCenter="false"/>
+ <imagePainter path="/iosmeimg/select_row.png" sourceInsets="42 0 1 0" paintCenter="false"/>
<color type="BORDERFILL" value="#3b78e6"/>
+ <color type="BACKGROUND" value="#00000000"/>
</state>
</style>
<bind style="listRenderer" key="ListRenderer"/>
+ <bind style="listRenderer" key="ListRendererCollapsed"/>
+ <bind style="listRenderer" key="PopupListRenderer"/>
+ <bind style="listRenderer" key="MenuRenderer"/>
-
- <style id="section">
- <insets top="5" left="5" bottom="5" right="5"/>
+ <style id="list">
<state>
- <imagePainter path="/iosmeimg/section.png" sourceInsets="12 12 12 12" paintCenter="false"/>
- <color type="BORDERFILL" value="#ffffff"/>
+ <color type="FOREGROUND" value="#000000"/>
</state>
</style>
- <bind style="section" key="Section"/>
+ <bind style="list" key="List"/>
+ <bind style="list" key="MenuBar"/>
</synth>
Modified: iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java
===================================================================
--- iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java 2021-07-09 16:16:19 UTC (rev 2533)
+++ iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java 2021-07-09 22:27:19 UTC (rev 2534)
@@ -78,7 +78,7 @@
setStyleFor("CheckBoxRenderer", checkBoxRenderer);
Style menuItem = new Style(defaultStyle);
- menuItem.addProperty(getSystemImageInWhite("chevron.right"), "arrow", Style.ALL);
+ menuItem.addProperty(new Icon(new Image(UIImage.systemImageNamed("chevron.right"))), "arrow", Style.ALL);
setStyleFor("MenuItem", menuItem);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
