Tweaks for new panel invocation.

diff --git a/src/Main/keyboard.cxx b/src/Main/keyboard.cxx
index 2f5685381211096208bbd76a923159c821f8f26d..e50eb6100437ef10b7354c6da5bd050f6b08ceef 100644 (file)
--- 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;