Repository: openmeetings Updated Branches: refs/heads/3.3.x b5c6d7933 -> 1175e5c86
[OPENMEETINGS-1678] eraser tool is added Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/1175e5c8 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/1175e5c8 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/1175e5c8 Branch: refs/heads/3.3.x Commit: 1175e5c86c97e73e551f6bfec7ee488ed19909e3 Parents: b5c6d79 Author: Maxim Solodovnik <[email protected]> Authored: Tue Aug 1 12:18:17 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Aug 1 12:18:17 2017 +0700 ---------------------------------------------------------------------- .../panels/maintoolspanel/mainToolsPanel.lzx | 14 ++++++-- .../maintoolspanel/mainToolsPanelItem.lzx | 1 + .../panels/propertypanel/propertyPanel.lzx | 36 +++++++++++++++---- .../src/main/webapp/public/theme.xml | 1 + .../basic-theme/whiteboard/clear-icon.png | Bin 0 -> 935 bytes 5 files changed, 44 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1175e5c8/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx ---------------------------------------------------------------------- diff --git a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx index fe49e9d..f88918d 100644 --- a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx +++ b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx @@ -44,6 +44,11 @@ labelid="557" x_insetResource="1" y_insetResource="1" resourceItem="pointer_whiteboard_menu_rsc" /> <mainToolsPanelItem name="letter" modi="letter" labelid="73" resourceItem="letter" /> + <mainToolsPanelItem name="erase" modi="rectangle" isEraser="true" resourceItem="erase_rsc"> + <handler name="oninit"> + this.__labeltooltip.setAttribute('text', "White-Out"); + </handler> + </mainToolsPanelItem> <mainToolsPanelItem name="paint" modi="paint" labelid="74" resourceItem="paint" /> <mainToolsPanelItem name="line" modi="line" labelid="75" resourceItem="line_rsc" /> <mainToolsPanelItem name="uline" modi="uline" labelid="76" resourceItem="uline_rsc" /> @@ -94,6 +99,11 @@ <mainToolsPanelItem name="hand" modi="hand" labelid="72" _isselected="true" resourceItem="menupointer_rsc" /> <mainToolsPanelItem name="pointerWhiteboard" modi="pointerWhiteboard" labelid="557" resourceItem="pointer_whiteboard_menu_rsc" /> <mainToolsPanelItem name="letter" modi="letter" labelid="73" resourceItem="letter" /> + <mainToolsPanelItem name="erase" modi="rectangle" isEraser="true" resourceItem="erase_rsc"> + <handler name="oninit"> + this.__labeltooltip.setAttribute('text', "White-Out"); + </handler> + </mainToolsPanelItem> <mainToolsPanelItem name="paint" modi="paint" labelid="74" resourceItem="paint" /> <mainToolsPanelItem name="line" modi="line" labelid="75" resourceItem="line_rsc" /> <mainToolsPanelItem name="uline" modi="uline" labelid="76" resourceItem="uline_rsc" /> @@ -128,7 +138,7 @@ </class> <class name="mainToolsTopPanel" extends="baseTopPanel" - width="420" height="33" title="" docking="true" + width="448" height="33" title="" docking="true" activationClassBounding="mainToolsLeftPanel" activationVClassBounding="mainToolsTopPanel" leftClassPanel="mainToolsLeftPanel" @@ -153,7 +163,7 @@ </class> <class name="mainToolsLeftPanel" extends="baseLeftPanel" - width="33" height="420" title="" docking="true" + width="33" height="448" title="" docking="true" activationClassBounding="mainToolsLeftPanel" activationVClassBounding="mainToolsTopPanel" topClassPanel="mainToolsTopPanel" http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1175e5c8/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanelItem.lzx ---------------------------------------------------------------------- diff --git a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanelItem.lzx b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanelItem.lzx index 4614545..657cda5 100644 --- a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanelItem.lzx +++ b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanelItem.lzx @@ -25,6 +25,7 @@ <attribute name="labelid" value="0" type="number" /> <attribute name="setSelectionToItem" value="true" type="boolean" /> <attribute name="_isselected" value="false" type="boolean" /> + <attribute name="isEraser" value="false" type="boolean" /> <handler name="oninit"> if (this._isselected) parent.parent.parent.setSelection(this); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1175e5c8/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx ---------------------------------------------------------------------- diff --git a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx index af1d049..e90d082 100644 --- a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx +++ b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx @@ -70,12 +70,36 @@ drawArea.currentdrawarrowlinestrokeFillDis); this._content.changeOpacitySlider.setSliderValue(drawArea.currentdrawarrowOpacity*100); } else if (drawArea.drawmodus == 'rectangle') { - this._content.lineColorChoose.setSelectedColorWithDis(drawArea.currentrectanglestroke, - drawArea.currentrectanglestrokeDis); - this._content.fillColorChoose.setSelectedColorWithDis(drawArea.currentrectanglestrokeFill, - drawArea.currentrectanglestrokeFillDis); - this._content.changeWidthSlider.setSliderValue(drawArea.currentrectangleineWidth); - this._content.changeOpacitySlider.setSliderValue(drawArea.currentrectangleOpacity*100); + if (drawArea.parent.parent.panelArea.objectRef.isEraser) { + if ($debug) Debug.write("loadPanelByModus :: isErase is TRUE"); + this._content.fillColorChoose.setEnabled(false); + this._content.lineColorChoose.setEnabled(false); + this._content.changeWidthSlider.setEnabled(false); + this._content.changeOpacitySlider.setEnabled(false); + drawArea.rectSettings = { + stroke: drawArea.currentrectanglestroke + , strokeDis: drawArea.currentrectanglestrokeDis + , strokeFill: drawArea.currentrectanglestrokeFill + , strokeFillDis: drawArea.currentrectanglestrokeFillDis + }; + drawArea.currentrectanglestroke = "16777215"; + drawArea.currentrectanglestrokeDis = "16777215"; + drawArea.currentrectanglestrokeFill = "16777215"; + drawArea.currentrectanglestrokeFillDis = "16777215"; + } else { + if (!!drawArea.rectSettings) { + drawArea.currentrectanglestroke = drawArea.rectSettings.stroke; + drawArea.currentrectanglestrokeDis = drawArea.rectSettings.strokeDis; + drawArea.currentrectanglestrokeFill = drawArea.rectSettings.strokeFill; + drawArea.currentrectanglestrokeFillDis = drawArea.rectSettings.strokeFillDis; + } + this._content.lineColorChoose.setSelectedColorWithDis(drawArea.currentrectanglestroke, + drawArea.currentrectanglestrokeDis); + this._content.fillColorChoose.setSelectedColorWithDis(drawArea.currentrectanglestrokeFill, + drawArea.currentrectanglestrokeFillDis); + this._content.changeWidthSlider.setSliderValue(drawArea.currentrectangleineWidth); + this._content.changeOpacitySlider.setSliderValue(drawArea.currentrectangleOpacity * 100); + } } else if (drawArea.drawmodus == 'ellipse') { this._content.lineColorChoose.setSelectedColorWithDis(drawArea.currentellipsestroke, drawArea.currentellipsestrokeDis); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1175e5c8/openmeetings-web/src/main/webapp/public/theme.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/public/theme.xml b/openmeetings-web/src/main/webapp/public/theme.xml index 82a19b3..9db7824 100644 --- a/openmeetings-web/src/main/webapp/public/theme.xml +++ b/openmeetings-web/src/main/webapp/public/theme.xml @@ -327,4 +327,5 @@ description="Conference Room Tab Icon" license="APL author sebawagner" src="themes/basic-theme/dashboard/conference_icon_normal.png" /> + <resource name="erase_rsc" description="Toolbar Icon" license="APL Author sebawagner" src="themes/basic-theme/whiteboard/clear-icon.png"/> </theme> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1175e5c8/openmeetings-web/src/main/webapp/public/themes/basic-theme/whiteboard/clear-icon.png ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/public/themes/basic-theme/whiteboard/clear-icon.png b/openmeetings-web/src/main/webapp/public/themes/basic-theme/whiteboard/clear-icon.png new file mode 100644 index 0000000..ce5fdc2 Binary files /dev/null and b/openmeetings-web/src/main/webapp/public/themes/basic-theme/whiteboard/clear-icon.png differ
