Mon, 12 Nov 2012 19:04:11 +0100
Changed a bunch of forms to use the E5ClearableLineEdit and E5ClearableComboBox.
--- a/APIs/Python3/eric5.api Mon Nov 12 17:46:11 2012 +0100 +++ b/APIs/Python3/eric5.api Mon Nov 12 19:04:11 2012 +0100 @@ -1190,6 +1190,10 @@ eric5.E5Gui.E5ClickableLabel.E5ClickableLabel.middleClicked?7 eric5.E5Gui.E5ClickableLabel.E5ClickableLabel.mouseReleaseEvent?4(evt) eric5.E5Gui.E5ClickableLabel.E5ClickableLabel?1(parent=None) +eric5.E5Gui.E5ComboBox.E5ClearableComboBox?1(parent=None, inactiveText="") +eric5.E5Gui.E5ComboBox.E5ComboBox.inactiveText?4() +eric5.E5Gui.E5ComboBox.E5ComboBox.setInactiveText?4(inactiveText) +eric5.E5Gui.E5ComboBox.E5ComboBox?1(parent=None, inactiveText="") eric5.E5Gui.E5Completers.E5DirCompleter?1(parent=None, completionMode=QCompleter.PopupCompletion, showHidden=False) eric5.E5Gui.E5Completers.E5FileCompleter?1(parent=None, completionMode=QCompleter.PopupCompletion, showHidden=False) eric5.E5Gui.E5Completers.E5StringListCompleter?1(parent=None, strings=[], completionMode=QCompleter.PopupCompletion) @@ -4122,7 +4126,6 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_branchCombo_activated?4(txt) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_buttonBox_clicked?4(button) -eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_clearRxEditButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffP1Button_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffP2Button_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffRevisionsButton_clicked?4() @@ -4570,7 +4573,6 @@ eric5.Plugins.VcsPlugins.vcsPySvn.SvnInfoDialog.SvnInfoDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog._reset?5() eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_buttonBox_clicked?4(button) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_clearRxEditButton_clicked?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_diffPreviousButton_clicked?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_diffRevisionsButton_clicked?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_fieldCombo_activated?4(txt) @@ -4792,7 +4794,6 @@ eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_buttonBox_clicked?4(button) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_clearRxEditButton_clicked?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_diffPreviousButton_clicked?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_diffRevisionsButton_clicked?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_fieldCombo_activated?4(txt) @@ -5619,7 +5620,6 @@ eric5.Preferences.ShortcutsDialog.ShortcutsDialog.objectTypeRole?7 eric5.Preferences.ShortcutsDialog.ShortcutsDialog.on_actionButton_toggled?4(checked) eric5.Preferences.ShortcutsDialog.ShortcutsDialog.on_buttonBox_accepted?4() -eric5.Preferences.ShortcutsDialog.ShortcutsDialog.on_clearSearchButton_clicked?4() eric5.Preferences.ShortcutsDialog.ShortcutsDialog.on_searchEdit_textChanged?4(txt) eric5.Preferences.ShortcutsDialog.ShortcutsDialog.on_shortcutButton_toggled?4(checked) eric5.Preferences.ShortcutsDialog.ShortcutsDialog.on_shortcutsList_itemChanged?4(itm, column) @@ -5776,7 +5776,6 @@ eric5.Project.CreateDialogCodeDialog.CreateDialogCodeDialog.initError?4() eric5.Project.CreateDialogCodeDialog.CreateDialogCodeDialog.on_buttonBox_clicked?4(button) eric5.Project.CreateDialogCodeDialog.CreateDialogCodeDialog.on_classNameCombo_activated?4(index) -eric5.Project.CreateDialogCodeDialog.CreateDialogCodeDialog.on_clearFilterButton_clicked?4() eric5.Project.CreateDialogCodeDialog.CreateDialogCodeDialog.on_filterEdit_textChanged?4(text) eric5.Project.CreateDialogCodeDialog.CreateDialogCodeDialog.on_newButton_clicked?4() eric5.Project.CreateDialogCodeDialog.CreateDialogCodeDialog?1(formName, project, parent=None)
--- a/APIs/Python3/eric5.bas Mon Nov 12 17:46:11 2012 +0100 +++ b/APIs/Python3/eric5.bas Mon Nov 12 19:04:11 2012 +0100 @@ -131,8 +131,10 @@ E5Action QAction E5Application QApplication E5ArrowItem QAbstractGraphicsShapeItem +E5ClearableComboBox E5ComboBox E5ClearableLineEdit E5LineEdit E5ClickableLabel QLabel +E5ComboBox QComboBox E5DirCompleter QCompleter E5DnDTabBar E5WheelTabBar E5FileCompleter QCompleter
--- a/Cooperation/ChatWidget.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Cooperation/ChatWidget.py Mon Nov 12 19:04:11 2012 +0100 @@ -66,10 +66,6 @@ UI.PixmapCache.getIcon("sharedEditSend.png")) self.cancelEditButton.setIcon( UI.PixmapCache.getIcon("sharedEditCancel.png")) - self.clearMessageButton.setIcon( - UI.PixmapCache.getIcon("clearLeft.png")) - self.clearHostButton.setIcon( - UI.PixmapCache.getIcon("clearLeft.png")) self.__ui = ui self.__client = CooperationClient(self)
--- a/Cooperation/ChatWidget.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Cooperation/ChatWidget.ui Mon Nov 12 19:04:11 2012 +0100 @@ -65,25 +65,12 @@ </widget> </item> <item row="1" column="0"> - <widget class="QLineEdit" name="messageEdit"> + <widget class="E5ClearableLineEdit" name="messageEdit"> <property name="toolTip"> <string>Enter the text to send</string> </property> </widget> </item> - <item row="1" column="1"> - <widget class="QToolButton" name="clearMessageButton"> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="toolTip"> - <string>Press to clear the message text</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="2" column="0" colspan="2"> <widget class="QPushButton" name="sendButton"> <property name="toolTip"> @@ -209,7 +196,7 @@ </widget> </item> <item> - <widget class="QComboBox" name="hostEdit"> + <widget class="E5ClearableComboBox" name="hostEdit"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -230,19 +217,6 @@ </property> </widget> </item> - <item> - <widget class="QToolButton" name="clearHostButton"> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="toolTip"> - <string>Press to clear the host</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> </layout> </item> <item> @@ -350,11 +324,21 @@ </widget> <customwidgets> <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + <customwidget> <class>E5Led</class> <extends>QWidget</extends> <header>E5Gui/E5Led.h</header> <container>1</container> </customwidget> + <customwidget> + <class>E5ClearableComboBox</class> + <extends>QComboBox</extends> + <header>E5Gui/E5ComboBox.h</header> + </customwidget> </customwidgets> <tabstops> <tabstop>serverButton</tabstop> @@ -370,38 +354,5 @@ <tabstop>sendButton</tabstop> </tabstops> <resources/> - <connections> - <connection> - <sender>clearHostButton</sender> - <signal>pressed()</signal> - <receiver>hostEdit</receiver> - <slot>clearEditText()</slot> - <hints> - <hint type="sourcelabel"> - <x>279</x> - <y>651</y> - </hint> - <hint type="destinationlabel"> - <x>221</x> - <y>653</y> - </hint> - </hints> - </connection> - <connection> - <sender>clearMessageButton</sender> - <signal>pressed()</signal> - <receiver>messageEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>274</x> - <y>488</y> - </hint> - <hint type="destinationlabel"> - <x>241</x> - <y>489</y> - </hint> - </hints> - </connection> - </connections> + <connections/> </ui>
--- a/DataViews/CodeMetricsDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/DataViews/CodeMetricsDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -19,8 +19,6 @@ import Utilities -import UI.PixmapCache - class CodeMetricsDialog(QDialog, Ui_CodeMetricsDialog): """ @@ -54,7 +52,6 @@ self.__fileList = [] self.__project = None - self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) self.filterFrame.setVisible(False) def __resizeResultColumns(self):
--- a/DataViews/CodeMetricsDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/DataViews/CodeMetricsDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -41,23 +41,13 @@ </widget> </item> <item> - <widget class="QLineEdit" name="excludeFilesEdit"> + <widget class="E5ClearableLineEdit" name="excludeFilesEdit"> <property name="toolTip"> <string>Enter filename patterns of files to be excluded separated by a comma</string> </property> </widget> </item> <item> - <widget class="QToolButton" name="clearButton"> - <property name="toolTip"> - <string>Press to clear the filter edit</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> <widget class="Line" name="line"> <property name="lineWidth"> <number>2</number> @@ -180,31 +170,20 @@ </widget> <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> <tabstops> <tabstop>startButton</tabstop> <tabstop>excludeFilesEdit</tabstop> - <tabstop>clearButton</tabstop> <tabstop>resultList</tabstop> <tabstop>summaryList</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/> - <connections> - <connection> - <sender>clearButton</sender> - <signal>clicked()</signal> - <receiver>excludeFilesEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>717</x> - <y>18</y> - </hint> - <hint type="destinationlabel"> - <x>659</x> - <y>20</y> - </hint> - </hints> - </connection> - </connections> + <connections/> </ui>
--- a/Documentation/Help/source.qhp Mon Nov 12 17:46:11 2012 +0100 +++ b/Documentation/Help/source.qhp Mon Nov 12 19:04:11 2012 +0100 @@ -116,6 +116,7 @@ <section title="eric5.E5Gui.E5Action" ref="eric5.E5Gui.E5Action.html" /> <section title="eric5.E5Gui.E5Application" ref="eric5.E5Gui.E5Application.html" /> <section title="eric5.E5Gui.E5ClickableLabel" ref="eric5.E5Gui.E5ClickableLabel.html" /> + <section title="eric5.E5Gui.E5ComboBox" ref="eric5.E5Gui.E5ComboBox.html" /> <section title="eric5.E5Gui.E5Completers" ref="eric5.E5Gui.E5Completers.html" /> <section title="eric5.E5Gui.E5FileDialog" ref="eric5.E5Gui.E5FileDialog.html" /> <section title="eric5.E5Gui.E5Led" ref="eric5.E5Gui.E5Led.html" /> @@ -2445,7 +2446,6 @@ <keyword name="CreateDialogCodeDialog.initError" id="CreateDialogCodeDialog.initError" ref="eric5.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.initError" /> <keyword name="CreateDialogCodeDialog.on_buttonBox_clicked" id="CreateDialogCodeDialog.on_buttonBox_clicked" ref="eric5.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.on_buttonBox_clicked" /> <keyword name="CreateDialogCodeDialog.on_classNameCombo_activated" id="CreateDialogCodeDialog.on_classNameCombo_activated" ref="eric5.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.on_classNameCombo_activated" /> - <keyword name="CreateDialogCodeDialog.on_clearFilterButton_clicked" id="CreateDialogCodeDialog.on_clearFilterButton_clicked" ref="eric5.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.on_clearFilterButton_clicked" /> <keyword name="CreateDialogCodeDialog.on_filterEdit_textChanged" id="CreateDialogCodeDialog.on_filterEdit_textChanged" ref="eric5.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.on_filterEdit_textChanged" /> <keyword name="CreateDialogCodeDialog.on_newButton_clicked" id="CreateDialogCodeDialog.on_newButton_clicked" ref="eric5.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.on_newButton_clicked" /> <keyword name="DCTestResult" id="DCTestResult" ref="eric5.DebugClients.Python.DCTestResult.html#DCTestResult" /> @@ -3328,6 +3328,8 @@ <keyword name="E5ArrowItem.setEndPoint" id="E5ArrowItem.setEndPoint" ref="eric5.E5Graphics.E5ArrowItem.html#E5ArrowItem.setEndPoint" /> <keyword name="E5ArrowItem.setPoints" id="E5ArrowItem.setPoints" ref="eric5.E5Graphics.E5ArrowItem.html#E5ArrowItem.setPoints" /> <keyword name="E5ArrowItem.setStartPoint" id="E5ArrowItem.setStartPoint" ref="eric5.E5Graphics.E5ArrowItem.html#E5ArrowItem.setStartPoint" /> + <keyword name="E5ClearableComboBox" id="E5ClearableComboBox" ref="eric5.E5Gui.E5ComboBox.html#E5ClearableComboBox" /> + <keyword name="E5ClearableComboBox (Constructor)" id="E5ClearableComboBox (Constructor)" ref="eric5.E5Gui.E5ComboBox.html#E5ClearableComboBox.__init__" /> <keyword name="E5ClearableLineEdit" id="E5ClearableLineEdit" ref="eric5.E5Gui.E5LineEdit.html#E5ClearableLineEdit" /> <keyword name="E5ClearableLineEdit (Constructor)" id="E5ClearableLineEdit (Constructor)" ref="eric5.E5Gui.E5LineEdit.html#E5ClearableLineEdit.__init__" /> <keyword name="E5ClearableLineEdit.__textChanged" id="E5ClearableLineEdit.__textChanged" ref="eric5.E5Gui.E5LineEdit.html#E5ClearableLineEdit.__textChanged" /> @@ -3335,6 +3337,11 @@ <keyword name="E5ClickableLabel (Constructor)" id="E5ClickableLabel (Constructor)" ref="eric5.E5Gui.E5ClickableLabel.html#E5ClickableLabel.__init__" /> <keyword name="E5ClickableLabel (Module)" id="E5ClickableLabel (Module)" ref="eric5.E5Gui.E5ClickableLabel.html" /> <keyword name="E5ClickableLabel.mouseReleaseEvent" id="E5ClickableLabel.mouseReleaseEvent" ref="eric5.E5Gui.E5ClickableLabel.html#E5ClickableLabel.mouseReleaseEvent" /> + <keyword name="E5ComboBox" id="E5ComboBox" ref="eric5.E5Gui.E5ComboBox.html#E5ComboBox" /> + <keyword name="E5ComboBox (Constructor)" id="E5ComboBox (Constructor)" ref="eric5.E5Gui.E5ComboBox.html#E5ComboBox.__init__" /> + <keyword name="E5ComboBox (Module)" id="E5ComboBox (Module)" ref="eric5.E5Gui.E5ComboBox.html" /> + <keyword name="E5ComboBox.inactiveText" id="E5ComboBox.inactiveText" ref="eric5.E5Gui.E5ComboBox.html#E5ComboBox.inactiveText" /> + <keyword name="E5ComboBox.setInactiveText" id="E5ComboBox.setInactiveText" ref="eric5.E5Gui.E5ComboBox.html#E5ComboBox.setInactiveText" /> <keyword name="E5Completers (Module)" id="E5Completers (Module)" ref="eric5.E5Gui.E5Completers.html" /> <keyword name="E5DirCompleter" id="E5DirCompleter" ref="eric5.E5Gui.E5Completers.html#E5DirCompleter" /> <keyword name="E5DirCompleter (Constructor)" id="E5DirCompleter (Constructor)" ref="eric5.E5Gui.E5Completers.html#E5DirCompleter.__init__" /> @@ -5650,7 +5657,6 @@ <keyword name="HgLogBrowserDialog.keyPressEvent" id="HgLogBrowserDialog.keyPressEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.keyPressEvent" /> <keyword name="HgLogBrowserDialog.on_branchCombo_activated" id="HgLogBrowserDialog.on_branchCombo_activated" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_branchCombo_activated" /> <keyword name="HgLogBrowserDialog.on_buttonBox_clicked" id="HgLogBrowserDialog.on_buttonBox_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_buttonBox_clicked" /> - <keyword name="HgLogBrowserDialog.on_clearRxEditButton_clicked" id="HgLogBrowserDialog.on_clearRxEditButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_clearRxEditButton_clicked" /> <keyword name="HgLogBrowserDialog.on_diffP1Button_clicked" id="HgLogBrowserDialog.on_diffP1Button_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffP1Button_clicked" /> <keyword name="HgLogBrowserDialog.on_diffP2Button_clicked" id="HgLogBrowserDialog.on_diffP2Button_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffP2Button_clicked" /> <keyword name="HgLogBrowserDialog.on_diffRevisionsButton_clicked" id="HgLogBrowserDialog.on_diffRevisionsButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffRevisionsButton_clicked" /> @@ -8967,7 +8973,6 @@ <keyword name="ShortcutsDialog.__shortcutChanged" id="ShortcutsDialog.__shortcutChanged" ref="eric5.Preferences.ShortcutsDialog.html#ShortcutsDialog.__shortcutChanged" /> <keyword name="ShortcutsDialog.on_actionButton_toggled" id="ShortcutsDialog.on_actionButton_toggled" ref="eric5.Preferences.ShortcutsDialog.html#ShortcutsDialog.on_actionButton_toggled" /> <keyword name="ShortcutsDialog.on_buttonBox_accepted" id="ShortcutsDialog.on_buttonBox_accepted" ref="eric5.Preferences.ShortcutsDialog.html#ShortcutsDialog.on_buttonBox_accepted" /> - <keyword name="ShortcutsDialog.on_clearSearchButton_clicked" id="ShortcutsDialog.on_clearSearchButton_clicked" ref="eric5.Preferences.ShortcutsDialog.html#ShortcutsDialog.on_clearSearchButton_clicked" /> <keyword name="ShortcutsDialog.on_searchEdit_textChanged" id="ShortcutsDialog.on_searchEdit_textChanged" ref="eric5.Preferences.ShortcutsDialog.html#ShortcutsDialog.on_searchEdit_textChanged" /> <keyword name="ShortcutsDialog.on_shortcutButton_toggled" id="ShortcutsDialog.on_shortcutButton_toggled" ref="eric5.Preferences.ShortcutsDialog.html#ShortcutsDialog.on_shortcutButton_toggled" /> <keyword name="ShortcutsDialog.on_shortcutsList_itemChanged" id="ShortcutsDialog.on_shortcutsList_itemChanged" ref="eric5.Preferences.ShortcutsDialog.html#ShortcutsDialog.on_shortcutsList_itemChanged" /> @@ -9683,8 +9688,6 @@ <keyword name="SvnLogBrowserDialog.keyPressEvent" id="SvnLogBrowserDialog.keyPressEvent" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.keyPressEvent" /> <keyword name="SvnLogBrowserDialog.on_buttonBox_clicked" id="SvnLogBrowserDialog.on_buttonBox_clicked" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_buttonBox_clicked" /> <keyword name="SvnLogBrowserDialog.on_buttonBox_clicked" id="SvnLogBrowserDialog.on_buttonBox_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_buttonBox_clicked" /> - <keyword name="SvnLogBrowserDialog.on_clearRxEditButton_clicked" id="SvnLogBrowserDialog.on_clearRxEditButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_clearRxEditButton_clicked" /> - <keyword name="SvnLogBrowserDialog.on_clearRxEditButton_clicked" id="SvnLogBrowserDialog.on_clearRxEditButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_clearRxEditButton_clicked" /> <keyword name="SvnLogBrowserDialog.on_diffPreviousButton_clicked" id="SvnLogBrowserDialog.on_diffPreviousButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_diffPreviousButton_clicked" /> <keyword name="SvnLogBrowserDialog.on_diffPreviousButton_clicked" id="SvnLogBrowserDialog.on_diffPreviousButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_diffPreviousButton_clicked" /> <keyword name="SvnLogBrowserDialog.on_diffRevisionsButton_clicked" id="SvnLogBrowserDialog.on_diffRevisionsButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_diffRevisionsButton_clicked" /> @@ -12639,6 +12642,7 @@ <file>eric5.E5Gui.E5Action.html</file> <file>eric5.E5Gui.E5Application.html</file> <file>eric5.E5Gui.E5ClickableLabel.html</file> + <file>eric5.E5Gui.E5ComboBox.html</file> <file>eric5.E5Gui.E5Completers.html</file> <file>eric5.E5Gui.E5FileDialog.html</file> <file>eric5.E5Gui.E5Led.html</file>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.E5Gui.E5ComboBox.html Mon Nov 12 19:04:11 2012 +0100 @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.E5Gui.E5ComboBox</title> +<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>eric5.E5Gui.E5ComboBox</h1> +<p> +Module implementing combobox classes using the eric5 line edits. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#E5ClearableComboBox">E5ClearableComboBox</a></td> +<td>Class implementing a combobox using the eric5 line edit.</td> +</tr><tr> +<td><a href="#E5ComboBox">E5ComboBox</a></td> +<td>Class implementing a combobox using the eric5 line edit.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="E5ClearableComboBox" ID="E5ClearableComboBox"></a> +<h2>E5ClearableComboBox</h2> +<p> + Class implementing a combobox using the eric5 line edit. +</p> +<h3>Derived from</h3> +E5ComboBox +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#E5ClearableComboBox.__init__">E5ClearableComboBox</a></td> +<td>Constructor</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="E5ClearableComboBox.__init__" ID="E5ClearableComboBox.__init__"></a> +<h4>E5ClearableComboBox (Constructor)</h4> +<b>E5ClearableComboBox</b>(<i>parent=None, inactiveText=""</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd><dt><i>inactiveText</i></dt> +<dd> +text to be shown on inactivity (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="E5ComboBox" ID="E5ComboBox"></a> +<h2>E5ComboBox</h2> +<p> + Class implementing a combobox using the eric5 line edit. +</p> +<h3>Derived from</h3> +QComboBox +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#E5ComboBox.__init__">E5ComboBox</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#E5ComboBox.inactiveText">inactiveText</a></td> +<td>Public method to get the inactive text.</td> +</tr><tr> +<td><a href="#E5ComboBox.setInactiveText">setInactiveText</a></td> +<td>Public method to set the inactive text.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="E5ComboBox.__init__" ID="E5ComboBox.__init__"></a> +<h4>E5ComboBox (Constructor)</h4> +<b>E5ComboBox</b>(<i>parent=None, inactiveText=""</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd><dt><i>inactiveText</i></dt> +<dd> +text to be shown on inactivity (string) +</dd> +</dl><a NAME="E5ComboBox.inactiveText" ID="E5ComboBox.inactiveText"></a> +<h4>E5ComboBox.inactiveText</h4> +<b>inactiveText</b>(<i></i>) +<p> + Public method to get the inactive text. +</p><p> + return inactive text (string) +</p><a NAME="E5ComboBox.setInactiveText" ID="E5ComboBox.setInactiveText"></a> +<h4>E5ComboBox.setInactiveText</h4> +<b>setInactiveText</b>(<i>inactiveText</i>) +<p> + Public method to set the inactive text. +</p><dl> +<dt><i>inactiveText</i></dt> +<dd> +text to be shown on inactivity (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Mon Nov 12 17:46:11 2012 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Mon Nov 12 19:04:11 2012 +0100 @@ -151,9 +151,6 @@ <td><a href="#HgLogBrowserDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> <td>Private slot called by a button of the button box clicked.</td> </tr><tr> -<td><a href="#HgLogBrowserDialog.on_clearRxEditButton_clicked">on_clearRxEditButton_clicked</a></td> -<td>Private slot called by a click of the clear RX edit button.</td> -</tr><tr> <td><a href="#HgLogBrowserDialog.on_diffP1Button_clicked">on_diffP1Button_clicked</a></td> <td>Private slot to handle the Diff to Parent 1 button.</td> </tr><tr> @@ -575,12 +572,7 @@ <dd> button that was clicked (QAbstractButton) </dd> -</dl><a NAME="HgLogBrowserDialog.on_clearRxEditButton_clicked" ID="HgLogBrowserDialog.on_clearRxEditButton_clicked"></a> -<h4>HgLogBrowserDialog.on_clearRxEditButton_clicked</h4> -<b>on_clearRxEditButton_clicked</b>(<i></i>) -<p> - Private slot called by a click of the clear RX edit button. -</p><a NAME="HgLogBrowserDialog.on_diffP1Button_clicked" ID="HgLogBrowserDialog.on_diffP1Button_clicked"></a> +</dl><a NAME="HgLogBrowserDialog.on_diffP1Button_clicked" ID="HgLogBrowserDialog.on_diffP1Button_clicked"></a> <h4>HgLogBrowserDialog.on_diffP1Button_clicked</h4> <b>on_diffP1Button_clicked</b>(<i></i>) <p>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html Mon Nov 12 17:46:11 2012 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html Mon Nov 12 19:04:11 2012 +0100 @@ -100,9 +100,6 @@ <td><a href="#SvnLogBrowserDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> <td>Private slot called by a button of the button box clicked.</td> </tr><tr> -<td><a href="#SvnLogBrowserDialog.on_clearRxEditButton_clicked">on_clearRxEditButton_clicked</a></td> -<td>Private slot called by a click of the clear RX edit button.</td> -</tr><tr> <td><a href="#SvnLogBrowserDialog.on_diffPreviousButton_clicked">on_diffPreviousButton_clicked</a></td> <td>Private slot to handle the Diff to Previous button.</td> </tr><tr> @@ -287,12 +284,7 @@ <dd> button that was clicked (QAbstractButton) </dd> -</dl><a NAME="SvnLogBrowserDialog.on_clearRxEditButton_clicked" ID="SvnLogBrowserDialog.on_clearRxEditButton_clicked"></a> -<h4>SvnLogBrowserDialog.on_clearRxEditButton_clicked</h4> -<b>on_clearRxEditButton_clicked</b>(<i></i>) -<p> - Private slot called by a click of the clear RX edit button. -</p><a NAME="SvnLogBrowserDialog.on_diffPreviousButton_clicked" ID="SvnLogBrowserDialog.on_diffPreviousButton_clicked"></a> +</dl><a NAME="SvnLogBrowserDialog.on_diffPreviousButton_clicked" ID="SvnLogBrowserDialog.on_diffPreviousButton_clicked"></a> <h4>SvnLogBrowserDialog.on_diffPreviousButton_clicked</h4> <b>on_diffPreviousButton_clicked</b>(<i></i>) <p>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html Mon Nov 12 17:46:11 2012 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html Mon Nov 12 19:04:11 2012 +0100 @@ -112,9 +112,6 @@ <td><a href="#SvnLogBrowserDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> <td>Private slot called by a button of the button box clicked.</td> </tr><tr> -<td><a href="#SvnLogBrowserDialog.on_clearRxEditButton_clicked">on_clearRxEditButton_clicked</a></td> -<td>Private slot called by a click of the clear RX edit button.</td> -</tr><tr> <td><a href="#SvnLogBrowserDialog.on_diffPreviousButton_clicked">on_diffPreviousButton_clicked</a></td> <td>Private slot to handle the Diff to Previous button.</td> </tr><tr> @@ -343,12 +340,7 @@ <dd> button that was clicked (QAbstractButton) </dd> -</dl><a NAME="SvnLogBrowserDialog.on_clearRxEditButton_clicked" ID="SvnLogBrowserDialog.on_clearRxEditButton_clicked"></a> -<h4>SvnLogBrowserDialog.on_clearRxEditButton_clicked</h4> -<b>on_clearRxEditButton_clicked</b>(<i></i>) -<p> - Private slot called by a click of the clear RX edit button. -</p><a NAME="SvnLogBrowserDialog.on_diffPreviousButton_clicked" ID="SvnLogBrowserDialog.on_diffPreviousButton_clicked"></a> +</dl><a NAME="SvnLogBrowserDialog.on_diffPreviousButton_clicked" ID="SvnLogBrowserDialog.on_diffPreviousButton_clicked"></a> <h4>SvnLogBrowserDialog.on_diffPreviousButton_clicked</h4> <b>on_diffPreviousButton_clicked</b>(<i></i>) <p>
--- a/Documentation/Source/eric5.Preferences.ShortcutsDialog.html Mon Nov 12 17:46:11 2012 +0100 +++ b/Documentation/Source/eric5.Preferences.ShortcutsDialog.html Mon Nov 12 19:04:11 2012 +0100 @@ -94,9 +94,6 @@ <td><a href="#ShortcutsDialog.on_buttonBox_accepted">on_buttonBox_accepted</a></td> <td>Private slot to handle the OK button press.</td> </tr><tr> -<td><a href="#ShortcutsDialog.on_clearSearchButton_clicked">on_clearSearchButton_clicked</a></td> -<td>Private slot called by a click of the clear search button.</td> -</tr><tr> <td><a href="#ShortcutsDialog.on_searchEdit_textChanged">on_searchEdit_textChanged</a></td> <td>Private slot called, when the text in the search edit changes.</td> </tr><tr> @@ -254,11 +251,6 @@ <b>on_buttonBox_accepted</b>(<i></i>) <p> Private slot to handle the OK button press. -</p><a NAME="ShortcutsDialog.on_clearSearchButton_clicked" ID="ShortcutsDialog.on_clearSearchButton_clicked"></a> -<h4>ShortcutsDialog.on_clearSearchButton_clicked</h4> -<b>on_clearSearchButton_clicked</b>(<i></i>) -<p> - Private slot called by a click of the clear search button. </p><a NAME="ShortcutsDialog.on_searchEdit_textChanged" ID="ShortcutsDialog.on_searchEdit_textChanged"></a> <h4>ShortcutsDialog.on_searchEdit_textChanged</h4> <b>on_searchEdit_textChanged</b>(<i>txt</i>)
--- a/Documentation/Source/eric5.Project.CreateDialogCodeDialog.html Mon Nov 12 17:46:11 2012 +0100 +++ b/Documentation/Source/eric5.Project.CreateDialogCodeDialog.html Mon Nov 12 19:04:11 2012 +0100 @@ -91,9 +91,6 @@ <td><a href="#CreateDialogCodeDialog.on_classNameCombo_activated">on_classNameCombo_activated</a></td> <td>Private slot to handle the activated signal of the classname combo.</td> </tr><tr> -<td><a href="#CreateDialogCodeDialog.on_clearFilterButton_clicked">on_clearFilterButton_clicked</a></td> -<td>Private slot called by a click of the clear filter button.</td> -</tr><tr> <td><a href="#CreateDialogCodeDialog.on_filterEdit_textChanged">on_filterEdit_textChanged</a></td> <td>Private slot called, when thext of the filter edit has changed.</td> </tr><tr> @@ -212,12 +209,7 @@ <dd> index of the activated item (integer) </dd> -</dl><a NAME="CreateDialogCodeDialog.on_clearFilterButton_clicked" ID="CreateDialogCodeDialog.on_clearFilterButton_clicked"></a> -<h4>CreateDialogCodeDialog.on_clearFilterButton_clicked</h4> -<b>on_clearFilterButton_clicked</b>(<i></i>) -<p> - Private slot called by a click of the clear filter button. -</p><a NAME="CreateDialogCodeDialog.on_filterEdit_textChanged" ID="CreateDialogCodeDialog.on_filterEdit_textChanged"></a> +</dl><a NAME="CreateDialogCodeDialog.on_filterEdit_textChanged" ID="CreateDialogCodeDialog.on_filterEdit_textChanged"></a> <h4>CreateDialogCodeDialog.on_filterEdit_textChanged</h4> <b>on_filterEdit_textChanged</b>(<i>text</i>) <p>
--- a/Documentation/Source/index-eric5.E5Gui.html Mon Nov 12 17:46:11 2012 +0100 +++ b/Documentation/Source/index-eric5.E5Gui.html Mon Nov 12 19:04:11 2012 +0100 @@ -40,6 +40,9 @@ <td><a href="eric5.E5Gui.E5ClickableLabel.html">E5ClickableLabel</a></td> <td>Module implementing a clickable label.</td> </tr><tr> +<td><a href="eric5.E5Gui.E5ComboBox.html">E5ComboBox</a></td> +<td>Module implementing combobox classes using the eric5 line edits.</td> +</tr><tr> <td><a href="eric5.E5Gui.E5Completers.html">E5Completers</a></td> <td>Module implementing various kinds of completers.</td> </tr><tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/E5Gui/E5ComboBox.py Mon Nov 12 19:04:11 2012 +0100 @@ -0,0 +1,66 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2012 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing combobox classes using the eric5 line edits. +""" + +from PyQt4.QtGui import QComboBox + +from .E5LineEdit import E5LineEdit, E5ClearableLineEdit + + +class E5ComboBox(QComboBox): + """ + Class implementing a combobox using the eric5 line edit. + """ + def __init__(self, parent=None, inactiveText=""): + """ + Constructor + + @param parent reference to the parent widget (QWidget) + @param inactiveText text to be shown on inactivity (string) + """ + super().__init__(parent) + + self.setMinimumHeight(24) + + self.__lineedit = E5LineEdit(self, inactiveText) + self.setLineEdit(self.__lineedit) + + self.setMinimumHeight(self.__lineedit.minimumHeight() + 3) + + def inactiveText(self): + """ + Public method to get the inactive text. + + return inactive text (string) + """ + return self.__lineedit.inactiveText() + + def setInactiveText(self, inactiveText): + """ + Public method to set the inactive text. + + @param inactiveText text to be shown on inactivity (string) + """ + self.__lineedit.setInactiveText() + + +class E5ClearableComboBox(E5ComboBox): + """ + Class implementing a combobox using the eric5 line edit. + """ + def __init__(self, parent=None, inactiveText=""): + """ + Constructor + + @param parent reference to the parent widget (QWidget) + @param inactiveText text to be shown on inactivity (string) + """ + super().__init__(parent, inactiveText) + + self.__lineedit = E5ClearableLineEdit(self, inactiveText) + self.setLineEdit(self.__lineedit)
--- a/E5Network/E5NetworkMonitor.py Mon Nov 12 17:46:11 2012 +0100 +++ b/E5Network/E5NetworkMonitor.py Mon Nov 12 19:04:11 2012 +0100 @@ -11,8 +11,6 @@ from PyQt4.QtGui import QDialog, QStandardItemModel, QSortFilterProxyModel from PyQt4.QtNetwork import QNetworkRequest, QNetworkAccessManager -import UI.PixmapCache - from .E5NetworkHeaderDetailsDialog import E5NetworkHeaderDetailsDialog from .Ui_E5NetworkMonitor import Ui_E5NetworkMonitor @@ -76,8 +74,6 @@ super().__init__(parent) self.setupUi(self) - self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) - self.__requestHeaders = QStandardItemModel(self) self.__requestHeaders.setHorizontalHeaderLabels( [self.trUtf8("Name"), self.trUtf8("Value")])
--- a/E5Network/E5NetworkMonitor.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/E5Network/E5NetworkMonitor.ui Mon Nov 12 19:04:11 2012 +0100 @@ -45,19 +45,18 @@ <number>0</number> </property> <item> - <widget class="QLineEdit" name="searchEdit"> + <widget class="E5ClearableLineEdit" name="searchEdit"> + <property name="minimumSize"> + <size> + <width>350</width> + <height>0</height> + </size> + </property> <property name="toolTip"> <string>Enter search term for requests</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="clearButton"> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> </layout> </item> </layout> @@ -190,6 +189,11 @@ </widget> <customwidgets> <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + <customwidget> <class>E5TableView</class> <extends>QTableView</extends> <header>E5Gui/E5TableView.h</header> @@ -197,7 +201,6 @@ </customwidgets> <tabstops> <tabstop>searchEdit</tabstop> - <tabstop>clearButton</tabstop> <tabstop>requestsList</tabstop> <tabstop>removeButton</tabstop> <tabstop>removeAllButton</tabstop> @@ -239,21 +242,5 @@ </hint> </hints> </connection> - <connection> - <sender>clearButton</sender> - <signal>clicked()</signal> - <receiver>searchEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>780</x> - <y>14</y> - </hint> - <hint type="destinationlabel"> - <x>753</x> - <y>20</y> - </hint> - </hints> - </connection> </connections> </ui>
--- a/Helpviewer/AdBlock/AdBlockDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/AdBlock/AdBlockDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -10,8 +10,6 @@ from PyQt4.QtCore import pyqtSlot, QTimer, QCoreApplication from PyQt4.QtGui import QDialog, QMenu, QToolButton -from E5Gui.E5LineEditButton import E5LineEditButton -from E5Gui.E5LineEdit import E5LineEdit from E5Gui import E5MessageBox import Helpviewer.HelpWindow @@ -40,10 +38,6 @@ self.updateSpinBox.setValue(Preferences.getHelp("AdBlockUpdatePeriod")) self.searchEdit.setInactiveText(self.trUtf8("Search...")) - self.__clearSearchButton = E5LineEditButton(self) - self.__clearSearchButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) - self.searchEdit.addWidget(self.__clearSearchButton, E5LineEdit.RightSide) - self.__clearSearchButton.clicked[()].connect(self.searchEdit.clear) self.__manager = Helpviewer.HelpWindow.HelpWindow.adBlockManager() self.adBlockGroup.setChecked(self.__manager.isEnabled())
--- a/Helpviewer/AdBlock/AdBlockDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/AdBlock/AdBlockDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -58,7 +58,7 @@ </spacer> </item> <item row="1" column="1"> - <widget class="E5LineEdit" name="searchEdit"> + <widget class="E5ClearableLineEdit" name="searchEdit"> <property name="toolTip"> <string>Enter search term for subscriptions and rules</string> </property> @@ -143,7 +143,7 @@ </widget> <customwidgets> <customwidget> - <class>E5LineEdit</class> + <class>E5ClearableLineEdit</class> <extends>QLineEdit</extends> <header>E5Gui/E5LineEdit.h</header> </customwidget>
--- a/Helpviewer/AdBlock/AdBlockExceptionsDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/AdBlock/AdBlockExceptionsDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -10,9 +10,6 @@ from PyQt4.QtCore import pyqtSlot from PyQt4.QtGui import QDialog -from E5Gui.E5LineEditButton import E5LineEditButton -from E5Gui.E5LineEdit import E5LineEdit - from .Ui_AdBlockExceptionsDialog import Ui_AdBlockExceptionsDialog import Helpviewer.HelpWindow @@ -36,10 +33,6 @@ self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("adBlockPlusGreen48.png")) self.hostEdit.setInactiveText(self.trUtf8("Enter host to be added...")) - self.__clearHostButton = E5LineEditButton(self) - self.__clearHostButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) - self.hostEdit.addWidget(self.__clearHostButton, E5LineEdit.RightSide) - self.__clearHostButton.clicked[()].connect(self.hostEdit.clear) self.buttonBox.setFocus()
--- a/Helpviewer/AdBlock/AdBlockExceptionsDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/AdBlock/AdBlockExceptionsDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -46,7 +46,7 @@ </spacer> </item> <item row="1" column="1"> - <widget class="E5LineEdit" name="hostEdit"> + <widget class="E5ClearableLineEdit" name="hostEdit"> <property name="toolTip"> <string>Enter a host to block AdBlock for</string> </property> @@ -117,7 +117,7 @@ </widget> <customwidgets> <customwidget> - <class>E5LineEdit</class> + <class>E5ClearableLineEdit</class> <extends>QLineEdit</extends> <header>E5Gui/E5LineEdit.h</header> </customwidget>
--- a/Helpviewer/Bookmarks/BookmarksDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/Bookmarks/BookmarksDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -19,8 +19,6 @@ from .Ui_BookmarksDialog import Ui_BookmarksDialog -import UI.PixmapCache - class BookmarksDialog(QDialog, Ui_BookmarksDialog): """ @@ -42,8 +40,6 @@ super().__init__(parent) self.setupUi(self) - self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) - self.__bookmarksManager = manager if self.__bookmarksManager is None: self.__bookmarksManager = Helpviewer.HelpWindow.HelpWindow.bookmarksManager()
--- a/Helpviewer/Bookmarks/BookmarksDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/Bookmarks/BookmarksDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -38,22 +38,12 @@ <number>0</number> </property> <item> - <widget class="QLineEdit" name="searchEdit"> + <widget class="E5ClearableLineEdit" name="searchEdit"> <property name="toolTip"> <string>Enter search term for bookmarks</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="clearButton"> - <property name="toolTip"> - <string>Press to clear the search edit</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> </layout> </item> </layout> @@ -134,14 +124,18 @@ </widget> <customwidgets> <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + <customwidget> <class>E5TreeView</class> <extends>QTreeView</extends> - <header>E5Gui/E5TreeView</header> + <header>E5Gui/E5TreeView.h</header> </customwidget> </customwidgets> <tabstops> <tabstop>searchEdit</tabstop> - <tabstop>clearButton</tabstop> <tabstop>bookmarksTree</tabstop> <tabstop>removeButton</tabstop> <tabstop>addFolderButton</tabstop> @@ -181,21 +175,5 @@ </hint> </hints> </connection> - <connection> - <sender>clearButton</sender> - <signal>clicked()</signal> - <receiver>searchEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>728</x> - <y>21</y> - </hint> - <hint type="destinationlabel"> - <x>706</x> - <y>20</y> - </hint> - </hints> - </connection> </connections> </ui>
--- a/Helpviewer/CookieJar/CookiesDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/CookieJar/CookiesDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -16,8 +16,6 @@ from .Ui_CookiesDialog import Ui_CookiesDialog -import UI.PixmapCache - class CookiesDialog(QDialog, Ui_CookiesDialog): """ @@ -33,7 +31,6 @@ super().__init__(parent) self.setupUi(self) - self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) self.addButton.setEnabled(False) self.__cookieJar = cookieJar
--- a/Helpviewer/CookieJar/CookiesDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/CookieJar/CookiesDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -38,22 +38,18 @@ <number>0</number> </property> <item> - <widget class="QLineEdit" name="searchEdit"> + <widget class="E5ClearableLineEdit" name="searchEdit"> + <property name="minimumSize"> + <size> + <width>300</width> + <height>0</height> + </size> + </property> <property name="toolTip"> <string>Enter search term for cookies</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="clearButton"> - <property name="toolTip"> - <string>Press to clear the search edit</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> </layout> </item> </layout> @@ -143,6 +139,11 @@ </widget> <customwidgets> <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + <customwidget> <class>E5TableView</class> <extends>QTableView</extends> <header>E5Gui/E5TableView.h</header> @@ -150,7 +151,6 @@ </customwidgets> <tabstops> <tabstop>searchEdit</tabstop> - <tabstop>clearButton</tabstop> <tabstop>cookiesTable</tabstop> <tabstop>removeButton</tabstop> <tabstop>removeAllButton</tabstop> @@ -191,21 +191,5 @@ </hint> </hints> </connection> - <connection> - <sender>clearButton</sender> - <signal>clicked()</signal> - <receiver>searchEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>376</x> - <y>21</y> - </hint> - <hint type="destinationlabel"> - <x>329</x> - <y>23</y> - </hint> - </hints> - </connection> </connections> </ui>
--- a/Helpviewer/CookieJar/CookiesExceptionsDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/CookieJar/CookiesExceptionsDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -16,8 +16,6 @@ from .Ui_CookiesExceptionsDialog import Ui_CookiesExceptionsDialog -import UI.PixmapCache - class CookiesExceptionsDialog(QDialog, Ui_CookiesExceptionsDialog): """ @@ -33,8 +31,6 @@ super().__init__(parent) self.setupUi(self) - self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) - self.__cookieJar = cookieJar self.removeButton.clicked[()].connect(self.exceptionsTable.removeSelected)
--- a/Helpviewer/CookieJar/CookiesExceptionsDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/CookieJar/CookiesExceptionsDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -139,22 +139,18 @@ <number>0</number> </property> <item> - <widget class="QLineEdit" name="searchEdit"> + <widget class="E5ClearableLineEdit" name="searchEdit"> + <property name="minimumSize"> + <size> + <width>300</width> + <height>0</height> + </size> + </property> <property name="toolTip"> <string>Enter search term for exceptions</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="clearButton"> - <property name="toolTip"> - <string>Press to clear the search edit</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> </layout> </item> </layout> @@ -237,6 +233,11 @@ </widget> <customwidgets> <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + <customwidget> <class>E5TableView</class> <extends>QTableView</extends> <header>E5Gui/E5TableView.h</header> @@ -248,7 +249,6 @@ <tabstop>allowForSessionButton</tabstop> <tabstop>allowButton</tabstop> <tabstop>searchEdit</tabstop> - <tabstop>clearButton</tabstop> <tabstop>exceptionsTable</tabstop> <tabstop>removeButton</tabstop> <tabstop>removeAllButton</tabstop> @@ -288,21 +288,5 @@ </hint> </hints> </connection> - <connection> - <sender>clearButton</sender> - <signal>clicked()</signal> - <receiver>searchEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>467</x> - <y>159</y> - </hint> - <hint type="destinationlabel"> - <x>432</x> - <y>158</y> - </hint> - </hints> - </connection> </connections> </ui>
--- a/Helpviewer/History/HistoryDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/History/HistoryDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -17,8 +17,6 @@ from .Ui_HistoryDialog import Ui_HistoryDialog -import UI.PixmapCache - class HistoryDialog(QDialog, Ui_HistoryDialog): """ @@ -40,8 +38,6 @@ super().__init__(parent) self.setupUi(self) - self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) - self.__historyManager = manager if self.__historyManager is None: self.__historyManager = Helpviewer.HelpWindow.HelpWindow.historyManager()
--- a/Helpviewer/History/HistoryDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/History/HistoryDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -38,22 +38,12 @@ <number>0</number> </property> <item> - <widget class="QLineEdit" name="searchEdit"> + <widget class="E5ClearableLineEdit" name="searchEdit"> <property name="toolTip"> <string>Enter search term for history entries</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="clearButton"> - <property name="toolTip"> - <string>Press to clear the search edit</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> </layout> </item> </layout> @@ -131,14 +121,18 @@ </widget> <customwidgets> <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + <customwidget> <class>E5TreeView</class> <extends>QTreeView</extends> - <header>E5Gui/E5TreeView</header> + <header>E5Gui/E5TreeView.h</header> </customwidget> </customwidgets> <tabstops> <tabstop>searchEdit</tabstop> - <tabstop>clearButton</tabstop> <tabstop>historyTree</tabstop> <tabstop>removeButton</tabstop> <tabstop>removeAllButton</tabstop> @@ -178,21 +172,5 @@ </hint> </hints> </connection> - <connection> - <sender>clearButton</sender> - <signal>clicked()</signal> - <receiver>searchEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>728</x> - <y>21</y> - </hint> - <hint type="destinationlabel"> - <x>706</x> - <y>20</y> - </hint> - </hints> - </connection> </connections> </ui>
--- a/Helpviewer/Network/SendRefererWhitelistDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/Network/SendRefererWhitelistDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -13,7 +13,6 @@ from .Ui_SendRefererWhitelistDialog import Ui_SendRefererWhitelistDialog -import UI.PixmapCache import Preferences @@ -30,8 +29,6 @@ super().__init__(parent) self.setupUi(self) - self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) - self.__model = QStringListModel(Preferences.getHelp("SendRefererWhitelist"), self) self.__model.sort(0) self.__proxyModel = QSortFilterProxyModel(self)
--- a/Helpviewer/Network/SendRefererWhitelistDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/Network/SendRefererWhitelistDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -23,7 +23,7 @@ <number>0</number> </property> <item row="0" column="1"> - <widget class="QLineEdit" name="searchEdit"> + <widget class="E5ClearableLineEdit" name="searchEdit"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -41,16 +41,6 @@ </property> </widget> </item> - <item row="0" column="2"> - <widget class="QToolButton" name="clearButton"> - <property name="toolTip"> - <string>Press to clear the search edit</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> <item row="0" column="0"> <spacer name="horizontalSpacer"> <property name="orientation"> @@ -153,6 +143,11 @@ </widget> <customwidgets> <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + <customwidget> <class>E5ListView</class> <extends>QListView</extends> <header>E5Gui/E5ListView.h</header> @@ -160,7 +155,6 @@ </customwidgets> <tabstops> <tabstop>searchEdit</tabstop> - <tabstop>clearButton</tabstop> <tabstop>whitelist</tabstop> <tabstop>addButton</tabstop> <tabstop>removeButton</tabstop> @@ -201,21 +195,5 @@ </hint> </hints> </connection> - <connection> - <sender>clearButton</sender> - <signal>clicked()</signal> - <receiver>searchEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>478</x> - <y>24</y> - </hint> - <hint type="destinationlabel"> - <x>437</x> - <y>22</y> - </hint> - </hints> - </connection> </connections> </ui>
--- a/Helpviewer/OfflineStorage/WebDatabasesDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/OfflineStorage/WebDatabasesDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -16,8 +16,6 @@ from .WebDatabasesModel import WebDatabasesModel -import UI.PixmapCache - class WebDatabasesDialog(QDialog, Ui_WebDatabasesDialog): """ @@ -32,8 +30,6 @@ super().__init__(parent) self.setupUi(self) - self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) - self.removeButton.clicked.connect(self.databasesTree.removeSelected) self.removeAllButton.clicked.connect(self.databasesTree.removeAll)
--- a/Helpviewer/OfflineStorage/WebDatabasesDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/OfflineStorage/WebDatabasesDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -38,22 +38,18 @@ <number>0</number> </property> <item> - <widget class="QLineEdit" name="searchEdit"> + <widget class="E5ClearableLineEdit" name="searchEdit"> + <property name="minimumSize"> + <size> + <width>300</width> + <height>0</height> + </size> + </property> <property name="toolTip"> <string>Enter search term for databases</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="clearButton"> - <property name="toolTip"> - <string>Press to clear the search edit</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> </layout> </item> </layout> @@ -121,6 +117,11 @@ </widget> <customwidgets> <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + <customwidget> <class>E5TreeView</class> <extends>QTreeView</extends> <header>E5Gui/E5TreeView.h</header> @@ -128,7 +129,6 @@ </customwidgets> <tabstops> <tabstop>searchEdit</tabstop> - <tabstop>clearButton</tabstop> <tabstop>databasesTree</tabstop> <tabstop>removeButton</tabstop> <tabstop>removeAllButton</tabstop>
--- a/Helpviewer/Passwords/PasswordsDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/Passwords/PasswordsDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -18,8 +18,6 @@ from .Ui_PasswordsDialog import Ui_PasswordsDialog -import UI.PixmapCache - class PasswordsDialog(QDialog, Ui_PasswordsDialog): """ @@ -34,8 +32,6 @@ super().__init__(parent) self.setupUi(self) - self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) - self.__showPasswordsText = self.trUtf8("Show Passwords") self.__hidePasswordsText = self.trUtf8("Hide Passwords") self.passwordsButton.setText(self.__showPasswordsText)
--- a/Helpviewer/Passwords/PasswordsDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/Passwords/PasswordsDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -38,22 +38,24 @@ <number>0</number> </property> <item> - <widget class="QLineEdit" name="searchEdit"> + <widget class="E5ClearableLineEdit" name="searchEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>300</width> + <height>0</height> + </size> + </property> <property name="toolTip"> <string>Enter search term</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="clearButton"> - <property name="toolTip"> - <string>Press to clear the search edit</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> </layout> </item> </layout> @@ -144,6 +146,11 @@ </widget> <customwidgets> <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + <customwidget> <class>E5TableView</class> <extends>QTableView</extends> <header>E5Gui/E5TableView.h</header> @@ -151,7 +158,6 @@ </customwidgets> <tabstops> <tabstop>searchEdit</tabstop> - <tabstop>clearButton</tabstop> <tabstop>passwordsTable</tabstop> <tabstop>removeButton</tabstop> <tabstop>removeAllButton</tabstop> @@ -167,8 +173,8 @@ <slot>accept()</slot> <hints> <hint type="sourcelabel"> - <x>228</x> - <y>274</y> + <x>237</x> + <y>340</y> </hint> <hint type="destinationlabel"> <x>157</x> @@ -183,8 +189,8 @@ <slot>reject()</slot> <hints> <hint type="sourcelabel"> - <x>316</x> - <y>260</y> + <x>325</x> + <y>340</y> </hint> <hint type="destinationlabel"> <x>286</x> @@ -192,21 +198,5 @@ </hint> </hints> </connection> - <connection> - <sender>clearButton</sender> - <signal>clicked()</signal> - <receiver>searchEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>376</x> - <y>21</y> - </hint> - <hint type="destinationlabel"> - <x>329</x> - <y>23</y> - </hint> - </hints> - </connection> </connections> </ui>
--- a/Helpviewer/UserAgent/UserAgentsDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/UserAgent/UserAgentsDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -15,8 +15,6 @@ from .Ui_UserAgentsDialog import Ui_UserAgentsDialog -import UI.PixmapCache - class UserAgentsDialog(QDialog, Ui_UserAgentsDialog): """ @@ -31,8 +29,6 @@ super().__init__(parent) self.setupUi(self) - self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) - self.removeButton.clicked[()].connect(self.userAgentsTable.removeSelected) self.removeAllButton.clicked[()].connect(self.userAgentsTable.removeAll)
--- a/Helpviewer/UserAgent/UserAgentsDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/UserAgent/UserAgentsDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -38,22 +38,12 @@ <number>0</number> </property> <item> - <widget class="QLineEdit" name="searchEdit"> + <widget class="E5ClearableLineEdit" name="searchEdit"> <property name="toolTip"> <string>Enter search term</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="clearButton"> - <property name="toolTip"> - <string>Press to clear the search edit</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> </layout> </item> </layout> @@ -134,6 +124,11 @@ </widget> <customwidgets> <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + <customwidget> <class>E5TableView</class> <extends>QTableView</extends> <header>E5Gui/E5TableView.h</header> @@ -141,7 +136,6 @@ </customwidgets> <tabstops> <tabstop>searchEdit</tabstop> - <tabstop>clearButton</tabstop> <tabstop>userAgentsTable</tabstop> <tabstop>removeButton</tabstop> <tabstop>removeAllButton</tabstop> @@ -156,8 +150,8 @@ <slot>accept()</slot> <hints> <hint type="sourcelabel"> - <x>228</x> - <y>274</y> + <x>237</x> + <y>390</y> </hint> <hint type="destinationlabel"> <x>157</x> @@ -172,8 +166,8 @@ <slot>reject()</slot> <hints> <hint type="sourcelabel"> - <x>316</x> - <y>260</y> + <x>325</x> + <y>390</y> </hint> <hint type="destinationlabel"> <x>286</x> @@ -181,21 +175,5 @@ </hint> </hints> </connection> - <connection> - <sender>clearButton</sender> - <signal>clicked()</signal> - <receiver>searchEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>376</x> - <y>21</y> - </hint> - <hint type="destinationlabel"> - <x>329</x> - <y>23</y> - </hint> - </hints> - </connection> </connections> </ui>
--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -30,7 +30,6 @@ super().__init__(parent) self.setupUi(self) - self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("flashBlock48.png")) self.__model = QStringListModel(whitelist[:], self)
--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -62,7 +62,7 @@ </spacer> </item> <item row="1" column="2"> - <widget class="QLineEdit" name="searchEdit"> + <widget class="E5ClearableLineEdit" name="searchEdit"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -80,16 +80,6 @@ </property> </widget> </item> - <item row="1" column="3"> - <widget class="QToolButton" name="clearButton"> - <property name="toolTip"> - <string>Press to clear the search edit</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> </layout> </item> <item> @@ -176,6 +166,11 @@ </widget> <customwidgets> <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + <customwidget> <class>E5ListView</class> <extends>QListView</extends> <header>E5Gui/E5ListView.h</header> @@ -183,7 +178,6 @@ </customwidgets> <tabstops> <tabstop>searchEdit</tabstop> - <tabstop>clearButton</tabstop> <tabstop>whitelist</tabstop> <tabstop>addButton</tabstop> <tabstop>removeButton</tabstop> @@ -224,21 +218,5 @@ </hint> </hints> </connection> - <connection> - <sender>clearButton</sender> - <signal>clicked()</signal> - <receiver>searchEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>478</x> - <y>24</y> - </hint> - <hint type="destinationlabel"> - <x>437</x> - <y>22</y> - </hint> - </hints> - </connection> </connections> </ui>
--- a/Plugins/CheckerPlugins/Pep8/Pep8Dialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Plugins/CheckerPlugins/Pep8/Pep8Dialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -76,14 +76,6 @@ self.__data = {} self.__statistics = {} - self.clearButton.setIcon( - UI.PixmapCache.getIcon("clearLeft.png")) - self.clearButtonExcludeMessages.setIcon( - UI.PixmapCache.getIcon("clearLeft.png")) - self.clearButtonIncludeMessages.setIcon( - UI.PixmapCache.getIcon("clearLeft.png")) - self.clearButtonFixIssues.setIcon( - UI.PixmapCache.getIcon("clearLeft.png")) self.on_loadDefaultButton_clicked() def __resort(self):
--- a/Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -28,41 +28,78 @@ <enum>QFrame::NoFrame</enum> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label_2"> + <item row="1" column="2"> + <widget class="QToolButton" name="excludeMessagesSelectButton"> + <property name="toolTip"> + <string>Press to select the message codes from a list</string> + </property> <property name="text"> - <string>Exclude Files:</string> + <string>...</string> </property> </widget> </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="excludeFilesEdit"> - <property name="toolTip"> - <string>Enter filename patterns of files to be excluded separated by a comma</string> + <item row="4" column="0" colspan="3"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QCheckBox" name="repeatCheckBox"> + <property name="toolTip"> + <string>Select to repeat each message type</string> + </property> + <property name="text"> + <string>Repeat messages</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="fixIssuesCheckBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Select to fix some issues</string> + </property> + <property name="text"> + <string>Fix issues automatically</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Exclude Messages:</string> </property> </widget> </item> - <item row="0" column="2"> - <widget class="QToolButton" name="clearButton"> + <item row="3" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Fix Issues:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="E5ClearableLineEdit" name="fixIssuesEdit"> <property name="toolTip"> - <string>Press to clear the filter edit</string> - </property> - <property name="text"> - <string/> + <string>Enter message codes of issues to be fixed automatically (leave empty to fix all)</string> </property> </widget> </item> <item row="0" column="4" rowspan="5"> - <widget class="Line" name="line"> - <property name="lineWidth"> - <number>2</number> - </property> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - </widget> - </item> - <item row="0" column="5" rowspan="5"> <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <widget class="QPushButton" name="startButton"> @@ -109,32 +146,46 @@ </item> </layout> </item> - <item row="1" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Exclude Messages:</string> + <item row="2" column="1"> + <widget class="E5ClearableLineEdit" name="includeMessagesEdit"> + <property name="toolTip"> + <string>Enter message codes or categories to be included separated by a comma</string> </property> </widget> </item> <item row="1" column="1"> - <widget class="QLineEdit" name="excludeMessagesEdit"> + <widget class="E5ClearableLineEdit" name="excludeMessagesEdit"> <property name="toolTip"> <string>Enter message codes or categories to be excluded separated by a comma</string> </property> </widget> </item> - <item row="1" column="2"> - <widget class="QToolButton" name="clearButtonExcludeMessages"> - <property name="toolTip"> - <string>Press to clear the exclude messages edit</string> - </property> + <item row="0" column="0"> + <widget class="QLabel" name="label_2"> <property name="text"> - <string/> + <string>Exclude Files:</string> </property> </widget> </item> - <item row="1" column="3"> - <widget class="QToolButton" name="excludeMessagesSelectButton"> + <item row="0" column="1"> + <widget class="E5ClearableLineEdit" name="excludeFilesEdit"> + <property name="toolTip"> + <string>Enter filename patterns of files to be excluded separated by a comma</string> + </property> + </widget> + </item> + <item row="0" column="3" rowspan="5"> + <widget class="Line" name="line"> + <property name="lineWidth"> + <number>2</number> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QToolButton" name="includeMessagesSelectButton"> <property name="toolTip"> <string>Press to select the message codes from a list</string> </property> @@ -150,58 +201,7 @@ </property> </widget> </item> - <item row="2" column="1"> - <widget class="QLineEdit" name="includeMessagesEdit"> - <property name="toolTip"> - <string>Enter message codes or categories to be included separated by a comma</string> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="QToolButton" name="clearButtonIncludeMessages"> - <property name="toolTip"> - <string>Press to clear the include messages edit</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="2" column="3"> - <widget class="QToolButton" name="includeMessagesSelectButton"> - <property name="toolTip"> - <string>Press to select the message codes from a list</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>Fix Issues:</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QLineEdit" name="fixIssuesEdit"> - <property name="toolTip"> - <string>Enter message codes of issues to be fixed automatically (leave empty to fix all)</string> - </property> - </widget> - </item> <item row="3" column="2"> - <widget class="QToolButton" name="clearButtonFixIssues"> - <property name="toolTip"> - <string>Press to clear the fix issues edit</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="3" column="3"> <widget class="QToolButton" name="fixIssuesSelectButton"> <property name="toolTip"> <string>Press to select the message codes from a list</string> @@ -211,46 +211,6 @@ </property> </widget> </item> - <item row="4" column="0" colspan="4"> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QCheckBox" name="repeatCheckBox"> - <property name="toolTip"> - <string>Select to repeat each message type</string> - </property> - <property name="text"> - <string>Repeat messages</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="fixIssuesCheckBox"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Select to fix some issues</string> - </property> - <property name="text"> - <string>Fix issues automatically</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> </layout> </widget> </item> @@ -315,19 +275,22 @@ </widget> <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> <tabstops> <tabstop>startButton</tabstop> <tabstop>loadDefaultButton</tabstop> <tabstop>excludeFilesEdit</tabstop> - <tabstop>clearButton</tabstop> <tabstop>excludeMessagesEdit</tabstop> - <tabstop>clearButtonExcludeMessages</tabstop> <tabstop>excludeMessagesSelectButton</tabstop> <tabstop>includeMessagesEdit</tabstop> - <tabstop>clearButtonIncludeMessages</tabstop> <tabstop>includeMessagesSelectButton</tabstop> <tabstop>fixIssuesEdit</tabstop> - <tabstop>clearButtonFixIssues</tabstop> <tabstop>fixIssuesSelectButton</tabstop> <tabstop>repeatCheckBox</tabstop> <tabstop>fixIssuesCheckBox</tabstop> @@ -338,70 +301,6 @@ <resources/> <connections> <connection> - <sender>clearButton</sender> - <signal>clicked()</signal> - <receiver>excludeFilesEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>493</x> - <y>42</y> - </hint> - <hint type="destinationlabel"> - <x>460</x> - <y>39</y> - </hint> - </hints> - </connection> - <connection> - <sender>clearButtonExcludeMessages</sender> - <signal>clicked()</signal> - <receiver>excludeMessagesEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>491</x> - <y>66</y> - </hint> - <hint type="destinationlabel"> - <x>444</x> - <y>63</y> - </hint> - </hints> - </connection> - <connection> - <sender>clearButtonIncludeMessages</sender> - <signal>clicked()</signal> - <receiver>includeMessagesEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>493</x> - <y>106</y> - </hint> - <hint type="destinationlabel"> - <x>458</x> - <y>95</y> - </hint> - </hints> - </connection> - <connection> - <sender>clearButtonFixIssues</sender> - <signal>clicked()</signal> - <receiver>fixIssuesEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>478</x> - <y>122</y> - </hint> - <hint type="destinationlabel"> - <x>445</x> - <y>122</y> - </hint> - </hints> - </connection> - <connection> <sender>repeatCheckBox</sender> <signal>toggled(bool)</signal> <receiver>fixIssuesCheckBox</receiver>
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -60,7 +60,6 @@ self.__fileList = [] self.__project = None - self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) self.filterFrame.setVisible(False) def __resort(self):
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -42,23 +42,13 @@ </widget> </item> <item> - <widget class="QLineEdit" name="excludeFilesEdit"> + <widget class="E5ClearableLineEdit" name="excludeFilesEdit"> <property name="toolTip"> <string>Enter filename patterns of files to be excluded separated by a comma</string> </property> </widget> </item> <item> - <widget class="QToolButton" name="clearButton"> - <property name="toolTip"> - <string>Press to clear the filter edit</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> <widget class="Line" name="line"> <property name="lineWidth"> <number>2</number> @@ -139,30 +129,19 @@ </widget> <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> <tabstops> <tabstop>startButton</tabstop> <tabstop>excludeFilesEdit</tabstop> - <tabstop>clearButton</tabstop> <tabstop>resultList</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/> - <connections> - <connection> - <sender>clearButton</sender> - <signal>clicked()</signal> - <receiver>excludeFilesEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>527</x> - <y>22</y> - </hint> - <hint type="destinationlabel"> - <x>492</x> - <y>19</y> - </hint> - </hints> - </connection> - </connections> + <connections/> </ui>
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -21,7 +21,6 @@ from . import Tabnanny import Utilities import Preferences -import UI.PixmapCache from eric5config import getConfig @@ -50,7 +49,6 @@ self.__fileList = [] self.__project = None - self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) self.filterFrame.setVisible(False) def __resort(self):
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -42,23 +42,13 @@ </widget> </item> <item> - <widget class="QLineEdit" name="excludeFilesEdit"> + <widget class="E5ClearableLineEdit" name="excludeFilesEdit"> <property name="toolTip"> <string>Enter filename patterns of files to be excluded separated by a comma</string> </property> </widget> </item> <item> - <widget class="QToolButton" name="clearButton"> - <property name="toolTip"> - <string>Press to clear the filter edit</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> <widget class="Line" name="line"> <property name="lineWidth"> <number>2</number> @@ -145,30 +135,19 @@ </widget> <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> <tabstops> <tabstop>startButton</tabstop> <tabstop>excludeFilesEdit</tabstop> - <tabstop>clearButton</tabstop> <tabstop>resultList</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/> - <connections> - <connection> - <sender>clearButton</sender> - <signal>clicked()</signal> - <receiver>excludeFilesEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>526</x> - <y>18</y> - </hint> - <hint type="destinationlabel"> - <x>480</x> - <y>17</y> - </hint> - </hints> - </connection> - </connections> + <connections/> </ui>
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -18,7 +18,6 @@ from .Ui_HgGpgSignaturesDialog import Ui_HgGpgSignaturesDialog import Preferences -import UI.PixmapCache class HgGpgSignaturesDialog(QDialog, Ui_HgGpgSignaturesDialog): @@ -35,8 +34,6 @@ super().__init__(parent) self.setupUi(self) - self.clearRxEditButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -63,19 +63,12 @@ </widget> </item> <item> - <widget class="QLineEdit" name="rxEdit"> + <widget class="E5ClearableLineEdit" name="rxEdit"> <property name="toolTip"> <string>Enter the regular expression to filter on</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="clearRxEditButton"> - <property name="text"> - <string/> - </property> - </widget> - </item> </layout> </item> <item> @@ -230,10 +223,16 @@ </item> </layout> </widget> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> <tabstops> <tabstop>categoryCombo</tabstop> <tabstop>rxEdit</tabstop> - <tabstop>clearRxEditButton</tabstop> <tabstop>signaturesList</tabstop> <tabstop>verifyButton</tabstop> <tabstop>errors</tabstop> @@ -243,22 +242,5 @@ <tabstop>buttonBox</tabstop> </tabstops> <resources/> - <connections> - <connection> - <sender>clearRxEditButton</sender> - <signal>clicked()</signal> - <receiver>rxEdit</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>681</x> - <y>16</y> - </hint> - <hint type="destinationlabel"> - <x>631</x> - <y>15</y> - </hint> - </hints> - </connection> - </connections> + <connections/> </ui>
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -21,8 +21,6 @@ from .Ui_HgLogBrowserDialog import Ui_HgLogBrowserDialog from .HgDiffDialog import HgDiffDialog -import UI.PixmapCache - import Preferences COLORNAMES = ["blue", "darkgreen", "red", "green", "darkblue", "purple", @@ -94,7 +92,6 @@ self.toDate.setDate(QDate.currentDate()) self.fieldCombo.setCurrentIndex(self.fieldCombo.findText( self.trUtf8("Message"))) - self.clearRxEditButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) self.limitSpinBox.setValue(self.vcs.getPlugin().getPreferences( "LogLimit")) self.stopCheckBox.setChecked(self.vcs.getPlugin().getPreferences( @@ -1204,13 +1201,6 @@ self.messageEdit.clear() self.filesTree.clear() - @pyqtSlot() - def on_clearRxEditButton_clicked(self): - """ - Private slot called by a click of the clear RX edit button. - """ - self.rxEdit.clear() - @pyqtSlot(bool) def on_stopCheckBox_clicked(self, checked): """
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -119,19 +119,12 @@ </widget> </item> <item> - <widget class="QLineEdit" name="rxEdit"> + <widget class="E5ClearableLineEdit" name="rxEdit"> <property name="toolTip"> <string>Enter the regular expression to filter on</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="clearRxEditButton"> - <property name="text"> - <string/> - </property> - </widget> - </item> </layout> </item> <item> @@ -476,13 +469,19 @@ </item> </layout> </widget> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> <tabstops> <tabstop>fromDate</tabstop> <tabstop>toDate</tabstop> <tabstop>branchCombo</tabstop> <tabstop>fieldCombo</tabstop> <tabstop>rxEdit</tabstop> - <tabstop>clearRxEditButton</tabstop> <tabstop>logTree</tabstop> <tabstop>messageEdit</tabstop> <tabstop>filesTree</tabstop>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -23,8 +23,6 @@ from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog -import UI.PixmapCache - class SvnLogBrowserDialog(QDialog, SvnDialogMixin, Ui_SvnLogBrowserDialog): """ @@ -58,7 +56,6 @@ self.fromDate.setDate(QDate.currentDate()) self.toDate.setDate(QDate.currentDate()) self.fieldCombo.setCurrentIndex(self.fieldCombo.findText(self.trUtf8("Message"))) - self.clearRxEditButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) self.limitSpinBox.setValue(self.vcs.getPlugin().getPreferences("LogLimit")) self.stopCheckBox.setChecked(self.vcs.getPlugin().getPreferences("StopLogOnCopy")) @@ -503,13 +500,6 @@ self.messageEdit.clear() self.filesTree.clear() - @pyqtSlot() - def on_clearRxEditButton_clicked(self): - """ - Private slot called by a click of the clear RX edit button. - """ - self.rxEdit.clear() - @pyqtSlot(bool) def on_stopCheckBox_clicked(self, checked): """
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>SvnLogBrowserDialog</class> - <widget class="QDialog" name="SvnLogBrowserDialog" > - <property name="geometry" > + <widget class="QDialog" name="SvnLogBrowserDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,267 +10,260 @@ <height>600</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Subversion Log</string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QLabel" name="label" > - <property name="text" > + <widget class="QLabel" name="label"> + <property name="text"> <string>From:</string> </property> </widget> </item> <item> - <widget class="QDateEdit" name="fromDate" > - <property name="toolTip" > + <widget class="QDateEdit" name="fromDate"> + <property name="toolTip"> <string>Enter the start date</string> </property> - <property name="calendarPopup" > + <property name="calendarPopup"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QLabel" name="label_2" > - <property name="text" > + <widget class="QLabel" name="label_2"> + <property name="text"> <string>To:</string> </property> </widget> </item> <item> - <widget class="QDateEdit" name="toDate" > - <property name="toolTip" > + <widget class="QDateEdit" name="toDate"> + <property name="toolTip"> <string>Enter the end date</string> </property> - <property name="calendarPopup" > + <property name="calendarPopup"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QComboBox" name="fieldCombo" > - <property name="toolTip" > + <widget class="QComboBox" name="fieldCombo"> + <property name="toolTip"> <string>Select the field to filter on</string> </property> <item> - <property name="text" > + <property name="text"> <string>Revision</string> </property> </item> <item> - <property name="text" > + <property name="text"> <string>Author</string> </property> </item> <item> - <property name="text" > + <property name="text"> <string>Message</string> </property> </item> </widget> </item> <item> - <widget class="QLineEdit" name="rxEdit" > - <property name="toolTip" > + <widget class="E5ClearableLineEdit" name="rxEdit"> + <property name="toolTip"> <string>Enter the regular expression to filter on</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="clearRxEditButton" > - <property name="text" > - <string/> - </property> - </widget> - </item> </layout> </item> <item> - <widget class="QTreeWidget" name="logTree" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > + <widget class="QTreeWidget" name="logTree"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>5</verstretch> </sizepolicy> </property> - <property name="alternatingRowColors" > + <property name="alternatingRowColors"> <bool>true</bool> </property> - <property name="selectionMode" > + <property name="selectionMode"> <enum>QAbstractItemView::ExtendedSelection</enum> </property> - <property name="rootIsDecorated" > + <property name="rootIsDecorated"> <bool>false</bool> </property> - <property name="itemsExpandable" > + <property name="itemsExpandable"> <bool>false</bool> </property> - <property name="sortingEnabled" > + <property name="sortingEnabled"> <bool>true</bool> </property> - <property name="allColumnsShowFocus" > + <property name="allColumnsShowFocus"> <bool>true</bool> </property> <column> - <property name="text" > + <property name="text"> <string>Revision</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Author</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Date</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Message</string> </property> </column> </widget> </item> <item> - <widget class="QTextEdit" name="messageEdit" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > + <widget class="QTextEdit" name="messageEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>2</verstretch> </sizepolicy> </property> - <property name="readOnly" > + <property name="readOnly"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QTreeWidget" name="filesTree" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > + <widget class="QTreeWidget" name="filesTree"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>3</verstretch> </sizepolicy> </property> - <property name="alternatingRowColors" > + <property name="alternatingRowColors"> <bool>true</bool> </property> - <property name="rootIsDecorated" > + <property name="rootIsDecorated"> <bool>false</bool> </property> - <property name="itemsExpandable" > + <property name="itemsExpandable"> <bool>false</bool> </property> - <property name="sortingEnabled" > + <property name="sortingEnabled"> <bool>true</bool> </property> - <property name="allColumnsShowFocus" > + <property name="allColumnsShowFocus"> <bool>true</bool> </property> <column> - <property name="text" > + <property name="text"> <string>Action</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Path</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Copy from</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Copy from Rev</string> </property> </column> </widget> </item> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QPushButton" name="nextButton" > - <property name="toolTip" > + <widget class="QPushButton" name="nextButton"> + <property name="toolTip"> <string>Press to get the next bunch of log entries</string> </property> - <property name="text" > + <property name="text"> <string>&Next</string> </property> </widget> </item> <item> - <widget class="QSpinBox" name="limitSpinBox" > - <property name="toolTip" > + <widget class="QSpinBox" name="limitSpinBox"> + <property name="toolTip"> <string>Enter the limit of entries to fetch</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> - <property name="minimum" > + <property name="minimum"> <number>1</number> </property> - <property name="maximum" > + <property name="maximum"> <number>10000</number> </property> - <property name="value" > + <property name="value"> <number>100</number> </property> </widget> </item> <item> - <widget class="QCheckBox" name="stopCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="stopCheckBox"> + <property name="toolTip"> <string>Select to stop listing log messages at a copy or move</string> </property> - <property name="text" > + <property name="text"> <string>Stop on Copy/Move</string> </property> </widget> </item> <item> - <widget class="Line" name="line" > - <property name="orientation" > + <widget class="Line" name="line"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> </widget> </item> <item> - <widget class="QPushButton" name="diffPreviousButton" > - <property name="toolTip" > + <widget class="QPushButton" name="diffPreviousButton"> + <property name="toolTip"> <string>Press to generate a diff to the previous revision</string> </property> - <property name="text" > + <property name="text"> <string>&Diff to Previous</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="diffRevisionsButton" > - <property name="toolTip" > + <widget class="QPushButton" name="diffRevisionsButton"> + <property name="toolTip"> <string>Press to compare two revisions</string> </property> - <property name="text" > + <property name="text"> <string>&Compare Revisions</string> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>91</width> <height>29</height> @@ -280,17 +274,24 @@ </layout> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> </property> </widget> </item> </layout> </widget> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> <tabstops> <tabstop>fromDate</tabstop> <tabstop>toDate</tabstop> @@ -305,7 +306,6 @@ <tabstop>diffPreviousButton</tabstop> <tabstop>diffRevisionsButton</tabstop> <tabstop>buttonBox</tabstop> - <tabstop>clearRxEditButton</tabstop> </tabstops> <resources/> <connections/>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -19,8 +19,6 @@ from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog -import UI.PixmapCache - import Preferences @@ -55,7 +53,6 @@ self.fromDate.setDate(QDate.currentDate()) self.toDate.setDate(QDate.currentDate()) self.fieldCombo.setCurrentIndex(self.fieldCombo.findText(self.trUtf8("Message"))) - self.clearRxEditButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) self.limitSpinBox.setValue(self.vcs.getPlugin().getPreferences("LogLimit")) self.stopCheckBox.setChecked(self.vcs.getPlugin().getPreferences("StopLogOnCopy")) @@ -578,13 +575,6 @@ self.messageEdit.clear() self.filesTree.clear() - @pyqtSlot() - def on_clearRxEditButton_clicked(self): - """ - Private slot called by a click of the clear RX edit button. - """ - self.rxEdit.clear() - @pyqtSlot(bool) def on_stopCheckBox_clicked(self, checked): """
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -76,19 +76,12 @@ </widget> </item> <item> - <widget class="QLineEdit" name="rxEdit"> + <widget class="E5ClearableLineEdit" name="rxEdit"> <property name="toolTip"> <string>Enter the regular expression to filter on</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="clearRxEditButton"> - <property name="text"> - <string/> - </property> - </widget> - </item> </layout> </item> <item> @@ -378,12 +371,18 @@ </item> </layout> </widget> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> <tabstops> <tabstop>fromDate</tabstop> <tabstop>toDate</tabstop> <tabstop>fieldCombo</tabstop> <tabstop>rxEdit</tabstop> - <tabstop>clearRxEditButton</tabstop> <tabstop>logTree</tabstop> <tabstop>messageEdit</tabstop> <tabstop>filesTree</tabstop>
--- a/Preferences/ConfigurationDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Preferences/ConfigurationDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -16,8 +16,7 @@ QFrame, QVBoxLayout, QTreeWidgetItem, QLabel from E5Gui.E5Application import e5App -from E5Gui.E5LineEdit import E5LineEdit -from E5Gui.E5LineEditButton import E5LineEditButton +from E5Gui.E5LineEdit import E5ClearableLineEdit from E5Gui import E5MessageBox from E5Gui.E5MainWindow import E5MainWindow @@ -407,18 +406,13 @@ self.leftVBoxLayout.setMargin(0) self.leftVBoxLayout.setSpacing(0) self.leftVBoxLayout.setObjectName("leftVBoxLayout") - self.configListFilter = E5LineEdit(self, self.trUtf8("Enter filter text...")) + self.configListFilter = E5ClearableLineEdit(self, + self.trUtf8("Enter filter text...")) self.configListFilter.setObjectName("configListFilter") self.leftVBoxLayout.addWidget(self.configListFilter) self.configList = QTreeWidget() self.configList.setObjectName("configList") self.leftVBoxLayout.addWidget(self.configList) - - self.__clearButton = E5LineEditButton(self) - self.__clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) - self.configListFilter.addWidget(self.__clearButton, E5LineEdit.RightSide) - self.__clearButton.setVisible(False) - self.__clearButton.clicked[()].connect(self.configListFilter.clear) self.configListFilter.textChanged.connect(self.__filterTextChanged) self.scrollArea = QScrollArea(self.configSplitter) @@ -492,8 +486,6 @@ @param filter text of the filter line edit (string) """ - self.__clearButton.setVisible(filter != "") - self.__filterChildItems(self.configList.invisibleRootItem(), filter) def __filterChildItems(self, parent, filter):
--- a/Preferences/ShortcutsDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Preferences/ShortcutsDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -16,8 +16,6 @@ from .Ui_ShortcutsDialog import Ui_ShortcutsDialog from .ShortcutDialog import ShortcutDialog -import UI.PixmapCache - import Preferences from Preferences import Shortcuts @@ -48,7 +46,6 @@ self.setModal(modal) self.setupUi(self) - self.clearSearchButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) self.shortcutsList.headerItem().setText(self.shortcutsList.columnCount(), "") self.shortcutsList.header().setSortIndicator(0, Qt.AscendingOrder) @@ -429,12 +426,6 @@ itm.setHidden(False) topItem.setHidden(childHiddenCount == topItem.childCount()) - @pyqtSlot() - def on_clearSearchButton_clicked(self): - """ - Private slot called by a click of the clear search button. - """ - self.searchEdit.clear() @pyqtSlot(bool) def on_actionButton_toggled(self, checked):
--- a/Preferences/ShortcutsDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Preferences/ShortcutsDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -27,22 +27,12 @@ </widget> </item> <item> - <widget class="QLineEdit" name="searchEdit"> + <widget class="E5ClearableLineEdit" name="searchEdit"> <property name="toolTip"> <string>Enter the regular expression that should be contained in the shortcut action</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="clearSearchButton"> - <property name="toolTip"> - <string>Press to clear the search edit</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> </layout> </item> <item> @@ -135,9 +125,15 @@ </widget> <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> <tabstops> <tabstop>searchEdit</tabstop> - <tabstop>clearSearchButton</tabstop> <tabstop>actionButton</tabstop> <tabstop>shortcutButton</tabstop> <tabstop>shortcutsList</tabstop> @@ -152,8 +148,8 @@ <slot>reject()</slot> <hints> <hint type="sourcelabel"> - <x>69</x> - <y>457</y> + <x>78</x> + <y>490</y> </hint> <hint type="destinationlabel"> <x>77</x>
--- a/Project/CreateDialogCodeDialog.py Mon Nov 12 17:46:11 2012 +0100 +++ b/Project/CreateDialogCodeDialog.py Mon Nov 12 19:04:11 2012 +0100 @@ -23,8 +23,6 @@ from Utilities import ModuleParser -import UI.PixmapCache - from eric5config import getConfig pyqtSignatureRole = Qt.UserRole + 1 @@ -66,8 +64,6 @@ self.proxyModel.setSourceModel(self.slotsModel) self.slotsView.setModel(self.proxyModel) - self.clearFilterButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) - # initialize some member variables self.__initError = False self.__module = None @@ -503,13 +499,6 @@ self.proxyModel.setFilterRegExp(re) @pyqtSlot() - def on_clearFilterButton_clicked(self): - """ - Private slot called by a click of the clear filter button. - """ - self.filterEdit.clear() - - @pyqtSlot() def on_newButton_clicked(self): """ Private slot called to enter the data for a new dialog class.
--- a/Project/CreateDialogCodeDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Project/CreateDialogCodeDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -16,29 +16,9 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout"> + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <layout class="QGridLayout"> - <item row="1" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>&Filename:</string> - </property> - <property name="buddy"> - <cstring>filenameEdit</cstring> - </property> - </widget> - </item> - <item row="0" column="2" colspan="2"> - <widget class="QPushButton" name="newButton"> - <property name="toolTip"> - <string>Press to generate a new forms class</string> - </property> - <property name="text"> - <string>&New...</string> - </property> - </widget> - </item> + <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> @@ -49,13 +29,6 @@ </property> </widget> </item> - <item row="2" column="3"> - <widget class="QToolButton" name="clearFilterButton"> - <property name="text"> - <string/> - </property> - </widget> - </item> <item row="0" column="1"> <widget class="QComboBox" name="classNameCombo"> <property name="sizePolicy"> @@ -69,7 +42,27 @@ </property> </widget> </item> - <item row="1" column="1" colspan="3"> + <item row="0" column="2"> + <widget class="QPushButton" name="newButton"> + <property name="toolTip"> + <string>Press to generate a new forms class</string> + </property> + <property name="text"> + <string>&New...</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>&Filename:</string> + </property> + <property name="buddy"> + <cstring>filenameEdit</cstring> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> <widget class="QLineEdit" name="filenameEdit"> <property name="toolTip"> <string>Displays the name of the file containing the code</string> @@ -79,13 +72,6 @@ </property> </widget> </item> - <item row="2" column="1" colspan="2"> - <widget class="QLineEdit" name="filterEdit"> - <property name="toolTip"> - <string>Enter a regular expression to filter the list below</string> - </property> - </widget> - </item> <item row="2" column="0"> <widget class="QLabel" name="label_3"> <property name="text"> @@ -96,6 +82,13 @@ </property> </widget> </item> + <item row="2" column="1" colspan="2"> + <widget class="E5ClearableLineEdit" name="filterEdit"> + <property name="toolTip"> + <string>Enter a regular expression to filter the list below</string> + </property> + </widget> + </item> </layout> </item> <item> @@ -117,12 +110,18 @@ </item> </layout> </widget> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> <tabstops> <tabstop>classNameCombo</tabstop> <tabstop>newButton</tabstop> <tabstop>filenameEdit</tabstop> <tabstop>filterEdit</tabstop> - <tabstop>clearFilterButton</tabstop> <tabstop>slotsView</tabstop> <tabstop>buttonBox</tabstop> </tabstops>
--- a/eric5.e4p Mon Nov 12 17:46:11 2012 +0100 +++ b/eric5.e4p Mon Nov 12 19:04:11 2012 +0100 @@ -1053,6 +1053,7 @@ <Source>UI/NotificationWidget.py</Source> <Source>Preferences/ConfigurationPages/NotificationsPage.py</Source> <Source>QScintilla/SpellingDictionaryEditDialog.py</Source> + <Source>E5Gui/E5ComboBox.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form>
--- a/i18n/eric5_de.ts Mon Nov 12 17:46:11 2012 +0100 +++ b/i18n/eric5_de.ts Mon Nov 12 19:04:11 2012 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -108,22 +107,22 @@ <translation>Aktionen</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="146"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="140"/> <source>Learn more about writing rules...</source> <translation>Mehr über das Schreiben von Regeln lernen...</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="141"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="135"/> <source>Update Subscription</source> <translation>Abonnement aktualisieren</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="130"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="124"/> <source>Browse Subscriptions...</source> <translation>Abonnements anschauen...</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="217"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="211"/> <source>Remove Subscription</source> <translation>Abonnement löschen</translation> </message> @@ -138,42 +137,42 @@ <translation>Gib die Aktualisierungsperiode ein (1 bis 14 Tage)</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="42"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="40"/> <source>Search...</source> <translation>Suchen...</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="125"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="119"/> <source>Add Rule</source> <translation>Regel hinzufügen</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="127"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="121"/> <source>Remove Rule</source> <translation>Regel löschen</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="136"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="130"/> <source>Disable Subscription</source> <translation>Abonnement deaktivieren</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="138"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="132"/> <source>Enable Subscription</source> <translation>Abonnement aktivieren</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="143"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="137"/> <source>Update All Subscriptions</source> <translation>Alle Abonnements aktualisieren</translation> </message> <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="203"/> + <source><p>Do you really want to remove subscription <b>{0}</b> and all subscriptions requiring it?</p><ul><li>{1}</li></ul></source> + <translation><p>Soll das Abonnement <b>{0}</b> und alle abhängigen Abonnements wirklich gelöscht werden?</p><ul><li>{1}</li></ul></translation> + </message> + <message> <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="209"/> - <source><p>Do you really want to remove subscription <b>{0}</b> and all subscriptions requiring it?</p><ul><li>{1}</li></ul></source> - <translation><p>Soll das Abonnement <b>{0}</b> und alle abhängigen Abonnements wirklich gelöscht werden?</p><ul><li>{1}</li></ul></translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="215"/> <source><p>Do you really want to remove subscription <b>{0}</b>?</p></source> <translation><p>Soll das Abonnement <b>{0}</b> wirklich gelöscht werden?</p></translation> </message> @@ -216,7 +215,7 @@ <translation>&Löschen</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockExceptionsDialog.py" line="38"/> + <location filename="Helpviewer/AdBlock/AdBlockExceptionsDialog.py" line="35"/> <source>Enter host to be added...</source> <translation>Gib einen hinzuzufügenden Host ein...</translation> </message> @@ -1709,57 +1708,52 @@ <translation>Gib den Suchausdruck für Lesezeichen ein</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="50"/> - <source>Press to clear the search edit</source> - <translation>Drücken, um den Suchtext zu löschen</translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="98"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="88"/> <source>Press to add a new bookmarks folder</source> <translation>Drücken, um einen neuen Lesezeichenordner hinzuzufügen</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="101"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="91"/> <source>Add &Folder</source> <translation>&Ordner hinzufügen</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="144"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="140"/> <source>&Open</source> <translation>Ö&ffnen</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="145"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="141"/> <source>Open in New &Tab</source> <translation>In neuem &Register öffnen</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="147"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="143"/> <source>Edit &Name</source> <translation>&Namen editieren</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="150"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="146"/> <source>Edit &Address</source> <translation>&Adresse editieren</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="152"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="148"/> <source>&Delete</source> <translation>&Löschen</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="251"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="247"/> <source>New Folder</source> <translation>Neuer Ordner</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="85"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="75"/> <source>Press to delete the selected entries</source> <translation>Drücken, um die ausgwählten Einträge zu löschen</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="155"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="151"/> <source>&Properties...</source> <translation>&Eigenschaften...</translation> </message> @@ -1949,7 +1943,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -2186,7 +2180,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -2488,155 +2482,155 @@ <translation>Nutzer</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="90"/> + <location filename="Cooperation/ChatWidget.ui" line="77"/> <source>Press to send the text above</source> <translation>Drücken, um den obigen Text zu senden</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="93"/> + <location filename="Cooperation/ChatWidget.ui" line="80"/> <source>Send</source> <translation>Senden</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="199"/> + <location filename="Cooperation/ChatWidget.ui" line="186"/> <source>Connection</source> <translation>Verbindung</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="207"/> + <location filename="Cooperation/ChatWidget.ui" line="194"/> <source>Host:</source> <translation>Rechner:</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="300"/> + <location filename="Cooperation/ChatWidget.ui" line="274"/> <source>Port:</source> <translation>Port:</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="282"/> + <location filename="Cooperation/ChatWidget.ui" line="256"/> <source>Shows the connection status</source> <translation>Zeigt den Verbindungsstatus</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="294"/> + <location filename="Cooperation/ChatWidget.ui" line="268"/> <source>Server</source> <translation>Server</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="342"/> + <location filename="Cooperation/ChatWidget.ui" line="316"/> <source>Shows the status of the server</source> <translation>Zeigt den Status des Servers</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="302"/> + <location filename="Cooperation/ChatWidget.py" line="298"/> <source>Start Server</source> <translation>Server starten</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="156"/> + <location filename="Cooperation/ChatWidget.py" line="152"/> <source>! Unknown command: {0} </source> <translation>! Unbekannter Befehl: {0} </translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="177"/> + <location filename="Cooperation/ChatWidget.py" line="173"/> <source>* {0} has joined. </source> <translation>* {0} ist beigetreten. </translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="210"/> + <location filename="Cooperation/ChatWidget.py" line="206"/> <source>* {0} has left. </source> <translation>* {0} hat die Sitzung verlassen. </translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="310"/> + <location filename="Cooperation/ChatWidget.py" line="306"/> <source>Stop Server</source> <translation>Server anhalten</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="315"/> + <location filename="Cooperation/ChatWidget.py" line="311"/> <source>! Server Error: {0} </source> <translation>! Serverfehler: {0} </translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="327"/> + <location filename="Cooperation/ChatWidget.py" line="323"/> <source>Disconnect</source> <translation>Unterbrechen</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="331"/> + <location filename="Cooperation/ChatWidget.py" line="327"/> <source>Connect</source> <translation>Verbinden</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="106"/> + <location filename="Cooperation/ChatWidget.ui" line="93"/> <source>Share Editor</source> <translation>Verteilter Editor</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="128"/> + <location filename="Cooperation/ChatWidget.ui" line="115"/> <source>Press to toggle the shared status of the current editor</source> <translation>Drücken, um den Freigabestatus des aktuellen Editors umzuschalten</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="242"/> + <location filename="Cooperation/ChatWidget.ui" line="163"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="144"/> + <location filename="Cooperation/ChatWidget.ui" line="131"/> <source>Press to start a shared edit</source> <translation>Drücken, um eine verteilte Änderungssitzung zu starten</translation> </message> <message> + <location filename="Cooperation/ChatWidget.ui" line="147"/> + <source>Press to end the edit and send the changes</source> + <translation>Drücken, um eine verteilte Änderungssitzung zu beenden und die Änderungen zu senden</translation> + </message> + <message> <location filename="Cooperation/ChatWidget.ui" line="160"/> - <source>Press to end the edit and send the changes</source> - <translation>Drücken, um eine verteilte Änderungssitzung zu beenden und die Änderungen zu senden</translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="173"/> <source>Press to cancel the shared edit</source> <translation>Drücken, um eine verteilte Änderungssitzung abzubrechen</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="503"/> + <location filename="Cooperation/ChatWidget.py" line="499"/> <source>Clear</source> <translation>Löschen</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="508"/> + <location filename="Cooperation/ChatWidget.py" line="504"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="561"/> + <location filename="Cooperation/ChatWidget.py" line="557"/> <source>Save Chat</source> <translation>Chat speichern</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="547"/> + <location filename="Cooperation/ChatWidget.py" line="543"/> <source>Text Files (*.txt);;All Files (*)</source> <translation>Text Dateien (*.txt);;Alle Dateien (*)</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="575"/> + <location filename="Cooperation/ChatWidget.py" line="571"/> <source>Error saving Chat</source> <translation>Fehlr beim Speichern</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="575"/> + <location filename="Cooperation/ChatWidget.py" line="571"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation><p>Der Inhalt des Chats konnte nicht nach <b>{0}</b> geschrieben werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="489"/> + <location filename="Cooperation/ChatWidget.py" line="485"/> <source>Copy</source> <translation>Kopieren</translation> </message> @@ -2646,105 +2640,95 @@ <translation>Gib den zu sendenden Text ein</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="307"/> + <location filename="Cooperation/ChatWidget.ui" line="281"/> <source>Enter the server port</source> <translation>Gib den Serverport ein</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="80"/> - <source>Press to clear the message text</source> - <translation>Drücken, um den Nachrichtentext zu löschen</translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="220"/> + <location filename="Cooperation/ChatWidget.ui" line="207"/> <source>Enter the host and port to connect to in the form "host:port"</source> <translation>Gib den Host und den Port in der Form "Host:Port" für die Verbindung ein</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="239"/> - <source>Press to clear the host</source> - <translation>Drücken, um den Hosteintrag zu löschen</translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="253"/> + <location filename="Cooperation/ChatWidget.ui" line="227"/> <source>Press to clear the hosts list</source> <translation>Drücken, um die Hostsliste zu löschen</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="485"/> + <location filename="Cooperation/ChatWidget.py" line="481"/> <source>Cut</source> <translation>Ausschneiden</translation> </message> <message> + <location filename="Cooperation/ChatWidget.py" line="490"/> + <source>Cut all</source> + <translation>Alles ausschneiden</translation> + </message> + <message> <location filename="Cooperation/ChatWidget.py" line="494"/> - <source>Cut all</source> - <translation>Alles ausschneiden</translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="498"/> <source>Copy all</source> <translation>Alles kopieren</translation> </message> <message> + <location filename="Cooperation/ChatWidget.py" line="614"/> + <source>Kick User</source> + <translation>Nutzer ausschließen</translation> + </message> + <message> <location filename="Cooperation/ChatWidget.py" line="618"/> - <source>Kick User</source> - <translation>Nutzer ausschließen</translation> + <source>Ban User</source> + <translation>Nutzer bannen</translation> </message> <message> <location filename="Cooperation/ChatWidget.py" line="622"/> - <source>Ban User</source> - <translation>Nutzer bannen</translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="626"/> <source>Ban and Kick User</source> <translation>Nutzer bannen und ausschließen</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="654"/> + <location filename="Cooperation/ChatWidget.py" line="650"/> <source>* {0} has been kicked. </source> <translation>* {0} wurde ausgeschlossen.</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="669"/> + <location filename="Cooperation/ChatWidget.py" line="665"/> <source>* {0} has been banned. </source> <translation>* {0} wurde gebannt.</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="684"/> + <location filename="Cooperation/ChatWidget.py" line="680"/> <source>* {0} has been banned and kicked. </source> <translation>* {0} wurde gebannt und ausgeschlossen.</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="561"/> + <location filename="Cooperation/ChatWidget.py" line="557"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="189"/> + <location filename="Cooperation/ChatWidget.py" line="185"/> <source>New User</source> <translation>Neuer Nutzer</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="189"/> + <location filename="Cooperation/ChatWidget.py" line="185"/> <source>{0} has joined.</source> <translation>{0} ist beigetreten.</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="217"/> + <location filename="Cooperation/ChatWidget.py" line="213"/> <source>User Left</source> <translation>Nutzer abgemeldet</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="217"/> + <location filename="Cooperation/ChatWidget.py" line="213"/> <source>{0} has left.</source> <translation>{0} hat die Sitzung verlassen.</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="238"/> + <location filename="Cooperation/ChatWidget.py" line="234"/> <source>Message from <{0}></source> <translation>Nachricht von <{0}></translation> </message> @@ -2860,47 +2844,42 @@ <context> <name>ClickToFlashWhitelistDialog</name> <message> - <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="53"/> + <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="52"/> <source>ClickToFlash Whitelist</source> <translation>ClickToFlash Whitelist</translation> </message> <message> - <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="86"/> - <source>Press to clear the search edit</source> - <translation>Drücken, um den Suchtext zu löschen</translation> - </message> - <message> - <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="113"/> + <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="103"/> <source>Press to add site to the whitelist</source> <translation>Drücken, um einen Rechner zur Whitelist hinzuzufügen</translation> </message> <message> - <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="116"/> + <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="106"/> <source>&Add...</source> <translation>&Hinzufügen...</translation> </message> <message> - <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="133"/> + <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="123"/> <source>Press to remove the selected entries</source> <translation>Drücken, um die ausgwählten Einträge zu löschen</translation> </message> <message> + <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="126"/> + <source>&Remove</source> + <translation>&Entfernen</translation> + </message> + <message> <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="136"/> - <source>&Remove</source> - <translation>&Entfernen</translation> - </message> - <message> - <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="146"/> <source>Press to remove all entries</source> <translation>Drücken, um alle Einträge zu löschen</translation> </message> <message> - <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="149"/> + <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="139"/> <source>R&emove All</source> <translation>&Alle entfernen</translation> </message> <message> - <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="53"/> + <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="52"/> <source>Enter host name to add to whitelist:</source> <translation>Gib den hinzuzufügenden Hostnamen ein:</translation> </message> @@ -2913,37 +2892,37 @@ <context> <name>CodeMetricsDialog</name> <message> - <location filename="DataViews/CodeMetricsDialog.py" line="194"/> + <location filename="DataViews/CodeMetricsDialog.py" line="191"/> <source>non-commentary lines</source> <translation>Quelltextzeilen</translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.py" line="192"/> - <source>empty lines</source> - <translation>Leerzeilen</translation> - </message> - <message> - <location filename="DataViews/CodeMetricsDialog.py" line="191"/> - <source>comments</source> - <translation>Kommentarzeilen</translation> - </message> - <message> - <location filename="DataViews/CodeMetricsDialog.py" line="190"/> - <source>bytes</source> - <translation>Bytes</translation> - </message> - <message> <location filename="DataViews/CodeMetricsDialog.py" line="189"/> - <source>lines</source> - <translation>Zeilen</translation> + <source>empty lines</source> + <translation>Leerzeilen</translation> </message> <message> <location filename="DataViews/CodeMetricsDialog.py" line="188"/> + <source>comments</source> + <translation>Kommentarzeilen</translation> + </message> + <message> + <location filename="DataViews/CodeMetricsDialog.py" line="187"/> + <source>bytes</source> + <translation>Bytes</translation> + </message> + <message> + <location filename="DataViews/CodeMetricsDialog.py" line="186"/> + <source>lines</source> + <translation>Zeilen</translation> + </message> + <message> + <location filename="DataViews/CodeMetricsDialog.py" line="185"/> <source>files</source> <translation>Dateien</translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.py" line="196"/> + <location filename="DataViews/CodeMetricsDialog.py" line="193"/> <source>documentation lines</source> <translation>Dokumentationszeilen</translation> </message> @@ -2960,76 +2939,76 @@ <p>Dieses Fenster zeigt einigen Quelltext Metriken an.</p></translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="86"/> + <location filename="DataViews/CodeMetricsDialog.ui" line="76"/> <source><b>Code metrics</b> <p>This list shows some code metrics.</p></source> <translation><b>Quelltext Metriken</b> <p>Diese Liste zeigt einigen Quelltext Metriken an.</p></translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="94"/> + <location filename="DataViews/CodeMetricsDialog.ui" line="84"/> <source>Name</source> <translation>Name</translation> </message> <message> + <location filename="DataViews/CodeMetricsDialog.ui" line="89"/> + <source>Start</source> + <translation>Starten</translation> + </message> + <message> + <location filename="DataViews/CodeMetricsDialog.ui" line="94"/> + <source>End</source> + <translation>Ende</translation> + </message> + <message> <location filename="DataViews/CodeMetricsDialog.ui" line="99"/> - <source>Start</source> - <translation>Starten</translation> + <source>Lines</source> + <translation>Zeilen</translation> </message> <message> <location filename="DataViews/CodeMetricsDialog.ui" line="104"/> - <source>End</source> - <translation>Ende</translation> + <source>Lines of code</source> + <translation>Quelltextzeilen</translation> </message> <message> <location filename="DataViews/CodeMetricsDialog.ui" line="109"/> - <source>Lines</source> - <translation>Zeilen</translation> + <source>Comments</source> + <translation>Kommentare</translation> </message> <message> <location filename="DataViews/CodeMetricsDialog.ui" line="114"/> - <source>Lines of code</source> - <translation>Quelltextzeilen</translation> - </message> - <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="119"/> - <source>Comments</source> - <translation>Kommentare</translation> - </message> - <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="124"/> <source>Empty</source> <translation>Leer</translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="138"/> + <location filename="DataViews/CodeMetricsDialog.ui" line="128"/> <source><b>Summary</b> <p>This shows some overall code metrics.</p></source> <translation><b>Zusammenfassung</b> <p>Dies zeigt einige zusammenfassende Quelltext Metriken an.</p></translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="146"/> + <location filename="DataViews/CodeMetricsDialog.ui" line="136"/> <source>Summary</source> <translation>Zusammenfassung</translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="151"/> + <location filename="DataViews/CodeMetricsDialog.ui" line="141"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="159"/> + <location filename="DataViews/CodeMetricsDialog.ui" line="149"/> <source>Shows the progress of the code metrics action</source> <translation>Zeigt den Fortschritt der Quelltext Metriken Ermittlung an</translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.py" line="50"/> + <location filename="DataViews/CodeMetricsDialog.py" line="48"/> <source>Collapse all</source> <translation>Alle einklappen</translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.py" line="51"/> + <location filename="DataViews/CodeMetricsDialog.py" line="49"/> <source>Expand all</source> <translation>Alle aufklappen</translation> </message> @@ -3044,12 +3023,7 @@ <translation>Gib Dateimuster getrennt durch Komma von Dateien ein, die ignoriert werden sollen</translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="53"/> - <source>Press to clear the filter edit</source> - <translation>Drücken, um den Filtertext zu löschen</translation> - </message> - <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="73"/> + <location filename="DataViews/CodeMetricsDialog.ui" line="63"/> <source>Press to start the code metrics run</source> <translation>Drücken, um den Quelltext Metriken Lauf zu starten</translation> </message> @@ -3424,289 +3398,289 @@ <context> <name>ConfigurationWidget</name> <message> - <location filename="Preferences/ConfigurationDialog.py" line="121"/> + <location filename="Preferences/ConfigurationDialog.py" line="120"/> <source>Application</source> <translation>Applikation</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="127"/> + <location filename="Preferences/ConfigurationDialog.py" line="126"/> <source>CORBA</source> <translation>CORBA</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="130"/> + <location filename="Preferences/ConfigurationDialog.py" line="129"/> <source>Email</source> <translation>Email</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="133"/> + <location filename="Preferences/ConfigurationDialog.py" line="132"/> <source>Graphics</source> <translation>Grafiken</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="136"/> + <location filename="Preferences/ConfigurationDialog.py" line="135"/> <source>Icons</source> <translation>Symbole</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="145"/> + <location filename="Preferences/ConfigurationDialog.py" line="144"/> <source>Plugin Manager</source> <translation>Plugin Manager</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="320"/> + <location filename="Preferences/ConfigurationDialog.py" line="319"/> <source>Printer</source> <translation>Drucker</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="188"/> + <location filename="Preferences/ConfigurationDialog.py" line="187"/> <source>Python</source> <translation>Python</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="157"/> + <location filename="Preferences/ConfigurationDialog.py" line="156"/> <source>Qt</source> <translation>Qt</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="163"/> + <location filename="Preferences/ConfigurationDialog.py" line="162"/> <source>Shell</source> <translation>Shell</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="166"/> + <location filename="Preferences/ConfigurationDialog.py" line="165"/> <source>Tasks</source> <translation>Aufgaben</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="169"/> + <location filename="Preferences/ConfigurationDialog.py" line="168"/> <source>Templates</source> <translation>Vorlagen</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="178"/> + <location filename="Preferences/ConfigurationDialog.py" line="177"/> <source>Version Control Systems</source> <translation>Versionskontrollsysteme</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="182"/> + <location filename="Preferences/ConfigurationDialog.py" line="181"/> <source>Debugger</source> <translation>Debugger</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="194"/> + <location filename="Preferences/ConfigurationDialog.py" line="193"/> <source>Ruby</source> <translation>Ruby</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="198"/> + <location filename="Preferences/ConfigurationDialog.py" line="197"/> <source>Editor</source> <translation>Editor</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="201"/> + <location filename="Preferences/ConfigurationDialog.py" line="200"/> <source>APIs</source> <translation>APIs</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="204"/> + <location filename="Preferences/ConfigurationDialog.py" line="203"/> <source>Autocompletion</source> <translation>Autom. Vervollständigung</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="211"/> + <location filename="Preferences/ConfigurationDialog.py" line="210"/> <source>Calltips</source> <translation>Calltips</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="217"/> + <location filename="Preferences/ConfigurationDialog.py" line="216"/> <source>General</source> <translation>Allgemein</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="235"/> + <location filename="Preferences/ConfigurationDialog.py" line="234"/> <source>Typing</source> <translation>Eingabe</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="238"/> + <location filename="Preferences/ConfigurationDialog.py" line="237"/> <source>Exporters</source> <translation>Exporter</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="242"/> + <location filename="Preferences/ConfigurationDialog.py" line="241"/> <source>Highlighters</source> <translation>Syntax-Hervorhebung</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="245"/> + <location filename="Preferences/ConfigurationDialog.py" line="244"/> <source>Filetype Associations</source> <translation>Dateitypzuordnungen</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="249"/> + <location filename="Preferences/ConfigurationDialog.py" line="248"/> <source>Styles</source> <translation>Stile</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="327"/> + <location filename="Preferences/ConfigurationDialog.py" line="326"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="333"/> + <location filename="Preferences/ConfigurationDialog.py" line="332"/> <source>Help Documentation</source> <translation>Hilfe Dokumentation</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="270"/> + <location filename="Preferences/ConfigurationDialog.py" line="269"/> <source>Help Viewers</source> <translation>Hilfeanzeiger</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="286"/> + <location filename="Preferences/ConfigurationDialog.py" line="285"/> <source>Project</source> <translation>Projekt</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="283"/> + <location filename="Preferences/ConfigurationDialog.py" line="282"/> <source>Project Viewer</source> <translation>Projektanzeige</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="289"/> + <location filename="Preferences/ConfigurationDialog.py" line="288"/> <source>Multiproject</source> <translation>Mehrfachprojekt</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="314"/> + <location filename="Preferences/ConfigurationDialog.py" line="313"/> <source>Interface</source> <translation>Oberfläche</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="299"/> + <location filename="Preferences/ConfigurationDialog.py" line="298"/> <source>Viewmanager</source> <translation>Ansichtenmanager</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="548"/> + <location filename="Preferences/ConfigurationDialog.py" line="540"/> <source>Configuration Page Error</source> <translation>Konfigurationsseitenfehler</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="548"/> + <location filename="Preferences/ConfigurationDialog.py" line="540"/> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>Die Konfigurationsseite <b>{0}</b> konnte nicht geladen werden.</p></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="220"/> + <location filename="Preferences/ConfigurationDialog.py" line="219"/> <source>Filehandling</source> <translation>Dateibehandlung</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="223"/> + <location filename="Preferences/ConfigurationDialog.py" line="222"/> <source>Searching</source> <translation>Suchen</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="330"/> + <location filename="Preferences/ConfigurationDialog.py" line="329"/> <source>Appearance</source> <translation>Erscheinung</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="214"/> + <location filename="Preferences/ConfigurationDialog.py" line="213"/> <source>QScintilla</source> <translation>QScintilla</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="229"/> + <location filename="Preferences/ConfigurationDialog.py" line="228"/> <source>Style</source> <translation>Stil</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="256"/> + <location filename="Preferences/ConfigurationDialog.py" line="255"/> <source>Properties</source> <translation>Einstellungen</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="474"/> + <location filename="Preferences/ConfigurationDialog.py" line="468"/> <source>Preferences</source> <translation>Einstellungen</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="479"/> + <location filename="Preferences/ConfigurationDialog.py" line="473"/> <source>Please select an entry of the list to display the configuration page.</source> <translation>Wähle einen Listeneintrag aus, um die Konfigurationsseite anzuzeigen.</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="172"/> + <location filename="Preferences/ConfigurationDialog.py" line="171"/> <source>Terminal</source> <translation>Terminal</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="317"/> + <location filename="Preferences/ConfigurationDialog.py" line="316"/> <source>Network</source> <translation>Netzwerk</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="226"/> + <location filename="Preferences/ConfigurationDialog.py" line="225"/> <source>Spell checking</source> <translation>Rechtschreibprüfung</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="191"/> + <location filename="Preferences/ConfigurationDialog.py" line="190"/> <source>Python3</source> <translation>Python3</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="253"/> + <location filename="Preferences/ConfigurationDialog.py" line="252"/> <source>Keywords</source> <translation>Schlüsselwörter</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="124"/> + <location filename="Preferences/ConfigurationDialog.py" line="123"/> <source>Cooperation</source> <translation>Zusammenarbeit</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="352"/> + <location filename="Preferences/ConfigurationDialog.py" line="351"/> <source>Tray Starter</source> <translation>Systemstarter</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="151"/> + <location filename="Preferences/ConfigurationDialog.py" line="150"/> <source>PyFlakes</source> <translation>PyFlakes</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="337"/> + <location filename="Preferences/ConfigurationDialog.py" line="336"/> <source>VirusTotal Interface</source> <translation>VirusTotal Schnittstelle</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="323"/> + <location filename="Preferences/ConfigurationDialog.py" line="322"/> <source>Security</source> <translation>Sicherheit</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="340"/> + <location filename="Preferences/ConfigurationDialog.py" line="339"/> <source>eric5 Web Browser</source> <translation>eric5 Web-Browser</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="232"/> + <location filename="Preferences/ConfigurationDialog.py" line="231"/> <source>Syntax Checker</source> <translation>Syntaxprüfer</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="410"/> + <location filename="Preferences/ConfigurationDialog.py" line="409"/> <source>Enter filter text...</source> <translation>Filtertext...</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="142"/> + <location filename="Preferences/ConfigurationDialog.py" line="141"/> <source>Notifications</source> <translation>Benachrichtigungen</translation> </message> @@ -3944,42 +3918,37 @@ <translation>Cookies</translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="50"/> - <source>Press to clear the search edit</source> - <translation>Drücken, um den Suchtext zu löschen</translation> - </message> - <message> - <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="83"/> + <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="79"/> <source>Press to remove the selected entries</source> <translation>Drücken, um die ausgwählten Einträge zu löschen</translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="86"/> + <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="82"/> <source>&Remove</source> <translation>&Entfernen</translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="96"/> + <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="92"/> <source>Press to remove all entries</source> <translation>Drücken, um alle Einträge zu löschen</translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="99"/> + <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="95"/> <source>Remove &All</source> <translation>&Alle entfernen</translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="43"/> + <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="49"/> <source>Enter search term for cookies</source> <translation>Gib den Suchbegriff für Cookies ein</translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="109"/> + <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="105"/> <source>Press to open the cookies exceptions dialog to add a new rule</source> <translation>Drücken, um den Dialog für Cookie Ausnahmen zur Definition einer neuen Regel zu öffnen</translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="112"/> + <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="108"/> <source>Add R&ule...</source> <translation>&Regel hinzufügen...</translation> </message> @@ -4042,37 +4011,32 @@ <translation>Ausnahmen</translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="144"/> + <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="150"/> <source>Enter search term for exceptions</source> <translation>Gib den Suchbegriff für Ausnahmen ein</translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="151"/> - <source>Press to clear the search edit</source> - <translation>Drücken, um den Suchtext zu löschen</translation> - </message> - <message> - <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="187"/> + <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="183"/> <source>Press to remove the selected entries</source> <translation>Drücken, um die ausgwählten Einträge zu löschen</translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="190"/> + <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="186"/> <source>&Remove</source> <translation>&Entfernen</translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="200"/> + <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="196"/> <source>Press to remove all entries</source> <translation>Drücken, um alle Einträge zu löschen</translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="203"/> + <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="199"/> <source>Remove &All</source> <translation>&Alle entfernen</translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.py" line="64"/> + <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.py" line="60"/> <source>Allow For Session</source> <translation>Für diese Sitzung erlauben</translation> </message> @@ -4241,82 +4205,82 @@ <translation>Formularcode Generator</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.ui" line="25"/> + <location filename="Project/CreateDialogCodeDialog.ui" line="58"/> <source>&Filename:</source> <translation>&Dateiname:</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.ui" line="35"/> + <location filename="Project/CreateDialogCodeDialog.ui" line="48"/> <source>Press to generate a new forms class</source> <translation>Drücken, um eine neue Formularklasse zu erzeugen</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.ui" line="38"/> + <location filename="Project/CreateDialogCodeDialog.ui" line="51"/> <source>&New...</source> <translation>&Neu...</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.ui" line="45"/> + <location filename="Project/CreateDialogCodeDialog.ui" line="25"/> <source>&Classname:</source> <translation>&Klassenname:</translation> </message> <message> + <location filename="Project/CreateDialogCodeDialog.ui" line="41"/> + <source>Select the class that should get the forms code</source> + <translation>Wähle die Klasse, die den Formularcode erhalten soll</translation> + </message> + <message> <location filename="Project/CreateDialogCodeDialog.ui" line="68"/> - <source>Select the class that should get the forms code</source> - <translation>Wähle die Klasse, die den Formularcode erhalten soll</translation> - </message> - <message> - <location filename="Project/CreateDialogCodeDialog.ui" line="75"/> <source>Displays the name of the file containing the code</source> <translation>Zeigt den Namen der Datei, die den Code enthält</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.ui" line="85"/> + <location filename="Project/CreateDialogCodeDialog.ui" line="88"/> <source>Enter a regular expression to filter the list below</source> <translation>Gib einen regulären Ausdruck ein, um die Liste zu filtern</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.ui" line="92"/> + <location filename="Project/CreateDialogCodeDialog.ui" line="78"/> <source>Filter &with:</source> <translation>&Filtere mit:</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="471"/> + <location filename="Project/CreateDialogCodeDialog.py" line="467"/> <source>Code Generation</source> <translation>Code Erzeugung</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="365"/> + <location filename="Project/CreateDialogCodeDialog.py" line="361"/> <source><p>Could not open the code template file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Die Codevorlagedatei "{0}" konnte nicht geöffnet werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="398"/> + <location filename="Project/CreateDialogCodeDialog.py" line="394"/> <source><p>Could not open the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Die Quelltextdatei "{0}" konnte nicht geöffnet werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="471"/> + <location filename="Project/CreateDialogCodeDialog.py" line="467"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Die Quelltextdatei "{0}" konnte nicht geschrieben werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="310"/> + <location filename="Project/CreateDialogCodeDialog.py" line="306"/> <source>uic error</source> <translation>uic Fehler</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="310"/> + <location filename="Project/CreateDialogCodeDialog.py" line="306"/> <source><p>There was an error loading the form <b>{0}</b>.</p><p>{1}</p></source> <translation><p>Es gab einen Fehler beim Laden des Formulars <b>{0}</b>.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="114"/> + <location filename="Project/CreateDialogCodeDialog.py" line="110"/> <source>Create Dialog Code</source> <translation>Formularcode Generator</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="114"/> + <location filename="Project/CreateDialogCodeDialog.py" line="110"/> <source>The file <b>{0}</b> exists but does not contain any classes.</source> <translation>Die datei <b>{0}</b> existiert, enthält jedoch keine Klassen.</translation> </message> @@ -7017,52 +6981,47 @@ <translation>Netzwerkrequests</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.ui" line="50"/> + <location filename="E5Network/E5NetworkMonitor.ui" line="56"/> <source>Enter search term for requests</source> <translation>Gib den Suchbegriff für Requests ein</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.ui" line="57"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.ui" line="86"/> + <location filename="E5Network/E5NetworkMonitor.ui" line="85"/> <source>Press to remove the selected requests</source> <translation>Drücken, um die ausgewählten Requests zu entfernen</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.ui" line="89"/> + <location filename="E5Network/E5NetworkMonitor.ui" line="88"/> <source>&Remove</source> <translation>&Entfernen</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.ui" line="99"/> + <location filename="E5Network/E5NetworkMonitor.ui" line="98"/> <source>Press to remove all requests</source> <translation>Drücken, um alle Anfragen zu entfernen</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.ui" line="102"/> + <location filename="E5Network/E5NetworkMonitor.ui" line="101"/> <source>Remove &All</source> <translation>&Alle entfernen</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.ui" line="134"/> + <location filename="E5Network/E5NetworkMonitor.ui" line="133"/> <source>Request Headers</source> <translation>Request Headers</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.ui" line="158"/> + <location filename="E5Network/E5NetworkMonitor.ui" line="157"/> <source>Response Headers</source> <translation>Response Headers</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="89"/> + <location filename="E5Network/E5NetworkMonitor.py" line="85"/> <source>Name</source> <translation>Name</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="89"/> + <location filename="E5Network/E5NetworkMonitor.py" line="85"/> <source>Value</source> <translation>Wert</translation> </message> @@ -7088,42 +7047,42 @@ <context> <name>E5RequestModel</name> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="217"/> + <location filename="E5Network/E5NetworkMonitor.py" line="213"/> <source>Method</source> <translation>Methode</translation> </message> <message> + <location filename="E5Network/E5NetworkMonitor.py" line="214"/> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> + <location filename="E5Network/E5NetworkMonitor.py" line="215"/> + <source>Response</source> + <translation>Antwort</translation> + </message> + <message> + <location filename="E5Network/E5NetworkMonitor.py" line="216"/> + <source>Length</source> + <translation>Länge</translation> + </message> + <message> + <location filename="E5Network/E5NetworkMonitor.py" line="217"/> + <source>Content Type</source> + <translation>Inhaltstyp</translation> + </message> + <message> <location filename="E5Network/E5NetworkMonitor.py" line="218"/> - <source>Address</source> - <translation>Adresse</translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.py" line="219"/> - <source>Response</source> - <translation>Antwort</translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.py" line="220"/> - <source>Length</source> - <translation>Länge</translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.py" line="221"/> - <source>Content Type</source> - <translation>Inhaltstyp</translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.py" line="222"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="291"/> + <location filename="E5Network/E5NetworkMonitor.py" line="287"/> <source>Redirect: {0}</source> <translation>Redirect: {0}</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="324"/> + <location filename="E5Network/E5NetworkMonitor.py" line="320"/> <source>Unknown</source> <translation>Unbekannt</translation> </message> @@ -14227,7 +14186,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="982"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -18982,7 +18941,7 @@ <translation>Wähle die als Filter zu verwendende Kategorie</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="309"/> <source>Revision</source> <translation>Revision</translation> </message> @@ -18997,77 +18956,77 @@ <translation>Gib den regulären Ausdruck zum Filtern ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="113"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="106"/> <source>Press to verify the signatures of the selected revision</source> <translation>Drücken, um die Signaturen der ausgewählten Revision zu verifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="109"/> <source>&Verify...</source> <translation>&Verifizieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="144"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="137"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="143"/> <source><b>Mercurial errors</b><p>This shows possible error messages.</p></source> <translation><b>Mercurial Fehler</b><p>Dies zeigt mögliche Fehlermeldungen.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="166"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="159"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="181"/> <source>Press to send the input to the hg process</source> <translation>Drücken um die Eingabe an den hg Prozess zu senden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="184"/> <source>&Send</source> <translation>Sen&den</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="187"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="194"/> - <source>Alt+S</source> - <translation>Alt+D</translation> + <source>Enter data to be sent to the hg process</source> + <translation>Gib die Daten ein, die an den hg Prozess geschickt werden sollen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="201"/> - <source>Enter data to be sent to the hg process</source> - <translation>Gib die Daten ein, die an den hg Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="208"/> <source>Select to switch the input field to password mode</source> <translation>Anwählen, um den Kennwort Modus für das Eingabefeld auszuwählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="204"/> <source>&Password Mode</source> <translation>&Kennwort Modus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="214"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="207"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <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/GpgExtension/HgGpgSignaturesDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="147"/> <source>no signatures found</source> <translation>keine Signaturen gefunden</translation> </message> @@ -19271,7 +19230,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="58"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> @@ -19301,17 +19260,17 @@ <translation>Wähle das als Filter zu verwendende Feld</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1177"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1174"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1174"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1171"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Message</source> <translation>Nachricht</translation> </message> @@ -19321,182 +19280,182 @@ <translation>Gib den regulären Ausdruck zum Filtern ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="167"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="160"/> <source>Branch</source> <translation>Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="180"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="197"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="190"/> <source>Tags</source> <translation>Marken</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="240"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="233"/> <source>Action</source> <translation>Aktion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="238"/> <source>Path</source> <translation>Pfad</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="243"/> <source>Copy from</source> <translation>Kopiert von</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="260"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="253"/> <source>Press to get the next bunch of log entries</source> <translation>Drücken, um die nächsten Log-Einträge zu erhalten</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="256"/> + <source>&Next</source> + <translation>&Nächste</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="263"/> - <source>&Next</source> - <translation>&Nächste</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="270"/> <source>Enter the limit of entries to fetch</source> <translation>Gib die Anzahl an zu holenden Einträgen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="289"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="282"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Auswählen, um die Anzeige von Log Meldungen bei einer Kopier- oder Verschiebeaktion zu stoppen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="285"/> <source>Stop on Copy/Move</source> <translation>Bei Kopieren/Umbenennen anhalten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="390"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="396"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Mercurial Log Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des hg log Befehls.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="427"/> <source>Press to send the input to the hg process</source> <translation>Drücken um die Eingabe an den hg Prozess zu senden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> <source>&Send</source> <translation>Sen&den</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> - <source>Alt+S</source> - <translation>Alt+D</translation> + <source>Enter data to be sent to the hg process</source> + <translation>Gib die Daten ein, die an den hg Prozess geschickt werden sollen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> - <source>Enter data to be sent to the hg process</source> - <translation>Gib die Daten ein, die an den hg Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="454"/> <source>Select to switch the input field to password mode</source> <translation>Anwählen, um den Kennwort Modus für das Eingabefeld auszuwählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> <source>&Password Mode</source> <translation>&Kennwort Modus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> <source>Added</source> <translation>Hinzugefügt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Deleted</source> <translation>Gelöscht</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="693"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="693"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <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/HgLogBrowserDialog.py" line="493"/> + <source>The hg process did not finish within 30s.</source> + <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> - <source>The hg process did not finish within 30s.</source> - <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> + <source>Could not start the hg executable.</source> + <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> - <source>Could not start the hg executable.</source> - <translation>Das hg Programm konnte nicht gestartet werden.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="502"/> <source>Mercurial Error</source> <translation>Mercurial Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="155"/> <source>Graph</source> <translation>Grafik</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="305"/> <source>Press to generate a diff to the first parent revision</source> <translation>Drücken, um ein Diff zum ersten Vorgänger zu erzeugen</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="308"/> + <source>Diff to Parent &1</source> + <translation>Diff zu Vorgänger &1</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="315"/> - <source>Diff to Parent &1</source> - <translation>Diff zu Vorgänger &1</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="322"/> <source>Press to generate a diff to the second parent revision</source> <translation>Drücken, um ein Diff zum zweiten Vorgänger zu erzeugen</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="318"/> + <source>Diff to Parent &2</source> + <translation>Diff zu Vorgänger &2</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="325"/> - <source>Diff to Parent &2</source> - <translation>Diff zu Vorgänger &2</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="332"/> <source>Press to compare two revisions</source> <translation>Drücken, um zwei Revisionen zu vergleichen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="328"/> <source>&Compare Revisions</source> <translation>&Vergleiche Revisionen</translation> </message> @@ -19511,53 +19470,53 @@ <translation>Wähle den als Filter zu verwendenden Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="89"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> <source>All</source> <translation>Alle</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> + <source>Mercurial Log (Incoming)</source> + <translation>Mercurial Log (Eingang)</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/> - <source>Mercurial Log (Incoming)</source> - <translation>Mercurial Log (Eingang)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="64"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial Log (Ausgang)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> <source>Press to refresh the list of changesets</source> <translation>Drücken, um die Liste der Änderungssätze zu erneuern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> <source>&Refresh</source> <translation>&Erneuern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="177"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="170"/> <source>Phase</source> <translation>Phase</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <source>Change the phase of the selected revisions</source> + <translation>Ändert die Phase der ausgewählten Revisionen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="351"/> + <source><b>Change Phase</b> +<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> + <translation><b>Phase ändern</b><p>Dies ändert die Phase der ausgewählten Revisionen. Die ausgewählten Revisionen müssen sich in der gleichen Phase befinden.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> - <source>Change the phase of the selected revisions</source> - <translation>Ändert die Phase der ausgewählten Revisionen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> - <source><b>Change Phase</b> -<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> - <translation><b>Phase ändern</b><p>Dies ändert die Phase der ausgewählten Revisionen. Die ausgewählten Revisionen müssen sich in der gleichen Phase befinden.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> @@ -22897,42 +22856,37 @@ <translation>Gib den Suchbegriff für Chronikeinträge ein</translation> </message> <message> - <location filename="Helpviewer/History/HistoryDialog.ui" line="50"/> - <source>Press to clear the search edit</source> - <translation>Drücken, um den Suchtext zu löschen</translation> - </message> - <message> - <location filename="Helpviewer/History/HistoryDialog.ui" line="82"/> + <location filename="Helpviewer/History/HistoryDialog.ui" line="72"/> <source>Press to remove the selected entries</source> <translation>Drücken, um die ausgwählten Einträge zu löschen</translation> </message> <message> - <location filename="Helpviewer/History/HistoryDialog.py" line="92"/> - <source>&Remove</source> - <translation>&Entfernen</translation> - </message> - <message> - <location filename="Helpviewer/History/HistoryDialog.ui" line="95"/> - <source>Press to remove all entries</source> - <translation>Drücken, um alle Einträge zu löschen</translation> - </message> - <message> - <location filename="Helpviewer/History/HistoryDialog.ui" line="98"/> - <source>Remove &All</source> - <translation>&Alle entfernen</translation> - </message> - <message> <location filename="Helpviewer/History/HistoryDialog.py" line="88"/> + <source>&Remove</source> + <translation>&Entfernen</translation> + </message> + <message> + <location filename="Helpviewer/History/HistoryDialog.ui" line="85"/> + <source>Press to remove all entries</source> + <translation>Drücken, um alle Einträge zu löschen</translation> + </message> + <message> + <location filename="Helpviewer/History/HistoryDialog.ui" line="88"/> + <source>Remove &All</source> + <translation>&Alle entfernen</translation> + </message> + <message> + <location filename="Helpviewer/History/HistoryDialog.py" line="84"/> <source>&Open</source> <translation>Ö&ffnen</translation> </message> <message> - <location filename="Helpviewer/History/HistoryDialog.py" line="89"/> + <location filename="Helpviewer/History/HistoryDialog.py" line="85"/> <source>Open in New &Tab</source> <translation>In neuem &Register öffnen</translation> </message> <message> - <location filename="Helpviewer/History/HistoryDialog.py" line="91"/> + <location filename="Helpviewer/History/HistoryDialog.py" line="87"/> <source>&Copy</source> <translation>&Kopieren</translation> </message> @@ -28453,57 +28407,52 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.py" line="88"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.py" line="84"/> <source>Saved Passwords</source> <translation>Gespeicherte Passwörter</translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="43"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="55"/> <source>Enter search term</source> <translation>Gib den Suchtext ein</translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="50"/> - <source>Press to clear the search edit</source> - <translation>Drücken, um den Suchtext zu löschen</translation> - </message> - <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="85"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="87"/> <source>Press to remove the selected entries</source> <translation>Drücken, um die ausgwählten Einträge zu löschen</translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="88"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="90"/> <source>&Remove</source> <translation>&Entfernen</translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="98"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="100"/> <source>Press to remove all entries</source> <translation>Drücken, um alle Einträge zu löschen</translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="101"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="103"/> <source>Remove &All</source> <translation>&Alle entfernen</translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="124"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="126"/> <source>Press to toggle the display of passwords</source> <translation>Drücken, um die Anzeige von Passwörtern umzuschalten</translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.py" line="39"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.py" line="35"/> <source>Show Passwords</source> <translation>Passwörter anzeigen</translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.py" line="40"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.py" line="36"/> <source>Hide Passwords</source> <translation>Passwörter ausblenden</translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.py" line="88"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.py" line="84"/> <source>Do you really want to show passwords?</source> <translation>Sollen die Passwörter wirklich angezeigt werden?</translation> </message> @@ -28577,62 +28526,47 @@ Zeile und Position.</p></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="34"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="166"/> <source>Exclude Files:</source> <translation>Ignoriere Dateien:</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="41"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="173"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation>Gib Dateimuster getrennt durch Komma von Dateien ein, die ignoriert werden sollen</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="48"/> - <source>Press to clear the filter edit</source> - <translation>Drücken, um den Filtertext zu löschen</translation> - </message> - <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="70"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="107"/> <source>Press to start the PEP 8 check run</source> <translation>Drücken, um die PEP 8 Prüfung zu starten</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="73"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="110"/> <source>Start</source> <translation>Starten</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="115"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="84"/> <source>Exclude Messages:</source> <translation>Ignorierte Nachrichten:</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="129"/> - <source>Press to clear the exclude messages edit</source> - <translation>Drücken, um die Liste ignorierter Nachrichten zu löschen</translation> - </message> - <message> <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="210"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="163"/> - <source>Press to clear the include messages edit</source> - <translation>Drücken, um die Liste ausgewählter Nachrichten zu löschen</translation> - </message> - <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="219"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="46"/> <source>Select to repeat each message type</source> <translation>Auswählen, um Wiederholungen eines Nachrichtentyps zuzulassen</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="222"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="49"/> <source>Repeat messages</source> <translation>Nachrichten wiederholen</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="260"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="220"/> <source><b>Result List</b> <p>This list shows the results of the PEP 8 check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -28643,22 +28577,22 @@ Zeile und Position.</p></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="276"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="236"/> <source>File/Line</source> <translation>Datei/Zeile</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="281"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="241"/> <source>Code</source> <translation>Schlüssel</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="286"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="246"/> <source>Message</source> <translation>Nachricht</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="294"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="254"/> <source>Shows the progress of the PEP 8 check action</source> <translation>Zeigt den Fortschritt der PEP 8 Prüfung an</translation> </message> @@ -28673,47 +28607,47 @@ <translation>Drücken, um alle Dateien mit Problemen anzuzeigen</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="293"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="285"/> <source>Error: {0}</source> <translation>Fehler: {0}</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="367"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="359"/> <source>No issues found.</source> <translation>Keine Probleme gefunden.</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="122"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="159"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation>Gib die Nachrichtenschlüssel oder -kategorien für auszuschließende Nachrichten durch Komma getrennt ein</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="156"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="152"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation>Gib die Nachrichtenschlüssel oder -kategorien für ausgewählte Nachrichten durch Komma getrennt ein</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="93"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="130"/> <source>Press to load the default values</source> <translation>Drücken, um Standarwerte zu laden</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="96"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="133"/> <source>Load Defaults</source> <translation>Standards laden</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="103"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="140"/> <source>Press to store the current values as defaults</source> <translation>Drücken, um die aktuellen Werte als Standard zu speichern</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="106"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="143"/> <source>Store Defaults</source> <translation>Standards speichern</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="149"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="200"/> <source>Included Messages:</source> <translation>Ausgewählte Nachrichten:</translation> </message> @@ -28733,32 +28667,27 @@ <translation>Drücken, um die Nachrichtenschlüssel aus einer Liste zu wählen</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="183"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="91"/> <source>Fix Issues:</source> <translation>Zu behebende Probleme:</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="190"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="98"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation>Geben sie die Nachrichtenschlüssel für automatisch zu behebende Probleme ein (leer lassen, um alle zu beheben)</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="197"/> - <source>Press to clear the fix issues edit</source> - <translation>Drücken, um die Liste zu behebender Probleme zu löschen</translation> - </message> - <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="232"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="59"/> <source>Select to fix some issues</source> <translation>Auswählen, um ausgewählte Probleme zu beheben</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="235"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="62"/> <source>Fix issues automatically</source> <translation>Probleme automatisch beheben</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="336"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="328"/> <source>Fix: {0}</source> <translation>Lösung: {0}</translation> </message> @@ -37016,7 +36945,7 @@ <context> <name>SendRefererWhitelistDialog</name> <message> - <location filename="Helpviewer/Network/SendRefererWhitelistDialog.py" line="52"/> + <location filename="Helpviewer/Network/SendRefererWhitelistDialog.py" line="49"/> <source>Send Referer Whitelist</source> <translation>Referer Whitelist</translation> </message> @@ -37026,42 +36955,37 @@ <translation>Gib den Suchausdruck für Hostnamen ein</translation> </message> <message> - <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="47"/> - <source>Press to clear the search edit</source> - <translation>Drücken, um den Suchtext zu löschen</translation> - </message> - <message> - <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="87"/> + <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="77"/> <source>Press to add site to the whitelist</source> <translation>Drücken, um einen Rechner zur Whitelist hinzuzufügen</translation> </message> <message> - <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="90"/> + <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="80"/> <source>&Add...</source> <translation>&Hinzufügen...</translation> </message> <message> - <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="107"/> + <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="97"/> <source>Press to remove the selected entries</source> <translation>Drücken, um die ausgwählten Einträge zu löschen</translation> </message> <message> + <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="100"/> + <source>&Remove</source> + <translation>&Entfernen</translation> + </message> + <message> <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="110"/> - <source>&Remove</source> - <translation>&Entfernen</translation> - </message> - <message> - <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="120"/> <source>Press to remove all entries</source> <translation>Drücken, um alle Einträge zu löschen</translation> </message> <message> - <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="123"/> + <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="113"/> <source>R&emove All</source> <translation>&Alle entfernen</translation> </message> <message> - <location filename="Helpviewer/Network/SendRefererWhitelistDialog.py" line="52"/> + <location filename="Helpviewer/Network/SendRefererWhitelistDialog.py" line="49"/> <source>Enter host name to add to the whitelist:</source> <translation>Gib den hinzuzufügenden Hostnamen ein:</translation> </message> @@ -37463,77 +37387,77 @@ <context> <name>ShortcutsDialog</name> <message> - <location filename="Preferences/ShortcutsDialog.py" line="120"/> + <location filename="Preferences/ShortcutsDialog.py" line="117"/> <source>Project</source> <translation>Projekt</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="124"/> + <location filename="Preferences/ShortcutsDialog.py" line="121"/> <source>General</source> <translation>Allgemein</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="132"/> + <location filename="Preferences/ShortcutsDialog.py" line="129"/> <source>Debug</source> <translation>Debug</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="128"/> + <location filename="Preferences/ShortcutsDialog.py" line="125"/> <source>Wizards</source> <translation>Autopiloten</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="136"/> + <location filename="Preferences/ShortcutsDialog.py" line="133"/> <source>Edit</source> <translation>Bearbeiten</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="140"/> + <location filename="Preferences/ShortcutsDialog.py" line="137"/> <source>File</source> <translation>Datei</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="144"/> + <location filename="Preferences/ShortcutsDialog.py" line="141"/> <source>Search</source> <translation>Suchen</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="148"/> + <location filename="Preferences/ShortcutsDialog.py" line="145"/> <source>View</source> <translation>Ansicht</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="166"/> + <location filename="Preferences/ShortcutsDialog.py" line="163"/> <source>Window</source> <translation>Fenster</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="331"/> + <location filename="Preferences/ShortcutsDialog.py" line="328"/> <source>Edit shortcuts</source> <translation>Kurzbefehle bearbeiten</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="152"/> + <location filename="Preferences/ShortcutsDialog.py" line="149"/> <source>Macro</source> <translation>Makro</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="156"/> + <location filename="Preferences/ShortcutsDialog.py" line="153"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="297"/> + <location filename="Preferences/ShortcutsDialog.py" line="294"/> <source><p><b>{0}</b> has already been allocated to the <b>{1}</b> action. Remove this binding?</p></source> <translation><p><b>{0}</b> wurde bereits der Aktion <b>{1}</b> zugewiesen. Diese Bindung löschen?</p></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="316"/> + <location filename="Preferences/ShortcutsDialog.py" line="313"/> <source><p><b>{0}</b> hides the <b>{1}</b> action. Remove this binding?</p></source> <translation><p><b>{0}</b> verdeckt die Aktion <b>{1}</b>. Diese Bindung löschen?</p></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="331"/> + <location filename="Preferences/ShortcutsDialog.py" line="328"/> <source><p><b>{0}</b> is hidden by the <b>{1}</b> action. Remove this binding?</p></source> <translation><p><b>{0}</b> wird durch die Aktion <b>{1}</b> verdeckt. Diese Bindung löschen?</p></translation> </message> @@ -37543,38 +37467,33 @@ <translation>Tastaturkurzbefehle</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.ui" line="98"/> + <location filename="Preferences/ShortcutsDialog.ui" line="88"/> <source>This list shows all keyboard shortcuts.</source> <translation>Diese Liste zeigt alle Tastaturkurzbefehle.</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.ui" line="101"/> + <location filename="Preferences/ShortcutsDialog.ui" line="91"/> <source><b>Keyboard Shortcuts List</b> <p>This list shows all keyboard shortcuts defined in the application. Double click an entry in order to change the respective shortcut. Alternatively, the shortcut might be changed by editing the key sequence in the respective column.</p></source> <translation><b>Tastaturkurzbefehl</b> <p>Diese Liste zeigt alle in der Applikation festgelegten Tastaturkurzbefehle. Doppelklicke einen Eintrag, um ihn zu bearbeiten. Alternativ kann ein Tastaturkurzbefehl durch Eingabe der Tastenfolge in der entsprechenden Spalte geändert werden.</p></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.ui" line="109"/> + <location filename="Preferences/ShortcutsDialog.ui" line="99"/> <source>Action</source> <translation>Befehl</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.ui" line="114"/> + <location filename="Preferences/ShortcutsDialog.ui" line="104"/> <source>Shortcut</source> <translation>Kurzbefehl</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.ui" line="119"/> + <location filename="Preferences/ShortcutsDialog.ui" line="109"/> <source>Alternativ</source> <translation>Alternative</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.ui" line="39"/> - <source>Press to clear the search edit</source> - <translation>Drücken, um den Suchtext zu löschen</translation> - </message> - <message> <location filename="Preferences/ShortcutsDialog.ui" line="32"/> <source>Enter the regular expression that should be contained in the shortcut action</source> <translation>Gib den regulären Ausdruck, den die Kurzbefehlaktion enthalten muss, ein</translation> @@ -37585,37 +37504,37 @@ <translation>&Filter:</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.ui" line="53"/> + <location filename="Preferences/ShortcutsDialog.ui" line="43"/> <source>Filter on</source> <translation>Filter für</translation> </message> <message> + <location filename="Preferences/ShortcutsDialog.ui" line="53"/> + <source>&Action</source> + <translation>&Befehl</translation> + </message> + <message> + <location filename="Preferences/ShortcutsDialog.ui" line="66"/> + <source>&Shortcut or Alternative</source> + <translation>&Kurzbefehl oder Alternative</translation> + </message> + <message> + <location filename="Preferences/ShortcutsDialog.ui" line="50"/> + <source>Select to filter based on the actions</source> + <translation>Auswählen, um basierend auf den Befehlen zu filtern</translation> + </message> + <message> <location filename="Preferences/ShortcutsDialog.ui" line="63"/> - <source>&Action</source> - <translation>&Befehl</translation> - </message> - <message> - <location filename="Preferences/ShortcutsDialog.ui" line="76"/> - <source>&Shortcut or Alternative</source> - <translation>&Kurzbefehl oder Alternative</translation> - </message> - <message> - <location filename="Preferences/ShortcutsDialog.ui" line="60"/> - <source>Select to filter based on the actions</source> - <translation>Auswählen, um basierend auf den Befehlen zu filtern</translation> - </message> - <message> - <location filename="Preferences/ShortcutsDialog.ui" line="73"/> <source>Select to filter based on shortcut or alternative shortcut</source> <translation>Auswählen, um basierend auf den Kurzbefehlen oder Alternativen zu filtern</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="160"/> + <location filename="Preferences/ShortcutsDialog.py" line="157"/> <source>Spelling</source> <translation>Rechtschreibung</translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="180"/> + <location filename="Preferences/ShortcutsDialog.py" line="177"/> <source>eric5 Web Browser</source> <translation>eric5 Web-Browser</translation> </message> @@ -40891,157 +40810,157 @@ <translation>Subversion Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="556"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="132"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="125"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="57"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="55"/> <source>Message</source> <translation>Nachricht</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="180"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="173"/> <source>Action</source> <translation>Aktion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="185"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="178"/> <source>Path</source> <translation>Pfad</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="190"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="183"/> <source>Copy from</source> <translation>Kopiert von</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="195"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="188"/> <source>Copy from Rev</source> <translation>Kopiert von Rev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="205"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="198"/> <source>Press to get the next bunch of log entries</source> <translation>Drücken, um die nächsten Log-Einträge zu erhalten</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="201"/> + <source>&Next</source> + <translation>&Nächste</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="208"/> - <source>&Next</source> - <translation>&Nächste</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="215"/> <source>Enter the limit of entries to fetch</source> <translation>Gib die Anzahl an zu holenden Einträgen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> <source>Press to generate a diff to the previous revision</source> <translation>Drücken, um ein Diff zur vorherigen Revision zu erzeugen</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="247"/> + <source>&Diff to Previous</source> + <translation>&Diff zu vorherigen</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> - <source>&Diff to Previous</source> - <translation>&Diff zu vorherigen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to compare two revisions</source> <translation>Drücken, um zwei Revisionen zu vergleichen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="257"/> <source>&Compare Revisions</source> <translation>&Vergleiche Revisionen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="87"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="84"/> <source>Added</source> <translation>Hinzugefügt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="88"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="85"/> <source>Deleted</source> <translation>Gelöscht</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="86"/> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="430"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="427"/> <source>Subversion Error</source> <translation>Subversion Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="285"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="291"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Subversion Log Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des svn log Befehls.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="307"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="329"/> <source>Press to send the input to the subversion process</source> <translation>Drücken um die Eingabe an den Subversion Prozess zu senden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="332"/> <source>&Send</source> <translation>Sen&den</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="335"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation>Alt+S</translation> + <source>Enter data to be sent to the subversion process</source> + <translation>Gib die Daten ein, die an den Subversion Prozess geschickt werden sollen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Gib die Daten ein, die an den Subversion Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> <source>Select to switch the input field to password mode</source> <translation>Anwählen, um den Kennwort Modus für das Eingabefeld auszuwählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="352"/> <source>&Password Mode</source> <translation>&Kennwort Modus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="355"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="247"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="244"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="247"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="244"/> <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> @@ -41076,17 +40995,17 @@ <translation>Gib den regulären Ausdruck zum Filtern ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="234"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="227"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Auswählen, um die Anzeige von Log Meldungen bei einer Kopier- oder Verschiebeaktion zu stoppen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="237"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="230"/> <source>Stop on Copy/Move</source> <translation>Bei Kopieren/Umbenennen anhalten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="87"/> <source>Replaced</source> <translation>Ersetzt</translation> </message> @@ -44729,7 +44648,7 @@ Zeile.</p></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="87"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="77"/> <source><b>Result List</b> <p>This list shows the results of the syntax check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -44740,12 +44659,12 @@ Zeile.</p></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="110"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="100"/> <source>Source</source> <translation>Quelltext</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="118"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="108"/> <source>Shows the progress of the syntax check action</source> <translation>Zeigt den Fortschritt der Syntaxprüfung an</translation> </message> @@ -44755,12 +44674,12 @@ <translation>Zeige</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="100"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="90"/> <source>File/Line</source> <translation>Datei/Zeile</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="105"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="95"/> <source>Message</source> <translation>Nachricht</translation> </message> @@ -44770,7 +44689,7 @@ <translation>Drücken, um alle Dateien mit Problemen anzuzeigen</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="276"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="275"/> <source>No issues found.</source> <translation>Keine Probleme gefunden.</translation> </message> @@ -44785,22 +44704,17 @@ <translation>Gib Dateimuster getrennt durch Komma von Dateien ein, die ignoriert werden sollen</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="54"/> - <source>Press to clear the filter edit</source> - <translation>Drücken, um den Filtertext zu löschen</translation> - </message> - <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="74"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="64"/> <source>Press to start the syntax check run</source> <translation>Drücken, um die Syntaxprüfung zu starten</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="77"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="67"/> <source>Start</source> <translation>Starten</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="195"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="194"/> <source>Error: {0}</source> <translation>Fehler: {0}</translation> </message> @@ -45169,7 +45083,7 @@ <context> <name>TabnannyDialog</name> <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py" line="190"/> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py" line="188"/> <source>No indentation errors found.</source> <translation>Keine Einrückungsfehler gefunden.</translation> </message> @@ -45189,7 +45103,7 @@ Zeile.</p></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="87"/> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="77"/> <source><b>Result List</b> <p>This list shows the results of the tabnanny command. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -45200,22 +45114,22 @@ Zeile.</p></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="106"/> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="96"/> <source>Filename</source> <translation>Dateiname</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="111"/> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="101"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="116"/> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="106"/> <source>Source</source> <translation>Quelltext</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="124"/> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="114"/> <source>Shows the progress of the tabnanny action</source> <translation>Zeigt den Fortschritt der Tabnanny Prüfung an</translation> </message> @@ -45230,27 +45144,22 @@ <translation>Gib Dateimuster getrennt durch Komma von Dateien ein, die ignoriert werden sollen</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="54"/> - <source>Press to clear the filter edit</source> - <translation>Drücken, um den Filtertext zu löschen</translation> - </message> - <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="74"/> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="64"/> <source>Press to start the tabnanny run</source> <translation>Drücken, um den Tabnanny Lauf zu starten</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="77"/> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="67"/> <source>Start</source> <translation>Starten</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py" line="261"/> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py" line="259"/> <source>Python2 interpreter not configured.</source> <translation>Kein Python2 Interpreter konfiguriert.</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py" line="286"/> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py" line="284"/> <source>Python2 interpreter did not finish within 15s.</source> <translation>Python2 Interpreter wurde nicht innerhalb von 15s beendet.</translation> </message> @@ -48341,27 +48250,22 @@ <translation>Gib den Suchtext ein</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentsDialog.ui" line="50"/> - <source>Press to clear the search edit</source> - <translation>Drücken, um den Suchtext zu löschen</translation> - </message> - <message> - <location filename="Helpviewer/UserAgent/UserAgentsDialog.ui" line="85"/> + <location filename="Helpviewer/UserAgent/UserAgentsDialog.ui" line="75"/> <source>Press to remove the selected entries</source> <translation>Drücken, um die ausgwählten Einträge zu löschen</translation> </message> <message> + <location filename="Helpviewer/UserAgent/UserAgentsDialog.ui" line="78"/> + <source>&Remove</source> + <translation>&Entfernen</translation> + </message> + <message> <location filename="Helpviewer/UserAgent/UserAgentsDialog.ui" line="88"/> - <source>&Remove</source> - <translation>&Entfernen</translation> - </message> - <message> - <location filename="Helpviewer/UserAgent/UserAgentsDialog.ui" line="98"/> <source>Press to remove all entries</source> <translation>Drücken, um alle Einträge zu löschen</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentsDialog.ui" line="101"/> + <location filename="Helpviewer/UserAgent/UserAgentsDialog.ui" line="91"/> <source>Remove &All</source> <translation>&Alle entfernen</translation> </message> @@ -54522,32 +54426,27 @@ <translation>Web SQL Datenbanken</translation> </message> <message> - <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="50"/> - <source>Press to clear the search edit</source> - <translation>Drücken, um den Suchtext zu löschen</translation> - </message> - <message> - <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="74"/> + <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="70"/> <source>Press to remove the selected entries</source> <translation>Drücken, um die ausgwählten Einträge zu löschen</translation> </message> <message> - <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="77"/> + <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="73"/> <source>&Remove</source> <translation>&Entfernen</translation> </message> <message> - <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="87"/> + <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="83"/> <source>Press to remove all entries</source> <translation>Drücken, um alle Einträge zu löschen</translation> </message> <message> - <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="90"/> + <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="86"/> <source>Remove &All</source> <translation>&Alle entfernen</translation> </message> <message> - <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="43"/> + <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="49"/> <source>Enter search term for databases</source> <translation>Gib den Suchbegriff für Datenbanken ein</translation> </message>
--- a/i18n/eric5_en.ts Mon Nov 12 17:46:11 2012 +0100 +++ b/i18n/eric5_en.ts Mon Nov 12 19:04:11 2012 +0100 @@ -112,22 +112,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="146"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="140"/> <source>Learn more about writing rules...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="141"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="135"/> <source>Update Subscription</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="130"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="124"/> <source>Browse Subscriptions...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="217"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="211"/> <source>Remove Subscription</source> <translation type="unfinished"></translation> </message> @@ -137,42 +137,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="42"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="40"/> <source>Search...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="125"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="119"/> <source>Add Rule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="127"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="121"/> <source>Remove Rule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="136"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="130"/> <source>Disable Subscription</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="138"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="132"/> <source>Enable Subscription</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="143"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="137"/> <source>Update All Subscriptions</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="203"/> + <source><p>Do you really want to remove subscription <b>{0}</b> and all subscriptions requiring it?</p><ul><li>{1}</li></ul></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="209"/> - <source><p>Do you really want to remove subscription <b>{0}</b> and all subscriptions requiring it?</p><ul><li>{1}</li></ul></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="215"/> <source><p>Do you really want to remove subscription <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -215,7 +215,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockExceptionsDialog.py" line="38"/> + <location filename="Helpviewer/AdBlock/AdBlockExceptionsDialog.py" line="35"/> <source>Enter host to be added...</source> <translation type="unfinished"></translation> </message> @@ -1682,57 +1682,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="50"/> - <source>Press to clear the search edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="85"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="75"/> <source>Press to delete the selected entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="152"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="148"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="98"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="88"/> <source>Press to add a new bookmarks folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="101"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="91"/> <source>Add &Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="144"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="140"/> <source>&Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="145"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="141"/> <source>Open in New &Tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="147"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="143"/> <source>Edit &Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="150"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="146"/> <source>Edit &Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="251"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="247"/> <source>New Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="155"/> + <location filename="Helpviewer/Bookmarks/BookmarksDialog.py" line="151"/> <source>&Properties...</source> <translation type="unfinished"></translation> </message> @@ -2465,254 +2460,244 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="Cooperation/ChatWidget.ui" line="163"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="77"/> + <source>Press to send the text above</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Cooperation/ChatWidget.ui" line="80"/> - <source>Press to clear the message text</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="242"/> - <source>...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="90"/> - <source>Press to send the text above</source> + <source>Send</source> <translation type="unfinished"></translation> </message> <message> <location filename="Cooperation/ChatWidget.ui" line="93"/> - <source>Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="106"/> <source>Share Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="128"/> + <location filename="Cooperation/ChatWidget.ui" line="115"/> <source>Press to toggle the shared status of the current editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="144"/> + <location filename="Cooperation/ChatWidget.ui" line="131"/> <source>Press to start a shared edit</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Cooperation/ChatWidget.ui" line="147"/> + <source>Press to end the edit and send the changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Cooperation/ChatWidget.ui" line="160"/> - <source>Press to end the edit and send the changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="173"/> <source>Press to cancel the shared edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="199"/> + <location filename="Cooperation/ChatWidget.ui" line="186"/> <source>Connection</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Cooperation/ChatWidget.ui" line="194"/> + <source>Host:</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Cooperation/ChatWidget.ui" line="207"/> - <source>Host:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="220"/> <source>Enter the host and port to connect to in the form "host:port"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="239"/> - <source>Press to clear the host</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="253"/> + <location filename="Cooperation/ChatWidget.ui" line="227"/> <source>Press to clear the hosts list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="503"/> + <location filename="Cooperation/ChatWidget.py" line="499"/> <source>Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="282"/> + <location filename="Cooperation/ChatWidget.ui" line="256"/> <source>Shows the connection status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="294"/> + <location filename="Cooperation/ChatWidget.ui" line="268"/> <source>Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="300"/> + <location filename="Cooperation/ChatWidget.ui" line="274"/> <source>Port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="307"/> + <location filename="Cooperation/ChatWidget.ui" line="281"/> <source>Enter the server port</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="342"/> + <location filename="Cooperation/ChatWidget.ui" line="316"/> <source>Shows the status of the server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="302"/> + <location filename="Cooperation/ChatWidget.py" line="298"/> <source>Start Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="156"/> + <location filename="Cooperation/ChatWidget.py" line="152"/> <source>! Unknown command: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="177"/> + <location filename="Cooperation/ChatWidget.py" line="173"/> <source>* {0} has joined. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="210"/> + <location filename="Cooperation/ChatWidget.py" line="206"/> <source>* {0} has left. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="310"/> + <location filename="Cooperation/ChatWidget.py" line="306"/> <source>Stop Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="315"/> + <location filename="Cooperation/ChatWidget.py" line="311"/> <source>! Server Error: {0} </source> <translation type="unfinished"></translation> </message> <message> + <location filename="Cooperation/ChatWidget.py" line="323"/> + <source>Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Cooperation/ChatWidget.py" line="327"/> - <source>Disconnect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="331"/> <source>Connect</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Cooperation/ChatWidget.py" line="481"/> + <source>Cut</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Cooperation/ChatWidget.py" line="485"/> - <source>Cut</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="489"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Cooperation/ChatWidget.py" line="490"/> + <source>Cut all</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Cooperation/ChatWidget.py" line="494"/> - <source>Cut all</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="498"/> <source>Copy all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="508"/> + <location filename="Cooperation/ChatWidget.py" line="504"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="561"/> + <location filename="Cooperation/ChatWidget.py" line="557"/> <source>Save Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="547"/> + <location filename="Cooperation/ChatWidget.py" line="543"/> <source>Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="561"/> + <location filename="Cooperation/ChatWidget.py" line="557"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="575"/> + <location filename="Cooperation/ChatWidget.py" line="571"/> <source>Error saving Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="575"/> + <location filename="Cooperation/ChatWidget.py" line="571"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Cooperation/ChatWidget.py" line="614"/> + <source>Kick User</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Cooperation/ChatWidget.py" line="618"/> - <source>Kick User</source> + <source>Ban User</source> <translation type="unfinished"></translation> </message> <message> <location filename="Cooperation/ChatWidget.py" line="622"/> - <source>Ban User</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="626"/> <source>Ban and Kick User</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="654"/> + <location filename="Cooperation/ChatWidget.py" line="650"/> <source>* {0} has been kicked. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="669"/> + <location filename="Cooperation/ChatWidget.py" line="665"/> <source>* {0} has been banned. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="684"/> + <location filename="Cooperation/ChatWidget.py" line="680"/> <source>* {0} has been banned and kicked. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="189"/> + <location filename="Cooperation/ChatWidget.py" line="185"/> <source>New User</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="189"/> + <location filename="Cooperation/ChatWidget.py" line="185"/> <source>{0} has joined.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="217"/> + <location filename="Cooperation/ChatWidget.py" line="213"/> <source>User Left</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="217"/> + <location filename="Cooperation/ChatWidget.py" line="213"/> <source>{0} has left.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="238"/> + <location filename="Cooperation/ChatWidget.py" line="234"/> <source>Message from <{0}></source> <translation type="unfinished"></translation> </message> @@ -2827,47 +2812,42 @@ <context> <name>ClickToFlashWhitelistDialog</name> <message> - <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="53"/> + <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="52"/> <source>ClickToFlash Whitelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="86"/> - <source>Press to clear the search edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="113"/> + <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="103"/> <source>Press to add site to the whitelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="116"/> + <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="106"/> <source>&Add...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="133"/> + <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="123"/> <source>Press to remove the selected entries</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="126"/> + <source>&Remove</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="136"/> - <source>&Remove</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="146"/> <source>Press to remove all entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="149"/> + <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="139"/> <source>R&emove All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="53"/> + <location filename="Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="52"/> <source>Enter host name to add to whitelist:</source> <translation type="unfinished"></translation> </message> @@ -2901,119 +2881,114 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="53"/> - <source>Press to clear the filter edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="73"/> + <location filename="DataViews/CodeMetricsDialog.ui" line="63"/> <source>Press to start the code metrics run</source> <translation type="unfinished"></translation> </message> <message> + <location filename="DataViews/CodeMetricsDialog.ui" line="89"/> + <source>Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="DataViews/CodeMetricsDialog.ui" line="76"/> + <source><b>Code metrics</b> +<p>This list shows some code metrics.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="DataViews/CodeMetricsDialog.ui" line="84"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="DataViews/CodeMetricsDialog.ui" line="94"/> + <source>End</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="DataViews/CodeMetricsDialog.ui" line="99"/> - <source>Start</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="86"/> - <source><b>Code metrics</b> -<p>This list shows some code metrics.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="94"/> - <source>Name</source> + <source>Lines</source> <translation type="unfinished"></translation> </message> <message> <location filename="DataViews/CodeMetricsDialog.ui" line="104"/> - <source>End</source> + <source>Lines of code</source> <translation type="unfinished"></translation> </message> <message> <location filename="DataViews/CodeMetricsDialog.ui" line="109"/> - <source>Lines</source> + <source>Comments</source> <translation type="unfinished"></translation> </message> <message> <location filename="DataViews/CodeMetricsDialog.ui" line="114"/> - <source>Lines of code</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="119"/> - <source>Comments</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="124"/> <source>Empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="138"/> + <location filename="DataViews/CodeMetricsDialog.ui" line="128"/> <source><b>Summary</b> <p>This shows some overall code metrics.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="146"/> + <location filename="DataViews/CodeMetricsDialog.ui" line="136"/> <source>Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="151"/> + <location filename="DataViews/CodeMetricsDialog.ui" line="141"/> <source>#</source> <translation type="unfinished"></translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.ui" line="159"/> + <location filename="DataViews/CodeMetricsDialog.ui" line="149"/> <source>Shows the progress of the code metrics action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.py" line="50"/> + <location filename="DataViews/CodeMetricsDialog.py" line="48"/> <source>Collapse all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.py" line="51"/> + <location filename="DataViews/CodeMetricsDialog.py" line="49"/> <source>Expand all</source> <translation type="unfinished"></translation> </message> <message> + <location filename="DataViews/CodeMetricsDialog.py" line="185"/> + <source>files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="DataViews/CodeMetricsDialog.py" line="186"/> + <source>lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="DataViews/CodeMetricsDialog.py" line="187"/> + <source>bytes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="DataViews/CodeMetricsDialog.py" line="188"/> - <source>files</source> + <source>comments</source> <translation type="unfinished"></translation> </message> <message> <location filename="DataViews/CodeMetricsDialog.py" line="189"/> - <source>lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="DataViews/CodeMetricsDialog.py" line="190"/> - <source>bytes</source> + <source>empty lines</source> <translation type="unfinished"></translation> </message> <message> <location filename="DataViews/CodeMetricsDialog.py" line="191"/> - <source>comments</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="DataViews/CodeMetricsDialog.py" line="192"/> - <source>empty lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="DataViews/CodeMetricsDialog.py" line="194"/> <source>non-commentary lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.py" line="196"/> + <location filename="DataViews/CodeMetricsDialog.py" line="193"/> <source>documentation lines</source> <translation type="unfinished"></translation> </message> @@ -3388,288 +3363,288 @@ <context> <name>ConfigurationWidget</name> <message> - <location filename="Preferences/ConfigurationDialog.py" line="121"/> + <location filename="Preferences/ConfigurationDialog.py" line="120"/> <source>Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="124"/> + <location filename="Preferences/ConfigurationDialog.py" line="123"/> <source>Cooperation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="127"/> + <location filename="Preferences/ConfigurationDialog.py" line="126"/> <source>CORBA</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="130"/> + <location filename="Preferences/ConfigurationDialog.py" line="129"/> <source>Email</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="133"/> + <location filename="Preferences/ConfigurationDialog.py" line="132"/> <source>Graphics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="136"/> + <location filename="Preferences/ConfigurationDialog.py" line="135"/> <source>Icons</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="317"/> + <location filename="Preferences/ConfigurationDialog.py" line="316"/> <source>Network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="145"/> + <location filename="Preferences/ConfigurationDialog.py" line="144"/> <source>Plugin Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="320"/> + <location filename="Preferences/ConfigurationDialog.py" line="319"/> <source>Printer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="188"/> + <location filename="Preferences/ConfigurationDialog.py" line="187"/> <source>Python</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="157"/> + <location filename="Preferences/ConfigurationDialog.py" line="156"/> <source>Qt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="163"/> + <location filename="Preferences/ConfigurationDialog.py" line="162"/> <source>Shell</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="166"/> + <location filename="Preferences/ConfigurationDialog.py" line="165"/> <source>Tasks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="169"/> + <location filename="Preferences/ConfigurationDialog.py" line="168"/> <source>Templates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="172"/> + <location filename="Preferences/ConfigurationDialog.py" line="171"/> <source>Terminal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="178"/> + <location filename="Preferences/ConfigurationDialog.py" line="177"/> <source>Version Control Systems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="182"/> + <location filename="Preferences/ConfigurationDialog.py" line="181"/> <source>Debugger</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="217"/> + <location filename="Preferences/ConfigurationDialog.py" line="216"/> <source>General</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="191"/> + <location filename="Preferences/ConfigurationDialog.py" line="190"/> <source>Python3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="194"/> + <location filename="Preferences/ConfigurationDialog.py" line="193"/> <source>Ruby</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="198"/> + <location filename="Preferences/ConfigurationDialog.py" line="197"/> <source>Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="201"/> + <location filename="Preferences/ConfigurationDialog.py" line="200"/> <source>APIs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="204"/> + <location filename="Preferences/ConfigurationDialog.py" line="203"/> <source>Autocompletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="214"/> + <location filename="Preferences/ConfigurationDialog.py" line="213"/> <source>QScintilla</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="211"/> + <location filename="Preferences/ConfigurationDialog.py" line="210"/> <source>Calltips</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="220"/> + <location filename="Preferences/ConfigurationDialog.py" line="219"/> <source>Filehandling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="223"/> + <location filename="Preferences/ConfigurationDialog.py" line="222"/> <source>Searching</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="226"/> + <location filename="Preferences/ConfigurationDialog.py" line="225"/> <source>Spell checking</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="229"/> + <location filename="Preferences/ConfigurationDialog.py" line="228"/> <source>Style</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="235"/> + <location filename="Preferences/ConfigurationDialog.py" line="234"/> <source>Typing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="238"/> + <location filename="Preferences/ConfigurationDialog.py" line="237"/> <source>Exporters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="242"/> + <location filename="Preferences/ConfigurationDialog.py" line="241"/> <source>Highlighters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="245"/> + <location filename="Preferences/ConfigurationDialog.py" line="244"/> <source>Filetype Associations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="249"/> + <location filename="Preferences/ConfigurationDialog.py" line="248"/> <source>Styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="253"/> + <location filename="Preferences/ConfigurationDialog.py" line="252"/> <source>Keywords</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="256"/> + <location filename="Preferences/ConfigurationDialog.py" line="255"/> <source>Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="327"/> + <location filename="Preferences/ConfigurationDialog.py" line="326"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="330"/> + <location filename="Preferences/ConfigurationDialog.py" line="329"/> <source>Appearance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="333"/> + <location filename="Preferences/ConfigurationDialog.py" line="332"/> <source>Help Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="270"/> + <location filename="Preferences/ConfigurationDialog.py" line="269"/> <source>Help Viewers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="286"/> + <location filename="Preferences/ConfigurationDialog.py" line="285"/> <source>Project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="283"/> + <location filename="Preferences/ConfigurationDialog.py" line="282"/> <source>Project Viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="289"/> + <location filename="Preferences/ConfigurationDialog.py" line="288"/> <source>Multiproject</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="314"/> + <location filename="Preferences/ConfigurationDialog.py" line="313"/> <source>Interface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="299"/> + <location filename="Preferences/ConfigurationDialog.py" line="298"/> <source>Viewmanager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="474"/> + <location filename="Preferences/ConfigurationDialog.py" line="468"/> <source>Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="479"/> + <location filename="Preferences/ConfigurationDialog.py" line="473"/> <source>Please select an entry of the list to display the configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="548"/> + <location filename="Preferences/ConfigurationDialog.py" line="540"/> <source>Configuration Page Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="548"/> + <location filename="Preferences/ConfigurationDialog.py" line="540"/> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="352"/> + <location filename="Preferences/ConfigurationDialog.py" line="351"/> <source>Tray Starter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="151"/> + <location filename="Preferences/ConfigurationDialog.py" line="150"/> <source>PyFlakes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="337"/> + <location filename="Preferences/ConfigurationDialog.py" line="336"/> <source>VirusTotal Interface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="323"/> + <location filename="Preferences/ConfigurationDialog.py" line="322"/> <source>Security</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="340"/> + <location filename="Preferences/ConfigurationDialog.py" line="339"/> <source>eric5 Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="232"/> + <location filename="Preferences/ConfigurationDialog.py" line="231"/> <source>Syntax Checker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="410"/> + <location filename="Preferences/ConfigurationDialog.py" line="409"/> <source>Enter filter text...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="142"/> + <location filename="Preferences/ConfigurationDialog.py" line="141"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> @@ -3907,42 +3882,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="43"/> + <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="49"/> <source>Enter search term for cookies</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="50"/> - <source>Press to clear the search edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="83"/> + <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="79"/> <source>Press to remove the selected entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="86"/> + <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="82"/> <source>&Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="96"/> + <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="92"/> <source>Press to remove all entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="99"/> + <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="95"/> <source>Remove &All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="109"/> + <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="105"/> <source>Press to open the cookies exceptions dialog to add a new rule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="112"/> + <location filename="Helpviewer/CookieJar/CookiesDialog.ui" line="108"/> <source>Add R&ule...</source> <translation type="unfinished"></translation> </message> @@ -4005,37 +3975,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="144"/> + <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="150"/> <source>Enter search term for exceptions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="151"/> - <source>Press to clear the search edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="187"/> + <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="183"/> <source>Press to remove the selected entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="190"/> + <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="186"/> <source>&Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="200"/> + <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="196"/> <source>Press to remove all entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="203"/> + <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.ui" line="199"/> <source>Remove &All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.py" line="64"/> + <location filename="Helpviewer/CookieJar/CookiesExceptionsDialog.py" line="60"/> <source>Allow For Session</source> <translation type="unfinished"></translation> </message> @@ -4203,82 +4168,82 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.ui" line="25"/> + <location filename="Project/CreateDialogCodeDialog.ui" line="58"/> <source>&Filename:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.ui" line="35"/> + <location filename="Project/CreateDialogCodeDialog.ui" line="48"/> <source>Press to generate a new forms class</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.ui" line="38"/> + <location filename="Project/CreateDialogCodeDialog.ui" line="51"/> <source>&New...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.ui" line="45"/> + <location filename="Project/CreateDialogCodeDialog.ui" line="25"/> <source>&Classname:</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Project/CreateDialogCodeDialog.ui" line="41"/> + <source>Select the class that should get the forms code</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Project/CreateDialogCodeDialog.ui" line="68"/> - <source>Select the class that should get the forms code</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/CreateDialogCodeDialog.ui" line="75"/> <source>Displays the name of the file containing the code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.ui" line="85"/> + <location filename="Project/CreateDialogCodeDialog.ui" line="88"/> <source>Enter a regular expression to filter the list below</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.ui" line="92"/> + <location filename="Project/CreateDialogCodeDialog.ui" line="78"/> <source>Filter &with:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="114"/> + <location filename="Project/CreateDialogCodeDialog.py" line="110"/> <source>Create Dialog Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="114"/> + <location filename="Project/CreateDialogCodeDialog.py" line="110"/> <source>The file <b>{0}</b> exists but does not contain any classes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="310"/> + <location filename="Project/CreateDialogCodeDialog.py" line="306"/> <source>uic error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="310"/> + <location filename="Project/CreateDialogCodeDialog.py" line="306"/> <source><p>There was an error loading the form <b>{0}</b>.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="471"/> + <location filename="Project/CreateDialogCodeDialog.py" line="467"/> <source>Code Generation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="365"/> + <location filename="Project/CreateDialogCodeDialog.py" line="361"/> <source><p>Could not open the code template file "{0}".</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="398"/> + <location filename="Project/CreateDialogCodeDialog.py" line="394"/> <source><p>Could not open the source file "{0}".</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="471"/> + <location filename="Project/CreateDialogCodeDialog.py" line="467"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -6943,52 +6908,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.ui" line="50"/> + <location filename="E5Network/E5NetworkMonitor.ui" line="56"/> <source>Enter search term for requests</source> <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.ui" line="57"/> - <source>...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.ui" line="86"/> + <location filename="E5Network/E5NetworkMonitor.ui" line="85"/> <source>Press to remove the selected requests</source> <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.ui" line="89"/> + <location filename="E5Network/E5NetworkMonitor.ui" line="88"/> <source>&Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.ui" line="99"/> + <location filename="E5Network/E5NetworkMonitor.ui" line="98"/> <source>Press to remove all requests</source> <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.ui" line="102"/> + <location filename="E5Network/E5NetworkMonitor.ui" line="101"/> <source>Remove &All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.ui" line="134"/> + <location filename="E5Network/E5NetworkMonitor.ui" line="133"/> <source>Request Headers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.ui" line="158"/> + <location filename="E5Network/E5NetworkMonitor.ui" line="157"/> <source>Response Headers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="89"/> + <location filename="E5Network/E5NetworkMonitor.py" line="85"/> <source>Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="89"/> + <location filename="E5Network/E5NetworkMonitor.py" line="85"/> <source>Value</source> <translation type="unfinished"></translation> </message> @@ -7014,42 +6974,42 @@ <context> <name>E5RequestModel</name> <message> + <location filename="E5Network/E5NetworkMonitor.py" line="213"/> + <source>Method</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="E5Network/E5NetworkMonitor.py" line="214"/> + <source>Address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="E5Network/E5NetworkMonitor.py" line="215"/> + <source>Response</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="E5Network/E5NetworkMonitor.py" line="216"/> + <source>Length</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="E5Network/E5NetworkMonitor.py" line="217"/> - <source>Method</source> + <source>Content Type</source> <translation type="unfinished"></translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="218"/> - <source>Address</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.py" line="219"/> - <source>Response</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.py" line="220"/> - <source>Length</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.py" line="221"/> - <source>Content Type</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.py" line="222"/> <source>Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="291"/> + <location filename="E5Network/E5NetworkMonitor.py" line="287"/> <source>Redirect: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="324"/> + <location filename="E5Network/E5NetworkMonitor.py" line="320"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> @@ -18864,7 +18824,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="309"/> <source>Revision</source> <translation type="unfinished"></translation> </message> @@ -18879,77 +18839,77 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="113"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="106"/> <source>Press to verify the signatures of the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="109"/> <source>&Verify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="144"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="137"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="143"/> <source><b>Mercurial errors</b><p>This shows possible error messages.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="166"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="159"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="181"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="184"/> <source>&Send</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="187"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="194"/> - <source>Alt+S</source> + <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="201"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="208"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="204"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="214"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="207"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <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/GpgExtension/HgGpgSignaturesDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="147"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -19153,7 +19113,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="58"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -19193,17 +19153,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1177"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1174"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1174"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1171"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -19213,233 +19173,233 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="155"/> <source>Graph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="167"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="160"/> <source>Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="180"/> <source>Date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="197"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="190"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="240"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="233"/> <source>Action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="238"/> <source>Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="243"/> <source>Copy from</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="260"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="253"/> <source>Press to get the next bunch of log entries</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="256"/> + <source>&Next</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="263"/> - <source>&Next</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="270"/> <source>Enter the limit of entries to fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="289"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="282"/> <source>Select to stop listing log messages at a copy or move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="285"/> <source>Stop on Copy/Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="305"/> <source>Press to generate a diff to the first parent revision</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="308"/> + <source>Diff to Parent &1</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="315"/> - <source>Diff to Parent &1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="322"/> <source>Press to generate a diff to the second parent revision</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="318"/> + <source>Diff to Parent &2</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="325"/> - <source>Diff to Parent &2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="332"/> <source>Press to compare two revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="328"/> <source>&Compare Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="390"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="396"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="427"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> <source>&Send</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> - <source>Alt+S</source> + <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="454"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="89"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> - <source>The hg process did not finish within 30s.</source> + <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="502"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="693"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="693"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <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/HgLogBrowserDialog.py" line="60"/> + <source>Mercurial Log (Incoming)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/> - <source>Mercurial Log (Incoming)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="64"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="177"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="170"/> <source>Phase</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="351"/> + <source><b>Change Phase</b> +<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> - <source>Change the phase of the selected revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> - <source><b>Change Phase</b> -<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> @@ -22753,42 +22713,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryDialog.ui" line="50"/> - <source>Press to clear the search edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/History/HistoryDialog.ui" line="82"/> + <location filename="Helpviewer/History/HistoryDialog.ui" line="72"/> <source>Press to remove the selected entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryDialog.py" line="92"/> - <source>&Remove</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/History/HistoryDialog.ui" line="95"/> - <source>Press to remove all entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/History/HistoryDialog.ui" line="98"/> - <source>Remove &All</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/History/HistoryDialog.py" line="88"/> + <source>&Remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/History/HistoryDialog.ui" line="85"/> + <source>Press to remove all entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/History/HistoryDialog.ui" line="88"/> + <source>Remove &All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/History/HistoryDialog.py" line="84"/> <source>&Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryDialog.py" line="89"/> + <location filename="Helpviewer/History/HistoryDialog.py" line="85"/> <source>Open in New &Tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryDialog.py" line="91"/> + <location filename="Helpviewer/History/HistoryDialog.py" line="87"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> @@ -28299,57 +28254,52 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.py" line="88"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.py" line="84"/> <source>Saved Passwords</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="43"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="55"/> <source>Enter search term</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="50"/> - <source>Press to clear the search edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="85"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="87"/> <source>Press to remove the selected entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="88"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="90"/> <source>&Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="98"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="100"/> <source>Press to remove all entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="101"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="103"/> <source>Remove &All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="124"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.ui" line="126"/> <source>Press to toggle the display of passwords</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.py" line="39"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.py" line="35"/> <source>Show Passwords</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.py" line="40"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.py" line="36"/> <source>Hide Passwords</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordsDialog.py" line="88"/> + <location filename="Helpviewer/Passwords/PasswordsDialog.py" line="84"/> <source>Do you really want to show passwords?</source> <translation type="unfinished"></translation> </message> @@ -28420,62 +28370,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="34"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="166"/> <source>Exclude Files:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="41"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="173"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="48"/> - <source>Press to clear the filter edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="70"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="107"/> <source>Press to start the PEP 8 check run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="73"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="110"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="115"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="84"/> <source>Exclude Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="129"/> - <source>Press to clear the exclude messages edit</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="210"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="163"/> - <source>Press to clear the include messages edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="219"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="46"/> <source>Select to repeat each message type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="222"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="49"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="260"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="220"/> <source><b>Result List</b> <p>This list shows the results of the PEP 8 check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -28483,22 +28418,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="276"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="236"/> <source>File/Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="281"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="241"/> <source>Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="286"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="246"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="294"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="254"/> <source>Shows the progress of the PEP 8 check action</source> <translation type="unfinished"></translation> </message> @@ -28513,47 +28448,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="293"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="285"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="367"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="359"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="122"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="159"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="156"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="152"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="93"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="130"/> <source>Press to load the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="96"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="133"/> <source>Load Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="103"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="140"/> <source>Press to store the current values as defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="106"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="143"/> <source>Store Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="149"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="200"/> <source>Included Messages:</source> <translation type="unfinished"></translation> </message> @@ -28573,32 +28508,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="183"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="91"/> <source>Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="190"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="98"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="197"/> - <source>Press to clear the fix issues edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="232"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="59"/> <source>Select to fix some issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="235"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="62"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="336"/> + <location filename="Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="328"/> <source>Fix: {0}</source> <translation type="unfinished"></translation> </message> @@ -36684,7 +36614,7 @@ <context> <name>SendRefererWhitelistDialog</name> <message> - <location filename="Helpviewer/Network/SendRefererWhitelistDialog.py" line="52"/> + <location filename="Helpviewer/Network/SendRefererWhitelistDialog.py" line="49"/> <source>Send Referer Whitelist</source> <translation type="unfinished"></translation> </message> @@ -36694,42 +36624,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="47"/> - <source>Press to clear the search edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="87"/> + <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="77"/> <source>Press to add site to the whitelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="90"/> + <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="80"/> <source>&Add...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="107"/> + <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="97"/> <source>Press to remove the selected entries</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="100"/> + <source>&Remove</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="110"/> - <source>&Remove</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="120"/> <source>Press to remove all entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="123"/> + <location filename="Helpviewer/Network/SendRefererWhitelistDialog.ui" line="113"/> <source>R&emove All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/SendRefererWhitelistDialog.py" line="52"/> + <location filename="Helpviewer/Network/SendRefererWhitelistDialog.py" line="49"/> <source>Enter host name to add to the whitelist:</source> <translation type="unfinished"></translation> </message> @@ -37144,143 +37069,138 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.ui" line="39"/> - <source>Press to clear the search edit</source> + <location filename="Preferences/ShortcutsDialog.ui" line="43"/> + <source>Filter on</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ShortcutsDialog.ui" line="50"/> + <source>Select to filter based on the actions</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ShortcutsDialog.ui" line="53"/> - <source>Filter on</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ShortcutsDialog.ui" line="60"/> - <source>Select to filter based on the actions</source> + <source>&Action</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ShortcutsDialog.ui" line="63"/> - <source>&Action</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ShortcutsDialog.ui" line="73"/> <source>Select to filter based on shortcut or alternative shortcut</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.ui" line="76"/> + <location filename="Preferences/ShortcutsDialog.ui" line="66"/> <source>&Shortcut or Alternative</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.ui" line="98"/> + <location filename="Preferences/ShortcutsDialog.ui" line="88"/> <source>This list shows all keyboard shortcuts.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.ui" line="101"/> + <location filename="Preferences/ShortcutsDialog.ui" line="91"/> <source><b>Keyboard Shortcuts List</b> <p>This list shows all keyboard shortcuts defined in the application. Double click an entry in order to change the respective shortcut. Alternatively, the shortcut might be changed by editing the key sequence in the respective column.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Preferences/ShortcutsDialog.ui" line="99"/> + <source>Action</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ShortcutsDialog.ui" line="104"/> + <source>Shortcut</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Preferences/ShortcutsDialog.ui" line="109"/> - <source>Action</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ShortcutsDialog.ui" line="114"/> - <source>Shortcut</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ShortcutsDialog.ui" line="119"/> <source>Alternativ</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="120"/> + <location filename="Preferences/ShortcutsDialog.py" line="117"/> <source>Project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="124"/> + <location filename="Preferences/ShortcutsDialog.py" line="121"/> <source>General</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="128"/> + <location filename="Preferences/ShortcutsDialog.py" line="125"/> <source>Wizards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="132"/> + <location filename="Preferences/ShortcutsDialog.py" line="129"/> <source>Debug</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="136"/> + <location filename="Preferences/ShortcutsDialog.py" line="133"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="140"/> + <location filename="Preferences/ShortcutsDialog.py" line="137"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="144"/> + <location filename="Preferences/ShortcutsDialog.py" line="141"/> <source>Search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="148"/> + <location filename="Preferences/ShortcutsDialog.py" line="145"/> <source>View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="152"/> + <location filename="Preferences/ShortcutsDialog.py" line="149"/> <source>Macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="156"/> + <location filename="Preferences/ShortcutsDialog.py" line="153"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="160"/> + <location filename="Preferences/ShortcutsDialog.py" line="157"/> <source>Spelling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="166"/> + <location filename="Preferences/ShortcutsDialog.py" line="163"/> <source>Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="331"/> + <location filename="Preferences/ShortcutsDialog.py" line="328"/> <source>Edit shortcuts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="297"/> + <location filename="Preferences/ShortcutsDialog.py" line="294"/> <source><p><b>{0}</b> has already been allocated to the <b>{1}</b> action. Remove this binding?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="316"/> + <location filename="Preferences/ShortcutsDialog.py" line="313"/> <source><p><b>{0}</b> hides the <b>{1}</b> action. Remove this binding?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="331"/> + <location filename="Preferences/ShortcutsDialog.py" line="328"/> <source><p><b>{0}</b> is hidden by the <b>{1}</b> action. Remove this binding?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ShortcutsDialog.py" line="180"/> + <location filename="Preferences/ShortcutsDialog.py" line="177"/> <source>eric5 Web Browser</source> <translation type="unfinished"></translation> </message> @@ -40527,17 +40447,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="556"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="57"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="55"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -40547,157 +40467,157 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="132"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="125"/> <source>Date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="180"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="173"/> <source>Action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="185"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="178"/> <source>Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="190"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="183"/> <source>Copy from</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="195"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="188"/> <source>Copy from Rev</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="205"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="198"/> <source>Press to get the next bunch of log entries</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="201"/> + <source>&Next</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="208"/> - <source>&Next</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="215"/> <source>Enter the limit of entries to fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="234"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="227"/> <source>Select to stop listing log messages at a copy or move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="237"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="230"/> <source>Stop on Copy/Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> <source>Press to generate a diff to the previous revision</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="247"/> + <source>&Diff to Previous</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> - <source>&Diff to Previous</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to compare two revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="257"/> <source>&Compare Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="285"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="291"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="307"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="329"/> <source>Press to send the input to the subversion process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="332"/> <source>&Send</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="335"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> + <source>Enter data to be sent to the subversion process</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="352"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="355"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="84"/> + <source>Added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="85"/> + <source>Deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="86"/> + <source>Modified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="427"/> + <source>Subversion Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="244"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="244"/> + <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/vcsSubversion/SvnLogBrowserDialog.py" line="87"/> - <source>Added</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="88"/> - <source>Deleted</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> - <source>Modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="430"/> - <source>Subversion Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="247"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="247"/> - <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/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> <source>Replaced</source> <translation type="unfinished"></translation> </message> @@ -44316,22 +44236,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="54"/> - <source>Press to clear the filter edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="74"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="64"/> <source>Press to start the syntax check run</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="67"/> + <source>Start</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="77"/> - <source>Start</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="87"/> <source><b>Result List</b> <p>This list shows the results of the syntax check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -44339,22 +44254,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="100"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="90"/> <source>File/Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="105"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="95"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="110"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="100"/> <source>Source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="118"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui" line="108"/> <source>Shows the progress of the syntax check action</source> <translation type="unfinished"></translation> </message> @@ -44369,12 +44284,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="276"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="275"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="195"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="194"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> @@ -44765,22 +44680,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="54"/> - <source>Press to clear the filter edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="74"/> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="64"/> <source>Press to start the tabnanny run</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="67"/> + <source>Start</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="77"/> - <source>Start</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="87"/> <source><b>Result List</b> <p>This list shows the results of the tabnanny command. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -44788,37 +44698,37 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="96"/> + <source>Filename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="101"/> + <source>#</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="106"/> - <source>Filename</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="111"/> - <source>#</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="116"/> <source>Source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="124"/> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui" line="114"/> <source>Shows the progress of the tabnanny action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py" line="190"/> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py" line="188"/> <source>No indentation errors found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py" line="261"/> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py" line="259"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py" line="286"/> + <location filename="Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py" line="284"/> <source>Python2 interpreter did not finish within 15s.</source> <translation type="unfinished"></translation> </message> @@ -47874,27 +47784,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentsDialog.ui" line="50"/> - <source>Press to clear the search edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/UserAgent/UserAgentsDialog.ui" line="85"/> + <location filename="Helpviewer/UserAgent/UserAgentsDialog.ui" line="75"/> <source>Press to remove the selected entries</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Helpviewer/UserAgent/UserAgentsDialog.ui" line="78"/> + <source>&Remove</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Helpviewer/UserAgent/UserAgentsDialog.ui" line="88"/> - <source>&Remove</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/UserAgent/UserAgentsDialog.ui" line="98"/> <source>Press to remove all entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentsDialog.ui" line="101"/> + <location filename="Helpviewer/UserAgent/UserAgentsDialog.ui" line="91"/> <source>Remove &All</source> <translation type="unfinished"></translation> </message> @@ -54048,32 +53953,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="43"/> + <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="49"/> <source>Enter search term for databases</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="50"/> - <source>Press to clear the search edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="74"/> + <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="70"/> <source>Press to remove the selected entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="77"/> + <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="73"/> <source>&Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="87"/> + <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="83"/> <source>Press to remove all entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="90"/> + <location filename="Helpviewer/OfflineStorage/WebDatabasesDialog.ui" line="86"/> <source>Remove &All</source> <translation type="unfinished"></translation> </message>