mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-09-13 20:23:04 +02:00
Merge pull request #343 from plc-user/master
minor: typos, comments, whitespace, translation
This commit is contained in:
commit
d1c6fb7e3c
BIN
lang/qet_de.qm
BIN
lang/qet_de.qm
Binary file not shown.
@ -9101,7 +9101,7 @@ Möchten Sie sie ersetzen?</translation>
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../sources/qetinformation.cpp" line="281"/>
|
<location filename="../sources/qetinformation.cpp" line="281"/>
|
||||||
<source>Bloc auxiliaire 2</source>
|
<source>Bloc auxiliaire 2</source>
|
||||||
<translation>Zusatzinfo 2</translation>
|
<translation>Zusatzinfo Zusatzartikel 2</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../sources/qetinformation.cpp" line="282"/>
|
<location filename="../sources/qetinformation.cpp" line="282"/>
|
||||||
@ -9642,7 +9642,7 @@ Fehler: Stellen Sie sicher, dass die Datei %1 eine gültige dxf-Datei ist</trans
|
|||||||
<location filename="../sources/dxf/dxftoelmt.cpp" line="59"/>
|
<location filename="../sources/dxf/dxftoelmt.cpp" line="59"/>
|
||||||
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="101"/>
|
<location filename="../sources/qet_elementscaler/qet_elementscaler.cpp" line="101"/>
|
||||||
<source>See details here:</source>
|
<source>See details here:</source>
|
||||||
<translation>Fehlermeldung:</translation>
|
<translation>Details:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../sources/dxf/dxftoelmt.cpp" line="112"/>
|
<location filename="../sources/dxf/dxftoelmt.cpp" line="112"/>
|
||||||
|
@ -37,7 +37,7 @@ class XmlElementCollection;
|
|||||||
This class represents the location,
|
This class represents the location,
|
||||||
the location of an element or of a category,
|
the location of an element or of a category,
|
||||||
even of a collection ... in a collection.
|
even of a collection ... in a collection.
|
||||||
She encapsulates a virtual path.
|
It encapsulates a virtual path.
|
||||||
\~French
|
\~French
|
||||||
Cette classe represente la localisation, l'emplacement d'un element ou
|
Cette classe represente la localisation, l'emplacement d'un element ou
|
||||||
d'une categorie, voire d'une collection... dans une collection.
|
d'une categorie, voire d'une collection... dans une collection.
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
@brief DiagramContext::add
|
@brief DiagramContext::add
|
||||||
Add all value of other to this.
|
Add all value of other to this.
|
||||||
If a key already exist, the value is replaced.
|
If a key already exist, the value is replaced.
|
||||||
If a key doesn't exist, she will be added.
|
If a key doesn't exist, it will be added.
|
||||||
All other keys of this context, which are not present in other, stay unchanged.
|
All other keys of this context, which are not present in other, stay unchanged.
|
||||||
@param other
|
@param other
|
||||||
*/
|
*/
|
||||||
@ -124,7 +124,7 @@ int DiagramContext::count()
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
@brief DiagramContext::keyMustShow
|
@brief DiagramContext::keyMustShow
|
||||||
@return the value pairs with key, if key no found, return false
|
@return the value pairs with key, if key not found, return false
|
||||||
*/
|
*/
|
||||||
bool DiagramContext::keyMustShow(const QString &key) const
|
bool DiagramContext::keyMustShow(const QString &key) const
|
||||||
{
|
{
|
||||||
|
@ -26,15 +26,15 @@ class QETProject;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief The ProjectPropertiesHandler class
|
* @brief The ProjectPropertiesHandler class
|
||||||
* A central class who handle, keep and provide all utilities
|
* A central class that handles, keeps and provides all utilities
|
||||||
* to easily manage all kind of properties used in a project.
|
* to easily manage all kind of properties used in a project.
|
||||||
*
|
*
|
||||||
* This is a new class since QElectroTech 0.9
|
* This is a new class since QElectroTech 0.9
|
||||||
* by consequent she is small and you can found a lot of properties (made before qet 0.9)
|
* by consequence it is small and you can find a lot of properties (made before qet 0.9)
|
||||||
* everywhere in the code.
|
* everywhere in the code.
|
||||||
* All new properties should be managed by this class
|
* All new properties should be managed by this class
|
||||||
* (of course if it make sense to be managed by this class).
|
* (of course if it makes sense to be managed by this class).
|
||||||
* Older properties who are not managed by this class but should be,
|
* Older properties which are not managed by this class but should be,
|
||||||
* will be managed in future.
|
* will be managed in future.
|
||||||
*/
|
*/
|
||||||
class ProjectPropertiesHandler
|
class ProjectPropertiesHandler
|
||||||
|
@ -2083,10 +2083,10 @@ void QETDiagramEditor::projectWasClosed(ProjectView *project_view)
|
|||||||
undo_group.removeStack(project -> undoStack());
|
undo_group.removeStack(project -> undoStack());
|
||||||
QETApp::unregisterProject(project);
|
QETApp::unregisterProject(project);
|
||||||
}
|
}
|
||||||
//When project is closed, a lot of signal are emitted, notably if there is an item selected in a diagram.
|
//When project is closed, a lot of signals are emitted, notably if there is an item selected in a diagram.
|
||||||
//In some special case, since signal/slot connection can be direct or queued, some signal are handled after QObject is deleted, and crash qet
|
//In some special case, since signal/slot connection can be direct or queued, some signals are handled after QObject is deleted, and crash qet
|
||||||
//notably in the function Diagram::elements when she call items() (I don't know exactly why).
|
//notably in the function Diagram::elements when it calls items() (I don't know exactly why).
|
||||||
//set nullptr to "m_selection_properties_editor->setDiagram()" fix this crash
|
//set nullptr to "m_selection_properties_editor->setDiagram()" fixes this crash
|
||||||
m_selection_properties_editor->setDiagram(nullptr);
|
m_selection_properties_editor->setDiagram(nullptr);
|
||||||
project_view -> deleteLater();
|
project_view -> deleteLater();
|
||||||
project -> deleteLater();
|
project -> deleteLater();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user