From f2d507fbd52a522c5d645045fb85ec74049204bb Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Thu, 21 Sep 2000 20:09:12 +0000
Subject: [PATCH] Tweaks for new panel invocation.
---
src/Main/keyboard.cxx | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/Main/keyboard.cxx b/src/Main/keyboard.cxx
index 2f5685381..e50eb6100 100644
--- a/src/Main/keyboard.cxx
+++ b/src/Main/keyboard.cxx
@@ -445,29 +445,20 @@ void GLUTspecialkey(int k, int x, int y) {
return;
}
case GLUT_KEY_F3: {
- ifstream input("panel.xml");
- if (!input.good()) {
- FG_LOG(FG_INPUT, FG_ALERT,
- "Cannot read panel configuration from panel.xml");
- return;
- }
- FGPanel * new_panel = fgReadPanel(input);
+ string panel_path =
+ current_properties.getStringValue("/sim/panel",
+ "Panels/Default/default.xml");
+ FGPanel * new_panel = fgReadPanel(panel_path);
if (new_panel == 0) {
FG_LOG(FG_INPUT, FG_ALERT,
- "Error reading new panel from panel.xml");
+ "Error reading new panel from " << panel_path);
return;
}
- FG_LOG(FG_INPUT, FG_INFO, "Loaded new panel from panel.xml");
+ FG_LOG(FG_INPUT, FG_INFO, "Loaded new panel from " << panel_path);
delete current_panel;
current_panel = new_panel;
return;
}
- case GLUT_KEY_F4: {
- delete current_panel;
- current_panel = fgCreateSmallSinglePropPanel(0, 0, 1024, 768);
- FG_LOG(FG_INPUT, FG_INFO, "Reverted to built-in panel");
- return;
- }
case GLUT_KEY_END: // numeric keypad 1
v->set_goal_view_offset( FG_PI * 0.75 );
return;