smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 21:55:43 +01:00
Code Issues Projects Releases Wiki Activity

most of the changes required to add a new master faders tabbable

Browse source 
the visibility button isn't actually working correctly
This commit is contained in:
Paul Davis 2016-01-23 16:26:41 -05:00
parent 87481a2ee1
commit 5c658db4bf
9 changed files with 98 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gtk2_ardour/ardour_ui_dependents.cc
View file

@ -36,6 +36,7 @@
#include "actions.h"
#include "ardour_ui.h"
#include "public_editor.h"
#include "master_faders.h"
#include "meterbridge.h"
#include "luawindow.h"
#include "mixer_ui.h"
@ -162,7 +163,8 @@ ARDOUR_UI::tab_window_root_drop (GtkNotebook* src,
tabbable = mixer;
} else if (w == GTK_WIDGET(rc_option_editor->contents().gobj())) {
tabbable = rc_option_editor;
} else {
} else if (w == GTK_WIDGET(masters->contents().gobj())) {
tabbable = masters;
return 0;
}
@ -264,8 +266,14 @@ ARDOUR_UI::setup_windows ()
return -1;
}
if (create_masters()) {
error << _("UI: cannot setup meterbridge") << endmsg;
return -1;
}
/* order of addition affects order seen in initial window display */
masters->add_to_notebook (_tabs, _("Masters"));
rc_option_editor->add_to_notebook (_tabs, _("Preferences"));
mixer->add_to_notebook (_tabs, _("Mixer"));
editor->add_to_notebook (_tabs, _("Editor"));
@ -381,6 +389,8 @@ ARDOUR_UI::setup_windows ()
_tabs.set_current_page (_tabs.page_num (mixer->contents()));
} else if (rc_option_editor && current_tab == "preferences") {
_tabs.set_current_page (_tabs.page_num (rc_option_editor->contents()));
} else if (masters && current_tab == "masters") {
_tabs.set_current_page (_tabs.page_num (masters->contents()));
} else if (editor) {
_tabs.set_current_page (_tabs.page_num (editor->contents()));
}