From 651b9d6418dd8d7252b6e065a78978899b465809 Mon Sep 17 00:00:00 2001
From: bkuker <bkuker@billkuker.com>
Date: Sat, 11 Jan 2014 17:01:19 -0500
Subject: [PATCH] Rename analysis meny to tools and move photo item there

---
 core/resources/l10n/messages.properties       |  4 ++-
 .../sf/openrocket/gui/main/BasicFrame.java    | 25 +++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index e7ba5f01c..b674d3caa 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -1169,7 +1169,7 @@ main.menu.edit.editpreset= Edit Component Preset File
 main.menu.edit.preferences = Preferences
 main.menu.edit.preferences.desc = Setup the application preferences
 
-main.menu.analyze = Analyze
+main.menu.analyze = Tools
 main.menu.analyze.desc = Rocket analysis
 main.menu.analyze.componentAnalysis = Component analysis
 main.menu.analyze.componentAnalysis.desc = Analyze the rocket components separately
@@ -1177,6 +1177,8 @@ main.menu.analyze.optimization = Rocket optimization
 main.menu.analyze.optimization.desc = General rocket design optimization
 main.menu.analyze.customExpressions = Custom expressions
 main.menu.analyze.customExpressions.desc = Define new flight data types by writing custom mathematical expressions
+main.menu.analyze.photo = 3D Rendering
+main.menu.analyze.photo.desc = Create realistic 3D images of the rocket
 
 main.menu.help = Help
 main.menu.help.desc = Information about OpenRocket
diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
index eb49551be..a00303abe 100644
--- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
+++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
@@ -610,19 +610,6 @@ public class BasicFrame extends JFrame {
 		menu.add(item);
 		
 		
-		item = new JMenuItem("Photo..."); //TODO
-		item.getAccessibleContext().setAccessibleDescription("Photo Editor"); //TODO
-		item.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				log.info(Markers.USER_MARKER, "Photo... selected");
-				PhotoFrame pa = new PhotoFrame(document, BasicFrame.this);
-				pa.setVisible(true);
-			}
-		});
-		menu.add(item);
-		
-		
 		
 		//// Preferences
 		item = new JMenuItem(trans.get("main.menu.edit.preferences"));
@@ -699,6 +686,18 @@ public class BasicFrame extends JFrame {
 		});
 		menu.add(item);
 		
+		item = new JMenuItem(trans.get("main.menu.analyze.photo"), KeyEvent.VK_P);
+		item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.photo.desc"));
+		item.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				log.info(Markers.USER_MARKER, "Photo... selected");
+				PhotoFrame pa = new PhotoFrame(document, BasicFrame.this);
+				pa.setVisible(true);
+			}
+		});
+		menu.add(item);
+		
 		////  Debug
 		// (shown if openrocket.debug.menu is defined)
 		if (System.getProperty("openrocket.debug.menu") != null) {