Support for relationship modality

2 files changed, 112 insertions, 36 deletions

diff --git a/translations/dbmodel_en.ts b/translations/dbmodel_en.ts
index cbcffbd..79b14c7 100644
--- a/translations/dbmodel_en.ts
+++ b/translations/dbmodel_en.ts
@@ -1,54 +1,86 @@
 <?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"/>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="176"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/items/database/columnlistmodel.cpp" line="175"/>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="178"/>
         <source>Data Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/items/database/columnlistmodel.cpp" line="177"/>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="180"/>
         <source>Req&apos;d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/items/database/columnlistmodel.cpp" line="179"/>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="182"/>
         <source>PK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/items/database/columnlistmodel.cpp" line="181"/>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="184"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DatabaseRelationshipProperties</name>
+    <name>DatabaseRelationshipForm</name>
     <message>
-        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="42"/>
-        <source>&amp;Relationship</source>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="16"/>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="53"/>
-        <source>Name:</source>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="28"/>
+        <source>Automatic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="55"/>
-        <source>Generated</source>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="37"/>
+        <source>Cardinality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="70"/>
-        <source>Cardinality:</source>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="46"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="53"/>
+        <source>1:N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="60"/>
+        <source>M:N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="82"/>
+        <source>Modality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="91"/>
+        <source>Parent is optional</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="98"/>
+        <source>Child is optional</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseRelationshipProperties</name>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="45"/>
+        <source>&amp;Relationship</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -334,17 +366,17 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="667"/>
+        <location filename="../src/mainwindow.cpp" line="670"/>
         <source>&amp;%1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="724"/>
+        <location filename="../src/mainwindow.cpp" line="727"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="730"/>
+        <location filename="../src/mainwindow.cpp" line="733"/>
         <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;
@@ -354,7 +386,7 @@ Copyright (C) 2008 Lukas Lalinsky
         <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"/>
+        <location filename="../src/mainwindow.cpp" line="742"/>
         <source>Untitled</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/dbmodel_sk.ts b/translations/dbmodel_sk.ts
index 92e69c6..ac126a2 100644
--- a/translations/dbmodel_sk.ts
+++ b/translations/dbmodel_sk.ts
@@ -1,54 +1,98 @@
 <?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="173"/>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="176"/>
         <source>Name</source>
         <translation>Názov</translation>
     </message>
     <message>
-        <location filename="../src/items/database/columnlistmodel.cpp" line="175"/>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="178"/>
         <source>Data Type</source>
         <translation>Dátový typ</translation>
     </message>
     <message>
-        <location filename="../src/items/database/columnlistmodel.cpp" line="177"/>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="180"/>
         <source>Req&apos;d</source>
         <translation>Požadovaný</translation>
     </message>
     <message>
-        <location filename="../src/items/database/columnlistmodel.cpp" line="179"/>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="182"/>
         <source>PK</source>
         <translation>Primárny kľúč</translation>
     </message>
     <message>
-        <location filename="../src/items/database/columnlistmodel.cpp" line="181"/>
+        <location filename="../src/items/database/columnlistmodel.cpp" line="184"/>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
 </context>
 <context>
+    <name>DatabaseRelationshipForm</name>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="16"/>
+        <source>Name:</source>
+        <translation>Názov:</translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="28"/>
+        <source>Automatic</source>
+        <translation>Automatické</translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="37"/>
+        <source>Cardinality:</source>
+        <translation>Kardinalita:</translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="46"/>
+        <source>1:1</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="53"/>
+        <source>1:N</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="60"/>
+        <source>M:N</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="82"/>
+        <source>Modality:</source>
+        <translation>Modalita:</translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="91"/>
+        <source>Parent is optional</source>
+        <translation>Rodič je nepovinný</translation>
+    </message>
+    <message>
+        <location filename="../src/items/database/databaserelationshipproperties.ui" line="98"/>
+        <source>Child is optional</source>
+        <translation>Potomok je nepovinný</translation>
+    </message>
+</context>
+<context>
     <name>DatabaseRelationshipProperties</name>
     <message>
-        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="42"/>
+        <location filename="../src/items/database/databaserelationshipproperties.cpp" line="45"/>
         <source>&amp;Relationship</source>
         <translation>&amp;Vzťah</translation>
     </message>
     <message>
         <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>
+        <translation type="obsolete">Názov:</translation>
     </message>
     <message>
         <location filename="../src/items/database/databaserelationshipproperties.cpp" line="70"/>
         <source>Cardinality:</source>
-        <translation>Kardinalita:</translation>
+        <translation type="obsolete">Kardinalita:</translation>
     </message>
 </context>
 <context>
@@ -284,7 +328,7 @@ 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="667"/>
+        <location filename="../src/mainwindow.cpp" line="670"/>
         <source>&amp;%1. %2</source>
         <translation></translation>
     </message>
@@ -299,7 +343,7 @@ Do you want to save your changes?</source>
         <translation>&amp;Pomocník</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="724"/>
+        <location filename="../src/mainwindow.cpp" line="727"/>
         <source>About</source>
         <translation>O aplikácii</translation>
     </message>
@@ -324,7 +368,7 @@ Do you want to save your changes?</source>
         <translation>Zobraziť m&amp;riežku</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="739"/>
+        <location filename="../src/mainwindow.cpp" line="742"/>
         <source>Untitled</source>
         <translation>Nepomenované</translation>
     </message>
@@ -349,7 +393,7 @@ Do you want to save your changes?</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow.cpp" line="730"/>
+        <location filename="../src/mainwindow.cpp" line="733"/>
         <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;