Make diagram notation configurable

9 files changed, 563 insertions, 97 deletions

diff --git a/src/diagramdocument.cpp b/src/diagramdocument.cpp
index 9df8b75..ced24bc 100644
--- a/src/diagramdocument.cpp
+++ b/src/diagramdocument.cpp
@@ -37,12 +37,14 @@ public:
 		gridSize(10),
 		gridVisible(true),
 		gridPen(QColor(185, 185, 185), 0),
-		printing(false)
+		printing(false),
+		notation(Relational)
 		{}
 	int gridSize;
 	bool gridVisible;
 	QPen gridPen;
 	bool printing;
+	Notation notation;
 };
 
 DiagramDocument::DiagramDocument(QObject *parent)
@@ -51,6 +53,24 @@ DiagramDocument::DiagramDocument(QObject *parent)
 	m_undoStack = new QUndoStack(this);
 }
 
+DiagramDocument::Notation
+DiagramDocument::notation() const
+{
+	return d->notation;
+}
+
+void
+DiagramDocument::setNotation(Notation notation)
+{
+	if (d->notation != notation) {
+		d->notation = notation;
+		// FIXME
+		foreach (DatabaseRelationship *connection, itemsByType<DatabaseRelationship>())
+			connection->updateLayout();
+		update();
+	}
+}
+
 int
 DiagramDocument::gridSize() const
 {
@@ -284,6 +304,8 @@ DiagramDocument::save(const QString &fileName)
 	root.setAttribute("xmlns", "http://oxygene.sk/ns/diagram/1/");
 	doc.appendChild(root);
 
+	appendEnumElement(doc, root, "notation", d->notation, this, "Notation");
+
 	QDomElement itemList = doc.createElement("item-list");
 	root.appendChild(itemList);
 
@@ -322,6 +344,9 @@ DiagramDocument::load(const QString &fileName)
 	}
 	setFileName(fileName);
 	QDomElement root = doc.firstChildElement("diagram");
+
+	d->notation = readEnumElement(root, "notation", Relational, this, "Notation");
+
 	QDomElement itemListElement = root.firstChildElement("item-list");
 	QDomElement itemElement = itemListElement.firstChildElement("item");
 	while (!itemElement.isNull()) {
diff --git a/src/diagramdocument.h b/src/diagramdocument.h
index ffb38ac..47d1294 100644
--- a/src/diagramdocument.h
+++ b/src/diagramdocument.h
@@ -34,9 +34,11 @@ class DiagramObject;
 class DiagramDocument : public QGraphicsScene
 {
 	Q_OBJECT
+	Q_ENUMS(Notation)
 	Q_PROPERTY(int gridSize READ gridSize WRITE setGridSize)
 	Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
 	Q_PROPERTY(QColor gridColor READ gridColor WRITE setGridColor)
+	Q_PROPERTY(Notation notation READ notation WRITE setNotation)
 
 public:
 	DiagramDocument(QObject *parent = 0);
@@ -47,6 +49,17 @@ public:
 		AddRelation
 	};
 
+	enum Notation {
+		Relational,
+		CrowsFoot
+	};
+
+	//! Returns the notation used in the diagram
+	Notation notation() const;
+
+	//! Sets the notation used in the diagram
+	void setNotation(Notation);
+
 	Mode mode();
 	void setMode(Mode mode);
 
diff --git a/src/items/database/databaserelationship.cpp b/src/items/database/databaserelationship.cpp
index d908409..6efe07b 100644
--- a/src/items/database/databaserelationship.cpp
+++ b/src/items/database/databaserelationship.cpp
@@ -329,17 +329,17 @@ DatabaseRelationship::updateLayout()
 
 	Q_ASSERT(haveLine);
 
-	// "Relational"
-	if (1) {
-		d->fillEnds = true;
-		d->targetEnd = d->arrowHeadPath();
-		d->sourceEnd = QPainterPath();
-	}
-	// "Crow's Foot"
-	else {
-		d->fillEnds = false;
-		d->targetEnd = d->crowsFootPath(d->cardinality);
-		d->sourceEnd = d->crowsFootPath(isRequired() ? One : ZeroOrOne);
+	switch (document()->notation()) {
+		case DiagramDocument::Relational:
+			d->fillEnds = true;
+			d->targetEnd = d->arrowHeadPath();
+			d->sourceEnd = QPainterPath();
+			break;
+		case DiagramDocument::CrowsFoot:
+			d->fillEnds = false;
+			d->targetEnd = d->crowsFootPath(d->cardinality);
+			d->sourceEnd = d->crowsFootPath(isRequired() ? One : ZeroOrOne);
+			break;
 	}
 
 	if (!d->sourceEnd.isEmpty()) {
diff --git a/src/items/database/databaserelationship.h b/src/items/database/databaserelationship.h
index d8762cf..9b5f0af 100644
--- a/src/items/database/databaserelationship.h
+++ b/src/items/database/databaserelationship.h
@@ -90,7 +90,7 @@ public:
 
 	static DiagramItemProperties *createPropertiesEditor(QWidget *parent = 0);
 
-protected slots:
+public slots:
 	void updateLayout();
 
 protected:
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 80cae48..5edff05 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -51,6 +51,9 @@ public:
 	QDockWidget *itemPropsDock;
 	QStackedWidget *propertyEditorsStack;
 	QMap<QString, int> propertyEditorsIndexes;
+
+	QActionGroup *notationActionGroup;
+	QMenu *notationMenu;
 };
 
 MainWindow::MainWindow()
@@ -277,6 +280,19 @@ MainWindow::setupActions()
 	m_actionShowGrid->setText(tr("Show &Grid"));
 	m_actionShowGrid->setCheckable(true);
 	connect(m_actionShowGrid, SIGNAL(triggered(bool)), SLOT(showGrid(bool)));
+	
+	d->notationMenu = new QMenu(tr("&Notation"), this);
+	d->notationActionGroup = new QActionGroup(this);
+	QAction *action;
+	action = d->notationActionGroup->addAction(tr("&Relational"));
+	action->setCheckable(true);
+	action->setData(DiagramDocument::Relational);
+	d->notationMenu->addAction(action);
+	action = d->notationActionGroup->addAction(tr("&Crow's Foot"));
+	action->setCheckable(true);
+	action->setData(DiagramDocument::CrowsFoot);
+	d->notationMenu->addAction(action);
+	connect(d->notationActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(setDiagramNotation(QAction*)));
 }
 
 void
@@ -370,6 +386,10 @@ MainWindow::setupMenuBar()
 	viewMenu->addSeparator();
 	viewMenu->addAction(m_actionShowGrid);
 
+	QMenu *diagramMenu = menuBar()->addMenu(tr("&Diagram"));
+	diagramMenu->addMenu(d->notationMenu);
+	diagramMenu->addSeparator();
+
 	menu = menuBar()->addMenu(tr("&Help"));
 	menu->addAction(m_actionAbout);
 }
@@ -510,6 +530,13 @@ MainWindow::newModel(DiagramDocument *newModel)
 
 	m_actionShowGrid->setChecked(m_model->isGridVisible());
 
+	foreach (QAction *action, d->notationActionGroup->actions()) {
+		if (action->data() == m_model->notation()) {
+			action->setChecked(true);
+			break;
+		}
+	}
+
 	QUndoStack *undoStack = m_model->undoStack();
 	connect(undoStack, SIGNAL(cleanChanged(bool)), this, SLOT(updateWindowTitle()));
 	connect(undoStack, SIGNAL(canUndoChanged(bool)), m_actionUndo, SLOT(setEnabled(bool)));
@@ -698,7 +725,7 @@ MainWindow::about()
 		"<p>\n"
 		"<b>Database Modeller</b><br />\n"
 		"<a href=\"http://oxygene.sk/lukas/dbmodel/\">http://oxygene.sk/lukas/dbmodel/</a><br />\n"
-		"Copyright (C) 2008 Lukáš Lalinský\n"
+		"Copyright (C) 2008 Lukas Lalinsky\n"
 		"</p>\n"
 		));
 }
@@ -720,3 +747,10 @@ MainWindow::updateWindowTitle()
 		setWindowTitle(qApp->applicationName());
 	}
 }
+
+void
+MainWindow::setDiagramNotation(QAction *action)
+{
+	m_model->undoStack()->push(
+		new SetObjectPropertyCommand(m_model, "notation", action->data()));
+}
diff --git a/src/mainwindow.h b/src/mainwindow.h
index eab0868..9cac7ce 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -41,6 +41,7 @@ public slots:
 	void switchModeSelect();
 	void switchModeAddTable();
 	void switchModeAddRelation();
+	void setDiagramNotation(QAction *action);
 
 	void updateSelection();
 	void deleteSelectedItems();
diff --git a/src/src.pri b/src/src.pri
index 592b49c..889f073 100644
--- a/src/src.pri
+++ b/src/src.pri
@@ -27,4 +27,5 @@ HEADERS = \
 	commands.h
 
 TRANSLATIONS = \
+	../translations/dbmodel_en.ts \
 	../translations/dbmodel_sk.ts
diff --git a/translations/dbmodel_en.ts b/translations/dbmodel_en.ts
new file mode 100644
index 0000000..cbcffbd
--- /dev/null
+++ b/translations/dbmodel_en.ts
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1" language="en">
+<defaultcodec></defaultcodec>
+<context>
+    <name>ColumnListModel</name>
+    <message>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="173"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="175"/>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="177"/>
+        <source>Req&apos;d</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="179"/>
+        <source>PK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="181"/>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseRelationshipProperties</name>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="42"/>
+        <source>&amp;Relationship</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="53"/>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="55"/>
+        <source>Generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="70"/>
+        <source>Cardinality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseTableProperties</name>
+    <message>
+        <location filename="../src/items/database/databasetableproperties.cpp" line="45"/>
+        <source>&amp;Table</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databasetableproperties.cpp" line="46"/>
+        <source>&amp;Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databasetableproperties.cpp" line="63"/>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databasetableproperties.cpp" line="83"/>
+        <source>&amp;Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databasetableproperties.cpp" line="84"/>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databasetableproperties.cpp" line="85"/>
+        <source>Move &amp;Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databasetableproperties.cpp" line="86"/>
+        <source>Move &amp;Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="149"/>
+        <source>&amp;Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="174"/>
+        <source>&amp;New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="177"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="181"/>
+        <source>&amp;Open...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="183"/>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="187"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="189"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="194"/>
+        <source>Save &amp;As...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="203"/>
+        <source>Export...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="213"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="219"/>
+        <source>Add new table</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="224"/>
+        <source>Add new relation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="228"/>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="229"/>
+        <source>Ctrl+Z</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="231"/>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="232"/>
+        <source>Ctrl+Shift+Z</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="240"/>
+        <source>Cu&amp;t</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="242"/>
+        <source>Ctrl+X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="246"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="248"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="252"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="254"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="258"/>
+        <source>&amp;Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="260"/>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="264"/>
+        <source>&amp;About...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="268"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="270"/>
+        <source>Ctrl+W</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="274"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="276"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="280"/>
+        <source>Show &amp;Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="284"/>
+        <source>&amp;Notation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="287"/>
+        <source>&amp;Relational</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="291"/>
+        <source>&amp;Crow&apos;s Foot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="357"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="323"/>
+        <source>&amp;Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="332"/>
+        <source>50%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="332"/>
+        <source>70%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="332"/>
+        <source>85%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="332"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="332"/>
+        <source>125%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="332"/>
+        <source>150%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="384"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="374"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="389"/>
+        <source>&amp;Diagram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="393"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="426"/>
+        <source>The document has been modified.
+Do you want to save your changes?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="500"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="500"/>
+        <source>Unknown format.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="667"/>
+        <source>&amp;%1. %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="724"/>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="730"/>
+        <source>&lt;p&gt;
+&lt;b&gt;Database Modeller&lt;/b&gt;&lt;br /&gt;
+&lt;a href=&quot;http://oxygene.sk/lukas/dbmodel/&quot;&gt;http://oxygene.sk/lukas/dbmodel/&lt;/a&gt;&lt;br /&gt;
+Copyright (C) 2008 Lukas Lalinsky
+&lt;/p&gt;
+</source>
+        <translation>&lt;p&gt;&lt;b&gt;Database Modeller&lt;/b&gt;&lt;br /&gt;&lt;a href=&quot;http://oxygene.sk/lukas/dbmodel/&quot;&gt;http://oxygene.sk/lukas/dbmodel/&lt;/a&gt;&lt;br /&gt;Copyright (C) 2008 Lukáš Lalinský&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="739"/>
+        <source>Untitled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/translations/dbmodel_sk.ts b/translations/dbmodel_sk.ts
index 2617dbd..92e69c6 100644
--- a/translations/dbmodel_sk.ts
+++ b/translations/dbmodel_sk.ts
@@ -1,30 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="sk">
-<defaultcodec></defaultcodec>
 <context>
     <name>ColumnListModel</name>
     <message>
-        <location filename="../src/items/database/columnlistmodel.cpp" line="161"/>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="173"/>
         <source>Name</source>
         <translation>Názov</translation>
     </message>
     <message>
-        <location filename="../src/items/database/columnlistmodel.cpp" line="163"/>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="175"/>
         <source>Data Type</source>
         <translation>Dátový typ</translation>
     </message>
     <message>
-        <location filename="../src/items/database/columnlistmodel.cpp" line="165"/>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="177"/>
         <source>Req&apos;d</source>
         <translation>Požadovaný</translation>
     </message>
     <message>
-        <location filename="../src/items/database/columnlistmodel.cpp" line="167"/>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="179"/>
         <source>PK</source>
         <translation>Primárny kľúč</translation>
     </message>
     <message>
-        <location filename="../src/items/database/columnlistmodel.cpp" line="169"/>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="181"/>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
@@ -32,50 +31,60 @@
 <context>
     <name>DatabaseRelationshipProperties</name>
     <message>
-        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="34"/>
+        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="42"/>
         <source>&amp;Relationship</source>
         <translation>&amp;Vzťah</translation>
     </message>
     <message>
-        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="44"/>
+        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="53"/>
         <source>Name:</source>
         <translation>Názov:</translation>
     </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="55"/>
+        <source>Generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="70"/>
+        <source>Cardinality:</source>
+        <translation>Kardinalita:</translation>
+    </message>
 </context>
 <context>
     <name>DatabaseTableProperties</name>
     <message>
-        <location filename="../src/items/database/databasetableproperties.cpp" line="44"/>
+        <location filename="../src/items/database/databasetableproperties.cpp" line="45"/>
         <source>&amp;Table</source>
         <translation>&amp;Tabuľka</translation>
     </message>
     <message>
-        <location filename="../src/items/database/databasetableproperties.cpp" line="45"/>
+        <location filename="../src/items/database/databasetableproperties.cpp" line="46"/>
         <source>&amp;Columns</source>
         <translation>Stĺ&amp;ce</translation>
     </message>
     <message>
-        <location filename="../src/items/database/databasetableproperties.cpp" line="62"/>
+        <location filename="../src/items/database/databasetableproperties.cpp" line="63"/>
         <source>Name:</source>
         <translation>Názov:</translation>
     </message>
     <message>
-        <location filename="../src/items/database/databasetableproperties.cpp" line="80"/>
+        <location filename="../src/items/database/databasetableproperties.cpp" line="85"/>
         <source>Move &amp;Up</source>
         <translation>Posunúť &amp;hore</translation>
     </message>
     <message>
-        <location filename="../src/items/database/databasetableproperties.cpp" line="81"/>
+        <location filename="../src/items/database/databasetableproperties.cpp" line="86"/>
         <source>Move &amp;Down</source>
         <translation>Posunúť &amp;dole</translation>
     </message>
     <message>
-        <location filename="../src/items/database/databasetableproperties.cpp" line="78"/>
+        <location filename="../src/items/database/databasetableproperties.cpp" line="83"/>
         <source>&amp;Add</source>
         <translation>Prid&amp;ať</translation>
     </message>
     <message>
-        <location filename="../src/items/database/databasetableproperties.cpp" line="79"/>
+        <location filename="../src/items/database/databasetableproperties.cpp" line="84"/>
         <source>&amp;Remove</source>
         <translation>Odst&amp;rániť</translation>
     </message>
@@ -83,309 +92,330 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/mainwindow.cpp" line="176"/>
+        <location filename="../src/mainwindow.cpp" line="174"/>
         <source>&amp;New</source>
         <translation>&amp;Nový</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="179"/>
+        <location filename="../src/mainwindow.cpp" line="177"/>
         <source>Ctrl+N</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="183"/>
+        <location filename="../src/mainwindow.cpp" line="181"/>
         <source>&amp;Open...</source>
         <translation>&amp;Otvoriť...
 </translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="185"/>
+        <location filename="../src/mainwindow.cpp" line="183"/>
         <source>Ctrl+O</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="189"/>
+        <location filename="../src/mainwindow.cpp" line="187"/>
         <source>&amp;Save</source>
         <translation>&amp;Uložiť</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="191"/>
+        <location filename="../src/mainwindow.cpp" line="189"/>
         <source>Ctrl+S</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="196"/>
+        <location filename="../src/mainwindow.cpp" line="194"/>
         <source>Save &amp;As...</source>
         <translation>Uložiť &amp;ako...</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="205"/>
+        <location filename="../src/mainwindow.cpp" line="203"/>
         <source>Export...</source>
         <translation>Exportovať...</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="215"/>
+        <location filename="../src/mainwindow.cpp" line="213"/>
         <source>Select</source>
         <translation>Výber</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="221"/>
+        <location filename="../src/mainwindow.cpp" line="219"/>
         <source>Add new table</source>
         <translation>Pridať novú tabuľku</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="226"/>
+        <location filename="../src/mainwindow.cpp" line="224"/>
         <source>Add new relation</source>
         <translation>Pridať nový vzťah</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="230"/>
+        <location filename="../src/mainwindow.cpp" line="228"/>
         <source>&amp;Undo</source>
         <translation>Vrátit &amp;späť</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="231"/>
+        <location filename="../src/mainwindow.cpp" line="229"/>
         <source>Ctrl+Z</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="233"/>
+        <location filename="../src/mainwindow.cpp" line="231"/>
         <source>Re&amp;do</source>
         <translation>&amp;Opakovať vrátené</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="234"/>
+        <location filename="../src/mainwindow.cpp" line="232"/>
         <source>Ctrl+Shift+Z</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="346"/>
+        <location filename="../src/mainwindow.cpp" line="357"/>
         <source>&amp;File</source>
         <translation>&amp;Súbor</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="312"/>
+        <location filename="../src/mainwindow.cpp" line="323"/>
         <source>&amp;Mode</source>
         <translation>&amp;Mód</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="321"/>
+        <location filename="../src/mainwindow.cpp" line="332"/>
         <source>50%</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="321"/>
+        <location filename="../src/mainwindow.cpp" line="332"/>
         <source>70%</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="321"/>
+        <location filename="../src/mainwindow.cpp" line="332"/>
         <source>85%</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="321"/>
+        <location filename="../src/mainwindow.cpp" line="332"/>
         <source>100%</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="321"/>
+        <location filename="../src/mainwindow.cpp" line="332"/>
         <source>125%</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="321"/>
+        <location filename="../src/mainwindow.cpp" line="332"/>
         <source>150%</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="276"/>
+        <location filename="../src/mainwindow.cpp" line="274"/>
         <source>&amp;Quit</source>
         <translation>&amp;Koniec</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="278"/>
+        <location filename="../src/mainwindow.cpp" line="276"/>
         <source>Ctrl+Q</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="260"/>
+        <location filename="../src/mainwindow.cpp" line="258"/>
         <source>&amp;Delete</source>
         <translation>&amp;Odstrániť</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="262"/>
+        <location filename="../src/mainwindow.cpp" line="260"/>
         <source>Del</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="485"/>
+        <location filename="../src/mainwindow.cpp" line="500"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="485"/>
+        <location filename="../src/mainwindow.cpp" line="500"/>
         <source>Unknown format.</source>
         <translation>Neznámy formát.</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="363"/>
+        <location filename="../src/mainwindow.cpp" line="374"/>
         <source>&amp;Edit</source>
         <translation>&amp;Upraviť</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="242"/>
+        <location filename="../src/mainwindow.cpp" line="240"/>
         <source>Cu&amp;t</source>
         <translation>Vystri&amp;hnúť</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="244"/>
+        <location filename="../src/mainwindow.cpp" line="242"/>
         <source>Ctrl+X</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="248"/>
+        <location filename="../src/mainwindow.cpp" line="246"/>
         <source>&amp;Copy</source>
         <translation>&amp;Kopírovať</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="250"/>
+        <location filename="../src/mainwindow.cpp" line="248"/>
         <source>Ctrl+C</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="254"/>
+        <location filename="../src/mainwindow.cpp" line="252"/>
         <source>&amp;Paste</source>
         <translation>&amp;Vložiť</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="256"/>
+        <location filename="../src/mainwindow.cpp" line="254"/>
         <source>Ctrl+V</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="373"/>
+        <location filename="../src/mainwindow.cpp" line="384"/>
         <source>&amp;View</source>
         <translation>&amp;Zobraziť</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="411"/>
+        <location filename="../src/mainwindow.cpp" line="426"/>
         <source>The document has been modified.
 Do you want to save your changes?</source>
         <translation>Dokument bol zmenený. Chcete uložiť Vaše zmeny?</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="627"/>
+        <location filename="../src/mainwindow.cpp" line="667"/>
         <source>&amp;%1. %2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="266"/>
+        <location filename="../src/mainwindow.cpp" line="264"/>
         <source>&amp;About...</source>
         <translation>&amp;O aplikácii...</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="378"/>
+        <location filename="../src/mainwindow.cpp" line="393"/>
         <source>&amp;Help</source>
         <translation>&amp;Pomocník</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="680"/>
+        <location filename="../src/mainwindow.cpp" line="724"/>
         <source>About</source>
         <translation>O aplikácii</translation>
     </message>
-    <message encoding="UTF-8">
-        <location filename="../src/mainwindow.cpp" line="686"/>
-        <source>&lt;p&gt;
-&lt;b&gt;Database Modeller&lt;/b&gt;&lt;br /&gt;
-&lt;a href=&quot;http://oxygene.sk/lukas/dbmodel/&quot;&gt;http://oxygene.sk/lukas/dbmodel/&lt;/a&gt;&lt;br /&gt;
-Copyright (C) 2008 Lukáš Lalinský
-&lt;/p&gt;
-</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="152"/>
+        <location filename="../src/mainwindow.cpp" line="149"/>
         <source>&amp;Properties</source>
         <translation>&amp;Vlastnosti</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="270"/>
+        <location filename="../src/mainwindow.cpp" line="268"/>
         <source>&amp;Close</source>
         <translation>Za&amp;vrieť</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="272"/>
+        <location filename="../src/mainwindow.cpp" line="270"/>
         <source>Ctrl+W</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="282"/>
+        <location filename="../src/mainwindow.cpp" line="280"/>
         <source>Show &amp;Grid</source>
         <translation>Zobraziť m&amp;riežku</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="695"/>
+        <location filename="../src/mainwindow.cpp" line="739"/>
         <source>Untitled</source>
         <translation>Nepomenované</translation>
     </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="284"/>
+        <source>&amp;Notation</source>
+        <translation>&amp;Notácia</translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="287"/>
+        <source>&amp;Relational</source>
+        <translation>&amp;Relačná</translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="291"/>
+        <source>&amp;Crow&apos;s Foot</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="389"/>
+        <source>&amp;Diagram</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="730"/>
+        <source>&lt;p&gt;
+&lt;b&gt;Database Modeller&lt;/b&gt;&lt;br /&gt;
+&lt;a href=&quot;http://oxygene.sk/lukas/dbmodel/&quot;&gt;http://oxygene.sk/lukas/dbmodel/&lt;/a&gt;&lt;br /&gt;
+Copyright (C) 2008 Lukas Lalinsky
+&lt;/p&gt;
+</source>
+        <translation>&lt;p&gt;&lt;b&gt;Database Modeller&lt;/b&gt;&lt;br /&gt;&lt;a href=&quot;http://oxygene.sk/lukas/dbmodel/&quot;&gt;http://oxygene.sk/lukas/dbmodel/&lt;/a&gt;&lt;br /&gt;Copyright (C) 2008 Lukáš Lalinský&lt;/p&gt;
+</translation>
+    </message>
 </context>
 <context>
     <name>TableProperties</name>
     <message>
         <location filename="../src/items/database/tableproperties.ui" line="23"/>
         <source>&amp;Definition</source>
-        <translation>&amp;Definícia</translation>
+        <translation type="obsolete">&amp;Definícia</translation>
     </message>
     <message>
         <location filename="../src/items/database/tableproperties.ui" line="29"/>
         <source>Name:</source>
-        <translation>Názov:</translation>
+        <translation type="obsolete">Názov:</translation>
     </message>
     <message>
         <location filename="../src/items/database/tableproperties.ui" line="53"/>
         <source>&amp;Columns</source>
-        <translation>Stĺ&amp;ce</translation>
+        <translation type="obsolete">Stĺ&amp;ce</translation>
     </message>
     <message>
         <location filename="../src/items/database/tableproperties.ui" line="72"/>
         <source>Add new column</source>
-        <translation>Pridať nový stĺpec</translation>
+        <translation type="obsolete">Pridať nový stĺpec</translation>
     </message>
     <message>
         <location filename="../src/items/database/tableproperties.ui" line="75"/>
         <source>&amp;Add</source>
-        <translation>Prid&amp;ať</translation>
+        <translation type="obsolete">Prid&amp;ať</translation>
     </message>
     <message>
         <location filename="../src/items/database/tableproperties.ui" line="82"/>
         <source>Remove selected column</source>
-        <translation>Odstrániť vybraný stĺpec</translation>
+        <translation type="obsolete">Odstrániť vybraný stĺpec</translation>
     </message>
     <message>
         <location filename="../src/items/database/tableproperties.ui" line="85"/>
         <source>&amp;Remove</source>
-        <translation>Odst&amp;rániť</translation>
+        <translation type="obsolete">Odst&amp;rániť</translation>
     </message>
     <message>
         <location filename="../src/items/database/tableproperties.ui" line="92"/>
         <source>Move selected column up</source>
-        <translation>Posunúť vybraný stĺpec hore</translation>
+        <translation type="obsolete">Posunúť vybraný stĺpec hore</translation>
     </message>
     <message>
         <location filename="../src/items/database/tableproperties.ui" line="95"/>
         <source>Move &amp;Up</source>
-        <translation>Posunúť &amp;hore</translation>
+        <translation type="obsolete">Posunúť &amp;hore</translation>
     </message>
     <message>
         <location filename="../src/items/database/tableproperties.ui" line="102"/>
         <source>Move selected column down</source>
-        <translation>Posunúť vybraný stĺpec dole</translation>
+        <translation type="obsolete">Posunúť vybraný stĺpec dole</translation>
     </message>
     <message>
         <location filename="../src/items/database/tableproperties.ui" line="105"/>
         <source>Move &amp;Down</source>
-        <translation>Posunúť &amp;dole</translation>
+        <translation type="obsolete">Posunúť &amp;dole</translation>
     </message>
 </context>
 </TS>