Thu, 08 Nov 2012 16:19:41 +0100
Some harminisation of nomenclature in the various Task dialogs.
--- a/APIs/Python3/eric5.api Thu Nov 08 15:28:53 2012 +0100 +++ b/APIs/Python3/eric5.api Thu Nov 08 16:19:41 2012 +0100 @@ -6977,17 +6977,17 @@ eric5.Tasks.Task.Task.isProjectTask?4() eric5.Tasks.Task.Task.setCompleted?4(completed) eric5.Tasks.Task.Task.setDescription?4(description) -eric5.Tasks.Task.Task.setLongText?4(longtext) eric5.Tasks.Task.Task.setPriority?4(priority) eric5.Tasks.Task.Task.setProjectTask?4(pt) -eric5.Tasks.Task.Task?1(description, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=TypeTodo, project=None, longtext="") +eric5.Tasks.Task.Task.setSummary?4(summary) +eric5.Tasks.Task.Task?1(summary, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=TypeTodo, project=None, description="") eric5.Tasks.TaskFilter.TaskFilter.hasActiveFilter?4() eric5.Tasks.TaskFilter.TaskFilter.setActive?4(enabled) -eric5.Tasks.TaskFilter.TaskFilter.setDescriptionFilter?4(filter) eric5.Tasks.TaskFilter.TaskFilter.setFileNameFilter?4(filter) eric5.Tasks.TaskFilter.TaskFilter.setPrioritiesFilter?4(priorities) eric5.Tasks.TaskFilter.TaskFilter.setScopeFilter?4(scope) eric5.Tasks.TaskFilter.TaskFilter.setStatusFilter?4(status) +eric5.Tasks.TaskFilter.TaskFilter.setSummaryFilter?4(filter) eric5.Tasks.TaskFilter.TaskFilter.setTypeFilter?4(taskType) eric5.Tasks.TaskFilter.TaskFilter.showTask?4(task) eric5.Tasks.TaskFilter.TaskFilter?1() @@ -6996,8 +6996,8 @@ eric5.Tasks.TaskPropertiesDialog.TaskPropertiesDialog.getData?4() eric5.Tasks.TaskPropertiesDialog.TaskPropertiesDialog.setReadOnly?4() eric5.Tasks.TaskPropertiesDialog.TaskPropertiesDialog?1(task=None, parent=None, projectOpen=False) -eric5.Tasks.TaskViewer.TaskViewer.addFileTask?4(description, filename, lineno, taskType=Task.TypeTodo, longtext="") -eric5.Tasks.TaskViewer.TaskViewer.addTask?4(description, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=Task.TypeTodo, longtext="") +eric5.Tasks.TaskViewer.TaskViewer.addFileTask?4(summary, filename, lineno, taskType=Task.TypeTodo, description="") +eric5.Tasks.TaskViewer.TaskViewer.addTask?4(summary, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=Task.TypeTodo, description="") eric5.Tasks.TaskViewer.TaskViewer.clearFileTasks?4(filename, conditionally=False) eric5.Tasks.TaskViewer.TaskViewer.clearProjectTasks?4(fileOnly=False) eric5.Tasks.TaskViewer.TaskViewer.clearTasks?4()
--- a/Documentation/Help/source.qhp Thu Nov 08 15:28:53 2012 +0100 +++ b/Documentation/Help/source.qhp Thu Nov 08 16:19:41 2012 +0100 @@ -10379,19 +10379,19 @@ <keyword name="Task.isProjectTask" id="Task.isProjectTask" ref="eric5.Tasks.Task.html#Task.isProjectTask" /> <keyword name="Task.setCompleted" id="Task.setCompleted" ref="eric5.Tasks.Task.html#Task.setCompleted" /> <keyword name="Task.setDescription" id="Task.setDescription" ref="eric5.Tasks.Task.html#Task.setDescription" /> - <keyword name="Task.setLongText" id="Task.setLongText" ref="eric5.Tasks.Task.html#Task.setLongText" /> <keyword name="Task.setPriority" id="Task.setPriority" ref="eric5.Tasks.Task.html#Task.setPriority" /> <keyword name="Task.setProjectTask" id="Task.setProjectTask" ref="eric5.Tasks.Task.html#Task.setProjectTask" /> + <keyword name="Task.setSummary" id="Task.setSummary" ref="eric5.Tasks.Task.html#Task.setSummary" /> <keyword name="TaskFilter" id="TaskFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter" /> <keyword name="TaskFilter (Constructor)" id="TaskFilter (Constructor)" ref="eric5.Tasks.TaskFilter.html#TaskFilter.__init__" /> <keyword name="TaskFilter (Module)" id="TaskFilter (Module)" ref="eric5.Tasks.TaskFilter.html" /> <keyword name="TaskFilter.hasActiveFilter" id="TaskFilter.hasActiveFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter.hasActiveFilter" /> <keyword name="TaskFilter.setActive" id="TaskFilter.setActive" ref="eric5.Tasks.TaskFilter.html#TaskFilter.setActive" /> - <keyword name="TaskFilter.setDescriptionFilter" id="TaskFilter.setDescriptionFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter.setDescriptionFilter" /> <keyword name="TaskFilter.setFileNameFilter" id="TaskFilter.setFileNameFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter.setFileNameFilter" /> <keyword name="TaskFilter.setPrioritiesFilter" id="TaskFilter.setPrioritiesFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter.setPrioritiesFilter" /> <keyword name="TaskFilter.setScopeFilter" id="TaskFilter.setScopeFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter.setScopeFilter" /> <keyword name="TaskFilter.setStatusFilter" id="TaskFilter.setStatusFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter.setStatusFilter" /> + <keyword name="TaskFilter.setSummaryFilter" id="TaskFilter.setSummaryFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter.setSummaryFilter" /> <keyword name="TaskFilter.setTypeFilter" id="TaskFilter.setTypeFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter.setTypeFilter" /> <keyword name="TaskFilter.showTask" id="TaskFilter.showTask" ref="eric5.Tasks.TaskFilter.html#TaskFilter.showTask" /> <keyword name="TaskFilterConfigDialog" id="TaskFilterConfigDialog" ref="eric5.Tasks.TaskFilterConfigDialog.html#TaskFilterConfigDialog" />
--- a/Documentation/Source/eric5.Tasks.Task.html Thu Nov 08 15:28:53 2012 +0100 +++ b/Documentation/Source/eric5.Tasks.Task.html Thu Nov 08 16:19:41 2012 +0100 @@ -83,16 +83,16 @@ <td>Public slot to update the completed flag.</td> </tr><tr> <td><a href="#Task.setDescription">setDescription</a></td> -<td>Public slot to update the description.</td> -</tr><tr> -<td><a href="#Task.setLongText">setLongText</a></td> -<td>Public slot to update the longtext field.</td> +<td>Public slot to update the description field.</td> </tr><tr> <td><a href="#Task.setPriority">setPriority</a></td> <td>Public slot to update the priority.</td> </tr><tr> <td><a href="#Task.setProjectTask">setProjectTask</a></td> <td>Public method to set the project relation flag.</td> +</tr><tr> +<td><a href="#Task.setSummary">setSummary</a></td> +<td>Public slot to update the description.</td> </tr> </table> <h3>Static Methods</h3> @@ -101,16 +101,16 @@ </table> <a NAME="Task.__init__" ID="Task.__init__"></a> <h4>Task (Constructor)</h4> -<b>Task</b>(<i>description, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=TypeTodo, project=None, longtext=""</i>) +<b>Task</b>(<i>summary, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=TypeTodo, project=None, description=""</i>) <p> Constructor </p><dl> <dt><i>parent</i></dt> <dd> parent widget of the task (QWidget) -</dd><dt><i>description</i></dt> +</dd><dt><i>summary</i></dt> <dd> -descriptive text of the task (string) +summary text of the task (string) </dd><dt><i>priority</i></dt> <dd> priority of the task (0=high, 1=normal, 2=low) @@ -137,7 +137,7 @@ </dd><dt><i>project</i></dt> <dd> reference to the project object (Project) -</dd><dt><i>longtext</i></dt> +</dd><dt><i>description</i></dt> <dd> explanatory text of the task (string) </dd> @@ -210,19 +210,9 @@ <h4>Task.setDescription</h4> <b>setDescription</b>(<i>description</i>) <p> - Public slot to update the description. + Public slot to update the description field. </p><dl> -<dt><i>longtext</i></dt> -<dd> -explanatory text of the task (string) -</dd> -</dl><a NAME="Task.setLongText" ID="Task.setLongText"></a> -<h4>Task.setLongText</h4> -<b>setLongText</b>(<i>longtext</i>) -<p> - Public slot to update the longtext field. -</p><dl> -<dt><i>longtext</i></dt> +<dt><i>description</i></dt> <dd> descriptive text of the task (string) </dd> @@ -246,6 +236,16 @@ <dd> flag indicating a project task (boolean) </dd> +</dl><a NAME="Task.setSummary" ID="Task.setSummary"></a> +<h4>Task.setSummary</h4> +<b>setSummary</b>(<i>summary</i>) +<p> + Public slot to update the description. +</p><dl> +<dt><i>summary</i></dt> +<dd> +summary text of the task (string) +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/eric5.Tasks.TaskFilter.html Thu Nov 08 15:28:53 2012 +0100 +++ b/Documentation/Source/eric5.Tasks.TaskFilter.html Thu Nov 08 16:19:41 2012 +0100 @@ -67,9 +67,6 @@ <td><a href="#TaskFilter.setActive">setActive</a></td> <td>Public method to activate the filter.</td> </tr><tr> -<td><a href="#TaskFilter.setDescriptionFilter">setDescriptionFilter</a></td> -<td>Public method to set the description filter.</td> -</tr><tr> <td><a href="#TaskFilter.setFileNameFilter">setFileNameFilter</a></td> <td>Public method to set the filename filter.</td> </tr><tr> @@ -82,6 +79,9 @@ <td><a href="#TaskFilter.setStatusFilter">setStatusFilter</a></td> <td>Public method to set the status filter.</td> </tr><tr> +<td><a href="#TaskFilter.setSummaryFilter">setSummaryFilter</a></td> +<td>Public method to set the description filter.</td> +</tr><tr> <td><a href="#TaskFilter.setTypeFilter">setTypeFilter</a></td> <td>Public method to set the type filter.</td> </tr><tr> @@ -118,17 +118,6 @@ <dd> flag indicating the activation state (boolean) </dd> -</dl><a NAME="TaskFilter.setDescriptionFilter" ID="TaskFilter.setDescriptionFilter"></a> -<h4>TaskFilter.setDescriptionFilter</h4> -<b>setDescriptionFilter</b>(<i>filter</i>) -<p> - Public method to set the description filter. -</p><dl> -<dt><i>filter</i></dt> -<dd> -a regular expression for the description filter - to set (string) or None -</dd> </dl><a NAME="TaskFilter.setFileNameFilter" ID="TaskFilter.setFileNameFilter"></a> <h4>TaskFilter.setFileNameFilter</h4> <b>setFileNameFilter</b>(<i>filter</i>) @@ -170,6 +159,17 @@ <dd> flag indicating a completed task (boolean) or None </dd> +</dl><a NAME="TaskFilter.setSummaryFilter" ID="TaskFilter.setSummaryFilter"></a> +<h4>TaskFilter.setSummaryFilter</h4> +<b>setSummaryFilter</b>(<i>filter</i>) +<p> + Public method to set the description filter. +</p><dl> +<dt><i>filter</i></dt> +<dd> +a regular expression for the description filter + to set (string) or None +</dd> </dl><a NAME="TaskFilter.setTypeFilter" ID="TaskFilter.setTypeFilter"></a> <h4>TaskFilter.setTypeFilter</h4> <b>setTypeFilter</b>(<i>taskType</i>)
--- a/Documentation/Source/eric5.Tasks.TaskViewer.html Thu Nov 08 15:28:53 2012 +0100 +++ b/Documentation/Source/eric5.Tasks.TaskViewer.html Thu Nov 08 16:19:41 2012 +0100 @@ -283,13 +283,13 @@ </dd> </dl><a NAME="TaskViewer.addFileTask" ID="TaskViewer.addFileTask"></a> <h4>TaskViewer.addFileTask</h4> -<b>addFileTask</b>(<i>description, filename, lineno, taskType=Task.TypeTodo, longtext=""</i>) +<b>addFileTask</b>(<i>summary, filename, lineno, taskType=Task.TypeTodo, description=""</i>) <p> Public slot to add a file related task. </p><dl> -<dt><i>description</i></dt> +<dt><i>summary</i></dt> <dd> -descriptive text of the task (string) +summary text of the task (string) </dd><dt><i>filename</i></dt> <dd> filename containing the task (string) @@ -300,19 +300,19 @@ <dd> type of the task (one of Task.TypeFixme, Task.TypeTodo, Task.TypeWarning, Task.TypeNote) -</dd><dt><i>longtext</i></dt> +</dd><dt><i>description</i></dt> <dd> explanatory text of the task (string) </dd> </dl><a NAME="TaskViewer.addTask" ID="TaskViewer.addTask"></a> <h4>TaskViewer.addTask</h4> -<b>addTask</b>(<i>description, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=Task.TypeTodo, longtext=""</i>) +<b>addTask</b>(<i>summary, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=Task.TypeTodo, description=""</i>) <p> Public slot to add a task. </p><dl> -<dt><i>description</i></dt> +<dt><i>summary</i></dt> <dd> -descriptive text of the task (string) +summary text of the task (string) </dd><dt><i>priority</i></dt> <dd> priority of the task (0=high, 1=normal, 2=low) @@ -336,7 +336,7 @@ <dd> type of the task (one of Task.TypeFixme, Task.TypeTodo, Task.TypeWarning, Task.TypeNote) -</dd><dt><i>longtext</i></dt> +</dd><dt><i>description</i></dt> <dd> explanatory text of the task (string) </dd>
--- a/E5XML/TasksReader.py Thu Nov 08 15:28:53 2012 +0100 +++ b/E5XML/TasksReader.py Thu Nov 08 16:19:41 2012 +0100 @@ -96,7 +96,7 @@ filename=task["filename"], lineno=task["linenumber"], completed=task["completed"], _time=task["created"], isProjectTask=self.forProject, taskType=task["type"], - longtext=task["description"]) + description=task["description"]) break if self.isStartElement():
--- a/E5XML/TasksWriter.py Thu Nov 08 15:28:53 2012 +0100 +++ b/E5XML/TasksWriter.py Thu Nov 08 16:19:41 2012 +0100 @@ -73,8 +73,8 @@ self.writeAttribute("priority", str(task.priority)) self.writeAttribute("completed", str(task.completed)) self.writeAttribute("type", str(task.taskType)) - self.writeTextElement("Summary", task.description.strip()) - self.writeTextElement("Description", task.longtext.strip()) + self.writeTextElement("Summary", task.summary.strip()) + self.writeTextElement("Description", task.description.strip()) self.writeTextElement("Created", time.strftime("%Y-%m-%d, %H:%M:%S", time.localtime(task.created))) if task.filename:
--- a/Tasks/Task.py Thu Nov 08 15:28:53 2012 +0100 +++ b/Tasks/Task.py Thu Nov 08 16:19:41 2012 +0100 @@ -27,14 +27,14 @@ TypeWarning = 2 TypeNote = 3 - def __init__(self, description, priority=1, filename="", lineno=0, + def __init__(self, summary, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, - taskType=TypeTodo, project=None, longtext=""): + taskType=TypeTodo, project=None, description=""): """ Constructor @param parent parent widget of the task (QWidget) - @param description descriptive text of the task (string) + @param summary summary text of the task (string) @param priority priority of the task (0=high, 1=normal, 2=low) @param filename filename containing the task (string) @param lineno line number containing the task (integer) @@ -45,12 +45,12 @@ @param taskType type of the task (one of TypeFixme, TypeTodo, TypeWarning, TypeNote) @param project reference to the project object (Project) - @param longtext explanatory text of the task (string) + @param description explanatory text of the task (string) """ super().__init__() + self.summary = summary self.description = description - self.longtext = longtext if priority in [0, 1, 2]: self.priority = priority else: @@ -68,7 +68,7 @@ self.setData(0, Qt.DisplayRole, "") self.setData(1, Qt.DisplayRole, "") - self.setData(2, Qt.DisplayRole, self.description) + self.setData(2, Qt.DisplayRole, self.summary) self.setData(3, Qt.DisplayRole, self.filename) self.setData(4, Qt.DisplayRole, self.lineno or "") @@ -122,22 +122,22 @@ if self._isProjectTask: self.setFont(col, boldFont) - def setDescription(self, description): + def setSummary(self, summary): """ Public slot to update the description. - @param longtext explanatory text of the task (string) + @param summary summary text of the task (string) + """ + self.summary = summary + self.setText(2, self.summary) + + def setDescription(self, description): + """ + Public slot to update the description field. + + @param description descriptive text of the task (string) """ self.description = description - self.setText(2, self.description) - - def setLongText(self, longtext): - """ - Public slot to update the longtext field. - - @param longtext descriptive text of the task (string) - """ - self.longtext = longtext def setPriority(self, priority): """
--- a/Tasks/TaskFilter.py Thu Nov 08 15:28:53 2012 +0100 +++ b/Tasks/TaskFilter.py Thu Nov 08 16:19:41 2012 +0100 @@ -22,7 +22,7 @@ """ self.active = False - self.descriptionFilter = None + self.summaryFilter = None self.filenameFilter = None self.typeFilter = Task.TypeNone # task type self.scopeFilter = None # global (False) or project (True) @@ -38,7 +38,7 @@ """ self.active = enabled - def setDescriptionFilter(self, filter): + def setSummaryFilter(self, filter): """ Public method to set the description filter. @@ -46,9 +46,9 @@ to set (string) or None """ if not filter: - self.descriptionFilter = None + self.summaryFilter = None else: - self.descriptionFilter = QRegExp(filter) + self.summaryFilter = QRegExp(filter) def setFileNameFilter(self, filter): """ @@ -102,7 +102,7 @@ @return flag indicating an active filter was found (boolean) """ - return self.descriptionFilter is not None or \ + return self.summaryFilter is not None or \ self.filenameFilter is not None or \ self.typeFilter != Task.TypeNone or \ self.scopeFilter is not None or \ @@ -119,8 +119,8 @@ if not self.active: return True - if self.descriptionFilter and \ - self.descriptionFilter.indexIn(task.description) == -1: + if self.summaryFilter and \ + self.summaryFilter.indexIn(task.summary) == -1: return False if self.filenameFilter and \
--- a/Tasks/TaskFilterConfigDialog.py Thu Nov 08 15:28:53 2012 +0100 +++ b/Tasks/TaskFilterConfigDialog.py Thu Nov 08 16:19:41 2012 +0100 @@ -34,13 +34,13 @@ self.typeCombo.addItem(self.trUtf8("ToDo"), Task.TypeTodo) self.typeCombo.addItem(self.trUtf8("Note"), Task.TypeNote) - if taskFilter.descriptionFilter is None or \ - not taskFilter.descriptionFilter.pattern(): - self.descriptionGroup.setChecked(False) - self.descriptionEdit.clear() + if taskFilter.summaryFilter is None or \ + not taskFilter.summaryFilter.pattern(): + self.summaryGroup.setChecked(False) + self.summaryEdit.clear() else: - self.descriptionGroup.setChecked(True) - self.descriptionEdit.setText(taskFilter.descriptionFilter.pattern()) + self.summaryGroup.setChecked(True) + self.summaryEdit.setText(taskFilter.summaryFilter.pattern()) if taskFilter.filenameFilter is None or \ not taskFilter.filenameFilter.pattern(): @@ -94,10 +94,10 @@ @param taskFilter the task filter object to be configured """ - if self.descriptionGroup.isChecked(): - taskFilter.setDescriptionFilter(self.descriptionEdit.text()) + if self.summaryGroup.isChecked(): + taskFilter.setSummaryFilter(self.summaryEdit.text()) else: - taskFilter.setDescriptionFilter(None) + taskFilter.setSummaryFilter(None) if self.filenameGroup.isChecked(): taskFilter.setFileNameFilter(self.filenameEdit.text())
--- a/Tasks/TaskFilterConfigDialog.ui Thu Nov 08 15:28:53 2012 +0100 +++ b/Tasks/TaskFilterConfigDialog.ui Thu Nov 08 16:19:41 2012 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>562</width> - <height>470</height> + <height>520</height> </rect> </property> <property name="windowTitle"> @@ -16,7 +16,7 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout"> + <layout class="QVBoxLayout" name="verticalLayout_4"> <item> <widget class="QLabel" name="label"> <property name="text"> @@ -31,24 +31,24 @@ </widget> </item> <item> - <widget class="QGroupBox" name="descriptionGroup"> + <widget class="QGroupBox" name="summaryGroup"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <property name="toolTip"> - <string>Select to filter on the task description</string> + <string>Select to filter on the task summary</string> </property> <property name="title"> - <string>Description</string> + <string>Summary</string> </property> <property name="checkable"> <bool>true</bool> </property> - <layout class="QVBoxLayout"> + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QLineEdit" name="descriptionEdit"> + <widget class="QLineEdit" name="summaryEdit"> <property name="toolTip"> - <string>Enter the description filter as a regular expression.</string> + <string>Enter the summary filter as a regular expression.</string> </property> </widget> </item> @@ -69,7 +69,7 @@ <property name="checkable"> <bool>true</bool> </property> - <layout class="QVBoxLayout"> + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <widget class="QLineEdit" name="filenameEdit"> <property name="toolTip"> @@ -94,7 +94,7 @@ <property name="checkable"> <bool>true</bool> </property> - <layout class="QVBoxLayout" name="verticalLayout"> + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> <widget class="QComboBox" name="typeCombo"> <property name="toolTip"> @@ -119,7 +119,7 @@ <property name="checkable"> <bool>true</bool> </property> - <layout class="QHBoxLayout"> + <layout class="QHBoxLayout" name="horizontalLayout"> <item> <widget class="QRadioButton" name="globalRadioButton"> <property name="toolTip"> @@ -157,7 +157,7 @@ <property name="checkable"> <bool>true</bool> </property> - <layout class="QHBoxLayout"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> <widget class="QRadioButton" name="uncompletedRadioButton"> <property name="toolTip"> @@ -195,7 +195,7 @@ <property name="checkable"> <bool>true</bool> </property> - <layout class="QHBoxLayout"> + <layout class="QHBoxLayout" name="horizontalLayout_3"> <item> <widget class="QCheckBox" name="priorityHighCheckBox"> <property name="toolTip"> @@ -230,6 +230,19 @@ </widget> </item> <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>8</height> + </size> + </property> + </spacer> + </item> + <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -242,8 +255,8 @@ </layout> </widget> <tabstops> - <tabstop>descriptionGroup</tabstop> - <tabstop>descriptionEdit</tabstop> + <tabstop>summaryGroup</tabstop> + <tabstop>summaryEdit</tabstop> <tabstop>filenameGroup</tabstop> <tabstop>filenameEdit</tabstop> <tabstop>typeGroup</tabstop>
--- a/Tasks/TaskPropertiesDialog.py Thu Nov 08 15:28:53 2012 +0100 +++ b/Tasks/TaskPropertiesDialog.py Thu Nov 08 16:19:41 2012 +0100 @@ -36,8 +36,8 @@ if not projectOpen: self.projectCheckBox.setEnabled(False) if task is not None: + self.summaryEdit.setText(task.summary) self.descriptionEdit.setText(task.description) - self.longtextEdit.setText(task.longtext) self.creationLabel.setText(time.strftime("%Y-%m-%d, %H:%M:%S", time.localtime(task.created))) self.priorityCombo.setCurrentIndex(task.priority) @@ -53,7 +53,7 @@ """ Public slot to set the dialog to read only mode. """ - self.descriptionEdit.setReadOnly(True) + self.summaryEdit.setReadOnly(True) self.completedCheckBox.setEnabled(False) self.priorityCombo.setEnabled(False) self.projectCheckBox.setEnabled(False) @@ -65,6 +65,6 @@ @return tuple of description, priority, completion flag, project flag and long text (string, string, boolean, boolean, string) """ - return (self.descriptionEdit.text(), self.priorityCombo.currentIndex(), + return (self.summaryEdit.text(), self.priorityCombo.currentIndex(), self.completedCheckBox.isChecked(), self.projectCheckBox.isChecked(), - self.longtextEdit.toPlainText()) + self.descriptionEdit.toPlainText())
--- a/Tasks/TaskPropertiesDialog.ui Thu Nov 08 15:28:53 2012 +0100 +++ b/Tasks/TaskPropertiesDialog.ui Thu Nov 08 16:19:41 2012 +0100 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>TaskPropertiesDialog</class> - <widget class="QDialog" name="TaskPropertiesDialog" > - <property name="geometry" > + <widget class="QDialog" name="TaskPropertiesDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,179 +10,179 @@ <height>297</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Task Properties</string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QGridLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > + <layout class="QGridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> <string>&Summary:</string> </property> - <property name="buddy" > - <cstring>descriptionEdit</cstring> + <property name="buddy"> + <cstring>summaryEdit</cstring> </property> </widget> </item> - <item row="0" column="1" colspan="3" > - <widget class="QLineEdit" name="descriptionEdit" > - <property name="toolTip" > + <item row="0" column="1" colspan="3"> + <widget class="QLineEdit" name="summaryEdit"> + <property name="toolTip"> <string>Enter the task summary</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="textLabel1" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="textLabel1"> + <property name="text"> <string>&Description:</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> </property> - <property name="buddy" > - <cstring>longtextEdit</cstring> + <property name="buddy"> + <cstring>descriptionEdit</cstring> </property> </widget> </item> - <item row="1" column="1" colspan="3" > - <widget class="QTextEdit" name="longtextEdit" > - <property name="toolTip" > + <item row="1" column="1" colspan="3"> + <widget class="QTextEdit" name="descriptionEdit"> + <property name="toolTip"> <string>Enter the task description</string> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QLabel" name="textLabel2" > - <property name="text" > + <item row="2" column="0"> + <widget class="QLabel" name="textLabel2"> + <property name="text"> <string>Creation Time:</string> </property> </widget> </item> - <item row="2" column="1" colspan="3" > - <widget class="QLabel" name="creationLabel" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Expanding" > + <item row="2" column="1" colspan="3"> + <widget class="QLabel" name="creationLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> </widget> </item> - <item row="3" column="0" > - <widget class="QLabel" name="textLabel4" > - <property name="text" > + <item row="3" column="0"> + <widget class="QLabel" name="textLabel4"> + <property name="text"> <string>&Priority:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>priorityCombo</cstring> </property> </widget> </item> - <item row="3" column="1" > - <widget class="QComboBox" name="priorityCombo" > - <property name="toolTip" > + <item row="3" column="1"> + <widget class="QComboBox" name="priorityCombo"> + <property name="toolTip"> <string>Select the task priority</string> </property> - <property name="currentIndex" > + <property name="currentIndex"> <number>1</number> </property> <item> - <property name="text" > + <property name="text"> <string>High</string> </property> </item> <item> - <property name="text" > + <property name="text"> <string>Normal</string> </property> </item> <item> - <property name="text" > + <property name="text"> <string>Low</string> </property> </item> </widget> </item> - <item row="3" column="2" > - <widget class="QCheckBox" name="projectCheckBox" > - <property name="toolTip" > + <item row="3" column="2"> + <widget class="QCheckBox" name="projectCheckBox"> + <property name="toolTip"> <string>Select to indicate a task related to the current project</string> </property> - <property name="text" > + <property name="text"> <string>Project &Task</string> </property> </widget> </item> - <item row="3" column="3" > - <widget class="QCheckBox" name="completedCheckBox" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <item row="3" column="3"> + <widget class="QCheckBox" name="completedCheckBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Select to mark this task as completed</string> </property> - <property name="text" > + <property name="text"> <string>T&ask completed</string> </property> </widget> </item> - <item row="4" column="0" > - <widget class="QLabel" name="textLabel5" > - <property name="text" > + <item row="4" column="0"> + <widget class="QLabel" name="textLabel5"> + <property name="text"> <string>Filename:</string> </property> </widget> </item> - <item row="4" column="1" colspan="3" > - <widget class="QLineEdit" name="filenameEdit" > - <property name="focusPolicy" > + <item row="4" column="1" colspan="3"> + <widget class="QLineEdit" name="filenameEdit"> + <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> - <property name="readOnly" > + <property name="readOnly"> <bool>true</bool> </property> </widget> </item> - <item row="5" column="0" > - <widget class="QLabel" name="textLabel6" > - <property name="text" > + <item row="5" column="0"> + <widget class="QLabel" name="textLabel6"> + <property name="text"> <string>Line:</string> </property> </widget> </item> - <item row="5" column="1" colspan="3" > - <widget class="QLineEdit" name="linenoEdit" > - <property name="focusPolicy" > + <item row="5" column="1" colspan="3"> + <widget class="QLineEdit" name="linenoEdit"> + <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> - <property name="readOnly" > + <property name="readOnly"> <bool>true</bool> </property> </widget> </item> - <item row="6" column="0" colspan="4" > - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <item row="6" column="0" colspan="4"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="6" /> + <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> + <tabstop>summaryEdit</tabstop> <tabstop>descriptionEdit</tabstop> - <tabstop>longtextEdit</tabstop> <tabstop>priorityCombo</tabstop> <tabstop>projectCheckBox</tabstop> <tabstop>completedCheckBox</tabstop> @@ -195,11 +196,11 @@ <receiver>TaskPropertiesDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>48</x> <y>143</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>49</x> <y>165</y> </hint> @@ -211,11 +212,11 @@ <receiver>TaskPropertiesDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>177</x> <y>149</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>177</x> <y>162</y> </hint>
--- a/Tasks/TaskViewer.py Thu Nov 08 15:28:53 2012 +0100 +++ b/Tasks/TaskViewer.py Thu Nov 08 16:19:41 2012 +0100 @@ -233,13 +233,13 @@ """ self.projectOpen = o - def addTask(self, description, priority=1, filename="", lineno=0, + def addTask(self, summary, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, - taskType=Task.TypeTodo, longtext=""): + taskType=Task.TypeTodo, description=""): """ Public slot to add a task. - @param description descriptive text of the task (string) + @param summary summary text of the task (string) @param priority priority of the task (0=high, 1=normal, 2=low) @param filename filename containing the task (string) @param lineno line number containing the task (integer) @@ -249,11 +249,11 @@ project (boolean) @param taskType type of the task (one of Task.TypeFixme, Task.TypeTodo, Task.TypeWarning, Task.TypeNote) - @param longtext explanatory text of the task (string) + @param description explanatory text of the task (string) """ - task = Task(description, priority, filename, lineno, completed, + task = Task(summary, priority, filename, lineno, completed, _time, isProjectTask, taskType, - self.project, longtext) + self.project, description) self.tasks.append(task) if self.taskFilter.showTask(task): self.addTopLevelItem(task) @@ -263,22 +263,22 @@ if isProjectTask: self.__projectTasksSaveTimer.changeOccurred() - def addFileTask(self, description, filename, lineno, taskType=Task.TypeTodo, - longtext=""): + def addFileTask(self, summary, filename, lineno, taskType=Task.TypeTodo, + description=""): """ Public slot to add a file related task. - @param description descriptive text of the task (string) + @param summary summary text of the task (string) @param filename filename containing the task (string) @param lineno line number containing the task (integer) @param taskType type of the task (one of Task.TypeFixme, Task.TypeTodo, Task.TypeWarning, Task.TypeNote) - @param longtext explanatory text of the task (string) + @param description explanatory text of the task (string) """ - self.addTask(description, filename=filename, lineno=lineno, + self.addTask(summary, filename=filename, lineno=lineno, isProjectTask=( self.project and self.project.isProjectSource(filename)), - taskType=taskType, longtext=longtext) + taskType=taskType, description=description) def getProjectTasks(self): """ @@ -358,11 +358,11 @@ dlg.setReadOnly() if dlg.exec_() == QDialog.Accepted and not ro: data = dlg.getData() - task.setDescription(data[0]) + task.setSummary(data[0]) task.setPriority(data[1]) task.setCompleted(data[2]) task.setProjectTask(data[3]) - task.setLongText(data[4]) + task.setDescription(data[4]) self.__projectTasksSaveTimer.changeOccurred() def __newTask(self): @@ -373,7 +373,7 @@ if dlg.exec_() == QDialog.Accepted: data = dlg.getData() self.addTask(data[0], data[1], completed=data[2], isProjectTask=data[3], - longtext=data[4]) + description=data[4]) def __markCompleted(self): """ @@ -413,10 +413,10 @@ Private slot to handle the "Paste" context menu entry. """ if self.copyTask: - self.addTask(self.copyTask.description, + self.addTask(self.copyTask.summary, priority=self.copyTask.priority, completed=self.copyTask.completed, - longtext=self.copyTask.longtext, + description=self.copyTask.description, isProjectTask=self.copyTask._isProjectTask) def __deleteTask(self):
--- a/i18n/eric5_cs.ts Thu Nov 08 15:28:53 2012 +0100 +++ b/i18n/eric5_cs.ts Thu Nov 08 16:19:41 2012 +0100 @@ -39385,7 +39385,7 @@ <context> <name>SnapshotRegionGrabber</name> <message> - <location filename="Snapshot/SnapshotRegionGrabber.py" line="93"/> + <location filename="Snapshot/SnapshotRegionGrabber.py" line="94"/> <source>Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit.</source> <translation type="unfinished"></translation> </message> @@ -46719,17 +46719,17 @@ <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> <source>Select to filter on the task description</source> - <translation>Vybrat pro filtrování popisu úlohy</translation> + <translation type="obsolete">Vybrat pro filtrování popisu úlohy</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> <source>Description</source> - <translation>Popis</translation> + <translation type="obsolete">Popis</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> <source>Enter the description filter as a regular expression.</source> - <translation>Zadání popisu filtru jako regulární výraz.</translation> + <translation type="obsolete">Zadání popisu filtru jako regulární výraz.</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="64"/> @@ -46901,91 +46901,106 @@ <source>Note</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> + <source>Select to filter on the task summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> + <source>Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> + <source>Enter the summary filter as a regular expression.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>TaskPropertiesDialog</name> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="13"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="14"/> <source>Task Properties</source> <translation>Nastavení úlohy</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="86"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="87"/> <source>Select the task priority</source> <translation>Vybrat prioritu úlohy</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="93"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="94"/> <source>High</source> <translation>Vysoká</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="98"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="99"/> <source>Normal</source> <translation>Normální</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="103"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="104"/> <source>Low</source> <translation>Nízká</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="111"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="112"/> <source>Select to indicate a task related to the current project</source> <translation>Vybrat pro označení, že úloha souvisí s aktuálním projektem</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="114"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="115"/> <source>Project &Task</source> <translation>Úloha projek&tu</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="127"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="128"/> <source>Select to mark this task as completed</source> <translation>Vybrat pro označení, že tato úloha je hotova</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="130"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="131"/> <source>T&ask completed</source> <translation>Úloh&a je hotová</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="154"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="155"/> <source>Line:</source> <translation>Řádek:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="137"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="138"/> <source>Filename:</source> <translation>Jméno souboru:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="76"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="77"/> <source>&Priority:</source> <translation>&Priorita:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="59"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="60"/> <source>Creation Time:</source> <translation>Čas vzniku:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="52"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="53"/> <source>Enter the task description</source> <translation>Zadejte popisek úlohy</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="39"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="40"/> <source>&Description:</source> <translation>&Popisek:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="22"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="23"/> <source>&Summary:</source> <translation>&Sumarizace:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="32"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="33"/> <source>Enter the task summary</source> <translation>Zadejte úlohu sumarizace</translation> </message>
--- a/i18n/eric5_de.ts Thu Nov 08 15:28:53 2012 +0100 +++ b/i18n/eric5_de.ts Thu Nov 08 16:19:41 2012 +0100 @@ -31220,11 +31220,6 @@ <translation><p>Die Programmiersprache <b>{0}</b> wird nicht unterstützt.</p></translation> </message> <message> - <location filename="Project/Project.py" line="341"/> - <source><p>The Project type <b>{0}</b> is already registered with Programmin Language <b>{1}</b>.</p></source> - <translation type="obsolete"><p>Der Projekttyp <b>{0}</b> ist bereits für die Programmiersprache <b>{1}</b> registriert.</p></translation> - </message> - <message> <location filename="Project/Project.py" line="351"/> <source><p>The Project type <b>{0}</b> is already registered.</p></source> <translation><p>Der Projekttyp <b>{0}</b> ist bereits registriert.</p></translation> @@ -37988,7 +37983,7 @@ <context> <name>SnapshotRegionGrabber</name> <message> - <location filename="Snapshot/SnapshotRegionGrabber.py" line="93"/> + <location filename="Snapshot/SnapshotRegionGrabber.py" line="94"/> <source>Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit.</source> <translation>Wählen sie mit der Maus einen Bereich aus. Um das Bildschirmfoto aufzunehmen, drücken sie die Eingabetaste oder tätigen sie einen Doppelklick. Zum Abbrechen drücken sie Escape.</translation> </message> @@ -45245,21 +45240,6 @@ <translation>Wähle die Kategorien, nach denen die Aufgabenliste gefiltert werden soll. Gib das Filterkriterium in jeder Kategorie ein. Die aktivierten Kategorien werden "<b>und</b>" verknüpft.</translation> </message> <message> - <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> - <source>Select to filter on the task description</source> - <translation>Auswählen, um über die Aufgabenbeschreibung zu filtern</translation> - </message> - <message> - <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> - <source>Description</source> - <translation>Beschreibung</translation> - </message> - <message> - <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> - <source>Enter the description filter as a regular expression.</source> - <translation>Gib den Beschreibungsfilter als regulären Ausdruck ein.</translation> - </message> - <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="64"/> <source>Select to filter on the task filename</source> <translation>Auswählen, um über den Dateinamen der Aufgabe zu filtern</translation> @@ -45409,91 +45389,106 @@ <source>Note</source> <translation>Hinweis</translation> </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> + <source>Select to filter on the task summary</source> + <translation>Auswählen, um über die Zusammenfassung der Aufgabe zu filtern</translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> + <source>Summary</source> + <translation>Zusammenfassung</translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> + <source>Enter the summary filter as a regular expression.</source> + <translation>Gib den Zusammenfassungsfilter als regulären Ausdruck ein.</translation> + </message> </context> <context> <name>TaskPropertiesDialog</name> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="13"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="14"/> <source>Task Properties</source> <translation>Aufgabeneigenschaften</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="39"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="40"/> <source>&Description:</source> <translation>&Beschreibung:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="52"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="53"/> <source>Enter the task description</source> <translation>Gib die Aufgabenbeschreibung ein</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="59"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="60"/> <source>Creation Time:</source> <translation>Erzeugungszeitpunkt:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="76"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="77"/> <source>&Priority:</source> <translation>&Wichtigkeit:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="137"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="138"/> <source>Filename:</source> <translation>Dateiname:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="154"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="155"/> <source>Line:</source> <translation>Zeile:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="127"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="128"/> <source>Select to mark this task as completed</source> <translation>Auswählen, um die Aufgabe als beendet zu markieren</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="130"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="131"/> <source>T&ask completed</source> <translation>Aufgabe be&endet</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="111"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="112"/> <source>Select to indicate a task related to the current project</source> <translation>Auswählen, um eine Aufgabe als zu einem Projekt gehörend zu markieren</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="114"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="115"/> <source>Project &Task</source> <translation>&Projektaufgabe</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="86"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="87"/> <source>Select the task priority</source> <translation>Wähle die Wichtigkeit der Aufgabe</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="93"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="94"/> <source>High</source> <translation>Hoch</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="98"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="99"/> <source>Normal</source> <translation>Normal</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="103"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="104"/> <source>Low</source> <translation>Niedrig</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="22"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="23"/> <source>&Summary:</source> <translation>&Zusammenfassung:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="32"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="33"/> <source>Enter the task summary</source> <translation>Gib die Zusammenfassung der Aufgabe ein</translation> </message>
--- a/i18n/eric5_en.ts Thu Nov 08 15:28:53 2012 +0100 +++ b/i18n/eric5_en.ts Thu Nov 08 16:19:41 2012 +0100 @@ -37648,7 +37648,7 @@ <context> <name>SnapshotRegionGrabber</name> <message> - <location filename="Snapshot/SnapshotRegionGrabber.py" line="93"/> + <location filename="Snapshot/SnapshotRegionGrabber.py" line="94"/> <source>Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit.</source> <translation type="unfinished"></translation> </message> @@ -44809,21 +44809,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> - <source>Select to filter on the task description</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> - <source>Description</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> - <source>Enter the description filter as a regular expression.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="64"/> <source>Select to filter on the task filename</source> <translation type="unfinished"></translation> @@ -44973,91 +44958,106 @@ <source>Note</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> + <source>Select to filter on the task summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> + <source>Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> + <source>Enter the summary filter as a regular expression.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>TaskPropertiesDialog</name> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="13"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="14"/> <source>Task Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="22"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="23"/> <source>&Summary:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="32"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="33"/> <source>Enter the task summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="39"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="40"/> <source>&Description:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="52"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="53"/> <source>Enter the task description</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="59"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="60"/> <source>Creation Time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="76"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="77"/> <source>&Priority:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="86"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="87"/> <source>Select the task priority</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="93"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="94"/> <source>High</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="98"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="99"/> <source>Normal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="103"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="104"/> <source>Low</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="111"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="112"/> <source>Select to indicate a task related to the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="114"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="115"/> <source>Project &Task</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="127"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="128"/> <source>Select to mark this task as completed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="130"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="131"/> <source>T&ask completed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="137"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="138"/> <source>Filename:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="154"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="155"/> <source>Line:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Thu Nov 08 15:28:53 2012 +0100 +++ b/i18n/eric5_es.ts Thu Nov 08 16:19:41 2012 +0100 @@ -38239,7 +38239,7 @@ <context> <name>SnapshotRegionGrabber</name> <message> - <location filename="Snapshot/SnapshotRegionGrabber.py" line="93"/> + <location filename="Snapshot/SnapshotRegionGrabber.py" line="94"/> <source>Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit.</source> <translation>Seleccionar una región utilizando el ratón. Para tomar el pantallazo, pulsar la tecla Enter o hacer doble click. Pulsar Esc para salir.</translation> </message> @@ -45569,17 +45569,17 @@ <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> <source>Select to filter on the task description</source> - <translation>Seleccionar para filtrar por descripción de la tarea</translation> + <translation type="obsolete">Seleccionar para filtrar por descripción de la tarea</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> <source>Description</source> - <translation>Descripción</translation> + <translation type="obsolete">Descripción</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> <source>Enter the description filter as a regular expression.</source> - <translation>Introducir el filtro de descripción como una expresión regular.</translation> + <translation type="obsolete">Introducir el filtro de descripción como una expresión regular.</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="64"/> @@ -45731,91 +45731,106 @@ <source>Note</source> <translation>Nota</translation> </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> + <source>Select to filter on the task summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> + <source>Summary</source> + <translation type="unfinished">Resumen</translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> + <source>Enter the summary filter as a regular expression.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>TaskPropertiesDialog</name> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="13"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="14"/> <source>Task Properties</source> <translation>Propiedades de la Tarea</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="22"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="23"/> <source>&Summary:</source> <translation>Re&sumen:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="32"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="33"/> <source>Enter the task summary</source> <translation>Introduzca el resumen de la tarea</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="39"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="40"/> <source>&Description:</source> <translation>&Descripción:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="52"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="53"/> <source>Enter the task description</source> <translation>Introduzca la descripción de la tarea</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="59"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="60"/> <source>Creation Time:</source> <translation>Fecha y Hora de Creación:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="76"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="77"/> <source>&Priority:</source> <translation>&Prioridad:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="86"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="87"/> <source>Select the task priority</source> <translation>Seleccione la prioridad de la tarea</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="93"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="94"/> <source>High</source> <translation>Alta</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="98"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="99"/> <source>Normal</source> <translation>Normal</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="103"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="104"/> <source>Low</source> <translation>Baja</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="111"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="112"/> <source>Select to indicate a task related to the current project</source> <translation>Seleccionar para indicar una tarea relacionada con el proyecto actual</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="114"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="115"/> <source>Project &Task</source> <translation>Tareas de &proyecto</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="127"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="128"/> <source>Select to mark this task as completed</source> <translation>Seleccionar para marcar esta tarea como completa</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="130"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="131"/> <source>T&ask completed</source> <translation>&Tareas Completada</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="137"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="138"/> <source>Filename:</source> <translation>Nombre de archivo:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="154"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="155"/> <source>Line:</source> <translation>Línea:</translation> </message>
--- a/i18n/eric5_fr.ts Thu Nov 08 15:28:53 2012 +0100 +++ b/i18n/eric5_fr.ts Thu Nov 08 16:19:41 2012 +0100 @@ -41852,7 +41852,7 @@ <context> <name>SnapshotRegionGrabber</name> <message> - <location filename="Snapshot/SnapshotRegionGrabber.py" line="93"/> + <location filename="Snapshot/SnapshotRegionGrabber.py" line="94"/> <source>Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit.</source> <translation type="unfinished"></translation> </message> @@ -49719,17 +49719,17 @@ <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> <source>Select to filter on the task description</source> - <translation>Cocher pour filtrer suivant la description de tâche</translation> + <translation type="obsolete">Cocher pour filtrer suivant la description de tâche</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> <source>Description</source> - <translation>Description</translation> + <translation type="obsolete">Description</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> <source>Enter the description filter as a regular expression.</source> - <translation>Entrer le filtre de description sous forme d'expression régulière.</translation> + <translation type="obsolete">Entrer le filtre de description sous forme d'expression régulière.</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="64"/> @@ -49901,91 +49901,106 @@ <source>Note</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> + <source>Select to filter on the task summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> + <source>Summary</source> + <translation type="unfinished">Bilan</translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> + <source>Enter the summary filter as a regular expression.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>TaskPropertiesDialog</name> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="13"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="14"/> <source>Task Properties</source> <translation>Propriétés des tâches</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="39"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="40"/> <source>&Description:</source> <translation>&Description:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="52"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="53"/> <source>Enter the task description</source> <translation>Entrer la decription de la tâche</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="59"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="60"/> <source>Creation Time:</source> <translation>Date de création:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="76"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="77"/> <source>&Priority:</source> <translation>&Priorité:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="137"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="138"/> <source>Filename:</source> <translation>Nom de fichier:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="154"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="155"/> <source>Line:</source> <translation>Ligne:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="127"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="128"/> <source>Select to mark this task as completed</source> <translation>Cocher pour marquer cette tâche comme complétée</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="130"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="131"/> <source>T&ask completed</source> <translation>Ta&che effectuée</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="111"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="112"/> <source>Select to indicate a task related to the current project</source> <translation>Cocher pour indiquer si cette tâche doit être rattachée au projet courant</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="114"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="115"/> <source>Project &Task</source> <translation>&Tâche de projet</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="86"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="87"/> <source>Select the task priority</source> <translation>Sélectionner la priorité de la tâche</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="93"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="94"/> <source>High</source> <translation>Haute</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="98"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="99"/> <source>Normal</source> <translation>Normale</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="103"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="104"/> <source>Low</source> <translation>Basse</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="22"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="23"/> <source>&Summary:</source> <translation>&Bilan:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="32"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="33"/> <source>Enter the task summary</source> <translation>Entrer le bilan des tâches</translation> </message>
--- a/i18n/eric5_it.ts Thu Nov 08 15:28:53 2012 +0100 +++ b/i18n/eric5_it.ts Thu Nov 08 16:19:41 2012 +0100 @@ -38960,7 +38960,7 @@ <context> <name>SnapshotRegionGrabber</name> <message> - <location filename="Snapshot/SnapshotRegionGrabber.py" line="93"/> + <location filename="Snapshot/SnapshotRegionGrabber.py" line="94"/> <source>Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit.</source> <translation type="unfinished"></translation> </message> @@ -46424,17 +46424,17 @@ <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> <source>Select to filter on the task description</source> - <translation>Seleziona per filtrare sulla descrizione del task</translation> + <translation type="obsolete">Seleziona per filtrare sulla descrizione del task</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> <source>Description</source> - <translation>Descrizione</translation> + <translation type="obsolete">Descrizione</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> <source>Enter the description filter as a regular expression.</source> - <translation>Inserisci il filtro sulla descrizione come un'espressione regolare.</translation> + <translation type="obsolete">Inserisci il filtro sulla descrizione come un'espressione regolare.</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="64"/> @@ -46606,91 +46606,106 @@ <source>Note</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> + <source>Select to filter on the task summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> + <source>Summary</source> + <translation type="unfinished">Sommario</translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> + <source>Enter the summary filter as a regular expression.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>TaskPropertiesDialog</name> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="13"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="14"/> <source>Task Properties</source> <translation>Proprietà task</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="39"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="40"/> <source>&Description:</source> <translation>&Descrizione:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="52"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="53"/> <source>Enter the task description</source> <translation>Inserisci la descrizione del task</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="59"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="60"/> <source>Creation Time:</source> <translation>Ora creazione:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="76"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="77"/> <source>&Priority:</source> <translation>&Priorità:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="137"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="138"/> <source>Filename:</source> <translation>Nome File:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="154"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="155"/> <source>Line:</source> <translation>Linea:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="127"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="128"/> <source>Select to mark this task as completed</source> <translation>Seleziona per marcare questo task come compleeto</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="130"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="131"/> <source>T&ask completed</source> <translation>T&ask completato</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="111"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="112"/> <source>Select to indicate a task related to the current project</source> <translation>Seleziona per indicare un task correlato al progetto corrente</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="114"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="115"/> <source>Project &Task</source> <translation>&Task Progetto</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="86"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="87"/> <source>Select the task priority</source> <translation>Seleziona la priorità del task</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="93"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="94"/> <source>High</source> <translation>Alta</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="98"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="99"/> <source>Normal</source> <translation>Normale</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="103"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="104"/> <source>Low</source> <translation>Bassa</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="22"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="23"/> <source>&Summary:</source> <translation>&Sommario:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="32"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="33"/> <source>Enter the task summary</source> <translation>Inserisci il riassunto del task</translation> </message>
--- a/i18n/eric5_ru.ts Thu Nov 08 15:28:53 2012 +0100 +++ b/i18n/eric5_ru.ts Thu Nov 08 16:19:41 2012 +0100 @@ -39073,7 +39073,7 @@ <context> <name>SnapshotRegionGrabber</name> <message> - <location filename="Snapshot/SnapshotRegionGrabber.py" line="93"/> + <location filename="Snapshot/SnapshotRegionGrabber.py" line="94"/> <source>Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit.</source> <translation type="unfinished"></translation> </message> @@ -46521,17 +46521,17 @@ <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> <source>Select to filter on the task description</source> - <translation>Фильтровать по описанию задачи</translation> + <translation type="obsolete">Фильтровать по описанию задачи</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> <source>Description</source> - <translation>Описание</translation> + <translation type="obsolete">Описание</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> <source>Enter the description filter as a regular expression.</source> - <translation>Задайте фильтр описания как регулярное выражение.</translation> + <translation type="obsolete">Задайте фильтр описания как регулярное выражение.</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="64"/> @@ -46703,91 +46703,106 @@ <source>Note</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> + <source>Select to filter on the task summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> + <source>Summary</source> + <translation type="unfinished">Итого</translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> + <source>Enter the summary filter as a regular expression.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>TaskPropertiesDialog</name> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="13"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="14"/> <source>Task Properties</source> <translation>Свойства задачи</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="39"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="40"/> <source>&Description:</source> <translation>&Описание:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="52"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="53"/> <source>Enter the task description</source> <translation>Задайте описание задачи</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="59"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="60"/> <source>Creation Time:</source> <translation>Время создания:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="76"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="77"/> <source>&Priority:</source> <translation>&Приоритет:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="137"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="138"/> <source>Filename:</source> <translation>Имя файла:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="154"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="155"/> <source>Line:</source> <translation>Строка:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="127"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="128"/> <source>Select to mark this task as completed</source> <translation>Пометить задачу как завершённую</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="130"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="131"/> <source>T&ask completed</source> <translation>З&адача завершена</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="111"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="112"/> <source>Select to indicate a task related to the current project</source> <translation>Указать, что задача относится к текущему проекту</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="114"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="115"/> <source>Project &Task</source> <translation>&Задача проекта</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="86"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="87"/> <source>Select the task priority</source> <translation>Задайте приоритет задачи</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="93"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="94"/> <source>High</source> <translation>Высокий</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="98"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="99"/> <source>Normal</source> <translation>Нормальный</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="103"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="104"/> <source>Low</source> <translation>Низкий</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="22"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="23"/> <source>&Summary:</source> <translation>&Сводка:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="32"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="33"/> <source>Enter the task summary</source> <translation>Задайте краткое изложение задачи</translation> </message>
--- a/i18n/eric5_tr.ts Thu Nov 08 15:28:53 2012 +0100 +++ b/i18n/eric5_tr.ts Thu Nov 08 16:19:41 2012 +0100 @@ -38992,7 +38992,7 @@ <context> <name>SnapshotRegionGrabber</name> <message> - <location filename="Snapshot/SnapshotRegionGrabber.py" line="93"/> + <location filename="Snapshot/SnapshotRegionGrabber.py" line="94"/> <source>Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit.</source> <translation type="unfinished"></translation> </message> @@ -46273,19 +46273,9 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> - <source>Select to filter on the task description</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> <source>Description</source> - <translation>Açıklama</translation> - </message> - <message> - <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> - <source>Enter the description filter as a regular expression.</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Açıklama</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="64"/> @@ -46447,91 +46437,106 @@ <source>Note</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> + <source>Select to filter on the task summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> + <source>Summary</source> + <translation type="unfinished">Özet</translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> + <source>Enter the summary filter as a regular expression.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>TaskPropertiesDialog</name> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="13"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="14"/> <source>Task Properties</source> <translation>Görev Özellikleri</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="22"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="23"/> <source>&Summary:</source> <translation>Özet &S:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="32"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="33"/> <source>Enter the task summary</source> <translation>Görev özetini gir</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="39"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="40"/> <source>&Description:</source> <translation>A&çıklama:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="52"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="53"/> <source>Enter the task description</source> <translation>Görev açıklamasını gir</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="59"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="60"/> <source>Creation Time:</source> <translation>Oluşum Zamanı:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="76"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="77"/> <source>&Priority:</source> <translation>&Öncelik:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="86"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="87"/> <source>Select the task priority</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="93"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="94"/> <source>High</source> <translation>Yükseklik</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="98"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="99"/> <source>Normal</source> <translation>Normal</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="103"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="104"/> <source>Low</source> <translation>Alçek</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="111"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="112"/> <source>Select to indicate a task related to the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="114"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="115"/> <source>Project &Task</source> <translation>Proje &Görevi</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="127"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="128"/> <source>Select to mark this task as completed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="130"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="131"/> <source>T&ask completed</source> <translation>Görev T&amamlandı</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="137"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="138"/> <source>Filename:</source> <translation>Dosyaadı:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="154"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="155"/> <source>Line:</source> <translation>Satır:</translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Thu Nov 08 15:28:53 2012 +0100 +++ b/i18n/eric5_zh_CN.GB2312.ts Thu Nov 08 16:19:41 2012 +0100 @@ -41824,7 +41824,7 @@ <context> <name>SnapshotRegionGrabber</name> <message> - <location filename="Snapshot/SnapshotRegionGrabber.py" line="93"/> + <location filename="Snapshot/SnapshotRegionGrabber.py" line="94"/> <source>Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit.</source> <translation type="unfinished"></translation> </message> @@ -49694,17 +49694,17 @@ <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> <source>Select to filter on the task description</source> - <translation>选择任务描述上进行过滤</translation> + <translation type="obsolete">选择任务描述上进行过滤</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> <source>Description</source> - <translation>描述</translation> + <translation type="obsolete">描述</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> <source>Enter the description filter as a regular expression.</source> - <translation>以正则表达式的形式输入描述过滤。</translation> + <translation type="obsolete">以正则表达式的形式输入描述过滤。</translation> </message> <message> <location filename="Tasks/TaskFilterConfigDialog.ui" line="64"/> @@ -49876,91 +49876,106 @@ <source>Note</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/> + <source>Select to filter on the task summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/> + <source>Summary</source> + <translation type="unfinished">摘要</translation> + </message> + <message> + <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/> + <source>Enter the summary filter as a regular expression.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>TaskPropertiesDialog</name> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="13"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="14"/> <source>Task Properties</source> <translation>任务属性</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="22"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="23"/> <source>&Summary:</source> <translation>摘要(&S):</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="32"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="33"/> <source>Enter the task summary</source> <translation>输入任务摘要</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="39"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="40"/> <source>&Description:</source> <translation>描述(&D):</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="52"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="53"/> <source>Enter the task description</source> <translation>输入任务描述</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="59"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="60"/> <source>Creation Time:</source> <translation>创建时间:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="76"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="77"/> <source>&Priority:</source> <translation>优先级(&P):</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="86"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="87"/> <source>Select the task priority</source> <translation>选择任务优先级</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="93"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="94"/> <source>High</source> <translation>高</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="98"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="99"/> <source>Normal</source> <translation>普通</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="103"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="104"/> <source>Low</source> <translation>低</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="111"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="112"/> <source>Select to indicate a task related to the current project</source> <translation>选择指示与当前项目相关的任务</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="114"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="115"/> <source>Project &Task</source> <translation>项目任务(&T)</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="127"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="128"/> <source>Select to mark this task as completed</source> <translation>选择将该任务标记为已完成</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="130"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="131"/> <source>T&ask completed</source> <translation>任务已完成(&a)</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="137"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="138"/> <source>Filename:</source> <translation>文件名:</translation> </message> <message> - <location filename="Tasks/TaskPropertiesDialog.ui" line="154"/> + <location filename="Tasks/TaskPropertiesDialog.ui" line="155"/> <source>Line:</source> <translation>行:</translation> </message>