issue #693 always allow to invite users after opening create session dialog
Former-commit-id:179f2d7ffe
[formerly9f2d97fa68
] [formerlyb78d86bf04
[formerly 204c35530bbe8c7e39749d70331ceb93c4d4a790]] Former-commit-id:b78d86bf04
Former-commit-id:03ee9d8a90
This commit is contained in:
parent
945b47e29e
commit
4b5af450d1
2 changed files with 40 additions and 45 deletions
|
@ -1064,7 +1064,7 @@ public class CollaborationGroupView extends CaveFloatingView implements
|
||||||
}
|
}
|
||||||
|
|
||||||
CreateSessionDialog dialog = new CreateSessionDialog(Display
|
CreateSessionDialog dialog = new CreateSessionDialog(Display
|
||||||
.getCurrent().getActiveShell(), getSelectedUsers().size() > 0);
|
.getCurrent().getActiveShell());
|
||||||
dialog.open();
|
dialog.open();
|
||||||
|
|
||||||
CreateSessionData result = (CreateSessionData) dialog.getReturnValue();
|
CreateSessionData result = (CreateSessionData) dialog.getReturnValue();
|
||||||
|
|
|
@ -76,15 +76,12 @@ public class CreateSessionDialog extends CaveSWTDialog {
|
||||||
|
|
||||||
private Button inviteUsers;
|
private Button inviteUsers;
|
||||||
|
|
||||||
private boolean showInvite;
|
|
||||||
|
|
||||||
private StyledText inviteMessageTF;
|
private StyledText inviteMessageTF;
|
||||||
|
|
||||||
private Label inviteLabel;
|
private Label inviteLabel;
|
||||||
|
|
||||||
public CreateSessionDialog(Shell parentShell, boolean showInvite) {
|
public CreateSessionDialog(Shell parentShell) {
|
||||||
super(parentShell);
|
super(parentShell);
|
||||||
this.showInvite = showInvite;
|
|
||||||
setText("Create Session");
|
setText("Create Session");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -122,49 +119,47 @@ public class CreateSessionDialog extends CaveSWTDialog {
|
||||||
sharedSessionDisplay.setLayoutData(gd);
|
sharedSessionDisplay.setLayoutData(gd);
|
||||||
sharedSessionDisplay.setText("Create Shared Display Session");
|
sharedSessionDisplay.setText("Create Shared Display Session");
|
||||||
|
|
||||||
if (showInvite) {
|
inviteUsers = new Button(body, SWT.CHECK);
|
||||||
inviteUsers = new Button(body, SWT.CHECK);
|
inviteUsers.setSelection(true);
|
||||||
inviteUsers.setSelection(true);
|
gd = new GridData(SWT.DEFAULT, SWT.DEFAULT, false, false);
|
||||||
gd = new GridData(SWT.DEFAULT, SWT.DEFAULT, false, false);
|
gd.horizontalSpan = 2;
|
||||||
gd.horizontalSpan = 2;
|
inviteUsers.setLayoutData(gd);
|
||||||
inviteUsers.setLayoutData(gd);
|
inviteUsers.setText("Invite Selected Users");
|
||||||
inviteUsers.setText("Invite Selected Users");
|
// inviteUsers.setSelection(true);
|
||||||
// inviteUsers.setSelection(true);
|
inviteUsers.setVisible(true);
|
||||||
inviteUsers.setVisible(true);
|
// label = new Label(body, SWT.NONE);
|
||||||
// label = new Label(body, SWT.NONE);
|
// label.setText("");
|
||||||
// label.setText("");
|
// label.setVisible(showInvite);
|
||||||
// label.setVisible(showInvite);
|
inviteLabel = new Label(body, SWT.NONE);
|
||||||
inviteLabel = new Label(body, SWT.NONE);
|
inviteLabel.setText("Message: ");
|
||||||
inviteLabel.setText("Message: ");
|
inviteLabel.setToolTipText("Message to send to invited users");
|
||||||
inviteLabel.setToolTipText("Message to send to invited users");
|
inviteMessageTF = new StyledText(body, SWT.BORDER | SWT.MULTI
|
||||||
inviteMessageTF = new StyledText(body, SWT.BORDER | SWT.MULTI
|
| SWT.WRAP | SWT.V_SCROLL);
|
||||||
| SWT.WRAP | SWT.V_SCROLL);
|
inviteMessageTF.setLayoutData(new GridData(GridData.FILL_BOTH));
|
||||||
inviteMessageTF.setLayoutData(new GridData(GridData.FILL_BOTH));
|
inviteMessageTF.pack();
|
||||||
inviteMessageTF.pack();
|
inviteMessageTF.setToolTipText("Message to send to invited users");
|
||||||
inviteMessageTF.setToolTipText("Message to send to invited users");
|
Point p = inviteMessageTF.getSize();
|
||||||
Point p = inviteMessageTF.getSize();
|
gd = (GridData) inviteMessageTF.getLayoutData();
|
||||||
gd = (GridData) inviteMessageTF.getLayoutData();
|
gd.heightHint = p.y * 3;
|
||||||
gd.heightHint = p.y * 3;
|
inviteUsers.addSelectionListener(new SelectionListener() {
|
||||||
inviteUsers.addSelectionListener(new SelectionListener() {
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void widgetSelected(SelectionEvent e) {
|
public void widgetSelected(SelectionEvent e) {
|
||||||
boolean selected = ((Button) e.widget).getSelection();
|
boolean selected = ((Button) e.widget).getSelection();
|
||||||
inviteLabel.setVisible(selected);
|
inviteLabel.setVisible(selected);
|
||||||
inviteMessageTF.setVisible(selected);
|
inviteMessageTF.setVisible(selected);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void widgetDefaultSelected(SelectionEvent e) {
|
public void widgetDefaultSelected(SelectionEvent e) {
|
||||||
boolean selected = ((Button) e.widget).getSelection();
|
boolean selected = ((Button) e.widget).getSelection();
|
||||||
inviteLabel.setVisible(selected);
|
inviteLabel.setVisible(selected);
|
||||||
inviteMessageTF.setVisible(selected);
|
inviteMessageTF.setVisible(selected);
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
inviteLabel.setVisible(true);
|
inviteLabel.setVisible(true);
|
||||||
inviteMessageTF.setVisible(true);
|
inviteMessageTF.setVisible(true);
|
||||||
}
|
|
||||||
return body;
|
return body;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue