[Slim-Checkins] r10220 - in /trunk/softsqueeze: platform/install4j/
platform/jws/icons/
resources/skin/slimdevices/ src/org/titmuss/softsqueeze/
src/org/titmuss/softsqueeze/skin/
titmuss at svn.slimdevices.com
titmuss at svn.slimdevices.com
Thu Oct 5 12:29:43 PDT 2006
Author: titmuss
Date: Thu Oct 5 12:29:29 2006
New Revision: 10220
URL: http://svn.slimdevices.com?rev=10220&view=rev
Log:
Image changes and OSX fix for Softsqueeze
Added:
trunk/softsqueeze/platform/jws/icons/icon64.gif (with props)
Modified:
trunk/softsqueeze/platform/install4j/softsqueeze.install4j
trunk/softsqueeze/resources/skin/slimdevices/Thumbs.db
trunk/softsqueeze/resources/skin/slimdevices/common.xml
trunk/softsqueeze/resources/skin/slimdevices/slimdevices.xml
trunk/softsqueeze/resources/skin/slimdevices/squeezebox3_large_mask.png
trunk/softsqueeze/resources/skin/slimdevices/squeezebox3_mask.png
trunk/softsqueeze/src/org/titmuss/softsqueeze/Softsqueeze.java
trunk/softsqueeze/src/org/titmuss/softsqueeze/skin/ButtonAction.java
trunk/softsqueeze/src/org/titmuss/softsqueeze/skin/LcdPanel.java
Modified: trunk/softsqueeze/platform/install4j/softsqueeze.install4j
URL: http://svn.slimdevices.com/trunk/softsqueeze/platform/install4j/softsqueeze.install4j?rev=10220&r1=10219&r2=10220&view=diff
==============================================================================
--- trunk/softsqueeze/platform/install4j/softsqueeze.install4j (original)
+++ trunk/softsqueeze/platform/install4j/softsqueeze.install4j Thu Oct 5 12:29:29 2006
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<install4j version="3.2.5">
<directoryPresets config="../../nativeskinwin32JAWT.dll" />
- <application name="Softsqueeze" distributionSourceDir="" applicationId="0664-8868-6773-1691" mediaDir="../../media" mediaFilePattern="%SHORT_NAME%_%PLATFORM%%WITH_JRE%_%VERSION%" compression="6" lzmaCompression="false" keepModificationTimes="false" shortName="softsqueeze" publisher="Richard Titmuss" publisherWeb="http://softsqueeze.sourceforge.net" version="3.1" allPathsRelative="true" backupOnSave="false" autoSave="false" macSignature="????" javaMinVersion="1.4" javaMaxVersion="" allowBetaVM="false">
+ <application name="Softsqueeze" distributionSourceDir="" applicationId="0664-8868-6773-1691" mediaDir="../../media" mediaFilePattern="%SHORT_NAME%_%PLATFORM%%WITH_JRE%_%VERSION%" compression="6" lzmaCompression="false" keepModificationTimes="false" shortName="softsqueeze" publisher="Richard Titmuss" publisherWeb="http://softsqueeze.sourceforge.net" version="3.2" allPathsRelative="true" backupOnSave="false" autoSave="false" macSignature="????" javaMinVersion="1.4" javaMaxVersion="" allowBetaVM="false">
<searchSequence>
<registry />
<envVar name="JAVA_HOME" />
Added: trunk/softsqueeze/platform/jws/icons/icon64.gif
URL: http://svn.slimdevices.com/trunk/softsqueeze/platform/jws/icons/icon64.gif?rev=10220&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/softsqueeze/platform/jws/icons/icon64.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: trunk/softsqueeze/platform/jws/icons/icon64.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: trunk/softsqueeze/resources/skin/slimdevices/Thumbs.db
URL: http://svn.slimdevices.com/trunk/softsqueeze/resources/skin/slimdevices/Thumbs.db?rev=10220&r1=10219&r2=10220&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/softsqueeze/resources/skin/slimdevices/common.xml
URL: http://svn.slimdevices.com/trunk/softsqueeze/resources/skin/slimdevices/common.xml?rev=10220&r1=10219&r2=10220&view=diff
==============================================================================
--- trunk/softsqueeze/resources/skin/slimdevices/common.xml (original)
+++ trunk/softsqueeze/resources/skin/slimdevices/common.xml Thu Oct 5 12:29:29 2006
@@ -468,20 +468,41 @@
/>
<VfPanel
- id="slimdevices.vfpanel3"
- scale="1"
- offset="320"
- fgcolor="0x32EA1A"
- bgcolor="0x000000"
- />
-
- <VfPanel
id="slimdevices.vfpanel2"
scale="2"
fgcolor="0x32EA1A"
bgcolor="0x000000"
/>
+ <VfPanel
+ id="slimdevices.vfpanelb1"
+ scale="1"
+ fgcolor="0x20e0e0"
+ bgcolor="0x000000"
+ />
+
+ <VfPanel
+ id="slimdevices.vfpanelb3"
+ scale="1"
+ offset="320"
+ fgcolor="0x20e0e0"
+ bgcolor="0x000000"
+ />
+
+ <VfPanel
+ id="slimdevices.vfpanelc1"
+ scale="1"
+ fgcolor="0x20e0e0"
+ bgcolor="0x080E0C"
+ />
+
+ <VfPanel
+ id="slimdevices.vfpanelc2"
+ scale="2"
+ fgcolor="0x20e0e0"
+ bgcolor="0x080E0C"
+ />
+
<!-- main display (small) -->
<GroupDef
id="slimdevices.vfd"
@@ -511,7 +532,7 @@
down="/squeezebox3_down.png"
width="391" height="204">
- <Element id="slimdevices.vfpanel1" x="37" y="54" />
+ <Element id="slimdevices.vfpanelc1" x="37" y="54" />
</GroupDef>
<!-- sb3 display (large) -->
@@ -523,7 +544,7 @@
width="783"
height="396">
- <Element id="slimdevices.vfpanel2" x="76" y="92" />
+ <Element id="slimdevices.vfpanelc2" x="76" y="92" />
</GroupDef>
<!-- normal horizontal remote control -->
@@ -574,8 +595,8 @@
down="/transporter_down.png"
width="896" height="171">
- <Element id="slimdevices.vfpanel1" x="68" y="49" />
- <Element id="slimdevices.vfpanel3" x="510" y="49" />
+ <Element id="slimdevices.vfpanelb1" x="68" y="49" />
+ <Element id="slimdevices.vfpanelb3" x="510" y="49" />
</GroupDef>
Modified: trunk/softsqueeze/resources/skin/slimdevices/slimdevices.xml
URL: http://svn.slimdevices.com/trunk/softsqueeze/resources/skin/slimdevices/slimdevices.xml?rev=10220&r1=10219&r2=10220&view=diff
==============================================================================
--- trunk/softsqueeze/resources/skin/slimdevices/slimdevices.xml (original)
+++ trunk/softsqueeze/resources/skin/slimdevices/slimdevices.xml Thu Oct 5 12:29:29 2006
@@ -27,279 +27,7 @@
<Include file="common.xml" />
-
-
- <If test="${slimdevices.display}=slimdevices.vfd">
- <Window
- id="slimdevices.main"
- configid="slimdevices.vfd"
- name="SoftSqueeze"
- visible="true"
- x="147" y="100"
- icon="/icon.png">
-
- <Group id="slimdevices.vfd" />
- </Window>
-
- <If test="${slimdevices.remote}=slimdevices.vremote">
- <Window
- id="slimdevices.remote"
- configid="slimdevices.vfd.vremote"
- name="SoftSqueeze"
- visible="true"
- owner="slimdevices.main"
- x="615" y="100">
-
- <Group id="slimdevices.vplaybuttons" />
- </Window>
- </If>
-
- <If test="${slimdevices.remote}=slimdevices.hremote">
- <Window
- id="slimdevices.remote"
- configid="slimdevices.vfd.hremote"
- name="SoftSqueeze"
- visible="true"
- owner="slimdevices.main"
- x="100" y="208">
-
- <Group id="slimdevices.hplaybuttons" />
- </Window>
- </If>
-
- <If test="${slimdevices.remote}=slimdevices.newremote">
- <Window
- id="slimdevices.remote"
- configid="slimdevices.sb3small.newremote"
- name="SoftSqueeze"
- visible="true"
- owner="slimdevices.main"
- windowmask="/newremote.png"
- x="615" y="100">
-
- <Group id="slimdevices.newremote" />
- </Window>
- </If>
- </If>
-
- <If test="${slimdevices.display}=slimdevices.vfd2">
- <Window
- id="slimdevices.main"
- configid="slimdevices.vfd2"
- name="SoftSqueeze"
- visible="true"
- x="100" y="100"
- icon="/icon.png">
-
- <Group id="slimdevices.vfd2" />
- </Window>
-
- <If test="${slimdevices.remote}=slimdevices.vremote">
- <Window
- id="slimdevices.remote"
- configid="slimdevices.vfd2.remote"
- name="SoftSqueeze"
- visible="true"
- owner="slimdevices.main"
- x="850" y="100">
-
- <Group id="slimdevices.vplaybuttons" />
- </Window>
- </If>
-
- <If test="${slimdevices.remote}=slimdevices.hremote">
- <Window
- id="slimdevices.remote"
- configid="slimdevices.vfd2.hremote"
- name="SoftSqueeze"
- visible="true"
- owner="slimdevices.main"
- x="221" y="229">
-
- <Group id="slimdevices.hplaybuttons" />
- </Window>
- </If>
-
- <If test="${slimdevices.remote}=slimdevices.newremote">
- <Window
- id="slimdevices.remote"
- configid="slimdevices.sb3small.newremote"
- name="SoftSqueeze"
- visible="true"
- owner="slimdevices.main"
- windowmask="/newremote.png"
- x="850" y="100">
-
- <Group id="slimdevices.newremote" />
- </Window>
- </If>
- </If>
-
- <If test="${slimdevices.display}=slimdevices.sb3small">
- <Window
- id="slimdevices.main"
- configid="slimdevices.sb3small"
- name="SoftSqueeze"
- visible="true"
- x="100" y="100"
- icon="/icon.png"
- windowmask="/squeezebox3.png">
-
- <Group id="slimdevices.sb3small" />
- </Window>
-
- <If test="${slimdevices.remote}=slimdevices.vremote">
- <Window
- id="slimdevices.remote"
- configid="slimdevices.sb3small.remote"
- name="SoftSqueeze"
- visible="true"
- owner="slimdevices.main"
- x="511" y="100">
-
- <Group id="slimdevices.vplaybuttons" />
- </Window>
- </If>
-
- <If test="${slimdevices.remote}=slimdevices.hremote">
- <Window
- id="slimdevices.remote"
- configid="slimdevices.sb3small.hremote"
- name="SoftSqueeze"
- visible="true"
- owner="slimdevices.main"
- x="48" y="324">
-
- <Group id="slimdevices.hplaybuttons" />
- </Window>
- </If>
-
- <If test="${slimdevices.remote}=slimdevices.newremote">
- <Window
- id="slimdevices.remote"
- configid="slimdevices.sb3small.newremote"
- name="SoftSqueeze"
- visible="true"
- owner="slimdevices.main"
- windowmask="/newremote.png"
- x="511" y="100">
-
- <Group id="slimdevices.newremote" />
- </Window>
- </If>
- </If>
-
- <If test="${slimdevices.display}=slimdevices.sb3large">
- <Window
- id="slimdevices.main"
- configid="slimdevices.sb3large"
- name="SoftSqueeze"
- visible="true"
- x="100" y="100"
- icon="/icon.png"
- windowmask="/squeezebox3_large.png">
-
- <Group id="slimdevices.sb3large" />
- </Window>
-
- <If test="${slimdevices.remote}=slimdevices.vremote">
- <Window
- id="slimdevices.remote"
- configid="slimdevices.sb3large.remote"
- name="SoftSqueeze"
- visible="true"
- owner="slimdevices.main"
- x="903" y="100">
-
- <Group id="slimdevices.vplaybuttons" />
- </Window>
- </If>
-
- <If test="${slimdevices.remote}=slimdevices.hremote">
- <Window
- id="slimdevices.remote"
- configid="slimdevices.sb3large.hremote"
- name="SoftSqueeze"
- visible="true"
- owner="slimdevices.main"
- x="224" y="516">
-
- <Group id="slimdevices.hplaybuttons" />
- </Window>
- </If>
-
- <If test="${slimdevices.remote}=slimdevices.newremote">
- <Window
- id="slimdevices.remote"
- configid="slimdevices.sb3large.newremote"
- name="SoftSqueeze"
- visible="true"
- owner="slimdevices.main"
- windowmask="/newremote.png"
- x="903" y="100">
-
- <Group id="slimdevices.newremote" />
- </Window>
- </If>
- </If>
-
- <If test="${slimdevices.display}=slimdevices.transporter">
- <Set name="deviceid" value="6" />
-
- <Window
- id="slimdevices.main"
- configid="slimdevices.transporter"
- deviceid="6"
- name="SoftSqueeze"
- visible="true"
- x="100" y="100"
- icon="/icon.png"
- windowmask="/transporter.png">
-
- <Group id="slimdevices.transporter" />
- </Window>
-
- <If test="${slimdevices.remote}=slimdevices.vremote">
- <Window
- id="slimdevices.remote"
- configid="slimdevices.transporter.remote"
- name="SoftSqueeze"
- visible="true"
- owner="slimdevices.main"
- x="1016" y="100">
-
- <Group id="slimdevices.vplaybuttons" />
- </Window>
- </If>
-
- <If test="${slimdevices.remote}=slimdevices.hremote">
- <Window
- id="slimdevices.remote"
- configid="slimdevices.transporter.hremote"
- name="SoftSqueeze"
- visible="true"
- owner="slimdevices.main"
- x="301" y="291">
-
- <Group id="slimdevices.hplaybuttons" />
- </Window>
- </If>
-
- <If test="${slimdevices.remote}=slimdevices.newremote">
- <Window
- id="slimdevices.remote"
- configid="slimdevices.transporter.newremote"
- name="SoftSqueeze"
- visible="true"
- owner="slimdevices.main"
- windowmask="/newremote.png"
- x="1016" y="100">
-
- <Group id="slimdevices.newremote" />
- </Window>
- </If>
- </If>
-
+
<Window
id="slimdevices.fullscreen"
name="SoftSqueeze"
@@ -310,5 +38,277 @@
<Group id="slimdevices.fullgroup" />
</Window>
+
+ <If test="${slimdevices.display}=slimdevices.vfd">
+ <Window
+ id="slimdevices.main"
+ configid="slimdevices.vfd"
+ name="SoftSqueeze"
+ visible="true"
+ x="147" y="100"
+ icon="/icon.png">
+
+ <Group id="slimdevices.vfd" />
+ </Window>
+
+ <If test="${slimdevices.remote}=slimdevices.vremote">
+ <Window
+ id="slimdevices.remote"
+ configid="slimdevices.vfd.vremote"
+ name="SoftSqueeze"
+ visible="true"
+ owner="slimdevices.main"
+ x="615" y="100">
+
+ <Group id="slimdevices.vplaybuttons" />
+ </Window>
+ </If>
+
+ <If test="${slimdevices.remote}=slimdevices.hremote">
+ <Window
+ id="slimdevices.remote"
+ configid="slimdevices.vfd.hremote"
+ name="SoftSqueeze"
+ visible="true"
+ owner="slimdevices.main"
+ x="100" y="208">
+
+ <Group id="slimdevices.hplaybuttons" />
+ </Window>
+ </If>
+
+ <If test="${slimdevices.remote}=slimdevices.newremote">
+ <Window
+ id="slimdevices.remote"
+ configid="slimdevices.sb3small.newremote"
+ name="SoftSqueeze"
+ visible="true"
+ owner="slimdevices.main"
+ windowmask="/newremote.png"
+ x="615" y="100">
+
+ <Group id="slimdevices.newremote" />
+ </Window>
+ </If>
+ </If>
+
+ <If test="${slimdevices.display}=slimdevices.vfd2">
+ <Window
+ id="slimdevices.main"
+ configid="slimdevices.vfd2"
+ name="SoftSqueeze"
+ visible="true"
+ x="100" y="100"
+ icon="/icon.png">
+
+ <Group id="slimdevices.vfd2" />
+ </Window>
+
+ <If test="${slimdevices.remote}=slimdevices.vremote">
+ <Window
+ id="slimdevices.remote"
+ configid="slimdevices.vfd2.remote"
+ name="SoftSqueeze"
+ visible="true"
+ owner="slimdevices.main"
+ x="850" y="100">
+
+ <Group id="slimdevices.vplaybuttons" />
+ </Window>
+ </If>
+
+ <If test="${slimdevices.remote}=slimdevices.hremote">
+ <Window
+ id="slimdevices.remote"
+ configid="slimdevices.vfd2.hremote"
+ name="SoftSqueeze"
+ visible="true"
+ owner="slimdevices.main"
+ x="221" y="229">
+
+ <Group id="slimdevices.hplaybuttons" />
+ </Window>
+ </If>
+
+ <If test="${slimdevices.remote}=slimdevices.newremote">
+ <Window
+ id="slimdevices.remote"
+ configid="slimdevices.sb3small.newremote"
+ name="SoftSqueeze"
+ visible="true"
+ owner="slimdevices.main"
+ windowmask="/newremote.png"
+ x="850" y="100">
+
+ <Group id="slimdevices.newremote" />
+ </Window>
+ </If>
+ </If>
+
+ <If test="${slimdevices.display}=slimdevices.sb3small">
+ <Window
+ id="slimdevices.main"
+ configid="slimdevices.sb3small"
+ name="SoftSqueeze"
+ visible="true"
+ x="100" y="100"
+ icon="/icon.png"
+ windowmask="/squeezebox3.png">
+
+ <Group id="slimdevices.sb3small" />
+ </Window>
+
+ <If test="${slimdevices.remote}=slimdevices.vremote">
+ <Window
+ id="slimdevices.remote"
+ configid="slimdevices.sb3small.remote"
+ name="SoftSqueeze"
+ visible="true"
+ owner="slimdevices.main"
+ x="511" y="100">
+
+ <Group id="slimdevices.vplaybuttons" />
+ </Window>
+ </If>
+
+ <If test="${slimdevices.remote}=slimdevices.hremote">
+ <Window
+ id="slimdevices.remote"
+ configid="slimdevices.sb3small.hremote"
+ name="SoftSqueeze"
+ visible="true"
+ owner="slimdevices.main"
+ x="48" y="324">
+
+ <Group id="slimdevices.hplaybuttons" />
+ </Window>
+ </If>
+
+ <If test="${slimdevices.remote}=slimdevices.newremote">
+ <Window
+ id="slimdevices.remote"
+ configid="slimdevices.sb3small.newremote"
+ name="SoftSqueeze"
+ visible="true"
+ owner="slimdevices.main"
+ windowmask="/newremote.png"
+ x="511" y="100">
+
+ <Group id="slimdevices.newremote" />
+ </Window>
+ </If>
+ </If>
+
+ <If test="${slimdevices.display}=slimdevices.sb3large">
+ <Window
+ id="slimdevices.main"
+ configid="slimdevices.sb3large"
+ name="SoftSqueeze"
+ visible="true"
+ x="100" y="100"
+ icon="/icon.png"
+ windowmask="/squeezebox3_large.png">
+
+ <Group id="slimdevices.sb3large" />
+ </Window>
+
+ <If test="${slimdevices.remote}=slimdevices.vremote">
+ <Window
+ id="slimdevices.remote"
+ configid="slimdevices.sb3large.remote"
+ name="SoftSqueeze"
+ visible="true"
+ owner="slimdevices.main"
+ x="903" y="100">
+
+ <Group id="slimdevices.vplaybuttons" />
+ </Window>
+ </If>
+
+ <If test="${slimdevices.remote}=slimdevices.hremote">
+ <Window
+ id="slimdevices.remote"
+ configid="slimdevices.sb3large.hremote"
+ name="SoftSqueeze"
+ visible="true"
+ owner="slimdevices.main"
+ x="224" y="516">
+
+ <Group id="slimdevices.hplaybuttons" />
+ </Window>
+ </If>
+
+ <If test="${slimdevices.remote}=slimdevices.newremote">
+ <Window
+ id="slimdevices.remote"
+ configid="slimdevices.sb3large.newremote"
+ name="SoftSqueeze"
+ visible="true"
+ owner="slimdevices.main"
+ windowmask="/newremote.png"
+ x="903" y="100">
+
+ <Group id="slimdevices.newremote" />
+ </Window>
+ </If>
+ </If>
+
+ <If test="${slimdevices.display}=slimdevices.transporter">
+ <Set name="deviceid" value="6" />
+
+ <Window
+ id="slimdevices.main"
+ configid="slimdevices.transporter"
+ deviceid="6"
+ name="SoftSqueeze"
+ visible="true"
+ x="100" y="100"
+ icon="/icon.png"
+ windowmask="/transporter.png">
+
+ <Group id="slimdevices.transporter" />
+ </Window>
+
+ <If test="${slimdevices.remote}=slimdevices.vremote">
+ <Window
+ id="slimdevices.remote"
+ configid="slimdevices.transporter.remote"
+ name="SoftSqueeze"
+ visible="true"
+ owner="slimdevices.main"
+ x="1016" y="100">
+
+ <Group id="slimdevices.vplaybuttons" />
+ </Window>
+ </If>
+
+ <If test="${slimdevices.remote}=slimdevices.hremote">
+ <Window
+ id="slimdevices.remote"
+ configid="slimdevices.transporter.hremote"
+ name="SoftSqueeze"
+ visible="true"
+ owner="slimdevices.main"
+ x="301" y="291">
+
+ <Group id="slimdevices.hplaybuttons" />
+ </Window>
+ </If>
+
+ <If test="${slimdevices.remote}=slimdevices.newremote">
+ <Window
+ id="slimdevices.remote"
+ configid="slimdevices.transporter.newremote"
+ name="SoftSqueeze"
+ visible="true"
+ owner="slimdevices.main"
+ windowmask="/newremote.png"
+ x="1016" y="100">
+
+ <Group id="slimdevices.newremote" />
+ </Window>
+ </If>
+ </If>
+
</SoftSqueezeSkin>
Modified: trunk/softsqueeze/resources/skin/slimdevices/squeezebox3_large_mask.png
URL: http://svn.slimdevices.com/trunk/softsqueeze/resources/skin/slimdevices/squeezebox3_large_mask.png?rev=10220&r1=10219&r2=10220&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/softsqueeze/resources/skin/slimdevices/squeezebox3_mask.png
URL: http://svn.slimdevices.com/trunk/softsqueeze/resources/skin/slimdevices/squeezebox3_mask.png?rev=10220&r1=10219&r2=10220&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/softsqueeze/src/org/titmuss/softsqueeze/Softsqueeze.java
URL: http://svn.slimdevices.com/trunk/softsqueeze/src/org/titmuss/softsqueeze/Softsqueeze.java?rev=10220&r1=10219&r2=10220&view=diff
==============================================================================
--- trunk/softsqueeze/src/org/titmuss/softsqueeze/Softsqueeze.java (original)
+++ trunk/softsqueeze/src/org/titmuss/softsqueeze/Softsqueeze.java Thu Oct 5 12:29:29 2006
@@ -46,6 +46,7 @@
import org.titmuss.softsqueeze.skin.Skin;
import org.titmuss.softsqueeze.util.Util;
+import com.l2fprod.gui.nativeskin.NativeSkin;
/**
*
@@ -146,7 +147,9 @@
if (!Config.isHeadless()) {
// Ensure jawt is loaded for nativeskinlib
- System.loadLibrary("jawt");
+ if (NativeSkin.isSupported()) {
+ System.loadLibrary("jawt");
+ }
lcddisplay = new LcdDisplay(this);
openSkins();
Modified: trunk/softsqueeze/src/org/titmuss/softsqueeze/skin/ButtonAction.java
URL: http://svn.slimdevices.com/trunk/softsqueeze/src/org/titmuss/softsqueeze/skin/ButtonAction.java?rev=10220&r1=10219&r2=10220&view=diff
==============================================================================
--- trunk/softsqueeze/src/org/titmuss/softsqueeze/skin/ButtonAction.java (original)
+++ trunk/softsqueeze/src/org/titmuss/softsqueeze/skin/ButtonAction.java Thu Oct 5 12:29:29 2006
@@ -82,7 +82,7 @@
if (macPos > 0) {
String mac = Config.getProperty("macaddress");
url = url.substring(0, macPos) + mac
- + url.substring(macPos + 6);
+ + url.substring(macPos + 9);
}
Platform.displayUrl(url);
Modified: trunk/softsqueeze/src/org/titmuss/softsqueeze/skin/LcdPanel.java
URL: http://svn.slimdevices.com/trunk/softsqueeze/src/org/titmuss/softsqueeze/skin/LcdPanel.java?rev=10220&r1=10219&r2=10220&view=diff
==============================================================================
--- trunk/softsqueeze/src/org/titmuss/softsqueeze/skin/LcdPanel.java (original)
+++ trunk/softsqueeze/src/org/titmuss/softsqueeze/skin/LcdPanel.java Thu Oct 5 12:29:29 2006
@@ -53,8 +53,6 @@
offset = parseIntAttribute(e, "offset", 0);
fgColor = parseColorAttribute(e, "fgcolor", Color.green);
bgColor = parseColorAttribute(e, "bgcolor", null);
-
- squeeze.getLcdDisplay().setColour(fgColor, bgColor);
}
public JComponent createComponent() {
@@ -63,6 +61,8 @@
panel.setForeground(fgColor);
if (bgColor != null)
panel.setBackground(bgColor);
+
+ squeeze.getLcdDisplay().setColour(fgColor, bgColor);
return panel;
}
More information about the checkins
mailing list