allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

nicer layout of MIDI channel selector

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13245 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Baier
2012-10-11 08:13:40 +00:00
parent 6177205398
commit 5bb898fa41
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/midi_channel_selector.h
View File

@@ -44,10 +44,11 @@ public:
protected:
virtual void button_toggled(Gtk::ToggleButton* button, uint8_t button_nr) = 0;
Gtk::Label _button_labels[4][4];
Gtk::Label _button_labels[4][4];
Gtkmm2ext::StatefulToggleButton _buttons[4][4];
int _recursion_counter;
bool was_clicked (GdkEventButton*);
int _recursion_counter;
bool was_clicked (GdkEventButton*);
};
class SingleMidiChannelSelector : public MidiChannelSelector

20
gtk2_ardour/midi_time_axis.cc
View File

@@ -201,7 +201,6 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
}
}
HBox* midi_controls_hbox = manage(new HBox());
MIDI::Name::MidiPatchManager& patch_manager = MIDI::Name::MidiPatchManager::instance();
@@ -222,14 +221,19 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
ARDOUR_UI::instance()->set_tip (_model_selector, _("External MIDI Device"));
ARDOUR_UI::instance()->set_tip (_custom_device_mode_selector, _("External Device Mode"));
midi_controls_hbox->pack_start(_channel_selector, true, false);
if (!patch_manager.all_models().empty()) {
_midi_controls_box.set_border_width (5);
_midi_controls_box.pack_start(_model_selector, true, false);
_midi_controls_box.pack_start(_custom_device_mode_selector, true, false);
}
_midi_controls_box.set_homogeneous(false);
_midi_controls_box.pack_start(*midi_controls_hbox, true, true);
if (!patch_manager.all_models().empty()) {
_midi_controls_box.resize(3, 3);
_midi_controls_box.set_border_width (5);
_midi_controls_box.attach(_channel_selector, 1, 2, 0, 1);
_midi_controls_box.attach(*(new Label(" ", false)), 0, 1, 1, 2);
_midi_controls_box.attach(*(new Label(" ", false)), 2, 3, 1, 2);
_midi_controls_box.attach(_model_selector, 1, 2, 1, 2);
_midi_controls_box.attach(_custom_device_mode_selector, 1, 2, 2, 3);
} else {
_midi_controls_box.attach(_channel_selector, 1, 2, 0, 1);
}
controls_vbox.pack_start(_midi_controls_box, false, false);

2
gtk2_ardour/midi_time_axis.h
View File

@@ -130,7 +130,7 @@ class MidiTimeAxisView : public RouteTimeAxisView
Gtk::RadioMenuItem* _meter_color_mode_item;
Gtk::RadioMenuItem* _channel_color_mode_item;
Gtk::RadioMenuItem* _track_color_mode_item;
Gtk::VBox _midi_controls_box;
Gtk::Table _midi_controls_box;
MidiMultipleChannelSelector _channel_selector;
Gtk::ComboBoxText _model_selector;
Gtk::ComboBoxText _custom_device_mode_selector;