Index: /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsComposite.java
===================================================================
--- /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsComposite.java	(revision 22)
+++ /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsComposite.java	(revision 23)
@@ -71,7 +71,6 @@
 		{
 			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,7 +125,6 @@
 		{
 			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,7 +142,6 @@
 		{
 			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);
Index: /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsDialog.java
===================================================================
--- /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsDialog.java	(revision 22)
+++ /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsDialog.java	(revision 23)
@@ -53,4 +53,5 @@
 		super(parentShell);
 		this.getFileContents();
+		setTitle("Settings");
 	}
 
Index: /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsDialog2.java
===================================================================
--- /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsDialog2.java	(revision 22)
+++ /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsDialog2.java	(revision 23)
@@ -6,8 +6,9 @@
 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,14 +22,23 @@
 		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);
+				}
+			}
 		}
 
Index: /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsHandler.java
===================================================================
--- /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsHandler.java	(revision 22)
+++ /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsHandler.java	(revision 23)
@@ -13,5 +13,5 @@
 		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event);
 		SettingsDialog dialog = new SettingsDialog(window.getShell());
-		dialog.setTitle("Settings");
+//		SettingsDialog2 dialog = new SettingsDialog2(window.getShell());
 		dialog.open();
 		return null;
Index: /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsProfileComposite.java
===================================================================
--- /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsProfileComposite.java	(revision 23)
+++ /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsProfileComposite.java	(revision 23)
@@ -0,0 +1,180 @@
+package de.ugoe.cs.swe.exercises.settings;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Button;
+
+public class SettingsProfileComposite extends Composite {
+	private Text svnWorkingCopyText;
+	private Text svnUsernameText;
+	private Text svnPasswordText;
+	private Text mysqlUsernameText;
+	private Text mysqlPasswordText;
+	private Text pdfLatexText;
+	private Text profileText;
+
+	public SettingsProfileComposite(Composite parent, int style) {
+		super(parent, SWT.NONE);
+		setLayout(new GridLayout(3, false));
+		{
+			Label lblProfileFile = new Label(this, SWT.NONE);
+			lblProfileFile.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+			lblProfileFile.setText("Profile File");
+		}
+		{
+			profileText = new Text(this, SWT.BORDER);
+			profileText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+		}
+		{
+			Button btnBrowseProfile = new Button(this, SWT.NONE);
+			btnBrowseProfile.setText("Browse");
+		}
+		{
+			Label label = new Label(this, SWT.SEPARATOR | SWT.HORIZONTAL);
+			label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 3, 1));
+		}
+		{
+			Label lblSvnWorkingCopy = new Label(this, SWT.NONE);
+			lblSvnWorkingCopy.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+			lblSvnWorkingCopy.setText("SVN Working Copy");
+		}
+		{
+			svnWorkingCopyText = new Text(this, SWT.BORDER);
+			svnWorkingCopyText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+		}
+		{
+			Button btnBrowseSVNWorkingCopy = new Button(this, SWT.NONE);
+			btnBrowseSVNWorkingCopy.setText("Browse");
+		}
+		{
+			Label lblSvnUsername = new Label(this, SWT.NONE);
+			lblSvnUsername.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+			lblSvnUsername.setText("SVN Username");
+		}
+		{
+			svnUsernameText = new Text(this, SWT.BORDER);
+			svnUsernameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+		}
+		new Label(this, SWT.NONE);
+		{
+			Label lblSvnPassword = new Label(this, SWT.NONE);
+			lblSvnPassword.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+			lblSvnPassword.setText("SVN Password");
+		}
+		{
+			svnPasswordText = new Text(this, SWT.BORDER | SWT.PASSWORD);
+			svnPasswordText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+		}
+		new Label(this, SWT.NONE);
+		{
+			Label label = new Label(this, SWT.SEPARATOR | SWT.HORIZONTAL);
+			label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 3, 1));
+		}
+		{
+			Label lblMysqlUsername = new Label(this, SWT.NONE);
+			lblMysqlUsername.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+			lblMysqlUsername.setText("MySQL Username");
+		}
+		{
+			mysqlUsernameText = new Text(this, SWT.BORDER);
+			mysqlUsernameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+		}
+		new Label(this, SWT.NONE);
+		{
+			Label lblMysqlPassword = new Label(this, SWT.NONE);
+			lblMysqlPassword.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+			lblMysqlPassword.setText("MySQL Password");
+		}
+		{
+			mysqlPasswordText = new Text(this, SWT.BORDER);
+			mysqlPasswordText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+		}
+		new Label(this, SWT.NONE);
+		{
+			Label lblMysqlSsl = new Label(this, SWT.NONE);
+			lblMysqlSsl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+			lblMysqlSsl.setText("MySQL SSL");
+		}
+		{
+			Combo mysqlSSLCombo = new Combo(this, SWT.NONE);
+			mysqlSSLCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+		}
+		new Label(this, SWT.NONE);
+		{
+			Label label = new Label(this, SWT.SEPARATOR | SWT.HORIZONTAL);
+			label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 3, 1));
+		}
+		{
+			Label lblPdfLatexPath = new Label(this, SWT.NONE);
+			lblPdfLatexPath.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+			lblPdfLatexPath.setText("pdfLatex Path");
+		}
+		{
+			pdfLatexText = new Text(this, SWT.BORDER);
+			pdfLatexText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+		}
+		{
+			Button btnBrowsePdfLatex = new Button(this, SWT.NONE);
+			btnBrowsePdfLatex.setText("Browse");
+		}
+
+	}
+
+	@Override
+	protected void checkSubclass() {
+	}
+
+	public Text getSvnWorkingCopyText() {
+		return svnWorkingCopyText;
+	}
+
+	public void setSvnWorkingCopyText(Text svnWorkingCopyText) {
+		this.svnWorkingCopyText = svnWorkingCopyText;
+	}
+
+	public Text getSvnUsernameText() {
+		return svnUsernameText;
+	}
+
+	public void setSvnUsernameText(Text svnUsernameText) {
+		this.svnUsernameText = svnUsernameText;
+	}
+
+	public Text getSvnPasswordText() {
+		return svnPasswordText;
+	}
+
+	public void setSvnPasswordText(Text svnPasswordText) {
+		this.svnPasswordText = svnPasswordText;
+	}
+
+	public Text getMysqlUsernameText() {
+		return mysqlUsernameText;
+	}
+
+	public void setMysqlUsernameText(Text mysqlUsernameText) {
+		this.mysqlUsernameText = mysqlUsernameText;
+	}
+
+	public Text getMysqlPasswordText() {
+		return mysqlPasswordText;
+	}
+
+	public void setMysqlPasswordText(Text mysqlPasswordText) {
+		this.mysqlPasswordText = mysqlPasswordText;
+	}
+
+	public Text getPdfLatexText() {
+		return pdfLatexText;
+	}
+
+	public void setPdfLatexText(Text pdfLatexText) {
+		this.pdfLatexText = pdfLatexText;
+	}
+
+}