Changeset 23 for trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe

Timestamp:

10/19/09 23:28:05 (15 years ago)

Author:

zeiss

Message:

 

Location:

trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings

Files:

• SettingsComposite.java (modified) (3 diffs)
• SettingsDialog.java (modified) (1 diff)
• SettingsDialog2.java (modified) (2 diffs)
• SettingsHandler.java (modified) (1 diff)
• SettingsProfileComposite.java (added)

trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsComposite.java

@@ -71 +71 @@
                 {
                         Label label = new Label(this, SWT.SEPARATOR | SWT.HORIZONTAL);
-                        label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 2, 1));
-                }
-                new Label(this, SWT.NONE);
+                        label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 3, 1));
+                }
                 {
                         Label lblMysqlHost = new Label(this, SWT.NONE);
@@ -126 +125 @@
                 {
                         Label label = new Label(this, SWT.SEPARATOR | SWT.HORIZONTAL);
-                        label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 2, 1));
-                }
-                new Label(this, SWT.NONE);
+                        label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 3, 1));
+                }
                 {
                         Label lblPdfLatexPath = new Label(this, SWT.NONE);
@@ -144 +142 @@
                 {
                         Label label = new Label(this, SWT.SEPARATOR | SWT.HORIZONTAL);
-                        label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 2, 1));
-                }
-                new Label(this, SWT.NONE);
+                        label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 3, 1));
+                }
                 {
                         Label lblResearchGroup = new Label(this, SWT.NONE);

trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsDialog.java

@@ -53 +53 @@
                 super(parentShell);
                 this.getFileContents();
+                setTitle("Settings");
         }
 

trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsDialog2.java

@@ -6 +6 @@
 import org.eclipse.swt.graphics.Point;
 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.Shell;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
 
 public class SettingsDialog2 extends TitleAreaDialog {
@@ -21 +22 @@
                 setTitle("Settings");
                 Composite area = (Composite) super.createDialogArea(parent);
-                Composite container = new Composite(area, SWT.NONE);
-                container.setLayout(new GridLayout(1, false));
                 {
-                        GridData gridData = new GridData(GridData.FILL_BOTH);
-                        gridData.grabExcessVerticalSpace = false;
-                        container.setLayoutData(gridData);
-                }
-                {
-                        Composite composite = new SettingsComposite(container, SWT.NONE);
-                        composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+                        TabFolder tabFolder = new TabFolder(area, SWT.NONE);
+                        tabFolder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+                        {
+                                TabItem tbtmSettings = new TabItem(tabFolder, SWT.NONE);
+                                tbtmSettings.setText("Settings");
+                                {
+                                        Composite composite = new SettingsComposite(tabFolder, SWT.NONE);
+                                        tbtmSettings.setControl(composite);
+                                }
+                        }
+                        {
+                                TabItem tbtmProfiledSettings = new TabItem(tabFolder, SWT.NONE);
+                                tbtmProfiledSettings.setText("Profiled Settings");
+                                {
+                                        Composite composite = new SettingsProfileComposite(tabFolder, SWT.NONE);
+                                        tbtmProfiledSettings.setControl(composite);
+                                }
+                        }
                 }
 

trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsHandler.java

@@ -13 +13 @@
                 IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event);
                 SettingsDialog dialog = new SettingsDialog(window.getShell());
-                dialog.setTitle("Settings");
+//              SettingsDialog2 dialog = new SettingsDialog2(window.getShell());
                 dialog.open();
                 return null;