Author: vjrj_ Date: 2011-02-25 00:07:55 +0100 (Fri, 25 Feb 2011) New Revision: 1262 Added: trunk/img/icons/checked.png trunk/img/icons/radiochecked.png trunk/img/icons/radiounchecked.png trunk/img/icons/unchecked.png trunk/src/main/java/cc/kune/chat/client/AddAsBuddieHeaderButton.java trunk/src/main/java/cc/kune/chat/client/KuneHablarWidget.java trunk/src/main/java/cc/kune/common/client/log/ trunk/src/main/java/cc/kune/common/client/log/EventBusWithLogging.java trunk/src/main/java/cc/kune/common/client/log/Log.java trunk/src/main/java/cc/kune/core/client/ws/entheader/ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeader.java trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java Removed: trunk/src/main/java/cc/kune/core/client/logs/ Modified: trunk/img/icons-base.svg trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java trunk/src/main/java/cc/kune/chat/client/ChatParts.java trunk/src/main/java/cc/kune/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/client/KuneGinjector.java trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuItemDescriptor.java trunk/src/main/java/cc/kune/common/client/errors/NotImplementedException.java trunk/src/main/java/cc/kune/common/client/errors/UIException.java trunk/src/main/java/cc/kune/common/client/resources/checked.png trunk/src/main/java/cc/kune/common/client/resources/radiochecked.png trunk/src/main/java/cc/kune/common/client/resources/radiounchecked.png trunk/src/main/java/cc/kune/common/client/shortcuts/DefaultGlobalShortcutRegister.java trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml trunk/src/main/java/cc/kune/common/client/utils/OnAcceptCallback.java trunk/src/main/java/cc/kune/common/public/kune-common.css trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerImpl.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java trunk/src/main/java/cc/kune/core/client/init/AppStarter.java trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java trunk/src/main/java/cc/kune/core/client/init/PrefetchUtilities.java trunk/src/main/java/cc/kune/core/client/resources/icons/checked.png trunk/src/main/java/cc/kune/core/client/resources/icons/radiochecked.png trunk/src/main/java/cc/kune/core/client/resources/icons/radiounchecked.png trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.java trunk/src/main/java/cc/kune/core/client/sn/actions/GroupMembersConfActions.java trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicDialog.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java Log: NEW - # 25: Social Net refactorization http://kune.ourproject.org/issues/ticket/25 Added: trunk/img/icons/checked.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/checked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/radiochecked.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/radiochecked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/radiounchecked.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/radiounchecked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/unchecked.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/unchecked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/img/icons-base.svg =================================================================== --- trunk/img/icons-base.svg 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/img/icons-base.svg 2011-02-24 23:07:55 UTC (rev 1262) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> + <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" @@ -13,13 +14,13 @@ height="297mm" id="svg21019" sodipodi:version="0.32" - inkscape:version="0.46" - sodipodi:docbase="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img" + inkscape:version="0.48.0 r9654" sodipodi:docname="icons-base.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="/tmp/buttons.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-ydpi="90" + version="1.1"> <sodipodi:namedview id="base" pagecolor="#ffffff" @@ -27,20 +28,21 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.8805759" - inkscape:cx="368.89944" - inkscape:cy="693.88452" + inkscape:zoom="1" + inkscape:cx="137.00004" + inkscape:cy="507.00023" inkscape:document-units="px" inkscape:current-layer="layer1" - inkscape:window-width="1280" - inkscape:window-height="1001" - inkscape:window-x="1280" - inkscape:window-y="0" + inkscape:window-width="1278" + inkscape:window-height="973" + inkscape:window-x="0" + inkscape:window-y="21" showgrid="false" showguides="true" inkscape:guide-bbox="true" inkscape:grid-points="true" - inkscape:guide-points="true"> + inkscape:guide-points="true" + inkscape:window-maximized="0"> <inkscape:grid empspacing="1" empopacity="0.4" @@ -60,6 +62,18 @@ id="defs21021"> <linearGradient inkscape:collect="always" + id="linearGradient4349"> + <stop + style="stop-color:#b3b3b3;stop-opacity:1;" + offset="0" + id="stop4351" /> + <stop + style="stop-color:#b3b3b3;stop-opacity:0;" + offset="1" + id="stop4353" /> + </linearGradient> + <linearGradient + inkscape:collect="always" id="linearGradient3002"> <stop style="stop-color:#de1515;stop-opacity:1;" @@ -1877,6 +1891,17 @@ y1="453.87259" x2="342.63214" y2="446.19382" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient4349" + id="radialGradient4374" + cx="137.31995" + cy="545.46362" + fx="137.31995" + fy="545.46362" + r="4.9999999" + gradientTransform="matrix(0.91693414,0.01425781,-0.01300982,0.83667505,18.233348,87.119612)" + gradientUnits="userSpaceOnUse" /> </defs> <metadata id="metadata21024"> @@ -1886,6 +1911,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -2153,7 +2179,7 @@ inkscape:flatsided="true" inkscape:rounded="0" inkscape:randomized="0" - d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " + d="m 1563.0192,677.96995 -3.3032,-5.65485 6.5488,-0.0333 z" transform="translate(126.81013,-429.87643)" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/menu-arrow-down.png" inkscape:export-xdpi="90" @@ -2218,7 +2244,7 @@ inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/button-sitebar-arrow-down.png" transform="matrix(1.7115632,0,0,1.0517267,-2323.1568,-28.402137)" - d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " + d="m 1563.0192,677.96995 -3.3032,-5.65485 6.5488,-0.0333 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -2267,7 +2293,7 @@ inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/button-sitebar-arrow-down.png" transform="matrix(1.7115632,0,0,1.0517267,-2323.1568,-28.402137)" - d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " + d="m 1563.0192,677.96995 -3.3032,-5.65485 6.5488,-0.0333 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -2316,7 +2342,7 @@ inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/button-sitebar-arrow-down.png" transform="matrix(1.7115632,0,0,1.0517267,-2323.1568,-28.402134)" - d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " + d="m 1563.0192,677.96995 -3.3032,-5.65485 6.5488,-0.0333 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -2365,7 +2391,7 @@ inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/button-sitebar-arrow-down.png" transform="matrix(1.7115632,0,0,1.0517267,-2323.1568,-28.402134)" - d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " + d="m 1563.0192,677.96995 -3.3032,-5.65485 6.5488,-0.0333 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -3016,7 +3042,7 @@ id="g14270"> <path transform="matrix(0.6,0,0,0.6249999,-25.304096,101.58627)" - d="M -43 242.36218 A 12.5 12 0 1 1 -68,242.36218 A 12.5 12 0 1 1 -43 242.36218 z" + d="m -43,242.36218 c 0,6.62742 -5.596441,12 -12.5,12 -6.903559,0 -12.5,-5.37258 -12.5,-12 0,-6.62741 5.596441,-12 12.5,-12 6.903559,0 12.5,5.37259 12.5,12 z" sodipodi:ry="12" sodipodi:rx="12.5" sodipodi:cy="242.36218" @@ -3035,7 +3061,7 @@ sodipodi:cy="242.36218" sodipodi:rx="12.5" sodipodi:ry="12" - d="M -43 242.36218 A 12.5 12 0 1 1 -68,242.36218 A 12.5 12 0 1 1 -43 242.36218 z" + d="m -43,242.36218 c 0,6.62742 -5.596441,12 -12.5,12 -6.903559,0 -12.5,-5.37258 -12.5,-12 0,-6.62741 5.596441,-12 12.5,-12 6.903559,0 12.5,5.37259 12.5,12 z" transform="matrix(0.28,0,0,0.2916666,-44.46,180.67323)" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" inkscape:export-xdpi="90" @@ -3152,14 +3178,14 @@ sodipodi:cy="242.36218" sodipodi:rx="12.5" sodipodi:ry="12" - d="M -43 242.36218 A 12.5 12 0 1 1 -68,242.36218 A 12.5 12 0 1 1 -43 242.36218 z" + d="m -43,242.36218 c 0,6.62742 -5.596441,12 -12.5,12 -6.903559,0 -12.5,-5.37258 -12.5,-12 0,-6.62741 5.596441,-12 12.5,-12 6.903559,0 12.5,5.37259 12.5,12 z" transform="matrix(0.6,0,0,0.6249999,-25.304096,101.58627)" /> <path inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" transform="matrix(0.28,0,0,0.2916666,-44.46,180.67323)" - d="M -43 242.36218 A 12.5 12 0 1 1 -68,242.36218 A 12.5 12 0 1 1 -43 242.36218 z" + d="m -43,242.36218 c 0,6.62742 -5.596441,12 -12.5,12 -6.903559,0 -12.5,-5.37258 -12.5,-12 0,-6.62741 5.596441,-12 12.5,-12 6.903559,0 12.5,5.37259 12.5,12 z" sodipodi:ry="12" sodipodi:rx="12.5" sodipodi:cy="242.36218" @@ -3219,7 +3245,7 @@ sodipodi:cy="554.68896" sodipodi:rx="11.5" sodipodi:ry="11.5" - d="M -215 554.68896 A 11.5 11.5 0 1 1 -238,554.68896 A 11.5 11.5 0 1 1 -215 554.68896 z" + d="m -215,554.68896 c 0,6.35128 -5.14873,11.5 -11.5,11.5 -6.35127,0 -11.5,-5.14872 -11.5,-11.5 0,-6.35127 5.14873,-11.5 11.5,-11.5 6.35127,0 11.5,5.14873 11.5,11.5 z" transform="translate(835.07499,-335.32678)" /> <text xml:space="preserve" @@ -3262,7 +3288,7 @@ id="g7072"> <path transform="translate(865.07499,-335.32678)" - d="M -215 554.68896 A 11.5 11.5 0 1 1 -238,554.68896 A 11.5 11.5 0 1 1 -215 554.68896 z" + d="m -215,554.68896 c 0,6.35128 -5.14873,11.5 -11.5,11.5 -6.35127,0 -11.5,-5.14872 -11.5,-11.5 0,-6.35127 5.14873,-11.5 11.5,-11.5 6.35127,0 11.5,5.14873 11.5,11.5 z" sodipodi:ry="11.5" sodipodi:rx="11.5" sodipodi:cy="554.68896" @@ -3291,7 +3317,7 @@ id="g7077"> <path transform="translate(895.07499,-335.32678)" - d="M -215 554.68896 A 11.5 11.5 0 1 1 -238,554.68896 A 11.5 11.5 0 1 1 -215 554.68896 z" + d="m -215,554.68896 c 0,6.35128 -5.14873,11.5 -11.5,11.5 -6.35127,0 -11.5,-5.14872 -11.5,-11.5 0,-6.35127 5.14873,-11.5 11.5,-11.5 6.35127,0 11.5,5.14873 11.5,11.5 z" sodipodi:ry="11.5" sodipodi:rx="11.5" sodipodi:cy="554.68896" @@ -3326,7 +3352,7 @@ sodipodi:cy="554.68896" sodipodi:rx="11.5" sodipodi:ry="11.5" - d="M -215 554.68896 A 11.5 11.5 0 1 1 -238,554.68896 A 11.5 11.5 0 1 1 -215 554.68896 z" + d="m -215,554.68896 c 0,6.35128 -5.14873,11.5 -11.5,11.5 -6.35127,0 -11.5,-5.14872 -11.5,-11.5 0,-6.35127 5.14873,-11.5 11.5,-11.5 6.35127,0 11.5,5.14873 11.5,11.5 z" transform="translate(925.07499,-335.32678)" /> <text xml:space="preserve" @@ -3349,7 +3375,7 @@ id="g7087"> <path transform="translate(953.07499,-335.32678)" - d="M -215 554.68896 A 11.5 11.5 0 1 1 -238,554.68896 A 11.5 11.5 0 1 1 -215 554.68896 z" + d="m -215,554.68896 c 0,6.35128 -5.14873,11.5 -11.5,11.5 -6.35127,0 -11.5,-5.14872 -11.5,-11.5 0,-6.35127 5.14873,-11.5 11.5,-11.5 6.35127,0 11.5,5.14873 11.5,11.5 z" sodipodi:ry="11.5" sodipodi:rx="11.5" sodipodi:cy="554.68896" @@ -3387,11 +3413,11 @@ inkscape:flatsided="true" inkscape:rounded="0" inkscape:randomized="0" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + d="m 589,358.38994 -15.61249,-27.04163 31.22498,-1e-5 z" transform="matrix(1.0090586,0,0,0.5666999,-5.5815934,146.26264)" /> <path transform="matrix(-1.0090586,0,0,-0.5666999,1186.9923,552.46172)" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + d="m 589,358.38994 -15.61249,-27.04163 31.22498,-1e-5 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -3407,7 +3433,7 @@ sodipodi:type="star" /> <path transform="matrix(0,1.0090586,-0.5666999,0,793.77505,-246.75759)" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + d="m 589,358.38994 -15.61249,-27.04163 31.22498,-1e-5 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -3435,7 +3461,7 @@ inkscape:flatsided="true" inkscape:rounded="0" inkscape:randomized="0" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + d="m 589,358.38994 -15.61249,-27.04163 31.22498,-1e-5 z" transform="matrix(0,1.0090586,0.5666999,0,387.80334,-243.21941)" /> </g> <g @@ -3443,7 +3469,7 @@ id="g8085"> <path transform="matrix(1.0090586,0,0,-0.5666999,34.910563,528.13723)" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + d="m 589,358.38994 -15.61249,-27.04163 31.22498,-1e-5 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -3471,7 +3497,7 @@ inkscape:flatsided="true" inkscape:rounded="0" inkscape:randomized="0" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + d="m 589,358.38994 -15.61249,-27.04163 31.22498,-1e-5 z" transform="matrix(-1.0090586,0,0,0.5666999,1223.0894,167.26264)" /> <path sodipodi:type="star" @@ -3487,11 +3513,11 @@ inkscape:flatsided="true" inkscape:rounded="0" inkscape:randomized="0" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + d="m 589,358.38994 -15.61249,-27.04163 31.22498,-1e-5 z" transform="matrix(0,-1.0090586,0.5666999,0,448.81872,941.94378)" /> <path transform="matrix(0,1.0090586,-0.5666999,0,809.09954,-246.21941)" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + d="m 589,358.38994 -15.61249,-27.04163 31.22498,-1e-5 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -3713,7 +3739,7 @@ transform="matrix(0.4565425,0,0,0.4565425,311.40113,199.37826)"> <path transform="matrix(1.0090586,0,0,0.5666999,-5.5815934,146.26264)" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + d="m 589,358.38994 -15.61249,-27.04163 31.22498,-1e-5 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -3741,7 +3767,7 @@ inkscape:flatsided="true" inkscape:rounded="0" inkscape:randomized="0" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + d="m 589,358.38994 -15.61249,-27.04163 31.22498,-1e-5 z" transform="matrix(-1.0090586,0,0,-0.5666999,1186.9923,552.46172)" /> <path sodipodi:type="star" @@ -3757,11 +3783,11 @@ inkscape:flatsided="true" inkscape:rounded="0" inkscape:randomized="0" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + d="m 589,358.38994 -15.61249,-27.04163 31.22498,-1e-5 z" transform="matrix(0,1.0090586,-0.5666999,0,793.77505,-246.75759)" /> <path transform="matrix(0,1.0090586,0.5666999,0,387.80334,-243.21941)" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + d="m 589,358.38994 -15.61249,-27.04163 31.22498,-1e-5 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -3857,11 +3883,11 @@ inkscape:flatsided="true" inkscape:rounded="0" inkscape:randomized="0" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + d="m 535.56988,360.58118 -7.31222,4.22171 0,-8.44343 z" transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-312.92678)" /> <path transform="matrix(1.0940589,0,0,1.8949657,-34.944996,-312.92678)" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + d="m 535.56988,360.58118 -7.31222,4.22171 0,-8.44343 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -4169,7 +4195,7 @@ id="g8211"> <path transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-312.92678)" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + d="m 535.56988,360.58118 -7.31222,4.22171 0,-8.44343 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -4197,7 +4223,7 @@ inkscape:flatsided="true" inkscape:rounded="0" inkscape:randomized="0" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + d="m 535.56988,360.58118 -7.31222,4.22171 0,-8.44343 z" transform="matrix(1.0940589,0,0,1.8949657,-34.944996,-312.92678)" /> </g> <g @@ -4205,7 +4231,7 @@ transform="translate(1.9896296,122.67525)"> <path transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-312.92678)" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + d="m 535.56988,360.58118 -7.31222,4.22171 0,-8.44343 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -4233,7 +4259,7 @@ inkscape:flatsided="true" inkscape:rounded="0" inkscape:randomized="0" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + d="m 535.56988,360.58118 -7.31222,4.22171 0,-8.44343 z" transform="matrix(1.0940589,0,0,1.8949657,-34.944996,-312.92678)" /> </g> <g @@ -4253,11 +4279,11 @@ inkscape:flatsided="true" inkscape:rounded="0" inkscape:randomized="0" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + d="m 535.56988,360.58118 -7.31222,4.22171 0,-8.44343 z" transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-312.92678)" /> <path transform="matrix(1.0940589,0,0,1.8949657,-34.944996,-312.92678)" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + d="m 535.56988,360.58118 -7.31222,4.22171 0,-8.44343 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -4289,11 +4315,11 @@ inkscape:flatsided="true" inkscape:rounded="0" inkscape:randomized="0" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + d="m 535.56988,360.58118 -7.31222,4.22171 0,-8.44343 z" transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-312.92678)" /> <path transform="matrix(1.0940589,0,0,1.8949657,-34.944996,-312.92678)" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + d="m 535.56988,360.58118 -7.31222,4.22171 0,-8.44343 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -4497,7 +4523,7 @@ inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/menu-arrow-down.png" transform="translate(-1437.9102,-6.8473347)" - d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z" + d="m 1563.0192,677.96995 -3.3032,-5.65485 6.5488,-0.0333 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -4542,7 +4568,7 @@ sodipodi:cy="332.62314" sodipodi:rx="26.82268" sodipodi:ry="26.82268" - d="M 277.35793,332.62314 A 26.82268,26.82268 0 1 1 223.71257,332.62314 A 26.82268,26.82268 0 1 1 277.35793,332.62314 z" + d="m 277.35793,332.62314 c 0,14.81376 -12.00893,26.82268 -26.82268,26.82268 -14.81376,0 -26.82268,-12.00892 -26.82268,-26.82268 0,-14.81376 12.00892,-26.82268 26.82268,-26.82268 14.81375,0 26.82268,12.00892 26.82268,26.82268 z" transform="matrix(0.1668983,0,0,0.1668983,278.88098,515.04891)" /> <path style="opacity:1;fill:#800000;fill-opacity:1;fill-rule:nonzero;stroke:#a02c2c;stroke-width:2.860111;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.37500004;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" @@ -4556,7 +4582,7 @@ sodipodi:cy="332.62314" sodipodi:rx="26.82268" sodipodi:ry="26.82268" - d="M 277.35793,332.62314 A 26.82268,26.82268 0 1 1 223.71257,332.62314 A 26.82268,26.82268 0 1 1 277.35793,332.62314 z" + d="m 277.35793,332.62314 c 0,14.81376 -12.00893,26.82268 -26.82268,26.82268 -14.81376,0 -26.82268,-12.00892 -26.82268,-26.82268 0,-14.81376 12.00892,-26.82268 26.82268,-26.82268 14.81375,0 26.82268,12.00892 26.82268,26.82268 z" transform="matrix(8.5773407e-2,0,0,8.5773407e-2,299.20557,542.03293)" /> </g> <rect @@ -4604,7 +4630,7 @@ sodipodi:cy="332.62314" sodipodi:rx="26.82268" sodipodi:ry="26.82268" - d="M 277.35793,332.62314 A 26.82268,26.82268 0 1 1 223.71257,332.62314 A 26.82268,26.82268 0 1 1 277.35793,332.62314 z" + d="m 277.35793,332.62314 c 0,14.81376 -12.00893,26.82268 -26.82268,26.82268 -14.81376,0 -26.82268,-12.00892 -26.82268,-26.82268 0,-14.81376 12.00892,-26.82268 26.82268,-26.82268 14.81375,0 26.82268,12.00892 26.82268,26.82268 z" transform="matrix(0.102065,0,0,0.102065,387.7515,-17.05636)" /> <path sodipodi:type="arc" @@ -4614,7 +4640,7 @@ sodipodi:cy="332.62314" sodipodi:rx="26.82268" sodipodi:ry="26.82268" - d="M 277.35793,332.62314 A 26.82268,26.82268 0 1 1 223.71257,332.62314 A 26.82268,26.82268 0 1 1 277.35793,332.62314 z" + d="m 277.35793,332.62314 c 0,14.81376 -12.00893,26.82268 -26.82268,26.82268 -14.81376,0 -26.82268,-12.00892 -26.82268,-26.82268 0,-14.81376 12.00892,-26.82268 26.82268,-26.82268 14.81375,0 26.82268,12.00892 26.82268,26.82268 z" transform="matrix(5.245387e-2,0,0,5.245387e-2,400.1808,-0.554549)" /> </g> </g> @@ -4646,13 +4672,13 @@ inkscape:transform-center-x="-156.01159" inkscape:transform-center-y="41.742437" /> <image - y="450.82797" + sodipodi:absref="/home/vjrj/proyectos/dev/kune/trunk/img/icons/lock_break.png" + xlink:href="icons/lock_break.png" + width="16" + height="16" + id="image2972" x="330.84604" - id="image2972" - height="16" - width="16" - sodipodi:absref="/home/vjrj/proyectos/dev/kune/trunk/img/icons/lock_break.png" - xlink:href="icons/lock_break.png" /> + y="450.82797" /> <use x="0" y="0" @@ -4741,14 +4767,14 @@ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.04705882;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> </g> <image - y="432.36218" - x="-371" - id="image3958" - height="16" - width="16" sodipodi:absref="/home/vjrj/proyectos/dev/kune/trunk/img/icons/lock_break.png" xlink:href="icons/lock_break.png" - transform="scale(-1,1)" /> + transform="scale(-1,1)" + width="16" + height="16" + id="image3958" + x="-371" + y="432.36218" /> <g id="g3962" transform="translate(-43.509019,-21.462476)"> @@ -4790,5 +4816,539 @@ d="M 356.90981,433.2195 C 362.64423,438.27174 365.62799,440.99217 365.62799,440.99217 L 361.71179,441.04075 L 370.01039,448.32762" id="path3976" sodipodi:nodetypes="cccc" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/group-def-icon.png" + ry="2.5" + y="524.09198" + x="366.44193" + height="13.999999" + width="14" + id="rect2884-9" + style="fill:#ffe6d5;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/checked.png" + ry="2.5" + y="496.36218" + x="51" + height="13.999999" + width="14" + id="rect2884-5" + style="fill:#ffe6d5;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#aad400;fill-opacity:1;fill-rule:evenodd;stroke:#5500d4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 61.950656,498.99001 -5.2833,4.75296 -1.7106,-1.96914 -2.0934,2.14668 c 1.5118,1.34043 2.6383,2.29564 3.8932,3.58472 2.1101,-1.97782 4.2716,-3.54473 6.5614,-5.03458 -0.3489,-1.48877 -0.8009,-2.51535 -1.3673,-3.48064 z" + id="rect4453" + sodipodi:nodetypes="ccccccc" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/checked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + style="fill:#ffe6d5;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect60658" + width="14" + height="13.999999" + x="51" + y="533.36218" + ry="6.9999995" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiochecked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + rx="6.9999995" /> + <rect + rx="3.7067122" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiochecked.png" + ry="3.7067122" + y="536.65546" + x="54.293335" + height="7.4134245" + width="7.4134245" + id="rect60678" + style="color:#000000;fill:#aad400;fill-opacity:1;fill-rule:evenodd;stroke:#5500d4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="fill:#ffe6d5;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect60699" + width="14" + height="13.999999" + x="51" + y="476.36218" + ry="2.5" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/unchecked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + style="fill:#ffe6d5;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect60716" + width="14" + height="13.999999" + x="51" + y="496.36218" + ry="2.5" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/checked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/checked.png" + sodipodi:nodetypes="ccccccc" + id="path60718" + d="m 61.950656,498.99001 -5.2833,4.75296 -1.7106,-1.96914 -2.0934,2.14668 c 1.5118,1.34043 2.6383,2.29564 3.8932,3.58472 2.1101,-1.97782 4.2716,-3.54473 6.5614,-5.03458 -0.3489,-1.48877 -0.8009,-2.51535 -1.3673,-3.48064 z" + style="color:#000000;fill:#aad400;fill-opacity:1;fill-rule:evenodd;stroke:#5500d4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <rect + rx="6.9999995" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiochecked.png" + ry="6.9999995" + y="533.36218" + x="51" + height="13.999999" + width="14" + id="rect60720" + style="fill:#ffe6d5;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#aad400;fill-opacity:1;fill-rule:evenodd;stroke:#5500d4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect60722" + width="7.4134245" + height="7.4134245" + x="54.293335" + y="536.65546" + ry="3.7067122" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiochecked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + rx="3.7067122" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/unchecked.png" + ry="2.5" + y="476.36218" + x="51" + height="13.999999" + width="14" + id="rect60724" + style="fill:#ffe6d5;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + rx="6.9999995" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/movecommons/images/icongen/radio.png" + ry="6.9999995" + y="553.36218" + x="51" + height="13.999999" + width="14" + id="rect60843" + style="fill:#ffe6d5;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#aad400;fill-opacity:1;fill-rule:evenodd;stroke:#5500d4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect60845" + width="7.4134245" + height="7.4134245" + x="54.293335" + y="556.65546" + ry="3.7067122" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiounchecked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + rx="3.7067122" /> + <rect + style="fill:#ffe6d5;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect60847" + width="14" + height="13.999999" + x="51" + y="553.36218" + ry="6.9999995" + inkscape:export-filename="/home/vjrj/proyectos/movecommons/images/icongen/radio.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + rx="6.9999995" /> + <rect + style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3546" + width="14" + height="13.999999" + x="81" + y="496.36218" + ry="2.5" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/checked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/checked.png" + sodipodi:nodetypes="ccccccc" + id="path3548" + d="m 91.950656,498.99001 -5.2833,4.75296 -1.7106,-1.96914 -2.0934,2.14668 c 1.5118,1.34043 2.6383,2.29564 3.8932,3.58472 2.1101,-1.97782 4.2716,-3.54473 6.5614,-5.03458 -0.3489,-1.48877 -0.8009,-2.51535 -1.3673,-3.48064 z" + style="color:#000000;fill:#aad400;fill-opacity:1;fill-rule:evenodd;stroke:#5500d4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <rect + rx="6.9999995" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiochecked.png" + ry="6.9999995" + y="533.36218" + x="81" + height="13.999999" + width="14" + id="rect3550" + style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#aad400;fill-opacity:1;fill-rule:evenodd;stroke:#5500d4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3552" + width="7.4134245" + height="7.4134245" + x="84.293335" + y="536.65546" + ry="3.7067122" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiochecked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + rx="3.7067122" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/checked.png" + ry="2.5" + y="496.36218" + x="81" + height="13.999999" + width="14" + id="rect3556" + style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffe6d5;fill-opacity:1;fill-rule:evenodd;stroke:#5500d4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 91.950656,498.99001 -5.2833,4.75296 -1.7106,-1.96914 -2.0934,2.14668 c 1.5118,1.34043 2.6383,2.29564 3.8932,3.58472 2.1101,-1.97782 4.2716,-3.54473 6.5614,-5.03458 -0.3489,-1.48877 -0.8009,-2.51535 -1.3673,-3.48064 z" + id="path3558" + sodipodi:nodetypes="ccccccc" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/checked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + rx="3.7067122" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiochecked.png" + ry="3.7067122" + y="536.65546" + x="84.293335" + height="7.4134245" + width="7.4134245" + id="rect3562" + style="color:#000000;fill:#ffe6d5;fill-opacity:1;fill-rule:evenodd;stroke:#5500d4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3564" + width="14" + height="13.999999" + x="81" + y="476.36218" + ry="2.5" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/unchecked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + rx="6.9999995" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiounchecked.png" + ry="6.9999995" + y="553.36218" + x="81" + height="13.999999" + width="14" + id="rect3570" + style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/checked.png" + sodipodi:nodetypes="ccccccc" + id="path3582" + d="m 122.19758,498.71675 -5.61351,5.05002 -1.81751,-2.09221 -2.22424,2.28085 c 1.60629,1.4242 2.80319,2.43911 4.13653,3.80876 2.24198,-2.10143 4.53857,-3.76628 6.97148,-5.34924 -0.3707,-1.58182 -0.85095,-2.67256 -1.45275,-3.69818 z" + style="color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06250000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <rect + style="fill:none;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3588" + width="14" + height="13.999999" + x="111" + y="553.36218" + ry="6.9999995" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiochecked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + rx="6.9999995" /> + <rect + style="fill:#fda348;fill-opacity:0.6;stroke:#d45500;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3576" + width="10.500132" + height="10.499868" + x="112.75002" + y="555.112" + ry="5.2499342" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiochecked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + rx="5.2500658" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/unchecked.png" + ry="2.5" + y="476.36218" + x="111" + height="13.999999" + width="14" + id="rect3586" + style="fill:none;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <g + id="g7077-2" + transform="translate(-665.11791,335.85622)" + inkscape:export-filename="/tmp/comunes-v5.png" + inkscape:export-xdpi="111.61000" + inkscape:export-ydpi="111.61000"> + <path + transform="matrix(0.386438,0,0,0.386438,459.7832,50.23523)" + d="m 544.15629,492.37067 c 0,62.80901 -50.91677,113.72577 -113.72578,113.72577 -62.80901,0 -113.72578,-50.91676 -113.72578,-113.72577 0,-62.80902 50.91677,-113.72578 113.72578,-113.72578 62.80901,0 113.72578,50.91676 113.72578,113.72578 z" + sodipodi:ry="113.72578" + sodipodi:rx="113.72578" + sodipodi:cy="492.37067" + sodipodi:cx="430.43051" + id="path7079" + style="color:#000000;fill:#84bade;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6.25;marker:none;visibility:visible;display:block" + sodipodi:type="arc" /> + <path + transform="matrix(0.350014,0,0,0.350014,475.3939,68.14733)" + d="m 544.15629,492.37067 c 0,62.80901 -50.91677,113.72577 -113.72578,113.72577 -62.80901,0 -113.72578,-50.91676 -113.72578,-113.72577 0,-62.80902 50.91677,-113.72578 113.72578,-113.72578 62.80901,0 113.72578,50.91676 113.72578,113.72578 z" + sodipodi:ry="113.72578" + sodipodi:rx="113.72578" + sodipodi:cy="492.37067" + sodipodi:cx="430.43051" + id="path7081" + style="color:#000000;fill:#029a00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6.25;marker:none;visibility:visible;display:block" + sodipodi:type="arc" /> + <path + transform="matrix(0.342057,0,0,0.342057,478.9016,72.06431)" + d="m 544.15629,492.37067 c 0,62.80901 -50.91677,113.72577 -113.72578,113.72577 -62.80901,0 -113.72578,-50.91676 -113.72578,-113.72577 0,-62.80902 50.91677,-113.72578 113.72578,-113.72578 62.80901,0 113.72578,50.91676 113.72578,113.72578 z" + sodipodi:ry="113.72578" + sodipodi:rx="113.72578" + sodipodi:cy="492.37067" + sodipodi:cx="430.43051" + id="path7083" + style="color:#000000;fill:#cf5c43;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6.25;marker:none;visibility:visible;display:block" + sodipodi:type="arc" /> + <path + transform="matrix(0.210753,0,0,0.210753,535.4274,136.7124)" + d="m 544.15629,492.37067 c 0,62.80901 -50.91677,113.72577 -113.72578,113.72577 -62.80901,0 -113.72578,-50.91676 -113.72578,-113.72577 0,-62.80902 50.91677,-113.72578 113.72578,-113.72578 62.80901,0 113.72578,50.91676 113.72578,113.72578 z" + sodipodi:ry="113.72578" + sodipodi:rx="113.72578" + sodipodi:cy="492.37067" + sodipodi:cx="430.43051" + id="path7085" + style="color:#000000;fill:#fea347;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6.25;marker:none;visibility:visible;display:block" + sodipodi:type="arc" /> + <path + transform="matrix(0.08813159,0,0,0.08813159,588.1349,197.0378)" + d="m 544.15629,492.37067 c 0,62.80901 -50.91677,113.72577 -113.72578,113.72577 -62.80901,0 -113.72578,-50.91676 -113.72578,-113.72577 0,-62.80902 50.91677,-113.72578 113.72578,-113.72578 62.80901,0 113.72578,50.91676 113.72578,113.72578 z" + sodipodi:ry="113.72578" + sodipodi:rx="113.72578" + sodipodi:cy="492.37067" + sodipodi:cx="430.43051" + id="path7087" + style="color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6.25;marker:none;visibility:visible;display:block" + sodipodi:type="arc" /> + </g> + <path + sodipodi:type="arc" + style="color:#000000;fill:#cf5c43;fill-opacity:0.6;stroke:#cf5c43;stroke-width:3.22555614;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4263" + sodipodi:cx="784.92682" + sodipodi:cy="841.8219" + sodipodi:rx="9.5390415" + sodipodi:ry="6.813601" + d="m 794.46586,841.8219 a 9.5390415,6.813601 0 1 1 -19.07808,0 9.5390415,6.813601 0 1 1 19.07808,0 z" + transform="matrix(0.26207038,0,0,0.36689855,-40.70607,191.49895)" + inkscape:export-filename="/home/vjrj/proyectos/comunes/imagenes/dot1.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + transform="matrix(0.26207038,0,0,0.36689855,-40.70607,201.49895)" + d="m 794.46586,841.8219 a 9.5390415,6.813601 0 1 1 -19.07808,0 9.5390415,6.813601 0 1 1 19.07808,0 z" + sodipodi:ry="6.813601" + sodipodi:rx="9.5390415" + sodipodi:cy="841.8219" + sodipodi:cx="784.92682" + id="path4265" + style="color:#000000;fill:#fda348;fill-opacity:0.6;stroke:#cf5c43;stroke-width:3.22555614;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" + inkscape:export-filename="/home/vjrj/proyectos/comunes/imagenes/dot2.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + sodipodi:type="arc" + style="color:#000000;fill:#ffff00;fill-opacity:0.6;stroke:#cf5c43;stroke-width:3.22555614;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4267" + sodipodi:cx="784.92682" + sodipodi:cy="841.8219" + sodipodi:rx="9.5390415" + sodipodi:ry="6.813601" + d="m 794.46586,841.8219 a 9.5390415,6.813601 0 1 1 -19.07808,0 9.5390415,6.813601 0 1 1 19.07808,0 z" + transform="matrix(0.26207038,0,0,0.36689855,-40.70607,211.49895)" + inkscape:export-filename="/home/vjrj/proyectos/comunes/imagenes/dot3.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + rx="6.9999995" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiounchecked.png" + ry="6.9999995" + y="523.36218" + x="111" + height="13.999999" + width="14" + id="rect4470" + style="fill:none;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + rx="5.2500658" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiounchecked.png" + ry="5.2499342" + y="525.112" + x="112.75002" + height="10.499868" + width="10.500132" + id="rect4472" + style="fill-opacity:0;stroke:#d45500;stroke-width:1.50000011999999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="fill:none;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect4474" + width="14" + height="13.999999" + x="111" + y="496.36218" + ry="2.5" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/checked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 142.19758,498.71675 -5.61351,5.05002 -1.81751,-2.09221 -2.22424,2.28085 c 1.60629,1.4242 2.80319,2.43911 4.13653,3.80876 2.24198,-2.10143 4.53857,-3.76628 6.97148,-5.34924 -0.3707,-1.58182 -0.85095,-2.67256 -1.45275,-3.69818 z" + id="path3563" + sodipodi:nodetypes="ccccccc" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/checked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + rx="6.9999995" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiochecked.png" + ry="6.9999995" + y="553.36218" + x="131" + height="13.999999" + width="14" + id="rect3565" + style="fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + rx="5.2500658" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiochecked.png" + ry="5.2499342" + y="555.112" + x="132.75003" + height="10.499868" + width="10.500132" + id="rect3567" + style="fill:#fda348;fill-opacity:0.6;stroke:#d45500;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="fill:none;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3569" + width="14" + height="13.999999" + x="131" + y="476.36218" + ry="2.5" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/unchecked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + style="fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3571" + width="16" + height="15.999999" + x="129" + y="523.36218" + ry="7.9999995" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiounchecked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + rx="7.9999995" /> + <rect + style="fill-opacity:1;stroke:#c83737;stroke-width:1.24998641000000021;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill:#ffffff" + id="rect3573" + width="8.7500134" + height="8.749794" + x="132.62503" + y="526.98706" + ry="4.374897" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiounchecked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + rx="4.3750067" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/checked.png" + ry="2.5" + y="496.36218" + x="131" + height="13.999999" + width="14" + id="rect3575" + style="fill:none;stroke:#c83737;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + rx="7.9999995" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiochecked.png" + ry="7.9999995" + y="537.36218" + x="129" + height="15.999999" + width="16" + id="rect3577" + style="fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + rx="4.3750067" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/radiochecked.png" + ry="4.374897" + y="540.98706" + x="132.62503" + height="8.749794" + width="8.7500134" + id="rect3579" + style="fill:url(#radialGradient4374);fill-opacity:1;stroke:#c83737;stroke-width:1.24998641000000021;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> </g> </svg> Added: trunk/src/main/java/cc/kune/chat/client/AddAsBuddieHeaderButton.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/AddAsBuddieHeaderButton.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/AddAsBuddieHeaderButton.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -0,0 +1,115 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.chat.client; + +import cc.kune.common.client.actions.AbstractAction; +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.PropertyChangeEvent; +import cc.kune.common.client.actions.PropertyChangeListener; +import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateChangedEvent; +import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.emite.im.client.roster.XmppRoster; +import com.calclab.emite.im.client.roster.events.RosterGroupChangedEvent; +import com.calclab.emite.im.client.roster.events.RosterGroupChangedHandler; +import com.calclab.suco.client.Suco; +import com.google.inject.Inject; + +public class AddAsBuddieHeaderButton { + + public static class AddAsBuddieAction extends AbstractExtendedAction { + private final ChatClient chatEngine; + private final Session session; + + @Inject + public AddAsBuddieAction(final ChatClient chatEngine, final Session session, final StateManager stateManager, + final I18nTranslationService i18n, final IconResources img) { + super(); + this.chatEngine = chatEngine; + this.session = session; + stateManager.onStateChanged(true, new StateChangedHandler() { + @Override + public void onStateChanged(final StateChangedEvent event) { + setState(event.getState()); + } + }); + Suco.get(XmppRoster.class).addRosterGroupChangedHandler(new RosterGroupChangedHandler() { + + @Override + public void onGroupChanged(final RosterGroupChangedEvent event) { + setState(session.getCurrentState()); + } + }); + putValue(Action.NAME, i18n.t("Add as a buddie")); + putValue(Action.SMALL_ICON, img.addGreen()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + chatEngine.addNewBuddie(session.getCurrentState().getGroup().getShortName()); + NotifyUser.info("Added as buddie. Waiting buddie response"); + setEnabled(false); + } + + private boolean currentGroupsIsAsPerson(final StateAbstractDTO state) { + return state.getGroup().isPersonal(); + } + + private boolean isNotMe(final String groupName) { + return !session.getCurrentUser().getShortName().equals(groupName); + } + + private void setState(final StateAbstractDTO state) { + final String groupName = state.getGroup().getShortName(); + final boolean imLogged = session.isLogged(); + final boolean isNotBuddie = !chatEngine.isBuddie(groupName); + if (imLogged && currentGroupsIsAsPerson(state) && isNotBuddie && isNotMe(groupName)) { + setEnabled(true); + } else { + setEnabled(false); + } + } + } + + @Inject + public AddAsBuddieHeaderButton(final AddAsBuddieAction buddieAction, final EntityHeader entityHeader) { + final ButtonDescriptor button = new ButtonDescriptor(buddieAction); + button.setVisible(false); + buddieAction.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(final PropertyChangeEvent event) { + if (event.getPropertyName().equals(AbstractAction.ENABLED)) { + button.setVisible((Boolean) event.getNewValue()); + } + } + }); + entityHeader.addAction(button); + } +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/chat/client/AddAsBuddieHeaderButton.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -33,13 +33,13 @@ import cc.kune.common.client.actions.ui.descrip.IconLabelDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; +import cc.kune.common.client.log.Log; import cc.kune.common.client.noti.NotifyUser; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.client.utils.TextUtils; import cc.kune.common.client.utils.WindowUtils; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStopEvent; -import cc.kune.core.client.logs.Log; import cc.kune.core.client.sitebar.SitebarActionsPresenter; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.UserSignInEvent; @@ -62,7 +62,6 @@ import com.calclab.hablar.HablarConfig; import com.calclab.hablar.console.client.HablarConsole; import com.calclab.hablar.core.client.Hablar; -import com.calclab.hablar.core.client.HablarWidget; import com.calclab.hablar.core.client.ui.icon.Icons; import com.calclab.hablar.html.client.HtmlConfig; import com.calclab.hablar.icons.alt.client.AltIconsBundle; @@ -225,7 +224,7 @@ chatIcon.putValue(Action.SHORT_DESCRIPTION, i18n.t("Show/hide the chat window")); final KeyStroke shortcut = Shortcut.getShortcut(false, true, false, false, Character.valueOf('C')); shorcutRegister.put(shortcut, action); - // action.setShortcut(shortcut); + action.setShortcut(shortcut); chatIcon.setVisible(session.isLogged()); siteActions.getLeftToolbar().addAction( new ToolbarSeparatorDescriptor(Type.spacer, SitebarActionsPresenter.LEFT_TOOLBAR)); @@ -237,7 +236,7 @@ } } - private void createDialog(final HablarWidget widget, final HtmlConfig htmlConfig) { + private void createDialog(final KuneHablarWidget widget, final HtmlConfig htmlConfig) { widget.addStyleName("k-chat-panel"); setSize(widget, htmlConfig); dialog.add(widget); @@ -256,7 +255,7 @@ dialog.setCollapsible(true); // final Widget btn = (Widget) // chatIcon.getValue(ParentWidget.PARENT_UI); - dialog.setPosition(118, 2); + dialog.setPosition(118, 1); dialog.setIcon(AbstractImagePrototype.create(chatResources.chat())); // dialog.getItem(0).getFocusSupport().setIgnore(true); initEmite(); @@ -294,7 +293,7 @@ config.dockConfig.headerSize = 0; config.dockConfig.rosterWidth = 150; config.dockConfig.rosterDock = "right"; - final HablarWidget widget = new HablarWidget(config.layout, config.tabHeaderSize); + final KuneHablarWidget widget = new KuneHablarWidget(config.layout, config.tabHeaderSize); final Hablar hablar = widget.getHablar(); HablarComplete.install(hablar, config); new KuneHablarSignals(eventBus, xmppSession, hablar, action); Modified: trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -34,5 +34,6 @@ bind(ChatOptions.class).in(Singleton.class); bind(ChatSitebarActions.class).in(Singleton.class); bind(ChatParts.class).asEagerSingleton(); + bind(AddAsBuddieHeaderButton.class).in(Singleton.class); } -} \ No newline at end of file +} Modified: trunk/src/main/java/cc/kune/chat/client/ChatParts.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -17,6 +17,7 @@ @Inject public ChatParts(final Session session, final Provider<ChatSitebarActions> chatActionsProvider, + final Provider<AddAsBuddieHeaderButton> buddieButton, final Provider<SNAdminsMenuItemsRegistry> snAdminsRegistry, final Provider<SNCollabsMenuItemsRegistry> snCollabsItemsRegistry, final Provider<SNPendingsMenuItemsRegistry> snPendingItemsRegistry, final IsNotMeCondition isNotMe, @@ -48,6 +49,7 @@ snAdminsRegistry.get().add(startChatWithMemberItem); snCollabsItemsRegistry.get().add(startChatWithMemberItem); snPendingItemsRegistry.get().add(startChatWithUserItem); + buddieButton.get(); } }); } Added: trunk/src/main/java/cc/kune/chat/client/KuneHablarWidget.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/KuneHablarWidget.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/KuneHablarWidget.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -0,0 +1,52 @@ +package cc.kune.chat.client; + +import com.calclab.hablar.core.client.Hablar; +import com.calclab.hablar.core.client.HablarDisplay; +import com.calclab.hablar.core.client.HablarPresenter; +import com.calclab.hablar.core.client.mvp.DefaultEventBus; +import com.calclab.hablar.core.client.pages.tabs.TabsLayout.TabHeaderSize; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.uibinder.client.UiConstructor; +import com.google.gwt.user.client.ui.LayoutPanel; +import com.google.gwt.user.client.ui.Widget; + +public class KuneHablarWidget extends LayoutPanel implements HablarDisplay { + public class HablarNoLoggerEventBus extends DefaultEventBus { + + @Override + public void fireEvent(final GwtEvent<?> event) { + // GWT.log("EVENT: " + event.toDebugString(), null); + super.fireEvent(event); + } + } + + private final Hablar hablar; + + @UiConstructor + public KuneHablarWidget(final Layout layout, final TabHeaderSize tabHeaderSize) { + addStyleName("hablar-HablarWidget"); + if (layout == Layout.accordion) { + hablar = HablarPresenter.createAccordionPresenter(new HablarNoLoggerEventBus(), this); + } else if (layout == Layout.tabs) { + hablar = HablarPresenter.createTabsPresenter(new HablarNoLoggerEventBus(), this, tabHeaderSize); + } else { + throw new IllegalStateException("Unimplemented layout: " + layout); + } + } + + @Override + public Widget asWidget() { + return this; + } + + @Override + public void forceLayout() { + // GWT.log("FORCE LAYOUT"); + super.forceLayout(); + } + + public Hablar getHablar() { + return hablar; + } + +} Property changes on: trunk/src/main/java/cc/kune/chat/client/KuneHablarWidget.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -19,6 +19,7 @@ */ package cc.kune.client; +import cc.kune.common.client.log.Log; import cc.kune.common.client.noti.NotifyUser; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; @@ -46,7 +47,7 @@ GWT.setUncaughtExceptionHandler(new UncaughtExceptionHandler() { @Override public void onUncaughtException(final Throwable e) { - GWT.log("Error in 'onModuleLoad()' method", e); + Log.error("Error in 'onModuleLoad()' method", e); e.printStackTrace(); } }); Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -25,6 +25,7 @@ import cc.kune.common.client.actions.gwtui.GwtGuiProvider; import cc.kune.common.client.actions.gxtui.GxtGuiProvider; import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.common.client.log.EventBusWithLogging; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.core.client.CoreGinModule; import cc.kune.core.client.CoreParts; @@ -33,7 +34,6 @@ import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.groups.newgroup.NewGroupPresenter; -import cc.kune.core.client.logs.EventBusWithLogging; import cc.kune.core.client.notify.confirm.UserConfirmPresenter; import cc.kune.core.client.notify.msgs.UserNotifierPresenter; import cc.kune.core.client.notify.spiner.SpinerPresenter; @@ -45,6 +45,7 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; import cc.kune.core.client.ws.CorePresenter; +import cc.kune.core.client.ws.entheader.EntityHeaderPresenter; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.pspace.client.PSpaceGinModule; import cc.kune.pspace.client.PSpacePresenter; @@ -74,6 +75,8 @@ Provider<CorePresenter> getCorePresenter(); + AsyncProvider<EntityHeaderPresenter> getEntityHeaderPresenter(); + AsyncProvider<EntityLicensePresenter> getEntityLicensePresenter(); ErrorHandler getErrorHandler(); @@ -119,4 +122,4 @@ AsyncProvider<UserConfirmPresenter> getUserConfirmPresenter(); AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter(); -} \ No newline at end of file +} Modified: trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -135,7 +135,7 @@ view.addActions(actions); final IconLabel simpleIconLabel = new IconLabel("IconLabel (no action)"); - simpleIconLabel.setLeftIcon("oc-testico"); + simpleIconLabel.setRightIcon("oc-testico"); simpleIconLabel.setTitle("tooltip"); final VerticalPanel panel = new VerticalPanel(); Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -119,7 +119,7 @@ @Override protected void setIconStyle(final String style) { - iconLabel.setLeftIcon(style); + iconLabel.setRightIcon(style); layout(); } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -33,7 +33,6 @@ import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuTitleItemDescriptor; import cc.kune.common.client.errors.UIException; -import cc.kune.common.client.noti.NotifyUser; import cc.kune.common.client.resources.CommonIconResources; import cc.kune.common.client.ui.IconLabel; @@ -49,37 +48,34 @@ private GwtBaseMenuItem item; private final CommonIconResources res = CommonIconResources.INSTANCE; - private void confCheckListener(final MenuItemDescriptor descriptor, final GwtCheckItem checkItem) { + private void confCheckListener(final MenuCheckItemDescriptor descriptor, final GwtCheckItem checkItem) { descriptor.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(final PropertyChangeEvent event) { if (event.getPropertyName().equals(MenuCheckItemDescriptor.CHECKED)) { final Boolean checked = (Boolean) event.getNewValue(); - NotifyUser.info("Check checked: " + checked); - iconLabel.setRightIconResource(checked ? res.checked() : res.unChecked()); + setCheckedIcon(checked); layout(); } } }); - iconLabel.setRightIconResource(res.unChecked()); + setCheckedIcon(descriptor.isChecked()); iconLabel.setWidth("100%"); } - private void confRadioCheckListener(final MenuItemDescriptor descriptor, final GwtCheckItem checkItem, - final String group) { + private void confRadioCheckListener(final MenuRadioItemDescriptor descriptor, final GwtCheckItem checkItem) { descriptor.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(final PropertyChangeEvent event) { if (event.getPropertyName().equals(MenuCheckItemDescriptor.CHECKED)) { final Boolean checked = (Boolean) event.getNewValue(); - NotifyUser.info("Radio checked: " + checked); - iconLabel.setRightIconResource(checked ? res.radioChecked() : res.radioUnChecked()); + setRadioChecked(checked); layout(); } } }); - iconLabel.setRightIconResource(res.radioUnChecked()); + setRadioChecked(descriptor.isChecked()); iconLabel.setWidth("100%"); } @@ -89,12 +85,12 @@ iconLabel = new IconLabel(""); if (descriptor instanceof MenuRadioItemDescriptor) { final GwtCheckItem checkItem = createCheckItem((MenuItemDescriptor) descriptor); - confRadioCheckListener((MenuItemDescriptor) descriptor, checkItem, - ((MenuRadioItemDescriptor) descriptor).getGroup()); + final MenuRadioItemDescriptor radioDescrip = (MenuRadioItemDescriptor) descriptor; + confRadioCheckListener(radioDescrip, checkItem); item = checkItem; } else if (descriptor instanceof MenuCheckItemDescriptor) { final GwtCheckItem checkItem = createCheckItem((MenuItemDescriptor) descriptor); - confCheckListener((MenuItemDescriptor) descriptor, checkItem); + confCheckListener((MenuCheckItemDescriptor) descriptor, checkItem); item = checkItem; } else if (descriptor instanceof MenuTitleItemDescriptor) { item = new GwtBaseMenuItem("", true); @@ -170,6 +166,10 @@ item.setHTML(iconLabel.toString()); } + private void setCheckedIcon(final Boolean checked) { + iconLabel.setLeftIconResource(checked ? res.checked() : res.unChecked()); + } + @Override protected void setEnabled(final boolean enabled) { item.setEnabled(enabled); @@ -178,16 +178,20 @@ @Override public void setIconResource(final ImageResource icon) { - iconLabel.setLeftIconResource(icon); + iconLabel.setRightIconResource(icon); layout(); } @Override protected void setIconStyle(final String style) { - iconLabel.setLeftIcon(style); + iconLabel.setRightIcon(style); layout(); } + private void setRadioChecked(final Boolean checked) { + iconLabel.setLeftIconResource(checked ? res.radioChecked() : res.radioUnChecked()); + } + @Override protected void setText(final String text) { if (text != null) { Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -71,7 +71,7 @@ @Override protected void setIconStyle(final String style) { - iconLabel.setLeftIcon(style); + iconLabel.setRightIcon(style); } @Override Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -101,7 +101,7 @@ @Override public void setIconStyle(final String style) { if (notStandAlone) { - iconLabel.setLeftIcon(style); + iconLabel.setRightIcon(style); layout(); } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -60,7 +60,7 @@ @Override public void setIconStyle(final String style) { - iconLabel.setLeftIcon(style); + iconLabel.setRightIcon(style); layout(); } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuItemDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuItemDescriptor.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuItemDescriptor.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -20,7 +20,7 @@ package cc.kune.common.client.actions.ui.descrip; import cc.kune.common.client.actions.AbstractAction; -import cc.kune.core.client.logs.Log; +import cc.kune.common.client.log.Log; public class MenuItemDescriptor extends AbstractGuiActionDescrip { Modified: trunk/src/main/java/cc/kune/common/client/errors/NotImplementedException.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/errors/NotImplementedException.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/common/client/errors/NotImplementedException.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -19,7 +19,7 @@ */ package cc.kune.common.client.errors; -import com.google.gwt.core.client.GWT; +import cc.kune.common.client.log.Log; public class NotImplementedException extends RuntimeException { @@ -27,22 +27,22 @@ public NotImplementedException() { super(); - GWT.log("NotImplementedException"); + Log.error("NotImplementedException"); } public NotImplementedException(final String text) { super(text); - GWT.log(text); + Log.error(text); } public NotImplementedException(final String text, final Throwable cause) { super(text, cause); - GWT.log(text, cause); + Log.error(text, cause); } public NotImplementedException(final Throwable cause) { super(cause); - GWT.log("NotImplementedException", cause); + Log.error("NotImplementedException", cause); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/client/errors/UIException.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/errors/UIException.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/common/client/errors/UIException.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify @@ -19,7 +19,7 @@ */ package cc.kune.common.client.errors; -import com.google.gwt.core.client.GWT; +import cc.kune.common.client.log.Log; public class UIException extends RuntimeException { @@ -27,17 +27,17 @@ public UIException(final String text) { super(text); - GWT.log(text); + Log.error(text); } public UIException(final String text, final Throwable cause) { super(text, cause); - GWT.log(text, cause); + Log.error(text, cause); } public UIException(final Throwable cause) { super(cause); - GWT.log("UIException", cause); + Log.error("UIException", cause); } } Added: trunk/src/main/java/cc/kune/common/client/log/EventBusWithLogging.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/log/EventBusWithLogging.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/log/EventBusWithLogging.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -0,0 +1,32 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.log; + + +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.SimpleEventBus; + +public class EventBusWithLogging extends SimpleEventBus { + @Override + public void fireEvent(final GwtEvent<?> event) { + Log.debug(event.toDebugString() + " " + event.toString()); + super.fireEvent(event); + } +} Property changes on: trunk/src/main/java/cc/kune/common/client/log/EventBusWithLogging.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/log/Log.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/log/Log.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/log/Log.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -0,0 +1,54 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.log; + +import com.google.gwt.core.client.GWT; + +public class Log { + + public static void debug(final String message) { + GWT.log(prefix(message)); + } + + public static void debug(final String message, final Throwable caught) { + GWT.log(prefix(message), caught); + } + + public static void error(final String message) { + debug(message); + } + + public static void error(final String message, final Throwable caught) { + debug(message, caught); + } + + public static void info(final String message) { + debug(message); + } + + public static void info(final String message, final Throwable caught) { + debug(message, caught); + } + + private static String prefix(final String message) { + return new StringBuffer().append("[kune] ").append(message).toString(); + } + +} Property changes on: trunk/src/main/java/cc/kune/common/client/log/Log.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/common/client/resources/checked.png =================================================================== (Binary files differ) Modified: trunk/src/main/java/cc/kune/common/client/resources/radiochecked.png =================================================================== (Binary files differ) Modified: trunk/src/main/java/cc/kune/common/client/resources/radiounchecked.png =================================================================== (Binary files differ) Modified: trunk/src/main/java/cc/kune/common/client/shortcuts/DefaultGlobalShortcutRegister.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/shortcuts/DefaultGlobalShortcutRegister.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/common/client/shortcuts/DefaultGlobalShortcutRegister.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -26,8 +26,8 @@ import cc.kune.common.client.actions.InputMap; import cc.kune.common.client.actions.KeyStroke; import cc.kune.common.client.actions.Shortcut; +import cc.kune.common.client.log.Log; -import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.Event; @@ -50,7 +50,7 @@ final AbstractAction action = get(Shortcut.getShortcut(event.getCtrlKey(), event.getAltKey(), event.getShiftKey(), event.getShiftKey(), (char) event.getKeyCode())); if (action != null) { - GWT.log("Not propagating event for action: " + action.getValue(Action.NAME)); + Log.debug("Not propagating event for action: " + action.getValue(Action.NAME)); nativeEvent.stopPropagation(); action.actionPerformed(new ActionEvent(nativeEvent.getCurrentEventTarget(), event)); nativeEventPrev.cancel(); @@ -80,7 +80,7 @@ public void put(final KeyStroke keystroke, final AbstractAction action) { final ChangeableObject previous = super.get(keystroke); if (previous != null) { - GWT.log("Shortcut already registed by: " + previous + "(overriding)"); + Log.info("Shortcut already registed by: " + previous + "(overriding)"); } super.put(keystroke, action); } Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -121,7 +121,7 @@ public void setLeftIconResource(final ImageResource res) { iconLeft.setResource(res); - iconRight.addStyleName("k-iconlabel-left"); + iconLeft.addStyleName("k-iconlabel-left"); } public void setRightIcon(final String imgCss) { Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml 2011-02-24 23:07:55 UTC (rev 1262) @@ -18,8 +18,8 @@ <g:FocusPanel ui:field="self"> <g:FlowPanel styleName="{style.pad}" ui:field="flow"> <g:Image ui:field="iconLeft" /> + <g:Image ui:field="iconRight" /> <g:InlineLabel ui:field="label" styleName="{style.label}" /> - <g:Image ui:field="iconRight" /> </g:FlowPanel> </g:FocusPanel> </ui:UiBinder> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/client/utils/OnAcceptCallback.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/OnAcceptCallback.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/common/client/utils/OnAcceptCallback.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -1,12 +1,12 @@ package cc.kune.common.client.utils; -import com.google.gwt.core.client.GWT; +import cc.kune.common.client.log.Log; public abstract class OnAcceptCallback implements SimpleCallback { @Override public void onCancel() { // Do nothing - GWT.log("On cancel callback"); + Log.debug("On cancel callback, do nothing"); } } Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-02-24 23:07:55 UTC (rev 1262) @@ -423,6 +423,7 @@ .k-iconlabel-text { vertical-align: top; padding-left: 3px; + float: left; } .k-menuimtem-title { @@ -443,7 +444,7 @@ } .k-iconlabel-right { - float: right; + float: left; /* margin-left: 5px; */ } Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.gxtui.GxtGuiProvider; import cc.kune.common.client.actions.ui.bind.DefaultGuiProvider; import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.common.client.log.EventBusWithLogging; import cc.kune.common.client.shortcuts.DefaultGlobalShortcutRegister; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.client.ui.MaskWidget; @@ -48,7 +49,6 @@ import cc.kune.core.client.init.AppStarter; import cc.kune.core.client.init.AppStarterDefault; import cc.kune.core.client.init.PrefetchUtilities; -import cc.kune.core.client.logs.EventBusWithLogging; import cc.kune.core.client.notify.confirm.UserConfirmPanel; import cc.kune.core.client.notify.confirm.UserConfirmPresenter; import cc.kune.core.client.notify.msgs.UserNotifierPresenter; @@ -88,6 +88,9 @@ import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; import cc.kune.core.client.ws.CorePresenter; import cc.kune.core.client.ws.CoreViewImpl; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.client.ws.entheader.EntityHeaderPanel; +import cc.kune.core.client.ws.entheader.EntityHeaderPresenter; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.WsArmor; import cc.kune.gspace.client.WsArmorImpl; @@ -140,6 +143,8 @@ GroupMembersPanel.class, GroupMembersPresenter.GroupMembersProxy.class); bindPresenter(EntityLicensePresenter.class, EntityLicensePresenter.EntityLicenseView.class, EntityLicensePanel.class, EntityLicensePresenter.EntityLicenseProxy.class); + bindPresenter(EntityHeaderPresenter.class, EntityHeaderPresenter.EntityHeaderView.class, + EntityHeaderPanel.class, EntityHeaderPresenter.EntityHeaderProxy.class); bind(UserPassAutocompleteManager.class).to(UserPassAutocompleteManagerImpl.class).in(Singleton.class); bindPresenter(SignInPresenter.class, SignInView.class, SignInPanel.class, SignInPresenter.SignInProxy.class); @@ -148,6 +153,7 @@ bind(SignIn.class).to(SignInPresenter.class).in(Singleton.class); bind(Register.class).to(RegisterPresenter.class).in(Singleton.class); bind(NewGroup.class).to(NewGroupPresenter.class).in(Singleton.class); + bind(EntityHeader.class).to(EntityHeaderPresenter.class).in(Singleton.class); bind(UserMessagesPresenter.class).in(Singleton.class); bind(UserMessagesPanel.class).in(Singleton.class); Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -20,6 +20,7 @@ package cc.kune.core.client.auth; import cc.kune.common.client.errors.UIException; +import cc.kune.common.client.log.Log; import cc.kune.common.client.noti.NotifyLevel; import cc.kune.common.client.noti.NotifyUser; import cc.kune.core.client.cookies.CookiesManager; @@ -27,7 +28,6 @@ import cc.kune.core.client.errors.GroupNameInUseException; import cc.kune.core.client.errors.UserRegistrationException; import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.logs.Log; import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.rpcservices.UserServiceAsync; Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -19,6 +19,7 @@ */ package cc.kune.core.client.auth; +import cc.kune.common.client.log.Log; import cc.kune.common.client.noti.NotifyLevel; import cc.kune.common.client.utils.TextUtils; import cc.kune.common.client.utils.TimerWrapper; @@ -26,7 +27,6 @@ import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.errors.UserAuthException; import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.logs.Log; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.notify.spiner.ProgressShowEvent; import cc.kune.core.client.resources.CoreMessages; Modified: trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerImpl.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerImpl.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -21,9 +21,9 @@ import java.util.Date; +import cc.kune.common.client.log.Log; import cc.kune.core.client.state.Session; -import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Cookies; public class CookiesManagerImpl implements CookiesManager { @@ -53,6 +53,6 @@ final long duration = Session.SESSION_DURATION; final Date expires = new Date(System.currentTimeMillis() + duration); Cookies.setCookie(Session.USERHASH, userHash, expires, null, "/", false); - GWT.log("Received hash: " + userHash, null); + Log.info("Received hash: " + userHash, null); } } Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -19,9 +19,9 @@ */ package cc.kune.core.client.errors; +import cc.kune.common.client.log.Log; import cc.kune.common.client.noti.NotifyLevel; import cc.kune.common.client.noti.NotifyUser; -import cc.kune.core.client.logs.Log; import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.state.Session; @@ -29,7 +29,6 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.google.gwt.core.client.GWT; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException; import com.google.inject.Inject; @@ -121,7 +120,7 @@ logException(caught, true); eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("Oops! Something has gone wrong with our servers. Retry later, please."))); - GWT.log("Other kind of exception in StateManagerDefault/processErrorException", caught); + Log.error("Other kind of exception in StateManagerDefault/processErrorException", caught); } } Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -20,11 +20,11 @@ package cc.kune.core.client.groups.newgroup; import cc.kune.common.client.errors.UIException; +import cc.kune.common.client.log.Log; import cc.kune.common.client.noti.NotifyLevel; import cc.kune.common.client.noti.NotifyUser; import cc.kune.core.client.auth.SignIn; import cc.kune.core.client.errors.GroupNameInUseException; -import cc.kune.core.client.logs.Log; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.GroupServiceAsync; Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify @@ -22,10 +22,10 @@ import java.util.Date; import java.util.HashMap; +import cc.kune.common.client.log.Log; import cc.kune.common.client.utils.Location; import cc.kune.common.client.utils.TextUtils; import cc.kune.common.client.utils.WindowUtils; -import cc.kune.core.client.logs.Log; import cc.kune.core.client.rpcservices.I18nServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.shared.dto.I18nLanguageDTO; Modified: trunk/src/main/java/cc/kune/core/client/init/AppStarter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStarter.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/init/AppStarter.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify @@ -19,8 +19,8 @@ */ package cc.kune.core.client.init; +import cc.kune.common.client.log.Log; import cc.kune.common.client.noti.NotifyLevel; -import cc.kune.core.client.logs.Log; import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.rpcservices.SiteServiceAsync; Modified: trunk/src/main/java/cc/kune/core/client/init/PrefetchUtilities.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/PrefetchUtilities.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/init/PrefetchUtilities.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/resources/icons/checked.png =================================================================== (Binary files differ) Modified: trunk/src/main/java/cc/kune/core/client/resources/icons/radiochecked.png =================================================================== (Binary files differ) Modified: trunk/src/main/java/cc/kune/core/client/resources/icons/radiounchecked.png =================================================================== (Binary files differ) Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -52,7 +52,6 @@ Label collabsLabel; @UiField DockLayoutPanel collabsPanel; - @UiField ScrollPanel collabsScroll; @UiField @@ -146,7 +145,6 @@ final ClickHandler clickHand = new ClickHandler() { @Override public void onClick(final ClickEvent event) { - GWT.log("Show event"); menu.show(thumb); } }; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/GroupMembersConfActions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/GroupMembersConfActions.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/GroupMembersConfActions.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -6,6 +6,9 @@ import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.sn.actions.conditions.IsGroupCondition; import cc.kune.core.client.sn.actions.registry.GroupMembersActionsRegistry; +import cc.kune.core.client.state.StateChangedEvent; +import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; +import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.domain.SocialNetworkVisibility; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -20,12 +23,12 @@ public static final SubMenuDescriptor VISIBILITY_SUBMENU = new SubMenuDescriptor(); @Inject - public GroupMembersConfActions(final I18nTranslationService i18n, final GroupMembersActionsRegistry registry, - final Provider<MembersVisibilityMenuItem> membersVisibility, + public GroupMembersConfActions(final StateManager stateManager, final I18nTranslationService i18n, + final GroupMembersActionsRegistry registry, final Provider<MembersVisibilityMenuItem> membersVisibility, final Provider<MembersModerationMenuItem> membersModeration, final CoreResources res, final JoinGroupAction joinGroupAction, final IsGroupCondition isGroupCondition, final UnJoinGroupAction unJoinGroupAction) { - OPTIONS_MENU.withText(i18n.t("More")).withIcon(res.arrowDownSitebar()).withStyles("k-sn-options-menu"); + OPTIONS_MENU.withText(i18n.t("Options")).withIcon(res.arrowDownSitebar()).withStyles("k-sn-options-menu"); registry.add(OPTIONS_MENU); registry.add(VISIBILITY_SUBMENU.withText(i18n.t("Those who can view this member list")).withParent(OPTIONS_MENU)); registry.add(MODERATION_SUBMENU.withText(i18n.t("New members policy")).withParent(OPTIONS_MENU)); @@ -39,10 +42,19 @@ i18n.t("moderate request to join"))); registry.add(membersModeration.get().withModeration(AdmissionType.Open).withParent(MODERATION_SUBMENU).withText( i18n.t("auto accept request to join"))); - registry.add(membersModeration.get().withModeration(AdmissionType.Closed).withParent(MODERATION_SUBMENU).withText( - i18n.t("closed for new members"))); + // registry.add(membersModeration.get().withModeration(AdmissionType.Closed).withParent(MODERATION_SUBMENU).withText( + // i18n.t("closed for new members"))); registry.add(new ButtonDescriptor(joinGroupAction).withStyles("k-no-backimage")); registry.add(new ButtonDescriptor(unJoinGroupAction).withStyles("k-no-backimage")); + + stateManager.onStateChanged(true, new StateChangedHandler() { + @Override + public void onStateChanged(final StateChangedEvent event) { + final boolean administrable = event.getState().getGroupRights().isAdministrable(); + OPTIONS_MENU.setVisible(administrable); + OPTIONS_MENU.setEnabled(administrable); + } + }); } } Modified: trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -23,10 +23,10 @@ import java.util.List; import cc.kune.common.client.errors.NotImplementedException; +import cc.kune.common.client.log.Log; import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; -import cc.kune.core.client.logs.Log; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -25,7 +25,7 @@ import cc.kune.common.client.actions.BeforeActionCollection; import cc.kune.common.client.actions.BeforeActionListener; import cc.kune.common.client.errors.NotImplementedException; -import cc.kune.core.client.logs.Log; +import cc.kune.common.client.log.Log; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.state.GroupChangedEvent.GroupChangedHandler; Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicDialog.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicDialog.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -142,7 +142,7 @@ public void setTitleIcon(final String icon) { if (TextUtils.notEmpty(icon)) { - title.setLeftIcon(icon); + title.setRightIcon(icon); } } Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -22,7 +22,6 @@ import cc.kune.common.client.ui.PopupTopPanel; import cc.kune.common.client.utils.TextUtils; -import com.google.gwt.core.client.GWT; import com.google.gwt.event.logical.shared.HasCloseHandlers; import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.UIObject; @@ -49,7 +48,8 @@ super.getTitleText().setText(title); // super.setAutoscroll(autoscroll); // super.setSize(String.valueOf(width), String.valueOf(height)); - GWT.log("Not setting size of dialog to: " + String.valueOf(width) + "/" + String.valueOf(height)); + // GWT.log("Not setting size of dialog to: " + String.valueOf(width) + + // "/" + String.valueOf(height)); super.setTitleIcon(icon); super.getFirstBtnText().setText(firstButtonTitle); if (TextUtils.notEmpty(cancelButtonTitle)) { Added: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeader.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeader.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeader.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -0,0 +1,42 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + \*/ +package cc.kune.core.client.ws.entheader; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; + +import com.google.gwt.user.client.ui.IsWidget; + +public interface EntityHeader { + + void addAction(GuiActionDescrip descriptor); + + void addWidget(IsWidget widget); + + /** + * Refresh the logo from the group info in the client session + */ + void refreshGroupLogo(); + + /** + * Reload the logo from the group reloaded from the server + */ + void reloadGroupLogoImage(); + +} \ No newline at end of file Added: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -0,0 +1,152 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.client.ws.entheader; + +import java.util.Date; + +import cc.kune.common.client.actions.ui.ActionFlowPanel; +import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.services.FileConstants; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.ws.entheader.EntityHeaderPresenter.EntityHeaderView; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.gspace.client.WsArmor; + +import com.google.gwt.user.client.ui.AbstractImagePrototype; +import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.gwtplatform.mvp.client.ViewImpl; + +public class EntityHeaderPanel extends ViewImpl implements EntityHeaderView { + + private final Provider<FileDownloadUtils> downloadProvider; + private final EntityTextLogo entityTextLogo; + private final CoreResources images; + private final HorizontalPanel mainPanel; + private final ActionFlowPanel toolbar; + private final VerticalPanel vpanel; + + @Inject + public EntityHeaderPanel(final Provider<FileDownloadUtils> downloadProvider, final CoreResources images, + final GuiProvider bindings, final WsArmor armor) { + mainPanel = new HorizontalPanel(); + mainPanel.setWidth("100%"); + this.downloadProvider = downloadProvider; + this.images = images; + vpanel = new VerticalPanel(); + vpanel.setWidth("100%"); + vpanel.setHorizontalAlignment(HorizontalPanel.ALIGN_RIGHT); + entityTextLogo = new EntityTextLogo(); + mainPanel.add(entityTextLogo); + toolbar = new ActionFlowPanel(bindings); + vpanel.add(toolbar); + mainPanel.add(vpanel); + armor.getEntityHeader().add(mainPanel); + } + + @Override + public void addAction(final GuiActionDescrip descriptor) { + toolbar.add(descriptor); + } + + @Override + public void addWidget(final IsWidget view) { + final Widget widget = (Widget) view; + vpanel.add(widget); + } + + @Override + public Widget asWidget() { + return mainPanel; + } + + @Override + public void reloadImage(final GroupDTO group) { + entityTextLogo.setLogoImage(downloadProvider.get().getLogoImageUrl(group.getStateToken()) + "&nocache=" + + new Date().getTime()); + } + + @Deprecated + public void setFullLogo(final StateToken stateToken, final boolean clipped) { + mainPanel.clear(); + final String imageUrl = downloadProvider.get().getImageUrl(stateToken); + Image logo; + if (clipped) { + logo = new Image(imageUrl, 0, 0, FileConstants.LOGO_DEF_WIDTH, FileConstants.LOGO_DEF_HEIGHT); + } else { + logo = new Image(imageUrl); + logo.setWidth(String.valueOf(FileConstants.LOGO_DEF_WIDTH)); + logo.setHeight(String.valueOf(FileConstants.LOGO_DEF_HEIGHT)); + } + mainPanel.add(logo); + } + + @Override + public void setLargeFont() { + entityTextLogo.setLargeFont(); + } + + @Override + public void setLogoImage(final StateToken stateToken) { + entityTextLogo.setLogoImage(downloadProvider.get().getLogoImageUrl(stateToken)); + } + + @Override + public void setLogoImageVisible(final boolean visible) { + entityTextLogo.setLogoVisible(visible); + } + + @Override + public void setLogoText(final String groupName) { + entityTextLogo.setLogoText(groupName); + } + + @Override + public void setMediumFont() { + entityTextLogo.setMediumFont(); + } + + // + // @Override + // public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { + // if (oldTheme != null) { + // entityTextLogo.removeStyleDependentName(oldTheme.toString()); + // } + // entityTextLogo.addStyleDependentName(newTheme.toString()); + // } + + @Override + public void setSmallFont() { + entityTextLogo.setSmallFont(); + } + + @Override + public void showDefUserLogo() { + entityTextLogo.setLogoImage(AbstractImagePrototype.create(images.personAvatarDef())); + } +} Added: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -0,0 +1,146 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + \*/ +package cc.kune.core.client.ws.entheader; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.core.client.state.GroupChangedEvent; +import cc.kune.core.client.state.GroupChangedEvent.GroupChangedHandler; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.GroupDTO; + +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.Presenter; +import com.gwtplatform.mvp.client.View; +import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; +import com.gwtplatform.mvp.client.proxy.Proxy; +import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; + +public class EntityHeaderPresenter extends + Presenter<EntityHeaderPresenter.EntityHeaderView, EntityHeaderPresenter.EntityHeaderProxy> implements + EntityHeader { + + @ProxyCodeSplit + public interface EntityHeaderProxy extends Proxy<EntityHeaderPresenter> { + } + public interface EntityHeaderView extends View { + void addAction(GuiActionDescrip descriptor); + + void addWidget(IsWidget widget); + + void reloadImage(GroupDTO group); + + void setLargeFont(); + + void setLogoImage(StateToken stateToken); + + void setLogoImageVisible(boolean visible); + + void setLogoText(final String groupName); + + void setMediumFont(); + + void setSmallFont(); + + // void setTheme(final WsTheme oldTheme, WsTheme newTheme); + + void showDefUserLogo(); + } + + private static final int LARGE_NAME_LIMIT = 20; + + private static final int MEDIUM_NAME_LIMIT = 90; + private final Session session; + + @Inject + public EntityHeaderPresenter(final EventBus eventBus, final EntityHeaderView view, final EntityHeaderProxy proxy, + final StateManager stateManager, final Session session) { + super(eventBus, view, proxy); + this.session = session; + stateManager.onGroupChanged(new GroupChangedHandler() { + @Override + public void onGroupChanged(final GroupChangedEvent event) { + setGroupLogo(session.getCurrentState().getGroup()); + } + }); + // theme.addOnThemeChanged(new Listener2<WsTheme, WsTheme>() { + // @Override + // public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { + // // getView().setTheme(oldTheme, newTheme); + // } + // }); + } + + @Override + public void addAction(final GuiActionDescrip descriptor) { + getView().addAction(descriptor); + } + + @Override + public void addWidget(final IsWidget widget) { + getView().addWidget(widget); + } + + @Override + public void refreshGroupLogo() { + setGroupLogo(session.getCurrentState().getGroup()); + } + + @Override + public void reloadGroupLogoImage() { + getView().reloadImage(session.getCurrentState().getGroup()); + } + + @Override + protected void revealInParent() { + RevealRootContentEvent.fire(this, this); + } + + void setGroupLogo(final GroupDTO group) { + if (group.hasLogo()) { + setLogoText(group.getLongName()); + getView().setLogoImage(group.getStateToken()); + getView().setLogoImageVisible(true); + } else { + setLogoText(group.getLongName()); + if (group.isPersonal()) { + getView().showDefUserLogo(); + getView().setLogoImageVisible(true); + } else { + getView().setLogoImageVisible(false); + } + } + } + + void setLogoText(final String name) { + final int length = name.length(); + if (length <= LARGE_NAME_LIMIT) { + getView().setLargeFont(); + } else if (length <= MEDIUM_NAME_LIMIT) { + getView().setMediumFont(); + } else { + getView().setSmallFont(); + } + getView().setLogoText(name); + } +} Added: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -0,0 +1,117 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.client.ws.entheader; + +import com.google.gwt.user.client.ui.AbstractImagePrototype; +import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.VerticalPanel; + +public class EntityTextLogo extends VerticalPanel { + + public static final String LOGO_NAME = "k-elogop-ln"; + public static final String LOGO_IMAGE = "k-elogop-image"; + + private static final String _100 = "100%"; + private static final String LOGO_MEDIUM_FONT_STYLE = "k-elogo-l-m"; + private static final String LOGO_SMALL_FONT_STYLE = "k-elogo-l-s"; + private static final String LOGO_LARGE_FONT_STYLE = "k-elogo-l-l"; + private final Label logoLabel; + private final Image logoImage; + + public EntityTextLogo() { + // Initialize + super(); + final HorizontalPanel generalHP = new HorizontalPanel(); + final VerticalPanel logoTextVP = new VerticalPanel(); + logoImage = new Image(); + logoLabel = new Label(); + final Label expandCell = new Label(""); + + logoImage.ensureDebugId(LOGO_IMAGE); + logoLabel.ensureDebugId(LOGO_NAME); + + // Layout + add(generalHP); + generalHP.add(logoImage); + generalHP.add(logoTextVP); + logoTextVP.add(logoLabel); + + // Set properties + + expandCell.setStyleName("k-elogop-expand"); + generalHP.setWidth(_100); + generalHP.setHeight(_100); + generalHP.setCellWidth(logoTextVP, _100); + generalHP.setCellHeight(logoTextVP, _100); + logoTextVP.setWidth(_100); + logoTextVP.setCellWidth(logoLabel, _100); + super.setVerticalAlignment(ALIGN_MIDDLE); + logoTextVP.setVerticalAlignment(ALIGN_MIDDLE); + generalHP.setVerticalAlignment(ALIGN_MIDDLE); + setStylePrimaryName("k-entitytextlogo"); + addStyleName("k-entitytextlogo-no-border"); + logoImage.setVisible(false); + setLogoTextImpl(""); + } + + public void setLargeFont() { + resetFontSize(); + logoLabel.addStyleName(LOGO_LARGE_FONT_STYLE); + } + + public void setLogoImage(final AbstractImagePrototype imageProto) { + imageProto.applyTo(logoImage); + } + + public void setLogoImage(final String url) { + Image.prefetch(url); + logoImage.setUrl(url); + } + + public void setLogoText(final String text) { + setLogoTextImpl(text); + } + + public void setLogoVisible(final boolean visible) { + logoImage.setVisible(visible); + } + + public void setMediumFont() { + resetFontSize(); + logoLabel.addStyleName(LOGO_MEDIUM_FONT_STYLE); + } + + public void setSmallFont() { + resetFontSize(); + logoLabel.addStyleName(LOGO_SMALL_FONT_STYLE); + } + + private void resetFontSize() { + logoLabel.removeStyleName(LOGO_LARGE_FONT_STYLE); + logoLabel.removeStyleName(LOGO_SMALL_FONT_STYLE); + logoLabel.removeStyleName(LOGO_MEDIUM_FONT_STYLE); + } + + private void setLogoTextImpl(final String text) { + logoLabel.setText(text); + } +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-24 23:07:55 UTC (rev 1262) @@ -904,7 +904,7 @@ .k-sn-bottomPanel { padding: 8px 10px 0; - float: right; + float: left; } .k-sn-bottomPanel-actions { @@ -958,3 +958,77 @@ .k-sn-join { float:left; } + +.k-entitytextlogo-border { + border: 2px solid #F2F2F2; +} + +.k-entitytextlogo-no-border { + border: none; +} + +.k-entitytextlogo { + height: 60px; + margin: 5px; + overflow: hidden; + width: 468px; +} + +.k-entitytextlogo table { + vertical-align: middle; +} + +.k-elogo-l-l { + font-size: 46px; +} + +.k-elogo-l-m { + font-size: 167%; +} + +.k-elogo-l-s { + font-size: 108%; +} + +.k-entitytextlogo .gwt-Label { + font-weight: 700; + margin: 5px; + height: 27px; +} + +.k-entitytextlogo-default .gwt-Label { + color: #69312F; +} + +.k-entitytextlogo-green .gwt-Label { + color: #250; +} + +.k-entitytextlogo-blue .gwt-Label { + color: #000080; +} + +.k-entitytextlogo-grey .gwt-Label { + color: #1A1A1A; +} + +.k-entitytextlogo-purple .gwt-Label { + color: #440055; +} + +.k-entitytextlogo-red .gwt-Label { + color: #800000; +} + +.k-elogo-plink { + color: #CCC; + font-size: 85%; + margin: 5px; + text-decoration: underline; + white-space: nowrap; + background-color: #FFF; +} + +.k-elogop-expand { + background-color: transparent; +} Modified: trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml 2011-02-24 23:07:55 UTC (rev 1262) @@ -86,7 +86,7 @@ </g:south> </g:DockLayoutPanel> </g:center> - <g:east size="200.0"> + <g:west size="200.0"> <g:DockLayoutPanel unit="PX" styleName="{res.style.entityTools}" ui:field="splitEast"> <g:north size="305"> @@ -103,7 +103,7 @@ styleName="{res.style.entityToolsSouth}" ui:field="entityToolsSouth"></g:VerticalPanel> </g:south> </g:DockLayoutPanel> - </g:east> + </g:west> </g:SplitLayoutPanel> </g:tab> <g:tab> Modified: trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-02-24 23:07:55 UTC (rev 1262) @@ -21,17 +21,17 @@ } .entityHeader { - -webkit-border-top-left-radius: 10px; - -moz-border-radius-topleft: 10px; - border-top-left-radius: 10px; + -webkit-border-top-right-radius: 10px; + -moz-border-radius-topright: 10px; + border-top-right-radius: 10px; background-color: #f4e3d7; overflow: hidden; } .entityFooter { - -webkit-border-bottom-left-radius: 10px; - -moz-border-radius-bottomleft: 10px; - border-top-bottom-radius: 10px; + -webkit-border-bottom-right-radius: 10px; + -moz-border-radius-bottomright: 10px; + border-bottom-right-radius: 10px; background-color: #f7ebe3; /* padding: 7px 10px 0px 17px; */ overflow: hidden; @@ -130,12 +130,12 @@ } .entityTools { - -webkit-border-top-right-radius: 10px; - -moz-border-radius-topright: 10px; - border-top-right-radius: 10px; - -webkit-border-bottom-right-radius: 10px; - -moz-border-radius-bottomright: 10px; - border-bottom-right-radius: 10px; + -webkit-border-top-left-radius: 10px; + -moz-border-radius-topleft: 10px; + border-top-left-radius: 10px; + -webkit-border-bottom-left-radius: 10px; + -moz-border-radius-bottomleft: 10px; + border-bottom-left-radius: 10px; background-color: #DEAA87; } Modified: trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java 2011-02-24 02:37:26 UTC (rev 1261) +++ trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java 2011-02-24 23:07:55 UTC (rev 1262) @@ -1,8 +1,8 @@ package cc.kune.wave.client; +import cc.kune.common.client.log.Log; import cc.kune.common.client.noti.NotifyUser; import cc.kune.common.client.utils.WindowUtils; -import cc.kune.core.client.logs.Log; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.UserSignInEvent; import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler;