From: mka <mka@opencascade.com>
Date: Thu, 18 Apr 2013 09:46:42 +0000 (+0000)
Subject: disapprove menu items are excluded from the pop-up menus
X-Git-Tag: Root_Delivery2_2013_04_22~16
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=875ca58ed2a6ea7b96ea6f805010761f341f87a9;p=tools%2Fsiman.git

disapprove menu items are excluded from the pop-up menus
---

diff --git a/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java b/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java
index b177211..20260a2 100644
--- a/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java
+++ b/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java
@@ -721,9 +721,9 @@ public class ApplicationSettings {
 					IMG_PROMOTE).action(ACT_PROMOTE_STUDY)
 					.confirmation("message.promote.study"));
 			// Refuse
-			addItem(MNU_DEMOTE, new PopupItem("menu.disapprove").icon(
+			addItem(MNU_DEMOTE, new PopupItem("menu.demote").icon(
 					IMG_DEMOTE).action("edit-study?action=demote")
-					.confirmation("message.disapprove.study"));
+					.confirmation("message.demote.study"));
 			addItem("approve", new PopupItem("menu.approve").icon(
 					"icon.APPROVED.png").action(ACT_PROMOTE_STUDY)
 					.confirmation("message.approve.study"));
@@ -923,9 +923,9 @@ public class ApplicationSettings {
 					"image.invalidate.png").action(
 					"setDocument?action=invalidate").confirmation(
 					"message.demote.document"));
-			addItem(MNU_DEMOTE, new PopupItem("menu.disapprove").icon(
-					IMG_DEMOTE).action("setDocument?action=disapprove")
-					.confirmation("message.disapprove.document"));
+			addItem(MNU_DEMOTE, new PopupItem("menu.demote").icon(
+					IMG_DEMOTE).action("setDocument?action=demote")
+					.confirmation("message.demote.document"));
 			addItem("approve", new PopupItem("menu.approve").icon(
 					"icon.APPROVED.png").action("setDocument?action=approve")
 					.confirmation("message.approve.document"));