Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2007-06-19 23:57:36 -0400
committerslewis2007-06-19 23:57:36 -0400
commit09bbecddd9f903929532c73e28a96ba357d7fdd0 (patch)
tree1f943a141d185bdb0d74c1f9714d3a7434deeb52
parent6c6ef2256c84153211548f248e2fc870c899d36a (diff)
downloadorg.eclipse.ecf-09bbecddd9f903929532c73e28a96ba357d7fdd0.tar.gz
org.eclipse.ecf-09bbecddd9f903929532c73e28a96ba357d7fdd0.tar.xz
org.eclipse.ecf-09bbecddd9f903929532c73e28a96ba357d7fdd0.zip
Fix for bug 193415
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/ChatComposite.java60
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/TeamChat.java2
2 files changed, 12 insertions, 50 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/ChatComposite.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/ChatComposite.java
index fa193c6bf..685de62a7 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/ChatComposite.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/ChatComposite.java
@@ -59,6 +59,7 @@ import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.events.DisposeEvent;
@@ -82,7 +83,6 @@ import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
@@ -155,7 +155,7 @@ public class ChatComposite extends Composite {
super(parent, SWT.NONE);
this.view = view;
this.chatWindow = chatWindow;
-
+ setLayout(new FillLayout());
meColor = colorFromRGBString(ClientPlugin.getDefault()
.getPluginPreferences().getString(
ClientPlugin.PREF_ME_TEXT_COLOR));
@@ -185,11 +185,12 @@ public class ChatComposite extends Composite {
}
});
+ SashForm sf = new SashForm(this,SWT.NORMAL);
+ sf.setLayout(new FillLayout());
+ sf.setOrientation(SWT.VERTICAL);
tableView = table;
- setLayout(new GridLayout(1, true));
-
- SourceViewer result = new SourceViewer(this, null, null, true,
+ SourceViewer result = new SourceViewer(sf, null, null, true,
SWT.BORDER | SWT.WRAP | SWT.V_SCROLL | SWT.MULTI | SWT.H_SCROLL
| SWT.READ_ONLY);
result.configure(new TextSourceViewerConfiguration(EditorsUI
@@ -197,7 +198,7 @@ public class ChatComposite extends Composite {
result.setDocument(new Document());
textoutput = result.getTextWidget();
- textoutput.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ textoutput.setLayoutData(new GridData(SWT.FILL));
String fontName = ClientPlugin.getDefault().getPluginPreferences()
.getString(ClientPlugin.PREF_CHAT_FONT);
if (!(fontName == null) && !(fontName.equals(""))) {
@@ -213,10 +214,9 @@ public class ChatComposite extends Composite {
textoutput.append(initText);
- textinput = new Text(this, SWT.SINGLE | SWT.BORDER);
+ textinput = new Text(sf, SWT.SINGLE | SWT.BORDER);
textinput.setText(TEXT_INPUT_INIT);
- textinput.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true,
- false));
+ textinput.setLayoutData(new GridData(SWT.FILL));
textinput.selectAll();
textinput.addKeyListener(new KeyListener() {
@@ -263,6 +263,8 @@ public class ChatComposite extends Composite {
}
}
});
+
+ sf.setWeights(new int[] { 90, 10});
// make actions
makeActions();
hookContextMenu();
@@ -874,14 +876,6 @@ public class ChatComposite extends Composite {
ISharedImages.IMG_OBJ_FILE));
// XXX disabled
sendFileToGroup.setEnabled(false);
- /*
- * sendFileToGroupAndLaunch = new Action() { public void run() {
- * sendFileToGroup(true); } };
- * sendFileToGroupAndLaunch.setText(MessageLoader
- * .getString("LineChatClientView.contextmenu.sendfileandlaunch"));
- * sendFileToGroupAndLaunch.setImageDescriptor(PlatformUI.getWorkbench()
- * .getSharedImages().getImageDescriptor( ISharedImages.IMG_OBJ_FILE));
- */
coBrowseURL = new Action() {
public void run() {
sendCoBrowseToUser(null);
@@ -900,7 +894,6 @@ public class ChatComposite extends Composite {
appShare = new Action() {
public void run() {
- sendAppShare(null);
}
};
appShare.setText(MessageLoader
@@ -1253,37 +1246,6 @@ public class ChatComposite extends Composite {
}
- protected void sendAppShare(ID receiver) {
- if (this.view.lch == null)
- return;
- /*
- * try { if (LineChatView.appShareActive()) {
- * Display.getDefault().asyncExec(new Runnable() { public void run() {
- * MessageDialog.openInformation(null,
- * MessageLoader.getString("LineChatClientView.contextmenu.appshare.activetitle"),
- * MessageLoader.getString("LineChatClientView.contextmenu.appshare.activemessage")); }
- * }); return; } if (MessageDialog.openConfirm(null,
- * MessageLoader.getString("LineChatClientView.contextmenu.appshare.confirmtitle"),
- * MessageLoader.getString("LineChatClientView.contextmenu.appshare.confirmmessage"))) {
- *
- * VNCParams p = new VNCParams();
- * p.setHostname(this.view.userdata.getNickname());
- * p.setGroupname(this.view.name); Object[] args = new Object[] {
- * receiver, p }; HashMap map = new HashMap(); map.put("args",args);
- * map.put("types",LineChatClientView.APPSHAREARGTYPES); ID serverID =
- * this.view.lch.createObject(null,
- * LineChatClientView.APPSHARECLASSNAME, map); EclipseAppShareServer
- * server = (EclipseAppShareServer) this.view.lch.getObject(serverID);
- * if (server != null) { LineChatView.setAppShareID(serverID,server);
- * this.view.setAppShareID(serverID); } } } catch (final Exception e) {
- * Display.getDefault().asyncExec(new Runnable() { public void run() {
- * MessageDialog.openInformation(null,
- * MessageLoader.getString("LineChatClientView.contextmenu.appshare.cancelledtitle"),
- * MessageLoader.getString("LineChatClientView.contextmenu.appshare.cancelledmessage"));
- * ClientPlugin.log("Exception starting application share",e); } }); }
- */
- }
-
protected void sendCoBrowseToUser(User user) {
String res = null;
ID userID = null;
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/TeamChat.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/TeamChat.java
index 58ded15ee..03604914d 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/TeamChat.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/TeamChat.java
@@ -36,7 +36,7 @@ class TeamChat extends Composite {
LineChatClientView view;
ChatWindow chatWindow;
- static final int DEFAULT_TREE_WIDGET_PERCENT = 30;
+ static final int DEFAULT_TREE_WIDGET_PERCENT = 10;
TeamChat(LineChatClientView view, Composite parent, int options,
String initText) {

Back to the top