Author: sebawagner
Date: Tue Apr 10 15:46:15 2012
New Revision: 1311797
URL: http://svn.apache.org/viewvc?rev=1311797&view=rev
Log:
OPENMEETINGS-129 Fix Property Bar Fill/Line/Lock color choose
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/lock.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/lock_open.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/paintcan.png
(with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/resources/color_line.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/resources/encrypted.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/resources/fill-color.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/resources/lock.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/resources/close_dn.png
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/fillColorChoose.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/lineColorChoose.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/lineOnlyColorChoose.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/regexptip.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/resources/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/scrollbars/library.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml?rev=1311797&r1=1311796&r2=1311797&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
Tue Apr 10 15:46:15 2012
@@ -210,14 +210,25 @@
license="APL Author sebawagner"
src="public/themes/basic-theme/whiteboard/doc_last.png" />
-
-
-
-
-
-
-
-
-
+ <!-- property panel -->
+ <resource name="colorlinechoose_rsc"
+ description="Property bar icon line color"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/whiteboard/pencil.png" />
+
+ <resource name="colorfillchoose_rsc"
+ description="Property bar icon fill color"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/whiteboard/paintcan.png" />
+
+ <resource name="color_lock_rsc"
+ description="Property bar icon color lock"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/whiteboard/lock.png" />
+
+ <resource name="color_lock_open_rsc"
+ description="Property bar icon color lock open"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/whiteboard/lock_open.png" />
</theme>
\ No newline at end of file
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/lock.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/lock.png?rev=1311797&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/lock.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/lock_open.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/lock_open.png?rev=1311797&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/lock_open.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/paintcan.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/paintcan.png?rev=1311797&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/paintcan.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/fillColorChoose.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/fillColorChoose.lzx?rev=1311797&r1=1311796&r2=1311797&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/fillColorChoose.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/fillColorChoose.lzx
Tue Apr 10 15:46:15 2012
@@ -63,6 +63,8 @@
this.rgt.setAttribute('opacity',0.3);
this.rgt.setAttribute('enabled',false);
this.colorIsEnabled = false;
+ this.rgt._lock.setAttribute("visibility","visible");
+ this.rgt._lock_open.setAttribute("visibility","hidden");
} else {
this._currentcolor.setAttribute('clickable',true);
this._currentcolor.setAttribute('opacity',1);
@@ -70,6 +72,8 @@
this.rgt.setAttribute('enabled',true);
this.onselectedColor.sendEvent(this.selectedColor);
this.colorIsEnabled = true;
+ this.rgt._lock.setAttribute("visibility","hidden");
+ this.rgt._lock_open.setAttribute("visibility","visible");
}
</method>
@@ -144,7 +148,8 @@
</view>
<button name="rgt" x="32" y="1" onclick="parent.toggle()" width="24"
height="23" >
- <view x="4" y="3" resource="colorfillchoose_rsc" />
+ <image x="4" y="3" src="$once{
canvas.getThemeImage('colorfillchoose_rsc') }"
+ width="16" height="16" stretches="both" />
<labelTooltip labelid="427" />
</button>
@@ -158,6 +163,8 @@
parent.selectedColorDis = -1;
parent.onselectedColor.sendEvent(-1);
parent.colorIsEnabled = false;
+ this._lock.setAttribute("visibility","hidden");
+ this._lock_open.setAttribute("visibility","visible");
} else {
parent._currentcolor.setAttribute('clickable',true);
parent._currentcolor.setAttribute('opacity',1);
@@ -166,9 +173,14 @@
parent.selectedColorDis = 1;
parent.onselectedColor.sendEvent(parent.selectedColor);
parent.colorIsEnabled = true;
+ this._lock.setAttribute("visibility","visible");
+ this._lock_open.setAttribute("visibility","hidden");
}
</handler>
- <view x="4" y="3" resource="colorfillblock_rsc" />
+ <image x="4" y="3" name="_lock" src="$once{
canvas.getThemeImage('color_lock_rsc') }"
+ width="16" height="16" stretches="both" />
+ <image x="4" y="3" name="_lock_open" src="$once{
canvas.getThemeImage('color_lock_open_rsc') }"
+ width="16" height="16" stretches="both"
visibility="hidden" />
<labelTooltip labelid="428" />
</button>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/library.lzx?rev=1311797&r1=1311796&r2=1311797&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/library.lzx
Tue Apr 10 15:46:15 2012
@@ -20,10 +20,7 @@
-->
<library>
- <resource name="colorlinechoose_rsc" src="resources/color_line.png" />
- <resource name="colorlineblock_rsc" src="resources/encrypted.png" />
- <resource name="colorfillchoose_rsc" src="resources/color_fill.png" />
- <resource name="colorfillblock_rsc" src="resources/encrypted.png" />
+ <!-- APL Author sebawagner -->
<resource name="arrow_down_slider_rsc"
src="resources/arrow_down_slider.png" />
<include href="vslider.lzx" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/lineColorChoose.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/lineColorChoose.lzx?rev=1311797&r1=1311796&r2=1311797&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/lineColorChoose.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/lineColorChoose.lzx
Tue Apr 10 15:46:15 2012
@@ -65,6 +65,8 @@
this.rgt.setAttribute('opacity',0.3);
this.rgt.setAttribute('enabled',false);
this.colorIsEnabled = false;
+ this.rgt._lock.setAttribute("visibility","visible");
+ this.rgt._lock_open.setAttribute("visibility","hidden");
} else {
this._currentcolor.setAttribute('clickable',true);
this._currentcolor.setAttribute('opacity',1);
@@ -72,6 +74,8 @@
this.rgt.setAttribute('enabled',true);
this.onselectedColor.sendEvent(this.selectedColor);
this.colorIsEnabled = true;
+ this.rgt._lock.setAttribute("visibility","hidden");
+ this.rgt._lock_open.setAttribute("visibility","visible");
}
</method>
@@ -147,7 +151,8 @@
</view>
<button name="rgt" x="32" y="1" onclick="parent.toggle()" width="24"
height="23" >
- <view x="4" y="3" resource="colorlinechoose_rsc" />
+ <image x="4" y="3" src="$once{
canvas.getThemeImage('colorlinechoose_rsc') }"
+ width="16" height="16" stretches="both" />
<labelTooltip labelid="424" />
</button>
@@ -161,6 +166,8 @@
parent.selectedColorDis = -1;
parent.onselectedColor.sendEvent(-1);
parent.colorIsEnabled = false;
+ this._lock.setAttribute("visibility","hidden");
+ this._lock_open.setAttribute("visibility","visible");
} else {
parent._currentcolor.setAttribute('clickable',true);
parent._currentcolor.setAttribute('opacity',1);
@@ -169,9 +176,14 @@
parent.selectedColorDis = 1;
parent.onselectedColor.sendEvent(parent.selectedColor);
parent.colorIsEnabled = true;
+ this._lock.setAttribute("visibility","visible");
+ this._lock_open.setAttribute("visibility","hidden");
}
</handler>
- <view x="4" y="3" resource="colorlineblock_rsc" />
+ <image x="4" y="3" name="_lock" src="$once{
canvas.getThemeImage('color_lock_rsc') }"
+ width="16" height="16" stretches="both" />
+ <image x="4" y="3" name="_lock_open" src="$once{
canvas.getThemeImage('color_lock_open_rsc') }"
+ width="16" height="16" stretches="both"
visibility="hidden" />
<labelTooltip labelid="426" />
</button>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/lineOnlyColorChoose.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/lineOnlyColorChoose.lzx?rev=1311797&r1=1311796&r2=1311797&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/lineOnlyColorChoose.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/lineOnlyColorChoose.lzx
Tue Apr 10 15:46:15 2012
@@ -98,7 +98,8 @@
</view>
<button name="rgt" x="32" y="1" onclick="parent.toggle()" width="24"
height="23" >
- <view x="4" y="3" resource="colorlinechoose_rsc" />
+ <image x="4" y="3" src="$once{
canvas.getThemeImage('colorlinechoose_rsc') }"
+ width="16" height="16" stretches="both" />
<labelTooltip labelid="424" />
</button>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/regexptip.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/regexptip.lzx?rev=1311797&r1=1311796&r2=1311797&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/regexptip.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/regexptip.lzx
Tue Apr 10 15:46:15 2012
@@ -20,10 +20,13 @@
-->
<library>
+<!-- APL Author sebawagner -->
<resource name="regexptip_rsc_r" src="resources/regexp/regexp_bg_r.swf" />
+<!-- APL Author sebawagner -->
<resource name="regexptip_rsc_m" src="resources/regexp/regexp_bg_m.swf" />
+<!-- APL Author sebawagner -->
<resource name="regexptip_rsc_l" src="resources/regexp/regexp_bg_l.swf" />
-
+<!-- APL Author sebawagner -->
<resource name="regexptip_rsc_point" src="resources/regexp/regexp_point.swf" />
<class name="regexptip" extends="view">
@@ -44,7 +47,7 @@
<view resource="regexptip_rsc_point" y="-7" x="12" />
- <text fontsize="11" text="${ parent.regexptext}" resize="true" />
+ <text fontsize="11" text="${ parent.regexptext}" resize="true"
multiline="false" />
</class>
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/resources/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/resources/library.lzx?rev=1311797&r1=1311796&r2=1311797&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/resources/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/resources/library.lzx
Tue Apr 10 15:46:15 2012
@@ -20,18 +20,23 @@
-->
<library>
+ <!-- APL Author sebawagner -->
<resource src="presenter_thumb.swf" name="presenter_thumb_rsc" />
-
+ <!-- APL Author sebawagner -->
<resource name="btn_presenter_minimize" src="minimize_up.png" />
+ <!-- APL Author sebawagner -->
<resource name="btn_presenter_maximize" src="maximize_up.png" />
+ <!-- APL Author sebawagner -->
<resource name="btn_presenter_maximize2" src="maximize2_up.png" />
+ <!-- APL Author sebawagner -->
<resource name="btn_presenter_close2" src="close_up.png" />
+ <!-- APL Author sebawagner -->
<resource name="btn_presenter_close">
<frame src="close_up.png" />
<frame src="close_mo.png" />
- <frame src="close_dn.png" />
+ <frame src="close_up.png" />
</resource>
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/scrollbars/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/scrollbars/library.lzx?rev=1311797&r1=1311796&r2=1311797&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/scrollbars/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/scrollbars/library.lzx
Tue Apr 10 15:46:15 2012
@@ -20,16 +20,22 @@
-->
<library>
+ <!-- APL Author sebawagner -->
<resource name="omscrolltrack_y_rsc" src="resources/y_scrolltrack.swf"
/>
+ <!-- APL Author sebawagner -->
<resource name="omscrollbar_ythumbmiddle_rsc"
src="resources/scrollthumb_y_mid.swf" />
+ <!-- APL Author sebawagner -->
<resource name="omscrollbar_ythumbtop_rsc"
src="resources/scrollthumb_y_top.swf" />
+ <!-- APL Author sebawagner -->
<resource name="omscrollbar_ythumbbottom_rsc"
src="resources/scrollthumb_y_bottom.swf" />
-
+ <!-- APL Author sebawagner -->
<resource name="omscrolltrack_x_rsc" src="resources/x_scrolltrack.swf"
/>
-
+ <!-- APL Author sebawagner -->
<resource name="omscrollbar_xthumbmiddle_rsc"
src="resources/scrollthumb_x_mid.swf" />
+ <!-- APL Author sebawagner -->
<resource name="omscrollbar_xthumbleft_rsc"
src="resources/scrollthumb_x_left.swf" />
+ <!-- APL Author sebawagner -->
<resource name="omscrollbar_xthumbright_rsc"
src="resources/scrollthumb_x_right.swf" />
<include href="om_vscrollbar.lzx"/>
