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
This commit is contained in:
blacksun
2013-08-25 10:38:26 +00:00
parent 0ff299b337
commit 21a8dfc640
2 changed files with 3 additions and 3 deletions

View File

@@ -1324,6 +1324,7 @@ void DiagramView::contextMenuEvent(QContextMenuEvent *e) {
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);
context_menu -> addAction(qde -> prj_diagramNum);
context_menu -> addAction(qde -> add_column); context_menu -> addAction(qde -> add_column);
context_menu -> addAction(qde -> remove_column); context_menu -> addAction(qde -> remove_column);
context_menu -> addAction(qde -> add_row); 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 -> find_element);
context_menu -> addAction(qde -> edit_element); context_menu -> addAction(qde -> edit_element);
context_menu -> addAction(qde -> selection_prop); context_menu -> addAction(qde -> selection_prop);
context_menu -> addAction(qde -> prj_diagramNum);
} }
// affiche le menu contextuel // affiche le menu contextuel

View File

@@ -1198,8 +1198,8 @@ void QETDiagramEditor::slot_updateComplexActions() {
// actions ayant aussi besoin d'items (elements, conducteurs, textes, ...) selectionnes // actions ayant aussi besoin d'items (elements, conducteurs, textes, ...) selectionnes
bool copiable_items = dv ? (dv -> hasCopiableItems()) : false; bool copiable_items = dv ? (dv -> hasCopiableItems()) : false;
bool deletable_items = dv ? (dv -> hasDeletableItems()) : false; bool deletable_items = dv ? (dv -> hasDeletableItems()) : false;
cut -> setEnabled(editable_diagram); cut -> setEnabled(editable_diagram && copiable_items);
copy -> setEnabled(editable_diagram); copy -> setEnabled(copiable_items);
delete_selection -> setEnabled(editable_diagram && deletable_items); delete_selection -> setEnabled(editable_diagram && deletable_items);
rotate_selection -> setEnabled(editable_diagram && dv -> diagram() -> canRotateSelection()); rotate_selection -> setEnabled(editable_diagram && dv -> diagram() -> canRotateSelection());
selection_prop -> setEnabled(deletable_items); selection_prop -> setEnabled(deletable_items);