From 0c9fd363ca162b32d682dea28a9f780c35abd0ec Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 1 Dec 2015 10:31:29 -0500 Subject: [PATCH] faderport: GUI tweaks --- libs/surfaces/faderport/gui.cc | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/libs/surfaces/faderport/gui.cc b/libs/surfaces/faderport/gui.cc index 593b3554e3..accf30e2ad 100644 --- a/libs/surfaces/faderport/gui.cc +++ b/libs/surfaces/faderport/gui.cc @@ -110,13 +110,15 @@ FPGUI::FPGUI (FaderPort& p) input_combo.signal_changed().connect (sigc::bind (sigc::mem_fun (*this, &FPGUI::active_port_changed), &input_combo, true)); output_combo.signal_changed().connect (sigc::bind (sigc::mem_fun (*this, &FPGUI::active_port_changed), &output_combo, false)); - l = manage (new Gtk::Label (_("Sends MIDI to:"))); + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Incoming MIDI on:"))); l->set_alignment (1.0, 0.5); table.attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0)); table.attach (input_combo, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 0); row++; - l = manage (new Gtk::Label (_("Receives MIDI from:"))); + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Outgoing MIDI on:"))); l->set_alignment (1.0, 0.5); table.attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0)); table.attach (output_combo, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 0); @@ -141,22 +143,22 @@ FPGUI::FPGUI (FaderPort& p) int action_row = 0; - - l = manage (new Gtk::Label (_("Button"))); - l->set_alignment (1.0, 0.5); - action_table.attach (*l, 0, 1, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); - l = manage (new Gtk::Label (_("Normal Press/Release Action"))); + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Press Action"))); l->set_alignment (0.5, 0.5); action_table.attach (*l, 1, 2, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); - l = manage (new Gtk::Label (_("Shift-Press Action"))); + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Shift-Press Action"))); l->set_alignment (0.5, 0.5); action_table.attach (*l, 2, 3, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); - l = manage (new Gtk::Label (_("Long Press Action"))); + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Long Press Action"))); l->set_alignment (0.5, 0.5); action_table.attach (*l, 3, 4, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); action_row++; - l = manage (new Gtk::Label (_("Mix"))); + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Mix"))); l->set_alignment (1.0, 0.5); action_table.attach (*l, 0, 1, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); align = manage (new Alignment); @@ -173,7 +175,8 @@ FPGUI::FPGUI (FaderPort& p) action_table.attach (*align, 3, 4, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); action_row++; - l = manage (new Gtk::Label (_("Proj"))); + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Proj"))); l->set_alignment (1.0, 0.5); action_table.attach (*l, 0, 1, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); align = manage (new Alignment); @@ -190,7 +193,8 @@ FPGUI::FPGUI (FaderPort& p) action_table.attach (*align, 3, 4, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); action_row++; - l = manage (new Gtk::Label (_("Trns"))); + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Trns"))); l->set_alignment (1.0, 0.5); action_table.attach (*l, 0, 1, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); align = manage (new Alignment); @@ -422,7 +426,7 @@ FPGUI::build_action_combo (Gtk::ComboBox& cb, vector > const Glib::RefPtr model (Gtk::ListStore::create (action_columns)); TreeIter rowp; TreeModel::Row row; - string current_action = fp.get_action (id, true, bs); + string current_action = fp.get_action (id, false, bs); /* lookup release action */ int active_row = -1; int n; vector >::const_iterator i;