From f74687694dc95ebe7f440d2a53f86d5bf63a95a0 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 8 Nov 2012 06:32:24 +0000
Subject: [PATCH] move "save options" back in main menu

---
 Fltk/graphicWindow.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp
index 2a3f8efd7f..e80cf6824e 100644
--- a/Fltk/graphicWindow.cpp
+++ b/Fltk/graphicWindow.cpp
@@ -2058,10 +2058,8 @@ static Fl_Menu_Item bar_table[] = {
     {"&Rename...",  FL_CTRL+'r', (Fl_Callback *)file_rename_cb, 0},
     {"Save &As...", FL_CTRL+'s', (Fl_Callback *)file_save_as_cb, 0},
     {"Sa&ve Mesh",  FL_CTRL+FL_SHIFT+'s', (Fl_Callback *)mesh_save_cb, 0},
-    {"Save Options", 0, 0, 0, FL_SUBMENU | FL_MENU_DIVIDER},
-      {"For Current File", 0, (Fl_Callback *)file_options_save_cb, (void*)"file"},
-      {"As Default", 0, (Fl_Callback *)file_options_save_cb, (void*)"default"},
-      {0},
+    {"Save Model Options", 0, (Fl_Callback *)file_options_save_cb, (void*)"file"},
+    {"Save Options As Default", 0, (Fl_Callback *)file_options_save_cb, (void*)"default", FL_MENU_DIVIDER},
     {"&Quit",       FL_CTRL+'q', (Fl_Callback *)file_quit_cb, 0},
     {0},
   {"&Tools", 0, 0, 0, FL_SUBMENU},
@@ -2124,10 +2122,8 @@ static Fl_Menu_Item sysbar_table[] = {
     {"Rename...",  FL_META+'r', (Fl_Callback *)file_rename_cb, 0},
     {"Save As...", FL_META+'s', (Fl_Callback *)file_save_as_cb, 0},
     {"Save Mesh",  FL_META+FL_SHIFT+'s', (Fl_Callback *)mesh_save_cb, 0},
-    {"Save Options", 0, 0, 0, FL_SUBMENU},
-      {"For Current File", 0, (Fl_Callback *)file_options_save_cb, (void*)"file"},
-      {"As Default", 0, (Fl_Callback *)file_options_save_cb, (void*)"default"},
-      {0},
+    {"Save Model Options", 0, (Fl_Callback *)file_options_save_cb, (void*)"file"},
+    {"Save Options As Default", 0, (Fl_Callback *)file_options_save_cb, (void*)"default"},
     {0},
   {"Tools", 0, 0, 0, FL_SUBMENU},
     {"Options",         FL_META+FL_SHIFT+'n', (Fl_Callback *)options_cb, 0},
-- 
GitLab