ardour/livetrax
13
0
Fork 0
Code

Lua Dialog refinements:

Browse Source 
* Add Heading Widget
* Swap OK/Cancel Buttons
* Update table layout (spacing + alignment)
* Some whitespace tweaks
This commit is contained in:
Robin Gareus 2017-04-25 16:45:18 +02:00
parent 441cc5b485
commit 35aa4f692a
2 changed files with 60 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
gtk2_ardour/luadialog.cc
View File

@ -103,6 +103,26 @@ Message::to_gtk_mt (MessageType mt)
* Lua Dialog Widgets * Lua Dialog Widgets
*/ */
class LuaDialogLabel : public LuaDialogWidget
{
public:
LuaDialogLabel (std::string const& title, Gtk::AlignmentEnum xalign)
: LuaDialogWidget ("", "")
, _lbl ("<b>" + title + "</b>", xalign, Gtk::ALIGN_CENTER, false)
{
_lbl.set_use_markup ();
}
Gtk::Widget* widget ()
{
return &_lbl;
}
void assign (luabridge::LuaRef* rv) const { }
protected:
Gtk::Label _lbl;
};
class LuaDialogCheckbox : public LuaDialogWidget class LuaDialogCheckbox : public LuaDialogWidget
{ {
public: public:
@ -155,9 +175,9 @@ class LuaDialogFader : public LuaDialogWidget
public: public:
LuaDialogFader (std::string const& key, std::string const& title, double dflt) LuaDialogFader (std::string const& key, std::string const& title, double dflt)
: LuaDialogWidget (key, title) : LuaDialogWidget (key, title)
, _db_adjustment (ARDOUR::gain_to_slider_position_with_max (1.0, ARDOUR::Config->get_max_gain()), 0, 1, 0.01, 0.1) , _db_adjustment (ARDOUR::gain_to_slider_position_with_max (1.0, ARDOUR::Config->get_max_gain ()), 0, 1, 0.01, 0.1)
{ {
_db_slider = Gtk::manage (new Gtkmm2ext::HSliderController (&_db_adjustment, boost::shared_ptr<PBD::Controllable>(), 220, 18)); _db_slider = Gtk::manage (new Gtkmm2ext::HSliderController (&_db_adjustment, boost::shared_ptr<PBD::Controllable> (), 220, 18));
_fader_centering_box.pack_start (*_db_slider, true, false); _fader_centering_box.pack_start (*_db_slider, true, false);
@ -169,9 +189,9 @@ public:
Gtkmm2ext::set_size_request_to_display_given_text (_db_display, "-99.00", 12, 0); Gtkmm2ext::set_size_request_to_display_given_text (_db_display, "-99.00", 12, 0);
_db_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &LuaDialogFader::db_changed)); _db_adjustment.signal_value_changed ().connect (sigc::mem_fun (*this, &LuaDialogFader::db_changed));
_db_display.signal_activate().connect (sigc::mem_fun (*this, &LuaDialogFader::on_activate)); _db_display.signal_activate ().connect (sigc::mem_fun (*this, &LuaDialogFader::on_activate));
_db_display.signal_key_press_event().connect (sigc::mem_fun (*this, &LuaDialogFader::on_key_press), false); _db_display.signal_key_press_event ().connect (sigc::mem_fun (*this, &LuaDialogFader::on_key_press), false);
double coeff_val = dB_to_coefficient (dflt); double coeff_val = dB_to_coefficient (dflt);
_db_adjustment.set_value (ARDOUR::gain_to_slider_position_with_max (coeff_val, ARDOUR::Config->get_max_gain ())); _db_adjustment.set_value (ARDOUR::gain_to_slider_position_with_max (coeff_val, ARDOUR::Config->get_max_gain ()));
@ -185,14 +205,14 @@ public:
void assign (luabridge::LuaRef* rv) const void assign (luabridge::LuaRef* rv) const
{ {
double const val = ARDOUR::slider_position_to_gain_with_max (_db_adjustment.get_value (), ARDOUR::Config->get_max_gain()); double const val = ARDOUR::slider_position_to_gain_with_max (_db_adjustment.get_value (), ARDOUR::Config->get_max_gain ());
(*rv)[_key] = accurate_coefficient_to_dB (val); (*rv)[_key] = accurate_coefficient_to_dB (val);
} }
protected: protected:
void db_changed () void db_changed ()
{ {
double const val = ARDOUR::slider_position_to_gain_with_max (_db_adjustment.get_value (), ARDOUR::Config->get_max_gain()); double const val = ARDOUR::slider_position_to_gain_with_max (_db_adjustment.get_value (), ARDOUR::Config->get_max_gain ());
char buf[16]; char buf[16];
if (val == 0.0) { if (val == 0.0) {
snprintf (buf, sizeof (buf), "-inf"); snprintf (buf, sizeof (buf), "-inf");
@ -270,7 +290,7 @@ public:
, _adj (dflt, lower, upper, step, step, 0) , _adj (dflt, lower, upper, step, step, 0)
, _spin (_adj) , _spin (_adj)
{ {
_spin.set_digits(digits); _spin.set_digits (digits);
} }
Gtk::Widget* widget () Gtk::Widget* widget ()
@ -356,7 +376,7 @@ public:
: LuaDialogWidget (key, title) : LuaDialogWidget (key, title)
, _rv (0) , _rv (0)
{ {
populate (_dd.items(), values, dflt); populate (_dd.items (), values, dflt);
} }
~LuaDialogDropDown () ~LuaDialogDropDown ()
@ -391,13 +411,13 @@ protected:
if (i.value ().isTable ()) { if (i.value ().isTable ()) {
Gtk::Menu* menu = Gtk::manage (new Gtk::Menu); Gtk::Menu* menu = Gtk::manage (new Gtk::Menu);
items.push_back (MenuElem (key, *menu)); items.push_back (MenuElem (key, *menu));
populate (menu->items(), i.value (), dflt); populate (menu->items (), i.value (), dflt);
continue; continue;
} }
luabridge::LuaRef* ref = new luabridge::LuaRef (i.value ()); luabridge::LuaRef* ref = new luabridge::LuaRef (i.value ());
_refs.push_back (ref); _refs.push_back (ref);
items.push_back (MenuElem (i.key ().cast<std::string> (), items.push_back (MenuElem (i.key ().cast<std::string> (),
sigc::bind (sigc::mem_fun(*this, &LuaDialogDropDown::dd_select), key, ref))); sigc::bind (sigc::mem_fun (*this, &LuaDialogDropDown::dd_select), key, ref)));
if (!_rv || key == dflt) { if (!_rv || key == dflt) {
_rv = ref; _rv = ref;
@ -430,14 +450,29 @@ Dialog::Dialog (std::string const& title, luabridge::LuaRef lr)
for (luabridge::Iterator i (lr); !i.isNil (); ++i) { for (luabridge::Iterator i (lr); !i.isNil (); ++i) {
if (!i.key ().isNumber ()) { continue; } if (!i.key ().isNumber ()) { continue; }
if (!i.value ().isTable ()) { continue; } if (!i.value ().isTable ()) { continue; }
if (!i.value ()["key"].isString ()) { continue; }
if (!i.value ()["title"].isString ()) { continue; } if (!i.value ()["title"].isString ()) { continue; }
if (!i.value ()["type"].isString ()) { continue; } if (!i.value ()["type"].isString ()) { continue; }
std::string key = i.value ()["key"].cast<std::string> ();
std::string title = i.value ()["title"].cast<std::string> (); std::string title = i.value ()["title"].cast<std::string> ();
std::string type = i.value ()["type"].cast<std::string> (); std::string type = i.value ()["type"].cast<std::string> ();
if (type == "heading") {
Gtk::AlignmentEnum xalign = Gtk::ALIGN_CENTER;
if (i.value ()["align"].isString ()) {
std::string align = i.value ()["align"].cast <std::string> ();
if (align == "left") {
xalign = Gtk::ALIGN_LEFT;
} else if (align == "right") {
xalign = Gtk::ALIGN_RIGHT;
}
}
_widgets.push_back (new LuaDialogLabel (title, xalign));
continue;
}
if (!i.value ()["key"].isString ()) { continue; }
std::string key = i.value ()["key"].cast<std::string> ();
if (type == "checkbox") { if (type == "checkbox") {
bool dflt = false; bool dflt = false;
if (i.value ()["default"].isBoolean ()) { if (i.value ()["default"].isBoolean ()) {
@ -514,22 +549,26 @@ Dialog::Dialog (std::string const& title, luabridge::LuaRef lr)
} }
} }
_ad.add_button (Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
_ad.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); _ad.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
_ad.add_button (Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
Gtk::Table* table = Gtk::manage (new Gtk::Table()); Gtk::Table* table = Gtk::manage (new Gtk::Table ());
table->set_spacings (6); table->set_col_spacings (4);
table->set_row_spacings (8);
_ad.get_vbox ()->pack_start (*table); _ad.get_vbox ()->pack_start (*table);
int row = 0; int row = 0;
for (DialogWidgets::const_iterator i = _widgets.begin (); i != _widgets.end () ; ++i) { for (DialogWidgets::const_iterator i = _widgets.begin (); i != _widgets.end (); ++i) {
std::string const& label = (*i)->label (); std::string const& label = (*i)->label ();
if (!label.empty ()) { if (!label.empty ()) {
Gtk::Label* lbl = Gtk::manage (new Gtk::Label ("<b>" + label + ":</b>", Gtk::ALIGN_END, Gtk::ALIGN_CENTER, false)); Gtk::Label* lbl = Gtk::manage (new Gtk::Label (label + ":", Gtk::ALIGN_END, Gtk::ALIGN_CENTER, false));
lbl->set_use_markup ();
table->attach (*lbl, 0, 1, row, row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK); table->attach (*lbl, 0, 1, row, row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK);
table->attach (*((*i)->widget ()), 1, 2, row, row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK);
} else if ((*i)->key ().empty ()) {
table->attach (*((*i)->widget ()), 0, 2, row, row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK);
} else {
table->attach (*((*i)->widget ()), 1, 2, row, row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK);
} }
table->attach (*((*i)->widget ()), 1, 2, row, row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK);
++row; ++row;
} }
} }

1
gtk2_ardour/luadialog.h
View File

@ -62,6 +62,7 @@ public:
virtual Gtk::Widget* widget () = 0; virtual Gtk::Widget* widget () = 0;
virtual void assign (luabridge::LuaRef* rv) const = 0; virtual void assign (luabridge::LuaRef* rv) const = 0;
std::string const& label () const { return _label; } std::string const& label () const { return _label; }
std::string const& key () const { return _key; }
protected: protected:
std::string _key; std::string _key;