#862: Removes default shortcut from Fl_Shortcut_Button

- the current UI for fallback/default/original shortcut was
confusing, so I remove it until we find something better. I
kept the values so we can reinstate a better interface without
changing the API.

3 files changed, 5 insertions, 5 deletions

diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx
index 0a21ed296..c1d99257e 100644
--- a/fluid/Fl_Menu_Type.cxx
+++ b/fluid/Fl_Menu_Type.cxx
@@ -711,7 +711,7 @@ void shortcut_in_cb(Fl_Shortcut_Button* i, void* v) {
       i->parent()->hide();
       return;
     }
-    i->default_value( i->value() ); // enable the "undo" capability of the shortcut button
+    //i->default_value( i->value() ); // enable the "undo" capability of the shortcut button
     i->show();
     i->parent()->show();
     i->redraw();
diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx
index 1d92d0233..ce2a6a884 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -1041,7 +1041,7 @@ static void cb_Shortcut(Fl_Shortcut_Button* o, void* v) {
   if (v == LOAD) {
     if (selected) {
       o->value(g_shell_config->list[selected-1]->shortcut);
-      o->default_value(o->value());
+      //o->default_value(o->value());
     } else {
       o->value(0);
     }
diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index 4f6a388e2..71f8f18dc 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -156,7 +156,7 @@ Function {make_settings_window()} {open
       xywh {10 10 320 530} selection_color 12 labelsize 11 labelcolor 255 resizable
     } {
       Fl_Group {} {
-        label General open
+        label General open selected
         image {icons/general_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11 resizable
         code0 {o->image()->scale(36, 24);}
       } {
@@ -1092,7 +1092,7 @@ if (v == LOAD) {
 if (v == LOAD) {
   if (selected) {
     o->value(g_shell_config->list[selected-1]->shortcut);
-    o->default_value(o->value());
+    //o->default_value(o->value());
   } else {
     o->value(0);
   }
@@ -1574,7 +1574,7 @@ Function {make_shell_window()} {open
     label {Shell Command Output} open
     xywh {769 585 555 430} type Double align 80 resizable visible
   } {
-    Fl_Terminal shell_run_terminal {selected
+    Fl_Terminal shell_run_terminal {
       xywh {10 10 535 375} resizable
       code0 {shell_run_terminal->ansi(1);}
       code1 {shell_run_terminal->history_lines(1000);}