[qet] [2458] revert some change at the comit 2445 and change the autonum entry in the ContextMenuEvent

[subversion@xxxxxxxxxxxxx]

Revision: 2458
Author:   blacksun
Date:     2013-08-25 12:38:26 +0200 (Sun, 25 Aug 2013)
Log Message:
-----------
revert some change at the comit 2445 and change the autonum entry in the ContextMenuEvent

Modified Paths:
--------------
    trunk/sources/diagramview.cpp
    trunk/sources/qetdiagrameditor.cpp

Modified: trunk/sources/diagramview.cpp
===================================================================
--- trunk/sources/diagramview.cpp	2013-08-24 19:04:39 UTC (rev 2457)
+++ trunk/sources/diagramview.cpp	2013-08-25 10:38:26 UTC (rev 2458)
@@ -1324,6 +1324,7 @@
 			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 @@
 			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

Modified: trunk/sources/qetdiagrameditor.cpp
===================================================================
--- trunk/sources/qetdiagrameditor.cpp	2013-08-24 19:04:39 UTC (rev 2457)
+++ trunk/sources/qetdiagrameditor.cpp	2013-08-25 10:38:26 UTC (rev 2458)
@@ -1198,8 +1198,8 @@
 	// 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);