smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki Activity

Change ArdourPrompter to not have an OK button by default, clean up new track/bus dialog and change 'affirmative' button on ArdourPrompter dialogs, make 'jack isn't running' dialog a MessageDialog, standardise some capitalisation, add stock buttons to plugin selector, fix layout of presets in plugin_ui. Fix 'rename range' dialog.

Browse source 
git-svn-id: svn://localhost/trunk/ardour2@458 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Nick Mainsbridge 2006-04-19 20:42:17 +00:00
parent c1be7a630a
commit 8ca561f8d3
16 changed files with 106 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

57
gtk2_ardour/add_route_dialog.cc
View file

@ -36,19 +36,19 @@ using namespace sigc;
using namespace std; using namespace std;
static const char* channel_setup_names[] = { static const char* channel_setup_names[] = {
"mono", "Mono",
"stereo", "Stereo",
"3 channels", "3 Channels",
"4 channels", "4 Channels",
"5 channels", "6 Channels",
"8 channels", "8 Channels",
"manual setup", "Manual Setup",
0 0
}; };
static const char* track_mode_names[] = { static const char* track_mode_names[] = {
"normal", "Normal",
"tape", "Tape",
0 0
}; };
@ -71,7 +71,6 @@ AddRouteDialog::AddRouteDialog ()
track_mode_strings = internationalize (track_mode_names); track_mode_strings = internationalize (track_mode_names);
} }
set_name ("AddRouteDialog"); set_name ("AddRouteDialog");
set_wmclass (X_("ardour_add_track_bus"), "Ardour"); set_wmclass (X_("ardour_add_track_bus"), "Ardour");
set_position (Gtk::WIN_POS_MOUSE); set_position (Gtk::WIN_POS_MOUSE);
@ -88,10 +87,13 @@ AddRouteDialog::AddRouteDialog ()
HBox *hbrb = manage (new HBox); HBox *hbrb = manage (new HBox);
hbrb->set_spacing (6); hbrb->set_spacing (6);
hbrb->pack_start (*(manage (new Label (_("Add")))), false, false); hbrb->pack_start (routes_spinner, true, false, 5);
hbrb->pack_start (routes_spinner, false, false); hbrb->pack_start (track_button, true, false, 5);
hbrb->pack_start (track_button, false, false); hbrb->pack_start (bus_button, true, false, 5);
hbrb->pack_start (bus_button, false, false);
aframe.set_label (_("Add"));
aframe.set_shadow_type (SHADOW_IN);
aframe.add (*hbrb);
set_popdown_strings (channel_combo, channel_combo_strings); set_popdown_strings (channel_combo, channel_combo_strings);
set_popdown_strings (track_mode_combo, track_mode_strings); set_popdown_strings (track_mode_combo, track_mode_strings);
@ -110,19 +112,28 @@ AddRouteDialog::AddRouteDialog ()
hbnt->pack_start (*(manage (new Label (_("Name (template)")))), false, false); hbnt->pack_start (*(manage (new Label (_("Name (template)")))), false, false);
hbnt->pack_start (name_template_entry, true, true); hbnt->pack_start (name_template_entry, true, true);
#endif #endif
VBox *dvbox = manage (new VBox);
HBox *dhbox = manage (new HBox);
get_vbox()->pack_start (*hbrb, false, false); ccframe.set_label (_("Channel Configuration"));
get_vbox()->pack_start (*(manage (new Label ("Channel configuration"))), false, false); ccframe.set_shadow_type (SHADOW_IN);
get_vbox()->pack_start (channel_combo, false, false);
get_vbox()->pack_start (track_mode_combo, false, false, 10); dvbox->pack_start (channel_combo, true, false, 5);
dvbox->pack_start (track_mode_combo, true, false, 5);
dhbox->pack_start (*dvbox, true, false, 5);
ccframe.add (*dhbox);
get_vbox()->pack_start (aframe, true, false, 10);
get_vbox()->pack_start (ccframe, true, false);
#if NOT_USEFUL_YET #if NOT_USEFUL_YET
get_vbox()->pack_start (*hbnt, false, false); get_vbox()->pack_start (*hbnt, false, false);
#endif #endif
get_vbox()->show_all (); get_vbox()->show_all ();
add_button (Stock::OK, RESPONSE_ACCEPT);
add_button (Stock::CANCEL, RESPONSE_CANCEL); add_button (Stock::CANCEL, RESPONSE_CANCEL);
add_button (Stock::ADD, RESPONSE_ACCEPT);
} }
AddRouteDialog::~AddRouteDialog () AddRouteDialog::~AddRouteDialog ()
@ -161,9 +172,9 @@ ARDOUR::TrackMode
AddRouteDialog::mode () AddRouteDialog::mode ()
{ {
Glib::ustring str = track_mode_combo.get_active_text(); Glib::ustring str = track_mode_combo.get_active_text();
if (str == _("normal")) { if (str == _("Normal")) {
return ARDOUR::Normal; return ARDOUR::Normal;
} else if (str == _("tape")) { } else if (str == _("Tape")) {
return ARDOUR::Destructive; return ARDOUR::Destructive;
} else { } else {
fatal << string_compose (X_("programming error: unknown track mode in add route dialog combo = %1"), str) fatal << string_compose (X_("programming error: unknown track mode in add route dialog combo = %1"), str)
@ -180,9 +191,9 @@ AddRouteDialog::channels ()
string str = channel_combo.get_active_text(); string str = channel_combo.get_active_text();
int chns; int chns;
if (str == _("mono")) { if (str == _("Mono")) {
return 1; return 1;
} else if (str == _("stereo")) { } else if (str == _("Stereo")) {
return 2; return 2;
} else if ((chns = atoi (str)) != 0) { } else if ((chns = atoi (str)) != 0) {
return chns; return chns;

3
gtk2_ardour/add_route_dialog.h
View file

@ -5,6 +5,7 @@
#include <gtkmm/entry.h> #include <gtkmm/entry.h>
#include <gtkmm/dialog.h> #include <gtkmm/dialog.h>
#include <gtkmm/frame.h>
#include <gtkmm/radiobutton.h> #include <gtkmm/radiobutton.h>
#include <gtkmm/adjustment.h> #include <gtkmm/adjustment.h>
#include <gtkmm/spinbutton.h> #include <gtkmm/spinbutton.h>
@ -33,6 +34,8 @@ class AddRouteDialog : public Gtk::Dialog
Gtk::SpinButton routes_spinner; Gtk::SpinButton routes_spinner;
Gtk::ComboBoxText channel_combo; Gtk::ComboBoxText channel_combo;
Gtk::ComboBoxText track_mode_combo; Gtk::ComboBoxText track_mode_combo;
Gtk::Frame aframe;
Gtk::Frame ccframe;
void track_type_chosen (); void track_type_chosen ();
}; };

22
gtk2_ardour/ardour_ui.cc
View file

@ -759,7 +759,7 @@ ARDOUR_UI::build_session_selector ()
session_selector_window->add_button (Stock::CANCEL, RESPONSE_CANCEL); session_selector_window->add_button (Stock::CANCEL, RESPONSE_CANCEL);
session_selector_window->add_button (Stock::OPEN, RESPONSE_ACCEPT); session_selector_window->add_button (Stock::OPEN, RESPONSE_ACCEPT);
session_selector_window->set_default_response (RESPONSE_ACCEPT);
recent_session_model = TreeStore::create (recent_session_columns); recent_session_model = TreeStore::create (recent_session_columns);
recent_session_display.set_model (recent_session_model); recent_session_display.set_model (recent_session_model);
recent_session_display.append_column (_("Recent Sessions"), recent_session_columns.visible_name); recent_session_display.append_column (_("Recent Sessions"), recent_session_columns.visible_name);
@ -1519,10 +1519,11 @@ ARDOUR_UI::snapshot_session ()
time (&n); time (&n);
now = ctime (&n); now = ctime (&n);
now = now.substr (0, now.length() - 1); now = now.substr (20, 4) + now.substr (3, 16) + " (" + now.substr (0, 3) + ")";
prompter.set_name ("Prompter"); prompter.set_name ("Prompter");
prompter.set_prompt (_("Name for snapshot")); prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
prompter.set_prompt (_("Name of New Snapshot"));
prompter.set_initial_text (now); prompter.set_initial_text (now);
switch (prompter.run()) { switch (prompter.run()) {
@ -1670,6 +1671,7 @@ ARDOUR_UI::save_template ()
prompter.set_name (X_("Prompter")); prompter.set_name (X_("Prompter"));
prompter.set_prompt (_("Name for mix template:")); prompter.set_prompt (_("Name for mix template:"));
prompter.set_initial_text(session->name() + _("-template")); prompter.set_initial_text(session->name() + _("-template"));
prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
switch (prompter.run()) { switch (prompter.run()) {
case RESPONSE_ACCEPT: case RESPONSE_ACCEPT:
@ -1965,7 +1967,7 @@ require some unused files to continue to exist."));
} }
} }
dvbox.pack_start (txt, true, false, 10); dvbox.pack_start (txt, true, false, 5);
for (vector<string>::iterator i = rep.paths.begin(); i != rep.paths.end(); ++i) { for (vector<string>::iterator i = rep.paths.begin(); i != rep.paths.end(); ++i) {
TreeModel::Row row = *(results_model->append()); TreeModel::Row row = *(results_model->append());
@ -1978,9 +1980,10 @@ require some unused files to continue to exist."));
list_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); list_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
dvbox.pack_start (list_scroller, true, false); dvbox.pack_start (list_scroller, true, false);
dhbox.pack_start (dvbox, true, false, 10); dhbox.pack_start (dvbox, true, false, 5);
results.get_vbox()->pack_start (dhbox, true, false); results.get_vbox()->pack_start (dhbox, true, false);
results.add_button (Stock::CLOSE, RESPONSE_CLOSE); results.add_button (Stock::CLOSE, RESPONSE_CLOSE);
results.set_default_response (RESPONSE_CLOSE);
results.set_position (Gtk::WIN_POS_CENTER); results.set_position (Gtk::WIN_POS_CENTER);
results.show_all_children (); results.show_all_children ();
@ -2009,6 +2012,7 @@ After cleanup, unused audio files will be moved to a \
checker.add_button (Stock::CANCEL, RESPONSE_CANCEL); checker.add_button (Stock::CANCEL, RESPONSE_CANCEL);
checker.add_button (_("Clean Up"), RESPONSE_ACCEPT); checker.add_button (_("Clean Up"), RESPONSE_ACCEPT);
checker.set_default_response (RESPONSE_CANCEL);
checker.set_name (_("CleanupDialog")); checker.set_name (_("CleanupDialog"));
checker.set_wmclass (_("ardour_cleanup"), "Ardour"); checker.set_wmclass (_("ardour_cleanup"), "Ardour");
@ -2033,9 +2037,9 @@ After cleanup, unused audio files will be moved to a \
_("cleaned files"), _("cleaned files"),
_("\ _("\
The following %1 %2 not in use and \n\ The following %1 %2 not in use and \n\
have been moved to %3. \n\ have been moved to %3. \n\n\
Flushing the wastebasket will release an additional\n\ Flushing the wastebasket will release an additional\n\
%4 %5bytes of disk space by deleting these files." %4 %5bytes of disk space.\n"
)); ));
} }
@ -2055,8 +2059,8 @@ ARDOUR_UI::flush_trash ()
display_cleanup_results (rep, display_cleanup_results (rep,
_("deleted file"), _("deleted file"),
_("The following %1 %2 \n\ _("The following %1 %2 deleted from\n\
deleted from %3, releasing \n\ %3,releasing \n\
%4 %5bytes of disk space")); %4 %5bytes of disk space"));
} }

7
gtk2_ardour/audio_time_axis.cc
View file

@ -834,6 +834,7 @@ AudioTimeAxisView::rename_current_playlist ()
prompter.set_prompt (_("Name for playlist")); prompter.set_prompt (_("Name for playlist"));
prompter.set_initial_text (pl->name()); prompter.set_initial_text (pl->name());
prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
switch (prompter.run ()) { switch (prompter.run ()) {
case Gtk::RESPONSE_ACCEPT: case Gtk::RESPONSE_ACCEPT:
@ -865,8 +866,9 @@ AudioTimeAxisView::use_copy_playlist (bool prompt)
ArdourPrompter prompter (true); ArdourPrompter prompter (true);
prompter.set_prompt (_("Name for playlist")); prompter.set_prompt (_("Name for Playlist"));
prompter.set_initial_text (name); prompter.set_initial_text (name);
prompter.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT);
prompter.show_all (); prompter.show_all ();
switch (prompter.run ()) { switch (prompter.run ()) {
@ -903,8 +905,9 @@ AudioTimeAxisView::use_new_playlist (bool prompt)
ArdourPrompter prompter (true); ArdourPrompter prompter (true);
prompter.set_prompt (_("Name for playlist")); prompter.set_prompt (_("Name for Playlist"));
prompter.set_initial_text (name); prompter.set_initial_text (name);
prompter.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT);
switch (prompter.run ()) { switch (prompter.run ()) {
case Gtk::RESPONSE_ACCEPT: case Gtk::RESPONSE_ACCEPT:

13
gtk2_ardour/editor_markers.cc
View file

@ -809,6 +809,8 @@ Editor::marker_menu_rename ()
Dialog dialog; Dialog dialog;
Entry entry; Entry entry;
HBox dhbox;
Label dlabel (_("New Name:"));
if (loc->is_mark()) { if (loc->is_mark()) {
dialog.set_title (_("ardour: rename mark")); dialog.set_title (_("ardour: rename mark"));
@ -817,13 +819,16 @@ Editor::marker_menu_rename ()
} }
dialog.set_name ("MarkRenameWindow"); dialog.set_name ("MarkRenameWindow");
dialog.set_size_request (300, -1); dialog.set_size_request (250, -1);
dialog.set_position (Gtk::WIN_POS_MOUSE); dialog.set_position (Gtk::WIN_POS_MOUSE);
dialog.set_modal (true); dialog.set_modal (true);
dhbox.pack_start (dlabel, true, false, 10);
dhbox.pack_start (entry, true, false, 10);
dialog.get_vbox()->pack_start (dhbox, true, false, 10);
dialog.add_action_widget (entry, RESPONSE_ACCEPT); dialog.add_button (Stock::CANCEL, RESPONSE_CANCEL);
dialog.add_button (Stock::OK, RESPONSE_ACCEPT); dialog.add_button (_("Rename"), RESPONSE_ACCEPT);
dialog.add_button (Stock::CANCEL, RESPONSE_ACCEPT); dialog.set_default_response (RESPONSE_ACCEPT);
entry.set_text (loc->name()); entry.set_text (loc->name());
entry.set_name ("MarkerNameDisplay"); entry.set_name ("MarkerNameDisplay");

1
gtk2_ardour/editor_mouse.cc
View file

@ -4606,6 +4606,7 @@ Editor::mouse_rename_region (ArdourCanvas::Item* item, GdkEvent* event)
prompter.set_prompt (_("Name for region:")); prompter.set_prompt (_("Name for region:"));
prompter.set_initial_text (clicked_regionview->region.name()); prompter.set_initial_text (clicked_regionview->region.name());
prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
prompter.show_all (); prompter.show_all ();
switch (prompter.run ()) { switch (prompter.run ()) {
case Gtk::RESPONSE_ACCEPT: case Gtk::RESPONSE_ACCEPT:

5
gtk2_ardour/editor_selection_list.cc
View file

@ -107,8 +107,9 @@ Editor::name_selection ()
{ {
ArdourPrompter p; ArdourPrompter p;
p.set_prompt (_("name for chunk:")); p.set_prompt (_("Name for Chunk:"));
p.change_labels (_("Create chunk"), _("Forget it")); p.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT);
p.change_labels (_("Create Chunk"), _("Forget it"));
p.show_all (); p.show_all ();
switch (p.run ()) { switch (p.run ()) {

14
gtk2_ardour/main.cc
View file

@ -270,18 +270,20 @@ show_ui_callback (void *arg)
void void
gui_jack_error () gui_jack_error ()
{ {
ArdourDialog win (_("ardour: unplugged")); MessageDialog win (_("Ardour could not connect to JACK."),
Label label (_("Ardour could not connect to JACK.\n\ false,
There are several possible reasons:\n\ Gtk::MESSAGE_INFO,
(Gtk::ButtonsType)(Gtk::BUTTONS_NONE));
win.set_secondary_text(_("There are several possible reasons:\n\
\n\ \n\
1) JACK is not running.\n\ 1) JACK is not running.\n\
2) JACK is running as another user, perhaps root.\n\ 2) JACK is running as another user, perhaps root.\n\
3) There is already another client called \"ardour\".\n\ 3) There is already another client called \"ardour\".\n\
\n\ \n\
Please consider the possibilities, and perhaps (re)start JACK.")); Please consider the possibilities, and perhaps (re)start JACK."));
win.get_vbox()->pack_start (label); win.add_button (Stock::QUIT, RESPONSE_CLOSE);
win.add_button (Stock::OK, RESPONSE_ACCEPT); win.set_default_response (RESPONSE_CLOSE);
win.show_all (); win.show_all ();
win.set_position (Gtk::WIN_POS_CENTER); win.set_position (Gtk::WIN_POS_CENTER);

3
gtk2_ardour/meter_bridge_strip.cc
View file

@ -218,8 +218,9 @@ MeterBridgeStrip::label_button_press_release (GdkEventButton *ev)
string name; string name;
ArdourPrompter prompter (true); ArdourPrompter prompter (true);
prompter.set_prompt (_("New name for meter:")); prompter.set_prompt (_("New Name for Meter:"));
prompter.set_initial_text (label.get_text()); prompter.set_initial_text (label.get_text());
prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
prompter.show_all(); prompter.show_all();
switch (prompter.run ()) { switch (prompter.run ()) {

19
gtk2_ardour/plugin_selector.cc
View file

@ -52,7 +52,7 @@ PluginSelector::PluginSelector (PluginManager *mgr)
lmodel = Gtk::ListStore::create(lcols); lmodel = Gtk::ListStore::create(lcols);
ladspa_display.set_model (lmodel); ladspa_display.set_model (lmodel);
ladspa_display.append_column (_("Available LADSPA plugins"), lcols.name); ladspa_display.append_column (_("Available LADSPA Plugins"), lcols.name);
ladspa_display.append_column (_("Type"), lcols.type); ladspa_display.append_column (_("Type"), lcols.type);
ladspa_display.append_column (_("# Inputs"),lcols.ins); ladspa_display.append_column (_("# Inputs"),lcols.ins);
ladspa_display.append_column (_("# Outputs"), lcols.outs); ladspa_display.append_column (_("# Outputs"), lcols.outs);
@ -64,7 +64,7 @@ PluginSelector::PluginSelector (PluginManager *mgr)
amodel = Gtk::ListStore::create(acols); amodel = Gtk::ListStore::create(acols);
added_list.set_model (amodel); added_list.set_model (amodel);
added_list.append_column (_("To be added"), acols.text); added_list.append_column (_("Plugins to be Applied to Channel"), acols.text);
added_list.set_headers_visible (true); added_list.set_headers_visible (true);
added_list.set_reorderable (false); added_list.set_reorderable (false);
@ -93,11 +93,11 @@ PluginSelector::PluginSelector (PluginManager *mgr)
ascroller.set_border_width(10); ascroller.set_border_width(10);
ascroller.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); ascroller.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
ascroller.add(added_list); ascroller.add(added_list);
Gtk::Button *btn_add = manage(new Gtk::Button(_("Add"))); Gtk::Button *btn_add = manage(new Gtk::Button(Stock::ADD));
ARDOUR_UI::instance()->tooltips().set_tip(*btn_add, _("Add a plugin to the effect list")); ARDOUR_UI::instance()->tooltips().set_tip(*btn_add, _("Add a plugin to the effect list"));
Gtk::Button *btn_remove = manage(new Gtk::Button(_("Remove"))); Gtk::Button *btn_remove = manage(new Gtk::Button(Stock::REMOVE));
ARDOUR_UI::instance()->tooltips().set_tip(*btn_remove, _("Remove a plugin from the effect list")); ARDOUR_UI::instance()->tooltips().set_tip(*btn_remove, _("Remove a plugin from the effect list"));
Gtk::Button *btn_update = manage(new Gtk::Button(_("Update"))); Gtk::Button *btn_update = manage(new Gtk::Button(Stock::REFRESH));
ARDOUR_UI::instance()->tooltips().set_tip(*btn_update, _("Update available plugins")); ARDOUR_UI::instance()->tooltips().set_tip(*btn_update, _("Update available plugins"));
btn_add->set_name("PluginSelectorButton"); btn_add->set_name("PluginSelectorButton");
@ -113,8 +113,9 @@ PluginSelector::PluginSelector (PluginManager *mgr)
table->attach(ascroller, 0, 7, 7, 9); table->attach(ascroller, 0, 7, 7, 9);
add_button (Stock::OK, RESPONSE_ACCEPT);
add_button (Stock::CANCEL, RESPONSE_CANCEL); add_button (Stock::CANCEL, RESPONSE_CANCEL);
add_button (Stock::APPLY, RESPONSE_APPLY);
set_default_response (RESPONSE_APPLY);
get_vbox()->pack_start (*table); get_vbox()->pack_start (*table);
@ -127,8 +128,8 @@ PluginSelector::PluginSelector (PluginManager *mgr)
#endif #endif
table->set_name("PluginSelectorTable"); table->set_name("PluginSelectorTable");
//ladspa_display.set_name("PluginSelectorDisplay"); ladspa_display.set_name("PluginSelectorDisplay");
ladspa_display.set_name("PluginSelectorList"); //ladspa_display.set_name("PluginSelectorList");
added_list.set_name("PluginSelectorList"); added_list.set_name("PluginSelectorList");
ladspa_display.signal_button_press_event().connect_notify (mem_fun(*this, &PluginSelector::row_clicked)); ladspa_display.signal_button_press_event().connect_notify (mem_fun(*this, &PluginSelector::row_clicked));
@ -303,7 +304,7 @@ PluginSelector::run ()
r = (ResponseType) Dialog::run (); r = (ResponseType) Dialog::run ();
switch (r) { switch (r) {
case RESPONSE_ACCEPT: case RESPONSE_APPLY:
for (i = added_plugins.begin(); i != added_plugins.end(); ++i){ for (i = added_plugins.begin(); i != added_plugins.end(); ++i){
use_plugin (*i); use_plugin (*i);
} }

13
gtk2_ardour/plugin_ui.cc
View file

@ -135,14 +135,14 @@ PluginUI::PluginUI (AudioEngine &engine, PluginInsert& pi, bool scrollable)
HBox* constraint_hbox = manage (new HBox); HBox* constraint_hbox = manage (new HBox);
HBox* smaller_hbox = manage (new HBox); HBox* smaller_hbox = manage (new HBox);
Label* combo_label = manage (new Label (_("<span size=\"large\" weight=\"bold\">Presets</span>"))); Label* combo_label = manage (new Label (_("<span size=\"large\">Presets</span>")));
combo_label->set_use_markup (true); combo_label->set_use_markup (true);
smaller_hbox->pack_start (*combo_label, false, false, 10); smaller_hbox->pack_start (*combo_label, false, false, 10);
smaller_hbox->pack_start (combo, false, false); smaller_hbox->pack_start (combo, false, false);
smaller_hbox->pack_start (save_button, false, false); smaller_hbox->pack_start (save_button, false, false);
constraint_hbox->set_spacing (10); constraint_hbox->set_spacing (5);
constraint_hbox->pack_start (*smaller_hbox, true, false); constraint_hbox->pack_start (*smaller_hbox, true, false);
constraint_hbox->pack_end (bypass_button, false, false); constraint_hbox->pack_end (bypass_button, false, false);
@ -226,6 +226,7 @@ PluginUI::build (AudioEngine &engine)
frame = manage (new Frame); frame = manage (new Frame);
frame->set_name ("BaseFrame"); frame->set_name ("BaseFrame");
frame->set_label (_("Controls"));
frame->add (*box); frame->add (*box);
hpacker.pack_start(*frame, true, true); hpacker.pack_start(*frame, true, true);
@ -828,11 +829,12 @@ PluginUI::setup_scale_values(guint32 port_index, ControlUI* cui)
PlugUIBase::PlugUIBase (PluginInsert& pi) PlugUIBase::PlugUIBase (PluginInsert& pi)
: insert (pi), : insert (pi),
plugin (insert.plugin()), plugin (insert.plugin()),
save_button(_("save")), save_button(_("Add")),
bypass_button (_("bypass")) bypass_button (_("Bypass"))
{ {
//combo.set_use_arrows_always(true); //combo.set_use_arrows_always(true);
set_popdown_strings (combo, plugin.get_presets()); set_popdown_strings (combo, plugin.get_presets());
combo.set_size_request (100, -1);
combo.set_active_text (""); combo.set_active_text ("");
combo.signal_changed().connect(mem_fun(*this, &PlugUIBase::setting_selected)); combo.signal_changed().connect(mem_fun(*this, &PlugUIBase::setting_selected));
@ -858,7 +860,8 @@ void
PlugUIBase::save_plugin_setting () PlugUIBase::save_plugin_setting ()
{ {
ArdourPrompter prompter (true); ArdourPrompter prompter (true);
prompter.set_prompt(_("Name for plugin settings:")); prompter.set_prompt(_("Name of New Preset:"));
prompter.add_button (Gtk::Stock::ADD, Gtk::RESPONSE_ACCEPT);
prompter.show_all(); prompter.show_all();

1
gtk2_ardour/redirect_box.cc
View file

@ -745,6 +745,7 @@ RedirectBox::rename_redirect (Redirect* redirect)
string result; string result;
name_prompter.set_prompt (_("rename redirect")); name_prompter.set_prompt (_("rename redirect"));
name_prompter.set_initial_text (redirect->name()); name_prompter.set_initial_text (redirect->name());
name_prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
name_prompter.show_all (); name_prompter.show_all ();
switch (name_prompter.run ()) { switch (name_prompter.run ()) {

1
gtk2_ardour/route_ui.cc
View file

@ -729,6 +729,7 @@ RouteUI::route_rename ()
string result; string result;
name_prompter.set_prompt (_("new name: ")); name_prompter.set_prompt (_("new name: "));
name_prompter.set_initial_text (_route.name()); name_prompter.set_initial_text (_route.name());
name_prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
name_prompter.show_all (); name_prompter.show_all ();
switch (name_prompter.run ()) { switch (name_prompter.run ()) {

3
gtk2_ardour/sfdb_ui.cc
View file

@ -234,7 +234,8 @@ SoundFileBox::add_field_clicked ()
ArdourPrompter prompter (true); ArdourPrompter prompter (true);
string name; string name;
prompter.set_prompt (_("Name for field")); prompter.set_prompt (_("Name for Field"));
prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
switch (prompter.run ()) { switch (prompter.run ()) {
case Gtk::RESPONSE_ACCEPT: case Gtk::RESPONSE_ACCEPT:

1
gtk2_ardour/visual_time_axis.cc
View file

@ -322,6 +322,7 @@ VisualTimeAxis::start_time_axis_rename()
ArdourPrompter name_prompter; ArdourPrompter name_prompter;
name_prompter.set_prompt (_("new name: ")) ; name_prompter.set_prompt (_("new name: ")) ;
name_prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
name_prompter.show_all() ; name_prompter.show_all() ;
switch (name_prompter.run ()) { switch (name_prompter.run ()) {

6
libs/gtkmm2ext/prompter.cc
View file

@ -52,7 +52,11 @@ Prompter::init ()
set_default_response (Gtk::RESPONSE_ACCEPT); set_default_response (Gtk::RESPONSE_ACCEPT);
add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
add_button (Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
/*
Alas a generic 'affirmative' button seems a bit useless sometimes.
You will have to add your own.
*/
entryLabel.set_line_wrap (true); entryLabel.set_line_wrap (true);
entryLabel.set_name ("PrompterLabel"); entryLabel.set_name ("PrompterLabel");