Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Sun Apr 15 12:58:17 2012 +0200
+++ b/APIs/Python3/eric5.api	Sun Apr 15 13:01:41 2012 +0200
@@ -4465,6 +4465,7 @@
 eric5.Preferences.ConfigurationDialog.ConfigurationDialog.DefaultMode?7
 eric5.Preferences.ConfigurationDialog.ConfigurationDialog.HelpBrowserMode?7
 eric5.Preferences.ConfigurationDialog.ConfigurationDialog.TrayStarterMode?7
+eric5.Preferences.ConfigurationDialog.ConfigurationDialog.accept?4()
 eric5.Preferences.ConfigurationDialog.ConfigurationDialog.getConfigurationPageName?4()
 eric5.Preferences.ConfigurationDialog.ConfigurationDialog.masterPasswordChanged?7
 eric5.Preferences.ConfigurationDialog.ConfigurationDialog.preferencesChanged?7
@@ -4476,6 +4477,8 @@
 eric5.Preferences.ConfigurationDialog.ConfigurationWidget.DefaultMode?7
 eric5.Preferences.ConfigurationDialog.ConfigurationWidget.HelpBrowserMode?7
 eric5.Preferences.ConfigurationDialog.ConfigurationWidget.TrayStarterMode?7
+eric5.Preferences.ConfigurationDialog.ConfigurationWidget.accept?4()
+eric5.Preferences.ConfigurationDialog.ConfigurationWidget.accepted?7
 eric5.Preferences.ConfigurationDialog.ConfigurationWidget.calledFromEric?4()
 eric5.Preferences.ConfigurationDialog.ConfigurationWidget.getConfigurationPageName?4()
 eric5.Preferences.ConfigurationDialog.ConfigurationWidget.getLexers?4()
@@ -4485,6 +4488,7 @@
 eric5.Preferences.ConfigurationDialog.ConfigurationWidget.on_buttonBox_clicked?4(button)
 eric5.Preferences.ConfigurationDialog.ConfigurationWidget.on_resetButton_clicked?4()
 eric5.Preferences.ConfigurationDialog.ConfigurationWidget.preferencesChanged?7
+eric5.Preferences.ConfigurationDialog.ConfigurationWidget.rejected?7
 eric5.Preferences.ConfigurationDialog.ConfigurationWidget.setPreferences?4()
 eric5.Preferences.ConfigurationDialog.ConfigurationWidget.showConfigurationPageByName?4(pageName, setCurrent=True)
 eric5.Preferences.ConfigurationDialog.ConfigurationWidget?1(parent=None, fromEric=True, displayMode=DefaultMode)

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sun Apr 15 12:58:17 2012 +0200
+++ b/Documentation/Help/source.qhp	Sun Apr 15 13:01:41 2012 +0200
@@ -1923,6 +1923,7 @@
       <keyword name="ConfigurationDialog (Module)" id="ConfigurationDialog (Module)" ref="eric5.Preferences.ConfigurationDialog.html" />
       <keyword name="ConfigurationDialog.__masterPasswordChanged" id="ConfigurationDialog.__masterPasswordChanged" ref="eric5.Preferences.ConfigurationDialog.html#ConfigurationDialog.__masterPasswordChanged" />
       <keyword name="ConfigurationDialog.__preferencesChanged" id="ConfigurationDialog.__preferencesChanged" ref="eric5.Preferences.ConfigurationDialog.html#ConfigurationDialog.__preferencesChanged" />
+      <keyword name="ConfigurationDialog.accept" id="ConfigurationDialog.accept" ref="eric5.Preferences.ConfigurationDialog.html#ConfigurationDialog.accept" />
       <keyword name="ConfigurationDialog.getConfigurationPageName" id="ConfigurationDialog.getConfigurationPageName" ref="eric5.Preferences.ConfigurationDialog.html#ConfigurationDialog.getConfigurationPageName" />
       <keyword name="ConfigurationDialog.setPreferences" id="ConfigurationDialog.setPreferences" ref="eric5.Preferences.ConfigurationDialog.html#ConfigurationDialog.setPreferences" />
       <keyword name="ConfigurationDialog.showConfigurationPageByName" id="ConfigurationDialog.showConfigurationPageByName" ref="eric5.Preferences.ConfigurationDialog.html#ConfigurationDialog.showConfigurationPageByName" />
@@ -1949,6 +1950,7 @@
       <keyword name="ConfigurationWidget.__initPage" id="ConfigurationWidget.__initPage" ref="eric5.Preferences.ConfigurationDialog.html#ConfigurationWidget.__initPage" />
       <keyword name="ConfigurationWidget.__setupUi" id="ConfigurationWidget.__setupUi" ref="eric5.Preferences.ConfigurationDialog.html#ConfigurationWidget.__setupUi" />
       <keyword name="ConfigurationWidget.__showConfigurationPage" id="ConfigurationWidget.__showConfigurationPage" ref="eric5.Preferences.ConfigurationDialog.html#ConfigurationWidget.__showConfigurationPage" />
+      <keyword name="ConfigurationWidget.accept" id="ConfigurationWidget.accept" ref="eric5.Preferences.ConfigurationDialog.html#ConfigurationWidget.accept" />
       <keyword name="ConfigurationWidget.calledFromEric" id="ConfigurationWidget.calledFromEric" ref="eric5.Preferences.ConfigurationDialog.html#ConfigurationWidget.calledFromEric" />
       <keyword name="ConfigurationWidget.getConfigurationPageName" id="ConfigurationWidget.getConfigurationPageName" ref="eric5.Preferences.ConfigurationDialog.html#ConfigurationWidget.getConfigurationPageName" />
       <keyword name="ConfigurationWidget.getLexers" id="ConfigurationWidget.getLexers" ref="eric5.Preferences.ConfigurationDialog.html#ConfigurationWidget.getLexers" />

--- a/Documentation/Source/eric5.Preferences.ConfigurationDialog.html	Sun Apr 15 12:58:17 2012 +0200
+++ b/Documentation/Source/eric5.Preferences.ConfigurationDialog.html	Sun Apr 15 13:01:41 2012 +0200
@@ -86,6 +86,9 @@
 <td><a href="#ConfigurationDialog.__preferencesChanged">__preferencesChanged</a></td>
 <td>Private slot to handle a change of the preferences.</td>
 </tr><tr>
+<td><a href="#ConfigurationDialog.accept">accept</a></td>
+<td></td>
+</tr><tr>
 <td><a href="#ConfigurationDialog.getConfigurationPageName">getConfigurationPageName</a></td>
 <td>Public method to get the page name of the current page.</td>
 </tr><tr>
@@ -142,7 +145,10 @@
 <b>__preferencesChanged</b>(<i></i>)
 <p>
         Private slot to handle a change of the preferences.
-</p><a NAME="ConfigurationDialog.getConfigurationPageName" ID="ConfigurationDialog.getConfigurationPageName"></a>
+</p><a NAME="ConfigurationDialog.accept" ID="ConfigurationDialog.accept"></a>
+<h4>ConfigurationDialog.accept</h4>
+<b>accept</b>(<i></i>)
+<a NAME="ConfigurationDialog.getConfigurationPageName" ID="ConfigurationDialog.getConfigurationPageName"></a>
 <h4>ConfigurationDialog.getConfigurationPageName</h4>
 <b>getConfigurationPageName</b>(<i></i>)
 <p>
@@ -237,13 +243,19 @@
     Class implementing a dialog for the configuration of eric5.
 </p><h3>Signals</h3>
 <dl>
-<dt>masterPasswordChanged(str, str)</dt>
+<dt>accepted()</dt>
+<dd>
+emitted to indicate acceptance of the changes
+</dd><dt>masterPasswordChanged(str, str)</dt>
 <dd>
 emitted after the master
         password has been changed with the old and the new password
 </dd><dt>preferencesChanged()</dt>
 <dd>
 emitted after settings have been changed
+</dd><dt>rejected()</dt>
+<dd>
+emitted to indicate rejection of the changes
 </dd>
 </dl>
 <h3>Derived from</h3>
@@ -277,6 +289,9 @@
 <td><a href="#ConfigurationWidget.__showConfigurationPage">__showConfigurationPage</a></td>
 <td>Private slot to show a selected configuration page.</td>
 </tr><tr>
+<td><a href="#ConfigurationWidget.accept">accept</a></td>
+<td>Public slot to accept the buttonBox accept signal.</td>
+</tr><tr>
 <td><a href="#ConfigurationWidget.calledFromEric">calledFromEric</a></td>
 <td>Public method to check, if invoked from within eric.</td>
 </tr><tr>
@@ -380,7 +395,12 @@
 <dd>
 column that was selected (integer) (ignored)
 </dd>
-</dl><a NAME="ConfigurationWidget.calledFromEric" ID="ConfigurationWidget.calledFromEric"></a>
+</dl><a NAME="ConfigurationWidget.accept" ID="ConfigurationWidget.accept"></a>
+<h4>ConfigurationWidget.accept</h4>
+<b>accept</b>(<i></i>)
+<p>
+        Public slot to accept the buttonBox accept signal.
+</p><a NAME="ConfigurationWidget.calledFromEric" ID="ConfigurationWidget.calledFromEric"></a>
 <h4>ConfigurationWidget.calledFromEric</h4>
 <b>calledFromEric</b>(<i></i>)
 <p>