Corrected button texts for filter-up and filter-down

diff --git a/actions.c b/actions.c
index dceff4f70aac35553968dca721cfa6e147ae9eb4..c48ebb2034951d145c7b54bc975f26ea27744078 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -90,8 +90,8 @@ ACTION_TABLE ActionTable[] = {
   {DIV_PHASE_FINE,     "DIV PHASE\nFINE",      NULL,           MIDI_KNOB | MIDI_WHEEL | CONTROLLER_ENCODER},
   {DRIVE,              "TX DRIVE",             NULL,           MIDI_KNOB | MIDI_WHEEL | CONTROLLER_ENCODER},
   {DUPLEX,             "DUPLEX",               "DUP",          MIDI_KEY | CONTROLLER_SWITCH},
-  {FILTER_MINUS,       "FILTER +",             "FL+",          MIDI_KEY | CONTROLLER_SWITCH},
-  {FILTER_PLUS,                "FILTER -",             "FL-",          MIDI_KEY | CONTROLLER_SWITCH},
+  {FILTER_MINUS,       "FILTER -",             "FL-",          MIDI_KEY | CONTROLLER_SWITCH},
+  {FILTER_PLUS,                "FILTER +",             "FL+",          MIDI_KEY | CONTROLLER_SWITCH},
   {FUNCTION,           "FUNC",                 "FUNC",         CONTROLLER_SWITCH},
   {IF_SHIFT,           "IF SHIFT",             NULL,           MIDI_KNOB | MIDI_WHEEL | CONTROLLER_ENCODER},
   {IF_SHIFT_RX1,       "IF SHIFT\nRX1",        NULL,           MIDI_KNOB | MIDI_WHEEL | CONTROLLER_ENCODER},

diff --git a/midi_menu.c b/midi_menu.c
index 45e08389272ff72d41eae426cbf1393b431c08ae..de3f8d32924233d82eee9d8021c71311cebaec69 100644 (file)
--- a/midi_menu.c
+++ b/midi_menu.c
@@ -52,14 +52,12 @@ enum {
   N_COLUMNS
 };
 
-//static GtkWidget *parent_window=NULL;
 static GtkWidget *dialog=NULL;
 
 static GtkListStore *store;
 static GtkWidget *view;
 static GtkWidget *scrolled_window=NULL;
 static gulong selection_signal_id;
-//GtkTreeSelection *selection;
 static GtkTreeModel *model;
 static GtkTreeIter iter;
 struct desc *current_cmd;
@@ -237,7 +235,7 @@ static gboolean action_cb(GtkWidget *widget,gpointer data) {
     selection=MIDI_WHEEL | MIDI_KNOB;
   }
 g_print("%s: type=%s selection=%02X thisAction=%d\n",__FUNCTION__,type,selection,thisAction);
-  int action=action_dialog(top_window,selection,thisAction);
+  int action=action_dialog(dialog,selection,thisAction);
   thisAction=action;
   gtk_button_set_label(GTK_BUTTON(newAction),ActionTable[action].str);
   return TRUE;
@@ -933,11 +931,7 @@ void midi_menu(GtkWidget *parent) {
 
   scrolled_window=gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),GTK_POLICY_AUTOMATIC,GTK_POLICY_ALWAYS);
-  //
-  // At the top of the window, there are rows of checkboxes for MIDI devices, up to 3 in a row.
-  // In the unlikely case there are very many MIDI devices, vertical space becomes scarce
-  //
-  gtk_widget_set_size_request(scrolled_window,400,300-15*((n_midi_devices+1)/3));
+  gtk_widget_set_size_request(scrolled_window,400,200);
 
   view=gtk_tree_view_new();