From 3201a9f6a165b54d66464512213874f1574afa43 Mon Sep 17 00:00:00 2001 From: asl Date: Tue, 24 Dec 2013 08:27:44 +0000 Subject: [PATCH] bug #278: forced update is implemented --- src/HYDROGUI/HYDROGUI_Module.cxx | 6 ++++++ src/HYDROGUI/HYDROGUI_Operations.cxx | 2 ++ src/HYDROGUI/HYDROGUI_Operations.h | 1 + src/HYDROGUI/resources/HYDROGUI_msg_en.ts | 12 ++++++++++++ 4 files changed, 21 insertions(+) diff --git a/src/HYDROGUI/HYDROGUI_Module.cxx b/src/HYDROGUI/HYDROGUI_Module.cxx index adf9b38c..039aab23 100644 --- a/src/HYDROGUI/HYDROGUI_Module.cxx +++ b/src/HYDROGUI/HYDROGUI_Module.cxx @@ -499,6 +499,12 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient, theMenu->addAction( action( UpdateObjectId ) ); theMenu->addSeparator(); } + else + { + theMenu->addAction( action( ForcedUpdateObjectId ) ); + theMenu->addSeparator(); + } + if( aSeq.Length() == 1 ) { diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx index 829ca2ad..95fb864d 100644 --- a/src/HYDROGUI/HYDROGUI_Operations.cxx +++ b/src/HYDROGUI/HYDROGUI_Operations.cxx @@ -106,6 +106,7 @@ void HYDROGUI_Module::createActions() createAction( PasteId, "PASTE", "", Qt::CTRL + Qt::Key_V ); createAction( UpdateObjectId, "UPDATE_OBJECT" ); + createAction( ForcedUpdateObjectId, "FORCED_UPDATE_OBJECT" ); createAction( ImportImageId, "IMPORT_IMAGE", "IMPORT_IMAGE_ICO", Qt::CTRL + Qt::Key_I ); createAction( EditImportedImageId, "EDIT_IMPORTED_IMAGE", "EDIT_IMPORTED_IMAGE_ICO" ); @@ -390,6 +391,7 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const anOp = new HYDROGUI_ExportImageOp( aModule ); break; case UpdateObjectId: + case ForcedUpdateObjectId: anOp = new HYDROGUI_UpdateObjectOp( aModule ); break; case RemoveImageRefsId: diff --git a/src/HYDROGUI/HYDROGUI_Operations.h b/src/HYDROGUI/HYDROGUI_Operations.h index 21771ffd..e4964dc3 100644 --- a/src/HYDROGUI/HYDROGUI_Operations.h +++ b/src/HYDROGUI/HYDROGUI_Operations.h @@ -37,6 +37,7 @@ enum OperationId PasteId, UpdateObjectId, + ForcedUpdateObjectId, ImportImageId, EditImportedImageId, diff --git a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts index 6b4abbd9..f16d2ae8 100644 --- a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts +++ b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts @@ -737,6 +737,10 @@ Would you like to remove all references from the image? DSK_UPDATE_OBJECT Update + + DSK_FORCED_UPDATE_OBJECT + Forced update + DSK_IMPORT_OBSTACLE_FROM_FILE Import obstacle from file @@ -965,6 +969,10 @@ Would you like to remove all references from the image? MEN_UPDATE_OBJECT Update + + MEN_FORCED_UPDATE_OBJECT + Forced update + MEN_IMPORT_OBSTACLE_FROM_FILE Import obstacle @@ -1169,6 +1177,10 @@ Would you like to remove all references from the image? STB_UPDATE_OBJECT Update + + STB_FORCED_UPDATE_OBJECT + Forced update + STB_IMPORT_OBSTACLE_FROM_FILE Import obstacle from file -- 2.39.2