X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=demo%2Fplugins%2Forg.argeo.demo.i18n%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fdemo%2Fi18n%2Feditors%2FMultiSectionPage.java;h=7e12e85b81a0e368b397ac12c8c1c0f23cbd6bd6;hb=00c6354fa0f7e6c70d1938ce0bb671d83d12d3b6;hp=1804b1d4ee2c8e9c30e1dd7559749c739fdc1e2a;hpb=d7c1552f4c28dc4acc25fb6214fb70d4fe67389d;p=lgpl%2Fargeo-commons.git

diff --git a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/editors/MultiSectionPage.java b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/editors/MultiSectionPage.java
index 1804b1d4e..7e12e85b8 100644
--- a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/editors/MultiSectionPage.java
+++ b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/editors/MultiSectionPage.java
@@ -1,12 +1,15 @@
 package org.argeo.demo.i18n.editors;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.demo.i18n.I18nDemoMessages;
+import org.argeo.demo.i18n.I18nDemoPlugin;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.AbstractFormPart;
 import org.eclipse.ui.forms.IManagedForm;
@@ -16,7 +19,6 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.forms.widgets.Section;
 import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
 
 /**
  * Offers two main sections : one to display a text area with a summary of all
@@ -24,7 +26,7 @@ import org.eclipse.ui.forms.widgets.TableWrapLayout;
  * enable browsing
  * */
 public class MultiSectionPage extends FormPage {
-	private final static Log log = LogFactory.getLog(MultiSectionPage.class);
+	// private final static Log log = LogFactory.getLog(MultiSectionPage.class);
 
 	// this page UI components
 	private FormToolkit tk;
@@ -41,15 +43,15 @@ public class MultiSectionPage extends FormPage {
 		Composite body = form.getBody();
 		body.setLayout(twt);
 
-		createHistorySection(form.getBody());
-		createTreeSection(form.getBody());
+		createDetailsSection(form.getBody());
+		createDescriptionSection(form.getBody());
 	}
 
-	protected void createTreeSection(Composite parent) {
+	protected void createDescriptionSection(Composite parent) {
 		// Section Layout & MetaData
 		Section section = tk.createSection(parent, Section.TWISTIE);
 		section.setLayoutData(new GridData(GridData.FILL_BOTH));
-		section.setText(I18nDemoMessages.get().MultiSelectionPage_DescriptionSectionTitle);
+		section.setText(I18nDemoMessages.get().MultiSectionPage_DescriptionSectionTitle);
 
 		// Section Body
 		Composite body = tk.createComposite(section, SWT.FILL);
@@ -60,26 +62,56 @@ public class MultiSectionPage extends FormPage {
 
 		body.setLayoutData(new GridData(GridData.FILL_BOTH));
 		section.setExpanded(true);
+
+		// button line
+		Button b1 = new Button(body, SWT.PUSH | SWT.FILL);
+		b1.setText(I18nDemoMessages.get().MultiSectionPage_Btn1Lbl);
+		Button b2 = new Button(body, SWT.PUSH | SWT.FILL);
+		b2.setText(I18nDemoMessages.get().MultiSectionPage_Btn2Lbl);
+		Button b3 = new Button(body, SWT.PUSH | SWT.FILL);
+		b3.setText(I18nDemoMessages.get().MultiSectionPage_Btn3Lbl);
+
+		addAListener(b1);
+		addAListener(b2);
+		addAListener(b3);
+	}
+
+	private void addAListener(Button b) {
+		b.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				MessageBox mb = new MessageBox(I18nDemoPlugin.getDefault()
+						.getWorkbench().getActiveWorkbenchWindow().getShell(),
+						SWT.OK);
+				// Title
+				mb.setText(I18nDemoMessages.get().MultiSectionPage_PopupTitle);
+				// Message
+				mb.setMessage(I18nDemoMessages.get().MultiSectionPage_PopupText);
+				mb.open();
+			}
+		});
 	}
 
-	protected void createHistorySection(Composite parent) {
+	protected void createDetailsSection(Composite parent) {
 
 		// Section Layout
 		Section section = tk.createSection(parent, Section.TWISTIE);
 		section.setLayoutData(new GridData(TableWrapData.FILL_GRAB));
-		TableWrapLayout twt = new TableWrapLayout();
-		section.setLayout(twt);
+		GridLayout gd = new GridLayout();
+		section.setLayout(gd);
 
 		// Set title of the section
-		section.setText(I18nDemoMessages.get().MultiSelectionPage_DetailsSectionTitle);
+		section.setText(I18nDemoMessages.get().MultiSectionPage_DetailsSectionTitle);
 
 		final Text styledText = tk.createText(section, "", SWT.FULL_SELECTION
-				| SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
+				| SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
 		styledText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		section.setClient(styledText);
 		styledText.setEditable(false);
+		styledText
+				.setText(I18nDemoMessages.get().MultiSectionPage_DescriptionSectionTxt);
 		section.setExpanded(false);
 
+		section.setClient(styledText);
+
 		AbstractFormPart part = new AbstractFormPart() {
 			public void commit(boolean onSave) {
 			}