Mercurial Repositories > eric / changeset
changeset
Added a widget to pick a path and changed the first configuration page.
Sun, 22 Nov 2015 18:41:02 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 22 Nov 2015 18:41:02 +0100
- changeset 4573
- 365f39d86985
- parent 4572
- 193e308b2f6e
- child 4574
- 86647045bc03
Added a widget to pick a path and changed the first configuration page.
--- a/APIs/Python3/eric6.api Sun Nov 22 12:03:31 2015 +0100 +++ b/APIs/Python3/eric6.api Sun Nov 22 18:41:02 2015 +0100 @@ -1406,6 +1406,30 @@ eric6.E5Gui.E5PasswordMeter.E5PasswordMeter.setMinimum?4(value) eric6.E5Gui.E5PasswordMeter.E5PasswordMeter.setValue?4(value) eric6.E5Gui.E5PasswordMeter.E5PasswordMeter?1(parent=None) +eric6.E5Gui.E5PathPicker.E5PathPicker.DefaultMode?7 +eric6.E5Gui.E5PathPicker.E5PathPicker.buttonToolTip?4() +eric6.E5Gui.E5PathPicker.E5PathPicker.defaultDirectory?4() +eric6.E5Gui.E5PathPicker.E5PathPicker.editorEnabled?4() +eric6.E5Gui.E5PathPicker.E5PathPicker.editorToolTip?4() +eric6.E5Gui.E5PathPicker.E5PathPicker.filters?4() +eric6.E5Gui.E5PathPicker.E5PathPicker.mode?4() +eric6.E5Gui.E5PathPicker.E5PathPicker.path?4() +eric6.E5Gui.E5PathPicker.E5PathPicker.setButtonToolTip?4(tooltip) +eric6.E5Gui.E5PathPicker.E5PathPicker.setDefaultDirectory?4(directory) +eric6.E5Gui.E5PathPicker.E5PathPicker.setEditorEnabled?4(enable) +eric6.E5Gui.E5PathPicker.E5PathPicker.setEditorToolTip?4(tooltip) +eric6.E5Gui.E5PathPicker.E5PathPicker.setFilters?4(filters) +eric6.E5Gui.E5PathPicker.E5PathPicker.setMode?4(mode) +eric6.E5Gui.E5PathPicker.E5PathPicker.setPath?4(path) +eric6.E5Gui.E5PathPicker.E5PathPicker.setText?4(path) +eric6.E5Gui.E5PathPicker.E5PathPicker.setWindowTitle?4(title) +eric6.E5Gui.E5PathPicker.E5PathPicker.text?4() +eric6.E5Gui.E5PathPicker.E5PathPicker.windowTitle?4() +eric6.E5Gui.E5PathPicker.E5PathPicker?1(parent=None) +eric6.E5Gui.E5PathPicker.E5PathPickerModes.DiretoryMode?7 +eric6.E5Gui.E5PathPicker.E5PathPickerModes.OpenFileMode?7 +eric6.E5Gui.E5PathPicker.E5PathPickerModes.OpenFilesMode?7 +eric6.E5Gui.E5PathPicker.E5PathPickerModes.SaveFileMode?7 eric6.E5Gui.E5ProgressDialog.E5ProgressDialog.format?4() eric6.E5Gui.E5ProgressDialog.E5ProgressDialog.setFormat?4(format) eric6.E5Gui.E5ProgressDialog.E5ProgressDialog?1(labelText, cancelButtonText, minimum, maximum, format=None, parent=None, flags=Qt.WindowFlags()) @@ -6181,7 +6205,6 @@ eric6.Preferences.ConfigurationPages.CooperationPage.CooperationPage.save?4() eric6.Preferences.ConfigurationPages.CooperationPage.CooperationPage?1() eric6.Preferences.ConfigurationPages.CooperationPage.create?4(dlg) -eric6.Preferences.ConfigurationPages.CorbaPage.CorbaPage.on_idlButton_clicked?4() eric6.Preferences.ConfigurationPages.CorbaPage.CorbaPage.save?4() eric6.Preferences.ConfigurationPages.CorbaPage.CorbaPage?1() eric6.Preferences.ConfigurationPages.CorbaPage.create?4(dlg)
--- a/APIs/Python3/eric6.bas Sun Nov 22 12:03:31 2015 +0100 +++ b/APIs/Python3/eric6.bas Sun Nov 22 18:41:02 2015 +0100 @@ -174,6 +174,8 @@ E5NetworkProxyFactory QNetworkProxyFactory E5PassivePopup QFrame E5PasswordMeter QProgressBar +E5PathPicker QWidget +E5PathPickerModes Enum E5ProgressDialog QProgressDialog E5RequestModel QAbstractTableModel E5SideBar QWidget
--- a/Documentation/Help/source.qhp Sun Nov 22 12:03:31 2015 +0100 +++ b/Documentation/Help/source.qhp Sun Nov 22 18:41:02 2015 +0100 @@ -123,6 +123,7 @@ <section title="eric6.E5Gui.E5ModelToolBar" ref="eric6.E5Gui.E5ModelToolBar.html" /> <section title="eric6.E5Gui.E5PassivePopup" ref="eric6.E5Gui.E5PassivePopup.html" /> <section title="eric6.E5Gui.E5PasswordMeter" ref="eric6.E5Gui.E5PasswordMeter.html" /> + <section title="eric6.E5Gui.E5PathPicker" ref="eric6.E5Gui.E5PathPicker.html" /> <section title="eric6.E5Gui.E5ProgressDialog" ref="eric6.E5Gui.E5ProgressDialog.html" /> <section title="eric6.E5Gui.E5SideBar" ref="eric6.E5Gui.E5SideBar.html" /> <section title="eric6.E5Gui.E5SingleApplication" ref="eric6.E5Gui.E5SingleApplication.html" /> @@ -2567,7 +2568,6 @@ <keyword name="CorbaPage" id="CorbaPage" ref="eric6.Preferences.ConfigurationPages.CorbaPage.html#CorbaPage" /> <keyword name="CorbaPage (Constructor)" id="CorbaPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.CorbaPage.html#CorbaPage.__init__" /> <keyword name="CorbaPage (Module)" id="CorbaPage (Module)" ref="eric6.Preferences.ConfigurationPages.CorbaPage.html" /> - <keyword name="CorbaPage.on_idlButton_clicked" id="CorbaPage.on_idlButton_clicked" ref="eric6.Preferences.ConfigurationPages.CorbaPage.html#CorbaPage.on_idlButton_clicked" /> <keyword name="CorbaPage.save" id="CorbaPage.save" ref="eric6.Preferences.ConfigurationPages.CorbaPage.html#CorbaPage.save" /> <keyword name="CreateDialogCodeDialog" id="CreateDialogCodeDialog" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog" /> <keyword name="CreateDialogCodeDialog (Constructor)" id="CreateDialogCodeDialog (Constructor)" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.__init__" /> @@ -3722,6 +3722,29 @@ <keyword name="E5PasswordMeter.setMaximum" id="E5PasswordMeter.setMaximum" ref="eric6.E5Gui.E5PasswordMeter.html#E5PasswordMeter.setMaximum" /> <keyword name="E5PasswordMeter.setMinimum" id="E5PasswordMeter.setMinimum" ref="eric6.E5Gui.E5PasswordMeter.html#E5PasswordMeter.setMinimum" /> <keyword name="E5PasswordMeter.setValue" id="E5PasswordMeter.setValue" ref="eric6.E5Gui.E5PasswordMeter.html#E5PasswordMeter.setValue" /> + <keyword name="E5PathPicker" id="E5PathPicker" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker" /> + <keyword name="E5PathPicker (Constructor)" id="E5PathPicker (Constructor)" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.__init__" /> + <keyword name="E5PathPicker (Module)" id="E5PathPicker (Module)" ref="eric6.E5Gui.E5PathPicker.html" /> + <keyword name="E5PathPicker.__showPathPickerDialog" id="E5PathPicker.__showPathPickerDialog" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.__showPathPickerDialog" /> + <keyword name="E5PathPicker.buttonToolTip" id="E5PathPicker.buttonToolTip" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.buttonToolTip" /> + <keyword name="E5PathPicker.defaultDirectory" id="E5PathPicker.defaultDirectory" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.defaultDirectory" /> + <keyword name="E5PathPicker.editorEnabled" id="E5PathPicker.editorEnabled" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.editorEnabled" /> + <keyword name="E5PathPicker.editorToolTip" id="E5PathPicker.editorToolTip" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.editorToolTip" /> + <keyword name="E5PathPicker.filters" id="E5PathPicker.filters" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.filters" /> + <keyword name="E5PathPicker.mode" id="E5PathPicker.mode" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.mode" /> + <keyword name="E5PathPicker.path" id="E5PathPicker.path" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.path" /> + <keyword name="E5PathPicker.setButtonToolTip" id="E5PathPicker.setButtonToolTip" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.setButtonToolTip" /> + <keyword name="E5PathPicker.setDefaultDirectory" id="E5PathPicker.setDefaultDirectory" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.setDefaultDirectory" /> + <keyword name="E5PathPicker.setEditorEnabled" id="E5PathPicker.setEditorEnabled" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.setEditorEnabled" /> + <keyword name="E5PathPicker.setEditorToolTip" id="E5PathPicker.setEditorToolTip" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.setEditorToolTip" /> + <keyword name="E5PathPicker.setFilters" id="E5PathPicker.setFilters" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.setFilters" /> + <keyword name="E5PathPicker.setMode" id="E5PathPicker.setMode" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.setMode" /> + <keyword name="E5PathPicker.setPath" id="E5PathPicker.setPath" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.setPath" /> + <keyword name="E5PathPicker.setText" id="E5PathPicker.setText" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.setText" /> + <keyword name="E5PathPicker.setWindowTitle" id="E5PathPicker.setWindowTitle" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.setWindowTitle" /> + <keyword name="E5PathPicker.text" id="E5PathPicker.text" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.text" /> + <keyword name="E5PathPicker.windowTitle" id="E5PathPicker.windowTitle" ref="eric6.E5Gui.E5PathPicker.html#E5PathPicker.windowTitle" /> + <keyword name="E5PathPickerModes" id="E5PathPickerModes" ref="eric6.E5Gui.E5PathPicker.html#E5PathPickerModes" /> <keyword name="E5ProgressDialog" id="E5ProgressDialog" ref="eric6.E5Gui.E5ProgressDialog.html#E5ProgressDialog" /> <keyword name="E5ProgressDialog (Constructor)" id="E5ProgressDialog (Constructor)" ref="eric6.E5Gui.E5ProgressDialog.html#E5ProgressDialog.__init__" /> <keyword name="E5ProgressDialog (Module)" id="E5ProgressDialog (Module)" ref="eric6.E5Gui.E5ProgressDialog.html" /> @@ -13997,6 +14020,7 @@ <file>eric6.E5Gui.E5ModelToolBar.html</file> <file>eric6.E5Gui.E5PassivePopup.html</file> <file>eric6.E5Gui.E5PasswordMeter.html</file> + <file>eric6.E5Gui.E5PathPicker.html</file> <file>eric6.E5Gui.E5ProgressDialog.html</file> <file>eric6.E5Gui.E5SideBar.html</file> <file>eric6.E5Gui.E5SingleApplication.html</file>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.E5Gui.E5PathPicker.html Sun Nov 22 18:41:02 2015 +0100 @@ -0,0 +1,400 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.E5Gui.E5PathPicker</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.E5Gui.E5PathPicker</h1> +<p> +Module implementing a path picker widget. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#E5PathPicker">E5PathPicker</a></td> +<td>Class implementing a path picker widget consisting of a line edit and a tool button to open a file dialog.</td> +</tr><tr> +<td><a href="#E5PathPickerModes">E5PathPickerModes</a></td> +<td>Class implementing the path picker modes.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="E5PathPicker" ID="E5PathPicker"></a> +<h2>E5PathPicker</h2> +<p> + Class implementing a path picker widget consisting of a line edit and a + tool button to open a file dialog. +</p> +<h3>Derived from</h3> +QWidget +<h3>Class Attributes</h3> +<table> +<tr><td>DefaultMode</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#E5PathPicker.__init__">E5PathPicker</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#E5PathPicker.__showPathPickerDialog">__showPathPickerDialog</a></td> +<td>Private slot to show the path picker dialog.</td> +</tr><tr> +<td><a href="#E5PathPicker.buttonToolTip">buttonToolTip</a></td> +<td>Public method to get the tool button tool tip.</td> +</tr><tr> +<td><a href="#E5PathPicker.defaultDirectory">defaultDirectory</a></td> +<td>Public method to get the default directory.</td> +</tr><tr> +<td><a href="#E5PathPicker.editorEnabled">editorEnabled</a></td> +<td>Public method to get the path editor's enabled state.</td> +</tr><tr> +<td><a href="#E5PathPicker.editorToolTip">editorToolTip</a></td> +<td>Public method to get the editor tool tip.</td> +</tr><tr> +<td><a href="#E5PathPicker.filters">filters</a></td> +<td>Public methods to get the filter string.</td> +</tr><tr> +<td><a href="#E5PathPicker.mode">mode</a></td> +<td>Public method to get the path picker mode.</td> +</tr><tr> +<td><a href="#E5PathPicker.path">path</a></td> +<td>Public method to get the current path.</td> +</tr><tr> +<td><a href="#E5PathPicker.setButtonToolTip">setButtonToolTip</a></td> +<td>Public method to set the tool button tool tip.</td> +</tr><tr> +<td><a href="#E5PathPicker.setDefaultDirectory">setDefaultDirectory</a></td> +<td>Public method to set the default directory.</td> +</tr><tr> +<td><a href="#E5PathPicker.setEditorEnabled">setEditorEnabled</a></td> +<td>Public method to set the path editor's enabled state.</td> +</tr><tr> +<td><a href="#E5PathPicker.setEditorToolTip">setEditorToolTip</a></td> +<td>Public method to set the editor tool tip.</td> +</tr><tr> +<td><a href="#E5PathPicker.setFilters">setFilters</a></td> +<td>Public method to set the filters for the path picker dialog.</td> +</tr><tr> +<td><a href="#E5PathPicker.setMode">setMode</a></td> +<td>Public method to set the path picker mode.</td> +</tr><tr> +<td><a href="#E5PathPicker.setPath">setPath</a></td> +<td>Public method to set the current path.</td> +</tr><tr> +<td><a href="#E5PathPicker.setText">setText</a></td> +<td>Public method to set the current path.</td> +</tr><tr> +<td><a href="#E5PathPicker.setWindowTitle">setWindowTitle</a></td> +<td>Public method to set the path picker dialog window title.</td> +</tr><tr> +<td><a href="#E5PathPicker.text">text</a></td> +<td>Public method to get the current path.</td> +</tr><tr> +<td><a href="#E5PathPicker.windowTitle">windowTitle</a></td> +<td>Public method to get the path picker dialog's window title.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="E5PathPicker.__init__" ID="E5PathPicker.__init__"></a> +<h4>E5PathPicker (Constructor)</h4> +<b>E5PathPicker</b>(<i>parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="E5PathPicker.__showPathPickerDialog" ID="E5PathPicker.__showPathPickerDialog"></a> +<h4>E5PathPicker.__showPathPickerDialog</h4> +<b>__showPathPickerDialog</b>(<i></i>) +<p> + Private slot to show the path picker dialog. +</p><a NAME="E5PathPicker.buttonToolTip" ID="E5PathPicker.buttonToolTip"></a> +<h4>E5PathPicker.buttonToolTip</h4> +<b>buttonToolTip</b>(<i></i>) +<p> + Public method to get the tool button tool tip. +</p><dl> +<dt>Returns:</dt> +<dd> +tool tip text +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="E5PathPicker.defaultDirectory" ID="E5PathPicker.defaultDirectory"></a> +<h4>E5PathPicker.defaultDirectory</h4> +<b>defaultDirectory</b>(<i></i>) +<p> + Public method to get the default directory. +</p><dl> +<dt>Returns:</dt> +<dd> +default directory +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="E5PathPicker.editorEnabled" ID="E5PathPicker.editorEnabled"></a> +<h4>E5PathPicker.editorEnabled</h4> +<b>editorEnabled</b>(<i></i>) +<p> + Public method to get the path editor's enabled state. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the enabled state +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="E5PathPicker.editorToolTip" ID="E5PathPicker.editorToolTip"></a> +<h4>E5PathPicker.editorToolTip</h4> +<b>editorToolTip</b>(<i></i>) +<p> + Public method to get the editor tool tip. +</p><dl> +<dt>Returns:</dt> +<dd> +tool tip text +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="E5PathPicker.filters" ID="E5PathPicker.filters"></a> +<h4>E5PathPicker.filters</h4> +<b>filters</b>(<i></i>) +<p> + Public methods to get the filter string. +</p><dl> +<dt>Returns:</dt> +<dd> +filter string +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="E5PathPicker.mode" ID="E5PathPicker.mode"></a> +<h4>E5PathPicker.mode</h4> +<b>mode</b>(<i></i>) +<p> + Public method to get the path picker mode. +</p><dl> +<dt>Returns:</dt> +<dd> +path picker mode +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +E5PathPickerModes +</dd> +</dl><a NAME="E5PathPicker.path" ID="E5PathPicker.path"></a> +<h4>E5PathPicker.path</h4> +<b>path</b>(<i></i>) +<p> + Public method to get the current path. +</p><dl> +<dt>Returns:</dt> +<dd> +current path +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="E5PathPicker.setButtonToolTip" ID="E5PathPicker.setButtonToolTip"></a> +<h4>E5PathPicker.setButtonToolTip</h4> +<b>setButtonToolTip</b>(<i>tooltip</i>) +<p> + Public method to set the tool button tool tip. +</p><dl> +<dt><i>tooltip</i> (str)</dt> +<dd> +text to be set as a tool tip +</dd> +</dl><a NAME="E5PathPicker.setDefaultDirectory" ID="E5PathPicker.setDefaultDirectory"></a> +<h4>E5PathPicker.setDefaultDirectory</h4> +<b>setDefaultDirectory</b>(<i>directory</i>) +<p> + Public method to set the default directory. +</p><dl> +<dt><i>directory</i> (str)</dt> +<dd> +default directory +</dd> +</dl><a NAME="E5PathPicker.setEditorEnabled" ID="E5PathPicker.setEditorEnabled"></a> +<h4>E5PathPicker.setEditorEnabled</h4> +<b>setEditorEnabled</b>(<i>enable</i>) +<p> + Public method to set the path editor's enabled state. +</p><dl> +<dt><i>enable</i> (bool)</dt> +<dd> +flag indicating the enable state +</dd> +</dl><a NAME="E5PathPicker.setEditorToolTip" ID="E5PathPicker.setEditorToolTip"></a> +<h4>E5PathPicker.setEditorToolTip</h4> +<b>setEditorToolTip</b>(<i>tooltip</i>) +<p> + Public method to set the editor tool tip. +</p><dl> +<dt><i>tooltip</i> (str)</dt> +<dd> +text to be set as a tool tip +</dd> +</dl><a NAME="E5PathPicker.setFilters" ID="E5PathPicker.setFilters"></a> +<h4>E5PathPicker.setFilters</h4> +<b>setFilters</b>(<i>filters</i>) +<p> + Public method to set the filters for the path picker dialog. +</p><p> + Note: Multiple filters must be separated by ';;'. +</p><dl> +<dt><i>filters</i> (str)</dt> +<dd> +string containing the file filters +</dd> +</dl><a NAME="E5PathPicker.setMode" ID="E5PathPicker.setMode"></a> +<h4>E5PathPicker.setMode</h4> +<b>setMode</b>(<i>mode</i>) +<p> + Public method to set the path picker mode. +</p><dl> +<dt><i>mode</i> (E5PathPickerModes)</dt> +<dd> +picker mode +</dd> +</dl><a NAME="E5PathPicker.setPath" ID="E5PathPicker.setPath"></a> +<h4>E5PathPicker.setPath</h4> +<b>setPath</b>(<i>path</i>) +<p> + Public method to set the current path. +</p><dl> +<dt><i>path</i> (str)</dt> +<dd> +path to be set +</dd> +</dl><a NAME="E5PathPicker.setText" ID="E5PathPicker.setText"></a> +<h4>E5PathPicker.setText</h4> +<b>setText</b>(<i>path</i>) +<p> + Public method to set the current path. +</p><dl> +<dt><i>path</i> (str)</dt> +<dd> +path to be set +</dd> +</dl><a NAME="E5PathPicker.setWindowTitle" ID="E5PathPicker.setWindowTitle"></a> +<h4>E5PathPicker.setWindowTitle</h4> +<b>setWindowTitle</b>(<i>title</i>) +<p> + Public method to set the path picker dialog window title. +</p><dl> +<dt><i>title</i> (str)</dt> +<dd> +window title +</dd> +</dl><a NAME="E5PathPicker.text" ID="E5PathPicker.text"></a> +<h4>E5PathPicker.text</h4> +<b>text</b>(<i></i>) +<p> + Public method to get the current path. +</p><dl> +<dt>Returns:</dt> +<dd> +current path +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="E5PathPicker.windowTitle" ID="E5PathPicker.windowTitle"></a> +<h4>E5PathPicker.windowTitle</h4> +<b>windowTitle</b>(<i></i>) +<p> + Public method to get the path picker dialog's window title. +</p><dl> +<dt>Returns:</dt> +<dd> +window title +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="E5PathPickerModes" ID="E5PathPickerModes"></a> +<h2>E5PathPickerModes</h2> +<p> + Class implementing the path picker modes. +</p> +<h3>Derived from</h3> +Enum +<h3>Class Attributes</h3> +<table> +<tr><td>DiretoryMode</td></tr><tr><td>OpenFileMode</td></tr><tr><td>OpenFilesMode</td></tr><tr><td>SaveFileMode</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.CorbaPage.html Sun Nov 22 12:03:31 2015 +0100 +++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.CorbaPage.html Sun Nov 22 18:41:02 2015 +0100 @@ -63,9 +63,6 @@ <td><a href="#CorbaPage.__init__">CorbaPage</a></td> <td>Constructor</td> </tr><tr> -<td><a href="#CorbaPage.on_idlButton_clicked">on_idlButton_clicked</a></td> -<td>Private slot to handle the IDL compiler selection.</td> -</tr><tr> <td><a href="#CorbaPage.save">save</a></td> <td>Public slot to save the Corba configuration.</td> </tr> @@ -79,11 +76,6 @@ <b>CorbaPage</b>(<i></i>) <p> Constructor -</p><a NAME="CorbaPage.on_idlButton_clicked" ID="CorbaPage.on_idlButton_clicked"></a> -<h4>CorbaPage.on_idlButton_clicked</h4> -<b>on_idlButton_clicked</b>(<i></i>) -<p> - Private slot to handle the IDL compiler selection. </p><a NAME="CorbaPage.save" ID="CorbaPage.save"></a> <h4>CorbaPage.save</h4> <b>save</b>(<i></i>)
--- a/Documentation/Source/index-eric6.E5Gui.html Sun Nov 22 12:03:31 2015 +0100 +++ b/Documentation/Source/index-eric6.E5Gui.html Sun Nov 22 18:41:02 2015 +0100 @@ -93,6 +93,9 @@ <td><a href="eric6.E5Gui.E5PasswordMeter.html">E5PasswordMeter</a></td> <td>Module implementing a custom widget indicating the strength of a password.</td> </tr><tr> +<td><a href="eric6.E5Gui.E5PathPicker.html">E5PathPicker</a></td> +<td>Module implementing a path picker widget.</td> +</tr><tr> <td><a href="eric6.E5Gui.E5ProgressDialog.html">E5ProgressDialog</a></td> <td>Module implementing a progress dialog allowing a customized progress bar label.</td> </tr><tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/E5Gui/E5PathPicker.py Sun Nov 22 18:41:02 2015 +0100 @@ -0,0 +1,322 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2015 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a path picker widget. +""" + +from __future__ import unicode_literals + +import os + +try: + from enum import Enum +except ImportError: + from ThirdParty.enum import Enum + +from PyQt5.QtCore import Qt +from PyQt5.QtWidgets import QWidget, QHBoxLayout, QToolButton + +from . import E5FileDialog +from .E5LineEdit import E5ClearableLineEdit +from .E5Completers import E5FileCompleter, E5DirCompleter + +import UI.PixmapCache +import Utilities + + +class E5PathPickerModes(Enum): + """ + Class implementing the path picker modes. + """ + OpenFileMode = 0 + OpenFilesMode = 1 + SaveFileMode = 2 + DiretoryMode = 3 + + +class E5PathPicker(QWidget): + """ + Class implementing a path picker widget consisting of a line edit and a + tool button to open a file dialog. + """ + DefaultMode = E5PathPickerModes.OpenFileMode + + def __init__(self, parent=None): + """ + Constructor + + @param parent reference to the parent widget + @type QWidget + """ + super(E5PathPicker, self).__init__(parent) + + self.__mode = E5PathPicker.DefaultMode + self.__editorEnabled = True + + self.__completer = None + self.__filters = "" + self.__defaultDirectory = "" + self.__windowTitle = "" + + self.__layout = QHBoxLayout() + self.__layout.setSpacing(0) + self.__layout.setContentsMargins(0, 0, 0, 0) + self.setLayout(self.__layout) + + self.__editor = E5ClearableLineEdit(self, self.tr("Enter Path Name")) + + self.__button = QToolButton(self) + self.__button.setToolButtonStyle(Qt.ToolButtonIconOnly) + self.__button.setIcon(UI.PixmapCache.getIcon("open.png")) + + self.__layout.addWidget(self.__editor) + self.__layout.addWidget(self.__button) + + self.__button.clicked.connect(self.__showPathPickerDialog) + + def setMode(self, mode): + """ + Public method to set the path picker mode. + + @param mode picker mode + @type E5PathPickerModes + """ + assert mode in E5PathPickerModes + + oldMode = self.__mode + self.__mode = mode + + if mode != oldMode: + # Remove current completer + self.__editor.setCompleter(None) + self.__completer = None + + # Set a new completer + if mode == E5PathPicker.DiretoryMode: + self.__completer = E5DirCompleter(self.__editor) + else: + self.__completer = E5FileCompleter(self.__editor) + + def mode(self): + """ + Public method to get the path picker mode. + + @return path picker mode + @rtype E5PathPickerModes + """ + return self.__mode + + def setText(self, path): + """ + Public method to set the current path. + + @param path path to be set + @type str + """ + if self.__mode == E5PathPickerModes.OpenFilesMode: + self.__editor.setText(path) + else: + self.__editor.setText(Utilities.toNativeSeparators(path)) + + def text(self): + """ + Public method to get the current path. + + @return current path + @rtype str + """ + if self.__mode == E5PathPickerModes.OpenFilesMode: + return self.__editor.text() + else: + return os.path.expanduser( + Utilities.toNativeSeparators(self.__editor.text())) + + def setPath(self, path): + """ + Public method to set the current path. + + @param path path to be set + @type str + """ + self.setText(path) + + def path(self): + """ + Public method to get the current path. + + @return current path + @rtype str + """ + return self.text() + + def setEditorEnabled(self, enable): + """ + Public method to set the path editor's enabled state. + + @param enable flag indicating the enable state + @type bool + """ + if enable != self.__editorEnabled: + self.__editorEnabled = enable + self.__editor.setEnabled(enable) + + def editorEnabled(self): + """ + Public method to get the path editor's enabled state. + + @return flag indicating the enabled state + @rtype bool + """ + return self.__editorEnabled + + def setDefaultDirectory(self, directory): + """ + Public method to set the default directory. + + @param directory default directory + @type str + """ + self.__defaultDirectory = directory + + def defaultDirectory(self): + """ + Public method to get the default directory. + + @return default directory + @rtype str + """ + return self.__defaultDirectory + + def setWindowTitle(self, title): + """ + Public method to set the path picker dialog window title. + + @param title window title + @type str + """ + self.__windowTitle = title + + def windowTitle(self): + """ + Public method to get the path picker dialog's window title. + + @return window title + @rtype str + """ + return self.__windowTitle + + def setFilters(self, filters): + """ + Public method to set the filters for the path picker dialog. + + Note: Multiple filters must be separated by ';;'. + + @param filters string containing the file filters + @type str + """ + self.__filters = filters + + def filters(self): + """ + Public methods to get the filter string. + + @return filter string + @rtype str + """ + return self.__filters + + def setButtonToolTip(self, tooltip): + """ + Public method to set the tool button tool tip. + + @param tooltip text to be set as a tool tip + @type str + """ + self.__button.setToolTip(tooltip) + + def buttonToolTip(self): + """ + Public method to get the tool button tool tip. + + @return tool tip text + @rtype str + """ + return self.__button.toolTip() + + def setEditorToolTip(self, tooltip): + """ + Public method to set the editor tool tip. + + @param tooltip text to be set as a tool tip + @type str + """ + self.__editor.setToolTip(tooltip) + + def editorToolTip(self): + """ + Public method to get the editor tool tip. + + @return tool tip text + @rtype str + """ + return self.__editor.toolTip() + + def __showPathPickerDialog(self): + """ + Private slot to show the path picker dialog. + """ + windowTitle = self.__windowTitle + if not windowTitle: + if self.__mode == E5PathPickerModes.OpenFileMode: + windowTitle = self.tr("Choose a file to open") + elif self.__mode == E5PathPickerModes.OpenFilesMode: + windowTitle = self.tr("Choose files to open") + elif self.__mode == E5PathPickerModes.SaveFileMode: + windowTitle = self.tr("Choose a file to save") + elif self.__mode == E5PathPickerModes.DiretoryMode: + windowTitle = self.tr("Choose a directory") + + directory = self.__editor.text() + if self.__mode == E5PathPickerModes.OpenFilesMode: + directory = os.path.expanduser( + Utilities.fromNativeSeparators(directory.split(";")[0])) + else: + directory = os.path.expanduser( + Utilities.fromNativeSeparators(directory)) + + if self.__mode == E5PathPickerModes.OpenFileMode: + path = E5FileDialog.getOpenFileName( + self, + windowTitle, + directory, + self.__filters) + path = Utilities.toNativeSeparators(path) + elif self.__mode == E5PathPickerModes.OpenFilesMode: + paths = E5FileDialog.getOpenFileNames( + self, + windowTitle, + directory, + self.__filters) + path = ";".join([Utilities.toNativeSeparators(path) + for path in paths]) + elif self.__mode == E5PathPickerModes.SaveFileMode: + path = E5FileDialog.getSaveFileName( + self, + windowTitle, + directory, + self.__filters, + E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) + path = Utilities.toNativeSeparators(path) + elif self.__mode == E5PathPickerModes.DiretoryMode: + path = E5FileDialog.getExistingDirectory( + self, + windowTitle, + directory, + E5FileDialog.Options(E5FileDialog.ShowDirsOnly)) + path = Utilities.toNativeSeparators(path) + + if path: + self.__editor.setText(path)
--- a/Preferences/ConfigurationPages/CorbaPage.py Sun Nov 22 12:03:31 2015 +0100 +++ b/Preferences/ConfigurationPages/CorbaPage.py Sun Nov 22 18:41:02 2015 +0100 @@ -9,17 +9,12 @@ from __future__ import unicode_literals -from PyQt5.QtCore import pyqtSlot - -from E5Gui.E5Completers import E5FileCompleter -from E5Gui import E5FileDialog +from E5Gui.E5PathPicker import E5PathPickerModes from .ConfigurationPageBase import ConfigurationPageBase from .Ui_CorbaPage import Ui_CorbaPage import Preferences -import Utilities -import UI.PixmapCache class CorbaPage(ConfigurationPageBase, Ui_CorbaPage): @@ -34,32 +29,18 @@ self.setupUi(self) self.setObjectName("CorbaPage") - self.idlButton.setIcon(UI.PixmapCache.getIcon("open.png")) - - self.idlCompleter = E5FileCompleter(self.idlEdit) + self.idlPicker.setMode(E5PathPickerModes.OpenFileMode) + self.idlPicker.setToolTip(self.tr( + "Press to select the IDL compiler via a file selection dialog.")) # set initial values - self.idlEdit.setText(Preferences.getCorba("omniidl")) + self.idlPicker.setText(Preferences.getCorba("omniidl")) def save(self): """ Public slot to save the Corba configuration. """ - Preferences.setCorba("omniidl", self.idlEdit.text()) - - @pyqtSlot() - def on_idlButton_clicked(self): - """ - Private slot to handle the IDL compiler selection. - """ - file = E5FileDialog.getOpenFileName( - self, - self.tr("Select IDL compiler"), - self.idlEdit.text(), - "") - - if file: - self.idlEdit.setText(Utilities.toNativeSeparators(file)) + Preferences.setCorba("omniidl", self.idlPicker.text()) def create(dlg):
--- a/Preferences/ConfigurationPages/CorbaPage.ui Sun Nov 22 12:03:31 2015 +0100 +++ b/Preferences/ConfigurationPages/CorbaPage.ui Sun Nov 22 18:41:02 2015 +0100 @@ -36,28 +36,21 @@ <property name="title"> <string>IDL Compiler</string> </property> - <layout class="QGridLayout"> - <item row="0" column="0"> - <widget class="QLineEdit" name="idlEdit"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="E5PathPicker" name="idlPicker" native="true"> <property name="toolTip"> <string>Enter the path to the IDL compiler.</string> </property> </widget> </item> - <item row="1" column="0" colspan="2"> + <item> <widget class="QLabel" name="textLabel1_4"> <property name="text"> <string><b>Note:</b> Leave this entry empty to use the default value (omniidl or omniidl.exe).</string> </property> </widget> </item> - <item row="0" column="1"> - <widget class="QToolButton" name="idlButton"> - <property name="toolTip"> - <string>Press to select the IDL compiler via a file selection dialog.</string> - </property> - </widget> - </item> </layout> </widget> </item> @@ -76,10 +69,14 @@ </item> </layout> </widget> - <tabstops> - <tabstop>idlEdit</tabstop> - <tabstop>idlButton</tabstop> - </tabstops> + <customwidgets> + <customwidget> + <class>E5PathPicker</class> + <extends>QWidget</extends> + <header>E5Gui/E5PathPicker.h</header> + <container>1</container> + </customwidget> + </customwidgets> <resources/> <connections/> </ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ThirdParty/enum/LICENSE Sun Nov 22 18:41:02 2015 +0100 @@ -0,0 +1,32 @@ +Copyright (c) 2013, Ethan Furman. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. + + Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials + provided with the distribution. + + Neither the name Ethan Furman nor the names of any + contributors may be used to endorse or promote products + derived from this software without specific prior written + permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ThirdParty/enum/__init__.py Sun Nov 22 18:41:02 2015 +0100 @@ -0,0 +1,790 @@ +"""Python Enumerations""" + +import sys as _sys + +__all__ = ['Enum', 'IntEnum', 'unique'] + +version = 1, 0, 4 + +pyver = float('%s.%s' % _sys.version_info[:2]) + +try: + any +except NameError: + def any(iterable): + for element in iterable: + if element: + return True + return False + +try: + from collections import OrderedDict +except ImportError: + OrderedDict = None + +try: + basestring +except NameError: + # In Python 2 basestring is the ancestor of both str and unicode + # in Python 3 it's just str, but was missing in 3.1 + basestring = str + +try: + unicode +except NameError: + # In Python 3 unicode no longer exists (it's just str) + unicode = str + +class _RouteClassAttributeToGetattr(object): + """Route attribute access on a class to __getattr__. + + This is a descriptor, used to define attributes that act differently when + accessed through an instance and through a class. Instance access remains + normal, but access to an attribute through a class will be routed to the + class's __getattr__ method; this is done by raising AttributeError. + + """ + def __init__(self, fget=None): + self.fget = fget + + def __get__(self, instance, ownerclass=None): + if instance is None: + raise AttributeError() + return self.fget(instance) + + def __set__(self, instance, value): + raise AttributeError("can't set attribute") + + def __delete__(self, instance): + raise AttributeError("can't delete attribute") + + +def _is_descriptor(obj): + """Returns True if obj is a descriptor, False otherwise.""" + return ( + hasattr(obj, '__get__') or + hasattr(obj, '__set__') or + hasattr(obj, '__delete__')) + + +def _is_dunder(name): + """Returns True if a __dunder__ name, False otherwise.""" + return (name[:2] == name[-2:] == '__' and + name[2:3] != '_' and + name[-3:-2] != '_' and + len(name) > 4) + + +def _is_sunder(name): + """Returns True if a _sunder_ name, False otherwise.""" + return (name[0] == name[-1] == '_' and + name[1:2] != '_' and + name[-2:-1] != '_' and + len(name) > 2) + + +def _make_class_unpicklable(cls): + """Make the given class un-picklable.""" + def _break_on_call_reduce(self, protocol=None): + raise TypeError('%r cannot be pickled' % self) + cls.__reduce_ex__ = _break_on_call_reduce + cls.__module__ = '<unknown>' + + +class _EnumDict(dict): + """Track enum member order and ensure member names are not reused. + + EnumMeta will use the names found in self._member_names as the + enumeration member names. + + """ + def __init__(self): + super(_EnumDict, self).__init__() + self._member_names = [] + + def __setitem__(self, key, value): + """Changes anything not dundered or not a descriptor. + + If a descriptor is added with the same name as an enum member, the name + is removed from _member_names (this may leave a hole in the numerical + sequence of values). + + If an enum member name is used twice, an error is raised; duplicate + values are not checked for. + + Single underscore (sunder) names are reserved. + + Note: in 3.x __order__ is simply discarded as a not necessary piece + leftover from 2.x + + """ + if pyver >= 3.0 and key == '__order__': + return + if _is_sunder(key): + raise ValueError('_names_ are reserved for future Enum use') + elif _is_dunder(key): + pass + elif key in self._member_names: + # descriptor overwriting an enum? + raise TypeError('Attempted to reuse key: %r' % key) + elif not _is_descriptor(value): + if key in self: + # enum overwriting a descriptor? + raise TypeError('Key already defined as: %r' % self[key]) + self._member_names.append(key) + super(_EnumDict, self).__setitem__(key, value) + + +# Dummy value for Enum as EnumMeta explicity checks for it, but of course until +# EnumMeta finishes running the first time the Enum class doesn't exist. This +# is also why there are checks in EnumMeta like `if Enum is not None` +Enum = None + + +class EnumMeta(type): + """Metaclass for Enum""" + @classmethod + def __prepare__(metacls, cls, bases): + return _EnumDict() + + def __new__(metacls, cls, bases, classdict): + # an Enum class is final once enumeration items have been defined; it + # cannot be mixed with other types (int, float, etc.) if it has an + # inherited __new__ unless a new __new__ is defined (or the resulting + # class will fail). + if type(classdict) is dict: + original_dict = classdict + classdict = _EnumDict() + for k, v in original_dict.items(): + classdict[k] = v + + member_type, first_enum = metacls._get_mixins_(bases) + __new__, save_new, use_args = metacls._find_new_(classdict, member_type, + first_enum) + # save enum items into separate mapping so they don't get baked into + # the new class + members = dict((k, classdict[k]) for k in classdict._member_names) + for name in classdict._member_names: + del classdict[name] + + # py2 support for definition order + __order__ = classdict.get('__order__') + if __order__ is None: + if pyver < 3.0: + try: + __order__ = [name for (name, value) in sorted(members.items(), key=lambda item: item[1])] + except TypeError: + __order__ = [name for name in sorted(members.keys())] + else: + __order__ = classdict._member_names + else: + del classdict['__order__'] + if pyver < 3.0: + __order__ = __order__.replace(',', ' ').split() + aliases = [name for name in members if name not in __order__] + __order__ += aliases + + # check for illegal enum names (any others?) + invalid_names = set(members) & set(['mro']) + if invalid_names: + raise ValueError('Invalid enum member name(s): %s' % ( + ', '.join(invalid_names), )) + + # create our new Enum type + enum_class = super(EnumMeta, metacls).__new__(metacls, cls, bases, classdict) + enum_class._member_names_ = [] # names in random order + if OrderedDict is not None: + enum_class._member_map_ = OrderedDict() + else: + enum_class._member_map_ = {} # name->value map + enum_class._member_type_ = member_type + + # Reverse value->name map for hashable values. + enum_class._value2member_map_ = {} + + # instantiate them, checking for duplicates as we go + # we instantiate first instead of checking for duplicates first in case + # a custom __new__ is doing something funky with the values -- such as + # auto-numbering ;) + if __new__ is None: + __new__ = enum_class.__new__ + for member_name in __order__: + value = members[member_name] + if not isinstance(value, tuple): + args = (value, ) + else: + args = value + if member_type is tuple: # special case for tuple enums + args = (args, ) # wrap it one more time + if not use_args or not args: + enum_member = __new__(enum_class) + if not hasattr(enum_member, '_value_'): + enum_member._value_ = value + else: + enum_member = __new__(enum_class, *args) + if not hasattr(enum_member, '_value_'): + enum_member._value_ = member_type(*args) + value = enum_member._value_ + enum_member._name_ = member_name + enum_member.__objclass__ = enum_class + enum_member.__init__(*args) + # If another member with the same value was already defined, the + # new member becomes an alias to the existing one. + for name, canonical_member in enum_class._member_map_.items(): + if canonical_member.value == enum_member._value_: + enum_member = canonical_member + break + else: + # Aliases don't appear in member names (only in __members__). + enum_class._member_names_.append(member_name) + enum_class._member_map_[member_name] = enum_member + try: + # This may fail if value is not hashable. We can't add the value + # to the map, and by-value lookups for this value will be + # linear. + enum_class._value2member_map_[value] = enum_member + except TypeError: + pass + + + # If a custom type is mixed into the Enum, and it does not know how + # to pickle itself, pickle.dumps will succeed but pickle.loads will + # fail. Rather than have the error show up later and possibly far + # from the source, sabotage the pickle protocol for this class so + # that pickle.dumps also fails. + # + # However, if the new class implements its own __reduce_ex__, do not + # sabotage -- it's on them to make sure it works correctly. We use + # __reduce_ex__ instead of any of the others as it is preferred by + # pickle over __reduce__, and it handles all pickle protocols. + unpicklable = False + if '__reduce_ex__' not in classdict: + if member_type is not object: + methods = ('__getnewargs_ex__', '__getnewargs__', + '__reduce_ex__', '__reduce__') + if not any(m in member_type.__dict__ for m in methods): + _make_class_unpicklable(enum_class) + unpicklable = True + + + # double check that repr and friends are not the mixin's or various + # things break (such as pickle) + for name in ('__repr__', '__str__', '__format__', '__reduce_ex__'): + class_method = getattr(enum_class, name) + obj_method = getattr(member_type, name, None) + enum_method = getattr(first_enum, name, None) + if name not in classdict and class_method is not enum_method: + if name == '__reduce_ex__' and unpicklable: + continue + setattr(enum_class, name, enum_method) + + # method resolution and int's are not playing nice + # Python's less than 2.6 use __cmp__ + + if pyver < 2.6: + + if issubclass(enum_class, int): + setattr(enum_class, '__cmp__', getattr(int, '__cmp__')) + + elif pyver < 3.0: + + if issubclass(enum_class, int): + for method in ( + '__le__', + '__lt__', + '__gt__', + '__ge__', + '__eq__', + '__ne__', + '__hash__', + ): + setattr(enum_class, method, getattr(int, method)) + + # replace any other __new__ with our own (as long as Enum is not None, + # anyway) -- again, this is to support pickle + if Enum is not None: + # if the user defined their own __new__, save it before it gets + # clobbered in case they subclass later + if save_new: + setattr(enum_class, '__member_new__', enum_class.__dict__['__new__']) + setattr(enum_class, '__new__', Enum.__dict__['__new__']) + return enum_class + + def __call__(cls, value, names=None, module=None, type=None): + """Either returns an existing member, or creates a new enum class. + + This method is used both when an enum class is given a value to match + to an enumeration member (i.e. Color(3)) and for the functional API + (i.e. Color = Enum('Color', names='red green blue')). + + When used for the functional API: `module`, if set, will be stored in + the new class' __module__ attribute; `type`, if set, will be mixed in + as the first base class. + + Note: if `module` is not set this routine will attempt to discover the + calling module by walking the frame stack; if this is unsuccessful + the resulting class will not be pickleable. + + """ + if names is None: # simple value lookup + return cls.__new__(cls, value) + # otherwise, functional API: we're creating a new Enum type + return cls._create_(value, names, module=module, type=type) + + def __contains__(cls, member): + return isinstance(member, cls) and member.name in cls._member_map_ + + def __delattr__(cls, attr): + # nicer error message when someone tries to delete an attribute + # (see issue19025). + if attr in cls._member_map_: + raise AttributeError( + "%s: cannot delete Enum member." % cls.__name__) + super(EnumMeta, cls).__delattr__(attr) + + def __dir__(self): + return (['__class__', '__doc__', '__members__', '__module__'] + + self._member_names_) + + @property + def __members__(cls): + """Returns a mapping of member name->value. + + This mapping lists all enum members, including aliases. Note that this + is a copy of the internal mapping. + + """ + return cls._member_map_.copy() + + def __getattr__(cls, name): + """Return the enum member matching `name` + + We use __getattr__ instead of descriptors or inserting into the enum + class' __dict__ in order to support `name` and `value` being both + properties for enum members (which live in the class' __dict__) and + enum members themselves. + + """ + if _is_dunder(name): + raise AttributeError(name) + try: + return cls._member_map_[name] + except KeyError: + raise AttributeError(name) + + def __getitem__(cls, name): + return cls._member_map_[name] + + def __iter__(cls): + return (cls._member_map_[name] for name in cls._member_names_) + + def __reversed__(cls): + return (cls._member_map_[name] for name in reversed(cls._member_names_)) + + def __len__(cls): + return len(cls._member_names_) + + def __repr__(cls): + return "<enum %r>" % cls.__name__ + + def __setattr__(cls, name, value): + """Block attempts to reassign Enum members. + + A simple assignment to the class namespace only changes one of the + several possible ways to get an Enum member from the Enum class, + resulting in an inconsistent Enumeration. + + """ + member_map = cls.__dict__.get('_member_map_', {}) + if name in member_map: + raise AttributeError('Cannot reassign members.') + super(EnumMeta, cls).__setattr__(name, value) + + def _create_(cls, class_name, names=None, module=None, type=None): + """Convenience method to create a new Enum class. + + `names` can be: + + * A string containing member names, separated either with spaces or + commas. Values are auto-numbered from 1. + * An iterable of member names. Values are auto-numbered from 1. + * An iterable of (member name, value) pairs. + * A mapping of member name -> value. + + """ + if pyver < 3.0: + # if class_name is unicode, attempt a conversion to ASCII + if isinstance(class_name, unicode): + try: + class_name = class_name.encode('ascii') + except UnicodeEncodeError: + raise TypeError('%r is not representable in ASCII' % class_name) + metacls = cls.__class__ + if type is None: + bases = (cls, ) + else: + bases = (type, cls) + classdict = metacls.__prepare__(class_name, bases) + __order__ = [] + + # special processing needed for names? + if isinstance(names, basestring): + names = names.replace(',', ' ').split() + if isinstance(names, (tuple, list)) and isinstance(names[0], basestring): + names = [(e, i+1) for (i, e) in enumerate(names)] + + # Here, names is either an iterable of (name, value) or a mapping. + for item in names: + if isinstance(item, basestring): + member_name, member_value = item, names[item] + else: + member_name, member_value = item + classdict[member_name] = member_value + __order__.append(member_name) + # only set __order__ in classdict if name/value was not from a mapping + if not isinstance(item, basestring): + classdict['__order__'] = ' '.join(__order__) + enum_class = metacls.__new__(metacls, class_name, bases, classdict) + + # TODO: replace the frame hack if a blessed way to know the calling + # module is ever developed + if module is None: + try: + module = _sys._getframe(2).f_globals['__name__'] + except (AttributeError, ValueError): + pass + if module is None: + _make_class_unpicklable(enum_class) + else: + enum_class.__module__ = module + + return enum_class + + @staticmethod + def _get_mixins_(bases): + """Returns the type for creating enum members, and the first inherited + enum class. + + bases: the tuple of bases that was given to __new__ + + """ + if not bases or Enum is None: + return object, Enum + + + # double check that we are not subclassing a class with existing + # enumeration members; while we're at it, see if any other data + # type has been mixed in so we can use the correct __new__ + member_type = first_enum = None + for base in bases: + if (base is not Enum and + issubclass(base, Enum) and + base._member_names_): + raise TypeError("Cannot extend enumerations") + # base is now the last base in bases + if not issubclass(base, Enum): + raise TypeError("new enumerations must be created as " + "`ClassName([mixin_type,] enum_type)`") + + # get correct mix-in type (either mix-in type of Enum subclass, or + # first base if last base is Enum) + if not issubclass(bases[0], Enum): + member_type = bases[0] # first data type + first_enum = bases[-1] # enum type + else: + for base in bases[0].__mro__: + # most common: (IntEnum, int, Enum, object) + # possible: (<Enum 'AutoIntEnum'>, <Enum 'IntEnum'>, + # <class 'int'>, <Enum 'Enum'>, + # <class 'object'>) + if issubclass(base, Enum): + if first_enum is None: + first_enum = base + else: + if member_type is None: + member_type = base + + return member_type, first_enum + + if pyver < 3.0: + @staticmethod + def _find_new_(classdict, member_type, first_enum): + """Returns the __new__ to be used for creating the enum members. + + classdict: the class dictionary given to __new__ + member_type: the data type whose __new__ will be used by default + first_enum: enumeration to check for an overriding __new__ + + """ + # now find the correct __new__, checking to see of one was defined + # by the user; also check earlier enum classes in case a __new__ was + # saved as __member_new__ + __new__ = classdict.get('__new__', None) + if __new__: + return None, True, True # __new__, save_new, use_args + + N__new__ = getattr(None, '__new__') + O__new__ = getattr(object, '__new__') + if Enum is None: + E__new__ = N__new__ + else: + E__new__ = Enum.__dict__['__new__'] + # check all possibles for __member_new__ before falling back to + # __new__ + for method in ('__member_new__', '__new__'): + for possible in (member_type, first_enum): + try: + target = possible.__dict__[method] + except (AttributeError, KeyError): + target = getattr(possible, method, None) + if target not in [ + None, + N__new__, + O__new__, + E__new__, + ]: + if method == '__member_new__': + classdict['__new__'] = target + return None, False, True + if isinstance(target, staticmethod): + target = target.__get__(member_type) + __new__ = target + break + if __new__ is not None: + break + else: + __new__ = object.__new__ + + # if a non-object.__new__ is used then whatever value/tuple was + # assigned to the enum member name will be passed to __new__ and to the + # new enum member's __init__ + if __new__ is object.__new__: + use_args = False + else: + use_args = True + + return __new__, False, use_args + else: + @staticmethod + def _find_new_(classdict, member_type, first_enum): + """Returns the __new__ to be used for creating the enum members. + + classdict: the class dictionary given to __new__ + member_type: the data type whose __new__ will be used by default + first_enum: enumeration to check for an overriding __new__ + + """ + # now find the correct __new__, checking to see of one was defined + # by the user; also check earlier enum classes in case a __new__ was + # saved as __member_new__ + __new__ = classdict.get('__new__', None) + + # should __new__ be saved as __member_new__ later? + save_new = __new__ is not None + + if __new__ is None: + # check all possibles for __member_new__ before falling back to + # __new__ + for method in ('__member_new__', '__new__'): + for possible in (member_type, first_enum): + target = getattr(possible, method, None) + if target not in ( + None, + None.__new__, + object.__new__, + Enum.__new__, + ): + __new__ = target + break + if __new__ is not None: + break + else: + __new__ = object.__new__ + + # if a non-object.__new__ is used then whatever value/tuple was + # assigned to the enum member name will be passed to __new__ and to the + # new enum member's __init__ + if __new__ is object.__new__: + use_args = False + else: + use_args = True + + return __new__, save_new, use_args + + +######################################################## +# In order to support Python 2 and 3 with a single +# codebase we have to create the Enum methods separately +# and then use the `type(name, bases, dict)` method to +# create the class. +######################################################## +temp_enum_dict = {} +temp_enum_dict['__doc__'] = "Generic enumeration.\n\n Derive from this class to define new enumerations.\n\n" + +def __new__(cls, value): + # all enum instances are actually created during class construction + # without calling this method; this method is called by the metaclass' + # __call__ (i.e. Color(3) ), and by pickle + if type(value) is cls: + # For lookups like Color(Color.red) + value = value.value + #return value + # by-value search for a matching enum member + # see if it's in the reverse mapping (for hashable values) + try: + if value in cls._value2member_map_: + return cls._value2member_map_[value] + except TypeError: + # not there, now do long search -- O(n) behavior + for member in cls._member_map_.values(): + if member.value == value: + return member + raise ValueError("%s is not a valid %s" % (value, cls.__name__)) +temp_enum_dict['__new__'] = __new__ +del __new__ + +def __repr__(self): + return "<%s.%s: %r>" % ( + self.__class__.__name__, self._name_, self._value_) +temp_enum_dict['__repr__'] = __repr__ +del __repr__ + +def __str__(self): + return "%s.%s" % (self.__class__.__name__, self._name_) +temp_enum_dict['__str__'] = __str__ +del __str__ + +def __dir__(self): + added_behavior = [ + m + for cls in self.__class__.mro() + for m in cls.__dict__ + if m[0] != '_' + ] + return (['__class__', '__doc__', '__module__', ] + added_behavior) +temp_enum_dict['__dir__'] = __dir__ +del __dir__ + +def __format__(self, format_spec): + # mixed-in Enums should use the mixed-in type's __format__, otherwise + # we can get strange results with the Enum name showing up instead of + # the value + + # pure Enum branch + if self._member_type_ is object: + cls = str + val = str(self) + # mix-in branch + else: + cls = self._member_type_ + val = self.value + return cls.__format__(val, format_spec) +temp_enum_dict['__format__'] = __format__ +del __format__ + + +#################################### +# Python's less than 2.6 use __cmp__ + +if pyver < 2.6: + + def __cmp__(self, other): + if type(other) is self.__class__: + if self is other: + return 0 + return -1 + return NotImplemented + raise TypeError("unorderable types: %s() and %s()" % (self.__class__.__name__, other.__class__.__name__)) + temp_enum_dict['__cmp__'] = __cmp__ + del __cmp__ + +else: + + def __le__(self, other): + raise TypeError("unorderable types: %s() <= %s()" % (self.__class__.__name__, other.__class__.__name__)) + temp_enum_dict['__le__'] = __le__ + del __le__ + + def __lt__(self, other): + raise TypeError("unorderable types: %s() < %s()" % (self.__class__.__name__, other.__class__.__name__)) + temp_enum_dict['__lt__'] = __lt__ + del __lt__ + + def __ge__(self, other): + raise TypeError("unorderable types: %s() >= %s()" % (self.__class__.__name__, other.__class__.__name__)) + temp_enum_dict['__ge__'] = __ge__ + del __ge__ + + def __gt__(self, other): + raise TypeError("unorderable types: %s() > %s()" % (self.__class__.__name__, other.__class__.__name__)) + temp_enum_dict['__gt__'] = __gt__ + del __gt__ + + +def __eq__(self, other): + if type(other) is self.__class__: + return self is other + return NotImplemented +temp_enum_dict['__eq__'] = __eq__ +del __eq__ + +def __ne__(self, other): + if type(other) is self.__class__: + return self is not other + return NotImplemented +temp_enum_dict['__ne__'] = __ne__ +del __ne__ + +def __hash__(self): + return hash(self._name_) +temp_enum_dict['__hash__'] = __hash__ +del __hash__ + +def __reduce_ex__(self, proto): + return self.__class__, (self._value_, ) +temp_enum_dict['__reduce_ex__'] = __reduce_ex__ +del __reduce_ex__ + +# _RouteClassAttributeToGetattr is used to provide access to the `name` +# and `value` properties of enum members while keeping some measure of +# protection from modification, while still allowing for an enumeration +# to have members named `name` and `value`. This works because enumeration +# members are not set directly on the enum class -- __getattr__ is +# used to look them up. + +@_RouteClassAttributeToGetattr +def name(self): + return self._name_ +temp_enum_dict['name'] = name +del name + +@_RouteClassAttributeToGetattr +def value(self): + return self._value_ +temp_enum_dict['value'] = value +del value + +Enum = EnumMeta('Enum', (object, ), temp_enum_dict) +del temp_enum_dict + +# Enum has now been created +########################### + +class IntEnum(int, Enum): + """Enum where members are also (and must be) ints""" + + +def unique(enumeration): + """Class decorator that ensures only unique members exist in an enumeration.""" + duplicates = [] + for name, member in enumeration.__members__.items(): + if name != member.name: + duplicates.append((name, member.name)) + if duplicates: + duplicate_names = ', '.join( + ["%s -> %s" % (alias, name) for (alias, name) in duplicates] + ) + raise ValueError('duplicate names found in %r: %s' % + (enumeration, duplicate_names) + ) + return enumeration
--- a/eric6.e4p Sun Nov 22 12:03:31 2015 +0100 +++ b/eric6.e4p Sun Nov 22 18:41:02 2015 +0100 @@ -180,6 +180,7 @@ <Source>E5Gui/E5ModelToolBar.py</Source> <Source>E5Gui/E5PassivePopup.py</Source> <Source>E5Gui/E5PasswordMeter.py</Source> + <Source>E5Gui/E5PathPicker.py</Source> <Source>E5Gui/E5ProgressDialog.py</Source> <Source>E5Gui/E5SideBar.py</Source> <Source>E5Gui/E5SingleApplication.py</Source> @@ -1159,6 +1160,7 @@ <Source>ThirdParty/Send2Trash/send2trash/plat_other.py</Source> <Source>ThirdParty/Send2Trash/send2trash/plat_win.py</Source> <Source>ThirdParty/__init__.py</Source> + <Source>ThirdParty/enum/__init__.py</Source> <Source>Toolbox/PyQt4ImportHook.py</Source> <Source>Toolbox/SingleApplication.py</Source> <Source>Toolbox/Startup.py</Source> @@ -1751,6 +1753,7 @@ <Other>ThirdParty/Pygments/pygments/LICENSE</Other> <Other>ThirdParty/Pygments/pygments/PKG-INFO</Other> <Other>ThirdParty/Send2Trash/LICENSE</Other> + <Other>ThirdParty/enum/LICENSE</Other> <Other>changelog</Other> <Other>default.e4k</Other> <Other>default_Mac.e4k</Other>
--- a/i18n/eric6_cs.ts Sun Nov 22 12:03:31 2015 +0100 +++ b/i18n/eric6_cs.ts Sun Nov 22 18:41:02 2015 +0100 @@ -3077,37 +3077,37 @@ <translation type="unfinished">Zpráva</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="68"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> <source>PEP-257</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="69"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/> <source>Eric</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> - <source>Statistics...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="75"/> - <source>Press to show some statistics for the last run</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/> - <source>Show</source> - <translation type="unfinished">Zobrazit</translation> + <source>Statistics...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> + <source>Press to show some statistics for the last run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/> + <source>Show</source> + <translation type="unfinished">Zobrazit</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/> <source>Press to show all files containing an issue</source> <translation type="unfinished">Stisknout pro zobrazení všech souborů, které obsahují problém</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="552"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/> <source>Error: {0}</source> <translation type="unfinished">Chyby: {0}</translation> </message> @@ -3117,7 +3117,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="692"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/> <source>No issues found.</source> <translation type="unfinished">Žádné problémy nenalezeny.</translation> </message> @@ -3142,12 +3142,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="645"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/> <source>{0} (ignored)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="537"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> @@ -3162,12 +3162,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/> <source>Errors</source> <translation type="unfinished">Chyby</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="579"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/> <source>Transferring data...</source> <translation type="unfinished"></translation> </message> @@ -4840,14 +4840,14 @@ <translation>IDL kompilátor</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="33"/> <source>Press to select the IDL compiler via a file selection dialog.</source> <translation>Stisknout pro výběr IDL kompilátoru přes dialog výběru souboru.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="43"/> <source>Enter the path to the IDL compiler.</source> - <translation>Zadejte cestu k IDL kompilátoru.</translation> + <translation type="unfinished">Zadejte cestu k IDL kompilátoru.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="50"/> @@ -4857,7 +4857,7 @@ <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="55"/> <source>Select IDL compiler</source> - <translation>Vyberte IDL kompliátor</translation> + <translation type="obsolete">Vyberte IDL kompliátor</translation> </message> </context> <context> @@ -7928,6 +7928,34 @@ </message> </context> <context> + <name>E5PathPicker</name> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="70"/> + <source>Enter Path Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="275"/> + <source>Choose a file to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="277"/> + <source>Choose files to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="279"/> + <source>Choose a file to save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="281"/> + <source>Choose a directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>E5RequestModel</name> <message> <location filename="../E5Network/E5NetworkMonitor.py" line="225"/> @@ -21100,42 +21128,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="90"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="137"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="141"/> <source>Received data on unexpected channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="144"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="157"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="162"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="351"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -60373,57 +60401,57 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="321"/> + <location filename="../Debugger/VariablesViewer.py" line="279"/> <source>Global Variables</source> <translation>Globální proměnné</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="322"/> + <location filename="../Debugger/VariablesViewer.py" line="280"/> <source>Globals</source> <translation>Globální</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Value</source> <translation>Hodnota</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Type</source> <translation>Typ</translation> </message> <message> + <location filename="../Debugger/VariablesViewer.py" line="284"/> + <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> + <translation><b>Prohlížeč globálních proměnných</b><p>Toto okno zobrazuje globální proměnné debugovénho programu.</p></translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="290"/> + <source>Local Variables</source> + <translation>Lokální proměnné</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="291"/> + <source>Locals</source> + <translation>Lokální</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="295"/> + <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> + <translation><b>Prohlížeč lokálních proměnných</b><p>Toto okno zobrazuje lokální proměnné debugovénho programu.</p></translation> + </message> + <message> <location filename="../Debugger/VariablesViewer.py" line="326"/> - <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> - <translation><b>Prohlížeč globálních proměnných</b><p>Toto okno zobrazuje globální proměnné debugovénho programu.</p></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="332"/> - <source>Local Variables</source> - <translation>Lokální proměnné</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> - <source>Locals</source> - <translation>Lokální</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="337"/> - <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> - <translation><b>Prohlížeč lokálních proměnných</b><p>Toto okno zobrazuje lokální proměnné debugovénho programu.</p></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="367"/> <source>Show Details...</source> <translation>Zobrazit detaily...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="372"/> + <location filename="../Debugger/VariablesViewer.py" line="331"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="580"/> + <location filename="../Debugger/VariablesViewer.py" line="539"/> <source>{0} items</source> <translation>{0} položek</translation> </message>
--- a/i18n/eric6_de.ts Sun Nov 22 12:03:31 2015 +0100 +++ b/i18n/eric6_de.ts Sun Nov 22 18:41:02 2015 +0100 @@ -3093,37 +3093,37 @@ <translation>Nachricht</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="68"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> <source>PEP-257</source> <translation>PEP-257</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="69"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/> <source>Eric</source> <translation>Eric</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> - <source>Statistics...</source> - <translation>Statistik...</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="75"/> - <source>Press to show some statistics for the last run</source> - <translation>Drücken, um eine Statistik für den letzten Lauf zu zeigen</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/> - <source>Show</source> - <translation>Zeige</translation> + <source>Statistics...</source> + <translation>Statistik...</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> + <source>Press to show some statistics for the last run</source> + <translation>Drücken, um eine Statistik für den letzten Lauf zu zeigen</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/> + <source>Show</source> + <translation>Zeige</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/> <source>Press to show all files containing an issue</source> <translation>Drücken, um alle Dateien mit Problemen anzuzeigen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="552"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/> <source>Error: {0}</source> <translation>Fehler: {0}</translation> </message> @@ -3133,7 +3133,7 @@ <translation>Lösung: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="692"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/> <source>No issues found.</source> <translation>Keine Probleme gefunden.</translation> </message> @@ -3158,12 +3158,12 @@ <translation>Ignorierte anzeigen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="645"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/> <source>{0} (ignored)</source> <translation>{0} (ignoriert)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="537"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/> <source>Preparing files...</source> <translation>Bereite Dateien vor...</translation> </message> @@ -3178,12 +3178,12 @@ <translation>Gib die maximal erlaubte Codekomplexität ein (McCabe: 10)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="579"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/> <source>Transferring data...</source> <translation>Übertrage Daten...</translation> </message> @@ -4840,7 +4840,7 @@ <translation>IDL-Compiler</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="33"/> <source>Press to select the IDL compiler via a file selection dialog.</source> <translation>Den IDL-Compiler mittels eines Dateiauswahldialoges wählen.</translation> </message> @@ -4855,11 +4855,6 @@ <translation><b>Hinweis:</b> Lasse diesen Eintrag leer, um den Standardwert (omniidl bzw. omniidl.exe) zu verwenden.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="55"/> - <source>Select IDL compiler</source> - <translation>Wähle IDL-Compiler</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="17"/> <source><b>Configure CORBA support</b></source> <translation><b>CORBA-Unterstützung einstellen</b></translation> @@ -7930,6 +7925,34 @@ </message> </context> <context> + <name>E5PathPicker</name> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="70"/> + <source>Enter Path Name</source> + <translation>Gib den Pfadnamen ein</translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="275"/> + <source>Choose a file to open</source> + <translation>Wähle eine zu öffnende Datei aus</translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="277"/> + <source>Choose files to open</source> + <translation>Wähle zu öffnende Dateien aus</translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="279"/> + <source>Choose a file to save</source> + <translation>Wähle eine zu schreibende Datei aus</translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="281"/> + <source>Choose a directory</source> + <translation>Wähle ein Verzeichnis aus</translation> + </message> +</context> +<context> <name>E5RequestModel</name> <message> <location filename="../E5Network/E5NetworkMonitor.py" line="225"/> @@ -21104,42 +21127,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="90"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="137"/> + <source>Did not receive the 'hello' message.</source> + <translation>„Hallo“-Nachricht konnte nicht empfangen werden.</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> - <source>Did not receive the 'hello' message.</source> - <translation>„Hallo“-Nachricht konnte nicht empfangen werden.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="141"/> <source>Received data on unexpected channel.</source> <translation>Daten auf unerwartetem Kanal empfangen.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="144"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation>Ungültige „Hallo“-Nachricht; Erwartete „capabilities: “, empfing jedoch „{0}“.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149"/> <source>'capabilities' message did not contain any capability.</source> <translation>„capabilities“-Nachricht enthielt keine Fähigkeiten.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="157"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation>Ungültige „Hallo“-Nachricht; Erwartete „encoding: “, empfing jedoch „{0}“.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="162"/> <source>'encoding' message did not contain any encoding.</source> <translation>„encoding“-Nachricht enthielt keine Kodierung.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="351"/> <source>For message see output dialog.</source> <translation>Nachricht siehe Ausgabedialog.</translation> </message> @@ -60498,57 +60521,57 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="321"/> + <location filename="../Debugger/VariablesViewer.py" line="279"/> <source>Global Variables</source> <translation>Globale Variablen</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="322"/> + <location filename="../Debugger/VariablesViewer.py" line="280"/> <source>Globals</source> <translation>Global</translation> </message> <message> + <location filename="../Debugger/VariablesViewer.py" line="284"/> + <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> + <translation><b>Das Globale Variablen Fenster</b><p>Dieses Fenster zeigt die globalen Variablen des untersuchten Programmes an.</p></translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="290"/> + <source>Local Variables</source> + <translation>Lokale Variablen</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="291"/> + <source>Locals</source> + <translation>Lokal</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="295"/> + <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> + <translation><b>Das Lokale Variablen Fenster</b><p>Dieses Fenster zeigt die lokalen Variablen des untersuchten Programmes an.</p></translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="291"/> + <source>Type</source> + <translation>Typ</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="291"/> + <source>Value</source> + <translation>Wert</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="539"/> + <source>{0} items</source> + <translation>{0} Einträge</translation> + </message> + <message> <location filename="../Debugger/VariablesViewer.py" line="326"/> - <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> - <translation><b>Das Globale Variablen Fenster</b><p>Dieses Fenster zeigt die globalen Variablen des untersuchten Programmes an.</p></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="332"/> - <source>Local Variables</source> - <translation>Lokale Variablen</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> - <source>Locals</source> - <translation>Lokal</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="337"/> - <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> - <translation><b>Das Lokale Variablen Fenster</b><p>Dieses Fenster zeigt die lokalen Variablen des untersuchten Programmes an.</p></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> - <source>Type</source> - <translation>Typ</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> - <source>Value</source> - <translation>Wert</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="580"/> - <source>{0} items</source> - <translation>{0} Einträge</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="367"/> <source>Show Details...</source> <translation>Zeige Details...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="372"/> + <location filename="../Debugger/VariablesViewer.py" line="331"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message>
--- a/i18n/eric6_en.ts Sun Nov 22 12:03:31 2015 +0100 +++ b/i18n/eric6_en.ts Sun Nov 22 18:41:02 2015 +0100 @@ -3049,37 +3049,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="68"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> <source>PEP-257</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="69"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/> <source>Eric</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> - <source>Statistics...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="75"/> - <source>Press to show some statistics for the last run</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/> - <source>Show</source> + <source>Statistics...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> + <source>Press to show some statistics for the last run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/> + <source>Show</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/> <source>Press to show all files containing an issue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="552"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> @@ -3089,7 +3089,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="692"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> @@ -3114,12 +3114,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="645"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/> <source>{0} (ignored)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="537"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> @@ -3134,12 +3134,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="579"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/> <source>Transferring data...</source> <translation type="unfinished"></translation> </message> @@ -4799,7 +4799,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="33"/> <source>Press to select the IDL compiler via a file selection dialog.</source> <translation type="unfinished"></translation> </message> @@ -4813,11 +4813,6 @@ <source><b>Note:</b> Leave this entry empty to use the default value (omniidl or omniidl.exe).</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="55"/> - <source>Select IDL compiler</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>CreateDialogCodeDialog</name> @@ -7846,6 +7841,34 @@ </message> </context> <context> + <name>E5PathPicker</name> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="70"/> + <source>Enter Path Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="275"/> + <source>Choose a file to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="277"/> + <source>Choose files to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="279"/> + <source>Choose a file to save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="281"/> + <source>Choose a directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>E5RequestModel</name> <message> <location filename="../E5Network/E5NetworkMonitor.py" line="225"/> @@ -20993,42 +21016,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="90"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="137"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="141"/> <source>Received data on unexpected channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="144"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="157"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="162"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="351"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -59950,57 +59973,57 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="321"/> + <location filename="../Debugger/VariablesViewer.py" line="279"/> <source>Global Variables</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="322"/> + <location filename="../Debugger/VariablesViewer.py" line="280"/> <source>Globals</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Value</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Type</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Debugger/VariablesViewer.py" line="284"/> + <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="290"/> + <source>Local Variables</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="291"/> + <source>Locals</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="295"/> + <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Debugger/VariablesViewer.py" line="326"/> - <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="332"/> - <source>Local Variables</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> - <source>Locals</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="337"/> - <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="367"/> <source>Show Details...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="372"/> + <location filename="../Debugger/VariablesViewer.py" line="331"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="580"/> + <location filename="../Debugger/VariablesViewer.py" line="539"/> <source>{0} items</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_es.ts Sun Nov 22 12:03:31 2015 +0100 +++ b/i18n/eric6_es.ts Sun Nov 22 18:41:02 2015 +0100 @@ -3091,37 +3091,37 @@ <translation>Mensaje</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="68"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> <source>PEP-257</source> <translation>Muestra el progreso de la comprobación del estilo de código</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="69"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/> <source>Eric</source> <translation>Eric</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> - <source>Statistics...</source> - <translation>Estadísticas...</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="75"/> - <source>Press to show some statistics for the last run</source> - <translation>Pulsar para mostrar algunas estadísticas de la última ejecución</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/> - <source>Show</source> - <translation>Mostrar</translation> + <source>Statistics...</source> + <translation>Estadísticas...</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> + <source>Press to show some statistics for the last run</source> + <translation>Pulsar para mostrar algunas estadísticas de la última ejecución</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/> + <source>Show</source> + <translation>Mostrar</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/> <source>Press to show all files containing an issue</source> <translation>Pulsar para mostrar todos los archivos con algún problema</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="552"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/> <source>Error: {0}</source> <translation>Error: {0}</translation> </message> @@ -3131,7 +3131,7 @@ <translation>Arreglar: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="692"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/> <source>No issues found.</source> <translation>No se han encontrado problemas.</translation> </message> @@ -3156,12 +3156,12 @@ <translation>Mostrar ignorados</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="645"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/> <source>{0} (ignored)</source> <translation>{0} (ignorado)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="537"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/> <source>Preparing files...</source> <translation>Preparando archivos...</translation> </message> @@ -3176,12 +3176,12 @@ <translation>Introducir la máxima complejidad de código permitida (McCabe: 10)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/> <source>Errors</source> <translation>Errores</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="579"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/> <source>Transferring data...</source> <translation>Transfiriendo datos...</translation> </message> @@ -4848,14 +4848,14 @@ <translation>Compilador IDL</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="33"/> <source>Press to select the IDL compiler via a file selection dialog.</source> <translation>Presione para seleccionar el compilador IDL utilizando un diálogo de selección de archivos.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="43"/> <source>Enter the path to the IDL compiler.</source> - <translation>Intruduzca la ruta del compilador IDL.</translation> + <translation type="unfinished">Intruduzca la ruta del compilador IDL.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="50"/> @@ -4865,7 +4865,7 @@ <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="55"/> <source>Select IDL compiler</source> - <translation>Seleccionar compilador IDL</translation> + <translation type="obsolete">Seleccionar compilador IDL</translation> </message> </context> <context> @@ -7948,6 +7948,34 @@ </message> </context> <context> + <name>E5PathPicker</name> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="70"/> + <source>Enter Path Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="275"/> + <source>Choose a file to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="277"/> + <source>Choose files to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="279"/> + <source>Choose a file to save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="281"/> + <source>Choose a directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>E5RequestModel</name> <message> <location filename="../E5Network/E5NetworkMonitor.py" line="225"/> @@ -21127,42 +21155,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="90"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="137"/> + <source>Did not receive the 'hello' message.</source> + <translation>No se ha recibido el mensaje 'hello'.</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> - <source>Did not receive the 'hello' message.</source> - <translation>No se ha recibido el mensaje 'hello'.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="141"/> <source>Received data on unexpected channel.</source> <translation>Datos recibidos en canal no esperado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="144"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation>Mensaje 'hello' erróneo, se esperaba 'capabilities' pero se obtuvo '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149"/> <source>'capabilities' message did not contain any capability.</source> <translation>El mensaje 'capabilities' no contiene ninguna capacidad.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="157"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation>Mensaje 'hello' erróneo, se esperaba 'encoding' pero se obtuvo '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="162"/> <source>'encoding' message did not contain any encoding.</source> <translation>El mensaje 'encoding' no contiene ninguna codificación.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="351"/> <source>For message see output dialog.</source> <translation>Para mensaje ver el diálogo de output.</translation> </message> @@ -60469,57 +60497,57 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="321"/> + <location filename="../Debugger/VariablesViewer.py" line="279"/> <source>Global Variables</source> <translation>Variables Globales</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="322"/> + <location filename="../Debugger/VariablesViewer.py" line="280"/> <source>Globals</source> <translation>Globales</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Value</source> <translation>Valor</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Type</source> <translation>Tipo</translation> </message> <message> + <location filename="../Debugger/VariablesViewer.py" line="284"/> + <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> + <translation><b>Ventana de Visor de Variables Globales</b><p>Esta ventana muestra las variables globales del programa en depuración.</p></translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="290"/> + <source>Local Variables</source> + <translation>Variables Locales</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="291"/> + <source>Locals</source> + <translation>Locales</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="295"/> + <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> + <translation><b>Ventana de Visor de Variables Locales</b><p>Esta ventana muestra las variables locales del programa en depuración.</p></translation> + </message> + <message> <location filename="../Debugger/VariablesViewer.py" line="326"/> - <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> - <translation><b>Ventana de Visor de Variables Globales</b><p>Esta ventana muestra las variables globales del programa en depuración.</p></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="332"/> - <source>Local Variables</source> - <translation>Variables Locales</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> - <source>Locals</source> - <translation>Locales</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="337"/> - <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> - <translation><b>Ventana de Visor de Variables Locales</b><p>Esta ventana muestra las variables locales del programa en depuración.</p></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="367"/> <source>Show Details...</source> <translation>Mostrar detalles...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="372"/> + <location filename="../Debugger/VariablesViewer.py" line="331"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="580"/> + <location filename="../Debugger/VariablesViewer.py" line="539"/> <source>{0} items</source> <translation>{0} elementos</translation> </message>
--- a/i18n/eric6_fr.ts Sun Nov 22 12:03:31 2015 +0100 +++ b/i18n/eric6_fr.ts Sun Nov 22 18:41:02 2015 +0100 @@ -3079,37 +3079,37 @@ <translation type="unfinished">Message</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="68"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> <source>PEP-257</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="69"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/> <source>Eric</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> - <source>Statistics...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="75"/> - <source>Press to show some statistics for the last run</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/> - <source>Show</source> + <source>Statistics...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> + <source>Press to show some statistics for the last run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/> + <source>Show</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/> <source>Press to show all files containing an issue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="552"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> @@ -3119,7 +3119,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="692"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> @@ -3144,12 +3144,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="645"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/> <source>{0} (ignored)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="537"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> @@ -3164,12 +3164,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/> <source>Errors</source> <translation type="unfinished">Erreurs</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="579"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/> <source>Transferring data...</source> <translation type="unfinished"></translation> </message> @@ -4830,14 +4830,14 @@ <translation>Compilateur IDL</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="33"/> <source>Press to select the IDL compiler via a file selection dialog.</source> <translation>Cliquer pour choisir manuellement un compilateur IDL.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="43"/> <source>Enter the path to the IDL compiler.</source> - <translation>Entrer le chemin du compilateur IDL.</translation> + <translation type="unfinished">Entrer le chemin du compilateur IDL.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="50"/> @@ -4847,7 +4847,7 @@ <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="55"/> <source>Select IDL compiler</source> - <translation>Sélection d'un compilateur IDL</translation> + <translation type="obsolete">Sélection d'un compilateur IDL</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="17"/> @@ -7934,6 +7934,34 @@ </message> </context> <context> + <name>E5PathPicker</name> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="70"/> + <source>Enter Path Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="275"/> + <source>Choose a file to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="277"/> + <source>Choose files to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="279"/> + <source>Choose a file to save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="281"/> + <source>Choose a directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>E5RequestModel</name> <message> <location filename="../E5Network/E5NetworkMonitor.py" line="225"/> @@ -21125,42 +21153,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="90"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="137"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="141"/> <source>Received data on unexpected channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="144"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="157"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="162"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="351"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -60437,57 +60465,57 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="321"/> + <location filename="../Debugger/VariablesViewer.py" line="279"/> <source>Global Variables</source> <translation>Variables globales</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="322"/> + <location filename="../Debugger/VariablesViewer.py" line="280"/> <source>Globals</source> <translation>Globales</translation> </message> <message> + <location filename="../Debugger/VariablesViewer.py" line="284"/> + <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> + <translation><b>Fenêtre de visualisation des variables globales</b><p>Cette fenêtre affiche les variables globales du programme débogué.</p></translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="290"/> + <source>Local Variables</source> + <translation>Variables locales</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="291"/> + <source>Locals</source> + <translation>Locales</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="295"/> + <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> + <translation><b>Fenêtre de visualisation des variables locales</b><p>Cette fenêtre affiche les variables locales du programme débogué.</p></translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="291"/> + <source>Value</source> + <translation>Valeur</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="291"/> + <source>Type</source> + <translation>Type</translation> + </message> + <message> <location filename="../Debugger/VariablesViewer.py" line="326"/> - <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> - <translation><b>Fenêtre de visualisation des variables globales</b><p>Cette fenêtre affiche les variables globales du programme débogué.</p></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="332"/> - <source>Local Variables</source> - <translation>Variables locales</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> - <source>Locals</source> - <translation>Locales</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="337"/> - <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> - <translation><b>Fenêtre de visualisation des variables locales</b><p>Cette fenêtre affiche les variables locales du programme débogué.</p></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> - <source>Value</source> - <translation>Valeur</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> - <source>Type</source> - <translation>Type</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="367"/> <source>Show Details...</source> <translation>Afficher les détails...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="372"/> + <location filename="../Debugger/VariablesViewer.py" line="331"/> <source>Configure...</source> <translation>Configuration...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="580"/> + <location filename="../Debugger/VariablesViewer.py" line="539"/> <source>{0} items</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_it.ts Sun Nov 22 12:03:31 2015 +0100 +++ b/i18n/eric6_it.ts Sun Nov 22 18:41:02 2015 +0100 @@ -3116,37 +3116,37 @@ <translation>Messaggio</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="68"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> <source>PEP-257</source> <translation>PEP-257</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="69"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/> <source>Eric</source> <translation>Eric</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> - <source>Statistics...</source> - <translation>Statistiche...</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="75"/> - <source>Press to show some statistics for the last run</source> - <translation>Premi per mostrare alcune statistiche dell'ultima esecuzione</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/> - <source>Show</source> - <translation>Mostra</translation> + <source>Statistics...</source> + <translation>Statistiche...</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> + <source>Press to show some statistics for the last run</source> + <translation>Premi per mostrare alcune statistiche dell'ultima esecuzione</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/> + <source>Show</source> + <translation>Mostra</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/> <source>Press to show all files containing an issue</source> <translation>Premi per mostrare tutti i file che contengono problematiche</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="552"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/> <source>Error: {0}</source> <translation>Errore: {0}</translation> </message> @@ -3156,7 +3156,7 @@ <translation>Corregge:{0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="692"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/> <source>No issues found.</source> <translation>Nessun problema trovato.</translation> </message> @@ -3181,12 +3181,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="645"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/> <source>{0} (ignored)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="537"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> @@ -3201,12 +3201,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/> <source>Errors</source> <translation type="unfinished">Errori</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="579"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/> <source>Transferring data...</source> <translation type="unfinished"></translation> </message> @@ -4873,14 +4873,14 @@ <translation>Compilatore IDL</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="33"/> <source>Press to select the IDL compiler via a file selection dialog.</source> <translation>Premi per selezionare un compilatore IDL con il dialogo di selezione.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="43"/> <source>Enter the path to the IDL compiler.</source> - <translation>Inserisci il percorso per il compilatore IDL.</translation> + <translation type="unfinished">Inserisci il percorso per il compilatore IDL.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="50"/> @@ -4890,7 +4890,7 @@ <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="55"/> <source>Select IDL compiler</source> - <translation>Seleziona il compilatore IDL</translation> + <translation type="obsolete">Seleziona il compilatore IDL</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="17"/> @@ -8006,6 +8006,34 @@ </message> </context> <context> + <name>E5PathPicker</name> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="70"/> + <source>Enter Path Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="275"/> + <source>Choose a file to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="277"/> + <source>Choose files to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="279"/> + <source>Choose a file to save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="281"/> + <source>Choose a directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>E5RequestModel</name> <message> <location filename="../E5Network/E5NetworkMonitor.py" line="225"/> @@ -21205,42 +21233,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="90"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="137"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="141"/> <source>Received data on unexpected channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="144"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="157"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="162"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="351"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -60577,57 +60605,57 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="321"/> + <location filename="../Debugger/VariablesViewer.py" line="279"/> <source>Global Variables</source> <translation>Variabili globali</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="322"/> + <location filename="../Debugger/VariablesViewer.py" line="280"/> <source>Globals</source> <translation>Globali</translation> </message> <message> + <location filename="../Debugger/VariablesViewer.py" line="284"/> + <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> + <translation><b>Finestra di visualizzazione delle variabili globali</b><p>Questa finestra mostra le variabili globali del programma in debug.</p></translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="290"/> + <source>Local Variables</source> + <translation>Variabili locali</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="291"/> + <source>Locals</source> + <translation>Locali</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="295"/> + <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> + <translation><b>Finestra di visualizzazione delle variabili locali</b><p>Questa finestra mostra le variabili locali del programma in debug.</p></translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="291"/> + <source>Value</source> + <translation>Valore</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="291"/> + <source>Type</source> + <translation>Tipo</translation> + </message> + <message> <location filename="../Debugger/VariablesViewer.py" line="326"/> - <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> - <translation><b>Finestra di visualizzazione delle variabili globali</b><p>Questa finestra mostra le variabili globali del programma in debug.</p></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="332"/> - <source>Local Variables</source> - <translation>Variabili locali</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> - <source>Locals</source> - <translation>Locali</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="337"/> - <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> - <translation><b>Finestra di visualizzazione delle variabili locali</b><p>Questa finestra mostra le variabili locali del programma in debug.</p></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> - <source>Value</source> - <translation>Valore</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> - <source>Type</source> - <translation>Tipo</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="367"/> <source>Show Details...</source> <translation>Mostra dettagli...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="372"/> + <location filename="../Debugger/VariablesViewer.py" line="331"/> <source>Configure...</source> <translation>Configura...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="580"/> + <location filename="../Debugger/VariablesViewer.py" line="539"/> <source>{0} items</source> <translation>{0} elementi</translation> </message>
--- a/i18n/eric6_pt.ts Sun Nov 22 12:03:31 2015 +0100 +++ b/i18n/eric6_pt.ts Sun Nov 22 18:41:02 2015 +0100 @@ -3113,37 +3113,37 @@ <translation>Mensagem</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="68"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> <source>PEP-257</source> <translation></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="69"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/> <source>Eric</source> <translation></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> - <source>Statistics...</source> - <translation>Estatísticas...</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="75"/> - <source>Press to show some statistics for the last run</source> - <translation>Pressionar para mostrar algumas estatísticas da última execução</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/> - <source>Show</source> - <translation>Mostrar</translation> + <source>Statistics...</source> + <translation>Estatísticas...</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> + <source>Press to show some statistics for the last run</source> + <translation>Pressionar para mostrar algumas estatísticas da última execução</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/> + <source>Show</source> + <translation>Mostrar</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/> <source>Press to show all files containing an issue</source> <translation>Pressionar para mostrar todos os ficheiros que tenham algum problema</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="552"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/> <source>Error: {0}</source> <translation>Erro: {0}</translation> </message> @@ -3153,7 +3153,7 @@ <translation>Corrigir: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="692"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/> <source>No issues found.</source> <translation>Não se encontraram problemas.</translation> </message> @@ -3178,12 +3178,12 @@ <translation>Mostrar ignorado</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="645"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/> <source>{0} (ignored)</source> <translation>{0} (ignorado)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="537"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> @@ -3198,12 +3198,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/> <source>Errors</source> <translation type="unfinished">Erros</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="579"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/> <source>Transferring data...</source> <translation type="unfinished"></translation> </message> @@ -4870,14 +4870,14 @@ <translation>Compilador IDL</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="33"/> <source>Press to select the IDL compiler via a file selection dialog.</source> <translation>Pressionar para selecionar o compilador IDL através da caixa de diálogo de seleção de ficheiros.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="43"/> <source>Enter the path to the IDL compiler.</source> - <translation>Introduzir a rota ao compilador IDL.</translation> + <translation type="unfinished">Introduzir a rota ao compilador IDL.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="50"/> @@ -4887,7 +4887,7 @@ <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="55"/> <source>Select IDL compiler</source> - <translation>Selecionar compilador IDL</translation> + <translation type="obsolete">Selecionar compilador IDL</translation> </message> </context> <context> @@ -7971,6 +7971,34 @@ </message> </context> <context> + <name>E5PathPicker</name> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="70"/> + <source>Enter Path Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="275"/> + <source>Choose a file to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="277"/> + <source>Choose files to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="279"/> + <source>Choose a file to save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="281"/> + <source>Choose a directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>E5RequestModel</name> <message> <location filename="../E5Network/E5NetworkMonitor.py" line="225"/> @@ -21176,42 +21204,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="90"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="137"/> + <source>Did not receive the 'hello' message.</source> + <translation>Não recebeu a mensagem 'hello'.</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> - <source>Did not receive the 'hello' message.</source> - <translation>Não recebeu a mensagem 'hello'.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="141"/> <source>Received data on unexpected channel.</source> <translation>Dados recebidos num canal imprevisto.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="144"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation>Mensagem 'hello' má, esperava-se 'capabilities: ' mas teve '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149"/> <source>'capabilities' message did not contain any capability.</source> <translation>Mensagem 'capabilities' não tinha nenhuma capacidade.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="157"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation>Mensagem 'hello' má, esperava-se 'encoding: ' mas teve '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="162"/> <source>'encoding' message did not contain any encoding.</source> <translation>Mensagem 'encoding' não tinha nenhuma codificação.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="351"/> <source>For message see output dialog.</source> <translation>Para a mensagem ver a caixa de diálogo da saída de comandos.</translation> </message> @@ -60261,57 +60289,57 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="321"/> + <location filename="../Debugger/VariablesViewer.py" line="279"/> <source>Global Variables</source> <translation>Variáveis Globais</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="322"/> + <location filename="../Debugger/VariablesViewer.py" line="280"/> <source>Globals</source> <translation>Globais</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Value</source> <translation>Valor</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Type</source> <translation>Tipo</translation> </message> <message> + <location filename="../Debugger/VariablesViewer.py" line="284"/> + <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="290"/> + <source>Local Variables</source> + <translation>Variáveis Locais</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="291"/> + <source>Locals</source> + <translation>Locais</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="295"/> + <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Debugger/VariablesViewer.py" line="326"/> - <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="332"/> - <source>Local Variables</source> - <translation>Variáveis Locais</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> - <source>Locals</source> - <translation>Locais</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="337"/> - <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="367"/> <source>Show Details...</source> <translation>Mostrar Detalhes...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="372"/> + <location filename="../Debugger/VariablesViewer.py" line="331"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="580"/> + <location filename="../Debugger/VariablesViewer.py" line="539"/> <source>{0} items</source> <translation>{0} elementos</translation> </message>
--- a/i18n/eric6_ru.ts Sun Nov 22 12:03:31 2015 +0100 +++ b/i18n/eric6_ru.ts Sun Nov 22 18:41:02 2015 +0100 @@ -3115,37 +3115,37 @@ <translation>Сообщение</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="68"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> <source>PEP-257</source> <translation>PEP-257</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="69"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/> <source>Eric</source> <translation>Eric</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> - <source>Statistics...</source> - <translation>Статистика...</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="75"/> - <source>Press to show some statistics for the last run</source> - <translation>Показать результаты последней проверки</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/> - <source>Show</source> - <translation>Показать</translation> + <source>Statistics...</source> + <translation>Статистика...</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> + <source>Press to show some statistics for the last run</source> + <translation>Показать результаты последней проверки</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/> + <source>Show</source> + <translation>Показать</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/> <source>Press to show all files containing an issue</source> <translation>Показать все файлы содержащие ошибки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="552"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/> <source>Error: {0}</source> <translation>Ошибка: {0}</translation> </message> @@ -3155,7 +3155,7 @@ <translation>Исправлено: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="692"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/> <source>No issues found.</source> <translation>Проблем со стилем не найдено.</translation> </message> @@ -3180,12 +3180,12 @@ <translation>Показать проигнорированные</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="645"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/> <source>{0} (ignored)</source> <translation>{0} (проигнорировано)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="537"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> @@ -3200,12 +3200,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/> <source>Errors</source> <translation type="unfinished">Ошибки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="579"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/> <source>Transferring data...</source> <translation type="unfinished"></translation> </message> @@ -4874,14 +4874,14 @@ <translation>Компилятор интерфейсов (IDL Compiler)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="33"/> <source>Press to select the IDL compiler via a file selection dialog.</source> <translation>Нажмите, чтобы выбрать компилятор интерфейсов с помощью файлового диалога.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="43"/> <source>Enter the path to the IDL compiler.</source> - <translation>Задайте путь для компилятора интерфейсов.</translation> + <translation type="unfinished">Задайте путь для компилятора интерфейсов.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="50"/> @@ -4891,7 +4891,7 @@ <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="55"/> <source>Select IDL compiler</source> - <translation>Выбрать компилятор интерфейсов (IDL Compiler)</translation> + <translation type="obsolete">Выбрать компилятор интерфейсов (IDL Compiler)</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="17"/> @@ -8003,6 +8003,34 @@ </message> </context> <context> + <name>E5PathPicker</name> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="70"/> + <source>Enter Path Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="275"/> + <source>Choose a file to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="277"/> + <source>Choose files to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="279"/> + <source>Choose a file to save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="281"/> + <source>Choose a directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>E5RequestModel</name> <message> <location filename="../E5Network/E5NetworkMonitor.py" line="225"/> @@ -21224,42 +21252,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="90"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="137"/> + <source>Did not receive the 'hello' message.</source> + <translation>Сообщение 'hello' не получено.</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> - <source>Did not receive the 'hello' message.</source> - <translation>Сообщение 'hello' не получено.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="141"/> <source>Received data on unexpected channel.</source> <translation>Получены данные по неожиданному каналу.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="144"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation>Неправильное 'hello' сообщение, ожидалось 'capabilities: ', а получено '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149"/> <source>'capabilities' message did not contain any capability.</source> <translation>Сообщение 'capabilities' пусто.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="157"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation>Неправильное 'hello' сообщение, ожидалось 'encoding: ', а получено '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="162"/> <source>'encoding' message did not contain any encoding.</source> <translation>Сообщение 'encoding' пусто.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="351"/> <source>For message see output dialog.</source> <translation>Сообщение можно увидеть в окне вывода.</translation> </message> @@ -60705,59 +60733,59 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="321"/> + <location filename="../Debugger/VariablesViewer.py" line="279"/> <source>Global Variables</source> <translation>Глобальные переменные</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="322"/> + <location filename="../Debugger/VariablesViewer.py" line="280"/> <source>Globals</source> <translation>Глобальные переменные</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="326"/> + <location filename="../Debugger/VariablesViewer.py" line="284"/> <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> <translation><b>Окно показа глобальных переменных</b> <p>Это окно отображает глобальные переменные отлаживаемой программы.</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="332"/> + <location filename="../Debugger/VariablesViewer.py" line="290"/> <source>Local Variables</source> <translation>Локальные переменные</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Locals</source> <translation>Локальные переменные</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="337"/> + <location filename="../Debugger/VariablesViewer.py" line="295"/> <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> <translation><b>Окно показа локальных переменных</b> <p>Это окно отображает локальные переменные отлаживаемой программы.</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Value</source> <translation>Значение</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="580"/> + <location filename="../Debugger/VariablesViewer.py" line="539"/> <source>{0} items</source> <translation>{0} элементов</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="367"/> + <location filename="../Debugger/VariablesViewer.py" line="326"/> <source>Show Details...</source> <translation>Показать подробности...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="372"/> + <location filename="../Debugger/VariablesViewer.py" line="331"/> <source>Configure...</source> <translation>Настроить...</translation> </message>
--- a/i18n/eric6_tr.ts Sun Nov 22 12:03:31 2015 +0100 +++ b/i18n/eric6_tr.ts Sun Nov 22 18:41:02 2015 +0100 @@ -3081,37 +3081,37 @@ <translation type="unfinished">Mesaj</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="68"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> <source>PEP-257</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="69"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/> <source>Eric</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> - <source>Statistics...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="75"/> - <source>Press to show some statistics for the last run</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/> - <source>Show</source> - <translation type="unfinished">Göster</translation> + <source>Statistics...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> + <source>Press to show some statistics for the last run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/> + <source>Show</source> + <translation type="unfinished">Göster</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/> <source>Press to show all files containing an issue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="552"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/> <source>Error: {0}</source> <translation type="unfinished">Hata: {0}</translation> </message> @@ -3121,7 +3121,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="692"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/> <source>No issues found.</source> <translation type="unfinished">Sorun bulunamadı.</translation> </message> @@ -3146,12 +3146,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="645"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/> <source>{0} (ignored)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="537"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> @@ -3166,12 +3166,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/> <source>Errors</source> <translation type="unfinished">Hatalar</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="579"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/> <source>Transferring data...</source> <translation type="unfinished"></translation> </message> @@ -4837,14 +4837,14 @@ <translation>IDL Derleyicisi</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="33"/> <source>Press to select the IDL compiler via a file selection dialog.</source> <translation>Dosya seçim diyaloğu yolu ile IDL derliyicisini seçiniz.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="43"/> <source>Enter the path to the IDL compiler.</source> - <translation>IDL derleyicisinin yolunu giriniz.</translation> + <translation type="unfinished">IDL derleyicisinin yolunu giriniz.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="50"/> @@ -4854,7 +4854,7 @@ <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="55"/> <source>Select IDL compiler</source> - <translation>IDL derleyicisini seçiniz</translation> + <translation type="obsolete">IDL derleyicisini seçiniz</translation> </message> </context> <context> @@ -7934,6 +7934,34 @@ </message> </context> <context> + <name>E5PathPicker</name> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="70"/> + <source>Enter Path Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="275"/> + <source>Choose a file to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="277"/> + <source>Choose files to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="279"/> + <source>Choose a file to save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="281"/> + <source>Choose a directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>E5RequestModel</name> <message> <location filename="../E5Network/E5NetworkMonitor.py" line="225"/> @@ -21107,42 +21135,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="90"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="137"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="141"/> <source>Received data on unexpected channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="144"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="157"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="162"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="351"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -60219,57 +60247,57 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="321"/> + <location filename="../Debugger/VariablesViewer.py" line="279"/> <source>Global Variables</source> <translation>Evrensel Değişkenler</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="322"/> + <location filename="../Debugger/VariablesViewer.py" line="280"/> <source>Globals</source> <translation>Evrensel</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Value</source> <translation>Değer</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Type</source> <translation>Tip</translation> </message> <message> + <location filename="../Debugger/VariablesViewer.py" line="284"/> + <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="290"/> + <source>Local Variables</source> + <translation>Yerel Değişkenler</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="291"/> + <source>Locals</source> + <translation>Yereller</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="295"/> + <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Debugger/VariablesViewer.py" line="326"/> - <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="332"/> - <source>Local Variables</source> - <translation>Yerel Değişkenler</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> - <source>Locals</source> - <translation>Yereller</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="337"/> - <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="367"/> <source>Show Details...</source> <translation>Detayları Göster...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="372"/> + <location filename="../Debugger/VariablesViewer.py" line="331"/> <source>Configure...</source> <translation>Ayarlanıyor...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="580"/> + <location filename="../Debugger/VariablesViewer.py" line="539"/> <source>{0} items</source> <translation>{0} madde</translation> </message>
--- a/i18n/eric6_zh_CN.GB2312.ts Sun Nov 22 12:03:31 2015 +0100 +++ b/i18n/eric6_zh_CN.GB2312.ts Sun Nov 22 18:41:02 2015 +0100 @@ -3078,37 +3078,37 @@ <translation type="unfinished">消息</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="68"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> <source>PEP-257</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="69"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/> <source>Eric</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> - <source>Statistics...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="75"/> - <source>Press to show some statistics for the last run</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/> - <source>Show</source> - <translation type="unfinished">显示</translation> + <source>Statistics...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> + <source>Press to show some statistics for the last run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/> + <source>Show</source> + <translation type="unfinished">显示</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/> <source>Press to show all files containing an issue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="552"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> @@ -3118,7 +3118,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="692"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> @@ -3143,12 +3143,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="645"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/> <source>{0} (ignored)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="537"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> @@ -3163,12 +3163,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/> <source>Errors</source> <translation type="unfinished">错误</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="579"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/> <source>Transferring data...</source> <translation type="unfinished"></translation> </message> @@ -4826,14 +4826,14 @@ <translation>IDL 编译器</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="33"/> <source>Press to select the IDL compiler via a file selection dialog.</source> <translation>请通过文件选择对话框选择 IDL 编译器。</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="43"/> <source>Enter the path to the IDL compiler.</source> - <translation>输入 IDL 编译器路径。</translation> + <translation type="unfinished">输入 IDL 编译器路径。</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="50"/> @@ -4843,7 +4843,7 @@ <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="55"/> <source>Select IDL compiler</source> - <translation>选择 IDL 编译器</translation> + <translation type="obsolete">选择 IDL 编译器</translation> </message> </context> <context> @@ -7905,6 +7905,34 @@ </message> </context> <context> + <name>E5PathPicker</name> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="70"/> + <source>Enter Path Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="275"/> + <source>Choose a file to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="277"/> + <source>Choose files to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="279"/> + <source>Choose a file to save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="281"/> + <source>Choose a directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>E5RequestModel</name> <message> <location filename="../E5Network/E5NetworkMonitor.py" line="225"/> @@ -21078,42 +21106,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="90"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="137"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="141"/> <source>Received data on unexpected channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="144"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="157"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="162"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="351"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -60373,57 +60401,57 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="321"/> + <location filename="../Debugger/VariablesViewer.py" line="279"/> <source>Global Variables</source> <translation>全局变量</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="322"/> + <location filename="../Debugger/VariablesViewer.py" line="280"/> <source>Globals</source> <translation>全局</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Value</source> <translation>值</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Type</source> <translation>类型</translation> </message> <message> + <location filename="../Debugger/VariablesViewer.py" line="284"/> + <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> + <translation><b>全局变量浏览器窗口</b><p>该窗口显示调试程序的全局变量。</p></translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="290"/> + <source>Local Variables</source> + <translation>局部变量</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="291"/> + <source>Locals</source> + <translation>局部</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="295"/> + <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> + <translation><b>局部变量浏览器窗口</b><p>该窗口显示高度程序的局部变量。</p></translation> + </message> + <message> <location filename="../Debugger/VariablesViewer.py" line="326"/> - <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> - <translation><b>全局变量浏览器窗口</b><p>该窗口显示调试程序的全局变量。</p></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="332"/> - <source>Local Variables</source> - <translation>局部变量</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> - <source>Locals</source> - <translation>局部</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="337"/> - <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> - <translation><b>局部变量浏览器窗口</b><p>该窗口显示高度程序的局部变量。</p></translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="367"/> <source>Show Details...</source> <translation>显示细节……</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="372"/> + <location filename="../Debugger/VariablesViewer.py" line="331"/> <source>Configure...</source> <translation>配置……</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="580"/> + <location filename="../Debugger/VariablesViewer.py" line="539"/> <source>{0} items</source> <translation type="unfinished"></translation> </message>
