[kune-commits] r1084 - in trunk: . src/main/java/org/ourproject/kune/app/client src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed src/main/java/org/ourproject/kune/platf/client/ui/rte/basic src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext

vjrj vjrj at ourproject.org
Mon Mar 23 21:55:53 CET 2009


Author: vjrj
Date: 2009-03-23 21:55:51 +0100 (Mon, 23 Mar 2009)
New Revision: 1084

Modified:
   trunk/pom.xml
   trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialog.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogView.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPanel.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java
Log:
Incomplete - task RTE Create/Edit link improved 


Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-03-23 19:21:30 UTC (rev 1083)
+++ trunk/pom.xml	2009-03-23 20:55:51 UTC (rev 1084)
@@ -397,7 +397,7 @@
       </releases>
       <snapshots>
         <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
+        <updatePolicy>daily</updatePolicy>
         <checksumPolicy>warn</checksumPolicy>
       </snapshots>
     </repository>

Modified: trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java	2009-03-23 19:21:30 UTC (rev 1083)
+++ trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java	2009-03-23 20:55:51 UTC (rev 1084)
@@ -34,8 +34,6 @@
 import com.calclab.emiteuimodule.client.EmiteUIModule;
 import com.calclab.suco.client.Suco;
 import com.google.gwt.core.client.EntryPoint;
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.core.client.GWT.UncaughtExceptionHandler;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DeferredCommand;
 
@@ -46,12 +44,6 @@
 
     public void onModuleLoad() {
         Log.setUncaughtExceptionHandler();
-        GWT.setUncaughtExceptionHandler(new UncaughtExceptionHandler() {
-            public void onUncaughtException(Throwable e) {
-                String message = e.getMessage();
-                Log.error("Caught: " + e.toString() + " " + (message != null ? message : ""), e);
-            }
-        });
 
         // At the moment, in runtime:
         Log.setCurrentLogLevel(Log.LOG_LEVEL_DEBUG);

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialog.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialog.java	2009-03-23 19:21:30 UTC (rev 1083)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialog.java	2009-03-23 20:55:51 UTC (rev 1084)
@@ -30,8 +30,6 @@
 
     void addTab(View view);
 
-    void insertTab(int index, View view);
-
     void show();
 
 }

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java	2009-03-23 19:21:30 UTC (rev 1083)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java	2009-03-23 20:55:51 UTC (rev 1084)
@@ -587,8 +587,8 @@
         img.setToolTip(i18n.t("Insert Image"));
         img.setAddCondition(canBeExtended);
 
-        ActionToolbarButtonDescriptor<Object> createLink = new ActionToolbarButtonDescriptor<Object>(accessRol, sndbar,
-                new Listener0() {
+        ActionToolbarButtonDescriptor<Object> createOrEditLink = new ActionToolbarButtonDescriptor<Object>(accessRol,
+                sndbar, new Listener0() {
                     public void onEvent() {
                         deferred.addCommand(new Listener0() {
                             public void onEvent() {
@@ -610,10 +610,10 @@
                         });
                     }
                 });
-        createLink.setIconCls(getCssName(imgResources.link()));
-        createLink.setToolTip(i18n.t("Create Link"));
-        createLink.setShortcut(new ShortcutDescriptor(true, 'K'));
-        createLink.setAddCondition(canBeExtended);
+        createOrEditLink.setIconCls(getCssName(imgResources.link()));
+        createOrEditLink.setToolTip(i18n.t("Create or Edit Link"));
+        createOrEditLink.setShortcut(new ShortcutDescriptor(true, 'K'));
+        createOrEditLink.setAddCondition(canBeExtended);
 
         ActionToolbarButtonDescriptor<Object> removeLink = new ActionToolbarButtonDescriptor<Object>(accessRol, sndbar,
                 new Listener0() {
@@ -784,7 +784,7 @@
         actions.add(withNoItem(removeFormatBtn));
         actions.add(withNoItem(hrButton));
         actions.add(withNoItem(img));
-        actions.add(withNoItem(createLink));
+        actions.add(withNoItem(createOrEditLink));
         actions.add(withNoItem(removeLink));
         actions.add(withNoItem(insertTableBtn));
         actions.add(withNoItem(insertTable));
@@ -794,7 +794,7 @@
         actions.add(withNoItem(hr));
         actions.add(withNoItem(undoBtn));
         actions.add(withNoItem(redoBtn));
-        actions.add(withNoItem(devInfo));
+        // actions.add(withNoItem(devInfo));
 
         for (String fontName : this.fontNames) {
             ActionToolbarMenuDescriptor<Object> fontNameAction = createFontNameAction(canBeBasic, fontName);

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogView.java	2009-03-23 19:21:30 UTC (rev 1083)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogView.java	2009-03-23 20:55:51 UTC (rev 1084)
@@ -24,6 +24,6 @@
 
 public interface InsertLinkDialogView extends AbstractTabbedDialogView, View {
 
-    int HEIGHT = 320;
+    int HEIGHT = 350;
 
 }

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPanel.java	2009-03-23 19:21:30 UTC (rev 1083)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPanel.java	2009-03-23 20:55:51 UTC (rev 1084)
@@ -12,6 +12,7 @@
 import com.gwtext.client.widgets.Component;
 import com.gwtext.client.widgets.Panel;
 import com.gwtext.client.widgets.form.Checkbox;
+import com.gwtext.client.widgets.form.FieldSet;
 import com.gwtext.client.widgets.form.TextField;
 import com.gwtext.client.widgets.form.event.FormPanelListenerAdapter;
 
@@ -83,10 +84,16 @@
             }
         });
 
+        FieldSet advanced = new FieldSet(Resources.i18n.t("More options"));
+        advanced.setCollapsible(true);
+        advanced.setCollapsed(true);
+        advanced.setAutoHeight(true);
+
+        advanced.add(onOverField);
+        advanced.add(sameWindow);
         add(hrefField);
         add(textField);
-        add(onOverField);
-        add(sameWindow);
+        add(advanced);
     }
 
     public String getHref() {

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java	2009-03-23 19:21:30 UTC (rev 1083)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java	2009-03-23 20:55:51 UTC (rev 1084)
@@ -34,7 +34,6 @@
     public void init(InsertLinkExtView view) {
         super.init(view);
         this.view = view;
-        // editorInsertDialog.insertTab(0, view);
     }
 
     @Override




More information about the kune-commits mailing list