realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-13 20:23:04 +02:00
Code Packages Releases 1 Activity

Activation/desactivation de l'action "Coller ici" en fonction de l'etat du presse-papier

Browse Source 
Mise a jour des traductions


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@203 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavierqet 2007-11-03 20:20:34 +00:00
parent 4fa3e665d9
commit 6c4a7ace87
6 changed files with 74 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
diagram.cpp
View File

@ -595,3 +595,10 @@ QSet<Conductor *> Diagram::selectedConductors() const {
} }
return(conductors_set); return(conductors_set);
} }
/// @return true si le presse-papier semble contenir un schema
bool Diagram::clipboardMayContainDiagram() {
QString clipboard_text = QApplication::clipboard() -> text().trimmed();
bool may_be_diagram = clipboard_text.startsWith("<diagram") && clipboard_text.endsWith("</diagram>");
return(may_be_diagram);
}

9
diagram.h
View File

@ -62,10 +62,13 @@ class Diagram : public QGraphicsScene {
bool draw_terminals; bool draw_terminals;
// methodes // methodes
protected:
virtual void drawBackground(QPainter *, const QRectF &);
virtual void keyPressEvent(QKeyEvent *);
virtual void keyReleaseEvent(QKeyEvent *);
public: public:
void drawBackground(QPainter *, const QRectF &); static bool clipboardMayContainDiagram();
void keyPressEvent(QKeyEvent *);
void keyReleaseEvent(QKeyEvent *);
// fonctions relatives a la pose de conducteurs // fonctions relatives a la pose de conducteurs
void setConductor(bool); void setConductor(bool);

1
diagramview.cpp
View File

@ -826,6 +826,7 @@ void DiagramView::contextMenuEvent(QContextMenuEvent *e) {
context_menu -> clear(); context_menu -> clear();
if (scene -> selectedItems().isEmpty()) { if (scene -> selectedItems().isEmpty()) {
paste_here_pos = e -> pos(); paste_here_pos = e -> pos();
paste_here -> setEnabled(Diagram::clipboardMayContainDiagram());
context_menu -> addAction(paste_here); context_menu -> addAction(paste_here);
context_menu -> addSeparator(); context_menu -> addSeparator();
context_menu -> addAction(qde -> infos_diagram); context_menu -> addAction(qde -> infos_diagram);

BIN
lang/qet_en.qm
View File

Binary file not shown.

110
lang/qet_en.ts
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS><TS version="1.1" language="en"> <!DOCTYPE TS><TS version="1.1" language="en">
<defaultcodec></defaultcodec>
<context> <context>
<name>AboutQET</name> <name>AboutQET</name>
<message> <message>
@ -226,115 +227,120 @@
<context> <context>
<name>DiagramView</name> <name>DiagramView</name>
<message> <message>
<location filename="../diagramview.cpp" line="366"/> <location filename="../diagramview.cpp" line="364"/>
<source> ?</source> <source> ?</source>
<translation> ?</translation> <translation> ?</translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="559"/> <location filename="../diagramview.cpp" line="557"/>
<source>Auteur : </source> <source>Auteur : </source>
<translation>Author : </translation> <translation>Author : </translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="561"/> <location filename="../diagramview.cpp" line="559"/>
<source>Date : </source> <source>Date : </source>
<translation>Date : </translation> <translation>Date : </translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="365"/> <location filename="../diagramview.cpp" line="363"/>
<source>Enregistrer le sch&#xe9;ma en cours ?</source> <source>Enregistrer le sch&#xe9;ma en cours ?</source>
<translation>Save the current diagram ?</translation> <translation>Save the current diagram ?</translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="405"/> <location filename="../diagramview.cpp" line="403"/>
<source>Enregistrer sous</source> <source>Enregistrer sous</source>
<translation>Save as</translation> <translation>Save as</translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="451"/> <location filename="../diagramview.cpp" line="449"/>
<source>Erreur</source> <source>Erreur</source>
<translation>Error</translation> <translation>Error</translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="563"/> <location filename="../diagramview.cpp" line="561"/>
<source>Fichier : </source> <source>Fichier : </source>
<translation>File : </translation> <translation>File : </translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="565"/> <location filename="../diagramview.cpp" line="563"/>
<source>Folio : </source> <source>Folio : </source>
<translation>Folio : </translation> <translation>Folio : </translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="451"/> <location filename="../diagramview.cpp" line="449"/>
<source>Impossible d&apos;ecrire dans ce fichier</source> <source>Impossible d&apos;ecrire dans ce fichier</source>
<translation>Can&apos;t write to the file</translation> <translation>Can&apos;t write to the file</translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="408"/> <location filename="../diagramview.cpp" line="406"/>
<source>Sch&#xe9;ma QElectroTech (*.qet)</source> <source>Sch&#xe9;ma QElectroTech (*.qet)</source>
<translation>QElectroTech Diagram (*.qet)</translation> <translation>QElectroTech Diagram (*.qet)</translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="557"/> <location filename="../diagramview.cpp" line="555"/>
<source>Titre : </source> <source>Titre : </source>
<translation>Title :</translation> <translation>Title :</translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="366"/> <location filename="../diagramview.cpp" line="364"/>
<source>Voulez-vous enregistrer le sch&#xe9;ma </source> <source>Voulez-vous enregistrer le sch&#xe9;ma </source>
<translation>Do you wish to save the diagram </translation> <translation>Do you wish to save the diagram </translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="677"/> <location filename="../diagramview.cpp" line="675"/>
<source>nouveau sch&#xe9;ma</source> <source>nouveau sch&#xe9;ma</source>
<translation>new diagram</translation> <translation>new diagram</translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="727"/> <location filename="../diagramview.cpp" line="725"/>
<source>&#xc9;diter les propri&#xe9;t&#xe9;s d&apos;un conducteur</source> <source>&#xc9;diter les propri&#xe9;t&#xe9;s d&apos;un conducteur</source>
<translation>Edit conductor properties</translation> <translation>Edit conductor properties</translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="514"/> <location filename="../diagramview.cpp" line="512"/>
<source>Propri&#xe9;t&#xe9;s du sch&#xe9;ma</source> <source>Propri&#xe9;t&#xe9;s du sch&#xe9;ma</source>
<translation>Diagram properties</translation> <translation>Diagram properties</translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="516"/> <location filename="../diagramview.cpp" line="514"/>
<source>Dimensions du sch&#xe9;ma</source> <source>Dimensions du sch&#xe9;ma</source>
<translation>Diagram size</translation> <translation>Diagram size</translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="519"/> <location filename="../diagramview.cpp" line="517"/>
<source>Colonnes :</source> <source>Colonnes :</source>
<translation>Columns :</translation> <translation>Columns :</translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="529"/> <location filename="../diagramview.cpp" line="527"/>
<source>&#xd7;</source> <source>&#xd7;</source>
<translation>×</translation> <translation>×</translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="530"/> <location filename="../diagramview.cpp" line="528"/>
<source>px</source> <source>px</source>
<translation>px</translation> <translation>px</translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="532"/> <location filename="../diagramview.cpp" line="530"/>
<source>Hauteur :</source> <source>Hauteur :</source>
<translation>Height :</translation> <translation>Height :</translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="545"/> <location filename="../diagramview.cpp" line="543"/>
<source>Informations du cartouche</source> <source>Informations du cartouche</source>
<translation>Inset properties</translation> <translation>Inset properties</translation>
</message> </message>
<message> <message>
<location filename="../diagramview.cpp" line="785"/> <location filename="../diagramview.cpp" line="783"/>
<source>&#xc9;diter les propri&#xe9;t&#xe9;s par d&#xe9;faut des conducteurs</source> <source>&#xc9;diter les propri&#xe9;t&#xe9;s par d&#xe9;faut des conducteurs</source>
<translation>Edit conductors default properties</translation> <translation>Edit conductors default properties</translation>
</message> </message>
<message>
<location filename="../diagramview.cpp" line="35"/>
<source>Coller ici</source>
<translation>Paste Here</translation>
</message>
</context> </context>
<context> <context>
<name>ElementDeleter</name> <name>ElementDeleter</name>
@ -557,22 +563,22 @@ Please check rights of the directory </translation>
<context> <context>
<name>ElementsPanel</name> <name>ElementsPanel</name>
<message> <message>
<location filename="../elementspanel.cpp" line="158"/> <location filename="../elementspanel.cpp" line="161"/>
<source>Ceci est un &#xe9;l&#xe9;ment que vous pouvez ins&#xe9;rer dans votre sch&#xe9;ma par cliquer-d&#xe9;placer</source> <source>Ceci est un &#xe9;l&#xe9;ment que vous pouvez ins&#xe9;rer dans votre sch&#xe9;ma par cliquer-d&#xe9;placer</source>
<translation>This is an element you can drag&apos;n drop onto your diagram</translation> <translation>This is an element you can drag&apos;n drop onto your diagram</translation>
</message> </message>
<message> <message>
<location filename="../elementspanel.cpp" line="159"/> <location filename="../elementspanel.cpp" line="162"/>
<source>Cliquer-d&#xe9;posez cet &#xe9;l&#xe9;ment sur le sch&#xe9;ma pour ins&#xe9;rer un &#xe9;l&#xe9;ment </source> <source>Cliquer-d&#xe9;posez cet &#xe9;l&#xe9;ment sur le sch&#xe9;ma pour ins&#xe9;rer un &#xe9;l&#xe9;ment </source>
<translation>Drag&apos;n drop this element to the diagram to insert a </translation> <translation>Drag&apos;n drop this element to the diagram to insert a </translation>
</message> </message>
<message> <message>
<location filename="../elementspanel.cpp" line="186"/> <location filename="../elementspanel.cpp" line="189"/>
<source>Collection QET</source> <source>Collection QET</source>
<translation>QET Collection</translation> <translation>QET Collection</translation>
</message> </message>
<message> <message>
<location filename="../elementspanel.cpp" line="189"/> <location filename="../elementspanel.cpp" line="192"/>
<source>Collection utilisateur</source> <source>Collection utilisateur</source>
<translation>User Collection</translation> <translation>User Collection</translation>
</message> </message>
@ -615,12 +621,12 @@ Please check rights of the directory </translation>
<translation>Delete element</translation> <translation>Delete element</translation>
</message> </message>
<message> <message>
<location filename="../elementspanelwidget.cpp" line="74"/> <location filename="../elementspanelwidget.cpp" line="77"/>
<source>Gestionnaire de cat&#xe9;gories</source> <source>Gestionnaire de cat&#xe9;gories</source>
<translation>Categories manager</translation> <translation>Categories manager</translation>
</message> </message>
<message> <message>
<location filename="../elementspanelwidget.cpp" line="77"/> <location filename="../elementspanelwidget.cpp" line="80"/>
<source>Vous pouvez utiliser ce gestionnaire pour ajouter, supprimer ou modifier les cat&#xe9;gories.</source> <source>Vous pouvez utiliser ce gestionnaire pour ajouter, supprimer ou modifier les cat&#xe9;gories.</source>
<translation>Use this manager to add, delete or modify categories.</translation> <translation>Use this manager to add, delete or modify categories.</translation>
</message> </message>
@ -1147,22 +1153,22 @@ Please check rights of the directory </translation>
<translation>Restore QElectroTech</translation> <translation>Restore QElectroTech</translation>
</message> </message>
<message> <message>
<location filename="../qetapp.cpp" line="436"/> <location filename="../qetapp.cpp" line="441"/>
<source>&#xc9;diteurs de sch&#xe9;mas</source> <source>&#xc9;diteurs de sch&#xe9;mas</source>
<translation>Diagram editors</translation> <translation>Diagram editors</translation>
</message> </message>
<message> <message>
<location filename="../qetapp.cpp" line="452"/> <location filename="../qetapp.cpp" line="457"/>
<source>&#xc9;diteurs d&apos;&#xe9;l&#xe9;ment</source> <source>&#xc9;diteurs d&apos;&#xe9;l&#xe9;ment</source>
<translation>Element editors</translation> <translation>Element editors</translation>
</message> </message>
<message> <message>
<location filename="../qetapp.cpp" line="526"/> <location filename="../qetapp.cpp" line="531"/>
<source>Usage : </source> <source>Usage : </source>
<translation>Usage: </translation> <translation>Usage: </translation>
</message> </message>
<message> <message>
<location filename="../qetapp.cpp" line="532"/> <location filename="../qetapp.cpp" line="537"/>
<source>QElectroTech, une application de r&#xe9;alisation de sch&#xe9;mas &#xe9;lectriques. <source>QElectroTech, une application de r&#xe9;alisation de sch&#xe9;mas &#xe9;lectriques.
Options disponibles : Options disponibles :
@ -1179,7 +1185,7 @@ Available options:
</translation> </translation>
</message> </message>
<message> <message>
<location filename="../qetapp.cpp" line="527"/> <location filename="../qetapp.cpp" line="532"/>
<source> [options] [fichier]... <source> [options] [fichier]...
</source> </source>
@ -1188,7 +1194,7 @@ Available options:
</translation> </translation>
</message> </message>
<message> <message>
<location filename="../qetapp.cpp" line="535"/> <location filename="../qetapp.cpp" line="540"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d&apos;elements <source> --common-elements-dir=DIR Definir le dossier de la collection d&apos;elements
</source> </source>
<translation> --common-elements-dir=DIR Define the elements collection directory <translation> --common-elements-dir=DIR Define the elements collection directory
@ -1198,7 +1204,7 @@ Available options:
<context> <context>
<name>QETDiagramEditor</name> <name>QETDiagramEditor</name>
<message> <message>
<location filename="../qetdiagrameditor.cpp" line="848"/> <location filename="../qetdiagrameditor.cpp" line="846"/>
<source>Active la fen&#xea;tre </source> <source>Active la fen&#xea;tre </source>
<translation>Activates the window </translation> <translation>Activates the window </translation>
</message> </message>
@ -1233,7 +1239,7 @@ Available options:
<translation>Displays informations about QElectroTech</translation> <translation>Displays informations about QElectroTech</translation>
</message> </message>
<message> <message>
<location filename="../qetdiagrameditor.cpp" line="407"/> <location filename="../qetdiagrameditor.cpp" line="408"/>
<source>Affiche ou non le panel d&apos;appareils</source> <source>Affiche ou non le panel d&apos;appareils</source>
<translation>Displays or not the elements panel</translation> <translation>Displays or not the elements panel</translation>
</message> </message>
@ -1313,12 +1319,12 @@ Available options:
<translation>&amp;Cascade</translation> <translation>&amp;Cascade</translation>
</message> </message>
<message> <message>
<location filename="../qetdiagrameditor.cpp" line="563"/> <location filename="../qetdiagrameditor.cpp" line="564"/>
<source>Ce fichier n&apos;est pas un document XML valide.</source> <source>Ce fichier n&apos;est pas un document XML valide.</source>
<translation>This file is not a valid XML Document.</translation> <translation>This file is not a valid XML Document.</translation>
</message> </message>
<message> <message>
<location filename="../qetdiagrameditor.cpp" line="561"/> <location filename="../qetdiagrameditor.cpp" line="562"/>
<source>Ce fichier n&apos;existe pas.</source> <source>Ce fichier n&apos;existe pas.</source>
<translation>This file does not exist.</translation> <translation>This file does not exist.</translation>
</message> </message>
@ -1473,7 +1479,7 @@ Available options:
<translation>Save as</translation> <translation>Save as</translation>
</message> </message>
<message> <message>
<location filename="../qetdiagrameditor.cpp" line="566"/> <location filename="../qetdiagrameditor.cpp" line="567"/>
<source>Erreur</source> <source>Erreur</source>
<translation>Error</translation> <translation>Error</translation>
</message> </message>
@ -1533,7 +1539,7 @@ Available options:
<translation>Imports a plan into the current plan</translation> <translation>Imports a plan into the current plan</translation>
</message> </message>
<message> <message>
<location filename="../qetdiagrameditor.cpp" line="562"/> <location filename="../qetdiagrameditor.cpp" line="563"/>
<source>Impossible de lire ce fichier.</source> <source>Impossible de lire ce fichier.</source>
<translation>Could not read file.</translation> <translation>Could not read file.</translation>
</message> </message>
@ -1573,7 +1579,7 @@ Available options:
<translation>&amp;New</translation> <translation>&amp;New</translation>
</message> </message>
<message> <message>
<location filename="../qetdiagrameditor.cpp" line="435"/> <location filename="../qetdiagrameditor.cpp" line="436"/>
<source>Outils</source> <source>Outils</source>
<translation>Tools</translation> <translation>Tools</translation>
</message> </message>
@ -1588,7 +1594,7 @@ Available options:
<translation>&amp;Open</translation> <translation>&amp;Open</translation>
</message> </message>
<message> <message>
<location filename="../qetdiagrameditor.cpp" line="535"/> <location filename="../qetdiagrameditor.cpp" line="536"/>
<source>Ouvrir un fichier</source> <source>Ouvrir un fichier</source>
<translation>Open a file</translation> <translation>Open a file</translation>
</message> </message>
@ -1673,7 +1679,7 @@ Available options:
<translation>Shrink the diagram&apos;s height</translation> <translation>Shrink the diagram&apos;s height</translation>
</message> </message>
<message> <message>
<location filename="../qetdiagrameditor.cpp" line="538"/> <location filename="../qetdiagrameditor.cpp" line="539"/>
<source>Sch&#xe9;mas QElectroTech (*.qet);;Fichiers XML (*.xml);;Tous les fichiers (*)</source> <source>Sch&#xe9;mas QElectroTech (*.qet);;Fichiers XML (*.xml);;Tous les fichiers (*)</source>
<translation>QElectroTech Diagrams (*.qet);;XML Files (*.xml);;All files (*)</translation> <translation>QElectroTech Diagrams (*.qet);;XML Files (*.xml);;All files (*)</translation>
</message> </message>
@ -1703,7 +1709,7 @@ Available options:
<translation>Puts selected elements into the clipboard</translation> <translation>Puts selected elements into the clipboard</translation>
</message> </message>
<message> <message>
<location filename="../qetdiagrameditor.cpp" line="564"/> <location filename="../qetdiagrameditor.cpp" line="565"/>
<source>Une erreur s&apos;est produite lors de l&apos;ouverture du fichier.</source> <source>Une erreur s&apos;est produite lors de l&apos;ouverture du fichier.</source>
<translation>An error occured while opening the file.</translation> <translation>An error occured while opening the file.</translation>
</message> </message>
@ -1778,27 +1784,27 @@ Available options:
<translation>Reset the conductors path ignoring the user changes</translation> <translation>Reset the conductors path ignoring the user changes</translation>
</message> </message>
<message> <message>
<location filename="../qetdiagrameditor.cpp" line="401"/> <location filename="../qetdiagrameditor.cpp" line="402"/>
<source>Affiche ou non la barre d&apos;outils principale</source> <source>Affiche ou non la barre d&apos;outils principale</source>
<translation>Display or hide the main toolbar</translation> <translation>Display or hide the main toolbar</translation>
</message> </message>
<message> <message>
<location filename="../qetdiagrameditor.cpp" line="403"/> <location filename="../qetdiagrameditor.cpp" line="404"/>
<source>Affiche ou non la barre d&apos;outils Affichage</source> <source>Affiche ou non la barre d&apos;outils Affichage</source>
<translation>Display or hide the Display toolbar</translation> <translation>Display or hide the Display toolbar</translation>
</message> </message>
<message> <message>
<location filename="../qetdiagrameditor.cpp" line="405"/> <location filename="../qetdiagrameditor.cpp" line="406"/>
<source>Affiche ou non la barre d&apos;outils Sch&#xe9;ma</source> <source>Affiche ou non la barre d&apos;outils Sch&#xe9;ma</source>
<translation>Display or hide the Diagram toolbar</translation> <translation>Display or hide the Diagram toolbar</translation>
</message> </message>
<message> <message>
<location filename="../qetdiagrameditor.cpp" line="438"/> <location filename="../qetdiagrameditor.cpp" line="439"/>
<source>Affichage</source> <source>Affichage</source>
<translation>Display</translation> <translation>Display</translation>
</message> </message>
<message> <message>
<location filename="../qetdiagrameditor.cpp" line="441"/> <location filename="../qetdiagrameditor.cpp" line="442"/>
<source>Sch&#xe9;ma</source> <source>Sch&#xe9;ma</source>
<translation>Diagram</translation> <translation>Diagram</translation>
</message> </message>
@ -2219,17 +2225,17 @@ Available options:
<translation>terminal</translation> <translation>terminal</translation>
</message> </message>
<message> <message>
<location filename="../editor/parttext.cpp" line="9"/> <location filename="../editor/parttext.cpp" line="10"/>
<source>T</source> <source>T</source>
<translation>T</translation> <translation>T</translation>
</message> </message>
<message> <message>
<location filename="../editor/parttext.cpp" line="11"/> <location filename="../editor/parttext.cpp" line="12"/>
<source>texte</source> <source>texte</source>
<translation>text</translation> <translation>text</translation>
</message> </message>
<message> <message>
<location filename="../editor/parttextfield.cpp" line="11"/> <location filename="../editor/parttextfield.cpp" line="12"/>
<source>_</source> <source>_</source>
<translation>_</translation> <translation>_</translation>
</message> </message>

9
qetdiagrameditor.cpp
View File

@ -777,13 +777,8 @@ void QETDiagramEditor::slot_updateModeActions() {
Gere les actions ayant besoin du presse-papier Gere les actions ayant besoin du presse-papier
*/ */
void QETDiagramEditor::slot_updatePasteAction() { void QETDiagramEditor::slot_updatePasteAction() {
if (!currentDiagram()) { // pour coller, il faut un schema ouvert et un schema dans le presse-papier
paste -> setEnabled(false); paste -> setEnabled(currentDiagram() && Diagram::clipboardMayContainDiagram());
} else {
QString clipboard_text = QApplication::clipboard() -> text();
bool can_paste = clipboard_text.startsWith("<diagram") && clipboard_text.endsWith("</diagram>\n");
paste -> setEnabled(can_paste);
}
} }
/** /**