ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

a few more visual tweaks and simplifications for audio/midi setup

Browse Source
This commit is contained in:
Paul Davis 2013-08-09 00:50:41 -04:00
parent 743bb5066e
commit f44e0f33af
6 changed files with 37 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk2_ardour/ardour3_fonts.rc.in
View File

@ -50,6 +50,11 @@ style "large_bold_text"
font_name = "bold @FONT_LARGE@"
}
style "big_text"
{
font_name = "@FONT_BIG@"
}
style "bigger_mono_text"
{
font_name = "@MONOSPACE@ @FONT_BIGGER@"

5
gtk2_ardour/ardour3_styles.rc.in
View File

@ -1011,3 +1011,8 @@ style "meter_strip_sep" = "default"
{
bg[NORMAL] = { 0.0, 0.0, 0.0 }
}
style "settings_notebook" = "big_text"
{
}

2
gtk2_ardour/ardour3_widget_list.rc
View File

@ -389,3 +389,5 @@ widget "*transport option button" style:highest "small_text"
widget "*transport active option button" style:highest "small_text"
widget "*plugin bypass button" style:highest "small_text"
widget "*punch button" style:highest "small_text"
widget "*SettingsNotebook" style:highest "settings_notebook"
widget "*SettingsNotebook*" style:highest "settings_notebook"

77
gtk2_ardour/engine_dialog.cc
View File

@ -32,6 +32,7 @@
#include "pbd/xml++.h"
#include <gtkmm/stock.h>
#include <gtkmm/notebook.h>
#include <gtkmm2ext/utils.h>
#include "ardour/audio_backend.h"
@ -64,12 +65,8 @@ EngineControl::EngineControl ()
, realtime_button (_("Realtime"))
#ifdef __APPLE___
, basic_packer (6, 2)
, options_packer (4, 2)
, device_packer (4, 2)
#else
, basic_packer (9, 2)
, options_packer (14, 2)
, device_packer (6, 2)
#endif
{
using namespace Notebook_Helpers;
@ -111,7 +108,7 @@ EngineControl::EngineControl ()
row = 0;
label = manage (left_aligned_label (_("Audio Driver:")));
label = manage (left_aligned_label (_("Audio System:")));
basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
basic_packer.attach (backend_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
row++;
@ -121,7 +118,7 @@ EngineControl::EngineControl ()
basic_packer.attach (driver_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
row++;
label = manage (left_aligned_label (_("Audio Interface:")));
label = manage (left_aligned_label (_("Device:")));
basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
basic_packer.attach (interface_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
row++;
@ -158,61 +155,20 @@ EngineControl::EngineControl ()
interface_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::interface_changed));
/* options */
options_packer.set_spacings (6);
row = 0;
options_packer.attach (realtime_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
++row;
realtime_button.set_active (true);
label = manage (left_aligned_label (_("Number of ports:")));
options_packer.attach (ports_spinner, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
++row;
label = manage (left_aligned_label (_("MIDI driver:")));
options_packer.attach (midi_driver_combo, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
++row;
#if !defined(__APPLE__) && !defined(__FreeBSD__)
label = manage (left_aligned_label (_("Dither:")));
options_packer.attach (dither_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
++row;
#endif
/* device settings */
device_packer.set_spacings (6);
row = 0;
#if !defined(__APPLE__) && !defined(__FreeBSD__)
label = manage (left_aligned_label (_("Input device:")));
device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
device_packer.attach (input_device_combo, 1, 2, row, row+1, FILL|EXPAND, (AttachOptions) 0);
++row;
label = manage (left_aligned_label (_("Output device:")));
device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
device_packer.attach (output_device_combo, 1, 2, row, row+1, FILL|EXPAND, (AttachOptions) 0);
++row;
#endif
basic_hbox.pack_start (basic_packer, false, false);
options_hbox.pack_start (options_packer, false, false);
device_packer.set_border_width (12);
options_packer.set_border_width (12);
basic_packer.set_border_width (12);
midi_packer.set_border_width (12);
notebook.pages().push_back (TabElem (basic_hbox, _("Device")));
notebook.pages().push_back (TabElem (options_hbox, _("Options")));
notebook.pages().push_back (TabElem (device_packer, _("Advanced")));
notebook.pages().push_back (TabElem (basic_hbox, _("Audio System Settings")));
notebook.pages().push_back (TabElem (midi_hbox, _("MIDI Settings")));
notebook.set_border_width (12);
notebook.set_tab_pos (POS_RIGHT);
notebook.show_all ();
notebook.set_name ("SettingsNotebook");
set_border_width (12);
pack_start (notebook);
@ -243,10 +199,12 @@ EngineControl::backend_changed ()
if (backend->requires_driver_selection()) {
vector<string> drivers = backend->enumerate_drivers();
driver_combo.set_sensitive (true);
set_popdown_strings (driver_combo, drivers);
driver_combo.set_active_text (drivers.front());
driver_changed ();
} else {
driver_combo.set_sensitive (false);
list_devices ();
}
}
@ -277,12 +235,15 @@ EngineControl::list_devices ()
}
set_popdown_strings (interface_combo, available_devices);
interface_combo.set_active_text (available_devices.front());
set_popdown_strings (input_device_combo, available_devices);
input_device_combo.set_active_text (available_devices.front());
set_popdown_strings (output_device_combo, available_devices);
output_device_combo.set_active_text (available_devices.front());
if (!available_devices.empty()) {
interface_combo.set_active_text (available_devices.front());
input_device_combo.set_active_text (available_devices.front());
output_device_combo.set_active_text (available_devices.front());
}
interface_changed ();
}

10
gtk2_ardour/engine_dialog.h
View File

@ -26,7 +26,6 @@
#include <gtkmm/checkbutton.h>
#include <gtkmm/spinbutton.h>
#include <gtkmm/notebook.h>
#include <gtkmm/comboboxtext.h>
#include <gtkmm/table.h>
#include <gtkmm/expander.h>
@ -47,6 +46,8 @@ class EngineControl : public Gtk::VBox {
void set_state (const XMLNode&);
private:
Gtk::Notebook notebook;
/* core fields used by all backends */
Gtk::ComboBoxText backend_combo;
@ -88,12 +89,9 @@ class EngineControl : public Gtk::VBox {
Gtk::ComboBoxText midi_driver_combo;
Gtk::Table basic_packer;
Gtk::Table options_packer;
Gtk::Table device_packer;
Gtk::Table midi_packer;
Gtk::HBox basic_hbox;
Gtk::HBox options_hbox;
Gtk::HBox device_hbox;
Gtk::Notebook notebook;
Gtk::HBox midi_hbox;
sigc::connection sr_connection;

2
gtk2_ardour/wscript
View File

@ -519,6 +519,7 @@ def build(bld):
'SMALLER' : '9',
'SMALL' : '10',
'NORMAL' : '11',
'BIG' : '13',
'BIGGER' : '17',
'LARGE' : '18',
'LARGER' : '28',
@ -544,6 +545,7 @@ def build(bld):
'SMALLER' : '8',
'SMALL' : '9',
'NORMAL' : '10',
'BIG' : '14',
'BIGGER' : '17',
'LARGE' : '18',
'LARGER' : '24',