From 21a8dfc64017200be9ef07c4d99e724a6a074406 Mon Sep 17 00:00:00 2001 From: blacksun Date: Sun, 25 Aug 2013 10:38:26 +0000 Subject: [PATCH] revert some change at the comit 2445 and change the autonum entry in the ContextMenuEvent git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2458 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/diagramview.cpp | 2 +- sources/qetdiagrameditor.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources/diagramview.cpp b/sources/diagramview.cpp index 99b904950..e234a7eb3 100644 --- a/sources/diagramview.cpp +++ b/sources/diagramview.cpp @@ -1324,6 +1324,7 @@ void DiagramView::contextMenuEvent(QContextMenuEvent *e) { context_menu -> addAction(paste_here); context_menu -> addSeparator(); context_menu -> addAction(qde -> infos_diagram); + context_menu -> addAction(qde -> prj_diagramNum); context_menu -> addAction(qde -> add_column); context_menu -> addAction(qde -> remove_column); context_menu -> addAction(qde -> add_row); @@ -1341,7 +1342,6 @@ void DiagramView::contextMenuEvent(QContextMenuEvent *e) { context_menu -> addAction(qde -> find_element); context_menu -> addAction(qde -> edit_element); context_menu -> addAction(qde -> selection_prop); - context_menu -> addAction(qde -> prj_diagramNum); } // affiche le menu contextuel diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index 4b5b5e4f6..611c9eb87 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -1198,8 +1198,8 @@ void QETDiagramEditor::slot_updateComplexActions() { // actions ayant aussi besoin d'items (elements, conducteurs, textes, ...) selectionnes bool copiable_items = dv ? (dv -> hasCopiableItems()) : false; bool deletable_items = dv ? (dv -> hasDeletableItems()) : false; - cut -> setEnabled(editable_diagram); - copy -> setEnabled(editable_diagram); + cut -> setEnabled(editable_diagram && copiable_items); + copy -> setEnabled(copiable_items); delete_selection -> setEnabled(editable_diagram && deletable_items); rotate_selection -> setEnabled(editable_diagram && dv -> diagram() -> canRotateSelection()); selection_prop -> setEnabled(deletable_items);