February 2011 - kune-commits - lists.ourproject.org

r1266 - in trunk/src/main/java: cc/kune/core/client/auth cc/kune/core/public cc/kune/gspace/client cc/kune/wave cc/kune/wave/client cc/kune/wave/public cc/kune/wave/public/static cc/kune/wave/public/static/images cc/kune/wave/server org/ourproject/kune/platf/server/manager/impl
by Vicente J. Ruiz Jurado 28 Feb '11

28 Feb '11

Author: vjrj_ Date: 2011-02-28 13:14:26 +0100 (Mon, 28 Feb 2011) New Revision: 1266 Added: trunk/src/main/java/cc/kune/wave/client/WaveClientSimpleAuthenticator.java trunk/src/main/java/cc/kune/wave/public/ trunk/src/main/java/cc/kune/wave/public/static/ trunk/src/main/java/cc/kune/wave/public/static/auth.css trunk/src/main/java/cc/kune/wave/public/static/favicon.ico trunk/src/main/java/cc/kune/wave/public/static/images/ trunk/src/main/java/cc/kune/wave/public/static/images/unknown.jpg trunk/src/main/java/cc/kune/wave/public/static/logo.png trunk/src/main/java/cc/kune/wave/server/CustomAuthenticationServlet.java Removed: trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java trunk/src/main/java/cc/kune/core/public/ws.html trunk/src/main/java/cc/kune/gspace/client/WsArmor.java trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml trunk/src/main/java/cc/kune/wave/server/WaveMain.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java Log: NEW - # 32: WIAB Server and Kune server running together http://kune.ourproject.org/issues/ticket/32 Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java 2011-02-26 19:48:11 UTC (rev 1265) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java 2011-02-28 12:14:26 UTC (rev 1266) @@ -44,7 +44,7 @@ public SignInNewForm(final I18nTranslationService i18n) { initWidget(uiBinder.createAndBindUi(this)); - nick.setFieldLabel(i18n.t("Nickname or email")); + nick.setFieldLabel(i18n.t("Your nickname")); password.setFieldLabel(i18n.t("Password")); } 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-26 19:48:11 UTC (rev 1265) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-02-28 12:14:26 UTC (rev 1266) @@ -21,6 +21,7 @@ import cc.kune.common.client.log.Log; import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.utils.SimpleCallback; import cc.kune.common.client.utils.TextUtils; import cc.kune.common.client.utils.TimerWrapper; import cc.kune.common.client.utils.TimerWrapper.Executer; @@ -36,7 +37,7 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.UserDTO; import cc.kune.core.shared.dto.UserInfoDTO; -import cc.kune.wave.client.WaveClientTester; +import cc.kune.wave.client.WaveClientSimpleAuthenticator; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -60,14 +61,14 @@ private final Provider<Register> registerProvider; private final TimerWrapper timer; private final UserServiceAsync userService; - private final WaveClientTester waveClientTester; + private final WaveClientSimpleAuthenticator waveClientTester; @Inject public SignInPresenter(final EventBus eventBus, final SignInView view, final SignInProxy proxy, final Session session, final StateManager stateManager, final I18nUITranslationService i18n, final UserServiceAsync userService, final Provider<Register> registerProvider, final CookiesManager cookiesManager, final UserPassAutocompleteManager autocomplete, - final TimerWrapper timeWrapper, final WaveClientTester waveClientTester) { + final TimerWrapper timeWrapper, final WaveClientSimpleAuthenticator waveClientTester) { super(eventBus, view, proxy, session, stateManager, i18n, cookiesManager, autocomplete); this.eventBus = eventBus; this.userService = userService; @@ -160,31 +161,41 @@ user.setShortName(nickOrEmail); user.setPassword(passwd); saveAutocompleteLoginData(nickOrEmail, passwd); - final AsyncCallback<UserInfoDTO> callback = new AsyncCallback<UserInfoDTO>() { + waveClientTester.doLogin(nickOrEmail, passwd, new SimpleCallback() { @Override - public void onFailure(final Throwable caught) { - getView().unMask(); - eventBus.fireEvent(new ProgressHideEvent()); - if (caught instanceof UserAuthException) { - getView().setErrorMessage(i18n.t(CoreMessages.INCORRECT_NICKNAME_EMAIL_OR_PASSWORD), - NotifyLevel.error); - } else { - getView().setErrorMessage("Error in login", NotifyLevel.error); - Log.error("Other kind of exception in SignInPresenter/doLogin"); - } + public void onSuccess() { + final AsyncCallback<UserInfoDTO> callback = new AsyncCallback<UserInfoDTO>() { + @Override + public void onFailure(final Throwable caught) { + getView().unMask(); + eventBus.fireEvent(new ProgressHideEvent()); + if (caught instanceof UserAuthException) { + getView().setErrorMessage(i18n.t(CoreMessages.INCORRECT_NICKNAME_EMAIL_OR_PASSWORD), + NotifyLevel.error); + } else { + getView().setErrorMessage("Error in login", NotifyLevel.error); + Log.error("Other kind of exception in SignInPresenter/doLogin"); + } + } + + @Override + public void onSuccess(final UserInfoDTO userInfoDTO) { + onSignIn(userInfoDTO); + stateManager.restorePreviousToken(); + getView().hide(); + getView().unMask(); + + } + }; + userService.login(user.getShortName(), user.getPassword(), callback); } @Override - public void onSuccess(final UserInfoDTO userInfoDTO) { - onSignIn(userInfoDTO); - stateManager.restorePreviousToken(); - waveClientTester.doLogin(nickOrEmail, passwd); - getView().hide(); - getView().unMask(); - + public void onCancel() { + getView().setErrorMessage("Error in login", NotifyLevel.error); + Log.error("SignInPresenter/doLogin fails in Wave auth"); } - }; - userService.login(user.getShortName(), user.getPassword(), callback); + }); } } Modified: trunk/src/main/java/cc/kune/core/public/ws.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.html 2011-02-26 19:48:11 UTC (rev 1265) +++ trunk/src/main/java/cc/kune/core/public/ws.html 2011-02-28 12:14:26 UTC (rev 1266) @@ -40,8 +40,8 @@ <script type="text/javascript" language="javascript"> var __session = { "id" : "TK8O7UyqvT", - "address" : "vjrj(a)kune.beta.iepala.es", - "domain" : "kune.beta.iepala.es" + "address" : "kune@localhost", + "domain" : "localhost" }; var __client_flags = {}; var __useSocketIO = true; @@ -154,7 +154,7 @@ sites like this one, where you can <strong>communicate, share, collaborate with others and create your web spaces easily</strong>. <a href="#signin">Join!</a> </div> -<div id="k-home-stats"> +<div id="k-home-stats" style="display: none;"> Latests groups created </div> </div> Modified: trunk/src/main/java/cc/kune/gspace/client/WsArmor.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/WsArmor.java 2011-02-26 19:48:11 UTC (rev 1265) +++ trunk/src/main/java/cc/kune/gspace/client/WsArmor.java 2011-02-28 12:14:26 UTC (rev 1266) @@ -43,6 +43,8 @@ ForIsWidget getSitebar(); + ForIsWidget getUserSpace(); + void selectGroupSpace(); void selectHomeSpace(); @@ -50,7 +52,4 @@ void selectPublicSpace(); void selectUserSpace(); - - void setFrameUrlForTesting(String url); - } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java 2011-02-26 19:48:11 UTC (rev 1265) +++ trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java 2011-02-28 12:14:26 UTC (rev 1266) @@ -27,7 +27,6 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.DockLayoutPanel; import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.SimplePanel; @@ -63,8 +62,6 @@ @UiField VerticalPanel entityToolsSouth; @UiField - Frame frame; - @UiField SplitLayoutPanel groupSpace; @UiField SimplePanel homeSpace; @@ -81,7 +78,7 @@ @UiField TabLayoutPanel tabs; @UiField - SimplePanel userSpace; + FlowPanel userSpace; @Inject public WsArmorImpl(final PSpacePresenter pspace) { @@ -90,7 +87,6 @@ tabs.setStyleName("k-spaces"); homeSpace.add(RootPanel.get("k-home-wrapper")); publicSpace.add(pspace.getWidget()); - // userSpace.add(new Label("User space")); } @Override @@ -143,6 +139,10 @@ return sitebar; } + public ForIsWidget getUserSpace() { + return userSpace; + } + @Override public void selectGroupSpace() { tabs.selectTab(groupSpace); @@ -162,10 +162,4 @@ public void selectUserSpace() { tabs.selectTab(userSpace); } - - @Override - @Deprecated - public void setFrameUrlForTesting(final String url) { - frame.setUrl(url); - } } 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-26 19:48:11 UTC (rev 1265) +++ trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml 2011-02-28 12:14:26 UTC (rev 1266) @@ -26,11 +26,11 @@ </g:tab> <g:tab> <g:header size='0' /> - <g:SimplePanel ui:field="userSpace" width="100%" + <g:FlowPanel ui:field="userSpace" width="100%" height="100%"> - <g:Frame url="http://localhost:9898/" styleName="{style.frame}" - ui:field="frame" width="100%" height="100%" /> - </g:SimplePanel> + + + </g:FlowPanel> </g:tab> <g:tab> <g:header size='0' /> Modified: trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml 2011-02-26 19:48:11 UTC (rev 1265) +++ trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml 2011-02-28 12:14:26 UTC (rev 1266) @@ -3,6 +3,7 @@ <module> <inherits name="com.google.gwt.user.User" /> <source path="client" /> + <public path="public" /> <inherits name="com.google.common.base.Base" /> <inherits name='com.google.gwt.user.User' /> <inherits name="com.google.gwt.event.EventBase" /> Copied: trunk/src/main/java/cc/kune/wave/client/WaveClientSimpleAuthenticator.java (from rev 1265, trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java) =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveClientSimpleAuthenticator.java (rev 0) +++ trunk/src/main/java/cc/kune/wave/client/WaveClientSimpleAuthenticator.java 2011-02-28 12:14:26 UTC (rev 1266) @@ -0,0 +1,63 @@ +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.SimpleCallback; +import cc.kune.common.client.utils.WindowUtils; +import cc.kune.gspace.client.WsArmor; + +import com.google.gwt.http.client.Request; +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.RequestCallback; +import com.google.gwt.http.client.RequestException; +import com.google.gwt.http.client.Response; +import com.google.gwt.http.client.URL; +import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; +import com.google.inject.Inject; + +public class WaveClientSimpleAuthenticator { + + private final WsArmor wsArmor; + + @Inject + public WaveClientSimpleAuthenticator(final WsArmor wsArmor) { + this.wsArmor = wsArmor; + } + + public void doLogin(final String userWithoutDomain, final String passwd, final SimpleCallback callback) { + final RequestBuilder request = new RequestBuilder(RequestBuilder.POST, "/auth/signin"); + final StringBuffer params = new StringBuffer(); + params.append("address="); + params.append(URL.encodeQueryString(userWithoutDomain)); + params.append("&password="); + params.append(URL.encodeQueryString(passwd)); + params.append("&signIn="); + params.append(URL.encodeQueryString("Sign in")); + try { + request.setHeader("Content-Type", "application/x-www-form-urlencoded"); + request.sendRequest(params.toString(), new RequestCallback() { + @Override + public void onError(final Request request, final Throwable exception) { + NotifyUser.error(exception.getStackTrace().toString(), true); + callback.onCancel(); + } + + @Override + public void onResponseReceived(final Request request, final Response response) { + final String url = WindowUtils.getLocation().getHost() + "/"; + Log.debug("Wave client url: " + url); + callback.onSuccess(); + // String token = + // Cookies.getCookie(JETTY_SESSION_TOKEN_NAME); + final ForIsWidget userSpace = wsArmor.getUserSpace(); + if (userSpace.getWidgetCount() > 0) { + userSpace.remove(0); + } + userSpace.add(new WebClient()); + } + }); + } catch (final RequestException e) { + NotifyUser.error(e.getStackTrace().toString(), true); + } + } +} Deleted: trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java 2011-02-26 19:48:11 UTC (rev 1265) +++ trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java 2011-02-28 12:14:26 UTC (rev 1266) @@ -1,72 +0,0 @@ -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.state.Session; -import cc.kune.core.client.state.UserSignInEvent; -import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; -import cc.kune.core.client.state.UserSignOutEvent; -import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler; -import cc.kune.gspace.client.WsArmor; - -import com.google.gwt.http.client.Request; -import com.google.gwt.http.client.RequestBuilder; -import com.google.gwt.http.client.RequestCallback; -import com.google.gwt.http.client.RequestException; -import com.google.gwt.http.client.Response; -import com.google.gwt.http.client.URL; -import com.google.inject.Inject; - -public class WaveClientTester { - - private final WsArmor wsarmor; - - @Inject - public WaveClientTester(final WsArmor wsarmor, final Session session) { - this.wsarmor = wsarmor; - session.onUserSignIn(true, new UserSignInHandler() { - @Override - public void onUserSignIn(final UserSignInEvent event) { - doLogin(event.getUserInfo().getChatName(), event.getUserInfo().getChatPassword()); - } - }); - - session.onUserSignOut(true, new UserSignOutHandler() { - @Override - public void onUserSignOut(final UserSignOutEvent event) { - // TODO Auto-generated method stub - } - }); - } - - public void doLogin(final String userWithoutDomain, final String passwd) { - final RequestBuilder request = new RequestBuilder(RequestBuilder.POST, "/auth/signin"); - final StringBuffer params = new StringBuffer(); - params.append("address="); - params.append(URL.encodeQueryString(userWithoutDomain)); - params.append("&password="); - params.append(URL.encodeQueryString(passwd)); - params.append("&signIn="); - params.append(URL.encodeQueryString("Sign in")); - try { - request.setHeader("Content-Type", "application/x-www-form-urlencoded"); - request.sendRequest(params.toString(), new RequestCallback() { - @Override - public void onError(final Request request, final Throwable exception) { - NotifyUser.error(exception.getStackTrace().toString(), true); - } - - @Override - public void onResponseReceived(final Request request, final Response response) { - final String url = WindowUtils.getLocation().getHost() + "/"; - Log.debug("Wave client url: " + url); - // wsarmor.setFrameUrlForTesting(url); - wsarmor.setFrameUrlForTesting("/"); - } - }); - } catch (final RequestException e) { - NotifyUser.error(e.getStackTrace().toString(), true); - } - } -} Added: trunk/src/main/java/cc/kune/wave/public/static/auth.css =================================================================== --- trunk/src/main/java/cc/kune/wave/public/static/auth.css (rev 0) +++ trunk/src/main/java/cc/kune/wave/public/static/auth.css 2011-02-28 12:14:26 UTC (rev 1266) @@ -0,0 +1,112 @@ +body { + background-color: #ffffff margin-top : 2; +} + +body { + font-family: arial, sans-serif; +} + +#wiab_loginform { + margin: 0; +} + +#wiab_loginbox_td { + padding-right: 10px; +} + +.form-noindent { + border: #0066cc 2px solid; + background-color: white; +} + +.bubble { + background-color: #62c4fb; +} + +.tl { + font-size: 1px; + padding: 0; + width: 4; + text-align: left; + vertical-align: top +} + +.tr { + font-size: 1px; + padding: 0; + width: 2; + text-align: right; + vertical-align: top +} + +.bl { + font-size: 1px; + padding: 0; + width: 4; + text-align: left; + vertical-align: bottom +} + +.br { + font-size: 1px; + padding: 0; + width: 4; + text-align: right; + vertical-align: bottom +} + +.loginBox { + padding: 5px 5px 20px; + margin: 0; + text-align: center; + background-color: #d3d4d6; +} + +.loginBox td { + padding-bottom: 5px; +} + +.loginBox td.smallfont { + font-size: 80%; +} + +.loginBox h2 { + margin: 0; + font-weight: bold; + font-size: 120%; +} + +.loginBox table { + margin: 0; + text-align: left; +} + +.loginBox p { + text-align: left; +} + +.alBox { + padding: 5px 10px; + margin: 0; +} + +.alBox h4 { + margin: 0; + font-size: 80%; +} + +.wiab.le.lbl { + font-family: Arial, Helvetica, sans-serif; + font-size: smaller; +} + +.wiab.le.val { + font-family: Arial, Helvetica, sans-serif; + font-size: smaller; +} + +.wiab.le.button { + font-family: Arial, Helvetica, sans-serif; + font-size: smaller; +} + Added: trunk/src/main/java/cc/kune/wave/public/static/favicon.ico =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/wave/public/static/favicon.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/wave/public/static/images/unknown.jpg =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/wave/public/static/images/unknown.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/wave/public/static/logo.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/wave/public/static/logo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/wave/server/CustomAuthenticationServlet.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/CustomAuthenticationServlet.java (rev 0) +++ trunk/src/main/java/cc/kune/wave/server/CustomAuthenticationServlet.java 2011-02-28 12:14:26 UTC (rev 1266) @@ -0,0 +1,247 @@ +package cc.kune.wave.server; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URLDecoder; +import java.nio.ByteBuffer; +import java.nio.CharBuffer; +import java.nio.charset.CharacterCodingException; +import java.nio.charset.Charset; +import java.nio.charset.CharsetDecoder; +import java.nio.charset.CodingErrorAction; +import java.security.Principal; + +import javax.security.auth.Subject; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.login.Configuration; +import javax.security.auth.login.LoginContext; +import javax.security.auth.login.LoginException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.eclipse.jetty.util.MultiMap; +import org.eclipse.jetty.util.UrlEncoded; +import org.waveprotocol.box.server.CoreSettings; +import org.waveprotocol.box.server.authentication.HttpRequestBasedCallbackHandler; +import org.waveprotocol.box.server.authentication.ParticipantPrincipal; +import org.waveprotocol.box.server.authentication.SessionManager; +import org.waveprotocol.box.server.gxp.AuthenticationPage; +import org.waveprotocol.box.server.rpc.BaseUrlHelper; +import org.waveprotocol.wave.model.wave.InvalidParticipantAddress; +import org.waveprotocol.wave.model.wave.ParticipantId; +import org.waveprotocol.wave.util.logging.Log; + +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; +import com.google.gxp.base.GxpContext; +import com.google.inject.Inject; +import com.google.inject.name.Named; + +/** + * A servlet for authenticating a user's password and giving them a token via a + * cookie. + * + * @author josephg(a)gmail.com (Joseph Gentle) + */ +public class CustomAuthenticationServlet extends HttpServlet { + private static final String DEFAULT_REDIRECT_URL = "/"; + public static final String RESPONSE_STATUS_NONE = "NONE"; + public static final String RESPONSE_STATUS_FAILED = "FAILED"; + public static final String RESPONSE_STATUS_SUCCESS = "SUCCESS"; + + private static final Log LOG = Log.get(CustomAuthenticationServlet.class); + + private final Configuration configuration; + private final SessionManager sessionManager; + private final String domain; + private final String baseUrl; + + @Inject + public CustomAuthenticationServlet(Configuration configuration, SessionManager sessionManager, + @Named(CoreSettings.WAVE_SERVER_DOMAIN) String domain, @Named(CoreSettings.HTTP_BASE_URL) String baseUrl) { + Preconditions.checkNotNull(configuration, "Configuration is null"); + Preconditions.checkNotNull(sessionManager, "Session manager is null"); + this.configuration = configuration; + this.sessionManager = sessionManager; + this.domain = domain.toLowerCase(); + this.baseUrl = BaseUrlHelper.removeLastSlash(baseUrl); + } + + @SuppressWarnings("unchecked") + public LoginContext login(BufferedReader body) throws IOException, LoginException { + try { + Subject subject = new Subject(); + + String parametersLine = body.readLine(); + // Throws UnsupportedEncodingException. + byte[] utf8Bytes = parametersLine.getBytes("UTF-8"); + + CharsetDecoder utf8Decoder = Charset.forName("UTF-8").newDecoder(); + utf8Decoder.onMalformedInput(CodingErrorAction.IGNORE); + utf8Decoder.onUnmappableCharacter(CodingErrorAction.IGNORE); + + // Throws CharacterCodingException. + CharBuffer parsed = utf8Decoder.decode(ByteBuffer.wrap(utf8Bytes)); + parametersLine = parsed.toString(); + + MultiMap<String> parameters = new UrlEncoded(parametersLine); + CallbackHandler callbackHandler = new HttpRequestBasedCallbackHandler(parameters); + + LoginContext context = new LoginContext("Wave", subject, callbackHandler, configuration); + + // If authentication fails, login() will throw a LoginException. + context.login(); + return context; + } catch (CharacterCodingException cce) { + throw new LoginException("Character coding exception (not utf-8): " + + cce.getLocalizedMessage()); + } catch (UnsupportedEncodingException uee) { + throw new LoginException("ad character encoding specification: " + uee.getLocalizedMessage()); + } + } + + /** + * The POST request should have all the fields required for authentication. + */ + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { + req.setCharacterEncoding("UTF-8"); + LoginContext context; + try { + context = login(req.getReader()); + } catch (LoginException e) { + String message = "The username or password you entered is incorrect."; + String responseType = RESPONSE_STATUS_FAILED; + LOG.info("User authentication failed: " + e.getLocalizedMessage()); + resp.setStatus(HttpServletResponse.SC_FORBIDDEN); + AuthenticationPage.write(resp.getWriter(), new GxpContext(req.getLocale()), domain, baseUrl, message, + responseType); + return; + } + + Subject subject = context.getSubject(); + + ParticipantId loggedInAddress; + try { + loggedInAddress = getLoggedInUser(subject); + } catch (InvalidParticipantAddress e1) { + throw new IllegalStateException( + "The user provided valid authentication information, but the username" + + " isn't a valid user address."); + } + + if (loggedInAddress == null) { + try { + context.logout(); + } catch (LoginException e) { + // Logout failed. Absorb the error, since we're about to throw an + // illegal state exception anyway. + } + throw new IllegalStateException( + "The user provided valid authentication information, but we don't " + + "know how to map their identity to a wave user address."); + } + + HttpSession session = req.getSession(true); + sessionManager.setLoggedInUser(session, loggedInAddress); + // The context needs to be notified when the user logs out. + session.setAttribute("context", context); + LOG.info("Authenticated user " + loggedInAddress); + + redirectLoggedInUser(req, resp); + } + + /** + * Get the participant id of the given subject. + * + * The subject is searched for compatible principals. When other + * authentication types are added, this method will need to be updated to + * support their principal types. + * + * @throws InvalidParticipantAddress The subject's address is invalid + */ + private ParticipantId getLoggedInUser(Subject subject) throws InvalidParticipantAddress { + String address = null; + + for (Principal p : subject.getPrincipals()) { + // TODO(josephg): When we support other authentication types (LDAP, etc), + // this method will need to read the address portion out of the other principal types. + if (p instanceof ParticipantPrincipal) { + address = ((ParticipantPrincipal) p).getName(); + break; + } + } + + return address == null ? null : ParticipantId.of(address); + } + + /** + * On GET, present a login form if the user isn't authenticated. + */ + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { + // If the user is already logged in, we'll try to redirect them immediately. + resp.setCharacterEncoding("UTF-8"); + req.setCharacterEncoding("UTF-8"); + HttpSession session = req.getSession(false); + ParticipantId user = sessionManager.getLoggedInUser(session); + + if (user != null) { + redirectLoggedInUser(req, resp); + } else { + resp.setStatus(HttpServletResponse.SC_OK); + resp.setContentType("text/html;charset=utf-8"); + AuthenticationPage.write(resp.getWriter(), new GxpContext(req.getLocale()), domain, baseUrl, "", + RESPONSE_STATUS_NONE); + } + } + + /** + * Redirect the user back to DEFAULT_REDIRECT_URL, unless a custom redirect + * URL has been specified in the query string; in which case redirect there. + * + * Only redirects to local URLs are allowed. + * + * @throws IOException + */ + private void redirectLoggedInUser(HttpServletRequest req, HttpServletResponse resp) + throws IOException { + Preconditions.checkState(sessionManager.getLoggedInUser(req.getSession(false)) != null, + "The user is not logged in"); + String query = req.getQueryString(); + + // Not using req.getParameter() for this because calling that method might parse the password + // sitting in POST data into a String, where it could be read by another process after the + // string is garbage collected. + if (query == null || !query.startsWith("r=")) { + resp.sendRedirect(baseUrl + DEFAULT_REDIRECT_URL); + return; + } + + String encoded_url = query.substring("r=".length()); + String path = URLDecoder.decode(encoded_url, "UTF-8"); + + // The URL must not be an absolute URL to prevent people using this as a + // generic redirection service. + URI uri; + try { + uri = new URI(path); + } catch (URISyntaxException e) { + // The redirect URL is invalid. + resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + return; + } + + if (Strings.isNullOrEmpty(uri.getHost()) == false) { + // The URL includes a host component. Disallow it. + resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + } else { + resp.sendRedirect(path); + } + } +} Modified: trunk/src/main/java/cc/kune/wave/server/WaveMain.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/WaveMain.java 2011-02-26 19:48:11 UTC (rev 1265) +++ trunk/src/main/java/cc/kune/wave/server/WaveMain.java 2011-02-28 12:14:26 UTC (rev 1266) @@ -39,7 +39,6 @@ import org.waveprotocol.box.server.robots.dataapi.DataApiServlet; import org.waveprotocol.box.server.robots.passive.RobotsGateway; import org.waveprotocol.box.server.rpc.AttachmentServlet; -import org.waveprotocol.box.server.rpc.AuthenticationServlet; import org.waveprotocol.box.server.rpc.FetchServlet; import org.waveprotocol.box.server.rpc.SignOutServlet; import org.waveprotocol.box.server.waveserver.WaveBus; @@ -124,7 +123,7 @@ private static void initializeServlets(final Injector injector, final CustomServerRpcProvider server) { server.addServlet("/attachment/*", injector.getInstance(AttachmentServlet.class)); - server.addServlet(SessionManager.SIGN_IN_URL, injector.getInstance(AuthenticationServlet.class)); + server.addServlet(SessionManager.SIGN_IN_URL, injector.getInstance(CustomAuthenticationServlet.class)); server.addServlet("/auth/signout", injector.getInstance(SignOutServlet.class)); server.addServlet("/auth/register", injector.getInstance(CustomUserRegistrationServlet.class)); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2011-02-26 19:48:11 UTC (rev 1265) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2011-02-28 12:14:26 UTC (rev 1266) @@ -19,6 +19,9 @@ */ package org.ourproject.kune.platf.server.manager.impl; +import java.io.IOException; +import java.net.HttpCookie; +import java.net.MalformedURLException; import java.util.Collection; import java.util.List; import java.util.TimeZone; @@ -38,7 +41,10 @@ import org.ourproject.kune.platf.server.manager.I18nLanguageManager; import org.ourproject.kune.platf.server.manager.UserManager; import org.ourproject.kune.platf.server.properties.ChatProperties; +import org.waveprotocol.box.consoleclient.ClientAuthenticator; +import org.waveprotocol.box.server.CoreSettings; import org.waveprotocol.box.server.authentication.PasswordDigest; +import org.waveprotocol.box.server.authentication.SessionManager; import cc.kune.core.client.errors.I18nNotFoundException; import cc.kune.core.client.errors.UserRegistrationException; @@ -53,6 +59,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import com.google.inject.name.Named; @Singleton public class UserManagerDefault extends DefaultManager<User, Long> implements UserManager {

1 0

r1265 - in trunk: script src/main/java/cc/kune/wave/client src/main/java/cc/kune/wave/server src/main/webapp/WEB-INF
by Vicente J. Ruiz Jurado 26 Feb '11

26 Feb '11

Author: vjrj_ Date: 2011-02-26 20:48:11 +0100 (Sat, 26 Feb 2011) New Revision: 1265 Added: trunk/script/kune server via mvn.launch Removed: trunk/src/main/java/cc/kune/wave/server/JettyModule.java Modified: trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java trunk/src/main/java/cc/kune/wave/server/CustomServerRpcProvider.java trunk/src/main/webapp/WEB-INF/web.xml Log: WIAB server integration cleanup Added: trunk/script/kune server via mvn.launch =================================================================== --- trunk/script/kune server via mvn.launch (rev 0) +++ trunk/script/kune server via mvn.launch 2011-02-26 19:48:11 UTC (rev 1265) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType"> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.ui.externaltools.launchGroup"/> +</listAttribute> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/mvn"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="exec:java"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/kune}"/> +</launchConfiguration> Modified: trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java 2011-02-26 10:20:40 UTC (rev 1264) +++ trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java 2011-02-26 19:48:11 UTC (rev 1265) @@ -62,7 +62,7 @@ final String url = WindowUtils.getLocation().getHost() + "/"; Log.debug("Wave client url: " + url); // wsarmor.setFrameUrlForTesting(url); - wsarmor.setFrameUrlForTesting("/wiiiabbb"); + wsarmor.setFrameUrlForTesting("/"); } }); } catch (final RequestException e) { Modified: trunk/src/main/java/cc/kune/wave/server/CustomServerRpcProvider.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/CustomServerRpcProvider.java 2011-02-26 10:20:40 UTC (rev 1264) +++ trunk/src/main/java/cc/kune/wave/server/CustomServerRpcProvider.java 2011-02-26 19:48:11 UTC (rev 1265) @@ -11,9 +11,6 @@ import java.util.concurrent.Executors; import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -21,13 +18,11 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.nio.SelectChannelConnector; import org.eclipse.jetty.servlet.DefaultServlet; -import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.util.resource.ResourceCollection; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.websocket.WebSocket; import org.eclipse.jetty.websocket.WebSocketServlet; -import org.jruby.rack.RackFilter; -import org.jruby.rack.RackServletContextListener; import org.ourproject.kune.rack.RackServletFilter; import org.waveprotocol.box.common.comms.WaveClientRpc.ProtocolAuthenticate; import org.waveprotocol.box.common.comms.WaveClientRpc.ProtocolAuthenticationResult; @@ -55,7 +50,6 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.name.Named; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.protobuf.Descriptors; import com.google.protobuf.Descriptors.MethodDescriptor; import com.google.protobuf.Message; @@ -63,13 +57,11 @@ import com.google.protobuf.Service; import com.google.protobuf.UnknownFieldSet; -import de.spieleck.servlets.ProxyServlet; - /** * ServerRpcProvider can provide instances of type Service over an incoming * network socket and service incoming RPCs to these services and their methods. - * - * + * + * */ public class CustomServerRpcProvider { abstract class Connection implements ProtoCallback { @@ -321,7 +313,7 @@ /** * Construct a new ServerRpcProvider, hosting on the specified WebSocket * addresses. - * + * * Also accepts an ExecutorService for spawning managing threads. */ public CustomServerRpcProvider(final InetSocketAddress[] httpAddresses, final Integer flashsocketPolicyPort, @@ -359,7 +351,7 @@ /** * Add a servlet to the servlet registry. This servlet will be attached to * the specified URL pattern when the server is started up. - * + * * @param urlPattern * URL pattern for paths. Eg, '/foo', '/foo/*' * @param servlet @@ -432,58 +424,15 @@ if (jettySessionManager != null) { context.getSessionHandler().setSessionManager(jettySessionManager); } - context.setResourceBase(resourceBase); + final ResourceCollection resources = new ResourceCollection(new String[] { "src/main/webapp", resourceBase, }); + context.setBaseResource(resources); context.setContextPath(baseUrl); - context.setWar(baseUrl); + context.setParentLoaderPriority(true); context.setDescriptor("WEB-INF/web.xml"); - final ServletHolder httpbindHolder = new ServletHolder(ProxyServlet.class); - httpbindHolder.setInitParameter("remotePath", "/http-bind/"); - httpbindHolder.setInitParameter("remotePort", "5280"); - context.addServlet(httpbindHolder, "/http-bind/"); - - context.addEventListener(new ServletContextListener() { - - @Override - public void contextDestroyed(final ServletContextEvent sce) { - } - - @Override - public void contextInitialized(final ServletContextEvent sce) { - final ServletContext context = sce.getServletContext(); - context.setAttribute("jruby.standalone", "true"); - context.setAttribute("rails.root", "/WEB-INF/publicspace/"); - context.setAttribute("files.prefix", "/WEB-INF/publicspace/public"); - context.setAttribute("rails.env", "production"); - context.setAttribute("jruby.max.runtimes", "1"); - context.setAttribute("public.root", "/public/"); - } - }); - - context.addEventListener(new RackServletContextListener()); - // final FilterHolder rubyRack = new - // FilterHolder(org.jruby.rack.rails.RailsServletContextListener.class); - // rubyRack.setFilter(new RackFilter()); - - // context.getInitParameter("rails.root"); - - context.addFilter(RackFilter.class, "/public/*", 0); - - context.addEventListener(new GuiceServletContextListener() { - @Override - protected Injector getInjector() { - return injector; - } - }); context.setAttribute(RackServletFilter.INJECTOR_PARENT_ATTRIBUTE, injector); - final FilterHolder filterHolder = new FilterHolder(RackServletFilter.class); - filterHolder.setInitParameter("org.ourproject.kune.rack.RackModule", - "org.ourproject.kune.app.server.KuneRackModule"); - context.addFilter(filterHolder, "/ws/*", 0); - // context.addFilter(GuiceFilter.class, "/*", 0); - // Servlet where the websocket connection is served from. final ServletHolder wsholder = new ServletHolder(new WaveWebSocketServlet()); context.addServlet(wsholder, "/socket"); Deleted: trunk/src/main/java/cc/kune/wave/server/JettyModule.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/JettyModule.java 2011-02-26 10:20:40 UTC (rev 1264) +++ trunk/src/main/java/cc/kune/wave/server/JettyModule.java 2011-02-26 19:48:11 UTC (rev 1265) @@ -1,3 +0,0 @@ -package cc.kune.wave.server; - - Modified: trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml 2011-02-26 10:20:40 UTC (rev 1264) +++ trunk/src/main/webapp/WEB-INF/web.xml 2011-02-26 19:48:11 UTC (rev 1265) @@ -19,48 +19,48 @@ <welcome-file>ws.html</welcome-file> </welcome-file-list>  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +    <context-param> @@ -117,42 +117,42 @@    - - - - - - - - - - - - - - - - - - - - - + <servlet> + <servlet-name>Proxy</servlet-name> + <servlet-class>de.spieleck.servlets.ProxyServlet</servlet-class> + <init-param> + <param-name>remotePath</param-name> + <param-value>/http-bind/</param-value> + </init-param> + <init-param> + <param-name>remoteServer</param-name> + <param-value>localhost</param-value> + </init-param> + <init-param> + <param-name>remotePort</param-name> + <param-value>5280</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>Proxy</servlet-name> + <url-pattern>/http-bind/ + </url-pattern> + </servlet-mapping>  - - - - - - - - - - - - - - + <filter> + <filter-name>rack</filter-name> + <filter-class>org.ourproject.kune.rack.RackServletFilter</filter-class> + <init-param> + <param-name>org.ourproject.kune.rack.RackModule</param-name> + <param-value> + org.ourproject.kune.app.server.KuneRackModule + </param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>rack</filter-name> + <url-pattern>/ws/*</url-pattern> + </filter-mapping>

1 0

r1264 - in trunk: img img/icons src/main/java/cc/kune/core/public src/main/java/cc/kune/core/public/images
by Vicente J. Ruiz Jurado 26 Feb '11

26 Feb '11

Author: vjrj_ Date: 2011-02-26 11:20:40 +0100 (Sat, 26 Feb 2011) New Revision: 1264 Added: trunk/img/icons/spliter-top.gif trunk/img/icons/spliter-top.png trunk/src/main/java/cc/kune/core/public/images/spliter-top.png Modified: trunk/img/icons-base.svg trunk/src/main/java/cc/kune/core/public/ws.css Log: a bottom spliter Added: trunk/img/icons/spliter-top.gif =================================================================== (Binary files differ) Property changes on: trunk/img/icons/spliter-top.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/spliter-top.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/spliter-top.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/img/icons-base.svg =================================================================== --- trunk/img/icons-base.svg 2011-02-25 01:11:55 UTC (rev 1263) +++ trunk/img/icons-base.svg 2011-02-26 10:20:40 UTC (rev 1264) @@ -29,8 +29,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="137.00004" - inkscape:cy="507.00023" + inkscape:cx="71" + inkscape:cy="807.5" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="1278" @@ -2894,149 +2894,167 @@ y="328.36218" /> </g> </g> + <rect + style="color:#000000;fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3602" + width="4.4210529" + height="21" + x="68.789474" + y="234.36218" + ry="1" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/splitter-top.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> <g - inkscape:export-ydpi="90" + id="g6583" + transform="matrix(1.1052632,0,0,1.1052632,-404.26316,-126.35392)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/splitter-top.png" inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/splitter-vert-bar.png" - id="g6617"> - <g - id="g6583"> - <rect - y="327.36218" - x="429" - height="2" - width="2" - id="rect6439" - style="fill:#999999;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <rect - y="328.36218" - x="430" - height="1" - width="1" - id="rect6441" - style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - <use - x="0" - y="0" - xlink:href="#g6583" - id="use6587" - transform="translate(0,5)" - width="744.09448" - height="1052.3622" /> - <use - height="1052.3622" - width="744.09448" - transform="translate(0,10)" - id="use6589" - xlink:href="#g6583" - y="0" - x="0" /> - <use - x="0" - y="0" - xlink:href="#g6583" - id="use6591" - transform="translate(0,15)" - width="744.09448" - height="1052.3622" /> - <use - height="1052.3622" - width="744.09448" - transform="translate(0,20)" - id="use6593" - xlink:href="#g6583" - y="0" - x="0" /> - <use - x="0" - y="0" - xlink:href="#g6583" - id="use6595" - transform="translate(0,25)" - width="744.09448" - height="1052.3622" /> - <use - height="1052.3622" - width="744.09448" - transform="translate(0,30)" - id="use6597" - xlink:href="#g6583" - y="0" - x="0" /> - <use - height="1052.3622" - width="744.09448" - transform="translate(0,35)" - id="use6599" - xlink:href="#g6583" - y="0" - x="0" /> - <use - x="0" - y="0" - xlink:href="#g6583" - id="use6601" - transform="translate(0,40)" - width="744.09448" - height="1052.3622" /> - <use - height="1052.3622" - width="744.09448" - transform="translate(0,45)" - id="use6603" - xlink:href="#g6583" - y="0" - x="0" /> - <use - x="0" - y="0" - xlink:href="#g6583" - id="use6605" - transform="translate(0,50)" - width="744.09448" - height="1052.3622" /> - <use - height="1052.3622" - width="744.09448" - transform="translate(0,55)" - id="use6607" - xlink:href="#g6583" - y="0" - x="0" /> - <use - x="0" - y="0" - xlink:href="#g6583" - id="use6609" - transform="translate(0,60)" - width="744.09448" - height="1052.3622" /> - <use - height="1052.3622" - width="744.09448" - transform="translate(0,65)" - id="use6611" - xlink:href="#g6583" - y="0" - x="0" /> - <use - x="0" - y="0" - xlink:href="#g6583" - id="use6613" - transform="translate(0,70)" - width="744.09448" - height="1052.3622" /> - <use - height="1052.3622" - width="744.09448" - transform="translate(0,75)" - id="use6615" - xlink:href="#g6583" - y="0" - x="0" /> + inkscape:export-ydpi="90"> + <rect + style="fill:#999999;fill-opacity:1;stroke:none" + id="rect6439" + width="2" + height="2" + x="429" + y="327.36218" /> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:none" + id="rect6441" + width="1" + height="1" + x="430" + y="328.36218" /> </g> + <use + height="1052.3622" + width="744.09448" + transform="translate(0,5.5263158)" + id="use6587" + xlink:href="#g6583" + y="0" + x="0" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/splitter-top.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <use + x="0" + y="0" + xlink:href="#g6583" + id="use6589" + transform="translate(0,11.052632)" + width="744.09448" + height="1052.3622" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/splitter-top.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <use + height="1052.3622" + width="744.09448" + transform="translate(0,16.578948)" + id="use6591" + xlink:href="#g6583" + y="0" + x="0" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/splitter-top.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <use + x="0" + y="0" + xlink:href="#g6583" + id="use6593" + transform="translate(-16.999997,22)" + width="744.09448" + height="1052.3622" /> + <use + height="1052.3622" + width="744.09448" + transform="translate(-16.999997,27)" + id="use6595" + xlink:href="#g6583" + y="0" + x="0" /> + <use + x="0" + y="0" + xlink:href="#g6583" + id="use6597" + transform="translate(-16.999997,32)" + width="744.09448" + height="1052.3622" /> + <use + x="0" + y="0" + xlink:href="#g6583" + id="use6599" + transform="translate(-16.999997,37)" + width="744.09448" + height="1052.3622" /> + <use + height="1052.3622" + width="744.09448" + transform="translate(-16.999997,42)" + id="use6601" + xlink:href="#g6583" + y="0" + x="0" /> + <use + x="0" + y="0" + xlink:href="#g6583" + id="use6603" + transform="translate(-16.999997,47)" + width="744.09448" + height="1052.3622" /> + <use + height="1052.3622" + width="744.09448" + transform="translate(-16.999997,52)" + id="use6605" + xlink:href="#g6583" + y="0" + x="0" /> + <use + x="0" + y="0" + xlink:href="#g6583" + id="use6607" + transform="translate(-16.999997,57)" + width="744.09448" + height="1052.3622" /> + <use + height="1052.3622" + width="744.09448" + transform="translate(-16.999997,62)" + id="use6609" + xlink:href="#g6583" + y="0" + x="0" /> + <use + x="0" + y="0" + xlink:href="#g6583" + id="use6611" + transform="translate(-16.999997,67)" + width="744.09448" + height="1052.3622" /> + <use + height="1052.3622" + width="744.09448" + transform="translate(-16.999997,72)" + id="use6613" + xlink:href="#g6583" + y="0" + x="0" /> + <use + x="0" + y="0" + xlink:href="#g6583" + id="use6615" + transform="translate(-16.999997,77)" + width="744.09448" + height="1052.3622" /> <g transform="translate(487,-9)" id="g14270"> @@ -4674,11 +4692,11 @@ <image sodipodi:absref="/home/vjrj/proyectos/dev/kune/trunk/img/icons/lock_break.png" xlink:href="icons/lock_break.png" - width="16" + y="450.82797" + x="330.84604" + id="image2972" height="16" - id="image2972" - x="330.84604" - y="450.82797" /> + width="16" /> <use x="0" y="0" @@ -4769,12 +4787,12 @@ <image sodipodi:absref="/home/vjrj/proyectos/dev/kune/trunk/img/icons/lock_break.png" xlink:href="icons/lock_break.png" - transform="scale(-1,1)" + y="432.36218" + x="-371" + id="image3958" + height="16" width="16" - height="16" - id="image3958" - x="-371" - y="432.36218" /> + transform="scale(-1,1)" /> <g id="g3962" transform="translate(-43.509019,-21.462476)"> Added: trunk/src/main/java/cc/kune/core/public/images/spliter-top.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/spliter-top.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-25 01:11:55 UTC (rev 1263) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-26 10:20:40 UTC (rev 1264) @@ -329,7 +329,7 @@ .gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger { background-color: white; - background: none; + background: url("images/spliter-top.png") no-repeat scroll center bottom white; cursor: col-resize; }

1 0

r1263 - in trunk: . img/icons script src/main/java/cc/kune/core/client/resources src/main/java/cc/kune/core/public/images src/main/java/org/ourproject/kune/app src/main/java/org/ourproject/kune/workspace
by Vicente J. Ruiz Jurado 25 Feb '11

25 Feb '11

Author: vjrj_ Date: 2011-02-25 02:11:55 +0100 (Fri, 25 Feb 2011) New Revision: 1263 Added: trunk/img/icons/unknown-60.png trunk/img/icons/unknown-gen.png trunk/src/main/java/cc/kune/core/client/resources/unknown-60.png Modified: trunk/TODO trunk/img/icons/person.svg trunk/script/kune client -no-server.launch trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java trunk/src/main/java/cc/kune/core/public/images/unknown.jpg trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml Log: NEW - # 25: Social Net refactorization http://kune.ourproject.org/issues/ticket/25 Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-02-24 23:07:55 UTC (rev 1262) +++ trunk/TODO 2011-02-25 01:11:55 UTC (rev 1263) @@ -11,6 +11,9 @@ Use org-mode in emacs to easy manage this file * SHORT-TERM (URGENT) +** TODO style injection: + http://www.hunlock.com/blogs/Howto_Dynamically_Insert_Javascript_And_CSS + https://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/f4c… ** >> Delete host/room conf in ws.html ** >> kune.properties from cmd line ** HelloWord with samples of extensions: sitebar, sitebar options menu, siteuseroptions, sn, ... @@ -32,6 +35,8 @@ [ ] src/org/waveprotocol/box/server/ServerMain.java [ ] pom.xml dep references ** Update Dev Guide +*** mvn compile && mvn gwt:compile +*** hosted mode, whe war selection target/kune-VERSION *** Increase open files limit /etc/security/limits.conf #I adjusted this so kune will work with more java files Modified: trunk/img/icons/person.svg =================================================================== --- trunk/img/icons/person.svg 2011-02-24 23:07:55 UTC (rev 1262) +++ trunk/img/icons/person.svg 2011-02-25 01:11:55 UTC (rev 1263) @@ -1,20 +1,23 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?>  + <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="210mm" height="297mm" id="svg3567" sodipodi:version="0.32" - inkscape:version="0.46" + inkscape:version="0.48.0 r9654" sodipodi:docname="person.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.1"> <defs id="defs3569"> <inkscape:perspective @@ -40,15 +43,16 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="380.83857" - inkscape:cy="884.33083" + inkscape:cx="578.54963" + inkscape:cy="375.39768" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1270" inkscape:window-height="773" - inkscape:window-x="1280" - inkscape:window-y="25" /> + inkscape:window-x="8" + inkscape:window-y="25" + inkscape:window-maximized="0" /> <metadata id="metadata3572"> <rdf:RDF> @@ -57,6 +61,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> @@ -81,7 +86,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(3.1844753,0,0,3.3202165,480.51643,-696.54479)" /> <path id="path17234" @@ -92,7 +97,7 @@ inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" transform="matrix(1.0508232,1.0517911,-1.0946071,1.0956153,627.39292,-109.63872)" - 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" @@ -109,7 +114,7 @@ inkscape:export-ydpi="90"> <path transform="matrix(3.1844753,0,0,3.3202165,614.65933,-434.25909)" - 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" @@ -147,7 +152,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(3.1844753,0,0,3.3202165,608.65933,-692.76155)" /> <path id="path3630" @@ -167,7 +172,7 @@ inkscape:export-ydpi="90"> <path transform="matrix(3.1844753,0,0,3.3202165,613.65933,-561.26401)" - 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" @@ -205,7 +210,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(3.1844753,0,0,3.3202165,478.73833,-564.33269)" /> <path id="path4478" @@ -216,7 +221,7 @@ inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" transform="matrix(1.0508232,1.0517911,-1.0946071,1.0956153,625.61482,22.573385)" - 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" @@ -242,7 +247,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(3.1844753,0,0,3.3202165,477.73833,-427.33272)" /> <path id="path4486" @@ -253,7 +258,7 @@ inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" transform="matrix(1.0508232,1.0517911,-1.0946071,1.0956153,624.61482,159.57335)" - 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" @@ -270,7 +275,7 @@ inkscape:export-ydpi="90"> <path transform="matrix(3.1844753,0,0,3.3202165,480.51643,-696.54479)" - 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" @@ -293,7 +298,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(1.0508232,1.0517911,-1.0946071,1.0956153,627.39292,-109.63872)" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" inkscape:export-xdpi="90" @@ -307,7 +312,7 @@ inkscape:export-ydpi="90"> <path transform="matrix(3.1844753,0,0,3.3202165,478.73833,-564.33269)" - 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" @@ -330,7 +335,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(1.0508232,1.0517911,-1.0946071,1.0956153,625.61482,22.573385)" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" inkscape:export-xdpi="90" @@ -344,7 +349,7 @@ inkscape:export-ydpi="90"> <path transform="matrix(3.1844753,0,0,3.3202165,477.73833,-427.33272)" - 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" @@ -367,7 +372,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(1.0508232,1.0517911,-1.0946071,1.0956153,624.61482,159.57335)" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" inkscape:export-xdpi="90" @@ -390,7 +395,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(3.1844753,0,0,3.3202165,480.51643,-696.54479)" /> <path id="path4568" @@ -401,7 +406,7 @@ inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" transform="matrix(1.0508232,1.0517911,-1.0946071,1.0956153,627.39292,-109.63872)" - 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" @@ -427,7 +432,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(3.1844753,0,0,3.3202165,478.73833,-564.33269)" /> <path id="path4576" @@ -438,7 +443,7 @@ inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" transform="matrix(1.0508232,1.0517911,-1.0946071,1.0956153,625.61482,22.573385)" - 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" @@ -464,7 +469,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(3.1844753,0,0,3.3202165,477.73833,-427.33272)" /> <path id="path4584" @@ -475,7 +480,7 @@ inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" transform="matrix(1.0508232,1.0517911,-1.0946071,1.0956153,624.61482,159.57335)" - 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" @@ -501,7 +506,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(3.1844753,0,0,3.3202165,614.65933,-434.25909)" /> <path id="path4592" @@ -521,7 +526,7 @@ inkscape:export-ydpi="90"> <path transform="matrix(3.1844753,0,0,3.3202165,608.65933,-692.76155)" - 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" @@ -559,7 +564,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(3.1844753,0,0,3.3202165,613.65933,-561.26401)" /> <path id="path4608" @@ -579,7 +584,7 @@ inkscape:export-ydpi="90"> <path transform="matrix(3.1844753,0,0,3.3202165,614.65933,-434.25909)" - 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" @@ -617,7 +622,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(3.1844753,0,0,3.3202165,608.65933,-692.76155)" /> <path id="path4624" @@ -637,7 +642,7 @@ inkscape:export-ydpi="90"> <path transform="matrix(3.1844753,0,0,3.3202165,613.65933,-561.26401)" - 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" @@ -675,7 +680,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(3.1844753,0,0,3.3202165,608.65933,-692.76155)" /> <path id="path2501" @@ -715,7 +720,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(3.1844753,0,0,3.3202165,608.65933,-692.76155)" /> <path id="path2470" @@ -728,5 +733,1058 @@ sodipodi:nodetypes="csssc" /> </g> </g> + <image + y="428.36218" + x="11" + id="image3279" + xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0a +HBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIy +MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABkAGQDASIA +AhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQA +AAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3 +ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWm +p6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEA +AwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSEx +BhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElK +U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3 +uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iii +gAooooAKY7rGpZ2Cj1JxWZqmqfZAYoQDLjknoo9ff6Vzsksksu+RmdiTgk5IH9KuMG9SHNJ2OxS7 +t5DtSeJm9A4JqeuAkQFeeTn86bZ67d6VMAXMttnDRk5x9Cen8v5hunbYFPueg0VXtbmK8to7iFw0 +bjKkVYrMsKKKKACiiigAooooASmSyLFE8jfdVST9AKkqjqr+Xpk59QB+ZA/rQtxM5WSVppXlc5Zi +SeeB7e1M5ySSDx+VAIx1PToKDyTxj6iuowGuODxkkevSsm+HBHBPt2rWkPB4zwayb08Ec/lQxo3v +A98xe50+RjgASxg9hnDfqR+tdrXmXhCUp4ngUDiRXQ8+ik/j0Fem1zzWprHYKKKKkoKKKKACiiig +AqnqieZps6+ilvy5/pVymSIJI2RujAgj60LRiZw579h/OgnoScDHAFDApIyMCHUkN7GkJGB06+vT +/GuowGSnCEDIH0rFvXySMkjPY9K0rqXg9ck81hXMm44BwPek2M2fBsYl8SRt/wA80duvTIx/WvSx +XDeAbbMt5dEYAVY1Prnk/wAh+ddzWE3qax2CiiipKCiiigAooooAKKKKAOL8QQGx1IygHy58sMDo +3cf1/Gsh7sADnt0B6V3er2UF9p8sNwwRfvCQn7hHQ15XK7xyFCc4OMjoa3hLQyktSzc3OSew+tZ5 +JcjHJz6fp70E5JyMn3NdH4MsbS81NpZ5EMkADRxHALH+97gfzIP1G7K4Ja2Ox8OaadL0aGCQYmb9 +5J/vHt+AwPwrXNFJWD1NRaKKKACiiigAoo7VSvr9LKIMRuduFUd6EribLbMEUsxAA6knisu71y3g +ysX71/Y4X8+/4ZrBub2e7YtMxIB4UHAH4f1qD19cdMVtGn3Ic+xLfXlxfZEj/KOQo+6P8awbu0yT +gcVs4Bzkkk+9RtGrk9CMHv1rSySsiLtnLNAwONpwT370+CGVZQ6MyuDlShIII7gjp9a3mtFJJwMC +nR2ip2ANKwGxpPiK4WNYr8GUY/1q8MPqOn+e9dJb3cF2m6CVXHcA4I+o6iuLVAFHtTGDKwdGZWBy +GU4I+hFQ6aexam+p6BRXH6X4meKZbfUG3RkgLMeCp/2vUe/866+smmty077C0UUUhiZwMnpXHX10 +by6eTtnCj2H8v/r10uqS+Tp0zDqV2/mcVyJOBwCTjsela0l1M5voB4AGMnPbvQAc4GRkY5/zxSYx +xwCBSnggDk/yrYzADgdScdh0oPAPTpQc4POKOAcZJP8AKgAI5PA6dqTqAegzwAOv+NL256+nrRwA +ACSfYUABxk8frTWAK46nH+fpTiMEdc5/KkY/KcZJx2PSgDKvkwDwM57d66zwhqZvNOa1kJMtsQuT +3U9PywR+ArlrwYUjjIHNS+ErkweJI4x92ZGRvbjI/UD86zmrouL1PSaKKKwNTK14/wCgKPWQA/ka +5odvpRRW9LYxnuIOh/GjFFFaEinv9f6U0nCgiiigBcdKF+YjNFFAAOWx7Udh9KKKAM27+4341U0p +jHr9gV4JuIx+bYooqHsyo7nrFFFFc5sf/9k= +" + height="100" + width="100" /> + <g + id="g3310" + transform="translate(635,338)"> + <path + style="fill:#dce2e8" + d="m 15.652276,526.89841 c -0.610306,-1.59043 1.679869,-11.36996 3.481806,-14.86804 3.193736,-6.19997 6.408908,-8.92653 16.688018,-14.15192 15.103201,-7.67772 14.080467,-6.32495 10.351016,-13.69128 -14.619009,-28.87514 0.626491,-58.97154 24.060007,-47.49727 13.579837,6.6494 16.194478,31.36184 5.166481,48.83132 C 74.079822,487.61189 73,489.56197 73,489.85473 c 0,0.96965 10.409081,7.10101 16,9.42463 10.938874,4.54628 20.11609,18.84024 17.46298,27.19945 -0.81757,2.57596 -89.82541,2.98723 -90.810704,0.4196 z" + id="path3334" + inkscape:connector-curvature="0" /> + <path + style="fill:#d4dbe2" + d="m 16,527.9114 c 0,-12.82229 7.444121,-22.89231 22.182697,-30.00761 12.879762,-6.21793 12.949565,-6.32177 9.035801,-13.4409 -14.220674,-25.86739 -1.36795,-55.39011 20.882279,-47.9666 14.595085,4.86946 18.104408,32.01735 6.356458,49.17313 -2.031924,2.96726 -2.353004,4.11342 -1.455316,5.19507 2.007816,2.41927 10.29052,7.29999 16.261866,9.58257 C 98.567144,504.00332 106,514.86317 106,524.89969 c 0,3.46249 0,3.46249 -45,3.46249 -24.75,0 -45,-0.20285 -45,-0.45078 z" + id="path3332" + inkscape:connector-curvature="0" /> + <path + style="fill:#c9cfd7" + d="m 16.456704,526.61441 c 0.368875,-0.96127 1.119209,-3.83918 1.667409,-6.39535 2.216133,-10.33347 6.136986,-14.70774 18.826133,-21.00325 14.555889,-7.22166 14.803417,-7.54851 10.923343,-14.42362 -9.684632,-17.16023 -7.20029,-40.63993 4.92623,-46.55817 22.784152,-11.11959 37.313196,18.96264 22.150804,45.86301 C 73.327781,486.9762 72,489.7139 72,490.18081 c 0,1.40694 10.137395,7.90103 15.78241,10.11034 9.778791,3.82716 13.64453,8.03488 16.63576,18.10744 3.27247,11.01959 7.88554,9.96359 -43.525159,9.96359 -42.526253,0 -45.068616,-0.1 -44.436307,-1.74777 z" + id="path3330" + inkscape:connector-curvature="0" /> + <path + style="fill:#b6c5d8" + d="m 17.373092,526.61218 c 0.279327,-0.9625 1.031608,-3.77247 1.671735,-6.24438 2.783906,-10.75028 5.91216,-14.19465 18.510886,-20.3814 14.312213,-7.02817 14.766578,-7.73334 10.45997,-16.23375 -9.151893,-18.06407 -4.861359,-45.39047 7.126784,-45.39047 1.093959,0 2.932921,-0.50516 4.086582,-1.12258 17.687459,-9.46604 28.608915,25.64678 14.765412,47.47125 -2.432458,3.83481 -2.830287,5.14422 -1.902558,6.26207 2.544299,3.06569 11.034196,8.55209 15.595883,10.07848 10.544154,3.52818 15.517054,10.12038 17.773324,23.56078 0.62952,3.75 0.62952,3.75 -43.983185,3.75 -42.015093,0 -44.583129,-0.10189 -44.104833,-1.75 z" + id="path3328" + inkscape:connector-curvature="0" /> + <path + style="fill:#b4c3d5" + d="m 18.625,527.56443 c -0.271169,-0.43876 -0.07962,-1.45126 0.42567,-2.25 0.717286,-1.13386 0.922062,-0.95895 0.934017,0.79775 0.01574,2.31303 -0.49232,2.85568 -1.359687,1.45225 z M 56,527.42433 c 0,-0.51582 0.868825,-0.87241 1.930722,-0.79241 1.061897,0.08 1.710339,0.50202 1.440983,0.93785 C 58.686419,528.67858 56,528.5627 56,527.42433 z m 7.696917,-0.45528 c -0.409197,-1.04122 -0.508402,-2.12872 -0.220456,-2.41666 0.91206,-0.91206 1.714561,0.58256 1.332392,2.48152 -0.350243,1.74033 -0.403729,1.73721 -1.111936,-0.0649 z M 90.5,526.36218 c -0.591982,-1.86517 -1.736214,-2.47275 -3.897148,-2.06937 -0.493432,0.0921 -0.155932,-0.96377 0.75,-2.3464 1.83229,-2.79643 2.167845,-5.58423 0.672148,-5.58423 -0.540872,0 -0.718644,-1.28178 -0.399256,-2.87872 0.692849,-3.46424 -1.332361,-5.24299 -3.1458,-2.76296 -1.080063,1.47707 -1.357435,1.49422 -2.47074,0.15277 -0.689752,-0.8311 -2.128577,-1.51109 -3.19739,-1.51109 -1.068813,0 -2.769543,-0.44219 -3.779399,-0.98265 -1.551676,-0.83043 -1.753393,-0.66637 -1.302178,1.05908 0.390745,1.49421 -0.0383,2.19137 -1.599905,2.59974 -1.278027,0.33421 -2.433926,1.71612 -2.882081,3.4456 -0.926234,3.57446 -2.640327,3.80366 -3.064627,0.4098 -0.239509,-1.91577 0.273933,-2.75503 2.113306,-3.45436 1.336324,-0.50807 2.68336,-1.89384 2.993412,-3.07948 0.451486,-1.72648 0.229815,-2.01748 -1.113305,-1.46147 -5.685387,2.35358 -8.400394,2.32578 -10.656986,-0.10913 -2.239511,-2.41647 -2.239511,-2.41647 -5.128955,0.26138 -2.847928,2.63937 -5.360813,0.88121 -2.63559,-1.84402 1.780268,-1.78026 -1.938125,-7.92517 -4.444221,-7.34438 -3.615262,0.83783 -3.517367,-1.10555 0.198459,-3.93974 4.186314,-3.19306 4.282774,-4.3519 0.84984,-10.20976 -3.029424,-5.16932 -5.077383,-19.22645 -3.004036,-20.61961 0.806655,-0.54203 0.627922,-1.16489 -0.605548,-2.11025 -3.325028,-2.54837 -2.212109,-5.47361 1.355956,-3.56404 2.689657,1.43946 9.562135,-2.54678 7.881678,-4.57161 -1.614969,-1.94592 0.543446,-2.81116 2.39466,-0.95995 1.932595,1.9326 0.234654,6.47485 -2.420364,6.47485 -2.390146,0 -4.051441,2.23713 -2.965777,3.99377 0.740689,1.19846 1.218594,1.12186 2.987344,-0.47884 3.406254,-3.08261 7.063255,-3.27149 3.920021,-0.20246 -1.321935,1.29073 -3.198156,2.63706 -4.169381,2.99186 -1.463856,0.53475 -1.653838,1.37626 -1.110841,4.92037 1.036819,6.76728 2.913385,6.57626 2.640423,-0.26877 -0.134821,-3.38089 0.142221,-3.95593 1.905896,-3.95593 1.571318,0 1.938872,0.47715 1.540636,2 -0.287656,1.1 -0.115141,2 0.383369,2 0.498509,0 0.96263,-0.45 1.03138,-1 0.238805,-1.91044 0.467909,-2.51699 2.115671,-5.60124 1.187834,-2.22337 1.350686,-3.4074 0.575302,-4.18279 -0.621603,-0.6216 -0.749078,-1.85432 -0.299757,-2.89875 1.303858,-3.03077 1.124261,-9.3161 -0.266216,-9.31669 -1.489085,-6.3e-4 -1.676094,-2.61915 -0.25,-3.50053 2.022248,-1.24982 1.004309,-3.5 -1.583333,-3.5 -1.628176,0 -2.425149,-0.46217 -2.155505,-1.25 0.8577,-2.50597 12.235836,-1.56907 15.262791,1.25676 9.369225,8.74672 9.558066,30.04723 0.394255,44.47037 -3.908079,6.15102 3.276749,13.99627 15.520797,16.94746 8.108519,1.9544 13.904595,10.2116 16.022105,22.82541 0.75747,4.5122 -13.553142,6.18611 -14.96111,1.75 z m -6.090775,-20.1003 c -1.883722,-2.0815 -5.196659,-3.05266 -5.996842,-1.75793 -1.215823,1.96724 0.488687,3.45823 3.953475,3.45823 3.308319,0 3.464506,-0.12996 2.043367,-1.7003 z M 49,465.80316 c 0,-0.85746 -0.45,-1.2809 -1,-0.94098 -0.55,0.33992 -1,1.04148 -1,1.55902 0,0.51754 0.45,0.94098 1,0.94098 0.55,0 1,-0.70156 1,-1.55902 z m -10.772141,57.4647 c 2.492459,-3.37124 5.498463,-4.13134 3.801947,-0.96137 -1.115671,2.08465 -2.792239,3.38743 -4.740006,3.68324 -0.667664,0.1014 -0.247131,-1.11882 0.938059,-2.72187 z m 15.267776,1.08726 c -0.34232,-0.55389 0.10053,-1.28448 0.984111,-1.62354 1.914649,-0.73472 2.981717,0.0749 2.061373,1.56407 -0.830379,1.34358 -2.234909,1.371 -3.045484,0.0595 z m 17.198218,0.36758 c -0.925629,-0.92563 0.189072,-2.36052 1.833779,-2.36052 0.842134,0 1.177876,0.60386 0.833994,1.5 -0.610368,1.59059 -1.613974,1.91432 -2.667773,0.86052 z M 24,522.37361 c 0,-1.24034 3.17723,-5.01143 4.222241,-5.01143 1.216405,0 0.911488,3.46627 -0.422241,4.8 -1.450736,1.45074 -3.8,1.58145 -3.8,0.21143 z m 56,-0.51143 c 0,-0.825 0.45,-1.5 1,-1.5 0.55,0 1,0.675 1,1.5 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-0.675 -1,-1.5 z m -47.8,-2.7 c -1.563834,-1.56383 -1.523926,-3.97474 0.102613,-6.19917 1.129249,-1.54434 1.463614,-1.58743 2.512331,-0.32381 0.959725,1.1564 0.897189,1.717 -0.302613,2.71275 -1.953977,1.62165 -1.932441,3.01023 0.04669,3.01023 0.857459,0 1.280902,0.45 0.940983,1 -0.818297,1.32403 -1.837753,1.26225 -3.3,-0.2 z m 17.043786,-0.05 c 0.225748,-0.6875 1.725748,-1.37269 3.333333,-1.52264 2.788155,-0.26007 2.833407,-0.20246 0.981751,1.25 -2.346126,1.84032 -4.882473,2.00058 -4.315084,0.27264 z m 28.413426,-2.29909 c 0.680432,-1.77318 3.471169,-1.56926 4.093255,0.29909 0.260434,0.78218 -0.538884,1.25 -2.135749,1.25 -1.8935,0 -2.398572,-0.39969 -1.957506,-1.54909 z M 21,516.4212 c 0,-0.51754 0.45,-1.2191 1,-1.55902 0.55,-0.33992 1,0.0835 1,0.94098 0,0.85746 -0.45,1.55902 -1,1.55902 -0.55,0 -1,-0.42344 -1,-0.94098 z m 16.647568,-4.24293 c -0.841403,-3.14186 -0.799742,-3.81609 0.235801,-3.81609 1.240865,0 2.226771,4.28986 1.217791,5.29884 -0.458333,0.45833 -1.11245,-0.20891 -1.453592,-1.48275 z m 4.591902,-1.82793 c 0.691029,-1.10652 1.819842,-1.79564 2.508473,-1.53139 C 45.436575,509.0832 46,508.86353 46,508.3308 c 0,-0.53274 0.675,-0.96862 1.5,-0.96862 2.212109,0 1.824239,2.10245 -0.5,2.71025 -1.1,0.28766 -2,0.92053 -2,1.40638 0,0.48585 -0.903813,0.88337 -2.008474,0.88337 -1.762089,0 -1.854346,-0.2468 -0.752056,-2.01184 z M 33,506.77885 c 0,-1.42084 0.48375,-2.42209 1.075,-2.225 0.59125,0.19708 1.04125,0.68458 1,1.08333 -0.04125,0.39875 -0.075,1.4 -0.075,2.225 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-1.1625 -1,-2.58333 z m -5.429973,0.69664 c -0.606232,-0.98091 2.181599,-3.69502 2.977678,-2.89894 0.706368,0.70637 -0.591568,3.78563 -1.595677,3.78563 -0.458697,0 -1.080597,-0.39901 -1.382001,-0.88669 z M 44,453.4212 c 0,-1.06754 0.45,-2.2191 1,-2.55902 0.55,-0.33992 1,-0.17828 1,0.3592 0,0.53747 0.273145,1.68903 0.606989,2.55901 0.398311,1.03799 0.05452,1.58179 -1,1.58179 C 44.682954,455.36218 44,454.53728 44,453.4212 z m 7,-4.85902 c 0,-3.04736 4.537474,-4.07671 5.289749,-1.2 0.434416,1.66121 0.03068,2 -2.383369,2 -1.598509,0 -2.90638,-0.36 -2.90638,-0.8 z m -1,-5.82423 c 0,-2.86866 6.434447,-5.29196 7.396256,-2.78553 0.909842,2.37101 -0.318374,3.71929 -2.066485,2.26848 -1.165167,-0.967 -1.912674,-0.97579 -3.410972,-0.0401 C 50.863459,442.83989 50,443.0906 50,442.73795 z" + id="path3326" + inkscape:connector-curvature="0" /> + <path + style="fill:#b3bcc9" + d="m 92,525.56218 c 0,-1.54 -0.527793,-3.32779 -1.172874,-3.97287 -0.855295,-0.8553 -0.884251,-1.80634 -0.106941,-3.51235 1.75157,-3.84427 -0.705254,-11.42904 -4.802674,-14.82692 -4.086046,-3.38846 -2.898331,-3.60091 4.550449,-0.81396 13.71103,5.12995 20.56433,25.9261 8.543858,25.9261 -7.011818,0 -7.011818,0 -7.011818,-2.8 z M 59.910502,504.75434 c -0.635465,-0.76569 -1.955842,-1.39216 -2.934171,-1.39216 -0.978329,0 -2.708052,-1.575 -3.84383,-3.5 -1.135778,-1.925 -2.755227,-3.5 -3.598776,-3.5 -1.951918,0 -1.967601,-1.39503 -0.03372,-3 2.076834,-1.72362 1.890939,-3.35723 -1,-8.78785 -4.069166,-7.64391 -3.455289,-10.71763 1.420545,-7.11277 5.169207,3.82176 11.750544,-2.46804 15.52335,-14.83571 1.370596,-4.49296 0.796129,-18.89883 -0.883128,-22.14616 -1.612127,-3.11751 -1.612127,-3.11751 1.26567,-3.11751 14.78876,0 19.89294,27.79836 8.559878,46.61877 -3.518421,5.84292 -3.518421,5.84292 2.297632,11.07309 3.521616,3.16687 5.178879,5.24555 4.200912,5.26916 -0.888328,0.0214 -2.688328,0.8515 -4,1.84459 -4.749564,3.59595 -14.858241,5.13632 -16.974357,2.58655 z" + id="path3324" + inkscape:connector-curvature="0" /> + <path + style="fill:#a9b6c7" + d="m 92.815054,521.61218 c 0.280763,-4.98157 -0.149325,-8.25644 -1.641625,-12.5 -2.022056,-5.75 -2.022056,-5.75 0.0199,-5.75 4.892222,0 12.116871,11.11379 14.138841,21.75 0.61783,3.25 0.61783,3.25 -6.139863,3.25 -6.757689,0 -6.757689,0 -6.377257,-6.75 z M 57.736081,502.60026 c -4.74666,-2.19188 -8.21023,-7.48361 -6.720339,-10.26749 0.787293,-1.47107 0.578728,-2.8552 -0.859855,-5.70638 -3.780683,-7.49305 -3.71844,-7.75193 1.891408,-7.86675 11.763399,-0.24076 19.607447,-21.36594 14.350292,-38.64746 -1.513683,-4.97583 8.15369,0.5478 11.171092,6.38281 4.79792,9.27815 2.757176,28.21359 -4.135306,38.37023 -3.248042,4.78626 -3.108843,5.61941 1.566627,9.37672 8.383493,6.73716 -5.850701,13.62864 -17.263919,8.35832 z" + id="path3322" + inkscape:connector-curvature="0" /> + <path + style="fill:#a5aeba" + d="m 95,519.94322 c 0,-6.15501 -0.465546,-9.23013 -1.731223,-11.43544 -2.129347,-3.71017 -1.162952,-4.96151 2.153516,-2.78847 3.134773,2.05398 7.071677,8.79205 8.555507,14.64287 0.62768,2.475 1.36978,5.2875 1.64911,6.25 0.44052,1.51793 -0.23044,1.75 -5.05952,1.75 -5.56739,0 -5.56739,0 -5.56739,-8.41896 z M 63,502.21435 c -5.613254,-0.99824 -11,-6.2765 -11,-10.77847 0,-1.62561 -0.40569,-3.2064 -0.901534,-3.51284 -2.70283,-1.67044 -3.10529,-6.77939 -0.482187,-6.12103 12.466652,3.12893 23.836582,-23.06489 17.885689,-41.20469 -1.768008,-5.38933 6.735063,1.04007 9.607989,7.26486 3.853849,8.35016 1.790957,26.18765 -4.142144,35.81645 -3.771821,6.12126 -3.726023,7.00345 0.532187,10.25135 4.268856,3.25601 4.328389,3.95246 0.506787,5.92869 -5.335159,2.75892 -7.429145,3.16975 -12.006787,2.35568 z" + id="path3320" + inkscape:connector-curvature="0" /> + <path + style="fill:#99a5b4" + d="m 97.580726,526.11218 c -0.251559,-1.2375 -0.72938,-5.35305 -1.061826,-9.14566 -0.332446,-3.79262 -1.069261,-7.76418 -1.637367,-8.8257 -0.934152,-1.74548 -0.829324,-1.82107 1.096284,-0.79051 2.819043,1.5087 5.542873,6.12588 6.994333,11.85613 0.64861,2.56066 1.59521,5.43713 2.10357,6.39217 1.39547,2.62165 1.2385,2.76357 -3.05667,2.76357 -3.326202,0 -4.056171,-0.37006 -4.438324,-2.25 z M 60.5,500.40269 c -3.265642,-1.35967 -7.602087,-6.57417 -8.46488,-10.17887 -0.442539,-1.8489 -1.129624,-4.14914 -1.526857,-5.11164 -0.576601,-1.39711 -0.209671,-1.75 1.819649,-1.75 12.357308,0 23.416086,-23.45864 18.741894,-39.7566 -1.195778,-4.16943 -0.0374,-4.10946 3.740804,0.19368 7.79605,8.87921 6.233208,28.06127 -3.573583,43.86154 -1.72735,2.78303 -1.718871,2.81367 1.521988,5.5 6.506488,5.39319 -3.087271,11.06061 -12.259015,7.24189 z" + id="path3318" + inkscape:connector-curvature="0" /> + <path + style="fill:#929ca9" + d="m 100.78845,526.61218 c -2.135149,-2.45575 -3.345892,-15.95753 -1.276991,-14.24049 0.800071,0.664 2.186211,3.746 3.080301,6.84888 0.8941,3.10289 2.03053,6.42911 2.52541,7.39161 0.6997,1.36086 0.48762,1.75 -0.95371,1.75 -1.01942,0 -2.53817,-0.7875 -3.37501,-1.75 z m -43.756084,-31 c -5.277946,-5.08752 -5.842086,-9.34879 -1.362926,-10.29495 10.175676,-2.14947 19.086762,-19.27014 18.092621,-34.76096 -0.486107,-7.57459 -0.486107,-7.57459 1.781461,-4.93839 6.180155,7.18486 4.779027,27.36115 -2.676692,38.54443 -3.503817,5.25559 -3.542145,6.21682 -0.36683,9.19987 3.118955,2.93011 3.114395,3.39903 -0.04705,4.83949 -5.40941,2.46469 -11.183057,1.49515 -15.420584,-2.58949 z" + id="path3316" + inkscape:connector-curvature="0" /> + <path + style="fill:#8a95a3" + d="m 101.70717,525.61218 c -0.2893,-1.5125 -0.13044,-3.425 0.35301,-4.25 0.6049,-1.03225 0.88849,-0.17472 0.90941,2.75 0.0348,4.86979 -0.49702,5.50174 -1.26242,1.5 z m -43.065403,-31 c -4.91445,-3.9769 -5.748541,-5.95905 -2.891767,-6.87206 5.527572,-1.76659 14.25,-8.96693 14.25,-11.76333 0,-0.62933 0.933234,-2.88544 2.073853,-5.01359 2.414595,-4.50511 5.220373,-17.98198 4.375484,-21.01657 -0.461667,-1.65818 -0.368419,-1.7777 0.455976,-0.58445 4.302348,6.22731 1.172547,26.46135 -5.612772,36.28634 -2.614917,3.78635 -2.614917,3.78635 -0.365672,6.82862 1.237084,1.67324 2.097118,3.17093 1.911187,3.3282 -4.208579,3.5597 -8.799793,3.17382 -14.196289,-1.19316 z" + id="path3314" + inkscape:connector-curvature="0" /> + <path + style="fill:#89929e" + d="m 68.553851,495.44931 c -0.369537,-0.59792 -1.542351,-1.08713 -2.606255,-1.08713 -1.842561,0 -1.829965,-0.12007 0.265385,-2.52994 2.199755,-2.52994 2.199755,-2.52994 3.583106,0.11028 1.388266,2.6496 0.236851,5.90001 -1.242236,3.50679 z m -9.192225,-2.58713 c -0.316582,-0.825 -1.202459,-1.5 -1.968615,-1.5 -0.766156,0 -1.393011,-0.45 -1.393011,-1 0,-0.55 0.81,-1 1.8,-1 0.99,0 2.31509,-0.51509 2.944645,-1.14465 0.859526,-0.85952 1.306427,-0.50004 1.794143,1.44317 0.99716,3.973 -1.799649,6.79122 -3.177162,3.20148 z m 8.279576,-8.19213 c -0.380672,-0.38067 0.492512,-1.63673 1.940409,-2.79125 1.907671,-1.52112 2.773627,-3.32052 3.144932,-6.53498 0.281816,-2.43973 1.077686,-4.89617 1.768601,-5.45875 0.690915,-0.56259 1.74847,-1.92289 2.350124,-3.02289 1.570686,-2.87168 1.407159,-0.26284 -0.427266,6.81644 -2.261098,8.72586 -6.159851,13.60838 -8.7768,10.99143 z" + id="path3312" + inkscape:connector-curvature="0" /> + </g> + <g + id="g3284" + transform="translate(405,8)"> + <path + style="fill:#e2e2e2" + d="m 15.652276,526.89841 c -0.610306,-1.59043 1.679869,-11.36996 3.481806,-14.86804 3.193736,-6.19997 6.408908,-8.92653 16.688018,-14.15192 15.103201,-7.67772 14.080467,-6.32495 10.351016,-13.69128 -1.808331,-3.57177 -3.903269,-10.02497 -4.81272,-14.82499 -3.802904,-20.07146 3.324696,-33.30245 18.738022,-34.78348 10.119537,-0.97236 19.91606,7.02874 21.494609,17.55526 1.618903,10.79562 -1.064845,25.26307 -6.193423,33.38726 C 74.079822,487.61189 73,489.56197 73,489.85473 c 0,0.96965 10.409081,7.10101 16,9.42463 9.295086,3.86311 14.72907,10.4495 17.0069,20.61359 2.05966,9.19063 5.88993,8.46923 -44.967299,8.46923 -38.429414,0 -44.905773,-0.20887 -45.387325,-1.46377 z" + id="path3308" + inkscape:connector-curvature="0" /> + <path + style="fill:#dbdbdb" + d="m 16,527.9114 c 0,-2.62657 2.732122,-12.00224 4.531131,-15.54922 3.224552,-6.35763 6.601797,-9.12393 17.651566,-14.45839 5.325484,-2.57097 10.247421,-5.35494 10.937639,-6.18661 1.033808,-1.24566 0.698683,-2.52394 -1.901838,-7.25429 -3.881591,-7.06061 -6.718379,-21.79648 -5.675491,-29.48168 1.619408,-11.93368 9.644411,-19.59005 20.55777,-19.61345 7.387715,-0.0158 14.713124,5.35401 17.636853,12.9286 3.651103,9.45902 1.003751,28.19618 -5.280395,37.37306 -2.031924,2.96726 -2.353004,4.11342 -1.455316,5.19507 2.007816,2.41927 10.29052,7.29999 16.261866,9.58257 3.56871,1.36416 7.045468,3.62191 9.129202,5.92835 C 102.23627,510.62947 106,519.79474 106,524.89969 l 0,3.46249 -45,0 c -24.75,0 -45,-0.20285 -45,-0.45078 z" + id="path3306" + inkscape:connector-curvature="0" /> + <path + style="fill:#cfcfcf" + d="m 16.456704,526.61441 c 0.368875,-0.96127 1.119209,-3.83918 1.667409,-6.39535 0.5482,-2.55616 2.432038,-7.04941 4.186307,-9.98499 2.983817,-4.99309 3.928247,-5.70389 14.639826,-11.01826 6.297636,-3.12447 12.009911,-6.44624 12.693946,-7.38171 1.03745,-1.4188 0.74382,-2.5866 -1.770603,-7.04191 -4.376469,-7.75468 -7.095994,-23.43767 -5.449612,-31.42689 2.463186,-11.95284 9.501326,-17.55924 21.115071,-16.81974 7.964276,0.50713 10.991789,2.52335 14.710952,9.79701 2.287988,4.47467 2.75,6.65685 2.75,12.98883 0,9.19793 -2.084348,17.73107 -6.049377,24.76563 C 73.327781,486.9762 72,489.7139 72,490.18081 c 0,1.40694 10.137395,7.90103 15.78241,10.11034 7.211312,2.82232 9.591432,4.52645 12.53552,8.97527 2.67495,4.04212 5.68207,12.92115 5.68207,16.77726 l 0,2.3185 -45.106989,0 c -42.526253,0 -45.068616,-0.1 -44.436307,-1.74777 z" + id="path3304" + inkscape:connector-curvature="0" /> + <path + style="fill:#c6c6c6" + d="m 17.373092,526.61218 c 0.279327,-0.9625 1.031608,-3.77247 1.671735,-6.24438 2.783906,-10.75028 5.91216,-14.19465 18.510886,-20.3814 C 46.011062,495.83431 51,492.3006 51,490.46369 c 0,-0.45132 -1.342943,-3.47129 -2.984317,-6.71104 -5.128801,-10.12327 -6.705493,-27.78195 -3.190135,-35.729 2.111227,-4.77278 7.331576,-9.66147 10.316919,-9.66147 1.093959,0 2.932921,-0.50516 4.086582,-1.12258 1.560711,-0.83527 3.458214,-0.81809 7.413803,0.0671 10.161194,2.27397 15.406984,12.42788 13.864042,26.83566 -0.940142,8.77891 -2.839688,14.77832 -6.512433,20.56845 -2.432458,3.83481 -2.830287,5.14422 -1.902558,6.26207 2.544299,3.06569 11.034196,8.55209 15.595883,10.07848 10.544154,3.52818 15.517054,10.12038 17.773324,23.56078 l 0.62952,3.75 -44.612705,0 c -42.015093,0 -44.583129,-0.10189 -44.104833,-1.75 z" + id="path3302" + inkscape:connector-curvature="0" /> + <path + style="fill:#c4c4c4" + d="m 18.625,527.56443 c -0.271169,-0.43876 -0.07962,-1.45126 0.42567,-2.25 0.717286,-1.13386 0.922062,-0.95895 0.934017,0.79775 0.01574,2.31303 -0.49232,2.85568 -1.359687,1.45225 z M 56,527.42433 c 0,-0.51582 0.868825,-0.87241 1.930722,-0.79241 1.061897,0.08 1.710339,0.50202 1.440983,0.93785 C 58.686419,528.67858 56,528.5627 56,527.42433 z m 7.696917,-0.45528 c -0.409197,-1.04122 -0.508402,-2.12872 -0.220456,-2.41666 0.91206,-0.91206 1.714561,0.58256 1.332392,2.48152 -0.350243,1.74033 -0.403729,1.73721 -1.111936,-0.0649 z M 78,527.36218 c 0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1 -0.55,0 -1,-0.45 -1,-1 z m 12.5,-1 c -0.591982,-1.86517 -1.736214,-2.47275 -3.897148,-2.06937 -0.493432,0.0921 -0.155932,-0.96377 0.75,-2.3464 1.83229,-2.79643 2.167845,-5.58423 0.672148,-5.58423 -0.540872,0 -0.718644,-1.28178 -0.399256,-2.87872 0.692849,-3.46424 -1.332361,-5.24299 -3.1458,-2.76296 -1.080063,1.47707 -1.357435,1.49422 -2.47074,0.15277 -0.689752,-0.8311 -2.128577,-1.51109 -3.19739,-1.51109 -1.068813,0 -2.769543,-0.44219 -3.779399,-0.98265 -1.551676,-0.83043 -1.753393,-0.66637 -1.302178,1.05908 0.390745,1.49421 -0.0383,2.19137 -1.599905,2.59974 -1.278027,0.33421 -2.433926,1.71612 -2.882081,3.4456 -0.926234,3.57446 -2.640327,3.80366 -3.064627,0.4098 -0.239509,-1.91577 0.273933,-2.75503 2.113306,-3.45436 1.336324,-0.50807 2.68336,-1.89384 2.993412,-3.07948 0.451486,-1.72648 0.229815,-2.01748 -1.113305,-1.46147 -0.92237,0.38184 -3.193636,1.05719 -5.047256,1.50079 -2.863407,0.68527 -3.706997,0.44317 -5.60973,-1.60992 l -2.239511,-2.41647 -2.889444,2.67785 c -2.549303,2.36261 -2.93001,2.4672 -3.23405,0.88845 -0.189534,-0.98417 0.07977,-2.21378 0.59846,-2.73247 0.590756,-0.59075 0.345605,-2.23351 -0.656219,-4.39734 -1.274624,-2.75304 -2.043607,-3.3513 -3.788002,-2.94704 -3.615262,0.83783 -3.517367,-1.10555 0.198459,-3.93974 4.186314,-3.19306 4.282774,-4.3519 0.84984,-10.20976 -3.029424,-5.16932 -5.077383,-19.22645 -3.004036,-20.61961 0.806655,-0.54203 0.627922,-1.16489 -0.605548,-2.11025 -0.9625,-0.73768 -1.75,-2.07913 -1.75,-2.98099 0,-1.92247 0.446593,-2.0063 3.105956,-0.58305 2.689657,1.43946 9.562135,-2.54678 7.881678,-4.57161 -1.614969,-1.94592 0.543446,-2.81116 2.39466,-0.95995 1.235311,1.23531 1.3192,2.03589 0.420105,4.00919 -0.617886,1.35611 -1.896097,2.46566 -2.840469,2.46566 -2.390146,0 -4.051441,2.23713 -2.965777,3.99377 0.740689,1.19846 1.218594,1.12186 2.987344,-0.47884 1.158078,-1.04804 3.054634,-2.05037 4.214567,-2.22739 2.030984,-0.30995 2.020092,-0.23507 -0.294546,2.02493 -1.321935,1.29073 -3.198156,2.63706 -4.169381,2.99186 -1.463856,0.53475 -1.653838,1.37626 -1.110841,4.92037 0.360261,2.35142 0.8174,4.4628 1.015863,4.69197 0.94873,1.0955 1.76649,-1.4016 1.62456,-4.96074 -0.134821,-3.38089 0.142221,-3.95593 1.905896,-3.95593 1.571318,0 1.938872,0.47715 1.540636,2 -0.287656,1.1 -0.115141,2 0.383369,2 0.498509,0 0.96263,-0.45 1.03138,-1 0.238805,-1.91044 0.467909,-2.51699 2.115671,-5.60124 1.187834,-2.22337 1.350686,-3.4074 0.575302,-4.18279 -0.621603,-0.6216 -0.749078,-1.85432 -0.299757,-2.89875 1.303858,-3.03077 1.124261,-9.3161 -0.266216,-9.31669 -1.489085,-6.3e-4 -1.676094,-2.61915 -0.25,-3.50053 2.022248,-1.24982 1.004309,-3.5 -1.583333,-3.5 -1.628176,0 -2.425149,-0.46217 -2.155505,-1.25 0.279683,-0.81716 2.533918,-1.24766 6.509968,-1.24324 5.097039,0.006 6.514701,0.41059 8.752823,2.5 5.258508,4.90913 6.924669,9.62931 6.88084,19.49324 -0.04661,10.49021 -1.957696,17.849 -6.486585,24.97713 l -3.162242,4.97713 4.372017,3.83196 c 4.808226,4.21429 9.794111,7.04966 14.311022,8.13837 8.108519,1.9544 13.904595,10.2116 16.022095,22.82541 l 0.62953,3.75 -7.477929,0 c -6.599667,0 -7.552478,-0.23489 -8.112701,-2 z m -6.090775,-20.1003 c -1.883722,-2.0815 -5.196659,-3.05266 -5.996842,-1.75793 -1.215823,1.96724 0.488687,3.45823 3.953475,3.45823 3.308319,0 3.464506,-0.12996 2.043367,-1.7003 z M 49,465.80316 c 0,-0.85746 -0.45,-1.2809 -1,-0.94098 -0.55,0.33992 -1,1.04148 -1,1.55902 0,0.51754 0.45,0.94098 1,0.94098 0.55,0 1,-0.70156 1,-1.55902 z m -10.772141,57.4647 c 2.492459,-3.37124 5.498463,-4.13134 3.801947,-0.96137 -1.115671,2.08465 -2.792239,3.38743 -4.740006,3.68324 -0.667664,0.1014 -0.247131,-1.11882 0.938059,-2.72187 z m 15.267776,1.08726 c -0.34232,-0.55389 0.10053,-1.28448 0.984111,-1.62354 1.914649,-0.73472 2.981717,0.0749 2.061373,1.56407 -0.830379,1.34358 -2.234909,1.371 -3.045484,0.0595 z m 17.198218,0.36758 c -0.925629,-0.92563 0.189072,-2.36052 1.833779,-2.36052 0.842134,0 1.177876,0.60386 0.833994,1.5 -0.610368,1.59059 -1.613974,1.91432 -2.667773,0.86052 z m -40.614906,-1.94385 c 0.04798,-1.16495 0.284941,-1.4019 0.604167,-0.60417 0.288871,0.72188 0.253344,1.58437 -0.07895,1.91667 -0.332292,0.33229 -0.568641,-0.25834 -0.52522,-1.3125 z M 24,522.37361 c 0,-1.24034 3.17723,-5.01143 4.222241,-5.01143 1.216405,0 0.911488,3.46627 -0.422241,4.8 -1.450736,1.45074 -3.8,1.58145 -3.8,0.21143 z m 56,-0.51143 c 0,-0.825 0.45,-1.5 1,-1.5 0.55,0 1,0.675 1,1.5 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-0.675 -1,-1.5 z m -47.8,-2.7 c -1.563834,-1.56383 -1.523926,-3.97474 0.102613,-6.19917 1.129249,-1.54434 1.463614,-1.58743 2.512331,-0.32381 0.959725,1.1564 0.897189,1.717 -0.302613,2.71275 -1.953977,1.62165 -1.932441,3.01023 0.04669,3.01023 0.857459,0 1.280902,0.45 0.940983,1 -0.818297,1.32403 -1.837753,1.26225 -3.3,-0.2 z m 17.043786,-0.05 c 0.225748,-0.6875 1.725748,-1.37269 3.333333,-1.52264 2.788155,-0.26007 2.833407,-0.20246 0.981751,1.25 -2.346126,1.84032 -4.882473,2.00058 -4.315084,0.27264 z m 28.413426,-2.29909 c 0.680432,-1.77318 3.471169,-1.56926 4.093255,0.29909 0.260434,0.78218 -0.538884,1.25 -2.135749,1.25 -1.8935,0 -2.398572,-0.39969 -1.957506,-1.54909 z M 21,516.4212 c 0,-0.51754 0.45,-1.2191 1,-1.55902 0.55,-0.33992 1,0.0835 1,0.94098 0,0.85746 -0.45,1.55902 -1,1.55902 -0.55,0 -1,-0.42344 -1,-0.94098 z m 16.647568,-4.24293 c -0.841403,-3.14186 -0.799742,-3.81609 0.235801,-3.81609 1.240865,0 2.226771,4.28986 1.217791,5.29884 -0.458333,0.45833 -1.11245,-0.20891 -1.453592,-1.48275 z m 4.591902,-1.82793 c 0.691029,-1.10652 1.819842,-1.79564 2.508473,-1.53139 C 45.436575,509.0832 46,508.86353 46,508.3308 c 0,-0.53274 0.675,-0.96862 1.5,-0.96862 2.212109,0 1.824239,2.10245 -0.5,2.71025 -1.1,0.28766 -2,0.92053 -2,1.40638 0,0.48585 -0.903813,0.88337 -2.008474,0.88337 -1.762089,0 -1.854346,-0.2468 -0.752056,-2.01184 z M 33,506.77885 c 0,-1.42084 0.48375,-2.42209 1.075,-2.225 0.59125,0.19708 1.04125,0.68458 1,1.08333 -0.04125,0.39875 -0.075,1.4 -0.075,2.225 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-1.1625 -1,-2.58333 z m -5.429973,0.69664 c -0.606232,-0.98091 2.181599,-3.69502 2.977678,-2.89894 0.706368,0.70637 -0.591568,3.78563 -1.595677,3.78563 -0.458697,0 -1.080597,-0.39901 -1.382001,-0.88669 z M 44,453.4212 c 0,-1.06754 0.45,-2.2191 1,-2.55902 0.55,-0.33992 1,-0.17828 1,0.3592 0,0.53747 0.273145,1.68903 0.606989,2.55901 0.398311,1.03799 0.05452,1.58179 -1,1.58179 C 44.682954,455.36218 44,454.53728 44,453.4212 z m 7,-4.85902 c 0,-1.20151 2.237913,-3.2 3.583369,-3.2 0.650852,0 1.418724,0.9 1.70638,2 0.434416,1.66121 0.03068,2 -2.383369,2 -1.598509,0 -2.90638,-0.36 -2.90638,-0.8 z m -1,-5.82423 c 0,-1.05446 4.209562,-4.37577 5.546021,-4.37577 1.466081,0 2.715466,2.76789 1.868196,4.1388 -0.358149,0.5795 -1.182125,0.46878 -2.084446,-0.28008 -1.165167,-0.967 -1.912674,-0.97579 -3.410972,-0.0401 C 50.863459,442.83989 50,443.0906 50,442.73795 z" + id="path3300" + inkscape:connector-curvature="0" /> + <path + style="fill:#bdbdbd" + d="m 92,525.56218 c 0,-1.54 -0.527793,-3.32779 -1.172874,-3.97287 -0.855295,-0.8553 -0.884251,-1.80634 -0.106941,-3.51235 1.75157,-3.84427 -0.705254,-11.42904 -4.802674,-14.82692 -4.086046,-3.38846 -2.898331,-3.60091 4.550449,-0.81396 7.800452,2.91852 13.33007,10.94988 14.92409,21.6761 l 0.63159,4.25 -7.011822,0 -7.011818,0 0,-2.8 z M 59.910502,504.75434 c -0.635465,-0.76569 -1.955842,-1.39216 -2.934171,-1.39216 -0.978329,0 -2.708052,-1.575 -3.84383,-3.5 -1.135778,-1.925 -2.755227,-3.5 -3.598776,-3.5 -1.951918,0 -1.967601,-1.39503 -0.03372,-3 2.076834,-1.72362 1.890939,-3.35723 -1,-8.78785 -2.267683,-4.25983 -3.321086,-9.21215 -1.959507,-9.21215 0.29727,0 1.818294,0.94472 3.380052,2.09938 2.417876,1.78761 3.191506,1.91873 5.209508,0.88296 3.948166,-2.02647 8.038747,-8.26066 10.313842,-15.71867 1.370596,-4.49296 0.796129,-18.89883 -0.883128,-22.14616 l -1.612127,-3.11751 2.877797,0 c 4.098422,0 9.266878,3.84485 12.150307,9.0387 4.705759,8.47637 2.96531,26.69319 -3.590429,37.58007 l -3.518421,5.84292 5.816053,5.23017 c 3.521616,3.16687 5.178879,5.24555 4.200912,5.26916 -0.888328,0.0214 -2.688328,0.8515 -4,1.84459 -4.749564,3.59595 -14.858241,5.13632 -16.974357,2.58655 z" + id="path3298" + inkscape:connector-curvature="0" /> + <path + style="fill:#b7b7b7" + d="m 92.815054,521.61218 c 0.280763,-4.98157 -0.149325,-8.25644 -1.641625,-12.5 l -2.022056,-5.75 2.04196,0 c 4.892222,0 12.116867,11.11379 14.138837,21.75 l 0.61783,3.25 -6.757689,0 -6.757689,0 0.380432,-6.75 z M 57.736081,502.60026 c -4.74666,-2.19188 -8.21023,-7.48361 -6.720339,-10.26749 0.787293,-1.47107 0.578728,-2.8552 -0.859855,-5.70638 -3.780683,-7.49305 -3.71844,-7.75193 1.891408,-7.86675 5.651727,-0.11567 8.864617,-2.37742 11.928874,-8.39746 3.505798,-6.88749 4.760424,-22.56113 2.421418,-30.25 -1.513683,-4.97583 8.15369,0.5478 11.171092,6.38281 4.79792,9.27815 2.757176,28.21359 -4.135306,38.37023 C 72.095018,486.8374 71,489.0307 71,489.73923 c 0,0.70852 1.8,2.73474 4,4.50271 2.2,1.76797 4,3.77126 4,4.45176 0,4.28196 -14.630272,6.9698 -21.263919,3.90656 z" + id="path3296" + inkscape:connector-curvature="0" /> + <path + style="fill:#afafaf" + d="m 95,519.94322 c 0,-6.15501 -0.465546,-9.23013 -1.731223,-11.43544 -2.129347,-3.71017 -1.162952,-4.96151 2.153516,-2.78847 3.134773,2.05398 7.071677,8.79205 8.555507,14.64287 0.62768,2.475 1.36978,5.2875 1.64911,6.25 0.44052,1.51793 -0.23044,1.75 -5.05952,1.75 l -5.56739,0 0,-8.41896 z M 63,502.21435 c -5.613254,-0.99824 -11,-6.2765 -11,-10.77847 0,-1.62561 -0.40569,-3.2064 -0.901534,-3.51284 -0.495844,-0.30645 -1.388827,-1.95503 -1.984407,-3.66352 -1.053717,-3.02269 -1.013269,-3.08886 1.50222,-2.45751 7.193124,1.80536 13.31839,-4.34121 17.965,-18.02748 1.635384,-4.81691 1.589968,-18.08883 -0.07931,-23.17721 -0.629611,-1.91921 -0.457536,-2.16355 1.127514,-1.60099 3.148476,1.11744 6.541494,4.66465 8.480475,8.86585 3.853849,8.35016 1.790957,26.18765 -4.142144,35.81645 C 72.335516,486.32767 71,489.11727 71,489.87773 c 0,0.76047 1.575,2.58398 3.5,4.05225 1.925,1.46827 3.5,3.05461 3.5,3.52521 0,0.88043 -4.252248,3.33348 -8.243213,4.75538 -1.241233,0.44222 -4.281787,0.44392 -6.756787,0.004 z" + id="path3294" + inkscape:connector-curvature="0" /> + <path + style="fill:#a6a6a6" + d="m 97.580726,526.11218 c -0.251559,-1.2375 -0.72938,-5.35305 -1.061826,-9.14566 -0.332446,-3.79262 -1.069261,-7.76418 -1.637367,-8.8257 -0.934152,-1.74548 -0.829324,-1.82107 1.096284,-0.79051 2.819043,1.5087 5.542873,6.12588 6.994333,11.85613 0.64861,2.56066 1.59521,5.43713 2.10357,6.39217 1.39547,2.62165 1.2385,2.76357 -3.05667,2.76357 -3.326202,0 -4.056171,-0.37006 -4.438324,-2.25 z M 60.5,500.40269 c -3.265642,-1.35967 -7.602087,-6.57417 -8.46488,-10.17887 -0.442539,-1.8489 -1.129624,-4.14914 -1.526857,-5.11164 -0.576601,-1.39711 -0.209671,-1.75 1.819649,-1.75 1.398039,0 3.714021,-0.44564 5.146628,-0.99032 9.482619,-3.60528 17.292496,-25.87479 13.595266,-38.76628 -1.195778,-4.16943 -0.0374,-4.10946 3.740804,0.19368 7.79605,8.87921 6.233208,28.06127 -3.573583,43.86154 -1.72735,2.78303 -1.718871,2.81367 1.521988,5.5 1.792458,1.48576 3.254958,3.25232 3.25,3.9257 -0.02355,3.1981 -10.442112,5.42583 -15.509015,3.31619 z" + id="path3292" + inkscape:connector-curvature="0" /> + <path + style="fill:#9d9d9d" + d="m 100.78845,526.61218 c -0.866616,-0.99674 -1.781975,-4.69799 -2.1266,-8.59888 -0.523145,-5.92159 -0.408114,-6.68543 0.849609,-5.64161 0.800071,0.664 2.186211,3.746 3.080301,6.84888 0.8941,3.10289 2.03053,6.42911 2.52541,7.39161 0.6997,1.36086 0.48762,1.75 -0.95371,1.75 -1.01942,0 -2.53817,-0.7875 -3.37501,-1.75 z m -43.756084,-31 c -2.422602,-2.3352 -4.011467,-4.85835 -4.211362,-6.68773 -0.282976,-2.5897 0.05447,-3.01703 2.848436,-3.60722 6.724353,-1.42042 12.654372,-8.84849 16.454544,-20.6113 1.672994,-5.17848 2.020932,-8.18397 1.638077,-14.14966 l -0.486107,-7.57459 2.267568,2.6362 c 3.370076,3.91795 4.644346,11.35074 3.431141,20.01379 -1.311434,9.36447 -2.596845,13.2643 -6.107833,18.53064 -3.503817,5.25559 -3.542145,6.21682 -0.36683,9.19987 1.375,1.29175 2.5,2.64795 2.5,3.0138 0,1.35589 -5.2333,2.9862 -9.58569,2.9862 -3.831989,0 -5.062889,-0.55069 -8.381944,-3.75 z" + id="path3290" + inkscape:connector-curvature="0" /> + <path + style="fill:#969696" + d="m 101.70717,525.61218 c -0.2893,-1.5125 -0.13044,-3.425 0.35301,-4.25 0.6049,-1.03225 0.88849,-0.17472 0.90941,2.75 0.0348,4.86979 -0.49702,5.50174 -1.26242,1.5 z m -43.065403,-31 c -4.91445,-3.9769 -5.748541,-5.95905 -2.891767,-6.87206 5.527572,-1.76659 14.25,-8.96693 14.25,-11.76333 0,-0.62933 0.933234,-2.88544 2.073853,-5.01359 2.414595,-4.50511 5.220373,-17.98198 4.375484,-21.01657 -0.461667,-1.65818 -0.368419,-1.7777 0.455976,-0.58445 1.899375,2.74919 2.357946,10.06835 1.116861,17.82599 -1.390605,8.69225 -2.963612,13.00724 -6.729633,18.46035 l -2.614917,3.78635 2.249245,3.04227 c 1.237084,1.67324 2.097118,3.17093 1.911187,3.3282 -1.47291,1.24581 -5.131086,2.55684 -7.1344,2.55684 -1.335305,0 -4.513155,-1.6875 -7.061889,-3.75 z" + id="path3288" + inkscape:connector-curvature="0" /> + <path + style="fill:#939393" + d="m 68.553851,495.44931 c -0.369537,-0.59792 -1.542351,-1.08713 -2.606255,-1.08713 -1.842561,0 -1.829965,-0.12007 0.265385,-2.52994 l 2.199755,-2.52994 1.383351,2.64022 c 0.90038,1.71844 1.042302,2.98127 0.4065,3.61707 -0.635802,0.63581 -1.211428,0.5973 -1.648736,-0.11028 z m -9.192225,-2.58713 c -0.316582,-0.825 -1.202459,-1.5 -1.968615,-1.5 -0.766156,0 -1.393011,-0.45 -1.393011,-1 0,-0.55 0.81,-1 1.8,-1 0.99,0 2.31509,-0.51509 2.944645,-1.14465 0.859526,-0.85952 1.306427,-0.50004 1.794143,1.44317 0.99716,3.973 -1.799649,6.79122 -3.177162,3.20148 z m 8.279576,-8.19213 c -0.380672,-0.38067 0.492512,-1.63673 1.940409,-2.79125 1.907671,-1.52112 2.773627,-3.32052 3.144932,-6.53498 0.281816,-2.43973 1.077686,-4.89617 1.768601,-5.45875 0.690915,-0.56259 1.74847,-1.92289 2.350124,-3.02289 1.570686,-2.87168 1.407159,-0.26284 -0.427266,6.81644 -2.261098,8.72586 -6.159851,13.60838 -8.7768,10.99143 z m 10.516693,-26.30787 c 0,-1.375 0.226973,-1.9375 0.504386,-1.25 0.277412,0.6875 0.277412,1.8125 0,2.5 -0.277413,0.6875 -0.504386,0.125 -0.504386,-1.25 z" + id="path3286" + inkscape:connector-curvature="0" /> + </g> + <rect + style="color:#000000;fill:#ececec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3282" + width="100" + height="100" + x="216" + y="452.36218" /> + <path + style="fill:#dce2e8" + d="m 101.65228,685.89841 c -0.61031,-1.59043 1.67986,-11.36996 3.4818,-14.86804 3.19374,-6.19997 6.40891,-8.92653 16.68802,-14.15192 15.1032,-7.67772 14.08047,-6.32495 10.35102,-13.69128 -14.61901,-28.87514 0.62649,-58.97154 24.06,-47.49727 13.57984,6.6494 16.19448,31.36184 5.16648,48.83132 -1.31978,2.09067 -2.3996,4.04075 -2.3996,4.33351 0,0.96965 10.40908,7.10101 16,9.42463 10.93887,4.54628 20.11609,18.84024 17.46298,27.19945 -0.81757,2.57596 -89.82541,2.98723 -90.8107,0.4196 z" + id="path3338" + inkscape:connector-curvature="0" /> + <path + style="fill:#d4dbe2" + d="m 102,686.9114 c 0,-12.82229 7.44412,-22.89231 22.1827,-30.00761 12.87976,-6.21793 12.94956,-6.32177 9.0358,-13.4409 -14.22068,-25.86739 -1.36795,-55.39011 20.88228,-47.9666 14.59508,4.86946 18.1044,32.01735 6.35646,49.17313 -2.03193,2.96726 -2.35301,4.11342 -1.45532,5.19507 2.00782,2.41927 10.29052,7.29999 16.26187,9.58257 9.30335,3.55626 16.73621,14.41611 16.73621,24.45263 0,3.46249 0,3.46249 -45,3.46249 -24.75,0 -45,-0.20285 -45,-0.45078 z" + id="path3340" + inkscape:connector-curvature="0" /> + <path + style="fill:#c9cfd7" + d="m 102.4567,685.61441 c 0.36888,-0.96127 1.11921,-3.83918 1.66741,-6.39535 2.21614,-10.33347 6.13699,-14.70774 18.82614,-21.00325 14.55588,-7.22166 14.80341,-7.54851 10.92334,-14.42362 -9.68463,-17.16023 -7.20029,-40.63993 4.92623,-46.55817 22.78415,-11.11959 37.31319,18.96264 22.1508,45.86301 C 159.32778,645.9762 158,648.7139 158,649.18081 c 0,1.40694 10.13739,7.90103 15.78241,10.11034 9.77879,3.82716 13.64453,8.03488 16.63576,18.10744 3.27247,11.01959 7.88554,9.96359 -43.52516,9.96359 -42.52625,0 -45.06861,-0.1 -44.43631,-1.74777 z" + id="path3342" + inkscape:connector-curvature="0" /> + <path + style="fill:#b6c5d8" + d="m 103.37309,685.61218 c 0.27933,-0.9625 1.03161,-3.77247 1.67174,-6.24438 2.7839,-10.75028 5.91216,-14.19465 18.51088,-20.3814 14.31222,-7.02817 14.76658,-7.73334 10.45997,-16.23375 -9.15189,-18.06407 -4.86136,-45.39047 7.12679,-45.39047 1.09396,0 2.93292,-0.50516 4.08658,-1.12258 17.68746,-9.46604 28.60891,25.64678 14.76541,47.47125 -2.43246,3.83481 -2.83029,5.14422 -1.90256,6.26207 2.5443,3.06569 11.0342,8.55209 15.59589,10.07848 10.54415,3.52818 15.51705,10.12038 17.77332,23.56078 0.62952,3.75 0.62952,3.75 -43.98319,3.75 -42.01509,0 -44.58312,-0.10189 -44.10483,-1.75 z" + id="path3344" + inkscape:connector-curvature="0" /> + <path + style="fill:#b4c3d5" + d="m 104.625,686.56443 c -0.27117,-0.43876 -0.0796,-1.45126 0.42567,-2.25 0.71729,-1.13386 0.92206,-0.95895 0.93402,0.79775 0.0157,2.31303 -0.49232,2.85568 -1.35969,1.45225 z M 142,686.42433 c 0,-0.51582 0.86883,-0.87241 1.93072,-0.79241 1.0619,0.08 1.71034,0.50202 1.44099,0.93785 C 144.68642,687.67858 142,687.5627 142,686.42433 z m 7.69692,-0.45528 c -0.4092,-1.04122 -0.50841,-2.12872 -0.22046,-2.41666 0.91206,-0.91206 1.71456,0.58256 1.33239,2.48152 -0.35024,1.74033 -0.40373,1.73721 -1.11193,-0.0649 z M 176.5,685.36218 c -0.59198,-1.86517 -1.73621,-2.47275 -3.89715,-2.06937 -0.49343,0.0921 -0.15593,-0.96377 0.75,-2.3464 1.83229,-2.79643 2.16785,-5.58423 0.67215,-5.58423 -0.54087,0 -0.71864,-1.28178 -0.39926,-2.87872 0.69285,-3.46424 -1.33236,-5.24299 -3.1458,-2.76296 -1.08006,1.47707 -1.35743,1.49422 -2.47074,0.15277 -0.68975,-0.8311 -2.12857,-1.51109 -3.19739,-1.51109 -1.06881,0 -2.76954,-0.44219 -3.77939,-0.98265 -1.55168,-0.83043 -1.7534,-0.66637 -1.30218,1.05908 0.39074,1.49421 -0.0383,2.19137 -1.59991,2.59974 -1.27803,0.33421 -2.43392,1.71612 -2.88208,3.4456 -0.92623,3.57446 -2.64033,3.80366 -3.06463,0.4098 -0.23951,-1.91577 0.27394,-2.75503 2.11331,-3.45436 1.33632,-0.50807 2.68336,-1.89384 2.99341,-3.07948 0.45149,-1.72648 0.22982,-2.01748 -1.1133,-1.46147 -5.68539,2.35358 -8.4004,2.32578 -10.65699,-0.10913 -2.23951,-2.41647 -2.23951,-2.41647 -5.12895,0.26138 -2.84793,2.63937 -5.36082,0.88121 -2.63559,-1.84402 1.78026,-1.78026 -1.93813,-7.92517 -4.44423,-7.34438 -3.61526,0.83783 -3.51736,-1.10555 0.19846,-3.93974 4.18632,-3.19306 4.28278,-4.3519 0.84984,-10.20976 -3.02942,-5.16932 -5.07738,-19.22645 -3.00403,-20.61961 0.80665,-0.54203 0.62792,-1.16489 -0.60555,-2.11025 -3.32503,-2.54837 -2.21211,-5.47361 1.35596,-3.56404 2.68965,1.43946 9.56213,-2.54678 7.88167,-4.57161 -1.61497,-1.94592 0.54345,-2.81116 2.39466,-0.95995 1.9326,1.9326 0.23466,6.47485 -2.42036,6.47485 -2.39015,0 -4.05144,2.23713 -2.96578,3.99377 0.74069,1.19846 1.2186,1.12186 2.98735,-0.47884 3.40625,-3.08261 7.06325,-3.27149 3.92002,-0.20246 -1.32194,1.29073 -3.19816,2.63706 -4.16938,2.99186 -1.46386,0.53475 -1.65384,1.37626 -1.11084,4.92037 1.03682,6.76728 2.91338,6.57626 2.64042,-0.26877 -0.13482,-3.38089 0.14222,-3.95593 1.9059,-3.95593 1.57131,0 1.93887,0.47715 1.54063,2 -0.28766,1.1 -0.11514,2 0.38337,2 0.49851,0 0.96263,-0.45 1.03138,-1 0.23881,-1.91044 0.46791,-2.51699 2.11567,-5.60124 1.18783,-2.22337 1.35069,-3.4074 0.5753,-4.18279 -0.6216,-0.6216 -0.74907,-1.85432 -0.29975,-2.89875 1.30385,-3.03077 1.12426,-9.3161 -0.26622,-9.31669 -1.48909,-6.3e-4 -1.67609,-2.61915 -0.25,-3.50053 2.02225,-1.24982 1.00431,-3.5 -1.58333,-3.5 -1.62818,0 -2.42515,-0.46217 -2.15551,-1.25 0.8577,-2.50597 12.23584,-1.56907 15.26279,1.25676 9.36923,8.74672 9.55807,30.04723 0.39426,44.47037 -3.90808,6.15102 3.27675,13.99627 15.52079,16.94746 8.10852,1.9544 13.9046,10.2116 16.02211,22.82541 0.75747,4.5122 -13.55314,6.18611 -14.96111,1.75 z m -6.09078,-20.1003 c -1.88372,-2.0815 -5.19665,-3.05266 -5.99684,-1.75793 -1.21582,1.96724 0.48869,3.45823 3.95348,3.45823 3.30832,0 3.4645,-0.12996 2.04336,-1.7003 z M 135,624.80316 c 0,-0.85746 -0.45,-1.2809 -1,-0.94098 -0.55,0.33992 -1,1.04148 -1,1.55902 0,0.51754 0.45,0.94098 1,0.94098 0.55,0 1,-0.70156 1,-1.55902 z m -10.77214,57.4647 c 2.49246,-3.37124 5.49846,-4.13134 3.80195,-0.96137 -1.11567,2.08465 -2.79224,3.38743 -4.74001,3.68324 -0.66766,0.1014 -0.24713,-1.11882 0.93806,-2.72187 z m 15.26777,1.08726 c -0.34232,-0.55389 0.10053,-1.28448 0.98412,-1.62354 1.91464,-0.73472 2.98171,0.0749 2.06137,1.56407 -0.83038,1.34358 -2.23491,1.371 -3.04549,0.0595 z m 17.19822,0.36758 c -0.92563,-0.92563 0.18907,-2.36052 1.83378,-2.36052 0.84214,0 1.17788,0.60386 0.834,1.5 -0.61037,1.59059 -1.61398,1.91432 -2.66778,0.86052 z M 110,681.37361 c 0,-1.24034 3.17723,-5.01143 4.22224,-5.01143 1.21641,0 0.91149,3.46627 -0.42224,4.8 -1.45074,1.45074 -3.8,1.58145 -3.8,0.21143 z m 56,-0.51143 c 0,-0.825 0.45,-1.5 1,-1.5 0.55,0 1,0.675 1,1.5 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-0.675 -1,-1.5 z m -47.8,-2.7 c -1.56383,-1.56383 -1.52393,-3.97474 0.10261,-6.19917 1.12925,-1.54434 1.46362,-1.58743 2.51233,-0.32381 0.95973,1.1564 0.89719,1.717 -0.30261,2.71275 -1.95398,1.62165 -1.93244,3.01023 0.0467,3.01023 0.85746,0 1.2809,0.45 0.94098,1 -0.81829,1.32403 -1.83775,1.26225 -3.3,-0.2 z m 17.04379,-0.05 c 0.22574,-0.6875 1.72574,-1.37269 3.33333,-1.52264 2.78815,-0.26007 2.83341,-0.20246 0.98175,1.25 -2.34613,1.84032 -4.88247,2.00058 -4.31508,0.27264 z m 28.41342,-2.29909 c 0.68043,-1.77318 3.47117,-1.56926 4.09326,0.29909 0.26043,0.78218 -0.53889,1.25 -2.13575,1.25 -1.8935,0 -2.39857,-0.39969 -1.95751,-1.54909 z M 107,675.4212 c 0,-0.51754 0.45,-1.2191 1,-1.55902 0.55,-0.33992 1,0.0835 1,0.94098 0,0.85746 -0.45,1.55902 -1,1.55902 -0.55,0 -1,-0.42344 -1,-0.94098 z m 16.64757,-4.24293 c -0.84141,-3.14186 -0.79974,-3.81609 0.2358,-3.81609 1.24086,0 2.22677,4.28986 1.21779,5.29884 -0.45833,0.45833 -1.11245,-0.20891 -1.45359,-1.48275 z m 4.5919,-1.82793 c 0.69103,-1.10652 1.81984,-1.79564 2.50847,-1.53139 0.68863,0.26425 1.25206,0.0446 1.25206,-0.48815 0,-0.53274 0.675,-0.96862 1.5,-0.96862 2.21211,0 1.82424,2.10245 -0.5,2.71025 -1.1,0.28766 -2,0.92053 -2,1.40638 0,0.48585 -0.90381,0.88337 -2.00847,0.88337 -1.76209,0 -1.85435,-0.2468 -0.75206,-2.01184 z M 119,665.77885 c 0,-1.42084 0.48375,-2.42209 1.075,-2.225 0.59125,0.19708 1.04125,0.68458 1,1.08333 -0.0413,0.39875 -0.075,1.4 -0.075,2.225 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-1.1625 -1,-2.58333 z m -5.42997,0.69664 c -0.60623,-0.98091 2.1816,-3.69502 2.97768,-2.89894 0.70636,0.70637 -0.59157,3.78563 -1.59568,3.78563 -0.4587,0 -1.0806,-0.39901 -1.382,-0.88669 z M 130,612.4212 c 0,-1.06754 0.45,-2.2191 1,-2.55902 0.55,-0.33992 1,-0.17828 1,0.3592 0,0.53747 0.27314,1.68903 0.60699,2.55901 0.39831,1.03799 0.0545,1.58179 -1,1.58179 -0.92404,0 -1.60699,-0.8249 -1.60699,-1.94098 z m 7,-4.85902 c 0,-3.04736 4.53747,-4.07671 5.28975,-1.2 0.43441,1.66121 0.0307,2 -2.38337,2 -1.59851,0 -2.90638,-0.36 -2.90638,-0.8 z m -1,-5.82423 c 0,-2.86866 6.43445,-5.29196 7.39626,-2.78553 0.90984,2.37101 -0.31838,3.71929 -2.06649,2.26848 -1.16517,-0.967 -1.91267,-0.97579 -3.41097,-0.0401 -1.05534,0.65909 -1.9188,0.9098 -1.9188,0.55715 z" + id="path3346" + inkscape:connector-curvature="0" /> + <path + style="fill:#8a95a3" + d="M 144.9375 593.4375 C 142.97096 593.97299 140.95652 594.35399 139.0347 595.03994 C 137.40346 595.68297 135.82664 596.45719 134.24576 597.21254 C 132.89522 597.97177 131.45954 598.59014 130.21875 599.53125 C 129.20006 600.19988 128.31529 601.0452 127.49574 601.94176 C 126.54293 602.91489 125.68052 603.97863 124.86585 605.06919 C 124.11244 606.14269 123.39057 607.26818 123 608.53125 C 121.89118 611.64763 121.52305 614.95108 120.94229 618.19003 C 120.43491 621.02887 119.92764 623.86992 119.3125 626.6875 C 118.27187 630.01502 116.87194 633.21362 115.55523 636.4377 C 115.02312 637.74165 114.46705 639.03745 113.91094 640.32968 C 113.62137 641.04061 113.7385 641.93096 114.35633 642.43288 C 115.13752 643.14557 116.16197 642.61737 117.05718 642.64018 C 118.036 642.69448 118.75459 643.6698 118.71355 644.61468 C 118.73921 645.64062 118.54332 646.66008 118.59375 647.6875 C 118.49482 648.60712 118.24273 649.69313 118.90625 650.46875 C 119.57634 651.23803 120.78394 650.79032 121.27415 650.03924 C 122.24328 648.28137 122.82983 646.34764 123.59375 644.5 C 123.90976 643.75299 124.79349 643.13302 125.61093 643.46406 C 126.443 643.8065 126.61349 644.78897 126.71636 645.57939 C 126.77204 646.39455 126.72234 647.20987 126.71875 648.02656 C 126.62342 648.94232 127.43762 650.04493 128.4098 649.44247 C 129.31453 648.98297 129.11091 647.84679 128.90864 647.04561 C 128.73317 646.2851 128.86422 645.26191 129.6875 644.9375 C 130.55585 644.51667 131.35017 645.19252 132.15156 645.3125 C 133.35003 645.31192 133.70367 643.90126 133.4375 642.9375 C 133.24935 641.81973 133.22713 640.68674 133.10451 639.55941 C 132.91453 637.38762 132.85095 635.20829 132.75 633.03125 C 133.09718 627.69884 133.62705 622.37981 134.26928 617.07539 C 134.50465 615.36505 134.79733 613.6578 135.21197 611.98214 C 135.80229 610.115 136.67692 608.33445 137.79829 606.72959 C 138.67315 605.51298 139.67316 604.37267 140.875 603.46875 C 141.96785 602.76299 143.13588 602.16345 144.36364 601.73232 C 147.31692 600.85106 150.41664 600.71467 153.46325 600.38908 C 154.54555 600.27353 155.67056 600.24821 156.69476 599.85575 C 157.65284 599.43076 158.65136 598.65136 158.75 597.53125 C 158.61378 596.53648 157.325 596.50592 156.60962 596.09332 C 154.2075 595.20187 151.72385 594.55584 149.23614 593.95516 C 147.95488 593.68582 146.65823 593.40804 145.34375 593.40625 C 145.20833 593.41667 145.07292 593.42708 144.9375 593.4375 z " + id="path3358-7" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccccccccccccccccccc" /> + <path + style="fill:#b3bcc9" + d="m 178,684.56218 c 0,-1.54 -0.52779,-3.32779 -1.17287,-3.97287 -0.8553,-0.8553 -0.88425,-1.80634 -0.10694,-3.51235 1.75156,-3.84427 -0.70526,-11.42904 -4.80268,-14.82692 -4.08605,-3.38846 -2.89833,-3.60091 4.55045,-0.81396 13.71103,5.12995 20.56433,25.9261 8.54386,25.9261 -7.01182,0 -7.01182,0 -7.01182,-2.8 z m -32.0895,-20.80784 c -0.63546,-0.76569 -1.95584,-1.39216 -2.93417,-1.39216 -0.97833,0 -2.70805,-1.575 -3.84383,-3.5 -1.13578,-1.925 -2.75523,-3.5 -3.59878,-3.5 -1.95191,0 -1.9676,-1.39503 -0.0337,-3 2.07684,-1.72362 1.89094,-3.35723 -1,-8.78785 -4.06916,-7.64391 -3.45528,-10.71763 1.42055,-7.11277 5.16921,3.82176 11.75054,-2.46804 15.52335,-14.83571 1.3706,-4.49296 0.79613,-18.89883 -0.88313,-22.14616 -1.61213,-3.11751 -1.61213,-3.11751 1.26567,-3.11751 14.78876,0 19.89294,27.79836 8.55988,46.61877 -3.51842,5.84292 -3.51842,5.84292 2.29763,11.07309 3.52162,3.16687 5.17888,5.24555 4.20091,5.26916 -0.88832,0.0214 -2.68832,0.8515 -4,1.84459 -4.74956,3.59595 -14.85824,5.13632 -16.97435,2.58655 z" + id="path3348" + inkscape:connector-curvature="0" /> + <path + style="fill:#a9b6c7" + d="m 178.81505,680.61218 c 0.28077,-4.98157 -0.14932,-8.25644 -1.64162,-12.5 -2.02206,-5.75 -2.02206,-5.75 0.0199,-5.75 4.89222,0 12.11687,11.11379 14.13884,21.75 0.61783,3.25 0.61783,3.25 -6.13986,3.25 -6.75769,0 -6.75769,0 -6.37726,-6.75 z m -35.07897,-19.01192 c -4.74666,-2.19188 -8.21023,-7.48361 -6.72034,-10.26749 0.78729,-1.47107 0.57873,-2.8552 -0.85985,-5.70638 -3.78069,-7.49305 -3.71844,-7.75193 1.8914,-7.86675 11.7634,-0.24076 19.60745,-21.36594 14.3503,-38.64746 -1.51369,-4.97583 8.15369,0.5478 11.17109,6.38281 4.79792,9.27815 2.75717,28.21359 -4.13531,38.37023 -3.24804,4.78626 -3.10884,5.61941 1.56663,9.37672 8.38349,6.73716 -5.8507,13.62864 -17.26392,8.35832 z" + id="path3350" + inkscape:connector-curvature="0" /> + <path + style="fill:#a5aeba" + d="m 181,678.94322 c 0,-6.15501 -0.46555,-9.23013 -1.73122,-11.43544 -2.12935,-3.71017 -1.16296,-4.96151 2.15351,-2.78847 3.13478,2.05398 7.07168,8.79205 8.55551,14.64287 0.62768,2.475 1.36978,5.2875 1.64911,6.25 0.44052,1.51793 -0.23044,1.75 -5.05952,1.75 -5.56739,0 -5.56739,0 -5.56739,-8.41896 z m -32,-17.72887 c -5.61325,-0.99824 -11,-6.2765 -11,-10.77847 0,-1.62561 -0.40569,-3.2064 -0.90153,-3.51284 -2.70283,-1.67044 -3.10529,-6.77939 -0.48219,-6.12103 12.46665,3.12893 23.83658,-23.06489 17.88569,-41.20469 -1.76801,-5.38933 6.73506,1.04007 9.60799,7.26486 3.85385,8.35016 1.79095,26.18765 -4.14215,35.81645 -3.77182,6.12126 -3.72602,7.00345 0.53219,10.25135 4.26886,3.25601 4.32839,3.95246 0.50679,5.92869 -5.33516,2.75892 -7.42915,3.16975 -12.00679,2.35568 z" + id="path3352" + inkscape:connector-curvature="0" /> + <path + style="fill:#99a5b4" + d="m 183.58073,685.11218 c -0.25156,-1.2375 -0.72938,-5.35305 -1.06183,-9.14566 -0.33245,-3.79262 -1.06926,-7.76418 -1.63737,-8.8257 -0.93415,-1.74548 -0.82932,-1.82107 1.09629,-0.79051 2.81904,1.5087 5.54287,6.12588 6.99433,11.85613 0.64861,2.56066 1.59521,5.43713 2.10357,6.39217 1.39547,2.62165 1.2385,2.76357 -3.05667,2.76357 -3.3262,0 -4.05617,-0.37006 -4.43832,-2.25 z M 146.5,659.40269 c -3.26564,-1.35967 -7.60209,-6.57417 -8.46488,-10.17887 -0.44254,-1.8489 -1.12962,-4.14914 -1.52686,-5.11164 -0.5766,-1.39711 -0.20967,-1.75 1.81965,-1.75 12.35731,0 23.41609,-23.45864 18.7419,-39.7566 -1.19578,-4.16943 -0.0374,-4.10946 3.7408,0.19368 7.79605,8.87921 6.23321,28.06127 -3.57358,43.86154 -1.72735,2.78303 -1.71887,2.81367 1.52198,5.5 6.50649,5.39319 -3.08727,11.06061 -12.25901,7.24189 z" + id="path3354" + inkscape:connector-curvature="0" /> + <path + style="fill:#929ca9" + d="m 186.78845,685.61218 c -2.13515,-2.45575 -3.34589,-15.95753 -1.27699,-14.24049 0.80007,0.664 2.18621,3.746 3.0803,6.84888 0.8941,3.10289 2.03053,6.42911 2.52541,7.39161 0.6997,1.36086 0.48762,1.75 -0.95371,1.75 -1.01942,0 -2.53817,-0.7875 -3.37501,-1.75 z m -43.75608,-31 c -5.27795,-5.08752 -5.84209,-9.34879 -1.36293,-10.29495 10.17568,-2.14947 19.08676,-19.27014 18.09262,-34.76096 -0.48611,-7.57459 -0.48611,-7.57459 1.78146,-4.93839 6.18016,7.18486 4.77903,27.36115 -2.67669,38.54443 -3.50382,5.25559 -3.54215,6.21682 -0.36683,9.19987 3.11895,2.93011 3.11439,3.39903 -0.0471,4.83949 -5.40941,2.46469 -11.18306,1.49515 -15.42058,-2.58949 z" + id="path3356" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3446" + d="M 144.28125 595 C 142.00751 595.73802 139.64364 596.2319 137.4784 597.27349 C 135.6721 598.08077 133.86478 598.94096 132.26612 600.1174 C 130.73005 601.4058 129.17807 602.69249 127.8239 604.17448 C 126.85978 605.37948 125.95531 606.6381 125.13476 607.94362 C 124.4645 609.16682 123.95051 610.48265 123.69995 611.85646 C 122.77255 615.8484 122.26684 619.9216 121.68145 623.97358 C 121.45909 625.44835 121.36454 626.95836 120.83485 628.36671 C 120.2772 629.80462 119.75378 631.2559 119.10811 632.6582 C 117.84279 635.59371 116.5574 638.52049 115.25 641.4375 C 114.96121 642.41928 115.61379 643.67596 116.71875 643.6875 C 117.57471 643.72769 118.47257 643.39381 119.28125 643.8125 C 120.10896 644.30526 120.25168 645.38461 120.16368 646.26665 C 120.13605 647.51514 119.91054 648.75208 119.90625 650 C 119.80181 651.00252 120.77371 652.10877 121.8125 651.8125 C 122.77627 651.35486 123.09206 650.27022 123.50521 649.37439 C 124.14816 647.971 124.74974 646.54964 125.34375 645.125 C 125.77181 644.44843 126.80721 644.15301 127.46875 644.65625 C 128.14087 645.33142 128.17389 646.37452 128.1875 647.27186 C 128.25171 648.29591 128.00205 649.38407 128.46875 650.34375 C 129.01348 651.20609 130.38698 650.74321 130.53125 649.8125 C 130.64455 648.92925 130.15267 648.02287 130.5 647.15625 C 130.8897 646.18329 132.13617 646.26013 132.97624 646.50887 C 134.13865 646.84616 134.96986 645.52354 134.65625 644.5 C 134.14001 641.99704 133.88795 639.44936 133.6604 636.90682 C 133.53479 635.24601 133.45972 633.57996 133.40625 631.91564 C 133.40776 628.05054 133.56011 624.18659 133.58734 620.32194 C 133.5092 618.66165 133.66003 617.00439 133.77178 615.34975 C 133.86019 614.26 134.16679 613.19537 134.70284 612.24084 C 135.75425 610.13175 136.90496 608.06085 138.28408 606.14668 C 138.97539 605.2227 139.70886 604.32205 140.6237 603.60859 C 141.69586 602.71229 142.87612 601.94068 144.125 601.3125 C 145.83105 600.5614 147.66184 600.05207 149.53139 599.98207 C 151.54006 599.8139 153.564 599.85415 155.57215 600.00177 C 156.55914 600.02608 157.75545 600.45322 158.56676 599.68324 C 159.39919 598.83203 158.35578 597.73618 157.44863 597.5769 C 155.18701 597.01954 152.96874 596.28477 150.68468 595.81288 C 148.9436 595.42134 147.16528 595.23058 145.40625 594.9375 C 145.03165 594.95846 144.64522 594.88643 144.28125 595 z " + style="fill:#99a5b4;fill-opacity:1" + sodipodi:nodetypes="cccccccccccccccccccccccccc" /> + <path + style="fill:#8a95a3" + d="m 187.70717,684.61218 c -0.2893,-1.5125 -0.13044,-3.425 0.35301,-4.25 0.6049,-1.03225 0.88849,-0.17472 0.90941,2.75 0.0348,4.86979 -0.49702,5.50174 -1.26242,1.5 z m -43.0654,-31 c -4.91445,-3.9769 -5.74854,-5.95905 -2.89177,-6.87206 5.52757,-1.76659 14.25,-8.96693 14.25,-11.76333 0,-0.62933 0.93323,-2.88544 2.07385,-5.01359 2.4146,-4.50511 5.22038,-17.98198 4.37549,-21.01657 -0.46167,-1.65818 -0.36842,-1.7777 0.45597,-0.58445 4.30235,6.22731 1.17255,26.46135 -5.61277,36.28634 -2.61492,3.78635 -2.61492,3.78635 -0.36567,6.82862 1.23708,1.67324 2.09712,3.17093 1.91119,3.3282 -4.20858,3.5597 -8.7998,3.17382 -14.19629,-1.19316 z" + id="path3358" + inkscape:connector-curvature="0" /> + <path + style="fill:#89929e" + d="m 154.55385,654.44931 c -0.36954,-0.59792 -1.54235,-1.08713 -2.60625,-1.08713 -1.84257,0 -1.82997,-0.12007 0.26538,-2.52994 2.19976,-2.52994 2.19976,-2.52994 3.58311,0.11028 1.38826,2.6496 0.23685,5.90001 -1.24224,3.50679 z m -9.19222,-2.58713 c -0.31659,-0.825 -1.20246,-1.5 -1.96862,-1.5 -0.76616,0 -1.39301,-0.45 -1.39301,-1 0,-0.55 0.81,-1 1.8,-1 0.99,0 2.31509,-0.51509 2.94464,-1.14465 0.85953,-0.85952 1.30643,-0.50004 1.79415,1.44317 0.99716,3.973 -1.79965,6.79122 -3.17716,3.20148 z m 8.27957,-8.19213 c -0.38067,-0.38067 0.49251,-1.63673 1.94041,-2.79125 1.90767,-1.52112 2.77363,-3.32052 3.14493,-6.53498 0.28182,-2.43973 1.07769,-4.89617 1.7686,-5.45875 0.69092,-0.56259 1.74847,-1.92289 2.35013,-3.02289 1.57068,-2.87168 1.40716,-0.26284 -0.42727,6.81644 -2.2611,8.72586 -6.15985,13.60838 -8.7768,10.99143 z" + id="path3360" + inkscape:connector-curvature="0" /> + <path + style="fill:#a9b6c7;fill-opacity:1" + d="M 145.25 597.3125 C 142.80952 598.09149 140.33926 598.81193 138.02258 599.92262 C 135.86469 600.90055 133.86179 602.21471 132.08479 603.78064 C 130.7889 604.95103 129.56663 606.2129 128.58749 607.66502 C 127.68149 608.9894 126.74812 610.30245 125.95163 611.69581 C 125.05389 613.43338 124.38329 615.28806 124.04005 617.21621 C 123.6573 619.05458 123.5135 620.93201 123.15948 622.77613 C 122.4436 627.34223 120.92417 631.72348 119.46875 636.09375 C 118.95204 637.51587 118.42061 638.93247 117.875 640.34375 C 117.60012 641.54756 118.18444 642.71866 118.85406 643.68155 C 119.66221 644.87909 120.51988 646.08135 120.96875 647.46875 C 121.19607 648.4387 121.387 649.41679 121.37419 650.41809 C 121.33526 651.23421 121.50778 652.18725 122.25 652.65625 C 123.16425 653.16753 124.0287 652.26592 124.40625 651.5 C 125.19377 650.2154 125.79673 648.83037 126.5 647.5 C 126.95576 646.81433 128.09705 646.62418 128.65625 647.28125 C 129.18105 648.05891 128.80797 649.25378 129.64275 649.8642 C 130.66506 650.39881 131.42126 649.20333 131.86223 648.44945 C 132.41655 647.74806 133.32963 647.5055 134.03125 647 C 134.66082 646.30469 134.47613 645.29428 134.31609 644.45904 C 134.01369 642.02648 133.83382 639.57896 133.64456 637.1351 C 133.48559 634.83714 133.39381 632.53432 133.29945 630.23298 C 133.23912 628.41503 133.20199 626.59238 133.40625 624.78125 C 133.60809 622.3134 134.0088 619.86641 134.28125 617.40625 C 134.49879 615.70007 135.18872 614.11124 135.75 612.5 C 136.3442 611.27245 136.81389 609.97109 137.62813 608.86286 C 138.55379 607.53181 139.56696 606.25979 140.625 605.03125 C 141.69864 603.83355 142.97676 602.82398 144.375 602.03125 C 145.49316 601.21418 146.83905 600.73706 148.21051 600.58915 C 150.39743 600.14864 152.62793 600.00526 154.84375 599.78125 C 155.54741 599.75193 156.6307 599.94571 156.875 599.0625 C 156.35591 598.1558 155.2092 598.60615 154.38044 598.5147 C 151.51518 598.07377 148.64677 597.64452 145.76753 597.29956 C 145.59617 597.25176 145.42245 597.31316 145.25 597.3125 z " + id="path3448" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccc" /> + <path + sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccc" + inkscape:connector-curvature="0" + id="path3450" + d="M 155.84375 598.5 C 154.21365 598.64223 152.56701 598.44899 150.94542 598.69046 C 149.34106 598.98055 147.83692 599.64084 146.29138 600.13914 C 144.28147 600.88915 142.293 601.7326 140.43996 602.81878 C 138.81218 603.8673 137.41543 605.22331 135.96875 606.5 C 134.52086 607.89557 133.224 609.46841 132.29616 611.26066 C 131.71839 612.37326 131.26253 613.54872 130.8 614.71374 C 129.60456 617.80167 128.53001 620.93713 127.55459 624.1012 C 126.85078 626.47081 126.20631 628.85717 125.62508 631.25966 C 124.88858 634.05202 124.14738 636.84718 123.57897 639.67914 C 123.22569 641.63166 122.7593 643.57079 122.63892 645.55698 C 122.4826 646.81985 122.79371 648.07516 122.88413 649.33213 C 123.02698 650.33522 123.07331 651.35772 122.73029 652.325 C 122.35885 653.04612 122.99026 654.39949 123.84375 653.71875 C 124.46991 652.98144 124.32409 651.91441 124.70629 651.05839 C 125.15859 649.64237 125.73389 648.26221 126.40625 646.9375 C 126.95278 646.062 128.02797 645.30908 129.07968 645.77656 C 130.08952 646.12268 130.64146 647.12416 130.97812 648.07437 C 131.40331 649.0322 131.46652 650.08456 131.6875 651.09375 C 131.83631 651.94145 132.95716 652.77333 133.625 651.90625 C 134.22897 651.03159 133.8601 649.93633 133.78125 648.96875 C 133.549 646.37465 133.36681 643.77563 133.33476 641.1704 C 133.24674 639.39841 133.51233 637.637 133.58711 635.86892 C 133.87451 631.49137 134.02115 627.09575 134.65625 622.75 C 135.10584 620.19291 135.52554 617.5981 136.53948 615.19077 C 137.2597 613.40736 138.25041 611.75152 139.12793 610.04367 C 139.94103 608.55905 141.07052 607.25857 142.32794 606.13297 C 143.22309 605.357 144.24505 604.74691 145.1875 604.03125 C 146.85063 602.91092 148.76106 602.25117 150.64358 601.60283 C 152.1607 601.12993 153.69142 600.68721 155.24363 600.3503 C 156.04323 600.26891 157.51656 599.99723 157.30299 598.92572 C 157.04887 598.40878 156.33288 598.35551 155.84375 598.5 z " + style="fill:#a6afbc;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3452" + d="m 101.65228,865.89841 c -0.61031,-1.59043 1.67986,-11.36996 3.4818,-14.86804 3.19374,-6.19997 6.40891,-8.92653 16.68802,-14.15192 15.1032,-7.67772 14.08047,-6.32495 10.35102,-13.69128 -14.61901,-28.87514 0.62649,-58.97154 24.06,-47.49727 13.57984,6.6494 16.19448,31.36184 5.16648,48.83132 -1.31978,2.09067 -2.3996,4.04075 -2.3996,4.33351 0,0.96965 10.40908,7.10101 16,9.42463 10.93887,4.54628 20.11609,18.84024 17.46298,27.19945 -0.81757,2.57596 -89.82541,2.98723 -90.8107,0.4196 z" + style="fill:#dce2e8" /> + <path + inkscape:connector-curvature="0" + id="path3454" + d="m 102,866.9114 c 0,-12.82229 7.44412,-22.89231 22.1827,-30.00761 12.87976,-6.21793 12.94956,-6.32177 9.0358,-13.4409 -14.22068,-25.86739 -1.36795,-55.39011 20.88228,-47.9666 14.59508,4.86946 18.1044,32.01735 6.35646,49.17313 -2.03193,2.96726 -2.35301,4.11342 -1.45532,5.19507 2.00782,2.41927 10.29052,7.29999 16.26187,9.58257 9.30335,3.55626 16.73621,14.41611 16.73621,24.45263 0,3.46249 0,3.46249 -45,3.46249 -24.75,0 -45,-0.20285 -45,-0.45078 z" + style="fill:#d4dbe2" /> + <path + style="fill:#8a95a3" + d="m 144.9375,773.4375 c -10.74797,1.8906 -22.72474,9.16325 -23.24043,21.21179 0.18451,9.55657 -7.82447,19.51606 -6.06577,27.90027 5.28283,0.6821 1.88241,12.62979 6.91321,4.50204 3.21724,-6.45871 3.59698,0.37141 5.52482,1.65913 5.32142,-3.53755 6.37277,-9.78899 4.49968,-16.57135 1.69519,-8.96701 0.26696,-19.40634 6.2796,-26.96463 3.42346,-6.48464 19.65013,-1.51549 17.63589,-9.00848 -3.51761,-1.83089 -7.63953,-2.39091 -11.547,-2.72877 z" + id="path3462" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3456" + d="m 102.4567,865.61441 c 0.36888,-0.96127 1.11921,-3.83918 1.66741,-6.39535 2.21614,-10.33347 6.13699,-14.70774 18.82614,-21.00325 14.55588,-7.22166 14.80341,-7.54851 10.92334,-14.42362 -9.68463,-17.16023 -7.20029,-40.63993 4.92623,-46.55817 22.78415,-11.11959 37.31319,18.96264 22.1508,45.86301 C 159.32778,825.9762 158,828.7139 158,829.18081 c 0,1.40694 10.13739,7.90103 15.78241,10.11034 9.77879,3.82716 13.64453,8.03488 16.63576,18.10744 3.27247,11.01959 7.88554,9.96359 -43.52516,9.96359 -42.52625,0 -45.06861,-0.1 -44.43631,-1.74777 z" + style="fill:#c9cfd7" /> + <path + style="fill:#99a5b4;fill-opacity:1" + d="m 144.28125,775 c -11.01047,1.99149 -21.67016,10.99671 -21.66625,22.86236 0.60297,8.84835 -6.29294,16.79216 -6.2865,24.61301 3.87487,1.13264 4.38748,13.59323 7.45458,5.58711 2.98372,-8.53966 5.32295,7.14749 7.85565,-0.489 5.85292,-7.95802 -0.36827,-18.44968 1.96308,-27.71756 -0.73509,-11.11553 9.58208,-22.50578 21.11758,-19.72924 9.18337,-1.84038 -5.84814,-5.35545 -10.43814,-5.12668 z" + id="path3474" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3458" + d="m 103.37309,865.61218 c 0.27933,-0.9625 1.03161,-3.77247 1.67174,-6.24438 2.7839,-10.75028 5.91216,-14.19465 18.51088,-20.3814 14.31222,-7.02817 14.76658,-7.73334 10.45997,-16.23375 -9.15189,-18.06407 -4.86136,-45.39047 7.12679,-45.39047 1.09396,0 2.93292,-0.50516 4.08658,-1.12258 17.68746,-9.46604 28.60891,25.64678 14.76541,47.47125 -2.43246,3.83481 -2.83029,5.14422 -1.90256,6.26207 2.5443,3.06569 11.0342,8.55209 15.59589,10.07848 10.54415,3.52818 15.51705,10.12038 17.77332,23.56078 0.62952,3.75 0.62952,3.75 -43.98319,3.75 -42.01509,0 -44.58312,-0.10189 -44.10483,-1.75 z" + style="fill:#b6c5d8" /> + <path + style="fill:#89929e" + d="m 154.55385,834.44931 c -7.73996,-0.71456 2.97335,-9.48381 1.94415,-0.99431 0.13822,1.07877 -1.20543,1.98995 -1.94415,0.99431 z m -9.19222,-2.58713 c -7.68155,-7.53278 11.21473,-1.49469 0.72323,0.93961 l -0.72323,-0.93961 z m 8.27957,-8.19213 c 5.46682,-4.33048 4.23206,-12.69502 9.14189,-17.11237 0.69994,4.71773 -1.73608,18.18334 -9.14189,17.11237 z" + id="path3478" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3460" + d="m 104.625,866.56443 c -0.27117,-0.43876 -0.0796,-1.45126 0.42567,-2.25 0.71729,-1.13386 0.92206,-0.95895 0.93402,0.79775 0.0157,2.31303 -0.49232,2.85568 -1.35969,1.45225 z M 142,866.42433 c 0,-0.51582 0.86883,-0.87241 1.93072,-0.79241 1.0619,0.08 1.71034,0.50202 1.44099,0.93785 C 144.68642,867.67858 142,867.5627 142,866.42433 z m 7.69692,-0.45528 c -0.4092,-1.04122 -0.50841,-2.12872 -0.22046,-2.41666 0.91206,-0.91206 1.71456,0.58256 1.33239,2.48152 -0.35024,1.74033 -0.40373,1.73721 -1.11193,-0.0649 z M 176.5,865.36218 c -0.59198,-1.86517 -1.73621,-2.47275 -3.89715,-2.06937 -0.49343,0.0921 -0.15593,-0.96377 0.75,-2.3464 1.83229,-2.79643 2.16785,-5.58423 0.67215,-5.58423 -0.54087,0 -0.71864,-1.28178 -0.39926,-2.87872 0.69285,-3.46424 -1.33236,-5.24299 -3.1458,-2.76296 -1.08006,1.47707 -1.35743,1.49422 -2.47074,0.15277 -0.68975,-0.8311 -2.12857,-1.51109 -3.19739,-1.51109 -1.06881,0 -2.76954,-0.44219 -3.77939,-0.98265 -1.55168,-0.83043 -1.7534,-0.66637 -1.30218,1.05908 0.39074,1.49421 -0.0383,2.19137 -1.59991,2.59974 -1.27803,0.33421 -2.43392,1.71612 -2.88208,3.4456 -0.92623,3.57446 -2.64033,3.80366 -3.06463,0.4098 -0.23951,-1.91577 0.27394,-2.75503 2.11331,-3.45436 1.33632,-0.50807 2.68336,-1.89384 2.99341,-3.07948 0.45149,-1.72648 0.22982,-2.01748 -1.1133,-1.46147 -5.68539,2.35358 -8.4004,2.32578 -10.65699,-0.10913 -2.23951,-2.41647 -2.23951,-2.41647 -5.12895,0.26138 -2.84793,2.63937 -5.36082,0.88121 -2.63559,-1.84402 1.78026,-1.78026 -1.93813,-7.92517 -4.44423,-7.34438 -3.61526,0.83783 -3.51736,-1.10555 0.19846,-3.93974 4.18632,-3.19306 4.28278,-4.3519 0.84984,-10.20976 -3.02942,-5.16932 -5.07738,-19.22645 -3.00403,-20.61961 0.80665,-0.54203 0.62792,-1.16489 -0.60555,-2.11025 -3.32503,-2.54837 -2.21211,-5.47361 1.35596,-3.56404 2.68965,1.43946 9.56213,-2.54678 7.88167,-4.57161 -1.61497,-1.94592 0.54345,-2.81116 2.39466,-0.95995 1.9326,1.9326 0.23466,6.47485 -2.42036,6.47485 -2.39015,0 -4.05144,2.23713 -2.96578,3.99377 0.74069,1.19846 1.2186,1.12186 2.98735,-0.47884 3.40625,-3.08261 7.06325,-3.27149 3.92002,-0.20246 -1.32194,1.29073 -3.19816,2.63706 -4.16938,2.99186 -1.46386,0.53475 -1.65384,1.37626 -1.11084,4.92037 1.03682,6.76728 2.91338,6.57626 2.64042,-0.26877 -0.13482,-3.38089 0.14222,-3.95593 1.9059,-3.95593 1.57131,0 1.93887,0.47715 1.54063,2 -0.28766,1.1 -0.11514,2 0.38337,2 0.49851,0 0.96263,-0.45 1.03138,-1 0.23881,-1.91044 0.46791,-2.51699 2.11567,-5.60124 1.18783,-2.22337 1.35069,-3.4074 0.5753,-4.18279 -0.6216,-0.6216 -0.74907,-1.85432 -0.29975,-2.89875 1.30385,-3.03077 1.12426,-9.3161 -0.26622,-9.31669 -1.48909,-6.3e-4 -1.67609,-2.61915 -0.25,-3.50053 2.02225,-1.24982 1.00431,-3.5 -1.58333,-3.5 -1.62818,0 -2.42515,-0.46217 -2.15551,-1.25 0.8577,-2.50597 12.23584,-1.56907 15.26279,1.25676 9.36923,8.74672 9.55807,30.04723 0.39426,44.47037 -3.90808,6.15102 3.27675,13.99627 15.52079,16.94746 8.10852,1.9544 13.9046,10.2116 16.02211,22.82541 0.75747,4.5122 -13.55314,6.18611 -14.96111,1.75 z m -6.09078,-20.1003 c -1.88372,-2.0815 -5.19665,-3.05266 -5.99684,-1.75793 -1.21582,1.96724 0.48869,3.45823 3.95348,3.45823 3.30832,0 3.4645,-0.12996 2.04336,-1.7003 z M 135,804.80316 c 0,-0.85746 -0.45,-1.2809 -1,-0.94098 -0.55,0.33992 -1,1.04148 -1,1.55902 0,0.51754 0.45,0.94098 1,0.94098 0.55,0 1,-0.70156 1,-1.55902 z m -10.77214,57.4647 c 2.49246,-3.37124 5.49846,-4.13134 3.80195,-0.96137 -1.11567,2.08465 -2.79224,3.38743 -4.74001,3.68324 -0.66766,0.1014 -0.24713,-1.11882 0.93806,-2.72187 z m 15.26777,1.08726 c -0.34232,-0.55389 0.10053,-1.28448 0.98412,-1.62354 1.91464,-0.73472 2.98171,0.0749 2.06137,1.56407 -0.83038,1.34358 -2.23491,1.371 -3.04549,0.0595 z m 17.19822,0.36758 c -0.92563,-0.92563 0.18907,-2.36052 1.83378,-2.36052 0.84214,0 1.17788,0.60386 0.834,1.5 -0.61037,1.59059 -1.61398,1.91432 -2.66778,0.86052 z M 110,861.37361 c 0,-1.24034 3.17723,-5.01143 4.22224,-5.01143 1.21641,0 0.91149,3.46627 -0.42224,4.8 -1.45074,1.45074 -3.8,1.58145 -3.8,0.21143 z m 56,-0.51143 c 0,-0.825 0.45,-1.5 1,-1.5 0.55,0 1,0.675 1,1.5 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-0.675 -1,-1.5 z m -47.8,-2.7 c -1.56383,-1.56383 -1.52393,-3.97474 0.10261,-6.19917 1.12925,-1.54434 1.46362,-1.58743 2.51233,-0.32381 0.95973,1.1564 0.89719,1.717 -0.30261,2.71275 -1.95398,1.62165 -1.93244,3.01023 0.0467,3.01023 0.85746,0 1.2809,0.45 0.94098,1 -0.81829,1.32403 -1.83775,1.26225 -3.3,-0.2 z m 17.04379,-0.05 c 0.22574,-0.6875 1.72574,-1.37269 3.33333,-1.52264 2.78815,-0.26007 2.83341,-0.20246 0.98175,1.25 -2.34613,1.84032 -4.88247,2.00058 -4.31508,0.27264 z m 28.41342,-2.29909 c 0.68043,-1.77318 3.47117,-1.56926 4.09326,0.29909 0.26043,0.78218 -0.53889,1.25 -2.13575,1.25 -1.8935,0 -2.39857,-0.39969 -1.95751,-1.54909 z M 107,855.4212 c 0,-0.51754 0.45,-1.2191 1,-1.55902 0.55,-0.33992 1,0.0835 1,0.94098 0,0.85746 -0.45,1.55902 -1,1.55902 -0.55,0 -1,-0.42344 -1,-0.94098 z m 16.64757,-4.24293 c -0.84141,-3.14186 -0.79974,-3.81609 0.2358,-3.81609 1.24086,0 2.22677,4.28986 1.21779,5.29884 -0.45833,0.45833 -1.11245,-0.20891 -1.45359,-1.48275 z m 4.5919,-1.82793 c 0.69103,-1.10652 1.81984,-1.79564 2.50847,-1.53139 0.68863,0.26425 1.25206,0.0446 1.25206,-0.48815 0,-0.53274 0.675,-0.96862 1.5,-0.96862 2.21211,0 1.82424,2.10245 -0.5,2.71025 -1.1,0.28766 -2,0.92053 -2,1.40638 0,0.48585 -0.90381,0.88337 -2.00847,0.88337 -1.76209,0 -1.85435,-0.2468 -0.75206,-2.01184 z M 119,845.77885 c 0,-1.42084 0.48375,-2.42209 1.075,-2.225 0.59125,0.19708 1.04125,0.68458 1,1.08333 -0.0413,0.39875 -0.075,1.4 -0.075,2.225 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-1.1625 -1,-2.58333 z m -5.42997,0.69664 c -0.60623,-0.98091 2.1816,-3.69502 2.97768,-2.89894 0.70636,0.70637 -0.59157,3.78563 -1.59568,3.78563 -0.4587,0 -1.0806,-0.39901 -1.382,-0.88669 z M 130,792.4212 c 0,-1.06754 0.45,-2.2191 1,-2.55902 0.55,-0.33992 1,-0.17828 1,0.3592 0,0.53747 0.27314,1.68903 0.60699,2.55901 0.39831,1.03799 0.0545,1.58179 -1,1.58179 -0.92404,0 -1.60699,-0.8249 -1.60699,-1.94098 z m 7,-4.85902 c 0,-3.04736 4.53747,-4.07671 5.28975,-1.2 0.43441,1.66121 0.0307,2 -2.38337,2 -1.59851,0 -2.90638,-0.36 -2.90638,-0.8 z m -1,-5.82423 c 0,-2.86866 6.43445,-5.29196 7.39626,-2.78553 0.90984,2.37101 -0.31838,3.71929 -2.06649,2.26848 -1.16517,-0.967 -1.91267,-0.97579 -3.41097,-0.0401 -1.05534,0.65909 -1.9188,0.9098 -1.9188,0.55715 z" + style="fill:#b4c3d5" /> + <path + style="fill:#a9b6c7;fill-opacity:1" + d="m 145.25,777.3125 c -11.57748,2.28759 -22.04731,12.59098 -21.71404,24.87521 -2.1508,9.37211 -8.56694,19.45652 -1.48218,28.50428 3.33233,2.3153 5.166,-5.33037 9.9863,-2.09476 4.97091,-4.99882 0.0124,-14.08411 1.24474,-20.74726 -0.21314,-10.68456 3.36449,-24.32549 15.12351,-27.33478 3.74378,-0.0902 9.83456,-1.73894 2.69785,-2.68337 -1.94006,-0.16358 -3.99555,0.20204 -5.85618,-0.51932 z" + id="path3480" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3464" + d="m 178,864.56218 c 0,-1.54 -0.52779,-3.32779 -1.17287,-3.97287 -0.8553,-0.8553 -0.88425,-1.80634 -0.10694,-3.51235 1.75156,-3.84427 -0.70526,-11.42904 -4.80268,-14.82692 -4.08605,-3.38846 -2.89833,-3.60091 4.55045,-0.81396 13.71103,5.12995 20.56433,25.9261 8.54386,25.9261 -7.01182,0 -7.01182,0 -7.01182,-2.8 z m -32.0895,-20.80784 c -0.63546,-0.76569 -1.95584,-1.39216 -2.93417,-1.39216 -0.97833,0 -2.70805,-1.575 -3.84383,-3.5 -1.13578,-1.925 -2.75523,-3.5 -3.59878,-3.5 -1.95191,0 -1.9676,-1.39503 -0.0337,-3 2.07684,-1.72362 1.89094,-3.35723 -1,-8.78785 -4.06916,-7.64391 -3.45528,-10.71763 1.42055,-7.11277 5.16921,3.82176 11.75054,-2.46804 15.52335,-14.83571 1.3706,-4.49296 0.79613,-18.89883 -0.88313,-22.14616 -1.61213,-3.11751 -1.61213,-3.11751 1.26567,-3.11751 14.78876,0 19.89294,27.79836 8.55988,46.61877 -3.51842,5.84292 -3.51842,5.84292 2.29763,11.07309 3.52162,3.16687 5.17888,5.24555 4.20091,5.26916 -0.88832,0.0214 -2.68832,0.8515 -4,1.84459 -4.74956,3.59595 -14.85824,5.13632 -16.97435,2.58655 z" + style="fill:#b3bcc9" /> + <path + style="fill:#a6afbc;fill-opacity:1" + d="m 155.84375,778.5 c -13.10779,-0.63094 -25.27523,9.74737 -27.22823,22.63972 -2.80862,10.00432 -7.29759,20.47561 -5.25581,30.98002 2.40323,-7.01052 6.93861,-6.58634 10.0934,-1.15553 0.40794,-13.19842 -1.12488,-27.28361 4.76462,-39.66134 2.31447,-7.99178 15.80278,-9.1778 18.08955,-12.76192 l -0.46353,-0.0409 0,0 z" + id="path3482" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3466" + d="m 178.81505,860.61218 c 0.28077,-4.98157 -0.14932,-8.25644 -1.64162,-12.5 -2.02206,-5.75 -2.02206,-5.75 0.0199,-5.75 4.89222,0 12.11687,11.11379 14.13884,21.75 0.61783,3.25 0.61783,3.25 -6.13986,3.25 -6.75769,0 -6.75769,0 -6.37726,-6.75 z m -35.07897,-19.01192 c -4.74666,-2.19188 -8.21023,-7.48361 -6.72034,-10.26749 0.78729,-1.47107 0.57873,-2.8552 -0.85985,-5.70638 -3.78069,-7.49305 -3.71844,-7.75193 1.8914,-7.86675 11.7634,-0.24076 19.60745,-21.36594 14.3503,-38.64746 -1.51369,-4.97583 8.15369,0.5478 11.17109,6.38281 4.79792,9.27815 2.75717,28.21359 -4.13531,38.37023 -3.24804,4.78626 -3.10884,5.61941 1.56663,9.37672 8.38349,6.73716 -5.8507,13.62864 -17.26392,8.35832 z" + style="fill:#a9b6c7" /> + <path + inkscape:connector-curvature="0" + id="path3468" + d="m 181,858.94322 c 0,-6.15501 -0.46555,-9.23013 -1.73122,-11.43544 -2.12935,-3.71017 -1.16296,-4.96151 2.15351,-2.78847 3.13478,2.05398 7.07168,8.79205 8.55551,14.64287 0.62768,2.475 1.36978,5.2875 1.64911,6.25 0.44052,1.51793 -0.23044,1.75 -5.05952,1.75 -5.56739,0 -5.56739,0 -5.56739,-8.41896 z m -32,-17.72887 c -5.61325,-0.99824 -11,-6.2765 -11,-10.77847 0,-1.62561 -0.40569,-3.2064 -0.90153,-3.51284 -2.70283,-1.67044 -3.10529,-6.77939 -0.48219,-6.12103 12.46665,3.12893 23.83658,-23.06489 17.88569,-41.20469 -1.76801,-5.38933 6.73506,1.04007 9.60799,7.26486 3.85385,8.35016 1.79095,26.18765 -4.14215,35.81645 -3.77182,6.12126 -3.72602,7.00345 0.53219,10.25135 4.26886,3.25601 4.32839,3.95246 0.50679,5.92869 -5.33516,2.75892 -7.42915,3.16975 -12.00679,2.35568 z" + style="fill:#a5aeba" /> + <path + inkscape:connector-curvature="0" + id="path3470" + d="m 183.58073,865.11218 c -0.25156,-1.2375 -0.72938,-5.35305 -1.06183,-9.14566 -0.33245,-3.79262 -1.06926,-7.76418 -1.63737,-8.8257 -0.93415,-1.74548 -0.82932,-1.82107 1.09629,-0.79051 2.81904,1.5087 5.54287,6.12588 6.99433,11.85613 0.64861,2.56066 1.59521,5.43713 2.10357,6.39217 1.39547,2.62165 1.2385,2.76357 -3.05667,2.76357 -3.3262,0 -4.05617,-0.37006 -4.43832,-2.25 z M 146.5,839.40269 c -3.26564,-1.35967 -7.60209,-6.57417 -8.46488,-10.17887 -0.44254,-1.8489 -1.12962,-4.14914 -1.52686,-5.11164 -0.5766,-1.39711 -0.20967,-1.75 1.81965,-1.75 12.35731,0 23.41609,-23.45864 18.7419,-39.7566 -1.19578,-4.16943 -0.0374,-4.10946 3.7408,0.19368 7.79605,8.87921 6.23321,28.06127 -3.57358,43.86154 -1.72735,2.78303 -1.71887,2.81367 1.52198,5.5 6.50649,5.39319 -3.08727,11.06061 -12.25901,7.24189 z" + style="fill:#99a5b4" /> + <path + inkscape:connector-curvature="0" + id="path3472" + d="m 186.78845,865.61218 c -2.13515,-2.45575 -3.34589,-15.95753 -1.27699,-14.24049 0.80007,0.664 2.18621,3.746 3.0803,6.84888 0.8941,3.10289 2.03053,6.42911 2.52541,7.39161 0.6997,1.36086 0.48762,1.75 -0.95371,1.75 -1.01942,0 -2.53817,-0.7875 -3.37501,-1.75 z m -43.75608,-31 c -5.27795,-5.08752 -5.84209,-9.34879 -1.36293,-10.29495 10.17568,-2.14947 19.08676,-19.27014 18.09262,-34.76096 -0.48611,-7.57459 -0.48611,-7.57459 1.78146,-4.93839 6.18016,7.18486 4.77903,27.36115 -2.67669,38.54443 -3.50382,5.25559 -3.54215,6.21682 -0.36683,9.19987 3.11895,2.93011 3.11439,3.39903 -0.0471,4.83949 -5.40941,2.46469 -11.18306,1.49515 -15.42058,-2.58949 z" + style="fill:#929ca9" /> + <path + inkscape:connector-curvature="0" + id="path3476" + d="m 187.70717,864.61218 c -0.2893,-1.5125 -0.13044,-3.425 0.35301,-4.25 0.6049,-1.03225 0.88849,-0.17472 0.90941,2.75 0.0348,4.86979 -0.49702,5.50174 -1.26242,1.5 z m -43.0654,-31 c -4.91445,-3.9769 -5.74854,-5.95905 -2.89177,-6.87206 5.52757,-1.76659 14.25,-8.96693 14.25,-11.76333 0,-0.62933 0.93323,-2.88544 2.07385,-5.01359 2.4146,-4.50511 5.22038,-17.98198 4.37549,-21.01657 -0.46167,-1.65818 -0.36842,-1.7777 0.45597,-0.58445 4.30235,6.22731 1.17255,26.46135 -5.61277,36.28634 -2.61492,3.78635 -2.61492,3.78635 -0.36567,6.82862 1.23708,1.67324 2.09712,3.17093 1.91119,3.3282 -4.20858,3.5597 -8.7998,3.17382 -14.19629,-1.19316 z" + style="fill:#8a95a3" /> + <path + style="fill:#dce2e8" + d="m 251.65228,865.89841 c -0.61031,-1.59043 1.67986,-11.36996 3.4818,-14.86804 3.19374,-6.19997 6.40891,-8.92653 16.68802,-14.15192 15.1032,-7.67772 14.08047,-6.32495 10.35102,-13.69128 -14.61901,-28.87514 0.62649,-58.97154 24.06,-47.49727 13.57984,6.6494 16.19448,31.36184 5.16648,48.83132 -1.31978,2.09067 -2.3996,4.04075 -2.3996,4.33351 0,0.96965 10.40908,7.10101 16,9.42463 10.93887,4.54628 20.11609,18.84024 17.46298,27.19945 -0.81757,2.57596 -89.82541,2.98723 -90.8107,0.4196 z" + id="path3509" + inkscape:connector-curvature="0" /> + <path + style="fill:#d4dbe2" + d="m 252,866.9114 c 0,-12.82229 7.44412,-22.89231 22.1827,-30.00761 12.87976,-6.21793 12.94956,-6.32177 9.0358,-13.4409 -14.22068,-25.86739 -1.36795,-55.39011 20.88228,-47.9666 14.59508,4.86946 18.1044,32.01735 6.35646,49.17313 -2.03193,2.96726 -2.35301,4.11342 -1.45532,5.19507 2.00782,2.41927 10.29052,7.29999 16.26187,9.58257 9.30335,3.55626 16.73621,14.41611 16.73621,24.45263 0,3.46249 0,3.46249 -45,3.46249 -24.75,0 -45,-0.20285 -45,-0.45078 z" + id="path3511" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3513" + d="M 294.65625 773.5 C 292.18513 774.03315 289.7182 774.66256 287.38554 775.65048 C 285.56623 776.47347 283.68022 777.23257 282.1296 778.5242 C 281.21415 779.20722 280.41347 780.02978 279.59798 780.82474 C 278.42984 782.13825 277.4208 783.58732 276.46875 785.0625 C 275.56878 786.59443 274.64315 788.11956 273.97651 789.7716 C 273.31039 791.25353 272.75812 792.78994 272.39421 794.37477 C 271.9409 796.1128 272.04894 797.9434 271.58706 799.68159 C 271.32879 800.76464 270.93025 801.80958 270.56006 802.85838 C 269.82675 804.86597 268.89031 806.79263 268.1875 808.8125 C 267.45431 810.76792 266.75297 812.73888 266.1875 814.75 C 265.9044 815.86685 265.62215 816.98632 265.52282 818.13756 C 265.34687 819.47222 265.39068 820.82092 265.53125 822.15625 C 265.95993 823.02412 267.26761 822.72598 267.625 823.71875 C 268.58315 825.05452 268.8951 826.71179 269.22857 828.28855 C 269.28284 828.98027 269.57477 830.06217 270.5 829.6875 C 271.42485 829.14397 271.70901 827.99915 272.42653 827.21724 C 272.98236 826.40945 273.32198 825.44438 274.03125 824.75 C 274.87357 823.92567 275.95196 824.8029 276.21379 825.70784 C 276.71466 826.57618 276.93746 827.64853 277.70875 828.32843 C 278.68277 828.87529 279.43613 827.53915 280.12572 827.02354 C 281.12301 825.98851 281.91076 824.74212 282.43634 823.406 C 283.2219 821.32711 283.59409 819.07736 283.36309 816.85953 C 283.29525 815.47963 283.02845 814.12443 282.71875 812.78125 C 282.46631 811.74523 282.79671 810.71071 282.92369 809.68352 C 283.3866 806.7227 283.46489 803.72115 283.80793 800.74658 C 283.98961 798.80397 284.29709 796.87455 284.63959 794.9551 C 284.99576 793.11417 285.48169 791.29022 286.27582 789.58559 C 286.93275 788.06704 287.75027 786.62066 288.74531 785.29735 C 289.36666 784.43487 290.04246 783.57033 291 783.0625 C 292.85982 781.92457 295.08155 781.70035 297.1875 781.34375 C 299.22101 781.11786 301.26038 780.87575 303.26002 780.43896 C 304.34646 780.17221 305.49232 779.77748 306.1875 778.84375 C 306.76233 778.01139 306.93322 776.62332 306.0625 775.9375 C 305.05856 775.4873 304.00279 775.1348 302.96875 774.75 C 300.99258 774.27042 298.98544 773.93071 296.97429 773.63864 C 296.20324 773.5995 295.42777 773.40752 294.65625 773.5 z " + style="fill:#8a95a3" /> + <path + style="fill:#c9cfd7" + d="m 252.4567,865.61441 c 0.36888,-0.96127 1.11921,-3.83918 1.66741,-6.39535 2.21614,-10.33347 6.13699,-14.70774 18.82614,-21.00325 14.55588,-7.22166 14.80341,-7.54851 10.92334,-14.42362 -9.68463,-17.16023 -7.20029,-40.63993 4.92623,-46.55817 22.78415,-11.11959 37.31319,18.96264 22.1508,45.86301 C 309.32778,825.9762 308,828.7139 308,829.18081 c 0,1.40694 10.13739,7.90103 15.78241,10.11034 9.77879,3.82716 13.64453,8.03488 16.63576,18.10744 3.27247,11.01959 7.88554,9.96359 -43.52516,9.96359 -42.52625,0 -45.06861,-0.1 -44.43631,-1.74777 z" + id="path3515" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3517" + d="M 294.1875 775.03125 C 291.11481 775.63002 288.13525 776.68056 285.40244 778.21331 C 281.52126 780.31644 278.17657 783.4203 275.78209 787.12687 C 273.99826 789.97714 272.86302 793.24961 272.70861 796.62003 C 272.60537 798.54628 272.74297 800.49518 272.31541 802.3937 C 271.57007 806.37359 269.83179 810.06421 268.3919 813.82243 C 267.46056 816.18233 266.70702 818.62823 266.36191 821.1461 C 266.01811 822.26471 267.11553 822.94515 267.8054 823.58576 C 269.37549 825.63049 269.90994 828.24593 271.28125 830.40625 C 272.06762 831.1105 272.97506 830.0846 273.26883 829.36653 C 273.8606 828.06965 274.15347 826.52685 275.28125 825.5625 C 276.24249 825.21886 276.99198 826.1526 277.46251 826.86001 C 278.19401 827.87165 278.72656 829.14013 279.90625 829.71875 C 280.95627 829.76237 281.21973 828.49131 281.59375 827.75 C 282.47596 826.24943 283.39066 824.73138 283.74162 823.00314 C 284.71287 819.02899 283.98437 814.93122 283.53652 810.93849 C 283.07593 807.26367 282.79712 803.49376 283.59375 799.84375 C 283.30701 794.20684 285.64533 788.52993 289.72728 784.64772 C 292.25026 782.19372 295.47345 780.38136 298.98694 779.88579 C 300.88893 779.62513 302.84958 779.6652 304.71875 780.125 C 305.69229 779.82617 306.85768 779.76466 307.5625 778.9375 C 307.62512 777.87607 306.41703 777.4894 305.61429 777.17516 C 302.07951 775.82666 298.31037 775.13859 294.53626 775.01073 L 294.35377 775.02147 L 294.1875 775.03125 z " + style="fill:#99a5b4;fill-opacity:1" /> + <path + style="fill:#b6c5d8" + d="m 253.37309,865.61218 c 0.27933,-0.9625 1.03161,-3.77247 1.67174,-6.24438 2.7839,-10.75028 5.91216,-14.19465 18.51088,-20.3814 14.31222,-7.02817 14.76658,-7.73334 10.45997,-16.23375 -9.15189,-18.06407 -4.86136,-45.39047 7.12679,-45.39047 1.09396,0 2.93292,-0.50516 4.08658,-1.12258 17.68746,-9.46604 28.60891,25.64678 14.76541,47.47125 -2.43246,3.83481 -2.83029,5.14422 -1.90256,6.26207 2.5443,3.06569 11.0342,8.55209 15.59589,10.07848 10.54415,3.52818 15.51705,10.12038 17.77332,23.56078 0.62952,3.75 0.62952,3.75 -43.98319,3.75 -42.01509,0 -44.58312,-0.10189 -44.10483,-1.75 z" + id="path3519" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3521" + d="m 304.55385,834.44931 c -7.73996,-0.71456 2.97335,-9.48381 1.94415,-0.99431 0.13822,1.07877 -1.20543,1.98995 -1.94415,0.99431 z m -9.19222,-2.58713 c -7.68155,-7.53278 11.21473,-1.49469 0.72323,0.93961 l -0.72323,-0.93961 z m 8.27957,-8.19213 c 5.46682,-4.33048 4.23206,-12.69502 9.14189,-17.11237 0.69994,4.71773 -1.73608,18.18334 -9.14189,17.11237 z" + style="fill:#89929e" /> + <path + style="fill:#b4c3d5" + d="m 254.625,866.56443 c -0.27117,-0.43876 -0.0796,-1.45126 0.42567,-2.25 0.71729,-1.13386 0.92206,-0.95895 0.93402,0.79775 0.0157,2.31303 -0.49232,2.85568 -1.35969,1.45225 z M 292,866.42433 c 0,-0.51582 0.86883,-0.87241 1.93072,-0.79241 1.0619,0.08 1.71034,0.50202 1.44099,0.93785 C 294.68642,867.67858 292,867.5627 292,866.42433 z m 7.69692,-0.45528 c -0.4092,-1.04122 -0.50841,-2.12872 -0.22046,-2.41666 0.91206,-0.91206 1.71456,0.58256 1.33239,2.48152 -0.35024,1.74033 -0.40373,1.73721 -1.11193,-0.0649 z M 326.5,865.36218 c -0.59198,-1.86517 -1.73621,-2.47275 -3.89715,-2.06937 -0.49343,0.0921 -0.15593,-0.96377 0.75,-2.3464 1.83229,-2.79643 2.16785,-5.58423 0.67215,-5.58423 -0.54087,0 -0.71864,-1.28178 -0.39926,-2.87872 0.69285,-3.46424 -1.33236,-5.24299 -3.1458,-2.76296 -1.08006,1.47707 -1.35743,1.49422 -2.47074,0.15277 -0.68975,-0.8311 -2.12857,-1.51109 -3.19739,-1.51109 -1.06881,0 -2.76954,-0.44219 -3.77939,-0.98265 -1.55168,-0.83043 -1.7534,-0.66637 -1.30218,1.05908 0.39074,1.49421 -0.0383,2.19137 -1.59991,2.59974 -1.27803,0.33421 -2.43392,1.71612 -2.88208,3.4456 -0.92623,3.57446 -2.64033,3.80366 -3.06463,0.4098 -0.23951,-1.91577 0.27394,-2.75503 2.11331,-3.45436 1.33632,-0.50807 2.68336,-1.89384 2.99341,-3.07948 0.45149,-1.72648 0.22982,-2.01748 -1.1133,-1.46147 -5.68539,2.35358 -8.4004,2.32578 -10.65699,-0.10913 -2.23951,-2.41647 -2.23951,-2.41647 -5.12895,0.26138 -2.84793,2.63937 -5.36082,0.88121 -2.63559,-1.84402 1.78026,-1.78026 -1.93813,-7.92517 -4.44423,-7.34438 -3.61526,0.83783 -3.51736,-1.10555 0.19846,-3.93974 4.18632,-3.19306 4.28278,-4.3519 0.84984,-10.20976 -3.02942,-5.16932 -5.07738,-19.22645 -3.00403,-20.61961 0.80665,-0.54203 0.62792,-1.16489 -0.60555,-2.11025 -3.32503,-2.54837 -2.21211,-5.47361 1.35596,-3.56404 2.68965,1.43946 9.56213,-2.54678 7.88167,-4.57161 -1.61497,-1.94592 0.54345,-2.81116 2.39466,-0.95995 1.9326,1.9326 0.23466,6.47485 -2.42036,6.47485 -2.39015,0 -4.05144,2.23713 -2.96578,3.99377 0.74069,1.19846 1.2186,1.12186 2.98735,-0.47884 3.40625,-3.08261 7.06325,-3.27149 3.92002,-0.20246 -1.32194,1.29073 -3.19816,2.63706 -4.16938,2.99186 -1.46386,0.53475 -1.65384,1.37626 -1.11084,4.92037 1.03682,6.76728 2.91338,6.57626 2.64042,-0.26877 -0.13482,-3.38089 0.14222,-3.95593 1.9059,-3.95593 1.57131,0 1.93887,0.47715 1.54063,2 -0.28766,1.1 -0.11514,2 0.38337,2 0.49851,0 0.96263,-0.45 1.03138,-1 0.23881,-1.91044 0.46791,-2.51699 2.11567,-5.60124 1.18783,-2.22337 1.35069,-3.4074 0.5753,-4.18279 -0.6216,-0.6216 -0.74907,-1.85432 -0.29975,-2.89875 1.30385,-3.03077 1.12426,-9.3161 -0.26622,-9.31669 -1.48909,-6.3e-4 -1.67609,-2.61915 -0.25,-3.50053 2.02225,-1.24982 1.00431,-3.5 -1.58333,-3.5 -1.62818,0 -2.42515,-0.46217 -2.15551,-1.25 0.8577,-2.50597 12.23584,-1.56907 15.26279,1.25676 9.36923,8.74672 9.55807,30.04723 0.39426,44.47037 -3.90808,6.15102 3.27675,13.99627 15.52079,16.94746 8.10852,1.9544 13.9046,10.2116 16.02211,22.82541 0.75747,4.5122 -13.55314,6.18611 -14.96111,1.75 z m -6.09078,-20.1003 c -1.88372,-2.0815 -5.19665,-3.05266 -5.99684,-1.75793 -1.21582,1.96724 0.48869,3.45823 3.95348,3.45823 3.30832,0 3.4645,-0.12996 2.04336,-1.7003 z M 285,804.80316 c 0,-0.85746 -0.45,-1.2809 -1,-0.94098 -0.55,0.33992 -1,1.04148 -1,1.55902 0,0.51754 0.45,0.94098 1,0.94098 0.55,0 1,-0.70156 1,-1.55902 z m -10.77214,57.4647 c 2.49246,-3.37124 5.49846,-4.13134 3.80195,-0.96137 -1.11567,2.08465 -2.79224,3.38743 -4.74001,3.68324 -0.66766,0.1014 -0.24713,-1.11882 0.93806,-2.72187 z m 15.26777,1.08726 c -0.34232,-0.55389 0.10053,-1.28448 0.98412,-1.62354 1.91464,-0.73472 2.98171,0.0749 2.06137,1.56407 -0.83038,1.34358 -2.23491,1.371 -3.04549,0.0595 z m 17.19822,0.36758 c -0.92563,-0.92563 0.18907,-2.36052 1.83378,-2.36052 0.84214,0 1.17788,0.60386 0.834,1.5 -0.61037,1.59059 -1.61398,1.91432 -2.66778,0.86052 z M 260,861.37361 c 0,-1.24034 3.17723,-5.01143 4.22224,-5.01143 1.21641,0 0.91149,3.46627 -0.42224,4.8 -1.45074,1.45074 -3.8,1.58145 -3.8,0.21143 z m 56,-0.51143 c 0,-0.825 0.45,-1.5 1,-1.5 0.55,0 1,0.675 1,1.5 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-0.675 -1,-1.5 z m -47.8,-2.7 c -1.56383,-1.56383 -1.52393,-3.97474 0.10261,-6.19917 1.12925,-1.54434 1.46362,-1.58743 2.51233,-0.32381 0.95973,1.1564 0.89719,1.717 -0.30261,2.71275 -1.95398,1.62165 -1.93244,3.01023 0.0467,3.01023 0.85746,0 1.2809,0.45 0.94098,1 -0.81829,1.32403 -1.83775,1.26225 -3.3,-0.2 z m 17.04379,-0.05 c 0.22574,-0.6875 1.72574,-1.37269 3.33333,-1.52264 2.78815,-0.26007 2.83341,-0.20246 0.98175,1.25 -2.34613,1.84032 -4.88247,2.00058 -4.31508,0.27264 z m 28.41342,-2.29909 c 0.68043,-1.77318 3.47117,-1.56926 4.09326,0.29909 0.26043,0.78218 -0.53889,1.25 -2.13575,1.25 -1.8935,0 -2.39857,-0.39969 -1.95751,-1.54909 z M 257,855.4212 c 0,-0.51754 0.45,-1.2191 1,-1.55902 0.55,-0.33992 1,0.0835 1,0.94098 0,0.85746 -0.45,1.55902 -1,1.55902 -0.55,0 -1,-0.42344 -1,-0.94098 z m 16.64757,-4.24293 c -0.84141,-3.14186 -0.79974,-3.81609 0.2358,-3.81609 1.24086,0 2.22677,4.28986 1.21779,5.29884 -0.45833,0.45833 -1.11245,-0.20891 -1.45359,-1.48275 z m 4.5919,-1.82793 c 0.69103,-1.10652 1.81984,-1.79564 2.50847,-1.53139 0.68863,0.26425 1.25206,0.0446 1.25206,-0.48815 0,-0.53274 0.675,-0.96862 1.5,-0.96862 2.21211,0 1.82424,2.10245 -0.5,2.71025 -1.1,0.28766 -2,0.92053 -2,1.40638 0,0.48585 -0.90381,0.88337 -2.00847,0.88337 -1.76209,0 -1.85435,-0.2468 -0.75206,-2.01184 z M 269,845.77885 c 0,-1.42084 0.48375,-2.42209 1.075,-2.225 0.59125,0.19708 1.04125,0.68458 1,1.08333 -0.0413,0.39875 -0.075,1.4 -0.075,2.225 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-1.1625 -1,-2.58333 z m -5.42997,0.69664 c -0.60623,-0.98091 2.1816,-3.69502 2.97768,-2.89894 0.70636,0.70637 -0.59157,3.78563 -1.59568,3.78563 -0.4587,0 -1.0806,-0.39901 -1.382,-0.88669 z M 280,792.4212 c 0,-1.06754 0.45,-2.2191 1,-2.55902 0.55,-0.33992 1,-0.17828 1,0.3592 0,0.53747 0.27314,1.68903 0.60699,2.55901 0.39831,1.03799 0.0545,1.58179 -1,1.58179 -0.92404,0 -1.60699,-0.8249 -1.60699,-1.94098 z m 7,-4.85902 c 0,-3.04736 4.53747,-4.07671 5.28975,-1.2 0.43441,1.66121 0.0307,2 -2.38337,2 -1.59851,0 -2.90638,-0.36 -2.90638,-0.8 z m -1,-5.82423 c 0,-2.86866 6.43445,-5.29196 7.39626,-2.78553 0.90984,2.37101 -0.31838,3.71929 -2.06649,2.26848 -1.16517,-0.967 -1.91267,-0.97579 -3.41097,-0.0401 -1.05534,0.65909 -1.9188,0.9098 -1.9188,0.55715 z" + id="path3523" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3525" + d="m 295.25,777.3125 c -11.57748,2.28759 -22.04731,12.59098 -21.71404,24.87521 -2.1508,9.37211 -8.56694,19.45652 -1.48218,28.50428 3.33233,2.3153 5.166,-5.33037 9.9863,-2.09476 4.97091,-4.99882 0.0124,-14.08411 1.24474,-20.74726 -0.21314,-10.68456 3.36449,-24.32549 15.12351,-27.33478 3.74378,-0.0902 9.83456,-1.73894 2.69785,-2.68337 -1.94006,-0.16358 -3.99555,0.20204 -5.85618,-0.51932 z" + style="fill:#a9b6c7;fill-opacity:1" /> + <path + style="fill:#b3bcc9" + d="m 328,864.56218 c 0,-1.54 -0.52779,-3.32779 -1.17287,-3.97287 -0.8553,-0.8553 -0.88425,-1.80634 -0.10694,-3.51235 1.75156,-3.84427 -0.70526,-11.42904 -4.80268,-14.82692 -4.08605,-3.38846 -2.89833,-3.60091 4.55045,-0.81396 13.71103,5.12995 20.56433,25.9261 8.54386,25.9261 -7.01182,0 -7.01182,0 -7.01182,-2.8 z m -32.0895,-20.80784 c -0.63546,-0.76569 -1.95584,-1.39216 -2.93417,-1.39216 -0.97833,0 -2.70805,-1.575 -3.84383,-3.5 -1.13578,-1.925 -2.75523,-3.5 -3.59878,-3.5 -1.95191,0 -1.9676,-1.39503 -0.0337,-3 2.07684,-1.72362 1.89094,-3.35723 -1,-8.78785 -4.06916,-7.64391 -3.45528,-10.71763 1.42055,-7.11277 5.16921,3.82176 11.75054,-2.46804 15.52335,-14.83571 1.3706,-4.49296 0.79613,-18.89883 -0.88313,-22.14616 -1.61213,-3.11751 -1.61213,-3.11751 1.26567,-3.11751 14.78876,0 19.89294,27.79836 8.55988,46.61877 -3.51842,5.84292 -3.51842,5.84292 2.29763,11.07309 3.52162,3.16687 5.17888,5.24555 4.20091,5.26916 -0.88832,0.0214 -2.68832,0.8515 -4,1.84459 -4.74956,3.59595 -14.85824,5.13632 -16.97435,2.58655 z" + id="path3527" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3529" + d="m 305.84375,778.5 c -13.10779,-0.63094 -25.27523,9.74737 -27.22823,22.63972 -2.80862,10.00432 -7.29759,20.47561 -5.25581,30.98002 2.40323,-7.01052 6.93861,-6.58634 10.0934,-1.15553 0.40794,-13.19842 -1.12488,-27.28361 4.76462,-39.66134 2.31447,-7.99178 15.80278,-9.1778 18.08955,-12.76192 l -0.46353,-0.0409 0,0 z" + style="fill:#a6afbc;fill-opacity:1" /> + <path + style="fill:#a9b6c7" + d="m 328.81505,860.61218 c 0.28077,-4.98157 -0.14932,-8.25644 -1.64162,-12.5 -2.02206,-5.75 -2.02206,-5.75 0.0199,-5.75 4.89222,0 12.11687,11.11379 14.13884,21.75 0.61783,3.25 0.61783,3.25 -6.13986,3.25 -6.75769,0 -6.75769,0 -6.37726,-6.75 z m -35.07897,-19.01192 c -4.74666,-2.19188 -8.21023,-7.48361 -6.72034,-10.26749 0.78729,-1.47107 0.57873,-2.8552 -0.85985,-5.70638 -3.78069,-7.49305 -3.71844,-7.75193 1.8914,-7.86675 11.7634,-0.24076 19.60745,-21.36594 14.3503,-38.64746 -1.51369,-4.97583 8.15369,0.5478 11.17109,6.38281 4.79792,9.27815 2.75717,28.21359 -4.13531,38.37023 -3.24804,4.78626 -3.10884,5.61941 1.56663,9.37672 8.38349,6.73716 -5.8507,13.62864 -17.26392,8.35832 z" + id="path3531" + inkscape:connector-curvature="0" /> + <path + style="fill:#a5aeba" + d="m 331,858.94322 c 0,-6.15501 -0.46555,-9.23013 -1.73122,-11.43544 -2.12935,-3.71017 -1.16296,-4.96151 2.15351,-2.78847 3.13478,2.05398 7.07168,8.79205 8.55551,14.64287 0.62768,2.475 1.36978,5.2875 1.64911,6.25 0.44052,1.51793 -0.23044,1.75 -5.05952,1.75 -5.56739,0 -5.56739,0 -5.56739,-8.41896 z m -32,-17.72887 c -5.61325,-0.99824 -11,-6.2765 -11,-10.77847 0,-1.62561 -0.40569,-3.2064 -0.90153,-3.51284 -2.70283,-1.67044 -3.10529,-6.77939 -0.48219,-6.12103 12.46665,3.12893 23.83658,-23.06489 17.88569,-41.20469 -1.76801,-5.38933 6.73506,1.04007 9.60799,7.26486 3.85385,8.35016 1.79095,26.18765 -4.14215,35.81645 -3.77182,6.12126 -3.72602,7.00345 0.53219,10.25135 4.26886,3.25601 4.32839,3.95246 0.50679,5.92869 -5.33516,2.75892 -7.42915,3.16975 -12.00679,2.35568 z" + id="path3533" + inkscape:connector-curvature="0" /> + <path + style="fill:#99a5b4" + d="m 333.58073,865.11218 c -0.25156,-1.2375 -0.72938,-5.35305 -1.06183,-9.14566 -0.33245,-3.79262 -1.06926,-7.76418 -1.63737,-8.8257 -0.93415,-1.74548 -0.82932,-1.82107 1.09629,-0.79051 2.81904,1.5087 5.54287,6.12588 6.99433,11.85613 0.64861,2.56066 1.59521,5.43713 2.10357,6.39217 1.39547,2.62165 1.2385,2.76357 -3.05667,2.76357 -3.3262,0 -4.05617,-0.37006 -4.43832,-2.25 z M 296.5,839.40269 c -3.26564,-1.35967 -7.60209,-6.57417 -8.46488,-10.17887 -0.44254,-1.8489 -1.12962,-4.14914 -1.52686,-5.11164 -0.5766,-1.39711 -0.20967,-1.75 1.81965,-1.75 12.35731,0 23.41609,-23.45864 18.7419,-39.7566 -1.19578,-4.16943 -0.0374,-4.10946 3.7408,0.19368 7.79605,8.87921 6.23321,28.06127 -3.57358,43.86154 -1.72735,2.78303 -1.71887,2.81367 1.52198,5.5 6.50649,5.39319 -3.08727,11.06061 -12.25901,7.24189 z" + id="path3535" + inkscape:connector-curvature="0" /> + <path + style="fill:#929ca9" + d="m 336.78845,865.61218 c -2.13515,-2.45575 -3.34589,-15.95753 -1.27699,-14.24049 0.80007,0.664 2.18621,3.746 3.0803,6.84888 0.8941,3.10289 2.03053,6.42911 2.52541,7.39161 0.6997,1.36086 0.48762,1.75 -0.95371,1.75 -1.01942,0 -2.53817,-0.7875 -3.37501,-1.75 z m -43.75608,-31 c -5.27795,-5.08752 -5.84209,-9.34879 -1.36293,-10.29495 10.17568,-2.14947 19.08676,-19.27014 18.09262,-34.76096 -0.48611,-7.57459 -0.48611,-7.57459 1.78146,-4.93839 6.18016,7.18486 4.77903,27.36115 -2.67669,38.54443 -3.50382,5.25559 -3.54215,6.21682 -0.36683,9.19987 3.11895,2.93011 3.11439,3.39903 -0.0471,4.83949 -5.40941,2.46469 -11.18306,1.49515 -15.42058,-2.58949 z" + id="path3537" + inkscape:connector-curvature="0" /> + <path + style="fill:#8a95a3" + d="m 337.70717,864.61218 c -0.2893,-1.5125 -0.13044,-3.425 0.35301,-4.25 0.6049,-1.03225 0.88849,-0.17472 0.90941,2.75 0.0348,4.86979 -0.49702,5.50174 -1.26242,1.5 z m -43.0654,-31 c -4.91445,-3.9769 -5.74854,-5.95905 -2.89177,-6.87206 5.52757,-1.76659 14.25,-8.96693 14.25,-11.76333 0,-0.62933 0.93323,-2.88544 2.07385,-5.01359 2.4146,-4.50511 5.22038,-17.98198 4.37549,-21.01657 -0.46167,-1.65818 -0.36842,-1.7777 0.45597,-0.58445 4.30235,6.22731 1.17255,26.46135 -5.61277,36.28634 -2.61492,3.78635 -2.61492,3.78635 -0.36567,6.82862 1.23708,1.67324 2.09712,3.17093 1.91119,3.3282 -4.20858,3.5597 -8.7998,3.17382 -14.19629,-1.19316 z" + id="path3539" + inkscape:connector-curvature="0" /> + <path + style="fill:#dce2e8" + d="m 391.65228,865.89841 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" + id="path3541" + inkscape:connector-curvature="0" /> + <path + style="fill:#d4dbe2" + d="m 392,866.9114 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 L 392,866.9114 l 0,0 z" + id="path3543" + inkscape:connector-curvature="0" /> + <path + style="fill:#8a95a3" + d="m 434.65625,773.5 c -7.69852,1.2786 -15.32629,5.38626 -18.86452,12.63087 -3.49594,5.08237 -3.42613,11.3838 -5.34919,17.00235 -2.24966,6.12482 -5.65448,12.27735 -4.91172,19.02303 3.75423,-0.0222 2.8619,10.63169 6.50516,5.35409 1.4767,-4.04082 4.59679,-2.49813 5.84292,0.5615 3.979,-0.57379 5.32978,-6.04312 5.53374,-9.54549 -0.54229,-4.63642 -0.76712,-9.18047 0.0427,-13.81344 0.61233,-7.08534 1.12499,-15.05152 6.21008,-20.51534 4.35824,-4.27477 11.08412,-1.74918 15.90629,-4.87336 3.08875,-4.80718 -5.67463,-5.1833 -8.80978,-5.66344 -0.70074,-0.0675 -1.40294,-0.11979 -2.10569,-0.16077 z" + id="path3545" + inkscape:connector-curvature="0" /> + <path + style="fill:#c9cfd7" + d="m 392.4567,865.61441 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" + id="path3547" + inkscape:connector-curvature="0" /> + <path + style="fill:#99a5b4;fill-opacity:1" + d="m 434.1875,775.03125 c -11.05074,1.9048 -21.83645,11.35271 -21.4665,23.20708 0.1661,8.41655 -5.71764,15.40311 -6.3756,23.67079 3.05476,1.49589 3.12673,9.53471 6.49564,7.59476 1.26814,-2.95465 4.44695,-5.51818 5.8376,-0.90613 4.60406,1.63384 5.39933,-6.84578 5.5132,-10.27583 -0.16403,-6.29624 -1.84939,-12.5838 -0.72716,-18.87389 -0.074,-8.88704 6.23025,-17.78618 15.08559,-19.60653 2.29627,0.0707 11.34814,0.94454 7.00739,-2.57327 -3.43361,-1.96172 -7.55512,-1.83124 -11.37016,-2.23698 z" + id="path3549" + inkscape:connector-curvature="0" /> + <path + style="fill:#b6c5d8" + d="m 393.37309,865.61218 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" + id="path3551" + inkscape:connector-curvature="0" /> + <path + style="fill:#89929e" + d="m 444.55385,834.44931 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" + id="path3553" + inkscape:connector-curvature="0" /> + <path + style="fill:#b4c3d5" + d="m 394.625,866.56443 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z M 432,866.42433 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z M 466.5,865.36218 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z M 425,804.80316 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z M 400,861.37361 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z M 397,855.4212 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 L 397,855.4212 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z M 409,845.77885 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z M 420,792.4212 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" + id="path3555" + inkscape:connector-curvature="0" /> + <path + style="fill:#a9b6c7;fill-opacity:1" + d="m 435.25,775.3125 c -11.51464,2.17614 -21.74671,12.47165 -21.76637,24.53983 -1.58577,8.25648 -6.71378,16.48143 -3.78128,25.06067 1.0866,4.9309 6.02398,4.39495 8.58289,1.2496 4.71845,1.12399 6.65409,-2.86004 5.9672,-6.96556 -0.35381,-5.18853 -1.73818,-10.32891 -0.97603,-15.55434 0.20835,-9.23334 3.44469,-19.54516 12.02425,-24.22714 2.19856,-1.14931 8.5908,-0.31366 7.95359,-3.20579 -2.60088,-0.81861 -5.42262,0.0201 -8.00425,-0.89727 z" + id="path3557" + inkscape:connector-curvature="0" /> + <path + style="fill:#b3bcc9" + d="m 468,864.56218 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" + id="path3559" + inkscape:connector-curvature="0" /> + <path + style="fill:#a6afbc;fill-opacity:1" + d="m 442.84375,778.5 c -13.20195,-0.70071 -25.60047,10.11622 -27.35729,23.09703 -2.73828,9.73599 -7.05259,19.69257 -5.14357,30.00793 1.01878,-4.87956 7.72896,-6.35158 9.719,-1.29958 1.07176,-2.72235 0.14583,-7.32642 0.46935,-10.76056 0.11336,-10.5865 0.5674,-21.90305 6.26952,-31.16656 4.06212,-5.38173 11.72711,-5.46076 16.47253,-9.79719 l -0.42954,-0.0811 0,0 z" + id="path3561" + inkscape:connector-curvature="0" /> + <path + style="fill:#a9b6c7" + d="m 468.81505,860.61218 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" + id="path3563" + inkscape:connector-curvature="0" /> + <path + style="fill:#a5aeba" + d="m 471,858.94322 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" + id="path3565" + inkscape:connector-curvature="0" /> + <path + style="fill:#99a5b4" + d="m 473.58073,865.11218 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 436.5,839.40269 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" + id="path3567" + inkscape:connector-curvature="0" /> + <path + style="fill:#929ca9" + d="m 476.78845,865.61218 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" + id="path3569" + inkscape:connector-curvature="0" /> + <path + style="fill:#8a95a3" + d="m 477.70717,864.61218 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" + id="path3571" + inkscape:connector-curvature="0" /> + <g + id="g3753" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/unknown-gen.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + style="fill:#dce2e8" + d="m 552.51419,862.96792 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" + id="path3634" + inkscape:connector-curvature="0" /> + <path + style="fill:#d4dbe2" + d="m 552.86191,863.98091 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 l -0.91846,-0.0906 0,0 z" + id="path3636" + inkscape:connector-curvature="0" /> + <path + style="fill:#a9b6c7;fill-opacity:1" + d="M 597.40625 773.21875 C 595.32188 773.24058 593.33746 774.043 591.62617 775.19283 C 589.83565 776.35162 588.21998 777.76125 586.52276 779.05054 C 584.44962 780.75514 582.39212 782.57297 580.97963 784.88262 C 579.55503 787.51636 578.96532 790.51165 578.65553 793.46461 C 578.32518 796.21314 578.3273 798.98702 578.21875 801.75 C 578.21379 805.57444 578.06524 809.39782 578.07991 813.2217 C 578.16586 818.32351 578.60197 823.41285 578.71875 828.51248 C 578.70168 830.15958 578.73567 831.82236 578.5769 833.45762 C 578.33168 834.21865 578.01083 835.71864 579.15156 835.84375 C 580.21158 835.82479 580.38667 834.4484 580.3071 833.63153 C 580.53662 831.95048 581.63215 830.49759 582.9375 829.46875 C 583.79001 828.97 584.91056 828.97775 585.78125 829.40625 C 587.10886 830.47618 588.15357 831.86941 589.53087 832.89031 C 591.3188 834.41519 593.04885 836.02388 594.80835 837.57015 C 595.79495 838.27205 597.07861 838.2881 598.2382 838.23934 C 599.30616 838.07102 600.37354 837.88447 601.45772 837.87159 C 602.35178 838.03268 603.78574 837.16217 602.84375 836.25 C 602.03955 835.54663 600.95632 836.01569 600.0101 835.85219 C 598.16743 835.78502 596.38912 834.73743 595.41246 833.18326 C 594.4091 831.42329 593.81389 829.47346 592.98542 827.63083 C 591.32426 823.67734 590.0751 819.55761 589.13503 815.37729 C 588.65683 813.21491 588.18572 811.04368 588.09464 808.82315 C 587.6518 803.64661 588.07822 798.4564 588.3125 793.28125 C 588.74411 790.47251 589.25114 787.5689 590.83615 785.15046 C 592.24561 782.80091 594.0478 780.68013 596.17116 778.94485 C 597.52084 777.76736 598.96123 776.6968 600.34375 775.5625 C 601.00092 774.77824 600.47197 773.34825 599.41372 773.28073 C 598.75335 773.13511 598.07526 773.20822 597.40625 773.21875 z " + id="path3650" + inkscape:connector-curvature="0" /> + <path + style="fill:#b6c5d8;fill-opacity:1" + d="M 595.0625 771.09375 C 591.56252 771.67893 588.23657 773.05474 585.19098 774.85039 C 583.72505 775.78959 582.29326 776.80079 581.08949 778.06676 C 578.82575 780.25375 577.03177 782.91302 575.77929 785.79607 C 574.05487 790.25238 572.59782 794.8053 571.23307 799.38281 C 570.05444 803.20159 568.94058 807.04329 567.64674 810.82428 C 566.66606 813.14332 565.39105 815.3295 564.5 817.6875 C 564.42831 818.51967 563.97924 819.40158 564.34375 820.21875 C 564.68766 820.85431 564.9567 819.49159 565.24784 819.21679 C 565.95569 818.04667 566.92649 817.05822 567.75 815.96875 C 569.77564 813.52745 571.84249 811.11072 574.09375 808.875 C 574.98603 808.19725 576.0249 807.72879 577.09375 807.40625 C 578.05295 807.13244 579.13947 807.31209 579.87925 808.00965 C 580.67752 808.6981 580.93153 809.82624 580.80573 810.83893 C 580.73674 813.08507 580.18387 815.27527 579.86412 817.49039 C 579.48695 818.99786 579.26809 820.53865 578.96875 822.0625 C 578.95008 822.94739 579.77175 823.96052 580.71875 823.71875 C 581.92395 823.30114 582.40486 822.00689 582.73087 820.88431 C 583.81179 817.40879 583.89504 813.73731 584.04265 810.13005 C 584.29521 806.25431 584.47279 802.3688 584.94329 798.5119 C 585.46426 794.86024 586.18978 791.23116 587.21875 787.6875 C 587.72654 786.21475 588.504 784.86499 589.35116 783.56495 C 590.3963 782.02014 591.77706 780.58963 593.5625 779.9375 C 597.33443 778.40539 601.41851 777.90273 605.28125 776.65625 C 606.13736 776.2424 606.95067 775.27879 606.625 774.28125 C 606.25921 773.15924 605.05177 772.67925 604.01222 772.38557 C 601.70944 771.72394 599.3308 771.35218 596.94745 771.13597 C 596.31893 771.11479 595.69101 771.02455 595.0625 771.09375 z " + id="path3638" + inkscape:connector-curvature="0" /> + <path + style="fill:#c9cfd7" + d="m 553.31861,862.68392 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" + id="path3640" + inkscape:connector-curvature="0" /> + <path + style="fill:#b6c5d8" + d="m 554.235,862.68169 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" + id="path3644" + inkscape:connector-curvature="0" /> + <path + style="fill:#89929e" + d="m 605.41576,831.51882 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" + id="path3646" + inkscape:connector-curvature="0" /> + <path + style="fill:#b4c3d5" + d="m 555.48691,863.63394 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z m 37.375,-0.1401 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z m 26.80308,-0.60687 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z m -35.40922,-40.45872 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z m -46.69385,-2.34909 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z m -56.65721,-0.39189 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 l -0.0789,-0.36537 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z m -9.23947,-3.57149 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z m 16.42997,-54.05429 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" + id="path3648" + inkscape:connector-curvature="0" /> + <path + style="fill:#b3bcc9" + d="m 628.86191,861.63169 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" + id="path3652" + inkscape:connector-curvature="0" /> + <path + style="fill:#a9b6c7" + d="m 629.67696,857.68169 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" + id="path3656" + inkscape:connector-curvature="0" /> + <path + style="fill:#a5aeba" + d="m 631.86191,856.01273 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" + id="path3658" + inkscape:connector-curvature="0" /> + <path + style="fill:#99a5b4" + d="m 634.44264,862.18169 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 597.36191,836.4722 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" + id="path3661" + inkscape:connector-curvature="0" /> + <path + style="fill:#99a5b4;fill-opacity:1" + d="M 597.625 771.4375 C 594.40751 772.24745 591.26611 773.32843 588.12645 774.39424 C 587.15491 774.76566 586.27356 775.36714 585.53125 776.09375 C 584.67839 776.84747 584.01295 777.78053 583.2883 778.65165 C 581.85471 780.47191 580.57894 782.40707 579.21875 784.28125 C 578.33679 785.77623 577.51778 787.31313 576.93141 788.9507 C 576.15841 790.82456 575.55181 792.76196 574.89448 794.6783 C 573.40592 799.26407 572.02784 803.88585 570.73921 808.53134 C 570.35837 810.07024 569.92171 811.59852 569.625 813.15625 C 569.52666 814.48107 570.05265 815.72844 570.4375 816.96875 C 571.09193 818.86517 571.68547 820.78193 572.3125 822.6875 C 572.7512 823.72458 573.84442 824.37935 574.9375 824.5 C 576.17953 824.48074 577.45825 824.53752 578.65625 824.15625 C 579.67688 823.76223 580.2613 822.79551 580.52187 821.77815 C 581.2546 819.2181 581.54139 816.56049 582.02236 813.94732 C 582.42286 811.57105 582.79807 809.1906 583.1875 806.8125 C 583.79691 804.59502 584.47547 802.39467 585.22723 800.22212 C 586.01002 798.19274 586.94292 796.22548 587.78125 794.21875 C 588.67128 792.31932 589.6479 790.45313 590.79616 788.69674 C 592.20393 786.68541 594.13474 785.12012 596.12428 783.71644 C 597.3642 782.96159 598.54641 782.11687 599.81351 781.40564 C 601.24146 780.52347 602.76926 779.81788 604.28125 779.09375 C 605.28021 778.78603 606.23394 778.2793 607.27609 778.14323 C 608.22477 778.0464 609.20907 778.2009 610.125 777.875 C 611.04955 777.30706 610.85506 775.88727 609.96875 775.375 C 609.16151 774.74404 608.22535 774.2968 607.33529 773.7957 C 605.654 772.95095 603.86097 772.35357 602.03184 771.92407 C 600.6747 771.6416 599.29267 771.45323 597.90625 771.40625 L 597.72456 771.42644 L 597.625 771.4375 z " + id="path3642" + inkscape:connector-curvature="0" /> + <path + style="fill:#929ca9" + d="m 637.65036,862.68169 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" + id="path3663" + inkscape:connector-curvature="0" /> + <path + style="fill:#8a95a3;fill-opacity:1" + d="m 604.07679,778.57601 c -2.07993,0.18622 -4.16688,0.39931 -6.19063,0.93582 -1.96265,0.5268 -3.86859,1.26151 -5.67823,2.18771 -1.2785,0.72607 -2.59489,1.40817 -3.73224,2.35094 -1.87066,1.41739 -3.50157,3.11504 -5.0864,4.83803 -0.8029,1.1366 -1.66147,2.24315 -2.35815,3.44834 -1.04606,1.93489 -1.92687,3.96033 -2.55709,6.06935 -1.02826,3.17356 -1.89607,6.39655 -2.77337,9.61433 -0.79085,2.99079 -1.58802,5.98101 -2.3162,8.9875 -0.72532,3.0427 -1.21047,6.14099 -1.45053,9.25973 -0.0808,1.12348 -0.27816,2.24516 -0.13834,3.37206 0.0627,1.15775 0.14707,2.31618 0.28118,3.46744 0.0295,0.43529 0.64114,0.88693 0.8125,0.28125 0.43782,-0.93637 0.98489,-1.88776 2.03125,-2.21875 0.77048,-0.37522 1.64462,-0.58501 2.49468,-0.42232 0.99503,0.20928 2.02353,0.51766 2.87283,1.09107 1.15247,0.76152 2.17094,1.75918 2.82587,2.98452 0.67432,0.79355 0.86715,1.92774 1.49412,2.69048 0.55618,0.0517 0.46735,-0.84631 0.60893,-1.24468 0.20794,-1.87479 -0.22577,-3.73167 -0.54643,-5.56782 -0.32562,-1.64053 -0.80423,-3.25041 -0.99895,-4.91491 -0.27135,-1.81202 -0.60341,-3.6237 -0.59359,-5.46277 -0.0577,-1.99807 -0.16648,-3.99431 -0.14423,-5.99405 -0.0352,-1.23626 -10e-4,-2.47036 0.11341,-3.70195 0.24423,-2.90098 0.56334,-5.79741 0.99836,-8.67632 0.6275,-2.95685 1.33887,-5.92442 2.64286,-8.66725 0.61629,-1.36529 1.23898,-2.73456 1.95854,-4.04735 0.72079,-1.14986 1.59611,-2.22584 2.73697,-2.98238 1.71322,-1.17297 3.55581,-2.14034 5.44826,-2.98937 1.80419,-0.81317 3.6119,-1.62339 5.33837,-2.5949 0.82255,-0.40084 1.88367,-0.6713 2.3005,-1.56976 0.12731,-0.30615 0.0397,-0.72575 -0.39425,-0.52399 z" + id="path3654" + inkscape:connector-curvature="0" /> + <path + style="fill:#8a95a3" + d="m 638.56908,861.68169 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" + id="path3665" + inkscape:connector-curvature="0" /> + </g> + <use + x="0" + y="0" + xlink:href="#path3634" + id="use3667" + transform="matrix(0.24124111,0,0,0.24124111,456.36314,718.26525)" + width="744.09448" + height="1052.3622" /> + <use + x="0" + y="0" + xlink:href="#path3636" + id="use3669" + transform="matrix(0.24124111,0,0,0.24124111,456.36314,718.26525)" + width="744.09448" + height="1052.3622" /> + <use + x="0" + y="0" + xlink:href="#path3638" + id="use3671" + transform="matrix(0.24124111,0,0,0.24124111,456.36314,718.26525)" + width="744.09448" + height="1052.3622" /> + <use + x="0" + y="0" + xlink:href="#path3640" + id="use3673" + transform="matrix(0.24124111,0,0,0.24124111,456.36314,718.26525)" + width="744.09448" + height="1052.3622" /> + <use + x="0" + y="0" + xlink:href="#path3642" + id="use3675" + transform="matrix(0.24124111,0,0,0.24124111,456.36314,718.26525)" + width="744.09448" + height="1052.3622" /> + <use + x="0" + y="0" + xlink:href="#path3644" + id="use3677" + transform="matrix(0.24124111,0,0,0.24124111,456.36314,718.26525)" + width="744.09448" + height="1052.3622" /> + <use + x="0" + y="0" + xlink:href="#path3646" + id="use3679" + transform="matrix(0.24124111,0,0,0.24124111,456.36314,718.26525)" + width="744.09448" + height="1052.3622" /> + <use + x="0" + y="0" + xlink:href="#path3648" + id="use3681" + transform="matrix(0.24124111,0,0,0.24124111,456.36314,718.26525)" + width="744.09448" + height="1052.3622" /> + <use + x="0" + y="0" + xlink:href="#path3650" + id="use3683" + transform="matrix(0.24124111,0,0,0.24124111,456.36314,718.26525)" + width="744.09448" + height="1052.3622" /> + <use + x="0" + y="0" + xlink:href="#path3652" + id="use3685" + transform="matrix(0.24124111,0,0,0.24124111,456.36314,718.26525)" + width="744.09448" + height="1052.3622" /> + <use + x="0" + y="0" + xlink:href="#path3654" + id="use3687" + transform="matrix(0.24124111,0,0,0.24124111,456.06567,717.53072)" + width="744.09448" + height="1052.3622" /> + <use + x="0" + y="0" + xlink:href="#path3656" + id="use3689" + transform="matrix(0.24124111,0,0,0.24124111,456.36314,718.26525)" + width="744.09448" + height="1052.3622" /> + <use + x="0" + y="0" + xlink:href="#path3658" + id="use3691" + transform="matrix(0.24124111,0,0,0.24124111,456.36314,718.26525)" + width="744.09448" + height="1052.3622" /> + <use + x="0" + y="0" + xlink:href="#path3661" + id="use3693" + transform="matrix(0.24124111,0,0,0.24124111,456.36314,718.26525)" + width="744.09448" + height="1052.3622" /> + <use + x="0" + y="0" + xlink:href="#path3663" + id="use3695" + transform="matrix(0.24124111,0,0,0.24124111,456.36314,718.26525)" + width="744.09448" + height="1052.3622" /> + <use + x="0" + y="0" + xlink:href="#path3665" + id="use3697" + transform="matrix(0.24124111,0,0,0.24124111,456.36314,718.26525)" + width="744.09448" + height="1052.3622" /> + <g + id="g3310-8" + transform="matrix(0.24077148,0,0,0.24077148,683.56915,801.39042)"> + <path + style="fill:#dce2e8" + d="m 15.652276,526.89841 c -0.610306,-1.59043 1.679869,-11.36996 3.481806,-14.86804 3.193736,-6.19997 6.408908,-8.92653 16.688018,-14.15192 15.103201,-7.67772 14.080467,-6.32495 10.351016,-13.69128 -14.619009,-28.87514 0.626491,-58.97154 24.060007,-47.49727 13.579837,6.6494 16.194478,31.36184 5.166481,48.83132 C 74.079822,487.61189 73,489.56197 73,489.85473 c 0,0.96965 10.409081,7.10101 16,9.42463 10.938874,4.54628 20.11609,18.84024 17.46298,27.19945 -0.81757,2.57596 -89.82541,2.98723 -90.810704,0.4196 z" + id="path3334-4" + inkscape:connector-curvature="0" /> + <path + style="fill:#d4dbe2" + d="m 16,527.9114 c 0,-12.82229 7.444121,-22.89231 22.182697,-30.00761 12.879762,-6.21793 12.949565,-6.32177 9.035801,-13.4409 -14.220674,-25.86739 -1.36795,-55.39011 20.882279,-47.9666 14.595085,4.86946 18.104408,32.01735 6.356458,49.17313 -2.031924,2.96726 -2.353004,4.11342 -1.455316,5.19507 2.007816,2.41927 10.29052,7.29999 16.261866,9.58257 C 98.567144,504.00332 106,514.86317 106,524.89969 c 0,3.46249 0,3.46249 -45,3.46249 -24.75,0 -45,-0.20285 -45,-0.45078 z" + id="path3332-9" + inkscape:connector-curvature="0" /> + <path + style="fill:#c9cfd7" + d="m 16.456704,526.61441 c 0.368875,-0.96127 1.119209,-3.83918 1.667409,-6.39535 2.216133,-10.33347 6.136986,-14.70774 18.826133,-21.00325 14.555889,-7.22166 14.803417,-7.54851 10.923343,-14.42362 -9.684632,-17.16023 -7.20029,-40.63993 4.92623,-46.55817 22.784152,-11.11959 37.313196,18.96264 22.150804,45.86301 C 73.327781,486.9762 72,489.7139 72,490.18081 c 0,1.40694 10.137395,7.90103 15.78241,10.11034 9.778791,3.82716 13.64453,8.03488 16.63576,18.10744 3.27247,11.01959 7.88554,9.96359 -43.525159,9.96359 -42.526253,0 -45.068616,-0.1 -44.436307,-1.74777 z" + id="path3330-2" + inkscape:connector-curvature="0" /> + <path + style="fill:#b6c5d8" + d="m 17.373092,526.61218 c 0.279327,-0.9625 1.031608,-3.77247 1.671735,-6.24438 2.783906,-10.75028 5.91216,-14.19465 18.510886,-20.3814 14.312213,-7.02817 14.766578,-7.73334 10.45997,-16.23375 -9.151893,-18.06407 -4.861359,-45.39047 7.126784,-45.39047 1.093959,0 2.932921,-0.50516 4.086582,-1.12258 17.687459,-9.46604 28.608915,25.64678 14.765412,47.47125 -2.432458,3.83481 -2.830287,5.14422 -1.902558,6.26207 2.544299,3.06569 11.034196,8.55209 15.595883,10.07848 10.544154,3.52818 15.517054,10.12038 17.773324,23.56078 0.62952,3.75 0.62952,3.75 -43.983185,3.75 -42.015093,0 -44.583129,-0.10189 -44.104833,-1.75 z" + id="path3328-0" + inkscape:connector-curvature="0" /> + <path + style="fill:#b4c3d5" + d="m 18.625,527.56443 c -0.271169,-0.43876 -0.07962,-1.45126 0.42567,-2.25 0.717286,-1.13386 0.922062,-0.95895 0.934017,0.79775 0.01574,2.31303 -0.49232,2.85568 -1.359687,1.45225 z M 56,527.42433 c 0,-0.51582 0.868825,-0.87241 1.930722,-0.79241 1.061897,0.08 1.710339,0.50202 1.440983,0.93785 C 58.686419,528.67858 56,528.5627 56,527.42433 z m 7.696917,-0.45528 c -0.409197,-1.04122 -0.508402,-2.12872 -0.220456,-2.41666 0.91206,-0.91206 1.714561,0.58256 1.332392,2.48152 -0.350243,1.74033 -0.403729,1.73721 -1.111936,-0.0649 z M 90.5,526.36218 c -0.591982,-1.86517 -1.736214,-2.47275 -3.897148,-2.06937 -0.493432,0.0921 -0.155932,-0.96377 0.75,-2.3464 1.83229,-2.79643 2.167845,-5.58423 0.672148,-5.58423 -0.540872,0 -0.718644,-1.28178 -0.399256,-2.87872 0.692849,-3.46424 -1.332361,-5.24299 -3.1458,-2.76296 -1.080063,1.47707 -1.357435,1.49422 -2.47074,0.15277 -0.689752,-0.8311 -2.128577,-1.51109 -3.19739,-1.51109 -1.068813,0 -2.769543,-0.44219 -3.779399,-0.98265 -1.551676,-0.83043 -1.753393,-0.66637 -1.302178,1.05908 0.390745,1.49421 -0.0383,2.19137 -1.599905,2.59974 -1.278027,0.33421 -2.433926,1.71612 -2.882081,3.4456 -0.926234,3.57446 -2.640327,3.80366 -3.064627,0.4098 -0.239509,-1.91577 0.273933,-2.75503 2.113306,-3.45436 1.336324,-0.50807 2.68336,-1.89384 2.993412,-3.07948 0.451486,-1.72648 0.229815,-2.01748 -1.113305,-1.46147 -5.685387,2.35358 -8.400394,2.32578 -10.656986,-0.10913 -2.239511,-2.41647 -2.239511,-2.41647 -5.128955,0.26138 -2.847928,2.63937 -5.360813,0.88121 -2.63559,-1.84402 1.780268,-1.78026 -1.938125,-7.92517 -4.444221,-7.34438 -3.615262,0.83783 -3.517367,-1.10555 0.198459,-3.93974 4.186314,-3.19306 4.282774,-4.3519 0.84984,-10.20976 -3.029424,-5.16932 -5.077383,-19.22645 -3.004036,-20.61961 0.806655,-0.54203 0.627922,-1.16489 -0.605548,-2.11025 -3.325028,-2.54837 -2.212109,-5.47361 1.355956,-3.56404 2.689657,1.43946 9.562135,-2.54678 7.881678,-4.57161 -1.614969,-1.94592 0.543446,-2.81116 2.39466,-0.95995 1.932595,1.9326 0.234654,6.47485 -2.420364,6.47485 -2.390146,0 -4.051441,2.23713 -2.965777,3.99377 0.740689,1.19846 1.218594,1.12186 2.987344,-0.47884 3.406254,-3.08261 7.063255,-3.27149 3.920021,-0.20246 -1.321935,1.29073 -3.198156,2.63706 -4.169381,2.99186 -1.463856,0.53475 -1.653838,1.37626 -1.110841,4.92037 1.036819,6.76728 2.913385,6.57626 2.640423,-0.26877 -0.134821,-3.38089 0.142221,-3.95593 1.905896,-3.95593 1.571318,0 1.938872,0.47715 1.540636,2 -0.287656,1.1 -0.115141,2 0.383369,2 0.498509,0 0.96263,-0.45 1.03138,-1 0.238805,-1.91044 0.467909,-2.51699 2.115671,-5.60124 1.187834,-2.22337 1.350686,-3.4074 0.575302,-4.18279 -0.621603,-0.6216 -0.749078,-1.85432 -0.299757,-2.89875 1.303858,-3.03077 1.124261,-9.3161 -0.266216,-9.31669 -1.489085,-6.3e-4 -1.676094,-2.61915 -0.25,-3.50053 2.022248,-1.24982 1.004309,-3.5 -1.583333,-3.5 -1.628176,0 -2.425149,-0.46217 -2.155505,-1.25 0.8577,-2.50597 12.235836,-1.56907 15.262791,1.25676 9.369225,8.74672 9.558066,30.04723 0.394255,44.47037 -3.908079,6.15102 3.276749,13.99627 15.520797,16.94746 8.108519,1.9544 13.904595,10.2116 16.022105,22.82541 0.75747,4.5122 -13.553142,6.18611 -14.96111,1.75 z m -6.090775,-20.1003 c -1.883722,-2.0815 -5.196659,-3.05266 -5.996842,-1.75793 -1.215823,1.96724 0.488687,3.45823 3.953475,3.45823 3.308319,0 3.464506,-0.12996 2.043367,-1.7003 z M 49,465.80316 c 0,-0.85746 -0.45,-1.2809 -1,-0.94098 -0.55,0.33992 -1,1.04148 -1,1.55902 0,0.51754 0.45,0.94098 1,0.94098 0.55,0 1,-0.70156 1,-1.55902 z m -10.772141,57.4647 c 2.492459,-3.37124 5.498463,-4.13134 3.801947,-0.96137 -1.115671,2.08465 -2.792239,3.38743 -4.740006,3.68324 -0.667664,0.1014 -0.247131,-1.11882 0.938059,-2.72187 z m 15.267776,1.08726 c -0.34232,-0.55389 0.10053,-1.28448 0.984111,-1.62354 1.914649,-0.73472 2.981717,0.0749 2.061373,1.56407 -0.830379,1.34358 -2.234909,1.371 -3.045484,0.0595 z m 17.198218,0.36758 c -0.925629,-0.92563 0.189072,-2.36052 1.833779,-2.36052 0.842134,0 1.177876,0.60386 0.833994,1.5 -0.610368,1.59059 -1.613974,1.91432 -2.667773,0.86052 z M 24,522.37361 c 0,-1.24034 3.17723,-5.01143 4.222241,-5.01143 1.216405,0 0.911488,3.46627 -0.422241,4.8 -1.450736,1.45074 -3.8,1.58145 -3.8,0.21143 z m 56,-0.51143 c 0,-0.825 0.45,-1.5 1,-1.5 0.55,0 1,0.675 1,1.5 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-0.675 -1,-1.5 z m -47.8,-2.7 c -1.563834,-1.56383 -1.523926,-3.97474 0.102613,-6.19917 1.129249,-1.54434 1.463614,-1.58743 2.512331,-0.32381 0.959725,1.1564 0.897189,1.717 -0.302613,2.71275 -1.953977,1.62165 -1.932441,3.01023 0.04669,3.01023 0.857459,0 1.280902,0.45 0.940983,1 -0.818297,1.32403 -1.837753,1.26225 -3.3,-0.2 z m 17.043786,-0.05 c 0.225748,-0.6875 1.725748,-1.37269 3.333333,-1.52264 2.788155,-0.26007 2.833407,-0.20246 0.981751,1.25 -2.346126,1.84032 -4.882473,2.00058 -4.315084,0.27264 z m 28.413426,-2.29909 c 0.680432,-1.77318 3.471169,-1.56926 4.093255,0.29909 0.260434,0.78218 -0.538884,1.25 -2.135749,1.25 -1.8935,0 -2.398572,-0.39969 -1.957506,-1.54909 z M 21,516.4212 c 0,-0.51754 0.45,-1.2191 1,-1.55902 0.55,-0.33992 1,0.0835 1,0.94098 0,0.85746 -0.45,1.55902 -1,1.55902 -0.55,0 -1,-0.42344 -1,-0.94098 z m 16.647568,-4.24293 c -0.841403,-3.14186 -0.799742,-3.81609 0.235801,-3.81609 1.240865,0 2.226771,4.28986 1.217791,5.29884 -0.458333,0.45833 -1.11245,-0.20891 -1.453592,-1.48275 z m 4.591902,-1.82793 c 0.691029,-1.10652 1.819842,-1.79564 2.508473,-1.53139 C 45.436575,509.0832 46,508.86353 46,508.3308 c 0,-0.53274 0.675,-0.96862 1.5,-0.96862 2.212109,0 1.824239,2.10245 -0.5,2.71025 -1.1,0.28766 -2,0.92053 -2,1.40638 0,0.48585 -0.903813,0.88337 -2.008474,0.88337 -1.762089,0 -1.854346,-0.2468 -0.752056,-2.01184 z M 33,506.77885 c 0,-1.42084 0.48375,-2.42209 1.075,-2.225 0.59125,0.19708 1.04125,0.68458 1,1.08333 -0.04125,0.39875 -0.075,1.4 -0.075,2.225 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-1.1625 -1,-2.58333 z m -5.429973,0.69664 c -0.606232,-0.98091 2.181599,-3.69502 2.977678,-2.89894 0.706368,0.70637 -0.591568,3.78563 -1.595677,3.78563 -0.458697,0 -1.080597,-0.39901 -1.382001,-0.88669 z M 44,453.4212 c 0,-1.06754 0.45,-2.2191 1,-2.55902 0.55,-0.33992 1,-0.17828 1,0.3592 0,0.53747 0.273145,1.68903 0.606989,2.55901 0.398311,1.03799 0.05452,1.58179 -1,1.58179 C 44.682954,455.36218 44,454.53728 44,453.4212 z m 7,-4.85902 c 0,-3.04736 4.537474,-4.07671 5.289749,-1.2 0.434416,1.66121 0.03068,2 -2.383369,2 -1.598509,0 -2.90638,-0.36 -2.90638,-0.8 z m -1,-5.82423 c 0,-2.86866 6.434447,-5.29196 7.396256,-2.78553 0.909842,2.37101 -0.318374,3.71929 -2.066485,2.26848 -1.165167,-0.967 -1.912674,-0.97579 -3.410972,-0.0401 C 50.863459,442.83989 50,443.0906 50,442.73795 z" + id="path3326-0" + inkscape:connector-curvature="0" /> + <path + style="fill:#b3bcc9" + d="m 92,525.56218 c 0,-1.54 -0.527793,-3.32779 -1.172874,-3.97287 -0.855295,-0.8553 -0.884251,-1.80634 -0.106941,-3.51235 1.75157,-3.84427 -0.705254,-11.42904 -4.802674,-14.82692 -4.086046,-3.38846 -2.898331,-3.60091 4.550449,-0.81396 13.71103,5.12995 20.56433,25.9261 8.543858,25.9261 -7.011818,0 -7.011818,0 -7.011818,-2.8 z M 59.910502,504.75434 c -0.635465,-0.76569 -1.955842,-1.39216 -2.934171,-1.39216 -0.978329,0 -2.708052,-1.575 -3.84383,-3.5 -1.135778,-1.925 -2.755227,-3.5 -3.598776,-3.5 -1.951918,0 -1.967601,-1.39503 -0.03372,-3 2.076834,-1.72362 1.890939,-3.35723 -1,-8.78785 -4.069166,-7.64391 -3.455289,-10.71763 1.420545,-7.11277 5.169207,3.82176 11.750544,-2.46804 15.52335,-14.83571 1.370596,-4.49296 0.796129,-18.89883 -0.883128,-22.14616 -1.612127,-3.11751 -1.612127,-3.11751 1.26567,-3.11751 14.78876,0 19.89294,27.79836 8.559878,46.61877 -3.518421,5.84292 -3.518421,5.84292 2.297632,11.07309 3.521616,3.16687 5.178879,5.24555 4.200912,5.26916 -0.888328,0.0214 -2.688328,0.8515 -4,1.84459 -4.749564,3.59595 -14.858241,5.13632 -16.974357,2.58655 z" + id="path3324-6" + inkscape:connector-curvature="0" /> + <path + style="fill:#a9b6c7" + d="m 92.815054,521.61218 c 0.280763,-4.98157 -0.149325,-8.25644 -1.641625,-12.5 -2.022056,-5.75 -2.022056,-5.75 0.0199,-5.75 4.892222,0 12.116871,11.11379 14.138841,21.75 0.61783,3.25 0.61783,3.25 -6.139863,3.25 -6.757689,0 -6.757689,0 -6.377257,-6.75 z M 57.736081,502.60026 c -4.74666,-2.19188 -8.21023,-7.48361 -6.720339,-10.26749 0.787293,-1.47107 0.578728,-2.8552 -0.859855,-5.70638 -3.780683,-7.49305 -3.71844,-7.75193 1.891408,-7.86675 11.763399,-0.24076 19.607447,-21.36594 14.350292,-38.64746 -1.513683,-4.97583 8.15369,0.5478 11.171092,6.38281 4.79792,9.27815 2.757176,28.21359 -4.135306,38.37023 -3.248042,4.78626 -3.108843,5.61941 1.566627,9.37672 8.383493,6.73716 -5.850701,13.62864 -17.263919,8.35832 z" + id="path3322-9" + inkscape:connector-curvature="0" /> + <path + style="fill:#a5aeba" + d="m 95,519.94322 c 0,-6.15501 -0.465546,-9.23013 -1.731223,-11.43544 -2.129347,-3.71017 -1.162952,-4.96151 2.153516,-2.78847 3.134773,2.05398 7.071677,8.79205 8.555507,14.64287 0.62768,2.475 1.36978,5.2875 1.64911,6.25 0.44052,1.51793 -0.23044,1.75 -5.05952,1.75 -5.56739,0 -5.56739,0 -5.56739,-8.41896 z M 63,502.21435 c -5.613254,-0.99824 -11,-6.2765 -11,-10.77847 0,-1.62561 -0.40569,-3.2064 -0.901534,-3.51284 -2.70283,-1.67044 -3.10529,-6.77939 -0.482187,-6.12103 12.466652,3.12893 23.836582,-23.06489 17.885689,-41.20469 -1.768008,-5.38933 6.735063,1.04007 9.607989,7.26486 3.853849,8.35016 1.790957,26.18765 -4.142144,35.81645 -3.771821,6.12126 -3.726023,7.00345 0.532187,10.25135 4.268856,3.25601 4.328389,3.95246 0.506787,5.92869 -5.335159,2.75892 -7.429145,3.16975 -12.006787,2.35568 z" + id="path3320-1" + inkscape:connector-curvature="0" /> + <path + style="fill:#99a5b4" + d="m 97.580726,526.11218 c -0.251559,-1.2375 -0.72938,-5.35305 -1.061826,-9.14566 -0.332446,-3.79262 -1.069261,-7.76418 -1.637367,-8.8257 -0.934152,-1.74548 -0.829324,-1.82107 1.096284,-0.79051 2.819043,1.5087 5.542873,6.12588 6.994333,11.85613 0.64861,2.56066 1.59521,5.43713 2.10357,6.39217 1.39547,2.62165 1.2385,2.76357 -3.05667,2.76357 -3.326202,0 -4.056171,-0.37006 -4.438324,-2.25 z M 60.5,500.40269 c -3.265642,-1.35967 -7.602087,-6.57417 -8.46488,-10.17887 -0.442539,-1.8489 -1.129624,-4.14914 -1.526857,-5.11164 -0.576601,-1.39711 -0.209671,-1.75 1.819649,-1.75 12.357308,0 23.416086,-23.45864 18.741894,-39.7566 -1.195778,-4.16943 -0.0374,-4.10946 3.740804,0.19368 7.79605,8.87921 6.233208,28.06127 -3.573583,43.86154 -1.72735,2.78303 -1.718871,2.81367 1.521988,5.5 6.506488,5.39319 -3.087271,11.06061 -12.259015,7.24189 z" + id="path3318-5" + inkscape:connector-curvature="0" /> + <path + style="fill:#929ca9" + d="m 100.78845,526.61218 c -2.135149,-2.45575 -3.345892,-15.95753 -1.276991,-14.24049 0.800071,0.664 2.186211,3.746 3.080301,6.84888 0.8941,3.10289 2.03053,6.42911 2.52541,7.39161 0.6997,1.36086 0.48762,1.75 -0.95371,1.75 -1.01942,0 -2.53817,-0.7875 -3.37501,-1.75 z m -43.756084,-31 c -5.277946,-5.08752 -5.842086,-9.34879 -1.362926,-10.29495 10.175676,-2.14947 19.086762,-19.27014 18.092621,-34.76096 -0.486107,-7.57459 -0.486107,-7.57459 1.781461,-4.93839 6.180155,7.18486 4.779027,27.36115 -2.676692,38.54443 -3.503817,5.25559 -3.542145,6.21682 -0.36683,9.19987 3.118955,2.93011 3.114395,3.39903 -0.04705,4.83949 -5.40941,2.46469 -11.183057,1.49515 -15.420584,-2.58949 z" + id="path3316-6" + inkscape:connector-curvature="0" /> + <path + style="fill:#8a95a3" + d="m 101.70717,525.61218 c -0.2893,-1.5125 -0.13044,-3.425 0.35301,-4.25 0.6049,-1.03225 0.88849,-0.17472 0.90941,2.75 0.0348,4.86979 -0.49702,5.50174 -1.26242,1.5 z m -43.065403,-31 c -4.91445,-3.9769 -5.748541,-5.95905 -2.891767,-6.87206 5.527572,-1.76659 14.25,-8.96693 14.25,-11.76333 0,-0.62933 0.933234,-2.88544 2.073853,-5.01359 2.414595,-4.50511 5.220373,-17.98198 4.375484,-21.01657 -0.461667,-1.65818 -0.368419,-1.7777 0.455976,-0.58445 4.302348,6.22731 1.172547,26.46135 -5.612772,36.28634 -2.614917,3.78635 -2.614917,3.78635 -0.365672,6.82862 1.237084,1.67324 2.097118,3.17093 1.911187,3.3282 -4.208579,3.5597 -8.799793,3.17382 -14.196289,-1.19316 z" + id="path3314-9" + inkscape:connector-curvature="0" /> + <path + style="fill:#89929e" + d="m 68.553851,495.44931 c -0.369537,-0.59792 -1.542351,-1.08713 -2.606255,-1.08713 -1.842561,0 -1.829965,-0.12007 0.265385,-2.52994 2.199755,-2.52994 2.199755,-2.52994 3.583106,0.11028 1.388266,2.6496 0.236851,5.90001 -1.242236,3.50679 z m -9.192225,-2.58713 c -0.316582,-0.825 -1.202459,-1.5 -1.968615,-1.5 -0.766156,0 -1.393011,-0.45 -1.393011,-1 0,-0.55 0.81,-1 1.8,-1 0.99,0 2.31509,-0.51509 2.944645,-1.14465 0.859526,-0.85952 1.306427,-0.50004 1.794143,1.44317 0.99716,3.973 -1.799649,6.79122 -3.177162,3.20148 z m 8.279576,-8.19213 c -0.380672,-0.38067 0.492512,-1.63673 1.940409,-2.79125 1.907671,-1.52112 2.773627,-3.32052 3.144932,-6.53498 0.281816,-2.43973 1.077686,-4.89617 1.768601,-5.45875 0.690915,-0.56259 1.74847,-1.92289 2.350124,-3.02289 1.570686,-2.87168 1.407159,-0.26284 -0.427266,6.81644 -2.261098,8.72586 -6.159851,13.60838 -8.7768,10.99143 z" + id="path3312-1" + inkscape:connector-curvature="0" /> + </g> + <g + id="g3771" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/unknown-gen.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:connector-curvature="0" + id="path3773" + d="m 552.51419,862.96792 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" + style="fill:#dce2e8" /> + <path + inkscape:connector-curvature="0" + id="path3775" + d="m 552.86191,863.98091 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 l -0.91846,-0.0906 0,0 z" + style="fill:#d4dbe2" /> + <path + inkscape:connector-curvature="0" + id="path3777" + d="M 597.40625 773.21875 C 595.32188 773.24058 593.33746 774.043 591.62617 775.19283 C 589.83565 776.35162 588.21998 777.76125 586.52276 779.05054 C 584.44962 780.75514 582.39212 782.57297 580.97963 784.88262 C 579.55503 787.51636 578.96532 790.51165 578.65553 793.46461 C 578.32518 796.21314 578.3273 798.98702 578.21875 801.75 C 578.21379 805.57444 578.06524 809.39782 578.07991 813.2217 C 578.16586 818.32351 578.60197 823.41285 578.71875 828.51248 C 578.70168 830.15958 578.73567 831.82236 578.5769 833.45762 C 578.33168 834.21865 578.01083 835.71864 579.15156 835.84375 C 580.21158 835.82479 580.38667 834.4484 580.3071 833.63153 C 580.53662 831.95048 581.63215 830.49759 582.9375 829.46875 C 583.79001 828.97 584.91056 828.97775 585.78125 829.40625 C 587.10886 830.47618 588.15357 831.86941 589.53087 832.89031 C 591.3188 834.41519 593.04885 836.02388 594.80835 837.57015 C 595.79495 838.27205 597.07861 838.2881 598.2382 838.23934 C 599.30616 838.07102 600.37354 837.88447 601.45772 837.87159 C 602.35178 838.03268 603.78574 837.16217 602.84375 836.25 C 602.03955 835.54663 600.95632 836.01569 600.0101 835.85219 C 598.16743 835.78502 596.38912 834.73743 595.41246 833.18326 C 594.4091 831.42329 593.81389 829.47346 592.98542 827.63083 C 591.32426 823.67734 590.0751 819.55761 589.13503 815.37729 C 588.65683 813.21491 588.18572 811.04368 588.09464 808.82315 C 587.6518 803.64661 588.07822 798.4564 588.3125 793.28125 C 588.74411 790.47251 589.25114 787.5689 590.83615 785.15046 C 592.24561 782.80091 594.0478 780.68013 596.17116 778.94485 C 597.52084 777.76736 598.96123 776.6968 600.34375 775.5625 C 601.00092 774.77824 600.47197 773.34825 599.41372 773.28073 C 598.75335 773.13511 598.07526 773.20822 597.40625 773.21875 z " + style="fill:#a9b6c7;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3779" + d="M 595.0625 771.09375 C 591.56252 771.67893 588.23657 773.05474 585.19098 774.85039 C 583.72505 775.78959 582.29326 776.80079 581.08949 778.06676 C 578.82575 780.25375 577.03177 782.91302 575.77929 785.79607 C 574.05487 790.25238 572.59782 794.8053 571.23307 799.38281 C 570.05444 803.20159 568.94058 807.04329 567.64674 810.82428 C 566.66606 813.14332 565.39105 815.3295 564.5 817.6875 C 564.42831 818.51967 563.97924 819.40158 564.34375 820.21875 C 564.68766 820.85431 564.9567 819.49159 565.24784 819.21679 C 565.95569 818.04667 566.92649 817.05822 567.75 815.96875 C 569.77564 813.52745 571.84249 811.11072 574.09375 808.875 C 574.98603 808.19725 576.0249 807.72879 577.09375 807.40625 C 578.05295 807.13244 579.13947 807.31209 579.87925 808.00965 C 580.67752 808.6981 580.93153 809.82624 580.80573 810.83893 C 580.73674 813.08507 580.18387 815.27527 579.86412 817.49039 C 579.48695 818.99786 579.26809 820.53865 578.96875 822.0625 C 578.95008 822.94739 579.77175 823.96052 580.71875 823.71875 C 581.92395 823.30114 582.40486 822.00689 582.73087 820.88431 C 583.81179 817.40879 583.89504 813.73731 584.04265 810.13005 C 584.29521 806.25431 584.47279 802.3688 584.94329 798.5119 C 585.46426 794.86024 586.18978 791.23116 587.21875 787.6875 C 587.72654 786.21475 588.504 784.86499 589.35116 783.56495 C 590.3963 782.02014 591.77706 780.58963 593.5625 779.9375 C 597.33443 778.40539 601.41851 777.90273 605.28125 776.65625 C 606.13736 776.2424 606.95067 775.27879 606.625 774.28125 C 606.25921 773.15924 605.05177 772.67925 604.01222 772.38557 C 601.70944 771.72394 599.3308 771.35218 596.94745 771.13597 C 596.31893 771.11479 595.69101 771.02455 595.0625 771.09375 z " + style="fill:#b6c5d8;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3781" + d="m 553.31861,862.68392 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" + style="fill:#c9cfd7" /> + <path + inkscape:connector-curvature="0" + id="path3783" + d="m 554.235,862.68169 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" + style="fill:#b6c5d8" /> + <path + inkscape:connector-curvature="0" + id="path3785" + d="m 605.41576,831.51882 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" + style="fill:#89929e" /> + <path + inkscape:connector-curvature="0" + id="path3787" + d="m 555.48691,863.63394 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z m 37.375,-0.1401 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z m 26.80308,-0.60687 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z m -35.40922,-40.45872 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z m -46.69385,-2.34909 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z m -56.65721,-0.39189 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 l -0.0789,-0.36537 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z m -9.23947,-3.57149 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z m 16.42997,-54.05429 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" + style="fill:#b4c3d5" /> + <path + inkscape:connector-curvature="0" + id="path3789" + d="m 628.86191,861.63169 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" + style="fill:#b3bcc9" /> + <path + inkscape:connector-curvature="0" + id="path3791" + d="m 629.67696,857.68169 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" + style="fill:#a9b6c7" /> + <path + inkscape:connector-curvature="0" + id="path3793" + d="m 631.86191,856.01273 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" + style="fill:#a5aeba" /> + <path + inkscape:connector-curvature="0" + id="path3795" + d="m 634.44264,862.18169 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 597.36191,836.4722 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" + style="fill:#99a5b4" /> + <path + inkscape:connector-curvature="0" + id="path3797" + d="M 597.625 771.4375 C 594.40751 772.24745 591.26611 773.32843 588.12645 774.39424 C 587.15491 774.76566 586.27356 775.36714 585.53125 776.09375 C 584.67839 776.84747 584.01295 777.78053 583.2883 778.65165 C 581.85471 780.47191 580.57894 782.40707 579.21875 784.28125 C 578.33679 785.77623 577.51778 787.31313 576.93141 788.9507 C 576.15841 790.82456 575.55181 792.76196 574.89448 794.6783 C 573.40592 799.26407 572.02784 803.88585 570.73921 808.53134 C 570.35837 810.07024 569.92171 811.59852 569.625 813.15625 C 569.52666 814.48107 570.05265 815.72844 570.4375 816.96875 C 571.09193 818.86517 571.68547 820.78193 572.3125 822.6875 C 572.7512 823.72458 573.84442 824.37935 574.9375 824.5 C 576.17953 824.48074 577.45825 824.53752 578.65625 824.15625 C 579.67688 823.76223 580.2613 822.79551 580.52187 821.77815 C 581.2546 819.2181 581.54139 816.56049 582.02236 813.94732 C 582.42286 811.57105 582.79807 809.1906 583.1875 806.8125 C 583.79691 804.59502 584.47547 802.39467 585.22723 800.22212 C 586.01002 798.19274 586.94292 796.22548 587.78125 794.21875 C 588.67128 792.31932 589.6479 790.45313 590.79616 788.69674 C 592.20393 786.68541 594.13474 785.12012 596.12428 783.71644 C 597.3642 782.96159 598.54641 782.11687 599.81351 781.40564 C 601.24146 780.52347 602.76926 779.81788 604.28125 779.09375 C 605.28021 778.78603 606.23394 778.2793 607.27609 778.14323 C 608.22477 778.0464 609.20907 778.2009 610.125 777.875 C 611.04955 777.30706 610.85506 775.88727 609.96875 775.375 C 609.16151 774.74404 608.22535 774.2968 607.33529 773.7957 C 605.654 772.95095 603.86097 772.35357 602.03184 771.92407 C 600.6747 771.6416 599.29267 771.45323 597.90625 771.40625 L 597.72456 771.42644 L 597.625 771.4375 z " + style="fill:#99a5b4;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3799" + d="m 637.65036,862.68169 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" + style="fill:#929ca9" /> + <path + inkscape:connector-curvature="0" + id="path3801" + d="m 604.07679,778.57601 c -2.07993,0.18622 -4.16688,0.39931 -6.19063,0.93582 -1.96265,0.5268 -3.86859,1.26151 -5.67823,2.18771 -1.2785,0.72607 -2.59489,1.40817 -3.73224,2.35094 -1.87066,1.41739 -3.50157,3.11504 -5.0864,4.83803 -0.8029,1.1366 -1.66147,2.24315 -2.35815,3.44834 -1.04606,1.93489 -1.92687,3.96033 -2.55709,6.06935 -1.02826,3.17356 -1.89607,6.39655 -2.77337,9.61433 -0.79085,2.99079 -1.58802,5.98101 -2.3162,8.9875 -0.72532,3.0427 -1.21047,6.14099 -1.45053,9.25973 -0.0808,1.12348 -0.27816,2.24516 -0.13834,3.37206 0.0627,1.15775 0.14707,2.31618 0.28118,3.46744 0.0295,0.43529 0.64114,0.88693 0.8125,0.28125 0.43782,-0.93637 0.98489,-1.88776 2.03125,-2.21875 0.77048,-0.37522 1.64462,-0.58501 2.49468,-0.42232 0.99503,0.20928 2.02353,0.51766 2.87283,1.09107 1.15247,0.76152 2.17094,1.75918 2.82587,2.98452 0.67432,0.79355 0.86715,1.92774 1.49412,2.69048 0.55618,0.0517 0.46735,-0.84631 0.60893,-1.24468 0.20794,-1.87479 -0.22577,-3.73167 -0.54643,-5.56782 -0.32562,-1.64053 -0.80423,-3.25041 -0.99895,-4.91491 -0.27135,-1.81202 -0.60341,-3.6237 -0.59359,-5.46277 -0.0577,-1.99807 -0.16648,-3.99431 -0.14423,-5.99405 -0.0352,-1.23626 -10e-4,-2.47036 0.11341,-3.70195 0.24423,-2.90098 0.56334,-5.79741 0.99836,-8.67632 0.6275,-2.95685 1.33887,-5.92442 2.64286,-8.66725 0.61629,-1.36529 1.23898,-2.73456 1.95854,-4.04735 0.72079,-1.14986 1.59611,-2.22584 2.73697,-2.98238 1.71322,-1.17297 3.55581,-2.14034 5.44826,-2.98937 1.80419,-0.81317 3.6119,-1.62339 5.33837,-2.5949 0.82255,-0.40084 1.88367,-0.6713 2.3005,-1.56976 0.12731,-0.30615 0.0397,-0.72575 -0.39425,-0.52399 z" + style="fill:#8a95a3;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3803" + d="m 638.56908,861.68169 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" + style="fill:#8a95a3" /> + </g> + <path + sodipodi:type="star" + style="color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4437" + sodipodi:sides="3" + sodipodi:cx="595" + sodipodi:cy="701.36218" + sodipodi:r1="41.012193" + sodipodi:r2="20.506097" + sodipodi:arg1="1.5464109" + sodipodi:arg2="2.5936085" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 596,742.36218 -37.00704,-60.63397 71.01408,-1.73205 z" + inkscape:transform-center-x="0.5" + inkscape:transform-center-y="9.8169873" /> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/unknown-60.png" + id="g4458" + transform="matrix(0.65793031,0,0,0.63284476,418.99836,237.59331)"> + <path + inkscape:connector-curvature="0" + id="path4460" + d="m 552.51419,862.96792 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" + style="fill:#dce2e8" /> + <path + inkscape:connector-curvature="0" + id="path4462" + d="m 552.86191,863.98091 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 l -0.91846,-0.0906 0,0 z" + style="fill:#d4dbe2" /> + <path + inkscape:connector-curvature="0" + id="path4464" + d="m 597.40625,773.21875 c -2.08437,0.0218 -4.06879,0.82425 -5.78008,1.97408 -1.79052,1.15879 -3.40619,2.56842 -5.10341,3.85771 -2.07314,1.7046 -4.13064,3.52243 -5.54313,5.83208 -1.4246,2.63374 -2.01431,5.62903 -2.3241,8.58199 -0.33035,2.74853 -0.32823,5.52241 -0.43678,8.28539 -0.005,3.82444 -0.15351,7.64782 -0.13884,11.4717 0.0859,5.10181 0.52206,10.19115 0.63884,15.29078 -0.0171,1.6471 0.0169,3.30988 -0.14185,4.94514 -0.24522,0.76103 -0.56607,2.26102 0.57466,2.38613 1.06002,-0.019 1.23511,-1.39535 1.15554,-2.21222 0.22952,-1.68105 1.32505,-3.13394 2.6304,-4.16278 0.85251,-0.49875 1.97306,-0.491 2.84375,-0.0625 1.32761,1.06993 2.37232,2.46316 3.74962,3.48406 1.78793,1.52488 3.51798,3.13357 5.27748,4.67984 0.9866,0.7019 2.27026,0.71795 3.42985,0.66919 1.06796,-0.16832 2.13534,-0.35487 3.21952,-0.36775 0.89406,0.16109 2.32802,-0.70942 1.38603,-1.62159 -0.8042,-0.70337 -1.88743,-0.23431 -2.83365,-0.39781 -1.84267,-0.0672 -3.62098,-1.11476 -4.59764,-2.66893 -1.00336,-1.75997 -1.59857,-3.7098 -2.42704,-5.55243 -1.66116,-3.95349 -2.91032,-8.07322 -3.85039,-12.25354 -0.4782,-2.16238 -0.94931,-4.33361 -1.04039,-6.55414 -0.44284,-5.17654 -0.0164,-10.36675 0.21786,-15.5419 0.43161,-2.80874 0.93864,-5.71235 2.52365,-8.13079 1.40946,-2.34955 3.21165,-4.47033 5.33501,-6.20561 1.34968,-1.17749 2.79007,-2.24805 4.17259,-3.38235 0.65717,-0.78426 0.12822,-2.21425 -0.93003,-2.28177 -0.66037,-0.14562 -1.33846,-0.0725 -2.00747,-0.062 z" + style="fill:#a9b6c7;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path4466" + d="m 595.0625,771.09375 c -3.49998,0.58518 -6.82593,1.96099 -9.87152,3.75664 -1.46593,0.9392 -2.89772,1.9504 -4.10149,3.21637 -2.26374,2.18699 -4.05772,4.84626 -5.3102,7.72931 -1.72442,4.45631 -3.18147,9.00923 -4.54622,13.58674 -1.17863,3.81878 -2.29249,7.66048 -3.58633,11.44147 -0.98068,2.31904 -2.25569,4.50522 -3.14674,6.86322 -0.0717,0.83217 -0.52076,1.71408 -0.15625,2.53125 0.34391,0.63556 0.61295,-0.72716 0.90409,-1.00196 0.70785,-1.17012 1.67865,-2.15857 2.50216,-3.24804 2.02564,-2.4413 4.09249,-4.85803 6.34375,-7.09375 0.89228,-0.67775 1.93115,-1.14621 3,-1.46875 0.9592,-0.27381 2.04572,-0.0942 2.7855,0.6034 0.79827,0.68845 1.05228,1.81659 0.92648,2.82928 -0.069,2.24614 -0.62186,4.43634 -0.94161,6.65146 -0.37717,1.50747 -0.59603,3.04826 -0.89537,4.57211 -0.0187,0.88489 0.803,1.89802 1.75,1.65625 1.2052,-0.41761 1.68611,-1.71186 2.01212,-2.83444 1.08092,-3.47552 1.16417,-7.147 1.31178,-10.75426 0.25256,-3.87574 0.43014,-7.76125 0.90064,-11.61815 0.52097,-3.65166 1.24649,-7.28074 2.27546,-10.8244 0.50779,-1.47275 1.28525,-2.82251 2.13241,-4.12255 1.04514,-1.54481 2.4259,-2.97532 4.21134,-3.62745 3.77193,-1.53211 7.85601,-2.03477 11.71875,-3.28125 0.85611,-0.41385 1.66942,-1.37746 1.34375,-2.375 -0.36579,-1.12201 -1.57323,-1.602 -2.61278,-1.89568 -2.30278,-0.66163 -4.68142,-1.03339 -7.06477,-1.2496 -0.62852,-0.0212 -1.25644,-0.11142 -1.88495,-0.0422 z" + style="fill:#b6c5d8;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path4468" + d="m 553.31861,862.68392 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" + style="fill:#c9cfd7" /> + <path + inkscape:connector-curvature="0" + id="path4470" + d="m 554.235,862.68169 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" + style="fill:#b6c5d8" /> + <path + inkscape:connector-curvature="0" + id="path4472" + d="m 605.41576,831.51882 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" + style="fill:#89929e" /> + <path + inkscape:connector-curvature="0" + id="path4474" + d="m 555.48691,863.63394 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z m 37.375,-0.1401 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z m 26.80308,-0.60687 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z m -35.40922,-40.45872 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z m -46.69385,-2.34909 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z m -56.65721,-0.39189 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 l -0.0789,-0.36537 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z m -9.23947,-3.57149 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z m 16.42997,-54.05429 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" + style="fill:#b4c3d5" /> + <path + inkscape:connector-curvature="0" + id="path4477" + d="m 628.86191,861.63169 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" + style="fill:#b3bcc9" /> + <path + inkscape:connector-curvature="0" + id="path4479" + d="m 629.67696,857.68169 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" + style="fill:#a9b6c7" /> + <path + inkscape:connector-curvature="0" + id="path4481" + d="m 631.86191,856.01273 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" + style="fill:#a5aeba" /> + <path + inkscape:connector-curvature="0" + id="path4483" + d="m 634.44264,862.18169 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 597.36191,836.4722 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" + style="fill:#99a5b4" /> + <path + inkscape:connector-curvature="0" + id="path4485" + d="m 597.625,771.4375 c -3.21749,0.80995 -6.35889,1.89093 -9.49855,2.95674 -0.97154,0.37142 -1.85289,0.9729 -2.5952,1.69951 -0.85286,0.75372 -1.5183,1.68678 -2.24295,2.5579 -1.43359,1.82026 -2.70936,3.75542 -4.06955,5.6296 -0.88196,1.49498 -1.70097,3.03188 -2.28734,4.66945 -0.773,1.87386 -1.3796,3.81126 -2.03693,5.7276 -1.48856,4.58577 -2.86664,9.20755 -4.15527,13.85304 -0.38084,1.5389 -0.8175,3.06718 -1.11421,4.62491 -0.0983,1.32482 0.42765,2.57219 0.8125,3.8125 0.65443,1.89642 1.24797,3.81318 1.875,5.71875 0.4387,1.03708 1.53192,1.69185 2.625,1.8125 1.24203,-0.0193 2.52075,0.0375 3.71875,-0.34375 1.02063,-0.39402 1.60505,-1.36074 1.86562,-2.3781 0.73273,-2.56005 1.01952,-5.21766 1.50049,-7.83083 0.4005,-2.37627 0.77571,-4.75672 1.16514,-7.13482 0.60941,-2.21748 1.28797,-4.41783 2.03973,-6.59038 0.78279,-2.02938 1.71569,-3.99664 2.55402,-6.00337 0.89003,-1.89943 1.86665,-3.76562 3.01491,-5.52201 1.40777,-2.01133 3.33858,-3.57662 5.32812,-4.9803 1.23992,-0.75485 2.42213,-1.59957 3.68923,-2.3108 1.42795,-0.88217 2.95575,-1.58776 4.46774,-2.31189 0.99896,-0.30772 1.95269,-0.81445 2.99484,-0.95052 0.94868,-0.0968 1.93298,0.0577 2.84891,-0.26823 0.92455,-0.56794 0.73006,-1.98773 -0.15625,-2.5 -0.80724,-0.63096 -1.7434,-1.0782 -2.63346,-1.5793 -1.68129,-0.84475 -3.47432,-1.44213 -5.30345,-1.87163 -1.35714,-0.28247 -2.73917,-0.47084 -4.12559,-0.51782 l -0.18169,0.0202 -0.0996,0.0111 z" + style="fill:#99a5b4;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path4487" + d="m 637.65036,862.68169 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" + style="fill:#929ca9" /> + <path + inkscape:connector-curvature="0" + id="path4489" + d="m 604.07679,778.57601 c -2.07993,0.18622 -4.16688,0.39931 -6.19063,0.93582 -1.96265,0.5268 -3.86859,1.26151 -5.67823,2.18771 -1.2785,0.72607 -2.59489,1.40817 -3.73224,2.35094 -1.87066,1.41739 -3.50157,3.11504 -5.0864,4.83803 -0.8029,1.1366 -1.66147,2.24315 -2.35815,3.44834 -1.04606,1.93489 -1.92687,3.96033 -2.55709,6.06935 -1.02826,3.17356 -1.89607,6.39655 -2.77337,9.61433 -0.79085,2.99079 -1.58802,5.98101 -2.3162,8.9875 -0.72532,3.0427 -1.21047,6.14099 -1.45053,9.25973 -0.0808,1.12348 -0.27816,2.24516 -0.13834,3.37206 0.0627,1.15775 0.14707,2.31618 0.28118,3.46744 0.0295,0.43529 0.64114,0.88693 0.8125,0.28125 0.43782,-0.93637 0.98489,-1.88776 2.03125,-2.21875 0.77048,-0.37522 1.64462,-0.58501 2.49468,-0.42232 0.99503,0.20928 2.02353,0.51766 2.87283,1.09107 1.15247,0.76152 2.17094,1.75918 2.82587,2.98452 0.67432,0.79355 0.86715,1.92774 1.49412,2.69048 0.55618,0.0517 0.46735,-0.84631 0.60893,-1.24468 0.20794,-1.87479 -0.22577,-3.73167 -0.54643,-5.56782 -0.32562,-1.64053 -0.80423,-3.25041 -0.99895,-4.91491 -0.27135,-1.81202 -0.60341,-3.6237 -0.59359,-5.46277 -0.0577,-1.99807 -0.16648,-3.99431 -0.14423,-5.99405 -0.0352,-1.23626 -10e-4,-2.47036 0.11341,-3.70195 0.24423,-2.90098 0.56334,-5.79741 0.99836,-8.67632 0.6275,-2.95685 1.33887,-5.92442 2.64286,-8.66725 0.61629,-1.36529 1.23898,-2.73456 1.95854,-4.04735 0.72079,-1.14986 1.59611,-2.22584 2.73697,-2.98238 1.71322,-1.17297 3.55581,-2.14034 5.44826,-2.98937 1.80419,-0.81317 3.6119,-1.62339 5.33837,-2.5949 0.82255,-0.40084 1.88367,-0.6713 2.3005,-1.56976 0.12731,-0.30615 0.0397,-0.72575 -0.39425,-0.52399 z" + style="fill:#8a95a3;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path4491" + d="m 638.56908,861.68169 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" + style="fill:#8a95a3" /> + </g> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/unknown-60.png" + id="g4493" + transform="matrix(0.65793031,0,0,0.63284476,418.99836,237.59331)"> + <path + style="fill:#dce2e8" + d="m 552.51419,862.96792 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" + id="path4495" + inkscape:connector-curvature="0" /> + <path + style="fill:#d4dbe2" + d="m 552.86191,863.98091 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 l -0.91846,-0.0906 0,0 z" + id="path4497" + inkscape:connector-curvature="0" /> + <path + style="fill:#a9b6c7;fill-opacity:1" + d="m 597.40625,773.21875 c -2.08437,0.0218 -4.06879,0.82425 -5.78008,1.97408 -1.79052,1.15879 -3.40619,2.56842 -5.10341,3.85771 -2.07314,1.7046 -4.13064,3.52243 -5.54313,5.83208 -1.4246,2.63374 -2.01431,5.62903 -2.3241,8.58199 -0.33035,2.74853 -0.32823,5.52241 -0.43678,8.28539 -0.005,3.82444 -0.15351,7.64782 -0.13884,11.4717 0.0859,5.10181 0.52206,10.19115 0.63884,15.29078 -0.0171,1.6471 0.0169,3.30988 -0.14185,4.94514 -0.24522,0.76103 -0.56607,2.26102 0.57466,2.38613 1.06002,-0.019 1.23511,-1.39535 1.15554,-2.21222 0.22952,-1.68105 1.32505,-3.13394 2.6304,-4.16278 0.85251,-0.49875 1.97306,-0.491 2.84375,-0.0625 1.32761,1.06993 2.37232,2.46316 3.74962,3.48406 1.78793,1.52488 3.51798,3.13357 5.27748,4.67984 0.9866,0.7019 2.27026,0.71795 3.42985,0.66919 1.06796,-0.16832 2.13534,-0.35487 3.21952,-0.36775 0.89406,0.16109 2.32802,-0.70942 1.38603,-1.62159 -0.8042,-0.70337 -1.88743,-0.23431 -2.83365,-0.39781 -1.84267,-0.0672 -3.62098,-1.11476 -4.59764,-2.66893 -1.00336,-1.75997 -1.59857,-3.7098 -2.42704,-5.55243 -1.66116,-3.95349 -2.91032,-8.07322 -3.85039,-12.25354 -0.4782,-2.16238 -0.94931,-4.33361 -1.04039,-6.55414 -0.44284,-5.17654 -0.0164,-10.36675 0.21786,-15.5419 0.43161,-2.80874 0.93864,-5.71235 2.52365,-8.13079 1.40946,-2.34955 3.21165,-4.47033 5.33501,-6.20561 1.34968,-1.17749 2.79007,-2.24805 4.17259,-3.38235 0.65717,-0.78426 0.12822,-2.21425 -0.93003,-2.28177 -0.66037,-0.14562 -1.33846,-0.0725 -2.00747,-0.062 z" + id="path4499" + inkscape:connector-curvature="0" /> + <path + style="fill:#b6c5d8;fill-opacity:1" + d="m 595.0625,771.09375 c -3.49998,0.58518 -6.82593,1.96099 -9.87152,3.75664 -1.46593,0.9392 -2.89772,1.9504 -4.10149,3.21637 -2.26374,2.18699 -4.05772,4.84626 -5.3102,7.72931 -1.72442,4.45631 -3.18147,9.00923 -4.54622,13.58674 -1.17863,3.81878 -2.29249,7.66048 -3.58633,11.44147 -0.98068,2.31904 -2.25569,4.50522 -3.14674,6.86322 -0.0717,0.83217 -0.52076,1.71408 -0.15625,2.53125 0.34391,0.63556 0.61295,-0.72716 0.90409,-1.00196 0.70785,-1.17012 1.67865,-2.15857 2.50216,-3.24804 2.02564,-2.4413 4.09249,-4.85803 6.34375,-7.09375 0.89228,-0.67775 1.93115,-1.14621 3,-1.46875 0.9592,-0.27381 2.04572,-0.0942 2.7855,0.6034 0.79827,0.68845 1.05228,1.81659 0.92648,2.82928 -0.069,2.24614 -0.62186,4.43634 -0.94161,6.65146 -0.37717,1.50747 -0.59603,3.04826 -0.89537,4.57211 -0.0187,0.88489 0.803,1.89802 1.75,1.65625 1.2052,-0.41761 1.68611,-1.71186 2.01212,-2.83444 1.08092,-3.47552 1.16417,-7.147 1.31178,-10.75426 0.25256,-3.87574 0.43014,-7.76125 0.90064,-11.61815 0.52097,-3.65166 1.24649,-7.28074 2.27546,-10.8244 0.50779,-1.47275 1.28525,-2.82251 2.13241,-4.12255 1.04514,-1.54481 2.4259,-2.97532 4.21134,-3.62745 3.77193,-1.53211 7.85601,-2.03477 11.71875,-3.28125 0.85611,-0.41385 1.66942,-1.37746 1.34375,-2.375 -0.36579,-1.12201 -1.57323,-1.602 -2.61278,-1.89568 -2.30278,-0.66163 -4.68142,-1.03339 -7.06477,-1.2496 -0.62852,-0.0212 -1.25644,-0.11142 -1.88495,-0.0422 z" + id="path4501" + inkscape:connector-curvature="0" /> + <path + style="fill:#c9cfd7" + d="m 553.31861,862.68392 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" + id="path4503" + inkscape:connector-curvature="0" /> + <path + style="fill:#b6c5d8" + d="m 554.235,862.68169 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" + id="path4505" + inkscape:connector-curvature="0" /> + <path + style="fill:#89929e" + d="m 605.41576,831.51882 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" + id="path4507" + inkscape:connector-curvature="0" /> + <path + style="fill:#b4c3d5" + d="m 555.48691,863.63394 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z m 37.375,-0.1401 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z m 26.80308,-0.60687 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z m -35.40922,-40.45872 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z m -46.69385,-2.34909 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z m -56.65721,-0.39189 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 l -0.0789,-0.36537 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z m -9.23947,-3.57149 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z m 16.42997,-54.05429 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" + id="path4509" + inkscape:connector-curvature="0" /> + <path + style="fill:#b3bcc9" + d="m 628.86191,861.63169 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" + id="path4511" + inkscape:connector-curvature="0" /> + <path + style="fill:#a9b6c7" + d="m 629.67696,857.68169 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" + id="path4513" + inkscape:connector-curvature="0" /> + <path + style="fill:#a5aeba" + d="m 631.86191,856.01273 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" + id="path4515" + inkscape:connector-curvature="0" /> + <path + style="fill:#99a5b4" + d="m 634.44264,862.18169 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 597.36191,836.4722 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" + id="path4517" + inkscape:connector-curvature="0" /> + <path + style="fill:#99a5b4;fill-opacity:1" + d="m 597.625,771.4375 c -3.21749,0.80995 -6.35889,1.89093 -9.49855,2.95674 -0.97154,0.37142 -1.85289,0.9729 -2.5952,1.69951 -0.85286,0.75372 -1.5183,1.68678 -2.24295,2.5579 -1.43359,1.82026 -2.70936,3.75542 -4.06955,5.6296 -0.88196,1.49498 -1.70097,3.03188 -2.28734,4.66945 -0.773,1.87386 -1.3796,3.81126 -2.03693,5.7276 -1.48856,4.58577 -2.86664,9.20755 -4.15527,13.85304 -0.38084,1.5389 -0.8175,3.06718 -1.11421,4.62491 -0.0983,1.32482 0.42765,2.57219 0.8125,3.8125 0.65443,1.89642 1.24797,3.81318 1.875,5.71875 0.4387,1.03708 1.53192,1.69185 2.625,1.8125 1.24203,-0.0193 2.52075,0.0375 3.71875,-0.34375 1.02063,-0.39402 1.60505,-1.36074 1.86562,-2.3781 0.73273,-2.56005 1.01952,-5.21766 1.50049,-7.83083 0.4005,-2.37627 0.77571,-4.75672 1.16514,-7.13482 0.60941,-2.21748 1.28797,-4.41783 2.03973,-6.59038 0.78279,-2.02938 1.71569,-3.99664 2.55402,-6.00337 0.89003,-1.89943 1.86665,-3.76562 3.01491,-5.52201 1.40777,-2.01133 3.33858,-3.57662 5.32812,-4.9803 1.23992,-0.75485 2.42213,-1.59957 3.68923,-2.3108 1.42795,-0.88217 2.95575,-1.58776 4.46774,-2.31189 0.99896,-0.30772 1.95269,-0.81445 2.99484,-0.95052 0.94868,-0.0968 1.93298,0.0577 2.84891,-0.26823 0.92455,-0.56794 0.73006,-1.98773 -0.15625,-2.5 -0.80724,-0.63096 -1.7434,-1.0782 -2.63346,-1.5793 -1.68129,-0.84475 -3.47432,-1.44213 -5.30345,-1.87163 -1.35714,-0.28247 -2.73917,-0.47084 -4.12559,-0.51782 l -0.18169,0.0202 -0.0996,0.0111 z" + id="path4519" + inkscape:connector-curvature="0" /> + <path + style="fill:#929ca9" + d="m 637.65036,862.68169 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" + id="path4521" + inkscape:connector-curvature="0" /> + <path + style="fill:#8a95a3;fill-opacity:1" + d="m 604.07679,778.57601 c -2.07993,0.18622 -4.16688,0.39931 -6.19063,0.93582 -1.96265,0.5268 -3.86859,1.26151 -5.67823,2.18771 -1.2785,0.72607 -2.59489,1.40817 -3.73224,2.35094 -1.87066,1.41739 -3.50157,3.11504 -5.0864,4.83803 -0.8029,1.1366 -1.66147,2.24315 -2.35815,3.44834 -1.04606,1.93489 -1.92687,3.96033 -2.55709,6.06935 -1.02826,3.17356 -1.89607,6.39655 -2.77337,9.61433 -0.79085,2.99079 -1.58802,5.98101 -2.3162,8.9875 -0.72532,3.0427 -1.21047,6.14099 -1.45053,9.25973 -0.0808,1.12348 -0.27816,2.24516 -0.13834,3.37206 0.0627,1.15775 0.14707,2.31618 0.28118,3.46744 0.0295,0.43529 0.64114,0.88693 0.8125,0.28125 0.43782,-0.93637 0.98489,-1.88776 2.03125,-2.21875 0.77048,-0.37522 1.64462,-0.58501 2.49468,-0.42232 0.99503,0.20928 2.02353,0.51766 2.87283,1.09107 1.15247,0.76152 2.17094,1.75918 2.82587,2.98452 0.67432,0.79355 0.86715,1.92774 1.49412,2.69048 0.55618,0.0517 0.46735,-0.84631 0.60893,-1.24468 0.20794,-1.87479 -0.22577,-3.73167 -0.54643,-5.56782 -0.32562,-1.64053 -0.80423,-3.25041 -0.99895,-4.91491 -0.27135,-1.81202 -0.60341,-3.6237 -0.59359,-5.46277 -0.0577,-1.99807 -0.16648,-3.99431 -0.14423,-5.99405 -0.0352,-1.23626 -10e-4,-2.47036 0.11341,-3.70195 0.24423,-2.90098 0.56334,-5.79741 0.99836,-8.67632 0.6275,-2.95685 1.33887,-5.92442 2.64286,-8.66725 0.61629,-1.36529 1.23898,-2.73456 1.95854,-4.04735 0.72079,-1.14986 1.59611,-2.22584 2.73697,-2.98238 1.71322,-1.17297 3.55581,-2.14034 5.44826,-2.98937 1.80419,-0.81317 3.6119,-1.62339 5.33837,-2.5949 0.82255,-0.40084 1.88367,-0.6713 2.3005,-1.56976 0.12731,-0.30615 0.0397,-0.72575 -0.39425,-0.52399 z" + id="path4523" + inkscape:connector-curvature="0" /> + <path + style="fill:#8a95a3" + d="m 638.56908,861.68169 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" + id="path4525" + inkscape:connector-curvature="0" /> + </g> </g> </svg> Added: trunk/img/icons/unknown-60.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/unknown-60.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/unknown-gen.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/unknown-gen.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/script/kune client -no-server.launch =================================================================== --- trunk/script/kune client -no-server.launch 2011-02-24 23:07:55 UTC (rev 1262) +++ trunk/script/kune client -no-server.launch 2011-02-25 01:11:55 UTC (rev 1263) @@ -2,8 +2,11 @@ <launchConfiguration type="com.google.gdt.eclipse.suite.webapp"> <booleanAttribute key="com.google.gdt.eclipse.core.RUN_SERVER" value="false"/> <stringAttribute key="com.google.gdt.eclipse.core.SERVER_PORT" value="8080"/> -<stringAttribute key="com.google.gdt.eclipse.suiteMainTypeProcessor.PREVIOUSLY_SET_MAIN_TYPE_NAME" value="com.google.gwt.dev.DevMode"/> +<stringAttribute key="com.google.gdt.eclipse.suiteMainTypeProcessor.PREVIOUSLY_SET_MAIN_TYPE_NAME" value="com.google.gwt.dev.GWTShell"/> <booleanAttribute key="com.google.gdt.eclipse.suiteWarArgumentProcessor.IS_WAR_FROM_PROJECT_PROPERTIES" value="true"/> +<listAttribute key="com.google.gwt.eclipse.core.ENTRY_POINT_MODULES"> +<listEntry value="cc.kune.Kune"/> +</listAttribute> <stringAttribute key="com.google.gwt.eclipse.core.URL" value="/ws/?locale=en&log_level=INFO"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> <listEntry value="/kune"/> @@ -17,7 +20,7 @@ </listAttribute> <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gwt.eclipse.core.moduleClasspathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-startupUrl /ws/?locale=en&log_level=INFO -noserver -war /home/vjrj/proyectos/dev/kune/trunk/target/kune-0.0.7 -remoteUI "${gwt_remote_ui_server_port}:${unique_id}" -logLevel INFO -codeServerPort 9997 cc.kune.Kune"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-war /home/vjrj/proyectos/dev/kune/trunk/target/kune-0.0.7 -startupUrl /ws/?locale=en&log_level=INFO -noserver -remoteUI "${gwt_remote_ui_server_port}:${unique_id}" -logLevel INFO -codeServerPort 9997 cc.kune.Kune"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="kune"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/> </launchConfiguration> Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2011-02-24 23:07:55 UTC (rev 1262) +++ trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2011-02-25 01:11:55 UTC (rev 1263) @@ -373,7 +373,7 @@ @Source("opentriangle.gif") ImageResource opentriangle(); - @Source("person2-60.png") + @Source("unknown-60.png") ImageResource personAvatarDef(); @Source("person-def.png") Added: trunk/src/main/java/cc/kune/core/client/resources/unknown-60.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/unknown-60.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/public/images/unknown.jpg =================================================================== (Binary files differ) Modified: trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2011-02-24 23:07:55 UTC (rev 1262) +++ trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2011-02-25 01:11:55 UTC (rev 1263) @@ -37,15 +37,15 @@  <set-configuration-property name="log_pattern" value="%d [%-5p] %m%n" /> -   <set-property name="user.agent" value="gecko1_8" /> - <inherits name="com.google.gwt.wave.Wave" /> + <inherits name="org.ourproject.kune.ws.armor.WsArmor" />  <entry-point class="org.ourproject.kune.app.client.OldKuneEntryPoint" /> -  <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> </module> \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml 2011-02-24 23:07:55 UTC (rev 1262) +++ trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml 2011-02-25 01:11:55 UTC (rev 1263) @@ -13,6 +13,6 @@ <inherits name="com.gwtextux.GwtExtUx" /> <inherits name="com.gwtextux.UploadDialog" /> <inherits name="com.gwtextux.ToastWindow" /> - <inherits name="com.google.gwt.wave.Wave" /> + <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> </module> \ No newline at end of file

1 0

24 Feb '11

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"?>  + <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;

1 0

24 Feb '11

Author: vjrj_ Date: 2011-02-24 03:37:26 +0100 (Thu, 24 Feb 2011) New Revision: 1261 Added: trunk/script/kune client -no-server.launch trunk/src/main/java/cc/kune/common/client/resources/ trunk/src/main/java/cc/kune/common/client/resources/CommonIconCssResource.java trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java trunk/src/main/java/cc/kune/common/client/resources/SubMenuResources.java trunk/src/main/java/cc/kune/common/client/resources/arrow-right-white.gif 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/resources/unchecked.png 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/resources/icons/unchecked.png trunk/src/main/java/cc/kune/core/client/sn/actions/GroupMembersConfActions.java trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationMenuItem.java trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityMenuItem.java Modified: trunk/ trunk/img/webtemplate/web_template-2011.svg trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java trunk/src/main/java/cc/kune/chat/client/ChatParts.java trunk/src/main/java/cc/kune/chat/client/ChatSitebarActions.java trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java trunk/src/main/java/cc/kune/common/client/actions/AbstractExtendedAction.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtCheckItem.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/AbstractGuiItem.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuRadioItemDescriptor.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/public/kune-common.css trunk/src/main/java/cc/kune/core/client/CoreParts.java trunk/src/main/java/cc/kune/core/client/logs/Log.java trunk/src/main/java/cc/kune/core/client/resources/icons/IconResources.java trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java trunk/src/main/java/cc/kune/core/client/state/Session.java trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java trunk/src/main/java/cc/kune/core/client/state/StateManager.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/footer/license/EntityLicensePresenter.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java Log: NEW - # 25: Social Net refactorization http://kune.ourproject.org/issues/ticket/25 Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - pmd-eclipse.log .pmd www-test screenlog.0 bin client public target target-local Main-compile bin .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat gwt-out synccss.sh .externalToolBuilders .wtpmodules www testRepository kune-OLD-jcr KuneApp.launch KuneApp NOSERVER.launch old_src org.ourproject.kune.app.Kune org.ourproject.kune.iml org.ourproject.kune.ipr org.ourproject.kune.iws nbproject hibernate.reveng.xml .gwt-tmp target-eclipse .checkstyle .classpath-bien pom.xml.* .gwt .jdee_sources .jdee_classpath prj.el .factorypath .apt_generated target.old _accounts + pmd-eclipse.log .pmd www-test screenlog.0 bin client public target target-local Main-compile bin .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat gwt-out synccss.sh .externalToolBuilders .wtpmodules www testRepository kune-OLD-jcr KuneApp.launch KuneApp NOSERVER.launch old_src org.ourproject.kune.app.Kune org.ourproject.kune.iml org.ourproject.kune.ipr org.ourproject.kune.iws nbproject hibernate.reveng.xml .gwt-tmp target-eclipse .checkstyle .classpath-bien pom.xml.* .gwt .jdee_sources .jdee_classpath prj.el .factorypath .apt_generated target.old _accounts _certificates Modified: trunk/img/webtemplate/web_template-2011.svg =================================================================== --- trunk/img/webtemplate/web_template-2011.svg 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/img/webtemplate/web_template-2011.svg 2011-02-24 02:37:26 UTC (rev 1261) @@ -52,9 +52,9 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="2.7077228" - inkscape:cx="962.93133" - inkscape:cy="392.7939" + inkscape:zoom="0.68229167" + inkscape:cx="512" + inkscape:cy="384" inkscape:current-layer="layer1" inkscape:document-units="px" showgrid="false" @@ -2640,11 +2640,12 @@ width="164.7063" height="32.31588" x="880.42413" - y="328.24014" /> + y="328.24014" + ry="4.4317684" /> <text xml:space="preserve" style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" - x="889.85516" + x="903.85516" y="349.36758" id="text24744-4" sodipodi:linespacing="125%" @@ -2653,7 +2654,7 @@ inkscape:export-ydpi="90"><tspan sodipodi:role="line" id="tspan24746-6" - x="889.85516" + x="903.85516" y="349.36758">menu item</tspan></text> <text inkscape:export-ydpi="90" @@ -2661,14 +2662,181 @@ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" sodipodi:linespacing="125%" id="text6164" - y="379.36758" - x="889.85516" + y="381.36758" + x="904.85516" style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" xml:space="preserve"><tspan - y="379.36758" - x="889.85516" + y="381.36758" + x="904.85516" id="tspan6166" sodipodi:role="line">menu item</tspan></text> + <rect + ry="4.4317684" + y="360.24014" + x="880.42413" + height="32.31588" + width="164.7063" + id="rect3808" + style="opacity:0.84999999999999998;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:2;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" /> + <image + y="336.0275" + x="885.00128" + id="image4011" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAApVJREFU +OI1lkk9oVFcUh7/3ZpLJjJNkYv2XKDFxjAGLWFypC1Ehiihu2k1pVxUsgcCsgpvgQkTBrMS94CJB +KrgQBLNwI6IgKoIOMdFYVCyYBjJmMjPOu/ec08Wz8RkPHO7dnI/f+e4NzIxkTU5O5lV1VET2icha +EcE51+Wc210qlZZZVUESMDEx8ZOq3uzp6env6OggDENUlZmZGebn52ve+12lu2dGAZeZshJAOjGc +F5EbxWKxP4oipqenqdVqiAhmxkC6cfXI1NhdYANw4v+5FYCIDHd3d293zjE7O/vGe39YRP4REX69 +d3G4q74wDrwCNmWmbPk7gPd+Xy6XY25uDufciZGRkbcAzaPBceAScPXK0PjlfD5/e+H8eRsbGzu4 +GrA+DEOq1Sre+78Tnj4Av1/Ye/ZWsLzc7OzspF6vP/pG4rv7f9jDuUE+fsoiIpz88TEpc5h4zMft +nHDt2R5UlY1tixzf/JjB00+DOIEZv/x8iICQIJUl4BhoAOk2wEAc4qucG6qBOgBeX3/w1YGJBwy/ +8BfpzDqCIA/aAtkCmEL9E7L0iqjxAfV1sv0jWNRMALwHNZCISvkJYbiGws79vL8zjukGeg8MUXlZ +Jmos0t7XhZlgLkoCHJhh4igM7iBsXQeBIk3h+UKWXiIKxX4+1zKYr4PpCiAEMOcwExDH4otnVMqP +IPToZ6XZaIJFVGamqcy+i9dVxZxLJHAupkpEYaCPVO4HCCO2/fYn25yHpY90FntoXWqJE6itBkSg +ivqISrlMKtcObXlIt4J6WKrQWPwXV6vS3tuBofHaSYCZkNlyiuzWFEFrJn7CsAVUIGrQ3qgiromp +xL68TwCiJm9ujsYuvMe8+9J+5UQk/lgi8V0FgP8Au3qlSuYS8nsAAAAASUVORK5CYII= +" + height="16" + width="16" /> + <image + width="16" + height="16" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAApVJREFU +OI1lkk9oVFcUh7/3ZpLJjJNkYv2XKDFxjAGLWFypC1Ehiihu2k1pVxUsgcCsgpvgQkTBrMS94CJB +KrgQBLNwI6IgKoIOMdFYVCyYBjJmMjPOu/ec08Wz8RkPHO7dnI/f+e4NzIxkTU5O5lV1VET2icha +EcE51+Wc210qlZZZVUESMDEx8ZOq3uzp6env6OggDENUlZmZGebn52ve+12lu2dGAZeZshJAOjGc +F5EbxWKxP4oipqenqdVqiAhmxkC6cfXI1NhdYANw4v+5FYCIDHd3d293zjE7O/vGe39YRP4REX69 +d3G4q74wDrwCNmWmbPk7gPd+Xy6XY25uDufciZGRkbcAzaPBceAScPXK0PjlfD5/e+H8eRsbGzu4 +GrA+DEOq1Sre+78Tnj4Av1/Ye/ZWsLzc7OzspF6vP/pG4rv7f9jDuUE+fsoiIpz88TEpc5h4zMft +nHDt2R5UlY1tixzf/JjB00+DOIEZv/x8iICQIJUl4BhoAOk2wEAc4qucG6qBOgBeX3/w1YGJBwy/ +8BfpzDqCIA/aAtkCmEL9E7L0iqjxAfV1sv0jWNRMALwHNZCISvkJYbiGws79vL8zjukGeg8MUXlZ +Jmos0t7XhZlgLkoCHJhh4igM7iBsXQeBIk3h+UKWXiIKxX4+1zKYr4PpCiAEMOcwExDH4otnVMqP +IPToZ6XZaIJFVGamqcy+i9dVxZxLJHAupkpEYaCPVO4HCCO2/fYn25yHpY90FntoXWqJE6itBkSg +ivqISrlMKtcObXlIt4J6WKrQWPwXV6vS3tuBofHaSYCZkNlyiuzWFEFrJn7CsAVUIGrQ3qgiromp +xL68TwCiJm9ujsYuvMe8+9J+5UQk/lgi8V0FgP8Au3qlSuYS8nsAAAAASUVORK5CYII= +" + id="image4014" + x="885.00128" + y="368.0275" /> + <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="367.31128" + x="1072.8741" + height="13.999999" + width="14" + id="rect2884" + 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 1083.8248,369.93911 -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/movecommons/images/icongen/cat-selected.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="1072.8741" + y="384.31128" + ry="6.9999995" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + rx="6.9999995" /> + <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 1066.7427,375.67338 -6.8467,6.15941 -2.2168,-2.55183 -2.7128,2.7819 c 1.9591,1.73709 3.419,2.97495 5.0452,4.64548 2.7345,-2.56308 5.5356,-4.59365 8.503,-6.52437 -0.4521,-1.92931 -1.0379,-3.25966 -1.7719,-4.51059 z" + id="rect4453-1" + sodipodi:nodetypes="ccccccc" + inkscape:export-filename="/home/vjrj/proyectos/movecommons/images/icongen/cat-selected.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/group-def-icon.png" + ry="3.7067122" + y="387.60455" + x="1076.1675" + 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="1072.8741" + y="347.31128" + ry="2.5" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/group-def-icon.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="1072.8741" + y="367.31128" + ry="2.5" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/movecommons/images/icongen/cat-selected.png" + sodipodi:nodetypes="ccccccc" + id="path60718" + d="m 1083.8248,369.93911 -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/group-def-icon.png" + ry="6.9999995" + y="384.31128" + x="1072.8741" + 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="1076.1675" + y="387.60455" + ry="3.7067122" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/group-def-icon.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/group-def-icon.png" + ry="2.5" + y="347.31128" + x="1072.8741" + 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" /> </g> <g inkscape:groupmode="layer" Added: trunk/script/kune client -no-server.launch =================================================================== --- trunk/script/kune client -no-server.launch (rev 0) +++ trunk/script/kune client -no-server.launch 2011-02-24 02:37:26 UTC (rev 1261) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="com.google.gdt.eclipse.suite.webapp"> +<booleanAttribute key="com.google.gdt.eclipse.core.RUN_SERVER" value="false"/> +<stringAttribute key="com.google.gdt.eclipse.core.SERVER_PORT" value="8080"/> +<stringAttribute key="com.google.gdt.eclipse.suiteMainTypeProcessor.PREVIOUSLY_SET_MAIN_TYPE_NAME" value="com.google.gwt.dev.DevMode"/> +<booleanAttribute key="com.google.gdt.eclipse.suiteWarArgumentProcessor.IS_WAR_FROM_PROJECT_PROPERTIES" value="true"/> +<stringAttribute key="com.google.gwt.eclipse.core.URL" value="/ws/?locale=en&log_level=INFO"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/kune"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="4"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> +<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gwt.eclipse.core.moduleClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-startupUrl /ws/?locale=en&log_level=INFO -noserver -war /home/vjrj/proyectos/dev/kune/trunk/target/kune-0.0.7 -remoteUI "${gwt_remote_ui_server_port}:${unique_id}" -logLevel INFO -codeServerPort 9997 cc.kune.Kune"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="kune"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/> +</launchConfiguration> Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -147,7 +147,7 @@ this.roomManager = Suco.get(RoomManager.class); Suco.get(SessionReconnect.class); - eventBus.addHandler(AppStartEvent.getType(), new AppStartEvent.AppStartHandler() { + session.onInitDataReceived(true, new AppStartEvent.AppStartHandler() { @Override public void onAppStart(final AppStartEvent event) { chatOptions.domain = event.getInitData().getChatDomain(); @@ -253,6 +253,7 @@ dialog.setBodyStyleName("k-chat-window"); dialog.setScrollMode(Scroll.NONE); dialog.setHideOnButtonClick(true); + dialog.setCollapsible(true); // final Widget btn = (Widget) // chatIcon.getValue(ParentWidget.PARENT_UI); dialog.setPosition(118, 2); Modified: trunk/src/main/java/cc/kune/chat/client/ChatParts.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -23,7 +23,7 @@ final IsPersonCondition isPersonCondition, final Provider<StartChatWithMemberAction> startChatWithMemberAction, final Provider<StartChatWithUserAction> startChatWithUserAction) { - session.onInitDataReceived(new AppStartHandler() { + session.onInitDataReceived(true, new AppStartHandler() { @Override public void onAppStart(final AppStartEvent event) { chatActionsProvider.get(); Modified: trunk/src/main/java/cc/kune/chat/client/ChatSitebarActions.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatSitebarActions.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/chat/client/ChatSitebarActions.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -4,7 +4,7 @@ import cc.kune.common.client.actions.AbstractAction; import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuSeparatorDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuTitleItemDescriptor; import cc.kune.core.client.sitebar.SiteUserOptions; @@ -81,6 +81,7 @@ } private static final String CHAT_STATUS = "k-chat-status-group"; + private static final String GROUP_CHAT_STATUS = "k-group-chat-status"; private static final String NO_STATUS = null; private final ChatClient chatClient; private final I18nTranslationService i18n; @@ -135,9 +136,10 @@ } - private MenuItemDescriptor createChatStatusAction(final ImageResource icon, final String text, + private MenuRadioItemDescriptor createChatStatusAction(final ImageResource icon, final String text, final AbstractAction action) { - final MenuItemDescriptor item = new MenuItemDescriptor(SiteUserOptionsPresenter.LOGGED_USER_MENU, action); + final MenuRadioItemDescriptor item = new MenuRadioItemDescriptor(SiteUserOptionsPresenter.LOGGED_USER_MENU, + action, GROUP_CHAT_STATUS); item.putValue(AbstractAction.NAME, text); item.putValue(AbstractAction.SMALL_ICON, icon); return item; Modified: trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -135,7 +135,7 @@ view.addActions(actions); final IconLabel simpleIconLabel = new IconLabel("IconLabel (no action)"); - simpleIconLabel.setIcon("oc-testico"); + simpleIconLabel.setLeftIcon("oc-testico"); simpleIconLabel.setTitle("tooltip"); final VerticalPanel panel = new VerticalPanel(); Modified: trunk/src/main/java/cc/kune/common/client/actions/AbstractExtendedAction.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/AbstractExtendedAction.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/common/client/actions/AbstractExtendedAction.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -19,10 +19,11 @@ */ package cc.kune.common.client.actions; +import com.google.gwt.resources.client.ImageResource; public abstract class AbstractExtendedAction extends AbstractAction { + public static final String NO_ICON = null; public static final String NO_TEXT = null; - public static final String NO_ICON = null; public AbstractExtendedAction() { super(); @@ -42,4 +43,24 @@ super.putValue(Action.SHORT_DESCRIPTION, tooltip); super.putValue(Action.SMALL_ICON, iconCls); } + + public AbstractExtendedAction withIcon(final ImageResource icon) { + super.putValue(Action.SHORT_DESCRIPTION, icon); + return this; + } + + public AbstractExtendedAction withIconCls(final String icon) { + super.putValue(Action.SHORT_DESCRIPTION, icon); + return this; + } + + public AbstractExtendedAction withText(final String text) { + super.putValue(Action.NAME, text); + return this; + } + + public AbstractExtendedAction withToolTip(final String tooltip) { + super.putValue(Action.SHORT_DESCRIPTION, tooltip); + return this; + } } \ No newline at end of file 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-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -59,6 +59,7 @@ @Override protected void addStyle(final String style) { iconLabel.addStyleName(style); + button.addStyleName(style); layout(); } @@ -112,13 +113,13 @@ @Override public void setIconResource(final ImageResource icon) { - iconLabel.setIconResource(icon); + iconLabel.setLeftIconResource(icon); layout(); } @Override protected void setIconStyle(final String style) { - iconLabel.setIcon(style); + iconLabel.setLeftIcon(style); layout(); } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuGui.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuGui.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -27,6 +27,7 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.Position; +import cc.kune.common.client.resources.SubMenuResources; import com.google.gwt.event.logical.shared.CloseEvent; import com.google.gwt.event.logical.shared.CloseHandler; @@ -74,7 +75,8 @@ @Override public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.create(descriptor); - menu = new MenuBar(true); + menu = new MenuBar(true, SubMenuResources.INSTANCE); + menu.setAutoOpen(true); menu.setFocusOnHoverEnabled(true); menu.setAnimationEnabled(true); descriptor.addPropertyChangeListener(new PropertyChangeListener() { @@ -112,7 +114,10 @@ } public void hide() { - popup.hide(); + if (popup != null) { + // if menu (not submenu) + popup.hide(); + } } @Override 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-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -33,6 +33,8 @@ 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; import com.google.gwt.resources.client.ImageResource; @@ -45,24 +47,40 @@ private IconLabel iconLabel; private GwtBaseMenuItem item; + private final CommonIconResources res = CommonIconResources.INSTANCE; - public AbstractGwtMenuItemGui() { + private void confCheckListener(final MenuItemDescriptor 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()); + layout(); + } + } + }); + iconLabel.setRightIconResource(res.unChecked()); + iconLabel.setWidth("100%"); } - public AbstractGwtMenuItemGui(final MenuItemDescriptor descriptor) { - super(descriptor); - - } - - private void confCheckListener(final MenuItemDescriptor descriptor, final GwtCheckItem checkItem) { + private void confRadioCheckListener(final MenuItemDescriptor descriptor, final GwtCheckItem checkItem, + final String group) { descriptor.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(final PropertyChangeEvent event) { + if (event.getPropertyName().equals(MenuCheckItemDescriptor.CHECKED)) { - checkItem.setChecked((Boolean) event.getNewValue()); + final Boolean checked = (Boolean) event.getNewValue(); + NotifyUser.info("Radio checked: " + checked); + iconLabel.setRightIconResource(checked ? res.radioChecked() : res.radioUnChecked()); + layout(); } } }); + iconLabel.setRightIconResource(res.radioUnChecked()); + iconLabel.setWidth("100%"); } @Override @@ -71,8 +89,8 @@ iconLabel = new IconLabel(""); if (descriptor instanceof MenuRadioItemDescriptor) { final GwtCheckItem checkItem = createCheckItem((MenuItemDescriptor) descriptor); - checkItem.setGroup(((MenuRadioItemDescriptor) descriptor).getGroup()); - confCheckListener((MenuItemDescriptor) descriptor, checkItem); + confRadioCheckListener((MenuItemDescriptor) descriptor, checkItem, + ((MenuRadioItemDescriptor) descriptor).getGroup()); item = checkItem; } else if (descriptor instanceof MenuCheckItemDescriptor) { final GwtCheckItem checkItem = createCheckItem((MenuItemDescriptor) descriptor); @@ -96,6 +114,16 @@ getParentMenu(descriptor).hide(); final AbstractAction action = descriptor.getAction(); if (action != null) { + if (descriptor instanceof MenuRadioItemDescriptor) { + final MenuRadioItemDescriptor checkItem = (MenuRadioItemDescriptor) descriptor; + if (!checkItem.isChecked()) { + checkItem.setChecked(true); + } + } else if (descriptor instanceof MenuCheckItemDescriptor) { + final MenuCheckItemDescriptor checkItem = (MenuCheckItemDescriptor) descriptor; + final boolean currentValue = checkItem.isChecked(); + checkItem.setChecked(!currentValue); + } descriptor.getAction().actionPerformed( new ActionEvent(item, getTargetObjectOfAction(descriptor), Event.getCurrentEvent())); } @@ -106,7 +134,7 @@ final int position = descriptor.getPosition(); final AbstractGwtMenuGui menu = getParentMenu(descriptor); if (menu == null) { - throw new UIException("To add a menu item you need to add the menu before. Item: " + descriptor); + throw new UIException("Warning: To add a menu item you need to add the menu before. Item: " + descriptor); } if (position == GuiActionDescrip.NO_POSITION) { menu.add(item); @@ -150,13 +178,13 @@ @Override public void setIconResource(final ImageResource icon) { - iconLabel.setIconResource(icon); + iconLabel.setLeftIconResource(icon); layout(); } @Override protected void setIconStyle(final String style) { - iconLabel.setIcon(style); + iconLabel.setLeftIcon(style); layout(); } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtCheckItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtCheckItem.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtCheckItem.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -19,19 +19,18 @@ */ package cc.kune.common.client.actions.gwtui; -import cc.kune.common.client.errors.NotImplementedException; public class GwtCheckItem extends GwtBaseMenuItem { public void setChecked(final boolean newValue) { - throw new NotImplementedException(); + // throw new NotImplementedException(); } /* * Checkbox group */ public void setGroup(final String group) { - throw new NotImplementedException(); + // throw new NotImplementedException(); } } 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-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -71,7 +71,7 @@ @Override protected void setIconStyle(final String style) { - iconLabel.setIcon(style); + iconLabel.setLeftIcon(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-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -93,7 +93,7 @@ @Override public void setIconResource(final ImageResource resource) { if (notStandAlone) { - iconLabel.setIconResource(resource); + iconLabel.setLeftIconResource(resource); layout(); } } @@ -101,7 +101,7 @@ @Override public void setIconStyle(final String style) { if (notStandAlone) { - iconLabel.setIcon(style); + iconLabel.setLeftIcon(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-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -34,6 +34,7 @@ @Override public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.descriptor = descriptor; + super.create(descriptor); item = new MenuItem("", menu); iconLabel = new IconLabel(""); configureItemFromProperties(); @@ -44,7 +45,6 @@ } else { parentMenu.insert(position, item); } - super.create(descriptor); descriptor.putValue(ParentWidget.PARENT_UI, this); return this; } @@ -60,7 +60,7 @@ @Override public void setIconStyle(final String style) { - iconLabel.setIcon(style); + iconLabel.setLeftIcon(style); layout(); } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -76,7 +76,7 @@ setIcon(descriptor.getValue(Action.SMALL_ICON)); setEnabled((Boolean) descriptor.getValue(AbstractAction.ENABLED)); setVisible((Boolean) descriptor.getValue(GuiActionDescrip.VISIBLE)); - setStyles((String) descriptor.getValue(GuiActionDescrip.STYLES)); + setStyles((String) descriptor.getValue(Action.STYLES)); } @Override @@ -97,7 +97,7 @@ setToolTipText((String) newValue); } else if (event.getPropertyName().equals(GuiActionDescrip.VISIBLE)) { setVisible((Boolean) newValue); - } else if (event.getPropertyName().equals(GuiActionDescrip.STYLES)) { + } else if (event.getPropertyName().equals(Action.STYLES)) { setStyles((String) newValue); } } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -204,7 +204,7 @@ @Override public void setStyles(final String styles) { - putValue(STYLES, styles); + putValue(Action.STYLES, styles); } @Override @@ -224,4 +224,40 @@ return "[GuiActionDescrip: " + getClass().getName() + (name == null ? "" : " " + name) + (tooltip == null ? "" : " " + tooltip) + "]"; } + + @Override + public GuiActionDescrip withIcon(final Object icon) { + super.putValue(Action.SMALL_ICON, icon); + return this; + } + + @Override + public GuiActionDescrip withIconCls(final String icon) { + putValue(Action.SMALL_ICON, icon); + return this; + } + + @Override + public GuiActionDescrip withParent(final GuiActionDescrip parent) { + setParent(parent); + return this; + } + + @Override + public GuiActionDescrip withStyles(final String styles) { + setStyles(styles); + return this; + } + + @Override + public GuiActionDescrip withText(final String text) { + putValue(Action.NAME, text); + return this; + } + + @Override + public GuiActionDescrip withToolTip(final String tooltip) { + putValue(Action.SHORT_DESCRIPTION, tooltip); + return this; + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -11,11 +11,6 @@ public static final int NO_POSITION = -1; /** - * Coma separated, styles of the Gui item - */ - public static final String STYLES = "stylesprop"; - - /** * {@link #TARGET} is used to associate a {@link #AbstractGuiActionDescrip} * with an object like groups, group names, users, and so on, and used to * execute actions against these targets @@ -80,4 +75,16 @@ void setVisible(final boolean visible); + GuiActionDescrip withIcon(Object icon); + + GuiActionDescrip withIconCls(String icon); + + GuiActionDescrip withParent(GuiActionDescrip parent); + + GuiActionDescrip withStyles(String styles); + + GuiActionDescrip withText(String text); + + GuiActionDescrip withToolTip(String tooltip); + } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuRadioItemDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuRadioItemDescriptor.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuRadioItemDescriptor.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -23,6 +23,7 @@ public class MenuRadioItemDescriptor extends MenuCheckItemDescriptor { + public static final String CHECKED_ITEM = "-checkeditem"; private final String group; public MenuRadioItemDescriptor(final MenuDescriptor parent, final AbstractAction action, final String group) { @@ -38,4 +39,21 @@ public Class<?> getType() { return MenuRadioItemDescriptor.class; } + + private String previousCheckedItemId() { + return group + CHECKED_ITEM; + } + + @Override + public void setChecked(final boolean checked) { + if (checked) { + final MenuRadioItemDescriptor previous = (MenuRadioItemDescriptor) parent.getValue(previousCheckedItemId()); + if (previous != null) { + previous.setChecked(false); + } + parent.putValue(previousCheckedItemId(), this); + } + super.setChecked(checked); + } + } Added: trunk/src/main/java/cc/kune/common/client/resources/CommonIconCssResource.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/resources/CommonIconCssResource.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/resources/CommonIconCssResource.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -0,0 +1,25 @@ +/* + * + * 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.resources; + +import com.google.gwt.resources.client.CssResource; + +public interface CommonIconCssResource extends CssResource { +} Added: trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -0,0 +1,41 @@ +/* + * + * 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.resources; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.ImageResource; + +public interface CommonIconResources extends ClientBundle { + + public static final CommonIconResources INSTANCE = GWT.create(CommonIconResources.class); + + @Source("checked.png") + ImageResource checked(); + + @Source("radiochecked.png") + ImageResource radioChecked(); + + @Source("radiounchecked.png") + ImageResource radioUnChecked(); + + @Source("unchecked.png") + ImageResource unChecked(); +} Added: trunk/src/main/java/cc/kune/common/client/resources/SubMenuResources.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/resources/SubMenuResources.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/resources/SubMenuResources.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -0,0 +1,13 @@ +package cc.kune.common.client.resources; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.user.client.ui.MenuBar.Resources; + +public interface SubMenuResources extends Resources { + public static final SubMenuResources INSTANCE = GWT.create(SubMenuResources.class); + + @Override + @Source("arrow-right-white.gif") + ImageResource menuBarSubMenuIcon(); +} Added: trunk/src/main/java/cc/kune/common/client/resources/arrow-right-white.gif =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/common/client/resources/arrow-right-white.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/common/client/resources/checked.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/common/client/resources/checked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/common/client/resources/radiochecked.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/common/client/resources/radiochecked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/common/client/resources/radiounchecked.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/common/client/resources/radiounchecked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/common/client/resources/unchecked.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/common/client/resources/unchecked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream 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-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -46,8 +46,10 @@ @UiField FlowPanel flow; @UiField - Image icon; + Image iconLeft; @UiField + Image iconRight; + @UiField InlineLabel label; @UiField FocusPanel self; @@ -106,20 +108,34 @@ return flow.remove(w); } - public void setIcon(final String imgCss) { - icon.setUrl("images/clear.gif"); - icon.setStyleName(imgCss); - icon.addStyleName("oc-ico-pad"); + public void setLabelText(final String text) { + label.setText(text); } - public void setIconResource(final ImageResource res) { - icon.setResource(res); + public void setLeftIcon(final String imgCss) { + iconLeft.setUrl("images/clear.gif"); + iconLeft.setStyleName(imgCss); + iconLeft.addStyleName("k-iconlabel-left"); + iconLeft.addStyleName("oc-ico-pad"); } - public void setLabelText(final String text) { - label.setText(text); + public void setLeftIconResource(final ImageResource res) { + iconLeft.setResource(res); + iconRight.addStyleName("k-iconlabel-left"); } + public void setRightIcon(final String imgCss) { + iconRight.setUrl("images/clear.gif"); + iconRight.setStyleName(imgCss); + iconRight.addStyleName("oc-ico-pad"); + iconRight.addStyleName("k-iconlabel-right"); + } + + public void setRightIconResource(final ImageResource res) { + iconRight.setResource(res); + iconRight.addStyleName("k-iconlabel-right"); + } + @Override public void setText(final String text) { label.setText(text); 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-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml 2011-02-24 02:37:26 UTC (rev 1261) @@ -2,24 +2,24 @@ <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui"> <ui:style> - .label { /* padding-left: 4px; */ - text-decoration: none; + .label { + text-decoration: none; } .label a:link { - text-decoration: none; - color: gray; + text-decoration: none; + color: gray; } - .pad { /* padding-left: 5px; */ - + .pad { + white-space: nowrap; } </ui:style> <g:FocusPanel ui:field="self"> - <g:FlowPanel styleName="{style.pad}" - ui:field="flow"> - <g:Image ui:field="icon"/> + <g:FlowPanel styleName="{style.pad}" ui:field="flow"> + <g:Image ui:field="iconLeft" /> <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/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-02-24 02:37:26 UTC (rev 1261) @@ -21,21 +21,21 @@ } .k-opacity80 { - kfilter: alpha(opacity = 80); + kfilter: alpha(opacity = 80); -moz-opacity: 0.80; -khtml-opacity: 0.80; opacity: 0.80; } .k-opacity90 { - kfilter: alpha(opacity = 90); + kfilter: alpha(opacity = 90); -moz-opacity: 0.90; -khtml-opacity: 0.90; opacity: 0.90; } .k-opacity95 { - kfilter: alpha(opacity = 95); + kfilter: alpha(opacity = 95); -moz-opacity: 0.95; -khtml-opacity: 0.95; opacity: 0.95; @@ -43,7 +43,7 @@ .gwt-PopupPanelGlass { background-color: #f7ebe3 !important; - kfilter: alpha(opacity = 68) !important; + kfilter: alpha(opacity = 68) !important; -moz-opacity: 0.68 !important; -khtml-opacity: 0.68 !important; opacity: 0.68 !important; @@ -263,7 +263,7 @@ background-color: #280b0b; } -.oc-menu .gwt-MenuBar-vertical { +.oc-menu .gwt-MenuBar-vertical, .gwt-MenuBar-vertical { background-color: #280b0b; border: 2px solid #552200; padding: 3px; @@ -273,7 +273,7 @@ -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomleft: 5px; border-bottom-left-radius: 5px; - kfilter: alpha(opacity = 90); + kfilter: alpha(opacity = 90); -moz-opacity: 0.90; -khtml-opacity: 0.90; opacity: 0.90; @@ -436,4 +436,17 @@ border-left: 1px solid #B3B3B3; height: 10px; margin-top: 4px; +} + +.k-iconlabel-left { + float: left; +} + +.k-iconlabel-right { + float: right; + /* margin-left: 5px; */ +} + +.gwt-MenuBar-vertical .subMenuIcon-selected { + background: none repeat scroll 0 0 #808080; } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/CoreParts.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -4,6 +4,7 @@ import cc.kune.core.client.init.AppStartEvent.AppStartHandler; import cc.kune.core.client.sitebar.SiteUserOptionsPresenter; import cc.kune.core.client.sn.GroupMembersPresenter; +import cc.kune.core.client.sn.actions.GroupMembersConfActions; import cc.kune.core.client.state.Session; import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; @@ -14,10 +15,12 @@ @Inject public CoreParts(final Session session, final Provider<GroupMembersPresenter> grouMembersPresenter, + final Provider<GroupMembersConfActions> groupMembersConfActions, final Provider<SiteUserOptionsPresenter> userOptions, final Provider<EntityLicensePresenter> licenseFooter) { - session.onInitDataReceived(new AppStartHandler() { + session.onInitDataReceived(true, new AppStartHandler() { @Override public void onAppStart(final AppStartEvent event) { + groupMembersConfActions.get(); grouMembersPresenter.get(); userOptions.get(); licenseFooter.get(); Modified: trunk/src/main/java/cc/kune/core/client/logs/Log.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/logs/Log.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/core/client/logs/Log.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -24,19 +24,23 @@ public class Log { public static void debug(final String message) { - GWT.log(message); + GWT.log(prefix(message)); } public static void debug(final String message, final Throwable caught) { - GWT.log(message, caught); + GWT.log(prefix(message), caught); } public static void error(final String message) { - debug(message); + debug(prefix(message)); } public static void info(final String message) { - GWT.log(message); + GWT.log(prefix(message)); } + private static String prefix(final String message) { + return new StringBuffer().append("-KUNE-----").append(message).toString(); + } + } Modified: trunk/src/main/java/cc/kune/core/client/resources/icons/IconResources.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/icons/IconResources.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/core/client/resources/icons/IconResources.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -30,6 +30,9 @@ @Source("bug.png") ImageResource bug(); + @Source("checked.png") + ImageResource checked(); + @Source("kicon.css") IconCssResource css(); @@ -56,4 +59,13 @@ @Source("prefs.png") ImageResource prefs(); + + @Source("radiochecked.png") + ImageResource radiochecked(); + + @Source("radiounchecked.png") + ImageResource radioUnChecked(); + + @Source("unchecked.png") + ImageResource unChecked(); } Added: trunk/src/main/java/cc/kune/core/client/resources/icons/checked.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/icons/checked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/icons/radiochecked.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/icons/radiochecked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/icons/radiounchecked.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/icons/radiounchecked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/icons/unchecked.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/icons/unchecked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -5,8 +5,6 @@ import cc.kune.common.client.actions.ui.IsActionExtensible; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; -import cc.kune.core.client.init.AppStartEvent; -import cc.kune.core.client.init.AppStartEvent.AppStartHandler; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.sn.actions.registry.AbstractSNMembersActionsRegistry; import cc.kune.core.client.sn.actions.registry.GroupMembersActionsRegistry; @@ -41,7 +39,6 @@ public interface GroupMembersView extends View { int AVATARLABELMAXSIZE = 4; - // int AVATARSIZE = 32; int AVATARSIZE = 22; String NOAVATAR = ""; @@ -79,11 +76,9 @@ private final GroupMembersActionsRegistry actionsRegistry; private final SNAdminsMenuItemsRegistry adminsMenuItemsRegistry; - private final SNCollabsMenuItemsRegistry collabsMenuItemsRegistry; private final Provider<FileDownloadUtils> downloadProvider; private final SNPendingsMenuItemsRegistry pendingsMenuItemsRegistry; - private final Session session; @Inject public GroupMembersPresenter(final EventBus eventBus, final GroupMembersView view, final GroupMembersProxy proxy, @@ -93,13 +88,12 @@ final SNPendingsMenuItemsRegistry pendingsMenuItemsRegistry, final GroupMembersActionsRegistry actionsRegistry) { super(eventBus, view, proxy); - this.session = session; this.downloadProvider = downloadProvider; this.adminsMenuItemsRegistry = adminsMenuItemsRegistry; this.collabsMenuItemsRegistry = collabsMenuItemsRegistry; this.pendingsMenuItemsRegistry = pendingsMenuItemsRegistry; this.actionsRegistry = actionsRegistry; - stateManager.onStateChanged(new StateChangedEvent.StateChangedHandler() { + stateManager.onStateChanged(true, new StateChangedEvent.StateChangedHandler() { @Override public void onStateChanged(final StateChangedEvent event) { GroupMembersPresenter.this.onStateChanged(event.getState()); @@ -112,12 +106,6 @@ GroupMembersPresenter.this.onStateChanged(event.getState()); } }); - session.onInitDataReceived(new AppStartHandler() { - @Override - public void onAppStart(final AppStartEvent event) { - // FIXME - } - }); createActions(); } Added: trunk/src/main/java/cc/kune/core/client/sn/actions/GroupMembersConfActions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/GroupMembersConfActions.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/GroupMembersConfActions.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -0,0 +1,48 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; +import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor; +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.shared.domain.AdmissionType; +import cc.kune.core.shared.domain.SocialNetworkVisibility; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class GroupMembersConfActions { + + public static final SubMenuDescriptor MODERATION_SUBMENU = new SubMenuDescriptor(); + public static final MenuDescriptor OPTIONS_MENU = new MenuDescriptor(); + public static final SubMenuDescriptor VISIBILITY_SUBMENU = new SubMenuDescriptor(); + + @Inject + public GroupMembersConfActions(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"); + 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)); + registry.add(membersVisibility.get().withVisibility(SocialNetworkVisibility.anyone).withParent( + VISIBILITY_SUBMENU).withText(i18n.t("anyone"))); + registry.add(membersVisibility.get().withVisibility(SocialNetworkVisibility.onlymembers).withParent( + VISIBILITY_SUBMENU).withText(i18n.t("only members"))); + registry.add(membersVisibility.get().withVisibility(SocialNetworkVisibility.onlyadmins).withParent( + VISIBILITY_SUBMENU).withText(i18n.t("only admins"))); + registry.add(membersModeration.get().withModeration(AdmissionType.Moderated).withParent(MODERATION_SUBMENU).withText( + 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(new ButtonDescriptor(joinGroupAction).withStyles("k-no-backimage")); + registry.add(new ButtonDescriptor(unJoinGroupAction).withStyles("k-no-backimage")); + } +} Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -27,6 +27,7 @@ putValue(NAME, i18n.t("Participate")); putValue(SHORT_DESCRIPTION, i18n.t("Request to participate in this group")); putValue(Action.SMALL_ICON, res.addGreen()); + putValue(Action.STYLES, "k-sn-join"); } @Override Added: trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationAction.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationAction.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -0,0 +1,45 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.domain.AdmissionType; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class MembersModerationAction extends AbstractExtendedAction { + + private AdmissionType admissionType; + private final Provider<GroupServiceAsync> groupServiceProvider; + private final I18nTranslationService i18n; + private final Session session; + + @Inject + public MembersModerationAction(final Session session, final I18nTranslationService i18n, + final Provider<GroupServiceAsync> groupServiceProvider) { + this.session = session; + this.i18n = i18n; + this.groupServiceProvider = groupServiceProvider; + } + + @Override + public void actionPerformed(final ActionEvent event) { + groupServiceProvider.get().setGroupNewMembersJoiningPolicy(session.getUserHash(), + session.getCurrentState().getGroup().getStateToken(), admissionType, new AsyncCallbackSimple<Void>() { + @Override + public void onSuccess(final Void result) { + NotifyUser.info(i18n.t("Members joining policy changed")); + } + }); + } + + public void setAdmissionType(final AdmissionType admissionType) { + this.admissionType = admissionType; + } + +} Added: trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationMenuItem.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -0,0 +1,23 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; +import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; +import cc.kune.core.shared.domain.AdmissionType; + +import com.google.inject.Inject; + +public class MembersModerationMenuItem extends MenuRadioItemDescriptor { + + private static final String GROUP_MEMBERS_MODERATION = "k-sn-gmembers-vis"; + + @Inject + public MembersModerationMenuItem(final MenuDescriptor parent, final MembersModerationAction action) { + super(parent, action, GROUP_MEMBERS_MODERATION); + } + + public MenuRadioItemDescriptor withModeration(final AdmissionType admissionType) { + ((MembersModerationAction) getAction()).setAdmissionType(admissionType); + return this; + } + +} \ No newline at end of file Added: trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityAction.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityAction.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -0,0 +1,46 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.domain.SocialNetworkVisibility; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class MembersVisibilityAction extends AbstractExtendedAction { + + private final Provider<GroupServiceAsync> groupServiceProvider; + private final I18nTranslationService i18n; + private final Session session; + private SocialNetworkVisibility visibility; + + @Inject + public MembersVisibilityAction(final Session session, final I18nTranslationService i18n, + final Provider<GroupServiceAsync> groupServiceProvider) { + this.session = session; + this.i18n = i18n; + this.groupServiceProvider = groupServiceProvider; + } + + @Override + public void actionPerformed(final ActionEvent event) { + groupServiceProvider.get().setSocialNetworkVisibility(session.getUserHash(), + session.getCurrentState().getGroup().getStateToken(), visibility, new AsyncCallbackSimple<Void>() { + @Override + public void onSuccess(final Void result) { + NotifyUser.info(i18n.t("Members visibility changed")); + } + }); + } + + public void setVisibility(final SocialNetworkVisibility visibility) { + this.visibility = visibility; + + } + +} Added: trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityMenuItem.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -0,0 +1,23 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; +import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; +import cc.kune.core.shared.domain.SocialNetworkVisibility; + +import com.google.inject.Inject; + +public class MembersVisibilityMenuItem extends MenuRadioItemDescriptor { + + private static final String GROUP_MEMBERS_VISIBILITY = "k-sn-gmembers-vis"; + + @Inject + public MembersVisibilityMenuItem(final MenuDescriptor parent, final MembersVisibilityAction action) { + super(parent, action, GROUP_MEMBERS_VISIBILITY); + } + + public MenuRadioItemDescriptor withVisibility(final SocialNetworkVisibility visibility) { + ((MembersVisibilityAction) getAction()).setVisibility(visibility); + return this; + } + +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -28,6 +28,7 @@ putValue(NAME, i18n.t("Leave this group")); putValue(SHORT_DESCRIPTION, i18n.t("Do not participate anymore in this group")); putValue(Action.SMALL_ICON, res.del()); + putValue(Action.STYLES, "k-sn-join"); } @Override Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -1,22 +1,6 @@ package cc.kune.core.client.sn.actions.registry; -import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; -import cc.kune.core.client.sn.actions.JoinGroupAction; -import cc.kune.core.client.sn.actions.UnJoinGroupAction; -import cc.kune.core.client.sn.actions.conditions.IsGroupCondition; -import com.google.inject.Inject; - public class GroupMembersActionsRegistry extends AbstractSNActionsRegistry { - @Inject - public GroupMembersActionsRegistry(final JoinGroupAction joinGroupAction, final IsGroupCondition isGroupCondition, - final UnJoinGroupAction unJoinGroupAction) { - final ButtonDescriptor join = new ButtonDescriptor(joinGroupAction); - final ButtonDescriptor unjoin = new ButtonDescriptor(unJoinGroupAction); - // join.setStyles("k-no-backimage"); - // unjoin.setStyles("k-no-backimage"); - // join.add(isGroupCondition); - add(join); - add(unjoin); - } + } Modified: trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -33,7 +33,7 @@ public AccessRightsClientManager(final EventBus eventBus, final StateManager stateManager) { this.eventBus = eventBus; this.previousRights = null; - stateManager.onStateChanged(new StateChangedHandler() { + stateManager.onStateChanged(true, new StateChangedHandler() { @Override public void onStateChanged(final StateChangedEvent event) { Modified: trunk/src/main/java/cc/kune/core/client/state/Session.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/Session.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/core/client/state/Session.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -136,7 +136,7 @@ boolean isNotLogged(); - void onInitDataReceived(AppStartEvent.AppStartHandler handler); + void onInitDataReceived(boolean fireNow, AppStartEvent.AppStartHandler handler); @Deprecated void onInitDataReceived(Listener<InitDataDTO> listener); 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-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -292,8 +292,11 @@ } @Override - public void onInitDataReceived(final AppStartHandler handler) { + public void onInitDataReceived(final boolean fireNow, final AppStartHandler handler) { eventBus.addHandler(AppStartEvent.getType(), handler); + if (fireNow && initData != null) { + handler.onAppStart(new AppStartEvent(initData)); + } } @Override Modified: trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -40,8 +40,9 @@ private final Provider<StateManager> stateManager; @Inject - public SiteTokenListeners(final EventBus eventBus, final Provider<StateManager> stateManager, - final Provider<SignIn> signIn, final Provider<Register> register, final Provider<NewGroup> newGroup, + public SiteTokenListeners(final Session session, final EventBus eventBus, + final Provider<StateManager> stateManager, final Provider<SignIn> signIn, + final Provider<Register> register, final Provider<NewGroup> newGroup, final Provider<AboutKuneDialog> aboutKuneDialog) { this.stateManager = stateManager; this.signIn = signIn; @@ -49,7 +50,7 @@ this.newGroup = newGroup; this.aboutKuneDialog = aboutKuneDialog; init(); - eventBus.addHandler(AppStartEvent.getType(), new AppStartHandler() { + session.onInitDataReceived(true, new AppStartHandler() { @Override public void onAppStart(final AppStartEvent event) { } Modified: trunk/src/main/java/cc/kune/core/client/state/StateManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -47,11 +47,16 @@ void onSocialNetworkChanged(SocialNetworkChangedEvent.SocialNetworkChangedHandler handler); + /** + * @param fireNow + * if true, fire handler with current state + * @param handler + */ + void onStateChanged(boolean fireNow, StateChangedEvent.StateChangedHandler handler); + @Deprecated void onStateChanged(Listener<StateAbstractDTO> listener); - void onStateChanged(StateChangedEvent.StateChangedHandler handler); - @Deprecated void onToolChanged(Listener2<String, String> listener); 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-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -153,7 +153,7 @@ if (beforeStateChangeCollection.checkBeforeAction()) { final HistoryTokenCallback tokenListener = siteTokens.get(historyToken != null ? historyToken.toLowerCase() : historyToken); - Log.debug("StateManager: history token changed (" + historyToken + ")"); + Log.debug("StateManager: on history changed (" + historyToken + ")"); if (tokenListener == null) { // Ok, normal token change onHistoryChanged(new StateToken(historyToken)); @@ -182,13 +182,18 @@ } @Override - public void onStateChanged(final Listener<StateAbstractDTO> listener) { - throw new NotImplementedException(); + public void onStateChanged(final boolean fireNow, final StateChangedHandler handler) { + eventBus.addHandler(StateChangedEvent.getType(), handler); + if (fireNow) { + if (session.getCurrentState() != null) { + handler.onStateChanged(new StateChangedEvent(session.getCurrentState())); + } + } } @Override - public void onStateChanged(final StateChangedHandler handler) { - eventBus.addHandler(StateChangedEvent.getType(), handler); + public void onStateChanged(final Listener<StateAbstractDTO> listener) { + throw new NotImplementedException(); } @Override @@ -203,6 +208,7 @@ @Override public void onValueChange(final ValueChangeEvent<String> event) { + Log.info("History event value changed: " + event.getValue()); onHistoryChanged(event.getValue()); } 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-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicDialog.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -142,7 +142,7 @@ public void setTitleIcon(final String icon) { if (TextUtils.notEmpty(icon)) { - title.setIcon(icon); + title.setLeftIcon(icon); } } Modified: trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicensePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicensePresenter.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicensePresenter.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -64,7 +64,7 @@ public EntityLicensePresenter(final EventBus eventBus, final EntityLicenseView view, final EntityLicenseProxy proxy, final StateManager stateManager) { super(eventBus, view, proxy); - stateManager.onStateChanged(new StateChangedHandler() { + stateManager.onStateChanged(true, new StateChangedHandler() { @Override public void onStateChanged(final StateChangedEvent event) { Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-24 02:37:26 UTC (rev 1261) @@ -945,4 +945,16 @@ float: right; margin: 10px 15px 0px 5px; cursor: pointer; -} \ No newline at end of file +} + +.k-sn-options-menu { + float: left; +} + +.k-sn-options-menu button { + background-color: none; +} + +.k-sn-join { + float:left; +} Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java 2011-02-22 02:22:10 UTC (rev 1260) +++ trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java 2011-02-24 02:37:26 UTC (rev 1261) @@ -21,8 +21,10 @@ import cc.kune.common.client.actions.ui.IsActionExtensible; import cc.kune.core.client.init.AppStartEvent; +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.shared.domain.ContentStatus; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupListDTO; @@ -61,15 +63,16 @@ private final StateTokenUtils stateTokenUtils; @Inject - public PSpacePresenter(final EventBus eventBus, final PSpaceView view, final PSpaceProxy proxy, - final I18nTranslationService i18n, final StateTokenUtils stateTokenUtils) { + public PSpacePresenter(final Session session, final StateManager stateManager, final EventBus eventBus, + final PSpaceView view, final PSpaceProxy proxy, final I18nTranslationService i18n, + final StateTokenUtils stateTokenUtils) { super(eventBus, view, proxy); this.i18n = i18n; this.stateTokenUtils = stateTokenUtils; - eventBus.addHandler(AppStartEvent.getType(), new AppStartEvent.AppStartHandler() { + session.onInitDataReceived(true, new AppStartEvent.AppStartHandler() { @Override public void onAppStart(final AppStartEvent event) { - eventBus.addHandler(StateChangedEvent.getType(), new StateChangedHandler() { + stateManager.onStateChanged(true, new StateChangedHandler() { @Override public void onStateChanged(final StateChangedEvent event) { setState(event.getState());

1 0

r1260 - in trunk/src/main/java/cc/kune: chat/client client common/client/shortcuts core/client core/public
by Vicente J. Ruiz Jurado 22 Feb '11

22 Feb '11

Author: vjrj_ Date: 2011-02-22 03:22:10 +0100 (Tue, 22 Feb 2011) New Revision: 1260 Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java trunk/src/main/java/cc/kune/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/common/client/shortcuts/DefaultGlobalShortcutRegister.java trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/public/ws.css Log: Shortcuts fixed Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-02-22 00:00:03 UTC (rev 1259) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-02-22 02:22:10 UTC (rev 1260) @@ -30,7 +30,6 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.KeyStroke; import cc.kune.common.client.actions.Shortcut; -import cc.kune.common.client.actions.ui.ParentWidget; 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; @@ -54,6 +53,7 @@ import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; import com.calclab.emite.im.client.chat.ChatManager; import com.calclab.emite.im.client.roster.XmppRoster; +import com.calclab.emite.reconnect.client.SessionReconnect; import com.calclab.emite.xep.avatar.client.AvatarManager; import com.calclab.emite.xep.muc.client.Room; import com.calclab.emite.xep.muc.client.RoomManager; @@ -145,6 +145,7 @@ this.roster = Suco.get(XmppRoster.class); this.chatManager = Suco.get(ChatManager.class); this.roomManager = Suco.get(RoomManager.class); + Suco.get(SessionReconnect.class); eventBus.addHandler(AppStartEvent.getType(), new AppStartEvent.AppStartHandler() { @Override @@ -222,9 +223,9 @@ chatIcon.setStyles("k-no-backimage, k-btn-sitebar, k-chat-icon"); chatIcon.putValue(Action.NAME, i18n.t(CHAT_TITLE)); chatIcon.putValue(Action.SHORT_DESCRIPTION, i18n.t("Show/hide the chat window")); - final KeyStroke shortcut = Shortcut.getShortcut(false, true, true, false, Character.valueOf('C')); + 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)); @@ -252,8 +253,9 @@ dialog.setBodyStyleName("k-chat-window"); dialog.setScrollMode(Scroll.NONE); dialog.setHideOnButtonClick(true); - final Widget btn = (Widget) chatIcon.getValue(ParentWidget.PARENT_UI); - dialog.setPosition(btn.getAbsoluteLeft(), btn.getAbsoluteTop()); + // final Widget btn = (Widget) + // chatIcon.getValue(ParentWidget.PARENT_UI); + dialog.setPosition(118, 2); dialog.setIcon(AbstractImagePrototype.create(chatResources.chat())); // dialog.getItem(0).getFocusSupport().setIgnore(true); initEmite(); @@ -416,6 +418,7 @@ } private void showDialog(final boolean show) { + Log.info("Show dialog: " + show); if (session.isLogged()) { createDialogIfNeeded(); if (show) { @@ -429,6 +432,7 @@ } private void toggleShowDialog() { + Log.info("Toggle!"); showDialog(dialog == null ? true : !dialogVisible()); } Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-02-22 00:00:03 UTC (rev 1259) +++ trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-02-22 02:22:10 UTC (rev 1260) @@ -63,6 +63,7 @@ */ public void onModuleLoadCont() { DelayedBindRegistry.bind(ginjector); + ginjector.getGlobalShortcutRegister().enable(); AsyncCallbackSimple.init(ginjector.getErrorHandler()); ginjector.getEventLogger(); NotifyUser.init(ginjector.getEventBus(), ginjector.getI18n()); @@ -71,7 +72,6 @@ ginjector.getSiteTokenListeners(); ginjector.getGwtGuiProvider(); ginjector.getUserNotifierPresenter(); - ginjector.getGlobalShortcutRegister(); ginjector.getSpinerPresenter(); ginjector.getGroupMembersPresenter(); ginjector.getSiteLogoPresenter(); 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-22 00:00:03 UTC (rev 1259) +++ trunk/src/main/java/cc/kune/common/client/shortcuts/DefaultGlobalShortcutRegister.java 2011-02-22 02:22:10 UTC (rev 1260) @@ -20,6 +20,7 @@ package cc.kune.common.client.shortcuts; import cc.kune.common.client.actions.AbstractAction; +import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ChangeableObject; import cc.kune.common.client.actions.InputMap; @@ -49,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"); + GWT.log("Not propagating event for action: " + action.getValue(Action.NAME)); nativeEvent.stopPropagation(); action.actionPerformed(new ActionEvent(nativeEvent.getCurrentEventTarget(), event)); nativeEventPrev.cancel(); @@ -57,7 +58,6 @@ } } }; - enableImpl(); } @Override Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-22 00:00:03 UTC (rev 1259) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-22 02:22:10 UTC (rev 1260) @@ -118,6 +118,7 @@ bind(ProxyFailureHandler.class).to(DefaultProxyFailureHandler.class).in(Singleton.class); bind(I18nUITranslationService.class).in(Singleton.class); bind(I18nTranslationService.class).to(I18nUITranslationService.class).in(Singleton.class); + bind(GlobalShortcutRegister.class).to(DefaultGlobalShortcutRegister.class).in(Singleton.class); // Presenters bindPresenter(CorePresenter.class, CorePresenter.CoreView.class, CoreViewImpl.class, @@ -161,7 +162,7 @@ bind(GuiProvider.class).to(DefaultGuiProvider.class).in(Singleton.class); bind(GxtGuiProvider.class).in(Singleton.class); bind(GwtGuiProvider.class).in(Singleton.class); - bind(GlobalShortcutRegister.class).to(DefaultGlobalShortcutRegister.class).in(Singleton.class); + bind(MaskWidgetView.class).to(MaskWidget.class).in(Singleton.class); // Core App Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-22 00:00:03 UTC (rev 1259) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-22 02:22:10 UTC (rev 1260) @@ -903,7 +903,7 @@ } .k-sn-bottomPanel { - padding: 0 10px; + padding: 8px 10px 0; float: right; }

1 0

r1259 - in trunk: . src/main/resources
by Vicente J. Ruiz Jurado 22 Feb '11

22 Feb '11

Author: vjrj_ Date: 2011-02-22 01:00:03 +0100 (Tue, 22 Feb 2011) New Revision: 1259 Modified: trunk/pom.xml trunk/src/main/resources/wave-server.properties Log: NEW - # 30: New running methods http://kune.ourproject.org/issues/ticket/30 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-21 20:51:42 UTC (rev 1258) +++ trunk/pom.xml 2011-02-22 00:00:03 UTC (rev 1259) @@ -217,11 +217,8 @@  <version>3.0-rc2</version> </dependency> -  +  <dependency> <groupId>com.google.inject.extensions</groupId> <artifactId>guice-servlet</artifactId> @@ -247,7 +244,7 @@ <groupId>com.gwtplatform</groupId> <artifactId>gwtp-all</artifactId> <version>0.5</version> - +  <exclusions> <exclusion> <groupId>org.springframework</groupId> @@ -272,18 +269,9 @@ <artifactId>gwt-fx</artifactId> <version>r464</version> </dependency> -  +   <dependency> <groupId>com.gwtext</groupId> @@ -518,12 +506,6 @@ <scope>provided</scope> </dependency>  -  -  -  -  -  -  <dependency> <groupId>org.jukito</groupId> <artifactId>jukito</artifactId> @@ -731,6 +713,46 @@ <build> <plugins> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.1.1</version> + <executions> + <execution> + <phase>exec</phase> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <configuration> + <mainClass>cc.kune.wave.server.WaveMain</mainClass> + <systemProperties> + <systemProperty> + <key>wave.server.config</key> + <value>src/main/resources/wave-server.properties</value> + </systemProperty> + <systemProperty> + <key>org.eclipse.jetty.util.resource.FileResource.checkAliases</key> +  + <value>False</value> + </systemProperty> + <systemProperty> + <key>java.security.auth.login.config</key> + <value>src/main/resources/jaas.config</value> + </systemProperty> + <systemProperty> + <key>DEBUG</key> + <value>true</value> + </systemProperty> + <systemProperty> + <key>org.eclipse.jetty.util.log.DEBUG</key> + <value>true</value> + </systemProperty> + </systemProperties> + <classpathScope>runtime</classpathScope> + </configuration> + </plugin> + <plugin>  <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> Modified: trunk/src/main/resources/wave-server.properties =================================================================== --- trunk/src/main/resources/wave-server.properties 2011-02-21 20:51:42 UTC (rev 1258) +++ trunk/src/main/resources/wave-server.properties 2011-02-22 00:00:03 UTC (rev 1259) @@ -1,7 +1,7 @@ # Core Configuration for the Wave in a Box server # -# Domain name of the wave server +# Domain name of the wave server wave_server_domain = localhost # A comma separated list of address on which to listen for connections. @@ -9,7 +9,7 @@ http_frontend_public_address = localhost:9898 http_frontend_addresses = ${http_frontend_public_address} http_baseurl = / -resource_base = ../kune-0.0.7/ +resource_base = target/kune-0.0.7/ ### Server-specific variables ###

1 0

r1258 - in trunk/src/main/java/cc/kune: chat/client chat/client/resources chat/client/snd chat/public common/client/actions/gwtui common/client/actions/gxtui common/client/actions/ui common/client/actions/ui/descrip common/public/gxt-custom/css core/client/logs core/client/resources/icons core/client/sitebar core/public pspace/client
by Vicente J. Ruiz Jurado 21 Feb '11

21 Feb '11

Author: vjrj_ Date: 2011-02-21 21:51:42 +0100 (Mon, 21 Feb 2011) New Revision: 1258 Added: trunk/src/main/java/cc/kune/chat/client/resources/chat-icons.css trunk/src/main/java/cc/kune/chat/client/resources/e-icon-a.gif trunk/src/main/java/cc/kune/chat/client/resources/e-icon.gif trunk/src/main/java/cc/kune/chat/client/snd/ trunk/src/main/java/cc/kune/chat/client/snd/ClickEvent.java trunk/src/main/java/cc/kune/chat/client/snd/KuneSoundManager.java trunk/src/main/java/cc/kune/core/client/resources/icons/IconCssResource.java Removed: trunk/src/main/java/cc/kune/core/client/resources/icons/IconBorrarCssResource.java trunk/src/main/java/cc/kune/core/client/resources/icons/e-icon-a.gif trunk/src/main/java/cc/kune/core/client/resources/icons/e-icon.gif Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java trunk/src/main/java/cc/kune/chat/client/KuneUnattendedPresenter.java trunk/src/main/java/cc/kune/chat/client/resources/ChatResources.java trunk/src/main/java/cc/kune/chat/public/kune-chat.css trunk/src/main/java/cc/kune/chat/public/kune-hablar.css 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/GwtButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtComplexToolbar.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuCheckItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuTitleItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtPushButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarSeparatorGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css trunk/src/main/java/cc/kune/core/client/logs/Log.java trunk/src/main/java/cc/kune/core/client/resources/icons/IconResources.java trunk/src/main/java/cc/kune/core/client/resources/icons/kicon.css trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/public/ws.html trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java Log: Actions improved, hablar integration Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -23,6 +23,8 @@ import cc.kune.chat.client.ShowChatDialogEvent.ShowChatDialogHandler; import cc.kune.chat.client.ToggleShowChatDialogEvent.ToggleShowChatDialogHandler; +import cc.kune.chat.client.resources.ChatResources; +import cc.kune.chat.client.snd.KuneSoundManager; import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; @@ -34,13 +36,11 @@ import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; import cc.kune.common.client.noti.NotifyUser; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; -import cc.kune.common.client.ui.PopupTopPanel; 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.resources.icons.IconResources; import cc.kune.core.client.sitebar.SitebarActionsPresenter; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.UserSignInEvent; @@ -50,7 +50,6 @@ import cc.kune.core.shared.dto.UserInfoDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.emite.browser.client.PageAssist; import com.calclab.emite.core.client.xmpp.session.XmppSession; import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; import com.calclab.emite.im.client.chat.ChatManager; @@ -64,30 +63,32 @@ 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.AltIcons; -import com.calclab.hablar.icons.def.client.DefaultIcons; -import com.calclab.hablar.icons.ie6gif.client.IE6GifIcons; +import com.calclab.hablar.icons.alt.client.AltIconsBundle; import com.calclab.hablar.login.client.HablarLogin; import com.calclab.hablar.login.client.LoginConfig; import com.calclab.suco.client.Suco; +import com.extjs.gxt.ui.client.Style.Scroll; +import com.extjs.gxt.ui.client.widget.Dialog; +import com.google.gwt.core.client.GWT; import com.google.gwt.event.shared.EventBus; +import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; public class ChatClientDefault implements ChatClient { - public static class ChatClientAction extends AbstractExtendedAction { + public class ChatClientAction extends AbstractExtendedAction { private final EventBus eventBus; - private final IconResources res; + private final ChatResources res; - @Inject - public ChatClientAction(final EventBus eventBus, final IconResources res) { + public ChatClientAction(final EventBus eventBus, final ChatResources res) { super(); this.eventBus = eventBus; this.res = res; - res.css().ensureInjected(); putValue(Action.SMALL_ICON, res.chat()); } @@ -98,42 +99,48 @@ } public void setBlink(final boolean blink) { - putValue(Action.SMALL_ICON, blink ? res.chatBlink() : res.chat()); + final ImageResource icon = blink ? res.chatBlink() : res.chat(); + putValue(Action.SMALL_ICON, icon); + dialog.setIcon(AbstractImagePrototype.create(icon)); } } protected static final String CHAT_CLIENT_ICON_ID = "k-chat-icon-id"; + private static final String CHAT_TITLE = "Chat ;)"; + private final ChatClientAction action; protected IconLabelDescriptor chatIcon; private final ChatManager chatManager; private final ChatOptions chatOptions; + private final ChatResources chatResources; + private Dialog dialog; + private final EventBus eventBus; private final I18nTranslationService i18n; - private PopupTopPanel popup; private final RoomManager roomManager; private final XmppRoster roster; private final Session session; private final GlobalShortcutRegister shorcutRegister; private final SitebarActionsPresenter siteActions; + private final XmppSession xmppSession; @Inject - public ChatClientDefault(final EventBus eventBus, final I18nTranslationService i18n, final ChatClientAction action, + public ChatClientDefault(final EventBus eventBus, final I18nTranslationService i18n, final SitebarActionsPresenter siteActions, final Session session, - final GlobalShortcutRegister shorcutRegister, final ChatOptions chatOptions) { + final GlobalShortcutRegister shorcutRegister, final ChatOptions chatOptions, + final ChatResources chatResources) { - // , final XmppSession xmppSession, - // final XmppRoster roster, final ChatManager chatManager, final - // RoomManager roomManager, - // final SessionReconnect sessionReconnect, final - // Provider<AvatarManager> avatarManager) { + this.eventBus = eventBus; this.i18n = i18n; - this.action = action; + action = new ChatClientAction(eventBus, chatResources); this.siteActions = siteActions; this.session = session; this.shorcutRegister = shorcutRegister; this.chatOptions = chatOptions; + this.chatResources = chatResources; + chatResources.css().ensureInjected(); this.xmppSession = Suco.get(XmppSession.class); this.roster = Suco.get(XmppRoster.class); this.chatManager = Suco.get(ChatManager.class); @@ -146,14 +153,6 @@ chatOptions.httpBase = event.getInitData().getChatHttpBase(); chatOptions.roomHost = event.getInitData().getChatRoomHost(); checkChatDomain(chatOptions.domain); - // if (session.isLogged()) { - // session.check(new AsyncCallbackSimple<Void>() { - // @Override - // public void onSuccess(final Void result) { - // doLogin(); - // } - // }); - // } session.onUserSignIn(true, new UserSignInHandler() { @Override public void onUserSignIn(final UserSignInEvent event) { @@ -221,7 +220,7 @@ chatIcon = new IconLabelDescriptor(action); chatIcon.setId(CHAT_CLIENT_ICON_ID); chatIcon.setStyles("k-no-backimage, k-btn-sitebar, k-chat-icon"); - chatIcon.putValue(Action.NAME, i18n.t("Chat ;)")); + chatIcon.putValue(Action.NAME, i18n.t(CHAT_TITLE)); chatIcon.putValue(Action.SHORT_DESCRIPTION, i18n.t("Show/hide the chat window")); final KeyStroke shortcut = Shortcut.getShortcut(false, true, true, false, Character.valueOf('C')); shorcutRegister.put(shortcut, action); @@ -240,22 +239,29 @@ private void createDialog(final HablarWidget widget, final HtmlConfig htmlConfig) { widget.addStyleName("k-chat-panel"); setSize(widget, htmlConfig); - popup.add(widget); + dialog.add(widget); } private void createDialogIfNeeded() { - if (popup == null) { - popup = new PopupTopPanel(); - popup.setStyleName("k-popup-top-centered"); - popup.addStyleName("k-bottom-10corners"); - popup.addStyleName("k-box-10shadow"); - popup.addStyleName("k-chat-window"); + if (dialog == null) { + dialog = new Dialog(); + dialog.setHeading(i18n.t(CHAT_TITLE)); + dialog.setClosable(true); + dialog.setResizable(true); + dialog.setButtons(""); + dialog.setBodyStyleName("k-chat-window"); + dialog.setScrollMode(Scroll.NONE); + dialog.setHideOnButtonClick(true); + final Widget btn = (Widget) chatIcon.getValue(ParentWidget.PARENT_UI); + dialog.setPosition(btn.getAbsoluteLeft(), btn.getAbsoluteTop()); + dialog.setIcon(AbstractImagePrototype.create(chatResources.chat())); + // dialog.getItem(0).getFocusSupport().setIgnore(true); initEmite(); } } private boolean dialogVisible() { - return popup != null && popup.isShowing(); + return dialog != null && dialog.isVisible(); } @Override @@ -278,21 +284,17 @@ } private void initEmite() { - final String icons = PageAssist.getMeta("hablar.icons"); - if ("alt".equals(icons)) { - AltIcons.load(); - } else if ("ie6".equals(icons)) { - IE6GifIcons.load(); - } else { - DefaultIcons.load(); - } + loadIcons(chatResources); final HablarConfig config = HablarConfig.getFromMeta(); final HtmlConfig htmlConfig = HtmlConfig.getFromMeta(); + config.dockConfig.headerSize = 0; + config.dockConfig.rosterWidth = 150; + config.dockConfig.rosterDock = "right"; final HablarWidget widget = new HablarWidget(config.layout, config.tabHeaderSize); final Hablar hablar = widget.getHablar(); HablarComplete.install(hablar, config); - new KuneHablarSignals(xmppSession, hablar, action); + new KuneHablarSignals(eventBus, xmppSession, hablar, action); if (htmlConfig.hasLogger) { new HablarConsole(hablar); } @@ -300,6 +302,7 @@ if (htmlConfig.hasLogin) { new HablarLogin(hablar, LoginConfig.getFromMeta()); } + new KuneSoundManager(eventBus, config.soundConfig); createDialog(widget, htmlConfig); } @@ -341,6 +344,31 @@ } } + public void loadIcons(final ChatResources others) { + final AltIconsBundle bundle = GWT.create(AltIconsBundle.class); + Icons.register(Icons.BUDDY_ADD, bundle.buddyAddIcon()); + Icons.register(Icons.BUDDY, bundle.buddyIcon()); + Icons.register(Icons.BUDDY_DND, others.busy()); + Icons.register(Icons.BUDDY_OFF, others.offline()); + Icons.register(Icons.BUDDY_ON, others.online()); + Icons.register(Icons.BUDDY_WAIT, others.away()); + Icons.register(Icons.ADD_CHAT, bundle.chatAddIcon()); + Icons.register(Icons.CHAT, others.xa()); + Icons.register(Icons.CLIPBOARD, bundle.clipboardIcon()); + Icons.register(Icons.CLOSE, bundle.closeIcon()); + Icons.register(Icons.CONSOLE, bundle.consoleIcon()); + Icons.register(Icons.ADD_GROUP, bundle.groupAddIcon()); + Icons.register(Icons.GROUP_CHAT, bundle.groupChatIcon()); + Icons.register(Icons.GROUP_CHAT_ADD, bundle.groupChatAddIcon()); + Icons.register(Icons.LOADING, bundle.loadingIcon()); + Icons.register(Icons.MENU, bundle.menuIcon()); + Icons.register(Icons.MISSING_ICON, bundle.missingIcon()); + Icons.register(Icons.NOT_CONNECTED, others.offline()); + Icons.register(Icons.CONNECTED, others.online()); + Icons.register(Icons.ROSTER, bundle.rosterIcon()); + Icons.register(Icons.SEARCH, bundle.searchIcon()); + } + @Override public void login(final XmppURI uri, final String passwd) { xmppSession.login(uri, passwd); @@ -358,7 +386,7 @@ @Override public void logout() { if (dialogVisible()) { - popup.hide(); + dialog.hide(); } if (isLoggedIn()) { xmppSession.logout(); @@ -371,11 +399,14 @@ } private void setSize(final Widget widget, final HtmlConfig htmlConfig) { + if (htmlConfig.width != null) { - widget.setWidth(htmlConfig.width); + widget.setWidth("98%"); + dialog.setWidth(htmlConfig.width); } if (htmlConfig.height != null) { - widget.setHeight(htmlConfig.height); + widget.setHeight("98%"); + dialog.setHeight(htmlConfig.height); } } @@ -388,15 +419,17 @@ if (session.isLogged()) { createDialogIfNeeded(); if (show) { - popup.showNear((Widget) chatIcon.getValue(ParentWidget.PARENT_UI)); + dialog.show(); + dialog.setZIndex(0); + dialog.getHeader().setZIndex(0); } else { - popup.hide(); + dialog.hide(); } } } private void toggleShowDialog() { - showDialog(popup == null ? true : !popup.isShowing()); + showDialog(dialog == null ? true : !dialogVisible()); } private XmppURI uriFrom(final String shortName) { Modified: trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -37,6 +37,7 @@ import com.calclab.hablar.user.client.UserContainer; import com.calclab.suco.client.Suco; import com.google.gwt.core.client.GWT; +import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.HasText; @@ -71,8 +72,9 @@ // FIXME: move to gin @SuppressWarnings("deprecation") - public KuneHablarSignals(final XmppSession session, final Hablar hablar, final ChatClientAction action) { - final HablarEventBus eventBus = hablar.getEventBus(); + public KuneHablarSignals(final EventBus eventBus, final XmppSession session, final Hablar hablar, + final ChatClientAction action) { + final HablarEventBus hablarEventBus = hablar.getEventBus(); final PrivateStorageManager storageManager = Suco.get(PrivateStorageManager.class); final HasText titleDisplay = new HasText() { @@ -88,11 +90,12 @@ }; final SignalPreferences preferences = new SignalPreferences(); - final UnattendedPagesManager manager = new UnattendedPagesManager(eventBus, BrowserFocusHandler.getInstance()); - new BrowserFocusManager(eventBus, manager, BrowserFocusHandler.getInstance()); - new UnattendedPresenter(eventBus, preferences, manager, titleDisplay); - new KuneUnattendedPresenter(eventBus, preferences, manager, action); - final NotificationManager notificationManager = new NotificationManager(eventBus, preferences); + final UnattendedPagesManager manager = new UnattendedPagesManager(hablarEventBus, + BrowserFocusHandler.getInstance()); + new BrowserFocusManager(hablarEventBus, manager, BrowserFocusHandler.getInstance()); + new UnattendedPresenter(hablarEventBus, preferences, manager, titleDisplay); + new KuneUnattendedPresenter(eventBus, hablarEventBus, preferences, manager, action); + final NotificationManager notificationManager = new NotificationManager(hablarEventBus, preferences); // notificationManager.addNotifier((BrowserPopupHablarNotifier) // GWT.create(BrowserPopupHablarNotifier.class), @@ -100,7 +103,7 @@ notificationManager.addNotifier((KuneChatNotifier) GWT.create(KuneChatNotifier.class), true); final SignalsPreferencesPresenter preferencesPage = new SignalsPreferencesPresenter(session, storageManager, - eventBus, preferences, new SignalsPreferencesWidget(), notificationManager); + hablarEventBus, preferences, new SignalsPreferencesWidget(), notificationManager); hablar.addPage(preferencesPage, UserContainer.ROL); } Modified: trunk/src/main/java/cc/kune/chat/client/KuneUnattendedPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/KuneUnattendedPresenter.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/chat/client/KuneUnattendedPresenter.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -20,15 +20,14 @@ package cc.kune.chat.client; import cc.kune.chat.client.ChatClientDefault.ChatClientAction; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.chat.client.snd.ClickEvent; -import com.calclab.hablar.chat.client.ui.PairChatPresenter; import com.calclab.hablar.core.client.mvp.HablarEventBus; -import com.calclab.hablar.rooms.client.room.RoomPresenter; import com.calclab.hablar.signals.client.SignalPreferences; import com.calclab.hablar.signals.client.unattended.UnattendedChatsChangedEvent; import com.calclab.hablar.signals.client.unattended.UnattendedChatsChangedHandler; import com.calclab.hablar.signals.client.unattended.UnattendedPagesManager; +import com.google.gwt.event.shared.EventBus; /** * Handles the presentation of unattended chats @@ -36,8 +35,9 @@ public class KuneUnattendedPresenter { private boolean active; - public KuneUnattendedPresenter(final HablarEventBus hablarEventBus, final SignalPreferences preferences, - final UnattendedPagesManager unattendedManager, final ChatClientAction action) { + public KuneUnattendedPresenter(final EventBus eventBus, final HablarEventBus hablarEventBus, + final SignalPreferences preferences, final UnattendedPagesManager unattendedManager, + final ChatClientAction action) { active = false; hablarEventBus.addHandler(UnattendedChatsChangedEvent.TYPE, new UnattendedChatsChangedHandler() { @Override @@ -45,10 +45,9 @@ final int unattendedChatsCount = unattendedManager.getSize(); if (unattendedChatsCount > 0 && active == false) { active = true; - NotifyUser.info("Num: " + unattendedChatsCount, true); - if (isChatPage(event.getPage().getType())) { - action.setBlink(true); - } + ClickEvent.fire(eventBus); + action.setBlink(true); + } else if (unattendedChatsCount == 0 && active == true) { action.setBlink(false); active = false; @@ -59,8 +58,4 @@ } - private boolean isChatPage(final String pageType) { - return pageType.equals(PairChatPresenter.TYPE) || pageType.equals(RoomPresenter.TYPE); - } - } Modified: trunk/src/main/java/cc/kune/chat/client/resources/ChatResources.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/resources/ChatResources.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/chat/client/resources/ChatResources.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -1,9 +1,12 @@ package cc.kune.chat.client.resources; import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.CssResource; import com.google.gwt.resources.client.ImageResource; public interface ChatResources extends ClientBundle { + public interface ChatIconCssResource extends CssResource { + } @Source("add.png") ImageResource add(); @@ -17,15 +20,24 @@ @Source("cancel.png") ImageResource cancel(); - @Source("chat.png") + @Source("e-icon.gif") ImageResource chat(); + @Source("e-icon-a.gif") + ImageResource chatBlink(); + @Source("chat-new-message-small.png") ImageResource chatNewMessageSmall(); + @Source("chat.png") + ImageResource chatNormal(); + @Source("chat-small.png") ImageResource chatSmall(); + @Source("chat-icons.css") + ChatIconCssResource css(); + @Source("del.png") ImageResource del(); Added: trunk/src/main/java/cc/kune/chat/client/resources/chat-icons.css =================================================================== --- trunk/src/main/java/cc/kune/chat/client/resources/chat-icons.css (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/resources/chat-icons.css 2011-02-21 20:51:42 UTC (rev 1258) @@ -0,0 +1,10 @@ +@CHARSET "UTF-8"; +@external k-*; + +@sprite div .k-icon-chatBlink { + gwt-image: "chatBlink"; +} + +@sprite div .k-icon-chat { + gwt-image: "chat"; +} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/chat/client/resources/e-icon-a.gif (from rev 1254, trunk/src/main/java/cc/kune/core/client/resources/icons/e-icon-a.gif) =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/chat/client/resources/e-icon.gif (from rev 1254, trunk/src/main/java/cc/kune/core/client/resources/icons/e-icon.gif) =================================================================== (Binary files differ) Added: trunk/src/main/java/cc/kune/chat/client/snd/ClickEvent.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/snd/ClickEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/snd/ClickEvent.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -0,0 +1,58 @@ +package cc.kune.chat.client.snd; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; + +import com.google.gwt.event.shared.HasHandlers; + +public class ClickEvent extends GwtEvent<ClickEvent.ClickHandler> { + + public interface HasClickHandlers extends HasHandlers { + HandlerRegistration addClickHandler(ClickHandler handler); + } + + public interface ClickHandler extends EventHandler { + public void onClick(ClickEvent event); + } + + private static final Type<ClickHandler> TYPE = new Type<ClickHandler>(); + + public static void fire(HasHandlers source) { + source.fireEvent(new ClickEvent()); + } + + public static Type<ClickHandler> getType() { + return TYPE; + } + + + public ClickEvent() { + } + + @Override + public Type<ClickHandler> getAssociatedType() { + return TYPE; + } + + @Override + protected void dispatch(ClickHandler handler) { + handler.onClick(this); + } + + @Override + public boolean equals(Object obj) { + return super.equals(obj); + } + + @Override + public int hashCode() { + return super.hashCode(); + } + + @Override + public String toString() { + return "ClickEvent[" + + "]"; + } +} Added: trunk/src/main/java/cc/kune/chat/client/snd/KuneSoundManager.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/snd/KuneSoundManager.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/snd/KuneSoundManager.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -0,0 +1,28 @@ +package cc.kune.chat.client.snd; + +import com.calclab.hablar.signals.sound.client.SoundManager; +import com.calclab.hablar.signals.sound.client.SoundSignalsConfig; +import com.google.gwt.event.shared.EventBus; + +public class KuneSoundManager { + private final SoundSignalsConfig soundConfig; + SoundManager soundManager; + + public KuneSoundManager(final EventBus eventBus, final SoundSignalsConfig soundConfig) { + this.soundConfig = soundConfig; + eventBus.addHandler(ClickEvent.getType(), new ClickEvent.ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + createSoundManagerIfNeeded(); + soundManager.play(); + } + }); + } + + private void createSoundManagerIfNeeded() { + if (soundManager == null) { + soundManager = new SoundManager(soundConfig); + } + } + +} Modified: trunk/src/main/java/cc/kune/chat/public/kune-chat.css =================================================================== --- trunk/src/main/java/cc/kune/chat/public/kune-chat.css 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/chat/public/kune-chat.css 2011-02-21 20:51:42 UTC (rev 1258) @@ -61,8 +61,9 @@ margin-top: 3px; } -.k-chat-window { - background-color: #FFF; +.k-chat-window { /* background-color: #FFF; + padding: 5px; */ + } .k-chat-panel { @@ -74,7 +75,7 @@ } .hablar-HablarWidget { - background-color: #888; + background-color: #F2F2F2; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; @@ -95,9 +96,9 @@ } .hablar-defaultBackground,.hablar-UserWidget,.hablar-defaultBordered { - -moz-border-radius: 5px; + /* -moz-border-radius: 5px; -webkit-border-radius: 5px; - border-radius: 5px; + border-radius: 5px; */ } .hablar-Header { /* -webkit-border-top-right-radius: 5px;*/ @@ -127,6 +128,10 @@ border-top-left-radius: 5px; } +.hablar-TabsHeaderWidget { + margin: -1px; +} + .hablar-ChatWidget { -webkit-border-bottom-right-radius: 5px; -moz-border-radius-bottomright: 5px; Modified: trunk/src/main/java/cc/kune/chat/public/kune-hablar.css =================================================================== --- trunk/src/main/java/cc/kune/chat/public/kune-hablar.css 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/chat/public/kune-hablar.css 2011-02-21 20:51:42 UTC (rev 1258) @@ -209,7 +209,7 @@ .chatMessage .metadata { display: inline; color: #808080; - font-size: 90%; + font-size: 14px; } .chatMessage .body { @@ -237,7 +237,7 @@ html { font-family: Tahoma, sans-serif; - font-size: 80%; + font-size: 12px; } body { 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-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -39,7 +39,7 @@ public abstract class AbstractGwtButtonGui extends AbstractChildGuiItem { private ButtonBase button; - private final boolean enableTongle; + protected boolean enableTongle; private IconLabel iconLabel; private boolean isChild; 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-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -144,10 +144,8 @@ @Override protected void setEnabled(final boolean enabled) { - item.setVisible(enabled); item.setEnabled(enabled); - iconLabel.setVisible(enabled); - layout(); + setVisible(enabled); } @Override Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtButtonGui.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtButtonGui.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -19,18 +19,7 @@ */ package cc.kune.common.client.actions.gwtui; -import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; public class GwtButtonGui extends AbstractGwtButtonGui { - public GwtButtonGui() { - } - - public GwtButtonGui(final ButtonDescriptor buttonDescriptor) { - super(buttonDescriptor); - } - - public GwtButtonGui(final ButtonDescriptor buttonDescriptor, final boolean enableTongle) { - super(buttonDescriptor, enableTongle); - } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtComplexToolbar.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtComplexToolbar.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtComplexToolbar.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -51,17 +51,17 @@ toolbar.add((Widget) uiObject); } - public void addFill() { + public Widget addFill() { currentFlow = FlowDir.right; - toolbar.addFill(); + return toolbar.addFill(); } - public void addSeparator() { - toolbar.addSeparator(); + public Widget addSeparator() { + return toolbar.addSeparator(); } - public void addSpacer() { - toolbar.addSpacer(); + public Widget addSpacer() { + return toolbar.addSpacer(); } private String getFlow() { 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-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -26,7 +26,6 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; -import cc.kune.common.client.actions.ui.descrip.IconLabelDescriptor; import cc.kune.common.client.ui.IconLabel; import com.google.gwt.event.dom.client.ClickEvent; @@ -36,13 +35,6 @@ public class GwtIconLabelGui extends AbstractGuiItem { private IconLabel iconLabel; - public GwtIconLabelGui() { - } - - public GwtIconLabelGui(final IconLabelDescriptor iconLabelDescriptor) { - super(iconLabelDescriptor); - } - @Override protected void addStyle(final String style) { iconLabel.addStyleName(style); @@ -74,7 +66,7 @@ @Override public void setEnabled(final boolean enabled) { - // Not implemented + super.setVisible(enabled); } @Override Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuCheckItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuCheckItemGui.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuCheckItemGui.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -19,12 +19,7 @@ */ package cc.kune.common.client.actions.gwtui; -import cc.kune.common.client.actions.ui.descrip.MenuCheckItemDescriptor; public class GwtMenuCheckItemGui extends AbstractGwtMenuItemGui { - public GwtMenuCheckItemGui(final MenuCheckItemDescriptor descriptor) { - super(descriptor); - } - } 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-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -37,13 +37,6 @@ private IconLabel iconLabel; private boolean notStandAlone; - public GwtMenuGui() { - } - - public GwtMenuGui(final MenuDescriptor descriptor) { - super(descriptor); - } - @Override protected void addStyle(final String style) { if (notStandAlone) { Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuItemGui.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuItemGui.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -19,16 +19,7 @@ */ package cc.kune.common.client.actions.gwtui; -import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; public class GwtMenuItemGui extends AbstractGwtMenuItemGui { - public GwtMenuItemGui() { - super(); - } - - public GwtMenuItemGui(final MenuItemDescriptor descriptor) { - super(descriptor); - } - } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuTitleItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuTitleItemGui.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuTitleItemGui.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -19,14 +19,6 @@ */ package cc.kune.common.client.actions.gwtui; -import cc.kune.common.client.actions.ui.descrip.MenuTitleItemDescriptor; public class GwtMenuTitleItemGui extends AbstractGwtMenuItemGui { - public GwtMenuTitleItemGui() { - super(); - } - - public GwtMenuTitleItemGui(final MenuTitleItemDescriptor descriptor) { - super(descriptor); - } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtPushButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtPushButtonGui.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtPushButtonGui.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -21,14 +21,16 @@ import cc.kune.common.client.actions.PropertyChangeEvent; import cc.kune.common.client.actions.PropertyChangeListener; +import cc.kune.common.client.actions.ui.AbstractGuiItem; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.PushButtonDescriptor; public class GwtPushButtonGui extends GwtButtonGui { - public GwtPushButtonGui() { - } - - public GwtPushButtonGui(final PushButtonDescriptor btn) { - super(btn, true); + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + super.enableTongle = true; + final PushButtonDescriptor btn = (PushButtonDescriptor) descriptor; setPressed(btn.isPushed()); btn.addPropertyChangeListener(new PropertyChangeListener() { @Override @@ -38,6 +40,7 @@ } } }); + return this; } } 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-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -21,7 +21,6 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.ui.IconLabel; @@ -32,13 +31,6 @@ private IconLabel iconLabel; private MenuItem item; - public GwtSubMenuGui() { - } - - public GwtSubMenuGui(final AbstractGuiActionDescrip descriptor) { - super(descriptor); - } - @Override public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.descriptor = descriptor; @@ -86,5 +78,7 @@ @Override public void setVisible(final boolean visible) { item.setVisible(visible); + iconLabel.setVisible(visible); + layout(); } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarGui.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarGui.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -21,38 +21,30 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import com.google.gwt.user.client.ui.UIObject; +import com.google.gwt.user.client.ui.Widget; public class GwtToolbarGui extends AbstractGuiItem implements ParentWidget { private GwtComplexToolbar toolbar; - public GwtToolbarGui() { - } - - public GwtToolbarGui(final AbstractGuiActionDescrip descriptor) { - super(descriptor); - - } - @Override public void add(final UIObject uiObject) { toolbar.add(uiObject); } - public void addFill() { - toolbar.addFill(); + public Widget addFill() { + return toolbar.addFill(); } - public void addSeparator() { - toolbar.addSeparator(); + public Widget addSeparator() { + return toolbar.addSeparator(); } - public void addSpacer() { - toolbar.addSpacer(); + public Widget addSpacer() { + return toolbar.addSpacer(); } @Override Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarSeparatorGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarSeparatorGui.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarSeparatorGui.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -26,10 +26,15 @@ import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; import cc.kune.common.client.errors.UIException; +import com.google.gwt.user.client.ui.Widget; + public class GwtToolbarSeparatorGui extends AbstractGuiItem { + private Widget widget; + @Override public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; final GwtToolbarGui toolbar = ((GwtToolbarGui) descriptor.getParent().getValue(ParentWidget.PARENT_UI)); if (toolbar == null) { throw new UIException("To add a toolbar separator you need to add the toolbar before. Item: " + descriptor); @@ -37,17 +42,18 @@ final Type type = ((ToolbarSeparatorDescriptor) descriptor).getSeparatorType(); switch (type) { case fill: - toolbar.addFill(); + widget = toolbar.addFill(); break; case spacer: - toolbar.addSpacer(); + widget = toolbar.addSpacer(); break; case separator: - toolbar.addSeparator(); + widget = toolbar.addSeparator(); break; default: break; } + configureItemFromProperties(); return toolbar; } @@ -68,6 +74,11 @@ } @Override + public void setVisible(final boolean visible) { + widget.setVisible(visible); + } + + @Override public boolean shouldBeAdded() { return false; } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -49,6 +49,7 @@ break; } super.create(descriptor); + configureItemFromProperties(); return toolbar; } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -148,6 +148,8 @@ protected abstract void setToolTipText(String text); private void setVisible(final Boolean visible) { + // if you have problems with setVisible check if the GuiItem calls + // configureItemFromProperties on creation setVisible(visible == null ? true : visible); } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -57,6 +57,8 @@ */ public AbstractGuiActionDescrip(final AbstractAction action) { this.action = action; + putValue(Action.ENABLED, Boolean.TRUE); + putValue(VISIBLE, Boolean.TRUE); position = NO_POSITION; parent = NO_PARENT; addConditions = new ArrayList<GuiAddCondition>(); @@ -82,11 +84,6 @@ return id; } - @Override - public Object getTarget() { - return getValue(TARGET); - } - /** * Gets the location, a string used to group actions with locations (top * bar, bottom bar, user bar...). @@ -114,6 +111,11 @@ } @Override + public Object getTarget() { + return getValue(TARGET); + } + + @Override public abstract Class<?> getType(); @Override @@ -162,7 +164,7 @@ @Override public void setEnabled(final boolean enabled) { - super.putValue(Action.ENABLED, enabled); + putValue(Action.ENABLED, enabled); } @Override @@ -170,11 +172,6 @@ this.id = id; } - @Override - public void setTarget(final Object object) { - putValue(TARGET, object); - } - /** * If we have several toolbars, we can group with the "location" string key * actions that must be in the same location (ex: top bar, bottom bar, and @@ -211,6 +208,11 @@ } @Override + public void setTarget(final Object object) { + putValue(TARGET, object); + } + + @Override public void setVisible(final boolean visible) { putValue(VISIBLE, visible); } Modified: trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css 2011-02-21 20:51:42 UTC (rev 1258) @@ -1647,50 +1647,52 @@ } .x-window-proxy { - background-color: #1f2833; - border-color: #18181a; + /* background-color: #1f2833; + border-color: #18181a; */ } .x-window-tl .x-window-header { - color: #fff !important; - font: bold 14px tahoma, arial, verdana, sans-serif; + font-size: 14px; + /* color: #fff !important; + font: bold 14px tahoma, arial, verdana, sans-serif; */ } .x-window-tc { - background-image: url(../images/window/top-bottom.png); +/* background-image: url(../images/window/top-bottom.png);*/ } .x-window-tl { - background-image: url(../images/window/left-corners.png); +/* background-image: url(../images/window/left-corners.png);*/ } .x-window-tr { - background-image: url(../images/window/right-corners.png); + /* background-image: url(../images/window/right-corners.png);*/ } .x-window-bc { - background-image: url(../images/window/top-bottom.png); + /* background-image: url(../images/window/top-bottom.png);*/ } .x-window-bl { - background-image: url(../images/window/left-corners.png); + /* background-image: url(../images/window/left-corners.png);*/ } .x-window-br { - background-image: url(../images/window/right-corners.png); + /* background-image: url(../images/window/right-corners.png);*/ } .x-window-mc { - border-color: #18181a; - font: normal 14px 'Ubuntu', Arial background-color : #1f2833; + font-size: 16px; + /* border-color: #18181a; + font: normal 14px 'Ubuntu', Arial background-color : #1f2833; */ } .x-window-ml { - background-image: url(../images/window/left-right.png); + /* background-image: url(../images/window/left-right.png);*/ } .x-window-mr { - background-image: url(../images/window/left-right.png); + /* background-image: url(../images/window/left-right.png); */ } .x-window-maximized .x-window-tc { Modified: trunk/src/main/java/cc/kune/core/client/logs/Log.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/logs/Log.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/core/client/logs/Log.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -35,4 +35,8 @@ debug(message); } + public static void info(final String message) { + GWT.log(message); + } + } Deleted: trunk/src/main/java/cc/kune/core/client/resources/icons/IconBorrarCssResource.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/icons/IconBorrarCssResource.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/core/client/resources/icons/IconBorrarCssResource.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -1,55 +0,0 @@ -/* - * - * 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.resources.icons; - -import com.google.gwt.resources.client.CssResource; - -public interface IconBorrarCssResource extends CssResource { - // - // @ClassName("k-icon-addGreen") - // String kIconAddGreen(); - // - // @ClassName("k-icon-bug") - // String kIconBug(); - // - // @ClassName("k-icon-chat") - // String kIconChat(); - // - // @ClassName("k-icon-groupHome") - // String kIconGroupHome(); - // - // @ClassName("k-icon-info") - // String kIconInfo(); - // - // @ClassName("k-icon-kuneIcon16") - // String kIconKuneIcon16(); - // - // @ClassName("k-icon-language") - // String kIconLanguage(); - // - // @ClassName("k-icon-maximize") - // String kIconMaaximize(); - // - // @ClassName("k-icon-minimize") - // String kIconMinimize(); - // - // @ClassName("k-icon-prefs") - // String kIconPrefs(); -} Copied: trunk/src/main/java/cc/kune/core/client/resources/icons/IconCssResource.java (from rev 1254, trunk/src/main/java/cc/kune/core/client/resources/icons/IconBorrarCssResource.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/icons/IconCssResource.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/resources/icons/IconCssResource.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -0,0 +1,25 @@ +/* + * + * 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.resources.icons; + +import com.google.gwt.resources.client.CssResource; + +public interface IconCssResource extends CssResource { +} Modified: trunk/src/main/java/cc/kune/core/client/resources/icons/IconResources.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/icons/IconResources.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/core/client/resources/icons/IconResources.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -30,14 +30,8 @@ @Source("bug.png") ImageResource bug(); - @Source("e-icon.gif") - ImageResource chat(); - - @Source("e-icon-a.gif") - ImageResource chatBlink(); - @Source("kicon.css") - IconBorrarCssResource css(); + IconCssResource css(); @Source("del-green.png") ImageResource delGreen(); Deleted: trunk/src/main/java/cc/kune/core/client/resources/icons/e-icon-a.gif =================================================================== (Binary files differ) Deleted: trunk/src/main/java/cc/kune/core/client/resources/icons/e-icon.gif =================================================================== (Binary files differ) Modified: trunk/src/main/java/cc/kune/core/client/resources/icons/kicon.css =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/icons/kicon.css 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/core/client/resources/icons/kicon.css 2011-02-21 20:51:42 UTC (rev 1258) @@ -1,44 +1,36 @@ @external k-icon-info,k-icon-language,k-icon-kuneIcon16,k-icon-bug,k-icon-prefs,k-icon-groupHome,k-icon-addGreen,k-icon-maximize,k-icon-minimize,k-*; @sprite div .k-icon-info { - gwt-image: "info"; + gwt-image: "info"; } @sprite div .k-icon-language { - gwt-image: "language"; + gwt-image: "language"; } @sprite div .k-icon-kuneIcon16 { - gwt-image: "kuneIcon16"; + gwt-image: "kuneIcon16"; } @sprite div .k-icon-bug { - gwt-image: "bug"; + gwt-image: "bug"; } @sprite div .k-icon-prefs { - gwt-image: "prefs"; + gwt-image: "prefs"; } @sprite div .k-icon-groupHome { - gwt-image: "groupHome"; + gwt-image: "groupHome"; } @sprite div .k-icon-addGreen { - gwt-image: "addGreen"; + gwt-image: "addGreen"; } @sprite div .k-icon-maximize { - gwt-image: "maximize"; + gwt-image: "maximize"; } -@sprite div .k-icon-chatBlink { - gwt-image: "chatBlink"; -} - -@sprite div .k-icon-chat { - gwt-image: "chat"; -} - @sprite div .k-icon-minimize { - gwt-image: "minimize"; + gwt-image: "minimize"; } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -28,12 +28,14 @@ import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor; +import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; +import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.sn.actions.GotoGroupAction; +import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.state.Session; import cc.kune.core.client.state.UserSignInEvent; import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; import cc.kune.core.client.state.UserSignOutEvent; @@ -54,6 +56,7 @@ private final I18nTranslationService i18n; private final IconResources img; private SubMenuDescriptor partiMenu; + private ToolbarSeparatorDescriptor separator; private final Session session; private final SitebarActionsPresenter siteOptions; private final StateManager stateManager; @@ -71,17 +74,19 @@ this.siteOptions = siteOptions; this.gotoGroupAction = gotoGroupAction; createActions(); + separator.setVisible(false); session.onUserSignIn(true, new UserSignInHandler() { @Override public void onUserSignIn(final UserSignInEvent event) { SiteUserOptionsPresenter.this.onUserSignIn(event.getUserInfo()); + separator.setVisible(true); } }); session.onUserSignOut(true, new UserSignOutHandler() { @Override public void onUserSignOut(final UserSignOutEvent event) { LOGGED_USER_MENU.setVisible(false); - LOGGED_USER_MENU.setEnabled(false); + separator.setVisible(false); SiteUserOptionsPresenter.this.setLoggedUserName(""); } }); @@ -110,9 +115,11 @@ private void createActions() { LOGGED_USER_MENU.setId(LOGGED_USER_MENU_ID); - LOGGED_USER_MENU.setStyles("k-no-backimage, k-btn-sitebar"); - siteOptions.getLeftToolbar().addAction(LOGGED_USER_MENU); - + LOGGED_USER_MENU.setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); + LOGGED_USER_MENU.setStyles("k-no-backimage, k-btn-sitebar, k-fl"); + siteOptions.getRightToolbar().addAction(LOGGED_USER_MENU); + separator = new ToolbarSeparatorDescriptor(Type.separator, SitebarActionsPresenter.RIGHT_TOOLBAR); + siteOptions.getRightToolbar().addAction(separator); partiMenu = new SubMenuDescriptor(i18n.t("Your groups")); addActionImpl(partiMenu); Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-21 20:51:42 UTC (rev 1258) @@ -46,7 +46,7 @@ } .gwt-MenuItem { - font-size: 80%; + font-size: 14px; margin: 1px; cursor: default; } @@ -60,7 +60,7 @@ } .gwt-Tree .gwt-TreeItem { - font-size: 80%; + font-size: 14px; cursor: default; } Modified: trunk/src/main/java/cc/kune/core/public/ws.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.html 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/core/public/ws.html 2011-02-21 20:51:42 UTC (rev 1258) @@ -13,6 +13,7 @@ <meta name="hablar.login" content="false" /> <meta name="hablar.hasVCard" content="false" /> <meta name="hablar.search" content="false" /> +<meta name="hablar.hasSound" content="false" /> <meta name="hablar.hasCopyToClipboard" content="false" />  <meta name="hablar.hasSignals" content="false" /> Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java 2011-02-21 04:32:11 UTC (rev 1257) +++ trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java 2011-02-21 20:51:42 UTC (rev 1258) @@ -20,6 +20,7 @@ package cc.kune.pspace.client; import cc.kune.common.client.actions.ui.IsActionExtensible; +import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.state.StateChangedEvent; import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; import cc.kune.core.shared.domain.ContentStatus; @@ -65,10 +66,15 @@ super(eventBus, view, proxy); this.i18n = i18n; this.stateTokenUtils = stateTokenUtils; - eventBus.addHandler(StateChangedEvent.getType(), new StateChangedHandler() { + eventBus.addHandler(AppStartEvent.getType(), new AppStartEvent.AppStartHandler() { @Override - public void onStateChanged(final StateChangedEvent event) { - setState(event.getState()); + public void onAppStart(final AppStartEvent event) { + eventBus.addHandler(StateChangedEvent.getType(), new StateChangedHandler() { + @Override + public void onStateChanged(final StateChangedEvent event) { + setState(event.getState()); + } + }); } }); }

1 0

21 Feb '11

Author: vjrj_ Date: 2011-02-21 05:32:11 +0100 (Mon, 21 Feb 2011) New Revision: 1257 Added: trunk/src/main/java/cc/kune/chat/client/ChatParts.java trunk/src/main/java/cc/kune/chat/client/ChatSitebarActions.java trunk/src/main/java/cc/kune/chat/client/StartChatWithMemberAction.java trunk/src/main/java/cc/kune/chat/client/StartChatWithUserAction.java trunk/src/main/java/cc/kune/chat/client/resources/ trunk/src/main/java/cc/kune/chat/client/resources/ChatResources.java trunk/src/main/java/cc/kune/chat/client/resources/add.png trunk/src/main/java/cc/kune/chat/client/resources/away.png trunk/src/main/java/cc/kune/chat/client/resources/busy.png trunk/src/main/java/cc/kune/chat/client/resources/cancel.png trunk/src/main/java/cc/kune/chat/client/resources/chat-new-message-small.png trunk/src/main/java/cc/kune/chat/client/resources/chat-small.png trunk/src/main/java/cc/kune/chat/client/resources/chat.png trunk/src/main/java/cc/kune/chat/client/resources/del.png trunk/src/main/java/cc/kune/chat/client/resources/group-chat.png trunk/src/main/java/cc/kune/chat/client/resources/info-lamp.png trunk/src/main/java/cc/kune/chat/client/resources/info.png trunk/src/main/java/cc/kune/chat/client/resources/invisible.png trunk/src/main/java/cc/kune/chat/client/resources/message.png trunk/src/main/java/cc/kune/chat/client/resources/new-chat.png trunk/src/main/java/cc/kune/chat/client/resources/new-email.png trunk/src/main/java/cc/kune/chat/client/resources/new-message.png trunk/src/main/java/cc/kune/chat/client/resources/not-authorized.png trunk/src/main/java/cc/kune/chat/client/resources/offline.png trunk/src/main/java/cc/kune/chat/client/resources/online.png trunk/src/main/java/cc/kune/chat/client/resources/question.png trunk/src/main/java/cc/kune/chat/client/resources/room-new-message-small.png trunk/src/main/java/cc/kune/chat/client/resources/room-small.png trunk/src/main/java/cc/kune/chat/client/resources/unavailable.png trunk/src/main/java/cc/kune/chat/client/resources/user_add.png trunk/src/main/java/cc/kune/chat/client/resources/xa.png trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuTitleItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuTitleItemGui.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuTitleItemDescriptor.java trunk/src/main/java/cc/kune/core/client/resources/arrowdownsitebar.gif trunk/src/main/java/cc/kune/core/public/images/clear.gif trunk/src/main/java/cc/kune/core/public/images/clear.png Removed: trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithMemberAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithUserAction.java Modified: trunk/.classpath trunk/pom.xml trunk/src/main/java/cc/kune/chat/client/ChatClient.java 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/KuneHablarSignals.java trunk/src/main/java/cc/kune/chat/client/KuneUnattendedPresenter.java trunk/src/main/java/cc/kune/chat/public/kune-chat.css trunk/src/main/java/cc/kune/chat/public/kune-hablar.css 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/KuneCommon.gwt.xml trunk/src/main/java/cc/kune/common/client/actions/ActionEvent.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtComplexToolbar.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtGuiProvider.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/gxtui/AbstractGxtButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtGuiProvider.java trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java trunk/src/main/java/cc/kune/common/client/ui/AbstractFlowToolbar.java trunk/src/main/java/cc/kune/common/client/ui/FlowToolbar.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/ui/KuneWindowUtils.java trunk/src/main/java/cc/kune/common/public/kune-common.css trunk/src/main/java/cc/kune/core/Core.gwt.xml trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java trunk/src/main/java/cc/kune/core/client/resources/icons/IconConstants.java trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsGroupCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsNotMeCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsPersonCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/state/Session.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/footer/license/EntityLicensePanel.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/public/ws.html trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java Log: Some fixes, SN changes and more emite integration Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/.classpath 2011-02-21 04:32:11 UTC (rev 1257) @@ -36,7 +36,6 @@ <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-assisted-inject/2.0/guice-assisted-inject-2.0.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-persist/3.0-rc2/guice-persist-3.0-rc2.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-persist/3.0-rc2/guice-persist-3.0-rc2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-servlet/3.0-rc2/guice-servlet-3.0-rc2.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-servlet/3.0-rc2/guice-servlet-3.0-rc2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/jhickman/web/gwt/gwt-customuibinder/0.1/gwt-customuibinder-0.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/adamtacy/gwt-fx/r464/gwt-fx-r464.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-gin/1.0-r137/gwt-gin-1.0-r137.jar"/> <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/log/gwt-log/gwt-log/3.0.1/gwt-log-3.0.1.jar"/> @@ -55,9 +54,8 @@ <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/extjs/gxt/2.2.1/gxt-2.2.1.jar"/> - <classpathentry kind="var" path="M2_REPO/com/jhickman/web/gwt/gxt-uibinder/0.6/gxt-uibinder-0.6.jar"/> <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.20070617/h2-1.0.20070617.jar"/> - <classpathentry kind="var" path="M2_REPO/com/calclab/emite/hablar/r1694/hablar-r1694.jar"/> + <classpathentry kind="var" path="M2_REPO/com/calclab/emite/hablar/r1697/hablar-r1697.jar"/> <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-c3p0/3.3.1.GA/hibernate-c3p0-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-c3p0/3.3.1.GA/hibernate-c3p0-3.3.1.GA-sources.jar"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/pom.xml 2011-02-21 04:32:11 UTC (rev 1257) @@ -272,16 +272,18 @@ <artifactId>gwt-fx</artifactId> <version>r464</version> </dependency> +   <dependency> <groupId>com.gwtext</groupId> @@ -343,7 +345,7 @@ <dependency> <groupId>com.calclab.emite</groupId> <artifactId>hablar</artifactId> - <version>r1694</version> + <version>r1697</version> </dependency> <dependency> <groupId>org.jivesoftware.smack</groupId> Modified: trunk/src/main/java/cc/kune/chat/client/ChatClient.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClient.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/chat/client/ChatClient.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -29,6 +29,8 @@ void chat(XmppURI jid); + void doLogin(); + boolean isBuddie(String shortName); boolean isBuddie(XmppURI jid); @@ -41,6 +43,11 @@ void login(XmppURI uri, String passwd); + /** + * @return true if loggin is needed + */ + boolean loginIfNecessary(); + void logout(); void setAvatar(String photoBinary); Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -41,7 +41,6 @@ import cc.kune.core.client.init.AppStopEvent; import cc.kune.core.client.logs.Log; import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.sitebar.SitebarActionsPresenter; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.UserSignInEvent; @@ -56,7 +55,6 @@ import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; import com.calclab.emite.im.client.chat.ChatManager; import com.calclab.emite.im.client.roster.XmppRoster; -import com.calclab.emite.reconnect.client.SessionReconnect; import com.calclab.emite.xep.avatar.client.AvatarManager; import com.calclab.emite.xep.muc.client.Room; import com.calclab.emite.xep.muc.client.RoomManager; @@ -90,7 +88,7 @@ this.eventBus = eventBus; this.res = res; res.css().ensureInjected(); - putValue(Action.SMALL_ICON, res.chatBlink()); + putValue(Action.SMALL_ICON, res.chat()); } @@ -124,17 +122,22 @@ public ChatClientDefault(final EventBus eventBus, final I18nTranslationService i18n, final ChatClientAction action, final SitebarActionsPresenter siteActions, final Session session, final GlobalShortcutRegister shorcutRegister, final ChatOptions chatOptions) { + + // , final XmppSession xmppSession, + // final XmppRoster roster, final ChatManager chatManager, final + // RoomManager roomManager, + // final SessionReconnect sessionReconnect, final + // Provider<AvatarManager> avatarManager) { this.i18n = i18n; this.action = action; this.siteActions = siteActions; this.session = session; this.shorcutRegister = shorcutRegister; this.chatOptions = chatOptions; - roster = Suco.get(XmppRoster.class); - xmppSession = Suco.get(XmppSession.class); - chatManager = Suco.get(ChatManager.class); - roomManager = Suco.get(RoomManager.class); - Suco.get(SessionReconnect.class); + this.xmppSession = Suco.get(XmppSession.class); + this.roster = Suco.get(XmppRoster.class); + this.chatManager = Suco.get(ChatManager.class); + this.roomManager = Suco.get(RoomManager.class); eventBus.addHandler(AppStartEvent.getType(), new AppStartEvent.AppStartHandler() { @Override @@ -143,21 +146,21 @@ chatOptions.httpBase = event.getInitData().getChatHttpBase(); chatOptions.roomHost = event.getInitData().getChatRoomHost(); checkChatDomain(chatOptions.domain); - if (session.isLogged()) { - session.check(new AsyncCallbackSimple<Void>() { - @Override - public void onSuccess(final Void result) { - doLogin(session.getCurrentUserInfo()); - } - }); - } - eventBus.addHandler(UserSignInEvent.getType(), new UserSignInHandler() { + // if (session.isLogged()) { + // session.check(new AsyncCallbackSimple<Void>() { + // @Override + // public void onSuccess(final Void result) { + // doLogin(); + // } + // }); + // } + session.onUserSignIn(true, new UserSignInHandler() { @Override public void onUserSignIn(final UserSignInEvent event) { - doLogin(session.getCurrentUserInfo()); + doLogin(); } }); - eventBus.addHandler(UserSignOutEvent.getType(), new UserSignOutHandler() { + session.onUserSignOut(true, new UserSignOutHandler() { @Override public void onUserSignOut(final UserSignOutEvent event) { createActionIfNeeded(); @@ -255,6 +258,12 @@ return popup != null && popup.isShowing(); } + @Override + public void doLogin() { + assert session.getCurrentUserInfo() != null; + doLogin(session.getCurrentUserInfo()); + } + private void doLogin(final UserInfoDTO user) { createActionIfNeeded(); createDialogIfNeeded(); @@ -282,9 +291,8 @@ final HtmlConfig htmlConfig = HtmlConfig.getFromMeta(); final HablarWidget widget = new HablarWidget(config.layout, config.tabHeaderSize); final Hablar hablar = widget.getHablar(); - HablarComplete.install(hablar, config); - new KuneHablarSignals(hablar, action); + new KuneHablarSignals(xmppSession, hablar, action); if (htmlConfig.hasLogger) { new HablarConsole(hablar); } @@ -339,6 +347,15 @@ } @Override + public boolean loginIfNecessary() { + if (!isLoggedIn()) { + doLogin(); + return true; + } + return false; + } + + @Override public void logout() { if (dialogVisible()) { popup.hide(); Modified: trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -32,5 +32,7 @@ protected void configure() { bind(ChatClient.class).to(ChatClientDefault.class).in(Singleton.class); bind(ChatOptions.class).in(Singleton.class); + bind(ChatSitebarActions.class).in(Singleton.class); + bind(ChatParts.class).asEagerSingleton(); } } \ No newline at end of file Added: trunk/src/main/java/cc/kune/chat/client/ChatParts.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatParts.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -0,0 +1,54 @@ +package cc.kune.chat.client; + +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.core.client.init.AppStartEvent; +import cc.kune.core.client.init.AppStartEvent.AppStartHandler; +import cc.kune.core.client.sn.actions.conditions.IsNotMeCondition; +import cc.kune.core.client.sn.actions.conditions.IsPersonCondition; +import cc.kune.core.client.sn.actions.registry.SNAdminsMenuItemsRegistry; +import cc.kune.core.client.sn.actions.registry.SNCollabsMenuItemsRegistry; +import cc.kune.core.client.sn.actions.registry.SNPendingsMenuItemsRegistry; +import cc.kune.core.client.state.Session; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class ChatParts { + + @Inject + public ChatParts(final Session session, final Provider<ChatSitebarActions> chatActionsProvider, + final Provider<SNAdminsMenuItemsRegistry> snAdminsRegistry, + final Provider<SNCollabsMenuItemsRegistry> snCollabsItemsRegistry, + final Provider<SNPendingsMenuItemsRegistry> snPendingItemsRegistry, final IsNotMeCondition isNotMe, + final IsPersonCondition isPersonCondition, + final Provider<StartChatWithMemberAction> startChatWithMemberAction, + final Provider<StartChatWithUserAction> startChatWithUserAction) { + session.onInitDataReceived(new AppStartHandler() { + @Override + public void onAppStart(final AppStartEvent event) { + chatActionsProvider.get(); + final Provider<MenuItemDescriptor> startChatWithMemberItem = new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(startChatWithMemberAction.get()); + item.add(isNotMe); + item.add(isPersonCondition); + return item; + } + }; + final Provider<MenuItemDescriptor> startChatWithUserItem = new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(startChatWithUserAction.get()); + item.add(isNotMe); + item.add(isPersonCondition); + return item; + } + }; + snAdminsRegistry.get().add(startChatWithMemberItem); + snCollabsItemsRegistry.get().add(startChatWithMemberItem); + snPendingItemsRegistry.get().add(startChatWithUserItem); + } + }); + } +} Added: trunk/src/main/java/cc/kune/chat/client/ChatSitebarActions.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatSitebarActions.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/ChatSitebarActions.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -0,0 +1,149 @@ +package cc.kune.chat.client; + +import cc.kune.chat.client.resources.ChatResources; +import cc.kune.common.client.actions.AbstractAction; +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.actions.ui.descrip.MenuSeparatorDescriptor; +import cc.kune.common.client.actions.ui.descrip.MenuTitleItemDescriptor; +import cc.kune.core.client.sitebar.SiteUserOptions; +import cc.kune.core.client.sitebar.SiteUserOptionsPresenter; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.UserSignInEvent; +import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.emite.core.client.events.StateChangedEvent; +import com.calclab.emite.core.client.events.StateChangedHandler; +import com.calclab.emite.core.client.xmpp.session.XmppSession; +import com.calclab.emite.core.client.xmpp.stanzas.Presence; +import com.calclab.emite.core.client.xmpp.stanzas.Presence.Show; +import com.calclab.emite.im.client.presence.PresenceManager; +import com.calclab.emite.im.client.presence.events.OwnPresenceChangedEvent; +import com.calclab.emite.im.client.presence.events.OwnPresenceChangedHandler; +import com.calclab.suco.client.Suco; +import com.google.gwt.resources.client.ImageResource; +import com.google.inject.Inject; + +public class ChatSitebarActions { + + public class ChangeOfflineStatusAction extends AbstractExtendedAction { + public ChangeOfflineStatusAction(final ImageResource icon) { + xmppSession.addSessionStateChangedHandler(true, new StateChangedHandler() { + @Override + public void onStateChanged(final StateChangedEvent event) { + if (!xmppSession.isReady()) { + SiteUserOptionsPresenter.LOGGED_USER_MENU.putValue(AbstractAction.SMALL_ICON, icon); + } + } + }); + } + + @Override + public void actionPerformed(final ActionEvent event) { + // presenceManager.changeOwnPresence(Presence.build(NO_STATUS, + // Show.xa)); + xmppSession.logout(); + } + } + public class ChangeOnlineStatusAction extends AbstractExtendedAction { + private final Presence thisPresence; + + public ChangeOnlineStatusAction(final String statusText, final Show show, final ImageResource icon) { + thisPresence = Presence.build(statusText, show); + presenceManager.addOwnPresenceChangedHandler(new OwnPresenceChangedHandler() { + + @Override + public void onOwnPresenceChanged(final OwnPresenceChangedEvent event) { + updateStatusIcon(icon, event.getCurrentPresence()); + } + + }); + updateStatusIcon(icon, presenceManager.getOwnPresence()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + if (!chatClient.loginIfNecessary()) { + presenceManager.changeOwnPresence(thisPresence); + } + nextPresence = thisPresence; + } + + private void updateStatusIcon(final ImageResource icon, final Presence currentPresence) { + if (thisPresence.getShow().equals(currentPresence.getShow()) + && ((currentPresence.getStatus() == null) || currentPresence.getStatus().equals( + thisPresence.getStatus()))) { + SiteUserOptionsPresenter.LOGGED_USER_MENU.putValue(AbstractAction.SMALL_ICON, icon); + } + } + } + + private static final String CHAT_STATUS = "k-chat-status-group"; + private static final String NO_STATUS = null; + private final ChatClient chatClient; + private final I18nTranslationService i18n; + private Presence nextPresence = Presence.build(NO_STATUS, Show.notSpecified); + private final PresenceManager presenceManager = Suco.get(PresenceManager.class); + private final ChatResources res; + private final Session session; + private final SiteUserOptions userOptions; + private final XmppSession xmppSession = Suco.get(XmppSession.class); + + @Inject + public ChatSitebarActions(final Session session, final ChatClient chatClient, final SiteUserOptions userOptions, + final I18nTranslationService i18n, final ChatResources res) { + this.session = session; + this.chatClient = chatClient; + this.userOptions = userOptions; + this.i18n = i18n; + this.res = res; + createActions(); + } + + private void createActions() { + final MenuTitleItemDescriptor chatActionsTitle = new MenuTitleItemDescriptor( + SiteUserOptionsPresenter.LOGGED_USER_MENU, i18n.t("Set your chat status")); + userOptions.addAction(new MenuSeparatorDescriptor(SiteUserOptionsPresenter.LOGGED_USER_MENU)); + userOptions.addAction(chatActionsTitle); + userOptions.addAction(createChatStatusAction(res.online(), i18n.t("Available"), + onlineAction(NO_STATUS, Show.notSpecified, res.online()))); + userOptions.addAction(createChatStatusAction(res.xa(), i18n.t("Available for chat"), + onlineAction(NO_STATUS, Show.chat, res.xa()))); + userOptions.addAction(createChatStatusAction(res.away(), i18n.t("Away"), + onlineAction(NO_STATUS, Show.away, res.away()))); + userOptions.addAction(createChatStatusAction(res.busy(), i18n.t("Busy"), + onlineAction(NO_STATUS, Show.dnd, res.busy()))); + userOptions.addAction(createChatStatusAction(res.offline(), i18n.t("Sign out of chat"), + new ChangeOfflineStatusAction(res.offline()))); + xmppSession.addSessionStateChangedHandler(false, new StateChangedHandler() { + + @Override + public void onStateChanged(final StateChangedEvent event) { + if (xmppSession.isReady()) { + presenceManager.changeOwnPresence(nextPresence); + } + } + }); + session.onUserSignIn(false, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + // + } + }); + + } + + private MenuItemDescriptor createChatStatusAction(final ImageResource icon, final String text, + final AbstractAction action) { + final MenuItemDescriptor item = new MenuItemDescriptor(SiteUserOptionsPresenter.LOGGED_USER_MENU, action); + item.putValue(AbstractAction.NAME, text); + item.putValue(AbstractAction.SMALL_ICON, icon); + return item; + } + + private AbstractExtendedAction onlineAction(final String statusText, final Show show, final ImageResource icon) { + return new ChangeOnlineStatusAction(statusText, show, icon); + } +} Modified: trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/chat/client/KuneHablarSignals.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -71,9 +71,8 @@ // FIXME: move to gin @SuppressWarnings("deprecation") - public KuneHablarSignals(final Hablar hablar, final ChatClientAction action) { + public KuneHablarSignals(final XmppSession session, final Hablar hablar, final ChatClientAction action) { final HablarEventBus eventBus = hablar.getEventBus(); - final XmppSession session = Suco.get(XmppSession.class); final PrivateStorageManager storageManager = Suco.get(PrivateStorageManager.class); final HasText titleDisplay = new HasText() { Modified: trunk/src/main/java/cc/kune/chat/client/KuneUnattendedPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/KuneUnattendedPresenter.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/chat/client/KuneUnattendedPresenter.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -20,8 +20,11 @@ package cc.kune.chat.client; import cc.kune.chat.client.ChatClientDefault.ChatClientAction; +import cc.kune.common.client.noti.NotifyUser; +import com.calclab.hablar.chat.client.ui.PairChatPresenter; import com.calclab.hablar.core.client.mvp.HablarEventBus; +import com.calclab.hablar.rooms.client.room.RoomPresenter; import com.calclab.hablar.signals.client.SignalPreferences; import com.calclab.hablar.signals.client.unattended.UnattendedChatsChangedEvent; import com.calclab.hablar.signals.client.unattended.UnattendedChatsChangedHandler; @@ -42,7 +45,10 @@ final int unattendedChatsCount = unattendedManager.getSize(); if (unattendedChatsCount > 0 && active == false) { active = true; - action.setBlink(true); + NotifyUser.info("Num: " + unattendedChatsCount, true); + if (isChatPage(event.getPage().getType())) { + action.setBlink(true); + } } else if (unattendedChatsCount == 0 && active == true) { action.setBlink(false); active = false; @@ -50,5 +56,11 @@ } }); + } + + private boolean isChatPage(final String pageType) { + return pageType.equals(PairChatPresenter.TYPE) || pageType.equals(RoomPresenter.TYPE); + } + } Copied: trunk/src/main/java/cc/kune/chat/client/StartChatWithMemberAction.java (from rev 1254, trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithMemberAction.java) =================================================================== --- trunk/src/main/java/cc/kune/chat/client/StartChatWithMemberAction.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/StartChatWithMemberAction.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -0,0 +1,38 @@ +package cc.kune.chat.client; + +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.noti.NotifyUser; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class StartChatWithMemberAction extends AbstractExtendedAction { + private final Provider<ChatClient> chatClient; + private final I18nTranslationService i18n; + + @Inject + public StartChatWithMemberAction(final I18nTranslationService i18n, final CoreResources res, + final Provider<ChatClient> chatClient) { + this.i18n = i18n; + this.chatClient = chatClient; + putValue(NAME, i18n.t("Start a chat with this member")); + putValue(Action.SMALL_ICON, res.newChat()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + chatClient.get().show(); + if (chatClient.get().isLoggedIn()) { + chatClient.get().chat(XmppURI.jid(((GroupDTO) event.getTarget()).getShortName())); + } else { + NotifyUser.important(i18n.t("To start a chat you need to be 'online'")); + } + } + +} Copied: trunk/src/main/java/cc/kune/chat/client/StartChatWithUserAction.java (from rev 1254, trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithUserAction.java) =================================================================== --- trunk/src/main/java/cc/kune/chat/client/StartChatWithUserAction.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/StartChatWithUserAction.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -0,0 +1,16 @@ +package cc.kune.chat.client; + +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class StartChatWithUserAction extends StartChatWithMemberAction { + @Inject + public StartChatWithUserAction(final I18nTranslationService i18n, final CoreResources res, + final Provider<ChatClient> chatClient) { + super(i18n, res, chatClient); + putValue(NAME, i18n.t("Start a chat with this person")); + } +} Added: trunk/src/main/java/cc/kune/chat/client/resources/ChatResources.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/resources/ChatResources.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/resources/ChatResources.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -0,0 +1,82 @@ +package cc.kune.chat.client.resources; + +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.ImageResource; + +public interface ChatResources extends ClientBundle { + + @Source("add.png") + ImageResource add(); + + @Source("away.png") + ImageResource away(); + + @Source("busy.png") + ImageResource busy(); + + @Source("cancel.png") + ImageResource cancel(); + + @Source("chat.png") + ImageResource chat(); + + @Source("chat-new-message-small.png") + ImageResource chatNewMessageSmall(); + + @Source("chat-small.png") + ImageResource chatSmall(); + + @Source("del.png") + ImageResource del(); + + @Source("group-chat.png") + ImageResource groupChat(); + + @Source("info.png") + ImageResource info(); + + @Source("info-lamp.png") + ImageResource infoLamp(); + + @Source("invisible.png") + ImageResource invisible(); + + @Source("message.png") + ImageResource message(); + + @Source("new-chat.png") + ImageResource newChat(); + + @Source("new-email.png") + ImageResource newEmail(); + + @Source("new-message.png") + ImageResource newMessage(); + + @Source("not-authorized.png") + ImageResource notAuthorized(); + + @Source("offline.png") + ImageResource offline(); + + @Source("online.png") + ImageResource online(); + + @Source("question.png") + ImageResource question(); + + @Source("room-new-message-small.png") + ImageResource roomNewMessageSmall(); + + @Source("room-small.png") + ImageResource roomSmall(); + + @Source("unavailable.png") + ImageResource unavailable(); + + @Source("user_add.png") + ImageResource user_add(); + + @Source("xa.png") + ImageResource xa(); +} \ No newline at end of file Added: trunk/src/main/java/cc/kune/chat/client/resources/add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/add.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/away.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/away.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/busy.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/busy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/cancel.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/cancel.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/chat-new-message-small.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/chat-new-message-small.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/chat-small.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/chat-small.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/chat.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/chat.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/del.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/del.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/group-chat.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/group-chat.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/info-lamp.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/info-lamp.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/info.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/info.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/invisible.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/invisible.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/message.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/message.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/new-chat.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/new-chat.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/new-email.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/new-email.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/new-message.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/new-message.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/not-authorized.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/not-authorized.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/offline.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/offline.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/online.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/online.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/question.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/question.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/room-new-message-small.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/room-new-message-small.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/room-small.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/room-small.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/unavailable.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/unavailable.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/user_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/user_add.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/chat/client/resources/xa.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/chat/client/resources/xa.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/chat/public/kune-chat.css =================================================================== --- trunk/src/main/java/cc/kune/chat/public/kune-chat.css 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/chat/public/kune-chat.css 2011-02-21 04:32:11 UTC (rev 1257) @@ -1,147 +1,144 @@ /* hablar: Examples.css */ -/* html {border: 0; padding: 0; height: 100%; width: 100%; overflow: hidden;} */ - + /* html {border: 0; padding: 0; height: 100%; width: 100%; overflow: hidden;} */ #center { - position: absolute; - left: 50%; - top: 50%; + position: absolute; + left: 50%; + top: 50%; } #playground { - position: absolute; - width: 900px; - height: 500px; - left: -450px; - top: -250px; - background-color: #e9e9e9; - border: 1px solid #bbbbbb; - padding: 5px; + position: absolute; + width: 900px; + height: 500px; + left: -450px; + top: -250px; + background-color: #e9e9e9; + border: 1px solid #bbbbbb; + padding: 5px; } .hablar { - padding: 1px; - background-color: #bBBBBB; + padding: 1px; + background-color: #bBBBBB; } #vertical_div { - position: absolute; - left: -150px; - width: 300px; - top: 5%; - height: 90%; + position: absolute; + left: -150px; + width: 300px; + top: 5%; + height: 90%; } #hablar_complete { - position: fixed; overflow: hidden; - left: 5px; - top: 5px; - right: 5px; - bottom: 5px; - background-color: #BBBBBB; + position: fixed; + overflow: hidden; + left: 5px; + top: 5px; + right: 5px; + bottom: 5px; + background-color: #BBBBBB; } #vertical_dock_div { - position: absolute; - left: -250px; - width: 500px; - top: 5%; - height: 90%; + position: absolute; + left: -250px; + width: 500px; + top: 5%; + height: 90%; } #horizontal_div { - position: absolute; - left: -350px; - width: 700px; - top: 15%; - height: 70%; + position: absolute; + left: -350px; + width: 700px; + top: 15%; + height: 70%; } /* End of hablar: Examples.css */ - .k-chat-icon { - + margin-top: 3px; } .k-chat-window { - background-color: #FFF; + background-color: #FFF; } .k-chat-panel { - margin: 5px; - background-color: #FFF; /* !important;*/ - /* kfilter: alpha(opacity = 88) !important;*/ - /* -moz-opacity: 0.88 !important;*/ - /* -khtml-opacity: 0.88 !important;*/ /* opacity: 0.88 !important;*/ + margin: 5px; + background-color: #FFF; /* !important;*/ + /* kfilter: alpha(opacity = 88) !important;*/ + /* -moz-opacity: 0.88 !important;*/ + /* -khtml-opacity: 0.88 !important;*/ /* opacity: 0.88 !important;*/ } .hablar-HablarWidget { - background-color: #888; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; + background-color: #888; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; } .gwt-Button { - text-shadow: 1px 1px 1px #FFFFFF; - font-weight: bold; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; + text-shadow: 1px 1px 1px #FFFFFF; + font-weight: bold; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; } .gwt-TextBox,.gwt-TextArea { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } .hablar-defaultBackground,.hablar-UserWidget,.hablar-defaultBordered { - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; } -.hablar-Header { -/* -webkit-border-top-right-radius: 5px;*/ -/* -moz-border-radius-topright: 5px;*/ -/* border-top-right-radius: 5px;*/ -/* -webkit-border-top-left-radius: 5px;*/ -/* -moz-border-radius-topleft: 5px;*/ -/* border-top-left-radius: 5px;*/ +.hablar-Header { /* -webkit-border-top-right-radius: 5px;*/ + /* -moz-border-radius-topright: 5px;*/ + /* border-top-right-radius: 5px;*/ + /* -webkit-border-top-left-radius: 5px;*/ + /* -moz-border-radius-topleft: 5px;*/ + /* border-top-left-radius: 5px;*/ + } .hablar-errorColor { - line-height: 2.5em; + line-height: 2.5em; } .form h2 { - font-size: 22px; - font-weight: bold; + font-size: 22px; + font-weight: bold; } .gwt-TabLayoutPanel,.gwt-TabLayoutPanelTab,.hablar-TabsHeaderWidget { - -webkit-border-top-right-radius: 5px; - -moz-border-radius-topright: 5px; - border-top-right-radius: 5px; - -webkit-border-top-left-radius: 5px; - -moz-border-radius-topleft: 5px; - border-top-left-radius: 5px; + -webkit-border-top-right-radius: 5px; + -moz-border-radius-topright: 5px; + border-top-right-radius: 5px; + -webkit-border-top-left-radius: 5px; + -moz-border-radius-topleft: 5px; + border-top-left-radius: 5px; } .hablar-ChatWidget { - -webkit-border-bottom-right-radius: 5px; - -moz-border-radius-bottomright: 5px; - border-bottom-right-radius: 5px; + -webkit-border-bottom-right-radius: 5px; + -moz-border-radius-bottomright: 5px; + border-bottom-right-radius: 5px; } .ellipsis { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; - -ms-text-overflow: ellipsis; - -moz-binding: url('/ws/ellipsis.xml#ellipsis'); - width: 100% -} - - + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + -ms-text-overflow: ellipsis; + -moz-binding: url('/ws/ellipsis.xml#ellipsis'); + width: 100% +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/chat/public/kune-hablar.css =================================================================== --- trunk/src/main/java/cc/kune/chat/public/kune-hablar.css 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/chat/public/kune-hablar.css 2011-02-21 04:32:11 UTC (rev 1257) @@ -1,602 +1,602 @@ /** Colors */ .hablar-clearBackground { - background-color: white; + background-color: white; } .hablar-lightBackground { - background-color: #e9e9e9; + background-color: #e9e9e9; } .hablar-highlightBackground { - background-color: highlight; + background-color: highlight; } .hablar-defaultBackground { - background-color: #bbbbbb; + background-color: #bbbbbb; } .hablar-darkBackground { - background-color: #bbbbbb; + background-color: #bbbbbb; } .hablar-selectedBackground { - background-color: highlight; + background-color: highlight; } .hablar-selectedBackground div.hablar-RosterItemWidget:hover { - background-color: transparent; + background-color: transparent; } /** Text colors **/ .hablar-clearColor { - color: black; + color: black; } .hablar-lightColor { - color: #BBBBBB; + color: #BBBBBB; } .hablar-mediumColor { - color: gray; + color: gray; } .hablar-darkColor { - color: black; + color: black; } .hablar-errorColor { - color: #c00; + color: #c00; } /** Non generalizable styles **/ div.hablar-ActionWidget:hover { - background-color: #BBBBBB; + background-color: #BBBBBB; } div.hablar-GroupHeaderWidget:hover { - background-color: #BBBBBB; - color: black; + background-color: #BBBBBB; + color: black; } div.hablar-RosterItemWidget:hover { - background-color: #E9E9E9; + background-color: #E9E9E9; } div.hablar-SearchResultItemWidget:hover { - background-color: #e9e9e9; + background-color: #e9e9e9; } .hablar-ChatWidget .actions div.hablar-OccupantsWidget:hover { - background-color: #BBBBBB; - color: white; + background-color: #BBBBBB; + color: white; } .hablar-Logger a.gwt-Anchor:hover { - color: white; - background-color: #BBBBBB; + color: white; + background-color: #BBBBBB; } .hablar-HablarWidget .gwt-TabLayoutPanel .gwt-TabLayoutPanelTab { - background-color: #AAAAAA; - padding: 0px 1px; - margin: 0 0px 0 0; - border-left: 1px solid #bbbbbb; - border-top: 1px solid #e9e9e9; - border-right: 1px solid e9e9e9; + background-color: #AAAAAA; + padding: 0px 1px; + margin: 0 0px 0 0; + border-left: 1px solid #bbbbbb; + border-top: 1px solid #e9e9e9; + border-right: 1px solid e9e9e9; } .hablar-HablarWidget .gwt-TabLayoutPanel .gwt-TabLayoutPanelTab-selected - { - background-color: #e9e9e9; - border-left: 1px solid white; - border-top: 1px solid white; - border-right: 1px solid white; + { + background-color: #e9e9e9; + border-left: 1px solid white; + border-top: 1px solid white; + border-right: 1px solid white; } /* .gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger { - background-color: #bbbbbb; + background-color: #bbbbbb; border-left: 1px solid gray; border-right: 1px solid #e9e9e9; } */ input[disabled] { - background-color: #e9e9e9; - color: black; + background-color: #e9e9e9; + color: black; } .hablar-Header.unattended { - color: #cc0000; - font-weight: bold; + color: #cc0000; + font-weight: bold; } .hablar-Header.unattended.blinkOn { - color: #000000; - background-color: highlight; + color: #000000; + background-color: highlight; } /** Classes for borders **/ .hablar-lightBordered { - border: 3px solid #E9E9E9; + border: 3px solid #E9E9E9; } .hablar-partialLightBordered { - border-top: 1px solid #E9E9E9; - border-bottom: 1px solid #E9E9E9; + border-top: 1px solid #E9E9E9; + border-bottom: 1px solid #E9E9E9; } .hablar-bottomLightBordered { - border-bottom: 1px solid #E9E9E9; + border-bottom: 1px solid #E9E9E9; } .hablar-defaultBordered { - border-left: 1px solid #BBBBBB; - /* This border affects scroll visibility */ - border-top: 1px solid #BBBBBB; + border-left: 1px solid #BBBBBB; + /* This border affects scroll visibility */ + border-top: 1px solid #BBBBBB; } .hablar-topDefaultBordered { - border-top: 1px solid #BBBBBB; + border-top: 1px solid #BBBBBB; } .hablar-bottomDefaultBordered { - border-bottom: 1px solid #BBBBBB; + border-bottom: 1px solid #BBBBBB; } .hablar-partialDarkBordered { - border-left: 1px solid #BBBBBB; - border-top: 1px solid #BBBBBB; + border-left: 1px solid #BBBBBB; + border-top: 1px solid #BBBBBB; } .hablar-darkBordered { - border: 1px solid #BBBBBB; + border: 1px solid #BBBBBB; } .hablar-bottomDarkBordered { - border-bottom: 1px solid #BBBBBB; + border-bottom: 1px solid #BBBBBB; } .hablar-disabledBordered { - border-left: 1px solid #8C8C8C; - border-top: 1px solid #8C8C8C; + border-left: 1px solid #8C8C8C; + border-top: 1px solid #8C8C8C; } /** Accordion effects **/ .hablar-AccordionHeaderWidget.notFocused { - border-top: 1px solid #E9E9E9; - border-bottom: 1px solid #BBB; + border-top: 1px solid #E9E9E9; + border-bottom: 1px solid #BBB; } .hablar-AccordionHeaderWidget.focused { - border-top: 1px solid white; - border-bottom: 1px solid #BBB; + border-top: 1px solid white; + border-bottom: 1px solid #BBB; } /** Chat messages **/ .chatMessage .body.incoming { - + } .chatMessage .body.sent { - color: #808080; + color: #808080; } .chatMessage .body.info { - color: #808080; - font-style: italic; + color: #808080; + font-style: italic; } .chatMessage .body.alert { - color: #c00; + color: #c00; } .hablar-ChatWidget .chatMessage { - display: block; - width: 94%; - overflow: hidden; - padding: 2px 3% 2px 3%; + display: block; + width: 94%; + overflow: hidden; + padding: 2px 3% 2px 3%; } .hablar-ChatWidget .chatMessage.odd { - background-color: #efefef; + background-color: #efefef; } .chatMessage .author { - display: inline; - font-weight: bold; + display: inline; + font-weight: bold; } .chatMessage .metadata { - display: inline; - color: #808080; - font-size: 90%; + display: inline; + color: #808080; + font-size: 90%; } .chatMessage .body { - display: inline; + display: inline; } .hablar-EmoticonImage { - vertical-align: text-top; + vertical-align: text-top; } /** MUC room occupants **/ .gwt-PopupPanel.occupants { - border-top: 1px solid #E9E9E9; - border-left: 1px solid #BBBBBB; - border-right: 1px solid #BBBBBB; - border-bottom: 1px solid #BBBBBB; - background-color: #e9e9e9; - z-index: 10000; + border-top: 1px solid #E9E9E9; + border-left: 1px solid #BBBBBB; + border-right: 1px solid #BBBBBB; + border-bottom: 1px solid #BBBBBB; + background-color: #e9e9e9; + z-index: 10000; } /** IE6 ZINDEX BUG **/ .hablar-HablarWidget { - z-index: 1; + /* z-index: 1; */ } html { - font-family: Tahoma, sans-serif; - font-size: 80%; + font-family: Tahoma, sans-serif; + font-size: 80%; } body { - height: 90%; + height: 90%; } /** HABLAR HEADER **/ .hablar-Header { - width: 100%; - overflow: hidden; - cursor: pointer; - padding: 3px 0; + width: 100%; + overflow: hidden; + cursor: pointer; + padding: 3px 0; } .hablar-Header .icon { - float: left; - margin-right: 3px; - margin-left: 3px; + float: left; + margin-right: 3px; + margin-left: 3px; } .hablar-RosterGroupWidget .icon { - float: left; - margin-right: 3px; + float: left; + margin-right: 3px; } .hablar-Header .title { - float: left; + float: left; } .hablar-AccordionHeaderWidget .icon { - float: left; - margin: 0 3px 0 3px; + float: left; + margin: 0 3px 0 3px; } .hablar-AccordionHeaderWidget .title { - display: block; - margin: 0 3px; + display: block; + margin: 0 3px; } .hablar-AccordionHeaderWidget .close { - float: right; - margin: 0px 3px 0 0; + float: right; + margin: 0px 3px 0 0; } .hablar-TabsHeaderWidget { - padding: 0; - margin: 0; - background-color: transparent; - border: none; + padding: 0; + margin: 0; + background-color: transparent; + border: none; } .hablar-TabsHeaderWidget .close { - margin: 2px 3px; + margin: 2px 3px; } .hablar-AccordionHeader .close { - margin: 2px 3px 0 0; + margin: 2px 3px 0 0; } .hablar-AccordionHeader .icon { - + } .hablar-AccordionHeader .title { - display: block; + display: block; } .hablar-TabsHeaderWidget .title { - display: inline; - margin-right: 10px; + display: inline; + margin-right: 10px; } /** DOCKS **/ .hablar-DockContainer-top { - background-color: transparent; - z-index: 4000; + background-color: transparent; + z-index: 4000; } .hablar-Header.DockHeaderWidget-top { - background-color: transparent; - border: 1px transparent; + background-color: transparent; + border: 1px transparent; } .hablar-Header.DockHeaderWidget-left { - cursor: default; - -moz-user-select: none; + cursor: default; + -moz-user-select: none; } .DockHeaderWidget-left .icon { - margin-left: 3px; + margin-left: 3px; } /** LIST ITEMS **/ .hablar-ListItem { - display: block; - width: 100%; - overflow: hidden; - padding: 5px 0px 0 0px; + display: block; + width: 100%; + overflow: hidden; + padding: 5px 0px 0 0px; } .clickable { - cursor: pointer; + cursor: pointer; } /** USER **/ .hablar-UserWidget .container { - padding: 0px 10px; - z-index: 3000; + padding: 0px 10px; + z-index: 3000; } .hablar-UserWidget h2 { - margin: 15px 0 5px 0; + margin: 15px 0 5px 0; } .hablar-UserWidget .actions { - padding: 5px 0 0 10px; + padding: 5px 0 0 10px; } /** ROSTER **/ .hablar-RosterWidget .item { - width: 100%; - overflow: hidden; + width: 100%; + overflow: hidden; } .hablar-RosterWidget .actions { - width: 100%; - overflow: hidden; + width: 100%; + overflow: hidden; } .hablar-RosterWidget .actions .hablar-ActionWidget { - float: left; - margin-right: 1px; + float: left; + margin-right: 1px; } .hablar-GroupHeaderWidget { - overflow: hidden; - padding: 3px; - cursor: pointer; - border-bottom: 1px solid #BBBBBB; - border-top: 1px solid white; + overflow: hidden; + padding: 3px; + cursor: pointer; + border-bottom: 1px solid #BBBBBB; + border-top: 1px solid white; } .hablar-GroupHeaderWidget .label { - display: block; - margin: 3px; + display: block; + margin: 3px; } .hablar-GroupHeaderWidget .menu { - float: right; - margin-right: 3px; + float: right; + margin-right: 3px; } .hablar-RosterItemWidget .user { - float: left; + float: left; } .hablar-RosterItemWidget .icon { - display: block; - float: left; - margin: 2px 5px 2px 2px; + display: block; + float: left; + margin: 2px 5px 2px 2px; } .hablar-RosterItemWidget .name { - display: block; - float: left; - margin-right: 5px; + display: block; + float: left; + margin-right: 5px; } .hablar-RosterItemWidget .menu { - float: right; + float: right; } .hablar-RosterGroupWidget .menu { - float: right; - cursor: pointer; + float: right; + cursor: pointer; } /** CHAT PAGE **/ .hablar-ChatWidget .actions div { - float: right; + float: right; } /** SEARCH PAGE **/ .hablar-SearchWidget .searchBox { - width: 75%; - padding: 3px; - margin-right: 1%; + width: 75%; + padding: 3px; + margin-right: 1%; } .hablar-SearchWidget .gwt-Button { - width: 20%; + width: 20%; } /** ROOMS **/ .hablar-ChatWidget .actions .hablar-OccupantsWidget { - display: block; - float: left; - padding: 2px 5px; - margin-left: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - cursor: pointer; + display: block; + float: left; + padding: 2px 5px; + margin-left: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + cursor: pointer; } .hablar-OccupantWidget { - width: 100%; - overflow: hidden; - margin: 2px 5px; - cursor: default; + width: 100%; + overflow: hidden; + margin: 2px 5px; + cursor: default; } .hablar-OccupantWidget .icon { - display: block; - float: left; - margin-right: 5px; + display: block; + float: left; + margin-right: 5px; } .hablar-OccupantWidget .name { - display: block; - float: left; + display: block; + float: left; } /** ROOM INVITATION **/ .hablar-OpenRoomWidget .list { - padding: 5px; + padding: 5px; } /** LOGGER **/ .hablar-Logger .gwt-Label { - opacity: 0.5; + opacity: 0.5; } .hablar-Logger .gwt-Label.ready { - opacity: 1; + opacity: 1; } .hablar-Logger .output { - color: blue; + color: blue; } .hablar-Logger .input { - color: #0c0; + color: #0c0; } /** OVERLAY **/ .hablar-Overlay { - z-index: 7000; - padding: 20px 10px 10px 10px; + z-index: 7000; + padding: 20px 10px 10px 10px; } /** FORMS **/ .form p { - width: 100%; - overflow: hidden; - margin: 3px 0; + width: 100%; + overflow: hidden; + margin: 3px 0; } .form h2 { - font-size: 200%; + font-size: 200%; } .form span.option { - display: block; - margin: 0 0 15px 30px; + display: block; + margin: 0 0 15px 30px; } .form p label { - display: block; - margin-top: 5px; - margin-right: 10px; - margin-right: 0.5em; + display: block; + margin-top: 5px; + margin-right: 10px; + margin-right: 0.5em; } .form p .gwt-Label { - font-weight: bold; + font-weight: bold; } .form .actions { - padding-left: 5px; - margin-top: 15px; - padding-top: 5px; + padding-left: 5px; + margin-top: 15px; + padding-top: 5px; } .form .gwt-TextBox,.form .gwt-PasswordTextBox { - padding: 2px; - width: 98%; - border: 0; + padding: 2px; + width: 98%; + border: 0; } .form p .gwt-RadioButton,.form p .gwt-CheckBox { - display: block; - width: 100%; - overflow: hidden; + display: block; + width: 100%; + overflow: hidden; } .form p .gwt-RadioButton input,.form p .gwt-CheckBox input { - float: left; - margin-right: 5px; + float: left; + margin-right: 5px; } .form p .gwt-RadioButton label,.form p .gwt-CheckBox label { - float: left; - margin: 0; + float: left; + margin: 0; } .hablar-PopupPanel { - z-index: 5000; - -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + z-index: 5000; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); } .hablar-PresenceWidget .controls { - width: 100%; - overflow: hidden; + width: 100%; + overflow: hidden; } .hablar-PresenceWidget .menu,.hablar-PresenceWidget .icon { - float: left; - margin-top: 4px; + float: left; + margin-top: 4px; } .loading { - width: 100%; - overflow: hidden; + width: 100%; + overflow: hidden; } .loading .icon { - display: block; - float: left; - margin-right: 5px; + display: block; + float: left; + margin-right: 5px; } /** SEMANTIC CSS PLEASE! **/ .overflowhidden { - overflow: hidden; + overflow: hidden; } /** ADD TO GROUP **/ .hablar-ManageGroupsWidget .list { - padding: 5px; + padding: 5px; } /** COPY TO CLIPBOARD **/ .hablar-CopyToClipboardWidget .gwt-TextArea { - width: 100%; - height: 10em; - margin-top: 3px; + width: 100%; + height: 10em; + margin-top: 3px; } .ellipsis { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; - -ms-text-overflow: ellipsis; - -moz-binding: url('ellipsis.xml#ellipsis'); - width: 100% + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + -ms-text-overflow: ellipsis; + -moz-binding: url('ellipsis.xml#ellipsis'); + width: 100% } .gwt-TextArea { - border: 1px solid #bbbbbb; + border: 1px solid #bbbbbb; } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -69,7 +69,7 @@ ginjector.getCorePresenter().get().forceReveal(); ginjector.getStateManager(); ginjector.getSiteTokenListeners(); - ginjector.getGxtGuiProvider(); + ginjector.getGwtGuiProvider(); ginjector.getUserNotifierPresenter(); ginjector.getGlobalShortcutRegister(); ginjector.getSpinerPresenter(); Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -21,6 +21,7 @@ import cc.kune.chat.client.ChatClient; import cc.kune.chat.client.ChatGinModule; +import cc.kune.chat.client.ChatParts; 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; @@ -65,6 +66,8 @@ ChatClient getChatClient(); + ChatParts getChatParts(); + AsyncProvider<CookiesManager> getCookiesManager(); CoreParts getCoreParts(); Modified: trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml 2011-02-21 04:32:11 UTC (rev 1257) @@ -10,9 +10,11 @@    - +   - <source path='client' /> + <source path='client' + excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> <public path="public" /> <inherits name='org.cobogw.gwt.user.User' /> <inherits name='com.google.gwt.inject.Inject' /> Modified: trunk/src/main/java/cc/kune/common/client/actions/ActionEvent.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ActionEvent.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/actions/ActionEvent.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -51,12 +51,19 @@ */ public class ActionEvent { + public static final Object NO_TARGET = String.valueOf("No target"); private final Event event; private final Object source; + private final Object target; public ActionEvent(final Object source, final Event event) { + this(source, NO_TARGET, event); + } + + public ActionEvent(final Object source, final Object target, final Event event) { this.source = source; this.event = event; + this.target = target; } public Event getEvent() { @@ -66,4 +73,8 @@ public Object getSource() { return source; } + + public Object getTarget() { + return target; + } } 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-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -30,6 +30,7 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.ButtonBase; @@ -56,6 +57,12 @@ } @Override + protected void addStyle(final String style) { + iconLabel.addStyleName(style); + layout(); + } + + @Override public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.descriptor = descriptor; iconLabel = new IconLabel(""); @@ -64,7 +71,9 @@ } else { button = new Button(); } - button.setStylePrimaryName("oc-button"); + button.addStyleName("oc-button"); + button.addStyleName("k-btn"); + button.addStyleName("k-5corners"); layout(); // button.setEnableToggle(enableTongle); final String id = descriptor.getId(); @@ -83,7 +92,8 @@ button.addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { - descriptor.fire(new ActionEvent(button, Event.as(event.getNativeEvent()))); + descriptor.fire(new ActionEvent(button, getTargetObjectOfAction(descriptor), + Event.as(event.getNativeEvent()))); } }); super.create(descriptor); @@ -101,6 +111,12 @@ } @Override + public void setIconResource(final ImageResource icon) { + iconLabel.setIconResource(icon); + layout(); + } + + @Override protected void setIconStyle(final String style) { iconLabel.setIcon(style); layout(); @@ -134,16 +150,12 @@ @Override public void setVisible(final boolean visible) { - if (!isChild) { - if (button.isAttached()) { - super.setVisible(visible); - } - } + button.setVisible(visible); } @Override - public boolean shouldBeAdded() { // NOPMD by vjrj on 18/01/11 0:48 - return true; + public boolean shouldBeAdded() { + return !descriptor.isChild(); } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuGui.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuGui.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -75,6 +75,7 @@ public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.create(descriptor); menu = new MenuBar(true); + menu.setFocusOnHoverEnabled(true); menu.setAnimationEnabled(true); descriptor.addPropertyChangeListener(new PropertyChangeListener() { @Override @@ -90,8 +91,7 @@ @Override public void propertyChange(final PropertyChangeEvent event) { if (event.getPropertyName().equals(MenuDescriptor.MENU_SHOW)) { - final String id = (String) descriptor.getValue(MenuDescriptor.MENU_SHOW_NEAR_TO); - show(id); + show(descriptor.getValue(MenuDescriptor.MENU_SHOW_NEAR_TO)); } } }); @@ -100,7 +100,7 @@ private PopupPanel createPopup() { popup = new PopupPanel(true); - popup.addStyleName("oc-menu"); + popup.setStyleName("oc-menu"); popup.add(menu); popup.addCloseHandler(new CloseHandler<PopupPanel>() { @Override @@ -111,6 +111,10 @@ return popup; } + public void hide() { + popup.hide(); + } + @Override public void insert(final int position, final UIObject item) { menu.insertItem((MenuItem) item, position); 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-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -31,9 +31,11 @@ import cc.kune.common.client.actions.ui.descrip.MenuCheckItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; 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.ui.IconLabel; +import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; @@ -67,7 +69,6 @@ public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.descriptor = descriptor; iconLabel = new IconLabel(""); - iconLabel.addTextStyleName("oc-ico-pad"); if (descriptor instanceof MenuRadioItemDescriptor) { final GwtCheckItem checkItem = createCheckItem((MenuItemDescriptor) descriptor); checkItem.setGroup(((MenuRadioItemDescriptor) descriptor).getGroup()); @@ -77,6 +78,9 @@ final GwtCheckItem checkItem = createCheckItem((MenuItemDescriptor) descriptor); confCheckListener((MenuItemDescriptor) descriptor, checkItem); item = checkItem; + } else if (descriptor instanceof MenuTitleItemDescriptor) { + item = new GwtBaseMenuItem("", true); + item.setStyleName("k-menuimtem-title"); } else { item = new GwtBaseMenuItem("", true); } @@ -89,16 +93,18 @@ item.setCommand(new Command() { @Override public void execute() { + getParentMenu(descriptor).hide(); final AbstractAction action = descriptor.getAction(); if (action != null) { - descriptor.getAction().actionPerformed(new ActionEvent(item, Event.getCurrentEvent())); + descriptor.getAction().actionPerformed( + new ActionEvent(item, getTargetObjectOfAction(descriptor), Event.getCurrentEvent())); } } }); configureItemFromProperties(); final int position = descriptor.getPosition(); - final AbstractGwtMenuGui menu = ((AbstractGwtMenuGui) descriptor.getParent().getValue(ParentWidget.PARENT_UI)); + final AbstractGwtMenuGui menu = getParentMenu(descriptor); if (menu == null) { throw new UIException("To add a menu item you need to add the menu before. Item: " + descriptor); } @@ -128,6 +134,10 @@ return item; } + private AbstractGwtMenuGui getParentMenu(final GuiActionDescrip descriptor) { + return ((AbstractGwtMenuGui) descriptor.getParent().getValue(ParentWidget.PARENT_UI)); + } + private void layout() { item.setHTML(iconLabel.toString()); } @@ -135,9 +145,18 @@ @Override protected void setEnabled(final boolean enabled) { item.setVisible(enabled); + item.setEnabled(enabled); + iconLabel.setVisible(enabled); + layout(); } @Override + public void setIconResource(final ImageResource icon) { + iconLabel.setIconResource(icon); + layout(); + } + + @Override protected void setIconStyle(final String style) { iconLabel.setIcon(style); layout(); @@ -167,6 +186,8 @@ @Override public void setVisible(final boolean visible) { item.setVisible(visible); + iconLabel.setVisible(visible); + layout(); } @Override Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtComplexToolbar.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtComplexToolbar.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtComplexToolbar.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -47,6 +47,7 @@ } public void add(final UIObject uiObject) { + uiObject.addStyleName(getFlow()); toolbar.add((Widget) uiObject); } @@ -79,6 +80,7 @@ } public void insert(final UIObject uiObject, final int position) { + uiObject.addStyleName(getFlow()); toolbar.insert((Widget) uiObject, position); } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtGuiProvider.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtGuiProvider.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtGuiProvider.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -27,6 +27,7 @@ import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuSeparatorDescriptor; +import cc.kune.common.client.actions.ui.descrip.MenuTitleItemDescriptor; import cc.kune.common.client.actions.ui.descrip.PushButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarDescriptor; @@ -42,12 +43,14 @@ final Provider<GwtMenuGui> gwtMenuGui, final Provider<GwtMenuItemGui> gwtMenuItemGui, final Provider<GwtMenuSeparatorGui> gwtMenuSeparatorGui, final Provider<GwtPushButtonGui> gwtPushButtonGui, final Provider<GwtButtonGui> gwtButtonGui, final Provider<GwtIconLabelGui> gwtIconLabelGui, - final Provider<GwtToolbarGui> gwtToolbarGui, final Provider<GwtToolbarSeparatorGui> gwtToolbarSeparatorGui) { + final Provider<GwtToolbarGui> gwtToolbarGui, final Provider<GwtToolbarSeparatorGui> gwtToolbarSeparatorGui, + final Provider<GwtMenuTitleItemGui> gwtMenuTitleItemGui) { guiProvider.register(SubMenuDescriptor.class, gwtSubMenuGui); guiProvider.register(MenuDescriptor.class, gwtMenuGui); guiProvider.register(MenuRadioItemDescriptor.class, gwtMenuItemGui); guiProvider.register(MenuCheckItemDescriptor.class, gwtMenuItemGui); + guiProvider.register(MenuTitleItemDescriptor.class, gwtMenuTitleItemGui); guiProvider.register(MenuItemDescriptor.class, gwtMenuItemGui); guiProvider.register(MenuSeparatorDescriptor.class, gwtMenuSeparatorGui); guiProvider.register(PushButtonDescriptor.class, gwtPushButtonGui); 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-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -63,7 +63,8 @@ public void onClick(final ClickEvent event) { final AbstractAction action = descriptor.getAction(); if (action != null) { - action.actionPerformed(new ActionEvent(iconLabel, Event.as(event.getNativeEvent()))); + action.actionPerformed(new ActionEvent(iconLabel, getTargetObjectOfAction(descriptor), + Event.as(event.getNativeEvent()))); } } }); 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-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -27,6 +27,7 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Label; @@ -44,6 +45,14 @@ } @Override + protected void addStyle(final String style) { + if (notStandAlone) { + iconLabel.addStyleName(style); + layout(); + } + } + + @Override public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.descriptor = descriptor; descriptor.putValue(ParentWidget.PARENT_UI, this); @@ -89,6 +98,14 @@ } @Override + public void setIconResource(final ImageResource resource) { + if (notStandAlone) { + iconLabel.setIconResource(resource); + layout(); + } + } + + @Override public void setIconStyle(final String style) { if (notStandAlone) { iconLabel.setIcon(style); Added: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuTitleItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuTitleItemGui.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuTitleItemGui.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -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.actions.gwtui; + +import cc.kune.common.client.actions.ui.descrip.MenuTitleItemDescriptor; + +public class GwtMenuTitleItemGui extends AbstractGwtMenuItemGui { + public GwtMenuTitleItemGui() { + super(); + } + + public GwtMenuTitleItemGui(final MenuTitleItemDescriptor descriptor) { + super(descriptor); + } +} 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-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -44,7 +44,6 @@ super.descriptor = descriptor; item = new MenuItem("", menu); iconLabel = new IconLabel(""); - iconLabel.addTextStyleName("oc-ico-pad"); configureItemFromProperties(); final AbstractGwtMenuGui parentMenu = ((AbstractGwtMenuGui) descriptor.getParent().getValue(PARENT_UI)); final int position = descriptor.getPosition(); Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -74,7 +74,7 @@ button.addSelectionListener(new SelectionListener<ButtonEvent>() { @Override public void componentSelected(final ButtonEvent event) { - descriptor.fire(new ActionEvent(button, Event.as(event.getEvent()))); + descriptor.fire(new ActionEvent(button, getTargetObjectOfAction(descriptor), Event.as(event.getEvent()))); } }); if (!descriptor.isChild()) { Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -92,17 +92,10 @@ public void componentSelected(final MenuEvent ce) { final AbstractAction action = descriptor.getAction(); if (action != null) { - action.actionPerformed(new ActionEvent(getItemObjectOfAction(descriptor), Event.getCurrentEvent())); + action.actionPerformed(new ActionEvent(item, getTargetObjectOfAction(descriptor), + Event.getCurrentEvent())); } } - - private Object getItemObjectOfAction(final GuiActionDescrip descriptor) { - // If the action is associated with a item (like a Group, a - // group shortname, a username, etc) we pass this item to - // the action, if not we only pass the menuitem - return descriptor.hasItem() ? descriptor.getItem() - : descriptor.isChild() ? descriptor.getParent().getItem() : item; - } }); child = item; super.create(descriptor); Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtGuiProvider.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtGuiProvider.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtGuiProvider.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -28,6 +28,7 @@ import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuSeparatorDescriptor; +import cc.kune.common.client.actions.ui.descrip.MenuTitleItemDescriptor; import cc.kune.common.client.actions.ui.descrip.PushButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarDescriptor; @@ -43,12 +44,14 @@ final Provider<GxtMenuGui> gxtMenuGui, final Provider<GxtMenuItemGui> gxtMenuItemGui, final Provider<GxtMenuSeparatorGui> gxtMenuSeparatorGui, final Provider<GxtPushButtonGui> gxtPushButtonGui, final Provider<GxtButtonGui> gxtButtonGui, final Provider<GwtIconLabelGui> gwtIconLabelGui, - final Provider<GxtToolbarGui> gxtToolbarGui, final Provider<GxtToolbarSeparatorGui> gxtToolbarSeparatorGui) { + final Provider<GxtToolbarGui> gxtToolbarGui, final Provider<GxtToolbarSeparatorGui> gxtToolbarSeparatorGui, + final Provider<GxtMenuTitleItemGui> gxtMenuTitleItemGui) { guiProvider.register(SubMenuDescriptor.class, gxtSubMenuGui); guiProvider.register(MenuDescriptor.class, gxtMenuGui); guiProvider.register(MenuRadioItemDescriptor.class, gxtMenuItemGui); guiProvider.register(MenuCheckItemDescriptor.class, gxtMenuItemGui); + guiProvider.register(MenuTitleItemDescriptor.class, gxtMenuTitleItemGui); guiProvider.register(MenuItemDescriptor.class, gxtMenuItemGui); guiProvider.register(MenuSeparatorDescriptor.class, gxtMenuSeparatorGui); guiProvider.register(PushButtonDescriptor.class, gxtPushButtonGui); Added: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuTitleItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuTitleItemGui.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuTitleItemGui.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -0,0 +1,95 @@ +/* + * + * 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.actions.gxtui; + +import cc.kune.common.client.actions.ui.AbstractChildGuiItem; +import cc.kune.common.client.actions.ui.AbstractGuiItem; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.utils.TextUtils; + +import com.extjs.gxt.ui.client.widget.menu.HeaderMenuItem; + +public class GxtMenuTitleItemGui extends AbstractChildGuiItem { + + private HeaderMenuItem item; + + public GxtMenuTitleItemGui() { + super(); + } + + public GxtMenuTitleItemGui(final MenuItemDescriptor descriptor) { + super(descriptor); + + } + + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + item = new HeaderMenuItem(""); + + final String id = descriptor.getId(); + if (id != null) { + item.ensureDebugId(id); + } + child = item; + super.create(descriptor); + configureItemFromProperties(); + return this; + } + + public HeaderMenuItem getItem() { + return item; + } + + @Override + protected void setEnabled(final boolean enabled) { + item.setVisible(enabled); + } + + @Override + protected void setIconStyle(final String style) { + item.addStyleName(style); + } + + @Override + protected void setText(final String text) { + if (text != null) { + item.setText(text); + } + } + + @Override + protected void setToolTipText(final String tooltip) { + if (TextUtils.notEmpty(tooltip)) { + item.setToolTip(new GxtDefTooltip(tooltip)); + } + } + + @Override + public void setVisible(final boolean visible) { + item.setVisible(visible); + } + + @Override + public boolean shouldBeAdded() { // NOPMD by vjrj on 18/01/11 0:48 + return false; + } +} Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -21,6 +21,7 @@ import cc.kune.common.client.actions.AbstractAction; 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.bind.GuiBinding; @@ -103,6 +104,14 @@ }; } + protected Object getTargetObjectOfAction(final GuiActionDescrip descriptor) { + // If the action is associated with a item (like a Group, a + // group shortname, a username, etc) we pass this item to + // the action, if not we only pass the menuitem + return descriptor.hasTarget() ? descriptor.getTarget() + : descriptor.isChild() ? descriptor.getParent().getTarget() : ActionEvent.NO_TARGET; + } + protected abstract void setEnabled(boolean enabled); private void setEnabled(final Boolean enabled) { Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -83,8 +83,8 @@ } @Override - public Object getItem() { - return getValue(ITEM); + public Object getTarget() { + return getValue(TARGET); } /** @@ -130,8 +130,8 @@ } @Override - public boolean hasItem() { - return getValue(ITEM) != null; + public boolean hasTarget() { + return getValue(TARGET) != null; } @Override @@ -171,8 +171,8 @@ } @Override - public void setItem(final Object object) { - putValue(ITEM, object); + public void setTarget(final Object object) { + putValue(TARGET, object); } /** Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -6,13 +6,6 @@ public interface GuiActionDescrip { - /** - * {@link #ITEM} is used to associate a {@link #AbstractGuiActionDescrip} - * with an object like groups, group names, users, and so on, and used to - * execute actions with this item as parameter - */ - public static final String ITEM = "item"; - public static final AbstractGuiActionDescrip NO_PARENT = new NoParentGuiActionDescriptor(); public static final int NO_POSITION = -1; @@ -22,20 +15,25 @@ */ public static final String STYLES = "stylesprop"; + /** + * {@link #TARGET} is used to associate a {@link #AbstractGuiActionDescrip} + * with an object like groups, group names, users, and so on, and used to + * execute actions against these targets + */ + public static final String TARGET = "target"; + public static final String VISIBLE = "visibleprop"; + void add(final GuiAddCondition addCondition); + void addPropertyChangeListener(final PropertyChangeListener listener); - void add(final GuiAddCondition addCondition); - void fire(final ActionEvent event); AbstractAction getAction(); String getId(); - Object getItem(); - Object[] getKeys(); String getLocation(); @@ -46,11 +44,13 @@ PropertyChangeListener[] getPropertyChangeListeners(); + Object getTarget(); + Class<?> getType(); Object getValue(final String key); - boolean hasItem(); + boolean hasTarget(); boolean isChild(); @@ -68,8 +68,6 @@ void setId(final String id); - void setItem(final Object object); - void setLocation(final String location); void setParent(final GuiActionDescrip parent); @@ -78,6 +76,8 @@ void setStyles(final String styles); + void setTarget(final Object object); + void setVisible(final boolean visible); } Added: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuTitleItemDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuTitleItemDescriptor.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuTitleItemDescriptor.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -0,0 +1,41 @@ +/* + * + * 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.actions.ui.descrip; + +import cc.kune.common.client.actions.AbstractAction; +import cc.kune.common.client.actions.Action; + +public class MenuTitleItemDescriptor extends MenuItemDescriptor { + + public MenuTitleItemDescriptor(final MenuDescriptor parent) { + super(AbstractAction.NO_ACTION); + setParent(parent); + } + + public MenuTitleItemDescriptor(final MenuDescriptor parent, final String title) { + this(parent); + putValue(Action.NAME, title); + } + + @Override + public Class<?> getType() { + return MenuTitleItemDescriptor.class; + } +} Modified: trunk/src/main/java/cc/kune/common/client/ui/AbstractFlowToolbar.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/AbstractFlowToolbar.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/ui/AbstractFlowToolbar.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -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/common/client/ui/FlowToolbar.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/FlowToolbar.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/ui/FlowToolbar.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -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,7 +22,6 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HasVerticalAlignment.VerticalAlignmentConstant; -import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.IndexedPanel.ForIsWidget; import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.Label; @@ -31,14 +30,11 @@ public class FlowToolbar extends Composite implements AbstractToolbar, ForIsWidget { private final FlowPanel childPanel; - private final HorizontalPanel mainPanel; public FlowToolbar() { super(); - mainPanel = new HorizontalPanel(); childPanel = new FlowPanel(); - mainPanel.add(childPanel); - initWidget(mainPanel); + initWidget(childPanel); } @Override @@ -63,7 +59,7 @@ @Override public Widget addSeparator() { final Label emptyLabel = new Label(""); - emptyLabel.setStyleName("ytb-sep-FIXMEEE"); + emptyLabel.setStyleName("k-tb-sep"); emptyLabel.addStyleName("oc-tb-sep"); emptyLabel.addStyleName("oc-floatleft"); this.add(emptyLabel); @@ -139,7 +135,6 @@ @Override public void setHeight(final String height) { - mainPanel.setHeight(height); childPanel.setHeight(height); } 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-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -24,13 +24,15 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.i18n.client.HasDirection.Direction; +import com.google.gwt.resources.client.ImageResource; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.FocusPanel; import com.google.gwt.user.client.ui.HasDirectionalText; import com.google.gwt.user.client.ui.HasWidgets; -import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.InlineLabel; import com.google.gwt.user.client.ui.Widget; @@ -42,9 +44,9 @@ private static IconTitleUiBinder uiBinder = GWT.create(IconTitleUiBinder.class); @UiField - HorizontalPanel hp; + FlowPanel flow; @UiField - InlineLabel icon; + Image icon; @UiField InlineLabel label; @UiField @@ -57,16 +59,18 @@ public IconLabel(final String text) { initWidget(uiBinder.createAndBindUi(this)); label.setText(text); + label.addStyleName("k-space-nowrap"); + label.addStyleName("k-iconlabel-text"); } @Override public void add(final Widget w) { - hp.add(w); + flow.add(w); } @Override public void addStyleName(final String style) { - hp.addStyleName(style); + flow.addStyleName(style); } public void addTextStyleName(final String style) { @@ -75,7 +79,7 @@ @Override public void clear() { - hp.clear(); + flow.clear(); } public HasClickHandlers getFocus() { @@ -94,19 +98,24 @@ @Override public Iterator<Widget> iterator() { - return hp.iterator(); + return flow.iterator(); } @Override public boolean remove(final Widget w) { - return hp.remove(w); + return flow.remove(w); } public void setIcon(final String imgCss) { + icon.setUrl("images/clear.gif"); icon.setStyleName(imgCss); icon.addStyleName("oc-ico-pad"); } + public void setIconResource(final ImageResource res) { + icon.setResource(res); + } + public void setLabelText(final String text) { label.setText(text); } 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-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml 2011-02-21 04:32:11 UTC (rev 1257) @@ -16,10 +16,10 @@ } </ui:style> <g:FocusPanel ui:field="self"> - <g:HorizontalPanel styleName="{style.pad}" - ui:field="hp"> - <g:InlineLabel ui:field="icon"/> - <g:InlineLabel ui:field="label" styleName="{style.label}" /> - </g:HorizontalPanel> + <g:FlowPanel styleName="{style.pad}" + ui:field="flow"> + <g:Image ui:field="icon"/> + <g:InlineLabel ui:field="label" styleName="{style.label}" /> + </g:FlowPanel> </g:FocusPanel> </ui:UiBinder> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/client/ui/KuneWindowUtils.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/KuneWindowUtils.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/client/ui/KuneWindowUtils.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -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/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-02-21 04:32:11 UTC (rev 1257) @@ -1,412 +1,439 @@ +/* Here the styles of cc.kune.commom (reused by other projects like gadgets and so on) */ .k-popup-top-centered { - + } .k-popup-bottom-centered { /* z-index:100000; */ - + } .k-floatleft,.k-fl { - float: left; + float: left; } .k-floatright,.k-fr { - float: right; + float: right; } .k-pointer { - cursor: pointer; - cursor: hand; + cursor: pointer; + cursor: hand; } .k-opacity80 { - kfilter: alpha(opacity = 80); - -moz-opacity: 0.80; - -khtml-opacity: 0.80; - opacity: 0.80; + kfilter: alpha(opacity = 80); + -moz-opacity: 0.80; + -khtml-opacity: 0.80; + opacity: 0.80; } .k-opacity90 { - kfilter: alpha(opacity = 90); - -moz-opacity: 0.90; - -khtml-opacity: 0.90; - opacity: 0.90; + kfilter: alpha(opacity = 90); + -moz-opacity: 0.90; + -khtml-opacity: 0.90; + opacity: 0.90; } .k-opacity95 { - kfilter: alpha(opacity = 95); - -moz-opacity: 0.95; - -khtml-opacity: 0.95; - opacity: 0.95; + kfilter: alpha(opacity = 95); + -moz-opacity: 0.95; + -khtml-opacity: 0.95; + opacity: 0.95; } .gwt-PopupPanelGlass { - background-color: #f7ebe3 !important; - kfilter: alpha(opacity = 68) !important; - -moz-opacity: 0.68 !important; - -khtml-opacity: 0.68 !important; - opacity: 0.68 !important; + background-color: #f7ebe3 !important; + kfilter: alpha(opacity = 68) !important; + -moz-opacity: 0.68 !important; + -khtml-opacity: 0.68 !important; + opacity: 0.68 !important; } .k-box-5shadow { - -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); - box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); } .k-box-10shadow { - -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); - box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); } .k-bottom-5corners { - -webkit-border-bottom-right-radius: 5px; - -moz-border-radius-bottomright: 5px; - border-bottom-right-radius: 5px; - -webkit-border-bottom-left-radius: 5px; - -moz-border-radius-bottomleft: 5px; - border-bottom-left-radius: 5px; + -webkit-border-bottom-right-radius: 5px; + -moz-border-radius-bottomright: 5px; + border-bottom-right-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + -moz-border-radius-bottomleft: 5px; + border-bottom-left-radius: 5px; } .k-bottom-10corners { - -webkit-border-bottom-right-radius: 10px; - -moz-border-radius-bottomright: 10px; - border-bottom-right-radius: 10px; - -webkit-border-bottom-left-radius: 10px; - -moz-border-radius-bottomleft: 10px; - border-bottom-left-radius: 10px; + -webkit-border-bottom-right-radius: 10px; + -moz-border-radius-bottomright: 10px; + border-bottom-right-radius: 10px; + -webkit-border-bottom-left-radius: 10px; + -moz-border-radius-bottomleft: 10px; + border-bottom-left-radius: 10px; } .k-top-5corners { - -webkit-border-top-right-radius: 5px; - -moz-border-radius-topright: 5px; - border-top-right-radius: 5px; - -webkit-border-top-left-radius: 5px; - -moz-border-radius-topleft: 5px; - border-top-left-radius: 5px; + -webkit-border-top-right-radius: 5px; + -moz-border-radius-topright: 5px; + border-top-right-radius: 5px; + -webkit-border-top-left-radius: 5px; + -moz-border-radius-topleft: 5px; + border-top-left-radius: 5px; } .k-top-10corners { - -webkit-border-top-right-radius: 10px; - -moz-border-radius-topright: 10px; - border-top-right-radius: 10px; - -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; + -webkit-border-top-left-radius: 10px; + -moz-border-radius-topleft: 10px; + border-top-left-radius: 10px; } .k-2corners { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; } .k-3corners { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } .k-5corners { - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; } .k-10corners { - -moz-border-radius: 10px; - -webkit-border-radius: 10px; - border-radius: 10px; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; } .k-dialog-outerp { - background-color: #552200; - border-top: 4px solid #000; - padding: 22px 4px 3px 4px; + background-color: #552200; + border-top: 4px solid #000; + padding: 22px 4px 3px 4px; } .k-dialog-title span { - color: #552200; - font-size: 20px; - font-weight: bold; - margin: 0 0 0 6px; + color: #552200; + font-size: 20px; + font-weight: bold; + margin: 0 0 0 6px; } .k-dialog-innerp { - background-color: #FFFFFF; - border: solid 1px #F2F2F2; - margin: 34px 16px 20px 16px; + background-color: #FFFFFF; + border: solid 1px #F2F2F2; + margin: 34px 16px 20px 16px; } .k-dialog-btn-area { - padding:0 15px 15px 15px; - margin-bottom:30px; + padding: 0 15px 15px 15px; + margin-bottom: 30px; } .k-dialog-btn-area div { - margin: 10px + margin: 10px } .k-dialog-innerp table { - margin: 5px; + margin: 5px; } -.k-dialog-btn { - text-shadow: 1px 1px 1px #FFFFFF; - font-weight: bold; +.k-dialog-btn,.k-btn { + text-shadow: 1px 1px 1px #FFFFFF; + font-weight: bold; + -moz-user-select: none; + -khtml-user-select: none; } .k-dialog-firstBtn { - float: left; + float: left; } .k-dialog-secondBtn { - float: right; + float: right; } .k-z100000 { - z-index: 100000; + z-index: 100000; } .k-z10000 { - z-index: 10000; + z-index: 10000; } .k-z1000 { - z-index: 1000; + z-index: 1000; } .oc-user-msg { - background-color: #FFCC00; - padding: 3px; + background-color: #FFCC00; + padding: 3px; } .oc-user-msg-popup { - padding: 0px; - border: 0px; + padding: 0px; + border: 0px; } .oc-floatleft { - float: left; + float: left; } .oc-floatright { - float: right; + float: right; } .x-toolbar { - background: none !important; - border-color: transparent !important; + background: none !important; + border-color: transparent !important; } .oc-testico { - background-image: url(/common/img/ico.png) !important; - -moz-background-clip: border; - -moz-background-inline-policy: continuous; - -moz-background-origin: padding; - background-attachment: scroll; - background-color: transparent; - background-position: 0 0; - background-repeat: no-repeat; - height: 16px; - widows: 16px; + background-image: url(/common/img/ico.png) !important; + -moz-background-clip: border; + -moz-background-inline-policy: continuous; + -moz-background-origin: padding; + background-attachment: scroll; + background-color: transparent; + background-position: 0 0; + background-repeat: no-repeat; + height: 16px; + widows: 16px; } -.oc-ico-pad { - padding-left: 20px; - white-space: normal; -} - .oc-tb-spacer { - margin: 2px; - width: 2px; + margin: 2px; + width: 2px; } .oc-tb-bottom-line { - border-bottom-color: rgb(208, 208, 208); - border-bottom-style: solid; - border-bottom-width: 1px; + border-bottom-color: rgb(208, 208, 208); + border-bottom-style: solid; + border-bottom-width: 1px; } .oc-blank-toolbar { - background: #FFF none repeat scroll 0% 50%; + background: #FFF none repeat scroll 0% 50%; } .oc-tb-sep { - padding-top: 4px; - padding-left: 5px; + padding-top: 4px; + padding-left: 5px; } .oc-transp .x-panel-body { - background: transparent; + background: transparent; } .oc-menu { - cursor: default; - -moz-user-select: none; - -khtml-user-select: none; - -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); - border: 1 px solid #BBBBBB; + cursor: default; + -moz-user-select: none; + -khtml-user-select: none; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + border: 1 px solid #BBBBBB; + font: 16px 'Ubuntu', arial; + font-weight: bold; + -webkit-border-bottom-right-radius: 5px; + -moz-border-radius-bottomright: 5px; + border-bottom-right-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + -moz-border-radius-bottomleft: 5px; + border-bottom-left-radius: 5px; + background-color: #280b0b; } +.gwt-PopupPanel .oc-menu { + border: 2px solid #552200; + background-color: #280b0b; +} + +.oc-menu .gwt-MenuBar-vertical { + background-color: #280b0b; + border: 2px solid #552200; + padding: 3px; + -webkit-border-bottom-right-radius: 5px; + -moz-border-radius-bottomright: 5px; + border-bottom-right-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + -moz-border-radius-bottomleft: 5px; + border-bottom-left-radius: 5px; + kfilter: alpha(opacity = 90); + -moz-opacity: 0.90; + -khtml-opacity: 0.90; + opacity: 0.90; +} + +.gwt-MenuBar .gwt-MenuItem-selected { + background-color: #c87137 !important; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} + +.gwt-MenuBar .gwt-MenuItem { + padding: 4px 4px 3px !important; +} + .oc-menu .gwt-MenuItem { - cursor: default; - -moz-user-select: none; - -khtml-user-select: none; + cursor: default; + -moz-user-select: none; + -khtml-user-select: none; + /* background-color: #c87137; */ + color: white; } .oc-button { - padding: 2px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - text-decoration: none; - vertical-align: middle; - background-color: #F2F2F2; + padding: 2px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + text-decoration: none; + vertical-align: middle; + background-color: #F2F2F2; + white-space: nowrap; } .oc-button:hover { - border: 2px orange solid; - background: #f0f0f0; - color: #855585; + border: 2px orange solid; + background: #f0f0f0; + color: #855585; } .oc-button:active { - border-top-color: #ffffff; - background: #ffffff; + border-top-color: #ffffff; + background: #ffffff; } #oc-mshortcut { - position: absolute; - right: 10px; + position: absolute; + right: 10px; } #oc-mshortcut-hidden { - visibility: hidden; + visibility: hidden; } #oc-mshortcut a { - text-decoration: none; - color: black; + text-decoration: none; + color: black; } .oc-user-msg { - background-color: #FFCC00; - padding: 3px; + background-color: #FFCC00; + padding: 3px; } .oc-user-msg-popup { - padding: 0px; - border: 0px; + padding: 0px; + border: 0px; } .oc-floatleft { - float: left; + float: left; } .oc-floatright { - float: right; + float: right; } .x-toolbar { - background: none !important; - border-color: transparent !important; + background: none !important; + border-color: transparent !important; } .oc-testico { - background-image: url(/common/img/ico.png) !important; - -moz-background-clip: border; - -moz-background-inline-policy: continuous; - -moz-background-origin: padding; - background-attachment: scroll; - background-color: transparent; - background-position: 0 0; - background-repeat: no-repeat; - height: 16px; - widows: 16px; + background-image: url(/common/img/ico.png) !important; + -moz-background-clip: border; + -moz-background-inline-policy: continuous; + -moz-background-origin: padding; + background-attachment: scroll; + background-color: transparent; + background-position: 0 0; + background-repeat: no-repeat; + height: 16px; + widows: 16px; } -.oc-ico-pad { - padding-left: 20px; - white-space: normal; +.oc-ico-pad { /* padding-right: 20px; */ + white-space: normal; } .oc-tb-spacer { - margin: 2px; - width: 2px; + margin: 2px; + width: 2px; } .oc-tb-bottom-line { - border-bottom-color: rgb(208, 208, 208); - border-bottom-style: solid; - border-bottom-width: 1px; + border-bottom-color: rgb(208, 208, 208); + border-bottom-style: solid; + border-bottom-width: 1px; } .oc-blank-toolbar { - background: #FFF none repeat scroll 0% 50%; + background: #FFF none repeat scroll 0% 50%; } .oc-tb-sep { - padding-top: 4px; - padding-left: 5px; + padding-top: 4px; + padding-left: 5px; } .oc-transp .x-panel-body { - background: transparent; + background: transparent; } -.oc-menu { - cursor: default; - -moz-user-select: none; - -khtml-user-select: none; - -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); - border: 1 px solid #BBBBBB; +#oc-mshortcut { + position: absolute; + right: 10px; } -.oc-menu .gwt-MenuItem { - cursor: default; - -moz-user-select: none; - -khtml-user-select: none; +#oc-mshortcut-hidden { + visibility: hidden; } -.oc-button { - padding: 2px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - text-decoration: none; - vertical-align: middle; - background-color: #F2F2F2; +#oc-mshortcut a { + text-decoration: none; + color: black; } -.oc-button:hover { - border: 2px orange solid; - background: #f0f0f0; - color: #855585; +.k-no-backimage,.k-no-backimage td { + background-image: none; } -.oc-button:active { - border-top-color: #ffffff; - background: #ffffff; +.k-space-nowrap { + white-space: nowrap; } -#oc-mshortcut { - position: absolute; - right: 10px; +.k-iconlabel-text { + vertical-align: top; + padding-left: 3px; } -#oc-mshortcut-hidden { - visibility: hidden; +.k-menuimtem-title { + color: white; + font-size: 15px; + font-style: italic; + padding: 2px 3px 2px 0; } -#oc-mshortcut a { - text-decoration: none; - color: black; -} - -.k-no-backimage,.k-no-backimage td { - background-image: none; +.k-tb-sep { + border-left: 1px solid #B3B3B3; + height: 10px; + margin-top: 4px; } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/Core.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/core/Core.gwt.xml 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/Core.gwt.xml 2011-02-21 04:32:11 UTC (rev 1257) @@ -2,7 +2,7 @@ <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> <module rename-to="ws">  -  <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> @@ -14,7 +14,7 @@ <inherits name="cc.kune.msgs.KuneMsgs" /> <inherits name="cc.kune.common.KuneCommon" /> <inherits name="com.extjs.gxt.ui.GXT" /> - <inherits name="com.jhickman.web.gwt.gxtuibinder.GxtUiBinder" /> + <inherits name="com.calclab.suco.Suco" /> <inherits name='com.gwtplatform.mvp.Mvp' />  Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -185,6 +185,7 @@ bind(SNPendingsMenuItemsRegistry.class).in(Singleton.class); bind(GroupMembersActionsRegistry.class).in(Singleton.class); + bind(SiteUserOptionsPresenter.class).in(Singleton.class); bind(SiteUserOptions.class).to(SiteUserOptionsPresenter.class).in(Singleton.class); bind(SitebarNewGroupLink.class).in(Singleton.class); bind(SitebarSignInLink.class).in(Singleton.class); Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -49,6 +49,9 @@ @Source("arrow-down-green.png") ImageResource arrowDownGreen(); + @Source("arrowdownsitebar.gif") + ImageResource arrowDownSitebar(); + @Source("arrow-down-white.gif") ImageResource arrowDownWhite(); Added: trunk/src/main/java/cc/kune/core/client/resources/arrowdownsitebar.gif =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/arrowdownsitebar.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/client/resources/icons/IconConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/icons/IconConstants.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/resources/icons/IconConstants.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -21,12 +21,15 @@ import com.google.gwt.resources.client.ImageResource; +@Deprecated public final class IconConstants { + @Deprecated public static final String CSS_SUFFIX = "k-icon-"; - public static final String PATH_PREFIX = "images/"; + private static final String PATH_PREFIX = "images/"; + @Deprecated public static String toPath(final ImageResource img) { return PATH_PREFIX + img.getName() + ".png"; } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -32,8 +32,8 @@ import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.sn.actions.GotoGroupAction; -import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.state.Session; import cc.kune.core.client.state.UserSignInEvent; import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; import cc.kune.core.client.state.UserSignOutEvent; @@ -47,12 +47,12 @@ public class SiteUserOptionsPresenter implements SiteUserOptions { - public static final String LOGGED_USER_MENU = "kune-sump-lum"; + public static final MenuDescriptor LOGGED_USER_MENU = new MenuDescriptor(); + public static final String LOGGED_USER_MENU_ID = "kune-sump-lum"; private final Provider<FileDownloadUtils> downloadProvider; private final GotoGroupAction gotoGroupAction; private final I18nTranslationService i18n; private final IconResources img; - private MenuDescriptor menuDescriptor; private SubMenuDescriptor partiMenu; private final Session session; private final SitebarActionsPresenter siteOptions; @@ -71,21 +71,17 @@ this.siteOptions = siteOptions; this.gotoGroupAction = gotoGroupAction; createActions(); - if (session.isLogged()) { - onUserSignIn(session.getCurrentUserInfo()); - } - session.onUserSignIn(new UserSignInHandler() { + session.onUserSignIn(true, new UserSignInHandler() { @Override public void onUserSignIn(final UserSignInEvent event) { SiteUserOptionsPresenter.this.onUserSignIn(event.getUserInfo()); } }); - session.onUserSignOut(new UserSignOutHandler() { - + session.onUserSignOut(true, new UserSignOutHandler() { @Override public void onUserSignOut(final UserSignOutEvent event) { - menuDescriptor.setVisible(false); - menuDescriptor.setEnabled(false); + LOGGED_USER_MENU.setVisible(false); + LOGGED_USER_MENU.setEnabled(false); SiteUserOptionsPresenter.this.setLoggedUserName(""); } }); @@ -97,7 +93,7 @@ } private void addActionImpl(final GuiActionDescrip descriptor) { - descriptor.setParent(menuDescriptor); + descriptor.setParent(LOGGED_USER_MENU); siteOptions.getRightToolbar().addAction(descriptor); } @@ -105,7 +101,7 @@ final String logoImageUrl = group.hasLogo() ? downloadProvider.get().getLogoImageUrl(group.getStateToken()) : "images/group-def-icon.gif"; final MenuItemDescriptor participant = new MenuItemDescriptor(gotoGroupAction); - participant.setItem(group); + participant.setTarget(group); participant.putValue(Action.NAME, group.getLongName()); participant.putValue(Action.SMALL_ICON, logoImageUrl); participant.setParent(partiMenu); @@ -113,10 +109,9 @@ } private void createActions() { - menuDescriptor = new MenuDescriptor(); - menuDescriptor.setId(LOGGED_USER_MENU); - menuDescriptor.setStyles("k-no-backimage, k-btn-sitebar"); - siteOptions.getRightToolbar().addAction(menuDescriptor); + LOGGED_USER_MENU.setId(LOGGED_USER_MENU_ID); + LOGGED_USER_MENU.setStyles("k-no-backimage, k-btn-sitebar"); + siteOptions.getLeftToolbar().addAction(LOGGED_USER_MENU); partiMenu = new SubMenuDescriptor(i18n.t("Your groups")); addActionImpl(partiMenu); @@ -139,8 +134,8 @@ } private void onUserSignIn(final UserInfoDTO userInfoDTO) { - menuDescriptor.setVisible(true); - menuDescriptor.setEnabled(true); + LOGGED_USER_MENU.setVisible(true); + LOGGED_USER_MENU.setEnabled(true); setLoggedUserName(userInfoDTO.getShortName()); partiMenu.clear(); final List<GroupDTO> groupsIsAdmin = userInfoDTO.getGroupsIsAdmin(); @@ -151,11 +146,11 @@ for (final GroupDTO group : groupsIsCollab) { addPartipation(group); } - partiMenu.setVisible(!groupsIsAdmin.isEmpty() || !groupsIsCollab.isEmpty()); + partiMenu.setEnabled((groupsIsAdmin.size() + groupsIsCollab.size()) > 0); } private void setLoggedUserName(final String shortName) { - menuDescriptor.putValue(Action.NAME, shortName); + LOGGED_USER_MENU.putValue(Action.NAME, shortName); } } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -29,6 +29,8 @@ import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuSeparatorDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarDescriptor; +import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; +import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; import cc.kune.common.client.ui.KuneWindowUtils; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.resources.CoreResources; @@ -108,14 +110,12 @@ public void onAppStart(final AppStartEvent event) { final IsActionExtensible right = getView().getRightBar(); OPTIONS_MENU.putValue(Action.NAME, i18n.t("Options")); - // OPTIONS_MENU.putValue(Action.SMALL_ICON, res.arrowDownBlack()); - // OPTIONS_MENU.setParent(RIGHT_TOOLBAR); - OPTIONS_MENU.setStyles("k-no-backimage, k-btn-sitebar"); + OPTIONS_MENU.putValue(Action.SMALL_ICON, res.arrowDownSitebar()); + OPTIONS_MENU.setParent(RIGHT_TOOLBAR); + OPTIONS_MENU.setStyles("k-no-backimage, k-btn-sitebar, k-fl"); OPTIONS_MENU.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl); - // final ToolbarSeparatorDescriptor separator = new - // ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); - // final ToolbarSeparatorDescriptor separator2 = new - // ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); + final ToolbarSeparatorDescriptor separator = new ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); + final ToolbarSeparatorDescriptor separator2 = new ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); final MenuSeparatorDescriptor menuSeparator = new MenuSeparatorDescriptor(OPTIONS_MENU); final AbstractExtendedAction bugsAction = new AbstractExtendedAction() { @@ -151,12 +151,12 @@ // aboutAction.setShortcut(shortcut); // shortcutReg.put(shortcut, aboutAction); - right.addAction(OPTIONS_MENU); right.addAction(signInLink.get()); right.addAction(signOutLink.get()); - // right.addAction(separator2); + right.addAction(separator2); right.addAction(newGroupLink.get()); - // right.addAction(separator); + right.addAction(separator); + right.addAction(OPTIONS_MENU); right.addAction(reportBugs); right.addAction(gotoKuneDevSite); right.addAction(menuSeparator); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -23,8 +23,8 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.core.client.state.StateManager; import cc.kune.core.client.state.SiteCommonTokens; -import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; @@ -52,7 +52,7 @@ @Inject public SitebarNewGroupLink(final SitebarNewGroupAction action) { super(action); - setStyles("k-no-backimage, k-btn-sitebar"); - // setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); + setStyles("k-no-backimage, k-btn-sitebar, k-fl"); + setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); } } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -64,14 +64,15 @@ // setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); setId(SITE_SIGN_IN); setVisible(!session.isLogged()); - setStyles("k-no-backimage, k-btn-sitebar"); - eventBus.addHandler(UserSignInEvent.getType(), new UserSignInHandler() { + setStyles("k-no-backimage, k-btn-sitebar, k-fl"); + setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); + session.onUserSignIn(true, new UserSignInHandler() { @Override public void onUserSignIn(final UserSignInEvent event) { SitebarSignInLink.this.setVisible(false); } }); - eventBus.addHandler(UserSignOutEvent.getType(), new UserSignOutHandler() { + session.onUserSignOut(true, new UserSignOutHandler() { @Override public void onUserSignOut(final UserSignOutEvent event) { SitebarSignInLink.this.setVisible(true); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -116,16 +116,16 @@ final ErrorHandler errorHandler, final Session session) { super(action); setId(SITE_SIGN_OUT); - // setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); + setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); setVisible(session.isLogged()); - setStyles("k-no-backimage, k-btn-sitebar"); - eventBus.addHandler(UserSignInEvent.getType(), new UserSignInHandler() { + setStyles("k-no-backimage, k-btn-sitebar, k-fl"); + session.onUserSignIn(true, new UserSignInHandler() { @Override public void onUserSignIn(final UserSignInEvent event) { SitebarSignOutLink.this.setVisible(true); } }); - eventBus.addHandler(UserSignOutEvent.getType(), new UserSignOutHandler() { + session.onUserSignOut(true, new UserSignOutHandler() { @Override public void onUserSignOut(final UserSignOutEvent event) { SitebarSignOutLink.this.setVisible(false); Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -130,7 +130,7 @@ final GuiActionDescCollection items = new GuiActionDescCollection(); for (final Provider<MenuItemDescriptor> provider : registry) { final MenuItemDescriptor menuItem = provider.get(); - menuItem.setItem(group); + menuItem.setTarget(group); items.add(menuItem); } return items; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -39,7 +39,7 @@ public void actionPerformed(final ActionEvent event) { NotifyUser.showProgressProcessing(); snServiceProvider.get().acceptJoinGroup(session.getUserHash(), session.getCurrentState().getStateToken(), - ((GroupDTO) event.getSource()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { + ((GroupDTO) event.getTarget()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { @Override public void onSuccess(final SocialNetworkDataDTO result) { NotifyUser.hideProgress(); Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -38,7 +38,7 @@ public void actionPerformed(final ActionEvent event) { NotifyUser.showProgressProcessing(); snServiceProvider.get().setCollabAsAdmin(session.getUserHash(), session.getCurrentState().getStateToken(), - ((GroupDTO) event.getSource()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { + ((GroupDTO) event.getTarget()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { @Override public void onSuccess(final SocialNetworkDataDTO result) { NotifyUser.hideProgress(); Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -38,7 +38,7 @@ public void actionPerformed(final ActionEvent event) { NotifyUser.showProgressProcessing(); snServiceProvider.get().setAdminAsCollab(session.getUserHash(), session.getCurrentState().getStateToken(), - ((GroupDTO) event.getSource()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { + ((GroupDTO) event.getTarget()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { @Override public void onSuccess(final SocialNetworkDataDTO result) { NotifyUser.hideProgress(); Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -38,7 +38,7 @@ public void actionPerformed(final ActionEvent event) { NotifyUser.showProgressProcessing(); snServiceProvider.get().denyJoinGroup(session.getUserHash(), session.getCurrentState().getStateToken(), - ((GroupDTO) event.getSource()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { + ((GroupDTO) event.getTarget()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { @Override public void onSuccess(final SocialNetworkDataDTO result) { NotifyUser.hideProgress(); Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -23,7 +23,7 @@ @Override public void actionPerformed(final ActionEvent event) { - stateManager.gotoToken(((GroupDTO) event.getSource()).getStateToken()); + stateManager.gotoToken(((GroupDTO) event.getTarget()).getStateToken()); } } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -38,7 +38,7 @@ public void actionPerformed(final ActionEvent event) { NotifyUser.showProgressProcessing(); snServiceProvider.get().deleteMember(session.getUserHash(), session.getCurrentState().getStateToken(), - ((GroupDTO) event.getSource()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { + ((GroupDTO) event.getTarget()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { @Override public void onSuccess(final SocialNetworkDataDTO result) { NotifyUser.hideProgress(); Deleted: trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithMemberAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithMemberAction.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithMemberAction.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -1,40 +0,0 @@ -package cc.kune.core.client.sn.actions; - -import cc.kune.chat.client.ChatClient; -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.noti.NotifyUser; -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class StartChatWithMemberAction extends AbstractExtendedAction { - private final Provider<ChatClient> chatClient; - - private final I18nTranslationService i18n; - - @Inject - public StartChatWithMemberAction(final I18nTranslationService i18n, final CoreResources res, - final Provider<ChatClient> chatClient) { - this.i18n = i18n; - this.chatClient = chatClient; - putValue(NAME, i18n.t("Start a chat with this member")); - putValue(Action.SMALL_ICON, res.newChat()); - } - - @Override - public void actionPerformed(final ActionEvent event) { - chatClient.get().show(); - if (chatClient.get().isLoggedIn()) { - chatClient.get().chat(XmppURI.jid(((GroupDTO) event.getSource()).getShortName())); - } else { - NotifyUser.important(i18n.t("To start a chat you need to be 'online'")); - } - } - -} Deleted: trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithUserAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithUserAction.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithUserAction.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -1,17 +0,0 @@ -package cc.kune.core.client.sn.actions; - -import cc.kune.chat.client.ChatClient; -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class StartChatWithUserAction extends StartChatWithMemberAction { - @Inject - public StartChatWithUserAction(final I18nTranslationService i18n, final CoreResources res, - final Provider<ChatClient> chatClient) { - super(i18n, res, chatClient); - putValue(NAME, i18n.t("Start a chat with this person")); - } -} Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsGroupCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsGroupCondition.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsGroupCondition.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -16,6 +16,6 @@ @Override public boolean mustBeAdded(final GuiActionDescrip descr) { - return (!((GroupDTO) descr.getItem()).isPersonal()); + return (!((GroupDTO) descr.getTarget()).isPersonal()); } } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsNotMeCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsNotMeCondition.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsNotMeCondition.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -21,6 +21,6 @@ @Override public boolean mustBeAdded(final GuiActionDescrip descr) { return (session.isLogged() && !session.getCurrentUser().getShortName().equals( - ((GroupDTO) descr.getItem()).getShortName())); + ((GroupDTO) descr.getTarget()).getShortName())); } } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsPersonCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsPersonCondition.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsPersonCondition.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -16,6 +16,6 @@ @Override public boolean mustBeAdded(final GuiActionDescrip descr) { - return (((GroupDTO) descr.getItem()).isPersonal()); + return (((GroupDTO) descr.getTarget()).isPersonal()); } } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -3,16 +3,19 @@ import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.core.client.sn.actions.JoinGroupAction; import cc.kune.core.client.sn.actions.UnJoinGroupAction; +import cc.kune.core.client.sn.actions.conditions.IsGroupCondition; import com.google.inject.Inject; public class GroupMembersActionsRegistry extends AbstractSNActionsRegistry { @Inject - public GroupMembersActionsRegistry(final JoinGroupAction joinGroupAction, final UnJoinGroupAction unJoinGroupAction) { + public GroupMembersActionsRegistry(final JoinGroupAction joinGroupAction, final IsGroupCondition isGroupCondition, + final UnJoinGroupAction unJoinGroupAction) { final ButtonDescriptor join = new ButtonDescriptor(joinGroupAction); final ButtonDescriptor unjoin = new ButtonDescriptor(unJoinGroupAction); // join.setStyles("k-no-backimage"); // unjoin.setStyles("k-no-backimage"); + // join.add(isGroupCondition); add(join); add(unjoin); } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -8,7 +8,6 @@ import cc.kune.core.client.sn.actions.GotoGroupAction; import cc.kune.core.client.sn.actions.GotoMemberAction; import cc.kune.core.client.sn.actions.RemoveMemberAction; -import cc.kune.core.client.sn.actions.StartChatWithMemberAction; import cc.kune.core.client.sn.actions.conditions.IsAdministrableCondition; import cc.kune.core.client.sn.actions.conditions.IsGroupCondition; import cc.kune.core.client.sn.actions.conditions.IsNotMeCondition; @@ -26,13 +25,13 @@ final IsNotMeCondition isNotMe, final ChangeToCollabAction changeToCollabAction, final ChangeToAdminAction changeToAdminAction, final RemoveMemberAction removeMemberAction, final AcceptJoinGroupAction acceptJoinGroupAction, final DenyJoinGroupAction denyJoinGroupAction, - final StartChatWithMemberAction startChatWithUserAction, final GotoGroupAction gotoGroupAction, - final GotoMemberAction gotoMemberAction) { + final GotoGroupAction gotoGroupAction, final GotoMemberAction gotoMemberAction) { add(new Provider<MenuItemDescriptor>() { @Override public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(changeToCollabAction); item.add(isAdministrableCondition); + item.add(isNotMe); return item; } }); @@ -41,6 +40,7 @@ public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(removeMemberAction); item.add(isAdministrableCondition); + item.add(isNotMe); return item; } }); @@ -60,15 +60,6 @@ return item; } }); - add(new Provider<MenuItemDescriptor>() { - @Override - public MenuItemDescriptor get() { - final MenuItemDescriptor item = new MenuItemDescriptor(startChatWithUserAction); - item.add(isNotMe); - item.add(isPersonCondition); - return item; - } - }); } } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -8,7 +8,6 @@ import cc.kune.core.client.sn.actions.GotoGroupAction; import cc.kune.core.client.sn.actions.GotoMemberAction; import cc.kune.core.client.sn.actions.RemoveMemberAction; -import cc.kune.core.client.sn.actions.StartChatWithMemberAction; import cc.kune.core.client.sn.actions.conditions.IsAdministrableCondition; import cc.kune.core.client.sn.actions.conditions.IsGroupCondition; import cc.kune.core.client.sn.actions.conditions.IsNotMeCondition; @@ -26,8 +25,7 @@ final IsNotMeCondition isNotMe, final ChangeToCollabAction changeToCollabAction, final ChangeToAdminAction changeToAdminAction, final RemoveMemberAction removeMemberAction, final AcceptJoinGroupAction acceptJoinGroupAction, final DenyJoinGroupAction denyJoinGroupAction, - final StartChatWithMemberAction startChatWithUserAction, final GotoGroupAction gotoGroupAction, - final GotoMemberAction gotoMemberAction) { + final GotoGroupAction gotoGroupAction, final GotoMemberAction gotoMemberAction) { add(new Provider<MenuItemDescriptor>() { @Override public MenuItemDescriptor get() { @@ -60,15 +58,7 @@ return item; } }); - add(new Provider<MenuItemDescriptor>() { - @Override - public MenuItemDescriptor get() { - final MenuItemDescriptor item = new MenuItemDescriptor(startChatWithUserAction); - item.add(isNotMe); - item.add(isPersonCondition); - return item; - } - }); + } } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -8,7 +8,6 @@ import cc.kune.core.client.sn.actions.GotoGroupAction; import cc.kune.core.client.sn.actions.GotoPersonAction; import cc.kune.core.client.sn.actions.RemoveMemberAction; -import cc.kune.core.client.sn.actions.StartChatWithUserAction; import cc.kune.core.client.sn.actions.conditions.IsAdministrableCondition; import cc.kune.core.client.sn.actions.conditions.IsGroupCondition; import cc.kune.core.client.sn.actions.conditions.IsPersonCondition; @@ -24,8 +23,8 @@ final IsPersonCondition isPersonCondition, final IsGroupCondition isGroupCondition, final ChangeToCollabAction changeToCollabAction, final ChangeToAdminAction changeToAdminAction, final RemoveMemberAction removeMemberAction, final AcceptJoinGroupAction acceptJoinGroupAction, - final DenyJoinGroupAction denyJoinGroupAction, final StartChatWithUserAction startChatWithUserAction, - final GotoGroupAction gotoGroupAction, final GotoPersonAction gotoPersonAction) { + final DenyJoinGroupAction denyJoinGroupAction, final GotoGroupAction gotoGroupAction, + final GotoPersonAction gotoPersonAction) { add(new Provider<MenuItemDescriptor>() { @Override public MenuItemDescriptor get() { @@ -58,14 +57,6 @@ return item; } }); - add(new Provider<MenuItemDescriptor>() { - @Override - public MenuItemDescriptor get() { - final MenuItemDescriptor item = new MenuItemDescriptor(startChatWithUserAction); - item.add(isPersonCondition); - return item; - } - }); } } Modified: trunk/src/main/java/cc/kune/core/client/state/Session.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/Session.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/state/Session.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -66,7 +66,7 @@ */ int SESSION_DURATION = 1000 * 60 * 60 * 24 * 14; - String USERHASH = "userHash"; + String USERHASH = "k007userHash"; void check(AsyncCallbackSimple<Void> callback); @@ -141,16 +141,28 @@ @Deprecated void onInitDataReceived(Listener<InitDataDTO> listener); + /** + * @param fireNow + * if @true the handler is fired after added if the user is + * loggedin + * @param handler + */ + void onUserSignIn(boolean fireNow, UserSignInEvent.UserSignInHandler handler); + @Deprecated void onUserSignIn(Listener<UserInfoDTO> listener); - void onUserSignIn(UserSignInEvent.UserSignInHandler handler); + /** + * @param fireNow + * if @true the handler is fired after added if the user is + * loggedin + * @param handler + */ + void onUserSignOut(boolean fireNow, UserSignOutEvent.UserSignOutHandler handler); @Deprecated void onUserSignOut(Listener0 listener); - void onUserSignOut(UserSignOutEvent.UserSignOutHandler handler); - void setCurrentLanguage(final I18nLanguageDTO currentLanguage); void setCurrentState(final StateAbstractDTO currentState); 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-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -302,13 +302,24 @@ } @Override + public void onUserSignIn(final boolean fireNow, final UserSignInHandler handler) { + eventBus.addHandler(UserSignInEvent.getType(), handler); + if (fireNow && isLogged() && currentUserInfo != null) { + handler.onUserSignIn(new UserSignInEvent(currentUserInfo)); + } + } + + @Override public void onUserSignIn(final Listener<UserInfoDTO> listener) { throw new NotImplementedException(); } @Override - public void onUserSignIn(final UserSignInHandler handler) { - eventBus.addHandler(UserSignInEvent.getType(), handler); + public void onUserSignOut(final boolean fireNow, final UserSignOutHandler handler) { + eventBus.addHandler(UserSignOutEvent.getType(), handler); + if (fireNow && isNotLogged()) { + handler.onUserSignOut(new UserSignOutEvent()); + } } @Override @@ -317,11 +328,6 @@ } @Override - public void onUserSignOut(final UserSignOutHandler handler) { - eventBus.addHandler(UserSignOutEvent.getType(), handler); - } - - @Override public void setCurrentLanguage(final I18nLanguageDTO currentLanguage) { this.currentLanguage = currentLanguage; } 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-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -68,7 +68,7 @@ this.resumedToken = null; siteTokens = new HashMap<String, HistoryTokenCallback>(); beforeStateChangeCollection = new BeforeActionCollection(); - eventBus.addHandler(UserSignInEvent.getType(), new UserSignInEvent.UserSignInHandler() { + session.onUserSignIn(true, new UserSignInEvent.UserSignInHandler() { @Override public void onUserSignIn(final UserSignInEvent event) { if (previousToken == null) { @@ -79,7 +79,7 @@ } } }); - eventBus.addHandler(UserSignOutEvent.getType(), new UserSignOutEvent.UserSignOutHandler() { + session.onUserSignOut(true, new UserSignOutEvent.UserSignOutHandler() { @Override public void onUserSignOut(final UserSignOutEvent event) { reload(); Modified: trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicensePanel.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicensePanel.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -72,8 +72,11 @@ }); licenseImage.addStyleName("k-footer-license-img"); licenseLabel.addStyleName("k-footer-license-label"); + licenseLabel.setVisible(false); armor.getEntityFooter().add(licenseBar); labelElement = licenseLabel.getElement(); + labelElement.getStyle().setOpacity(0); + licenseLabel.setVisible(true); } @Override @@ -92,9 +95,11 @@ } private void fade() { - final Fade fade = new Fade(labelElement); - fade.setDuration(.5); - fade.play(); + if ("1".equals(labelElement.getStyle().getOpacity())) { + final Fade fade = new Fade(labelElement); + fade.setDuration(.5); + fade.play(); + } } @Override Added: trunk/src/main/java/cc/kune/core/public/images/clear.gif =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/clear.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/public/images/clear.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/clear.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-21 04:32:11 UTC (rev 1257) @@ -370,18 +370,29 @@ margin-top: 2px; } -.x-btn button { - font: 18px/27px 'Ubuntu', arial; +.x-btn button,button { /* font: 18px/27px 'Ubuntu', arial; */ + } -.k-btn-sitebar,.k-btn-sitebar button { +.k-btn-sitebar span,.k-btn-sitebar button span,.k-sitebar button span { + text-decoration: underline; +} + +.k-btn-sitebar,.k-btn-sitebar button,.k-sitebar button { font: 13px 'Ubuntu', arial; color: #B3B3B3; cursor: pointer; - text-decoration: underline; white-space: nowrap; + background: none; + border: 0px; + padding: 0 3px 0 0 !important; } +.k-sitebar button:hover { + border: 0px; + background: none; +} + .k-btn-sitebar button { margin-top: -5px; } @@ -800,7 +811,7 @@ white-space: nowrap; } */ -.k-sn-mainpanel .x-btn button { +.k-sn-mainpanel .x-btn button,.k-sn-mainpanel button { font: 13px 'Ubuntu', arial; border: 2px solid #CCCCCC; cursor: pointer; @@ -815,6 +826,7 @@ vertical-align: middle; line-height: 2em !important; height: 26px !important; + font-weight: bold; /* font-size:small; cursor: pointer; @@ -822,13 +834,13 @@ padding-left: 25px !important; */ } -.k-sn-mainpanel .x-btn button:hover { +.k-sn-mainpanel .x-btn button:hover,.k-sn-mainpanel button:hover { border: 2px orange solid; background: #f0f0f0; color: #855585; } -.k-sn-mainpanel .x-btn button:active { +.k-sn-mainpanel .x-btn button:active,.k-sn-mainpanel button:active { border-top-color: #ffffff; background: #ffffff; } @@ -923,6 +935,7 @@ font-size: 16px; color: #784421; } + .k-footer-license-label-title { margin-right: 5px; color: #280b0b; Modified: trunk/src/main/java/cc/kune/core/public/ws.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.html 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/core/public/ws.html 2011-02-21 04:32:11 UTC (rev 1257) @@ -8,13 +8,13 @@ <meta name="emite.httpBase" content="/http-bind/" /> <meta name="emite.host" content="localhost" /> <meta name="emite.searchHost" content="search.localhost" /> -<meta name="emite.session" content="login" /> + <meta name="hablar.roomService" content="rooms.localhost" /> <meta name="hablar.login" content="false" /> <meta name="hablar.hasVCard" content="false" /> <meta name="hablar.search" content="false" /> <meta name="hablar.hasCopyToClipboard" content="false" /> -<meta name="hablar.hasLogger" content="true" /> + <meta name="hablar.hasSignals" content="false" /> <meta name="hablar.roster" content="true" /> <meta name="hablar.dockRoster" content="left" /> @@ -22,7 +22,7 @@ <meta name="hablar.layout" content="tabs" /> <meta name="hablar.inline" content="vertical_dock_div" /> <meta name="hablar.width" content="550px" /> -<meta name="hablar.height" content="300px" /> +<meta name="hablar.height" content="400px" /> <link rel="shortcut icon" href="favicon.ico" /> <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.8.0r4/build/reset/reset-min.css"> 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-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-02-21 04:32:11 UTC (rev 1257) @@ -145,8 +145,8 @@ .entityToolsNorth span { color: #a05a2c; - font-size: 20px; - font-weight: bold; + /* font-size: 20px; + font-weight: bold; */ } .entityToolsCenter { Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -98,8 +98,8 @@ @Override public void setContentGotoPublicUrl(final String publicUrl) { - frame.setUrl("about:blank"); - // frame.setUrl(publicUrl); + // frame.setUrl("about:blank"); + frame.setUrl(publicUrl); } } Modified: trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml 2011-02-21 04:32:11 UTC (rev 1257) @@ -7,8 +7,6 @@ <inherits name='com.google.gwt.user.User' /> <inherits name="com.google.gwt.event.EventBase" /> -  - <inherits name='com.glines.socketio.client.Client' /> <inherits name='com.google.gwt.json.JSON' /> <inherits name='com.google.gwt.websockets.WebSockets' /> Modified: trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java 2011-02-18 01:00:51 UTC (rev 1256) +++ trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java 2011-02-21 04:32:11 UTC (rev 1257) @@ -25,17 +25,14 @@ @Inject public WaveClientTester(final WsArmor wsarmor, final Session session) { this.wsarmor = wsarmor; - if (session.isLogged()) { - doLogin(session.getCurrentUserInfo().getChatName(), session.getCurrentUserInfo().getChatPassword()); - } - session.onUserSignIn(new UserSignInHandler() { + session.onUserSignIn(true, new UserSignInHandler() { @Override public void onUserSignIn(final UserSignInEvent event) { doLogin(event.getUserInfo().getChatName(), event.getUserInfo().getChatPassword()); } }); - session.onUserSignOut(new UserSignOutHandler() { + session.onUserSignOut(true, new UserSignOutHandler() { @Override public void onUserSignOut(final UserSignOutEvent event) { // TODO Auto-generated method stub

1 0