--- a/ProjectDjango/Documentation/source/Plugin_Project_Django.ProjectDjango.Project.html Sat Jan 27 11:46:33 2018 +0100
+++ b/ProjectDjango/Documentation/source/Plugin_Project_Django.ProjectDjango.Project.html Sat Mar 24 19:11:39 2018 +0100
@@ -80,7 +80,7 @@
QObject
<h3>Class Attributes</h3>
<table>
-<tr><td>RecentApplicationsKey</td></tr>
+<tr><td>RecentApplicationsKey</td></tr><tr><td>RecentDatabaseNamesKey</td></tr>
</table>
<h3>Class Methods</h3>
<table>
@@ -239,6 +239,9 @@
<td><a href="#Project.__loadRecentApplications">__loadRecentApplications</a></td>
<td>Private method to load the recently used applications list.</td>
</tr><tr>
+<td><a href="#Project.__loadRecentDatabaseNames">__loadRecentDatabaseNames</a></td>
+<td>Private method to load the list of recently used database names.</td>
+</tr><tr>
<td><a href="#Project.__loadRecentTestData">__loadRecentTestData</a></td>
<td>Private method to load the recently used test data lists.</td>
</tr><tr>
@@ -275,15 +278,27 @@
<td><a href="#Project.__saveRecentApplications">__saveRecentApplications</a></td>
<td>Private method to save the list of recently used applications list.</td>
</tr><tr>
+<td><a href="#Project.__saveRecentDatabaseNames">__saveRecentDatabaseNames</a></td>
+<td>Private method to save the list of recently used database names.</td>
+</tr><tr>
<td><a href="#Project.__saveRecentTestData">__saveRecentTestData</a></td>
<td>Private method to save the list of recently used test data.</td>
</tr><tr>
+<td><a href="#Project.__selectDatabaseName">__selectDatabaseName</a></td>
+<td>Private method to select the name of the database to work with.</td>
+</tr><tr>
<td><a href="#Project.__selectSite">__selectSite</a></td>
<td>Private method to select a site to work with.</td>
</tr><tr>
+<td><a href="#Project.__sendTestEmail">__sendTestEmail</a></td>
+<td>Private slot to send a test email through Django.</td>
+</tr><tr>
<td><a href="#Project.__serverProcFinished">__serverProcFinished</a></td>
<td>Private slot connected to the finished signal.</td>
</tr><tr>
+<td><a href="#Project.__setCurrentDatabase">__setCurrentDatabase</a></td>
+<td>Private method to set the database name to be used.</td>
+</tr><tr>
<td><a href="#Project.__setCurrentSite">__setCurrentSite</a></td>
<td>Private slot to set the current site.</td>
</tr><tr>
@@ -335,6 +350,9 @@
<td><a href="#Project.compileSelectedCatalogs">compileSelectedCatalogs</a></td>
<td>Public method to update the message catalogs.</td>
</tr><tr>
+<td><a href="#Project.currentDatabase">currentDatabase</a></td>
+<td>Public method to get the database name to be used.</td>
+</tr><tr>
<td><a href="#Project.getDjangoVersion">getDjangoVersion</a></td>
<td>Public method to get the Django version as a tuple.</td>
</tr><tr>
@@ -353,6 +371,9 @@
<td><a href="#Project.getRecentApplications">getRecentApplications</a></td>
<td>Public method to get the list of recent applications.</td>
</tr><tr>
+<td><a href="#Project.getRecentDatabaseNames">getRecentDatabaseNames</a></td>
+<td>Public method to get the list of recently used database names.</td>
+</tr><tr>
<td><a href="#Project.getRecentTestData">getRecentTestData</a></td>
<td>Public method to get the list of recent test data.</td>
</tr><tr>
@@ -389,6 +410,9 @@
<td><a href="#Project.setMostRecentApplication">setMostRecentApplication</a></td>
<td>Public method to set the most recently used applications entry.</td>
</tr><tr>
+<td><a href="#Project.setMostRecentDatabaseNames">setMostRecentDatabaseNames</a></td>
+<td>Public method to set the most recently used database names.</td>
+</tr><tr>
<td><a href="#Project.setMostRecentTestData">setMostRecentTestData</a></td>
<td>Public method to set the most recently used test data entry.</td>
</tr><tr>
@@ -906,6 +930,11 @@
<b>__loadRecentApplications</b>(<i></i>)
<p>
Private method to load the recently used applications list.
+</p><a NAME="Project.__loadRecentDatabaseNames" ID="Project.__loadRecentDatabaseNames"></a>
+<h4>Project.__loadRecentDatabaseNames</h4>
+<b>__loadRecentDatabaseNames</b>(<i></i>)
+<p>
+ Private method to load the list of recently used database names.
</p><a NAME="Project.__loadRecentTestData" ID="Project.__loadRecentTestData"></a>
<h4>Project.__loadRecentTestData</h4>
<b>__loadRecentTestData</b>(<i></i>)
@@ -987,22 +1016,47 @@
<b>__saveRecentApplications</b>(<i></i>)
<p>
Private method to save the list of recently used applications list.
+</p><a NAME="Project.__saveRecentDatabaseNames" ID="Project.__saveRecentDatabaseNames"></a>
+<h4>Project.__saveRecentDatabaseNames</h4>
+<b>__saveRecentDatabaseNames</b>(<i></i>)
+<p>
+ Private method to save the list of recently used database names.
</p><a NAME="Project.__saveRecentTestData" ID="Project.__saveRecentTestData"></a>
<h4>Project.__saveRecentTestData</h4>
<b>__saveRecentTestData</b>(<i></i>)
<p>
Private method to save the list of recently used test data.
+</p><a NAME="Project.__selectDatabaseName" ID="Project.__selectDatabaseName"></a>
+<h4>Project.__selectDatabaseName</h4>
+<b>__selectDatabaseName</b>(<i></i>)
+<p>
+ Private method to select the name of the database to work with.
</p><a NAME="Project.__selectSite" ID="Project.__selectSite"></a>
<h4>Project.__selectSite</h4>
<b>__selectSite</b>(<i></i>)
<p>
Private method to select a site to work with.
+</p><a NAME="Project.__sendTestEmail" ID="Project.__sendTestEmail"></a>
+<h4>Project.__sendTestEmail</h4>
+<b>__sendTestEmail</b>(<i></i>)
+<p>
+ Private slot to send a test email through Django.
</p><a NAME="Project.__serverProcFinished" ID="Project.__serverProcFinished"></a>
<h4>Project.__serverProcFinished</h4>
<b>__serverProcFinished</b>(<i></i>)
<p>
Private slot connected to the finished signal.
-</p><a NAME="Project.__setCurrentSite" ID="Project.__setCurrentSite"></a>
+</p><a NAME="Project.__setCurrentDatabase" ID="Project.__setCurrentDatabase"></a>
+<h4>Project.__setCurrentDatabase</h4>
+<b>__setCurrentDatabase</b>(<i>database</i>)
+<p>
+ Private method to set the database name to be used.
+</p><dl>
+<dt><i>database</i> (str)</dt>
+<dd>
+name of the database
+</dd>
+</dl><a NAME="Project.__setCurrentSite" ID="Project.__setCurrentSite"></a>
<h4>Project.__setCurrentSite</h4>
<b>__setCurrentSite</b>(<i>site</i>)
<p>
@@ -1152,6 +1206,21 @@
<dd>
list of filenames
</dd>
+</dl><a NAME="Project.currentDatabase" ID="Project.currentDatabase"></a>
+<h4>Project.currentDatabase</h4>
+<b>currentDatabase</b>(<i></i>)
+<p>
+ Public method to get the database name to be used.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+database name
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
</dl><a NAME="Project.getDjangoVersion" ID="Project.getDjangoVersion"></a>
<h4>Project.getDjangoVersion</h4>
<b>getDjangoVersion</b>(<i></i>)
@@ -1223,6 +1292,21 @@
<dd>
list of recent applications entries (list of strings)
</dd>
+</dl><a NAME="Project.getRecentDatabaseNames" ID="Project.getRecentDatabaseNames"></a>
+<h4>Project.getRecentDatabaseNames</h4>
+<b>getRecentDatabaseNames</b>(<i></i>)
+<p>
+ Public method to get the list of recently used database names.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+list of recently used database names
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+list of str
+</dd>
</dl><a NAME="Project.getRecentTestData" ID="Project.getRecentTestData"></a>
<h4>Project.getRecentTestData</h4>
<b>getRecentTestData</b>(<i>key</i>)
@@ -1265,7 +1349,7 @@
</dd>
</dl><a NAME="Project.makeMigrations" ID="Project.makeMigrations"></a>
<h4>Project.makeMigrations</h4>
-<b>makeMigrations</b>(<i>apps, migration=None, dryRun=False, empty=False</i>)
+<b>makeMigrations</b>(<i>apps, migration=None, dryRun=False, empty=False, merge=False</i>)
<p>
Public method to generate migrations.
</p><dl>
@@ -1281,6 +1365,9 @@
</dd><dt><i>empty</i> (bool)</dt>
<dd>
flag indicating the creation of an empty migration
+</dd><dt><i>merge</i> (bool)</dt>
+<dd>
+flag indicating to fix migration conflicts
</dd>
</dl><a NAME="Project.newForm" ID="Project.newForm"></a>
<h4>Project.newForm</h4>
@@ -1338,6 +1425,16 @@
<dd>
applications entry (string)
</dd>
+</dl><a NAME="Project.setMostRecentDatabaseNames" ID="Project.setMostRecentDatabaseNames"></a>
+<h4>Project.setMostRecentDatabaseNames</h4>
+<b>setMostRecentDatabaseNames</b>(<i>dbName</i>)
+<p>
+ Public method to set the most recently used database names.
+</p><dl>
+<dt><i>dbName</i> (str)</dt>
+<dd>
+database name
+</dd>
</dl><a NAME="Project.setMostRecentTestData" ID="Project.setMostRecentTestData"></a>
<h4>Project.setMostRecentTestData</h4>
<b>setMostRecentTestData</b>(<i>key, data</i>)
