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

First batch of MessageDialog replacements

Browse source
This commit is contained in:
Robin Gareus 2019-12-14 23:31:24 +01:00
parent 901bf1ab80
commit 2b55d6dce3
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
15 changed files with 180 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/add_route_dialog.cc
View file

@ -49,6 +49,7 @@
#include "LuaBridge/LuaBridge.h" #include "LuaBridge/LuaBridge.h"
#include "ardour_message.h"
#include "add_route_dialog.h" #include "add_route_dialog.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "route_group_dialog.h" #include "route_group_dialog.h"
@ -670,10 +671,9 @@ AddRouteDialog::track_type_chosen ()
break; break;
case MixedTrack: case MixedTrack:
{ {
MessageDialog msg (_("Audio+MIDI tracks are intended for use <b>ONLY</b> with plugins that use both audio and MIDI input data.\n\n" ArdourMessageDialog msg (_("Audio+MIDI tracks are intended for use <b>ONLY</b> with plugins that use both audio and MIDI input data.\n\n"
"Use a normal audio or MIDI track if you do not plan to use such a plugin."), "Use a normal audio or MIDI track if you do not plan to use such a plugin."),
true, MESSAGE_INFO, BUTTONS_OK, true); true, MESSAGE_INFO, BUTTONS_OK, true);
msg.set_position (WIN_POS_MOUSE);
msg.run (); msg.run ();
} }

62
gtk2_ardour/ardour_ui.cc
View file

@ -151,6 +151,7 @@ typedef uint64_t microseconds_t;
#include "actions.h" #include "actions.h"
#include "add_route_dialog.h" #include "add_route_dialog.h"
#include "ambiguous_file_dialog.h" #include "ambiguous_file_dialog.h"
#include "ardour_message.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "audio_clock.h" #include "audio_clock.h"
#include "audio_region_view.h" #include "audio_region_view.h"
@ -228,14 +229,15 @@ sigc::signal<void> ARDOUR_UI::CloseAllDialogs;
static bool static bool
ask_about_configuration_copy (string const & old_dir, string const & new_dir, int version) ask_about_configuration_copy (string const & old_dir, string const & new_dir, int version)
{ {
MessageDialog msg (string_compose (_("%1 %2.x has discovered configuration files from %1 %3.x.\n\n" ArdourMessageDialog msg (string_compose (
"Would you like these files to be copied and used for %1 %2.x?\n\n" _("%1 %2.x has discovered configuration files from %1 %3.x.\n\n"
"(This will require you to restart %1.)"), "Would you like these files to be copied and used for %1 %2.x?\n\n"
PROGRAM_NAME, PROGRAM_VERSION, version), "(This will require you to restart %1.)"),
false, /* no markup */ PROGRAM_NAME, PROGRAM_VERSION, version),
Gtk::MESSAGE_INFO, false, /* no markup */
Gtk::BUTTONS_YES_NO, Gtk::MESSAGE_INFO,
true /* modal, though it hardly matters since it is the only window */ Gtk::BUTTONS_YES_NO,
true /* modal, though it hardly matters since it is the only window */
); );
msg.set_default_response (Gtk::RESPONSE_YES); msg.set_default_response (Gtk::RESPONSE_YES);
@ -363,7 +365,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
/* "touch" the been-here-before path now that config has been migrated */ /* "touch" the been-here-before path now that config has been migrated */
PBD::ScopedFileDescriptor fout (g_open (been_here_before_path ().c_str(), O_CREAT|O_TRUNC|O_RDWR, 0666)); PBD::ScopedFileDescriptor fout (g_open (been_here_before_path ().c_str(), O_CREAT|O_TRUNC|O_RDWR, 0666));
} }
MessageDialog msg (string_compose (_("Your configuration files were copied. You can now restart %1."), PROGRAM_NAME), true); ArdourMessageDialog msg (string_compose (_("Your configuration files were copied. You can now restart %1."), PROGRAM_NAME), true);
msg.run (); msg.run ();
/* configuration was modified, exit immediately */ /* configuration was modified, exit immediately */
_exit (EXIT_SUCCESS); _exit (EXIT_SUCCESS);
@ -615,8 +617,7 @@ was not fast enough. Try to restart\n\
the audio backend and save the session."), PROGRAM_NAME); the audio backend and save the session."), PROGRAM_NAME);
} }
MessageDialog msg (_main_window, msgstr); ArdourMessageDialog msg (_main_window, msgstr);
pop_back_splash (msg);
msg.run (); msg.run ();
if (free_reason) { if (free_reason) {
@ -1002,12 +1003,11 @@ ARDOUR_UI::finish()
/* use the default name */ /* use the default name */
if (save_state_canfail ("")) { if (save_state_canfail ("")) {
/* failed - don't quit */ /* failed - don't quit */
MessageDialog msg (_main_window, ArdourMessageDialog msg (_main_window,
string_compose (_("\ string_compose (_("\
%1 was unable to save your session.\n\n\ %1 was unable to save your session.\n\n\
If you still wish to quit, please use the\n\n\ If you still wish to quit, please use the\n\n\
\"Just quit\" option."), PROGRAM_NAME)); \"Just quit\" option."), PROGRAM_NAME));
pop_back_splash(msg);
msg.run (); msg.run ();
return; return;
} }
@ -1555,12 +1555,11 @@ ARDOUR_UI::session_add_foldback_bus (int32_t channels, uint32_t how_many, string
void void
ARDOUR_UI::display_insufficient_ports_message () ARDOUR_UI::display_insufficient_ports_message ()
{ {
MessageDialog msg (_main_window, ArdourMessageDialog msg (_main_window,
string_compose (_("There are insufficient ports available\n\ string_compose (_("There are insufficient ports available\n\
to create a new track or bus.\n\ to create a new track or bus.\n\
You should save %1, exit and\n\ You should save %1, exit and\n\
restart with more ports."), PROGRAM_NAME)); restart with more ports."), PROGRAM_NAME));
pop_back_splash (msg);
msg.run (); msg.run ();
} }
@ -1700,7 +1699,7 @@ ARDOUR_UI::transport_record (bool roll)
switch (_session->record_status()) { switch (_session->record_status()) {
case Session::Disabled: case Session::Disabled:
if (_session->ntracks() == 0) { if (_session->ntracks() == 0) {
MessageDialog msg (_main_window, _("Please create one or more tracks before trying to record.\nYou can do this with the \"Add Track or Bus\" option in the Session menu.")); ArdourMessageDialog msg (_main_window, _("Please create one or more tracks before trying to record.\nYou can do this with the \"Add Track or Bus\" option in the Session menu."));
msg.run (); msg.run ();
return; return;
} }
@ -2325,11 +2324,11 @@ ARDOUR_UI::display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* lis
removed = rep.paths.size(); removed = rep.paths.size();
if (removed == 0) { if (removed == 0) {
MessageDialog msgd (_main_window, ArdourMessageDialog msgd (_main_window,
_("No files were ready for clean-up"), _("No files were ready for clean-up"),
true, true,
Gtk::MESSAGE_INFO, Gtk::MESSAGE_INFO,
Gtk::BUTTONS_OK); Gtk::BUTTONS_OK);
msgd.set_title (_("Clean-up")); msgd.set_title (_("Clean-up"));
msgd.set_secondary_text (_("If this seems surprising, \n\ msgd.set_secondary_text (_("If this seems surprising, \n\
check for any existing snapshots.\n\ check for any existing snapshots.\n\
@ -2468,10 +2467,10 @@ ARDOUR_UI::cleanup ()
} }
MessageDialog checker (_("Are you sure you want to clean-up?"), ArdourMessageDialog checker (_("Are you sure you want to clean-up?"),
true, true,
Gtk::MESSAGE_QUESTION, Gtk::MESSAGE_QUESTION,
Gtk::BUTTONS_NONE); Gtk::BUTTONS_NONE);
checker.set_title (_("Clean-up")); checker.set_title (_("Clean-up"));
@ -2747,7 +2746,7 @@ ARDOUR_UI::disk_overrun_handler ()
if (!have_disk_speed_dialog_displayed) { if (!have_disk_speed_dialog_displayed) {
have_disk_speed_dialog_displayed = true; have_disk_speed_dialog_displayed = true;
MessageDialog* msg = new MessageDialog (_main_window, string_compose (_("\ ArdourMessageDialog* msg = new ArdourMessageDialog (_main_window, string_compose (_("\
The disk system on your computer\n\ The disk system on your computer\n\
was not able to keep up with %1.\n\ was not able to keep up with %1.\n\
\n\ \n\
@ -2775,7 +2774,7 @@ ARDOUR_UI::disk_underrun_handler ()
if (!have_disk_speed_dialog_displayed) { if (!have_disk_speed_dialog_displayed) {
have_disk_speed_dialog_displayed = true; have_disk_speed_dialog_displayed = true;
MessageDialog* msg = new MessageDialog ( ArdourMessageDialog* msg = new ArdourMessageDialog (
_main_window, string_compose (_("The disk system on your computer\n\ _main_window, string_compose (_("The disk system on your computer\n\
was not able to keep up with %1.\n\ was not able to keep up with %1.\n\
\n\ \n\
@ -2797,13 +2796,8 @@ void
ARDOUR_UI::session_dialog (std::string msg) ARDOUR_UI::session_dialog (std::string msg)
{ {
ENSURE_GUI_THREAD (*this, &ARDOUR_UI::session_dialog, msg) ENSURE_GUI_THREAD (*this, &ARDOUR_UI::session_dialog, msg)
ArdourMessageDialog d (msg, false, MESSAGE_INFO, BUTTONS_OK, true);
MessageDialog* d; d.run ();
d = new MessageDialog (msg, false, MESSAGE_INFO, BUTTONS_OK, true);
d->show_all ();
d->run ();
delete d;
} }
int int

3
gtk2_ardour/ardour_ui_access_web.cc
View file

@ -39,6 +39,7 @@
#include "pbd/i18n.h" #include "pbd/i18n.h"
#include "pbd/openuri.h" #include "pbd/openuri.h"
#include "ardour_message.h"
#include "ardour_ui.h" #include "ardour_ui.h"
using namespace ARDOUR; using namespace ARDOUR;
@ -49,7 +50,7 @@ using namespace std;
void void
ARDOUR_UI::launch_chat () ARDOUR_UI::launch_chat ()
{ {
MessageDialog dialog(_("<b>Just ask and wait for an answer.\nIt may take from minutes to hours.</b>"), true); ArdourMessageDialog dialog(_("<b>Just ask and wait for an answer.\nIt may take from minutes to hours.</b>"), true);
dialog.set_title (_("About the Chat")); dialog.set_title (_("About the Chat"));
dialog.set_secondary_text (_("When you're inside the chat just ask your question and wait for an answer. The chat is occupied by real people with real lives so many of them are passively online and might not read your question before minutes or hours later.\nSo please be patient and wait for an answer.\n\nYou should just leave the chat window open and check back regularly until someone has answered your question.")); dialog.set_secondary_text (_("When you're inside the chat just ask your question and wait for an answer. The chat is occupied by real people with real lives so many of them are passively online and might not read your question before minutes or hours later.\nSo please be patient and wait for an answer.\n\nYou should just leave the chat window open and check back regularly until someone has answered your question."));

11
gtk2_ardour/ardour_ui_dependents.cc
View file

@ -41,6 +41,7 @@
#include "gtkmm2ext/bindings.h" #include "gtkmm2ext/bindings.h"
#include "actions.h" #include "actions.h"
#include "ardour_message.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "public_editor.h" #include "public_editor.h"
#include "meterbridge.h" #include "meterbridge.h"
@ -205,11 +206,11 @@ ARDOUR_UI::idle_ask_about_quit ()
} else { } else {
/* no session or session not dirty, but still ask anyway */ /* no session or session not dirty, but still ask anyway */
Gtk::MessageDialog msg (string_compose (_("Quit %1?"), PROGRAM_NAME), ArdourMessageDialog msg (string_compose (_("Quit %1?"), PROGRAM_NAME),
false, /* no markup */ false, /* no markup */
Gtk::MESSAGE_INFO, Gtk::MESSAGE_INFO,
Gtk::BUTTONS_YES_NO, Gtk::BUTTONS_YES_NO,
true); /* modal */ true); /* modal */
msg.set_default_response (Gtk::RESPONSE_YES); msg.set_default_response (Gtk::RESPONSE_YES);
if (msg.run() == Gtk::RESPONSE_YES) { if (msg.run() == Gtk::RESPONSE_YES) {

22
gtk2_ardour/ardour_ui_engine.cc
View file

@ -40,6 +40,7 @@
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
#include "ardour_message.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "engine_dialog.h" #include "engine_dialog.h"
#include "gui_thread.h" #include "gui_thread.h"
@ -56,11 +57,11 @@ using namespace std;
void void
ARDOUR_UI::audioengine_became_silent () ARDOUR_UI::audioengine_became_silent ()
{ {
MessageDialog msg (string_compose (_("This is a free/demo copy of %1. It has just switched to silent mode."), PROGRAM_NAME), ArdourMessageDialog msg (string_compose (_("This is a free/demo copy of %1. It has just switched to silent mode."), PROGRAM_NAME),
true, true,
Gtk::MESSAGE_WARNING, Gtk::MESSAGE_WARNING,
Gtk::BUTTONS_NONE, Gtk::BUTTONS_NONE,
true); true);
msg.set_title (string_compose (_("%1 is now silent"), PROGRAM_NAME)); msg.set_title (string_compose (_("%1 is now silent"), PROGRAM_NAME));
@ -123,7 +124,7 @@ void
ARDOUR_UI::halt_on_xrun_message () ARDOUR_UI::halt_on_xrun_message ()
{ {
cerr << "HALT on xrun\n"; cerr << "HALT on xrun\n";
MessageDialog msg (_main_window, _("Recording was stopped because your system could not keep up.")); ArdourMessageDialog msg (_main_window, _("Recording was stopped because your system could not keep up."));
msg.run (); msg.run ();
} }
@ -149,11 +150,10 @@ bool
ARDOUR_UI::check_audioengine (Gtk::Window& parent) ARDOUR_UI::check_audioengine (Gtk::Window& parent)
{ {
if (!AudioEngine::instance()->running()) { if (!AudioEngine::instance()->running()) {
MessageDialog msg (parent, string_compose ( ArdourMessageDialog msg (parent, string_compose (
_("%1 is not connected to any audio backend.\n" _("%1 is not connected to any audio backend.\n"
"You cannot open or close sessions in this condition"), "You cannot open or close sessions in this condition"),
PROGRAM_NAME)); PROGRAM_NAME));
pop_back_splash (msg);
msg.run (); msg.run ();
return false; return false;
} }

108
gtk2_ardour/ardour_ui_session.cc
View file

@ -56,6 +56,7 @@
#include "ardour/session_state_utils.h" #include "ardour/session_state_utils.h"
#include "ardour/session_directory.h" #include "ardour/session_directory.h"
#include "ardour_message.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "engine_dialog.h" #include "engine_dialog.h"
#include "missing_plugin_dialog.h" #include "missing_plugin_dialog.h"
@ -85,18 +86,16 @@ ARDOUR_UI::ask_about_loading_existing_session (const std::string& session_path)
{ {
std::string str = string_compose (_("This session\n%1\nalready exists. Do you want to open it?"), session_path); std::string str = string_compose (_("This session\n%1\nalready exists. Do you want to open it?"), session_path);
MessageDialog msg (str, ArdourMessageDialog msg (str,
false, false,
Gtk::MESSAGE_WARNING, Gtk::MESSAGE_WARNING,
Gtk::BUTTONS_YES_NO, Gtk::BUTTONS_YES_NO,
true); true);
msg.set_name (X_("OpenExistingDialog")); msg.set_name (X_("OpenExistingDialog"));
msg.set_title (_("Open Existing Session")); msg.set_title (_("Open Existing Session"));
msg.set_wmclass (X_("existing_session"), PROGRAM_NAME); msg.set_wmclass (X_("existing_session"), PROGRAM_NAME);
msg.set_position (Gtk::WIN_POS_CENTER); msg.set_position (Gtk::WIN_POS_CENTER);
pop_back_splash (msg);
switch (msg.run()) { switch (msg.run()) {
case RESPONSE_YES: case RESPONSE_YES:
@ -188,7 +187,7 @@ ARDOUR_UI::session_dialog_response_handler (int response, SessionDialog* session
int rv = ARDOUR::inflate_session (session_name, Config->get_default_session_parent_dir(), session_path, session_name); int rv = ARDOUR::inflate_session (session_name, Config->get_default_session_parent_dir(), session_path, session_name);
if (rv < 0) { if (rv < 0) {
MessageDialog msg (*session_dialog, string_compose (_("Extracting session-archive failed: %1"), inflate_error (rv))); ArdourMessageDialog msg (*session_dialog, string_compose (_("Extracting session-archive failed: %1"), inflate_error (rv)));
msg.run (); msg.run ();
return; /* back to main event loop */ return; /* back to main event loop */
} else if (rv == 0) { } else if (rv == 0) {
@ -237,10 +236,10 @@ ARDOUR_UI::session_dialog_response_handler (int response, SessionDialog* session
char illegal = Session::session_name_is_legal (session_name); char illegal = Session::session_name_is_legal (session_name);
if (illegal) { if (illegal) {
MessageDialog msg (*session_dialog, ArdourMessageDialog msg (*session_dialog,
string_compose (_("To ensure compatibility with various systems\n" string_compose (_("To ensure compatibility with various systems\n"
"session names may not contain a '%1' character"), "session names may not contain a '%1' character"),
illegal)); illegal));
msg.run (); msg.run ();
return; /* back to main event loop */ return; /* back to main event loop */
} }
@ -263,8 +262,7 @@ ARDOUR_UI::session_dialog_response_handler (int response, SessionDialog* session
} else { } else {
if (!likely_new) { if (!likely_new) {
pop_back_splash (*session_dialog); ArdourMessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
MessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
msg.run (); msg.run ();
return; /* back to main event loop */ return; /* back to main event loop */
} }
@ -272,9 +270,8 @@ ARDOUR_UI::session_dialog_response_handler (int response, SessionDialog* session
char illegal = Session::session_name_is_legal(session_name); char illegal = Session::session_name_is_legal(session_name);
if (illegal) { if (illegal) {
pop_back_splash (*session_dialog); ArdourMessageDialog msg (*session_dialog, string_compose(_("To ensure compatibility with various systems\n"
MessageDialog msg (*session_dialog, string_compose(_("To ensure compatibility with various systems\n" "session names may not contain a '%1' character"), illegal));
"session names may not contain a '%1' character"), illegal));
msg.run (); msg.run ();
return; /* back to main event loop */ return; /* back to main event loop */
@ -407,19 +404,16 @@ ARDOUR_UI::load_session_stage_two (const std::string& path, const std::string& s
catch (AudioEngine::PortRegistrationFailure const& err) { catch (AudioEngine::PortRegistrationFailure const& err) {
MessageDialog msg (err.what(), ArdourMessageDialog msg (err.what(),
true, true,
Gtk::MESSAGE_INFO, Gtk::MESSAGE_INFO,
Gtk::BUTTONS_CLOSE); Gtk::BUTTONS_CLOSE);
msg.set_title (_("Port Registration Error")); msg.set_title (_("Port Registration Error"));
msg.set_secondary_text (_("Click the Close button to try again.")); msg.set_secondary_text (_("Click the Close button to try again."));
msg.set_position (Gtk::WIN_POS_CENTER); msg.set_position (Gtk::WIN_POS_CENTER);
pop_back_splash (msg);
msg.present ();
int response = msg.run (); int response = msg.run ();
msg.hide (); msg.hide ();
switch (response) { switch (response) {
@ -431,17 +425,15 @@ ARDOUR_UI::load_session_stage_two (const std::string& path, const std::string& s
goto out; goto out;
} }
catch (SessionException const& e) { catch (SessionException const& e) {
MessageDialog msg (string_compose( ArdourMessageDialog msg (string_compose(
_("Session \"%1 (snapshot %2)\" did not load successfully:\n%3"), _("Session \"%1 (snapshot %2)\" did not load successfully:\n%3"),
path, snap_name, e.what()), path, snap_name, e.what()),
true, true,
Gtk::MESSAGE_INFO, Gtk::MESSAGE_INFO,
BUTTONS_OK); BUTTONS_OK);
msg.set_title (_("Loading Error")); msg.set_title (_("Loading Error"));
msg.set_position (Gtk::WIN_POS_CENTER); msg.set_position (Gtk::WIN_POS_CENTER);
pop_back_splash (msg);
msg.present ();
dump_errors (cerr); dump_errors (cerr);
@ -452,17 +444,15 @@ ARDOUR_UI::load_session_stage_two (const std::string& path, const std::string& s
} }
catch (...) { catch (...) {
MessageDialog msg (string_compose( ArdourMessageDialog msg (string_compose(
_("Session \"%1 (snapshot %2)\" did not load successfully."), _("Session \"%1 (snapshot %2)\" did not load successfully."),
path, snap_name), path, snap_name),
true, true,
Gtk::MESSAGE_INFO, Gtk::MESSAGE_INFO,
BUTTONS_OK); BUTTONS_OK);
msg.set_title (_("Loading Error")); msg.set_title (_("Loading Error"));
msg.set_position (Gtk::WIN_POS_CENTER); msg.set_position (Gtk::WIN_POS_CENTER);
pop_back_splash (msg);
msg.present ();
dump_errors (cerr); dump_errors (cerr);
@ -481,15 +471,13 @@ ARDOUR_UI::load_session_stage_two (const std::string& path, const std::string& s
} }
if (!new_session->writable()) { if (!new_session->writable()) {
MessageDialog msg (_("This session has been opened in read-only mode.\n\nYou will not be able to record or save."), ArdourMessageDialog msg (_("This session has been opened in read-only mode.\n\nYou will not be able to record or save."),
true, true,
Gtk::MESSAGE_INFO, Gtk::MESSAGE_INFO,
BUTTONS_OK); BUTTONS_OK);
msg.set_title (_("Read-only Session")); msg.set_title (_("Read-only Session"));
msg.set_position (Gtk::WIN_POS_CENTER); msg.set_position (Gtk::WIN_POS_CENTER);
pop_back_splash (msg);
msg.present ();
(void) msg.run (); (void) msg.run ();
msg.hide (); msg.hide ();
} }
@ -567,10 +555,9 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
cerr << "Here are the errors associated with this failed session:\n"; cerr << "Here are the errors associated with this failed session:\n";
dump_errors (cerr); dump_errors (cerr);
cerr << "---------\n"; cerr << "---------\n";
MessageDialog msg (string_compose(_("Could not create session in \"%1\": %2"), path, e.what())); ArdourMessageDialog msg (string_compose(_("Could not create session in \"%1\": %2"), path, e.what()));
msg.set_title (_("Loading Error")); msg.set_title (_("Loading Error"));
msg.set_position (Gtk::WIN_POS_CENTER); msg.set_position (Gtk::WIN_POS_CENTER);
pop_back_splash (msg);
msg.run (); msg.run ();
return -1; return -1;
} }
@ -578,10 +565,9 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
cerr << "Here are the errors associated with this failed session:\n"; cerr << "Here are the errors associated with this failed session:\n";
dump_errors (cerr); dump_errors (cerr);
cerr << "---------\n"; cerr << "---------\n";
MessageDialog msg (string_compose(_("Could not create session in \"%1\""), path)); ArdourMessageDialog msg (string_compose(_("Could not create session in \"%1\""), path));
msg.set_title (_("Loading Error")); msg.set_title (_("Loading Error"));
msg.set_position (Gtk::WIN_POS_CENTER); msg.set_position (Gtk::WIN_POS_CENTER);
pop_back_splash (msg);
msg.run (); msg.run ();
return -1; return -1;
} }
@ -635,12 +621,11 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
break; break;
case 1: case 1:
if (save_state_canfail ("")) { if (save_state_canfail ("")) {
MessageDialog msg (_main_window, ArdourMessageDialog msg (_main_window,
string_compose (_("\ string_compose (_("\
%1 was unable to save your session.\n\n\ %1 was unable to save your session.\n\n\
If you still wish to proceed, please use the\n\n\ If you still wish to proceed, please use the\n\n\
\"Don't save now\" option."), PROGRAM_NAME)); \"Don't save now\" option."), PROGRAM_NAME));
pop_back_splash(msg);
msg.run (); msg.run ();
return; return;
} }
@ -715,7 +700,7 @@ ARDOUR_UI::rename_session ()
char illegal = Session::session_name_is_legal (name); char illegal = Session::session_name_is_legal (name);
if (illegal) { if (illegal) {
MessageDialog msg (string_compose (_("To ensure compatibility with various systems\n" ArdourMessageDialog msg (string_compose (_("To ensure compatibility with various systems\n"
"session names may not contain a '%1' character"), illegal)); "session names may not contain a '%1' character"), illegal));
msg.run (); msg.run ();
goto again; goto again;
@ -723,8 +708,7 @@ ARDOUR_UI::rename_session ()
switch (_session->rename (name)) { switch (_session->rename (name)) {
case -1: { case -1: {
MessageDialog msg (_("That name is already in use by another directory/folder. Please try again.")); ArdourMessageDialog msg (_("That name is already in use by another directory/folder. Please try again."));
msg.set_position (WIN_POS_MOUSE);
msg.run (); msg.run ();
goto again; goto again;
break; break;
@ -732,8 +716,7 @@ ARDOUR_UI::rename_session ()
case 0: case 0:
break; break;
default: { default: {
MessageDialog msg (_("Renaming this session failed.\nThings could be seriously messed up at this point")); ArdourMessageDialog msg (_("Renaming this session failed.\nThings could be seriously messed up at this point"));
msg.set_position (WIN_POS_MOUSE);
msg.run (); msg.run ();
break; break;
} }
@ -785,12 +768,11 @@ ARDOUR_UI::save_session_as ()
break; break;
case 1: case 1:
if (save_state_canfail ("")) { if (save_state_canfail ("")) {
MessageDialog msg (_main_window, ArdourMessageDialog msg (_main_window,
string_compose (_("\ string_compose (_("\
%1 was unable to save your session.\n\n\ %1 was unable to save your session.\n\n\
If you still wish to proceed, please use the\n\n\ If you still wish to proceed, please use the\n\n\
\"Don't save now\" option."), PROGRAM_NAME)); \"Don't save now\" option."), PROGRAM_NAME));
pop_back_splash(msg);
msg.run (); msg.run ();
return; return;
} }
@ -861,7 +843,7 @@ If you still wish to proceed, please use the\n\n\
if (_session->save_as (sa)) { if (_session->save_as (sa)) {
/* ERROR MESSAGE */ /* ERROR MESSAGE */
MessageDialog msg (string_compose (_("Save As failed: %1"), sa.failure_message)); ArdourMessageDialog msg (string_compose (_("Save As failed: %1"), sa.failure_message));
msg.run (); msg.run ();
} }
@ -900,7 +882,7 @@ ARDOUR_UI::archive_session ()
} }
if (_session->archive_session (sad.target_folder(), sad.name(), sad.encode_option (), sad.compression_level (), sad.only_used_sources (), &sad)) { if (_session->archive_session (sad.target_folder(), sad.name(), sad.encode_option (), sad.compression_level (), sad.only_used_sources (), &sad)) {
MessageDialog msg (_("Session Archiving failed.")); ArdourMessageDialog msg (_("Session Archiving failed."));
msg.run (); msg.run ();
} }
} }
@ -935,8 +917,8 @@ ARDOUR_UI::process_snapshot_session_prompter (Prompter& prompter, bool switch_to
if (do_save) { if (do_save) {
char illegal = Session::session_name_is_legal(snapname); char illegal = Session::session_name_is_legal(snapname);
if (illegal) { if (illegal) {
MessageDialog msg (string_compose (_("To ensure compatibility with various systems\n" ArdourMessageDialog msg (string_compose (_("To ensure compatibility with various systems\n"
"snapshot names may not contain a '%1' character"), illegal)); "snapshot names may not contain a '%1' character"), illegal));
msg.run (); msg.run ();
return false; return false;
} }
@ -1026,8 +1008,8 @@ ARDOUR_UI::open_session ()
load_session (path, name); load_session (path, name);
} }
else if (rv < 0) { else if (rv < 0) {
MessageDialog msg (_main_window, ArdourMessageDialog msg (_main_window,
string_compose (_("Extracting session-archive failed: %1"), inflate_error (rv))); string_compose (_("Extracting session-archive failed: %1"), inflate_error (rv)));
msg.run (); msg.run ();
} }
else if (ARDOUR::find_session (session_path, path, name, isnew) == 0) { else if (ARDOUR::find_session (session_path, path, name, isnew) == 0) {

19
gtk2_ardour/ardour_ui_startup.cc
View file

@ -61,6 +61,7 @@
#include "gtkmm2ext/application.h" #include "gtkmm2ext/application.h"
#include "ambiguous_file_dialog.h" #include "ambiguous_file_dialog.h"
#include "ardour_message.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "debug.h" #include "debug.h"
#include "engine_dialog.h" #include "engine_dialog.h"
@ -168,12 +169,12 @@ ARDOUR_UI::session_format_mismatch (std::string xml_path, std::string backup_pat
const char* start_mono = "<tt>"; const char* start_mono = "<tt>";
const char* end_mono = "</tt>"; const char* end_mono = "</tt>";
MessageDialog msg (string_compose (_("%4This is a session from an older version of %3%5\n\n" ArdourMessageDialog msg (string_compose (_("%4This is a session from an older version of %3%5\n\n"
"%3 has copied the old session file\n\n%6%1%7\n\nto\n\n%6%2%7\n\n" "%3 has copied the old session file\n\n%6%1%7\n\nto\n\n%6%2%7\n\n"
"From now on, use the backup copy with older versions of %3"), "From now on, use the backup copy with older versions of %3"),
xml_path, backup_path, PROGRAM_NAME, xml_path, backup_path, PROGRAM_NAME,
start_big, end_big, start_big, end_big,
start_mono, end_mono), true); start_mono, end_mono), true);
msg.run (); msg.run ();
} }
@ -215,7 +216,7 @@ audio may be played at the wrong sample rate.\n"), desired, PROGRAM_NAME, actual
void void
ARDOUR_UI::sr_mismatch_message (samplecnt_t desired, samplecnt_t actual) ARDOUR_UI::sr_mismatch_message (samplecnt_t desired, samplecnt_t actual)
{ {
MessageDialog msg (string_compose (_("\ ArdourMessageDialog msg (string_compose (_("\
This session was created with a sample rate of %1 Hz, but\n\ This session was created with a sample rate of %1 Hz, but\n\
%2 is currently running at %3 Hz.\n\ %2 is currently running at %3 Hz.\n\
Audio will be recorded and played at the wrong sample rate.\n\ Audio will be recorded and played at the wrong sample rate.\n\
@ -617,7 +618,7 @@ ARDOUR_UI::check_memory_locking ()
if (ram == 0 || ((double) limits.rlim_cur / ram) < 0.75) { if (ram == 0 || ((double) limits.rlim_cur / ram) < 0.75) {
MessageDialog msg ( ArdourMessageDialog msg (
string_compose ( string_compose (
_("WARNING: Your system has a limit for maximum amount of locked memory. " _("WARNING: Your system has a limit for maximum amount of locked memory. "
"This might cause %1 to run out of memory before your system " "This might cause %1 to run out of memory before your system "
@ -643,8 +644,6 @@ ARDOUR_UI::check_memory_locking ()
vbox->show(); vbox->show();
hbox.show (); hbox.show ();
pop_back_splash (msg);
msg.run (); msg.run ();
if (cb.get_active()) { if (cb.get_active()) {

13
gtk2_ardour/editor_audio_import.cc
View file

@ -52,6 +52,7 @@
#include "ardour/utils.h" #include "ardour/utils.h"
#include "pbd/memento_command.h" #include "pbd/memento_command.h"
#include "ardour_message.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "cursor_context.h" #include "cursor_context.h"
#include "editor.h" #include "editor.h"
@ -81,7 +82,7 @@ void
Editor::add_external_audio_action (ImportMode mode_hint) Editor::add_external_audio_action (ImportMode mode_hint)
{ {
if (_session == 0) { if (_session == 0) {
MessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded.")); ArdourMessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded."));
msg.run (); msg.run ();
return; return;
} }
@ -103,7 +104,7 @@ Editor::external_audio_dialog ()
uint32_t midi_track_cnt; uint32_t midi_track_cnt;
if (_session == 0) { if (_session == 0) {
MessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded.")); ArdourMessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded."));
msg.run (); msg.run ();
return; return;
} }
@ -184,7 +185,7 @@ Editor::check_whether_and_how_to_import(string path, bool all_or_nothing)
message = string_compose (_("The session already contains a source file named %1. Do you want to import %2 as a new source, or skip it?"), wave_name, wave_name); message = string_compose (_("The session already contains a source file named %1. Do you want to import %2 as a new source, or skip it?"), wave_name, wave_name);
} }
MessageDialog dialog(message, false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE, true); ArdourMessageDialog dialog(message, false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE, true);
if (all_or_nothing) { if (all_or_nothing) {
// disabled // disabled
@ -198,10 +199,7 @@ Editor::check_whether_and_how_to_import(string path, bool all_or_nothing)
//dialog.add_button("Skip all", 4); // All or rest? //dialog.add_button("Skip all", 4); // All or rest?
dialog.show();
function = dialog.run (); function = dialog.run ();
dialog.hide(); dialog.hide();
} }
@ -650,8 +648,7 @@ Editor::embed_sndfiles (vector<string> paths,
} }
if (!finfo.seekable) { if (!finfo.seekable) {
MessageDialog msg ( string_compose ( _("%1\nThis audiofile cannot be embedded. It must be imported!"), short_path (path, 40)), false, Gtk::MESSAGE_ERROR); ArdourMessageDialog msg (string_compose (_("%1\nThis audiofile cannot be embedded. It must be imported!"), short_path (path, 40)), false, Gtk::MESSAGE_ERROR);
msg.set_position (WIN_POS_MOUSE);
msg.run (); msg.run ();
return -2; return -2;
} }

56
gtk2_ardour/editor_ops.cc
View file

@ -82,6 +82,7 @@
#include "canvas/canvas.h" #include "canvas/canvas.h"
#include "actions.h" #include "actions.h"
#include "ardour_message.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "audio_region_view.h" #include "audio_region_view.h"
#include "audio_streamview.h" #include "audio_streamview.h"
@ -3991,7 +3992,7 @@ Editor::freeze_route ()
} }
if (!clicked_routeview->track()->bounceable (clicked_routeview->track()->main_outs(), true)) { if (!clicked_routeview->track()->bounceable (clicked_routeview->track()->main_outs(), true)) {
MessageDialog d ( ArdourMessageDialog d (
_("This track/bus cannot be frozen because the signal adds or loses channels before reaching the outputs.\n" _("This track/bus cannot be frozen because the signal adds or loses channels before reaching the outputs.\n"
"This is typically caused by plugins that generate stereo output from mono input or vice versa.") "This is typically caused by plugins that generate stereo output from mono input or vice versa.")
); );
@ -4001,9 +4002,9 @@ Editor::freeze_route ()
} }
if (clicked_routeview->track()->has_external_redirects()) { if (clicked_routeview->track()->has_external_redirects()) {
MessageDialog d (string_compose (_("<b>%1</b>\n\nThis track has at least one send/insert/return as part of its signal flow.\n\n" ArdourMessageDialog d (string_compose (_("<b>%1</b>\n\nThis track has at least one send/insert/return as part of its signal flow.\n\n"
"Freezing will only process the signal as far as the first send/insert/return."), "Freezing will only process the signal as far as the first send/insert/return."),
clicked_routeview->track()->name()), true, MESSAGE_INFO, BUTTONS_NONE, true); clicked_routeview->track()->name()), true, MESSAGE_INFO, BUTTONS_NONE, true);
d.add_button (_("Freeze anyway"), Gtk::RESPONSE_OK); d.add_button (_("Freeze anyway"), Gtk::RESPONSE_OK);
d.add_button (_("Don't freeze"), Gtk::RESPONSE_CANCEL); d.add_button (_("Don't freeze"), Gtk::RESPONSE_CANCEL);
@ -4052,7 +4053,7 @@ Editor::bounce_range_selection (bool replace, bool enable_processing)
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i); RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
if (rtv && rtv->track() && replace && enable_processing && !rtv->track()->bounceable (rtv->track()->main_outs(), false)) { if (rtv && rtv->track() && replace && enable_processing && !rtv->track()->bounceable (rtv->track()->main_outs(), false)) {
MessageDialog d ( ArdourMessageDialog d (
_("You can't perform this operation because the processing of the signal " _("You can't perform this operation because the processing of the signal "
"will cause one or more of the tracks to end up with a region with more channels than this track has inputs.\n\n" "will cause one or more of the tracks to end up with a region with more channels than this track has inputs.\n\n"
"You can do this without processing, which is a different operation.") "You can do this without processing, which is a different operation.")
@ -7048,10 +7049,10 @@ Editor::split_region_at_points (boost::shared_ptr<Region> r, AnalysisFeatureList
if (positions.size() > 20 && can_ferret) { if (positions.size() > 20 && can_ferret) {
std::string msgstr = string_compose (_("You are about to split\n%1\ninto %2 pieces.\nThis could take a long time."), r->name(), positions.size() + 1); std::string msgstr = string_compose (_("You are about to split\n%1\ninto %2 pieces.\nThis could take a long time."), r->name(), positions.size() + 1);
MessageDialog msg (msgstr, ArdourMessageDialog msg (msgstr,
false, false,
Gtk::MESSAGE_INFO, Gtk::MESSAGE_INFO,
Gtk::BUTTONS_OK_CANCEL); Gtk::BUTTONS_OK_CANCEL);
if (can_ferret) { if (can_ferret) {
msg.add_button (_("Call for the Ferret!"), RESPONSE_APPLY); msg.add_button (_("Call for the Ferret!"), RESPONSE_APPLY);
@ -7061,8 +7062,6 @@ Editor::split_region_at_points (boost::shared_ptr<Region> r, AnalysisFeatureList
} }
msg.set_title (_("Excessive split?")); msg.set_title (_("Excessive split?"));
msg.present ();
int response = msg.run(); int response = msg.run();
msg.hide (); msg.hide ();
@ -7636,19 +7635,17 @@ Editor::_remove_tracks ()
} }
if (special_bus && !Config->get_allow_special_bus_removal()) { if (special_bus && !Config->get_allow_special_bus_removal()) {
MessageDialog msg (_("That would be bad news ...."), ArdourMessageDialog msg (_("That would be bad news ...."),
false, false,
Gtk::MESSAGE_INFO, Gtk::MESSAGE_INFO,
Gtk::BUTTONS_OK); Gtk::BUTTONS_OK);
msg.set_secondary_text (string_compose (_( msg.set_secondary_text (string_compose (_("Removing the master or monitor bus is such a bad idea\n\
"Removing the master or monitor bus is such a bad idea\n\
that %1 is not going to allow it.\n\ that %1 is not going to allow it.\n\
\n\ \n\
If you really want to do this sort of thing\n\ If you really want to do this sort of thing\n\
edit your ardour.rc file to set the\n\ edit your ardour.rc file to set the\n\
\"allow-special-bus-removal\" option to be \"yes\""), PROGRAM_NAME)); \"allow-special-bus-removal\" option to be \"yes\""), PROGRAM_NAME));
msg.present ();
msg.run (); msg.run ();
return; return;
} }
@ -7764,17 +7761,15 @@ void
Editor::do_insert_time () Editor::do_insert_time ()
{ {
if (selection->tracks.empty()) { if (selection->tracks.empty()) {
MessageDialog msg (_("You must first select some tracks to Insert Time."), ArdourMessageDialog msg (_("You must first select some tracks to Insert Time."),
true, MESSAGE_INFO, BUTTONS_OK, true); true, MESSAGE_INFO, BUTTONS_OK, true);
msg.set_position (WIN_POS_MOUSE);
msg.run (); msg.run ();
return; return;
} }
if (Config->get_edit_mode() == Lock) { if (Config->get_edit_mode() == Lock) {
MessageDialog msg (_("You cannot insert time in Lock Edit mode."), ArdourMessageDialog msg (_("You cannot insert time in Lock Edit mode."),
true, MESSAGE_INFO, BUTTONS_OK, true); true, MESSAGE_INFO, BUTTONS_OK, true);
msg.set_position (WIN_POS_MOUSE);
msg.run (); msg.run ();
return; return;
} }
@ -7939,17 +7934,15 @@ void
Editor::do_remove_time () Editor::do_remove_time ()
{ {
if (selection->tracks.empty()) { if (selection->tracks.empty()) {
MessageDialog msg (_("You must first select some tracks to Remove Time."), ArdourMessageDialog msg (_("You must first select some tracks to Remove Time."),
true, MESSAGE_INFO, BUTTONS_OK, true); true, MESSAGE_INFO, BUTTONS_OK, true);
msg.set_position (WIN_POS_MOUSE);
msg.run (); msg.run ();
return; return;
} }
if (Config->get_edit_mode() == Lock) { if (Config->get_edit_mode() == Lock) {
MessageDialog msg (_("You cannot remove time in Lock Edit mode."), ArdourMessageDialog msg (_("You cannot remove time in Lock Edit mode."),
true, MESSAGE_INFO, BUTTONS_OK, true); true, MESSAGE_INFO, BUTTONS_OK, true);
msg.set_position (WIN_POS_MOUSE);
msg.run (); msg.run ();
return; return;
} }
@ -8178,7 +8171,8 @@ Editor::fit_tracks (TrackViewList & tracks)
double first_y_pos = DBL_MAX; double first_y_pos = DBL_MAX;
if (h < TimeAxisView::preset_height (HeightSmall)) { if (h < TimeAxisView::preset_height (HeightSmall)) {
MessageDialog msg (_("There are too many tracks to fit in the current window")); ArdourMessageDialog msg (_("There are too many tracks to fit in the current window"));
msg.run ();
/* too small to be displayed */ /* too small to be displayed */
return; return;
} }

14
gtk2_ardour/engine_dialog.cc
View file

@ -29,8 +29,6 @@
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <gtkmm/messagedialog.h>
#include "pbd/error.h" #include "pbd/error.h"
#include "pbd/locale_guard.h" #include "pbd/locale_guard.h"
#include "pbd/xml++.h" #include "pbd/xml++.h"
@ -57,6 +55,7 @@
#include "opts.h" #include "opts.h"
#include "debug.h" #include "debug.h"
#include "ardour_message.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "engine_dialog.h" #include "engine_dialog.h"
#include "gui_thread.h" #include "gui_thread.h"
@ -130,7 +129,7 @@ EngineControl::EngineControl ()
vector<const ARDOUR::AudioBackendInfo*> backends = ARDOUR::AudioEngine::instance()->available_backends(); vector<const ARDOUR::AudioBackendInfo*> backends = ARDOUR::AudioEngine::instance()->available_backends();
if (backends.empty()) { if (backends.empty()) {
MessageDialog msg (string_compose (_("No audio/MIDI backends detected. %1 cannot run\n\n(This is a build/packaging/system error. It should never happen.)"), PROGRAM_NAME)); ArdourMessageDialog msg (string_compose (_("No audio/MIDI backends detected. %1 cannot run\n\n(This is a build/packaging/system error. It should never happen.)"), PROGRAM_NAME));
msg.run (); msg.run ();
throw failed_constructor (); throw failed_constructor ();
} }
@ -474,7 +473,7 @@ bool
EngineControl::start_engine () EngineControl::start_engine ()
{ {
if (push_state_to_backend (true) != 0) { if (push_state_to_backend (true) != 0) {
MessageDialog msg (*this, ARDOUR::AudioEngine::instance()->get_last_backend_error()); ArdourMessageDialog msg (*this, ARDOUR::AudioEngine::instance()->get_last_backend_error());
msg.run(); msg.run();
return false; return false;
} }
@ -485,8 +484,7 @@ bool
EngineControl::stop_engine (bool for_latency) EngineControl::stop_engine (bool for_latency)
{ {
if (ARDOUR::AudioEngine::instance()->stop(for_latency)) { if (ARDOUR::AudioEngine::instance()->stop(for_latency)) {
MessageDialog msg(*this, ArdourMessageDialog msg(*this, ARDOUR::AudioEngine::instance()->get_last_backend_error());
ARDOUR::AudioEngine::instance()->get_last_backend_error());
msg.run(); msg.run();
return false; return false;
} }
@ -759,13 +757,13 @@ EngineControl::enable_latency_tab ()
ARDOUR::AudioEngine::instance()->get_physical_inputs (type, inputs); ARDOUR::AudioEngine::instance()->get_physical_inputs (type, inputs);
if (!ARDOUR::AudioEngine::instance()->running()) { if (!ARDOUR::AudioEngine::instance()->running()) {
MessageDialog msg (_("Failed to start or connect to audio-engine.\n\nLatency calibration requires a working audio interface.")); ArdourMessageDialog msg (_("Failed to start or connect to audio-engine.\n\nLatency calibration requires a working audio interface."));
notebook.set_current_page (0); notebook.set_current_page (0);
msg.run (); msg.run ();
return; return;
} }
else if (inputs.empty() || outputs.empty()) { else if (inputs.empty() || outputs.empty()) {
MessageDialog msg (_("Your selected audio configuration is playback- or capture-only.\n\nLatency calibration requires playback and capture")); ArdourMessageDialog msg (_("Your selected audio configuration is playback- or capture-only.\n\nLatency calibration requires playback and capture"));
notebook.set_current_page (0); notebook.set_current_page (0);
msg.run (); msg.run ();
return; return;

5
gtk2_ardour/luadialog.h
View file

@ -21,11 +21,12 @@
#include <cassert> #include <cassert>
#include <gtkmm/table.h> #include <gtkmm/table.h>
#include <gtkmm/messagedialog.h>
#include <gtkmm/progressbar.h> #include <gtkmm/progressbar.h>
#include "LuaBridge/LuaBridge.h" #include "LuaBridge/LuaBridge.h"
#include "ardour_message.h"
namespace LuaDialog { namespace LuaDialog {
class Message { class Message {
@ -49,7 +50,7 @@ private:
static Gtk::ButtonsType to_gtk_bt (ButtonType bt); static Gtk::ButtonsType to_gtk_bt (ButtonType bt);
static Gtk::MessageType to_gtk_mt (MessageType mt); static Gtk::MessageType to_gtk_mt (MessageType mt);
Gtk::MessageDialog _message_dialog; ArdourMessageDialog _message_dialog;
}; };
class LuaDialogWidget { class LuaDialogWidget {

15
gtk2_ardour/main.cc
View file

@ -59,6 +59,7 @@
#include <gtkmm2ext/application.h> #include <gtkmm2ext/application.h>
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include "ardour_message.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "ui_config.h" #include "ui_config.h"
#include "opts.h" #include "opts.h"
@ -96,10 +97,10 @@ static string localedir (LOCALEDIR);
void void
gui_jack_error () gui_jack_error ()
{ {
MessageDialog win (string_compose (_("%1 could not connect to the audio backend."), PROGRAM_NAME), ArdourMessageDialog win (string_compose (_("%1 could not connect to the audio backend."), PROGRAM_NAME),
false, false,
Gtk::MESSAGE_INFO, Gtk::MESSAGE_INFO,
Gtk::BUTTONS_NONE); Gtk::BUTTONS_NONE);
win.add_button (Stock::QUIT, RESPONSE_CLOSE); win.add_button (Stock::QUIT, RESPONSE_CLOSE);
win.set_default_response (RESPONSE_CLOSE); win.set_default_response (RESPONSE_CLOSE);
@ -143,7 +144,7 @@ tell_about_backend_death (void* /* ignored */)
{ {
if (AudioEngine::instance()->processed_samples() == 0) { if (AudioEngine::instance()->processed_samples() == 0) {
/* died during startup */ /* died during startup */
MessageDialog msg (string_compose (_("The audio backend (%1) has failed, or terminated"), AudioEngine::instance()->current_backend_name()), false); ArdourMessageDialog msg (string_compose (_("The audio backend (%1) has failed, or terminated"), AudioEngine::instance()->current_backend_name()), false);
msg.set_position (Gtk::WIN_POS_CENTER); msg.set_position (Gtk::WIN_POS_CENTER);
msg.set_secondary_text (string_compose (_( msg.set_secondary_text (string_compose (_(
"%2 exited unexpectedly, and without notifying %1.\n\ "%2 exited unexpectedly, and without notifying %1.\n\
@ -162,7 +163,7 @@ Click OK to exit %1."), PROGRAM_NAME, AudioEngine::instance()->current_backend_n
MessageDialog msg (string_compose (_("The audio backend (%1) has failed, or terminated"), AudioEngine::instance()->current_backend_name()), false); MessageDialog msg (string_compose (_("The audio backend (%1) has failed, or terminated"), AudioEngine::instance()->current_backend_name()), false);
msg.set_secondary_text (string_compose (_("%2 exited unexpectedly, and without notifying %1."), msg.set_secondary_text (string_compose (_("%2 exited unexpectedly, and without notifying %1."),
PROGRAM_NAME, AudioEngine::instance()->current_backend_name())); PROGRAM_NAME, AudioEngine::instance()->current_backend_name()));
msg.present (); msg.run ();
} }
return false; /* do not call again */ return false; /* do not call again */
} }
@ -255,7 +256,7 @@ static void command_line_parse_error (int *argc, char** argv[]) {
// an MSVC app, let the user know we encountered a parsing error. // an MSVC app, let the user know we encountered a parsing error.
Gtk::Main app(argc, argv); // Calls 'gtk_init()' Gtk::Main app(argc, argv); // Calls 'gtk_init()'
Gtk::MessageDialog dlgReportParseError (string_compose (_("\n %1 could not understand your command line "), PROGRAM_NAME), ArdourMessageDialog dlgReportParseError (string_compose (_("\n %1 could not understand your command line "), PROGRAM_NAME),
false, MESSAGE_ERROR, BUTTONS_CLOSE, true); false, MESSAGE_ERROR, BUTTONS_CLOSE, true);
dlgReportParseError.set_title (string_compose (_("An error was encountered while launching %1"), PROGRAM_NAME)); dlgReportParseError.set_title (string_compose (_("An error was encountered while launching %1"), PROGRAM_NAME));
dlgReportParseError.run (); dlgReportParseError.run ();

15
gtk2_ardour/port_matrix.cc
View file

@ -22,6 +22,7 @@
*/ */
#include <iostream> #include <iostream>
#include <gtkmm/scrolledwindow.h> #include <gtkmm/scrolledwindow.h>
#include <gtkmm/adjustment.h> #include <gtkmm/adjustment.h>
#include <gtkmm/label.h> #include <gtkmm/label.h>
@ -30,21 +31,25 @@
#include <gtkmm/menu_elems.h> #include <gtkmm/menu_elems.h>
#include <gtkmm/window.h> #include <gtkmm/window.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>
#include <gtkmm/messagedialog.h>
#include "ardour/bundle.h" #include "ardour/bundle.h"
#include "ardour/types.h" #include "ardour/types.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/route.h" #include "ardour/route.h"
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "ardour_dialog.h"
#include "ardour_message.h"
#include "gui_thread.h"
#include "port_matrix.h" #include "port_matrix.h"
#include "port_matrix_body.h" #include "port_matrix_body.h"
#include "port_matrix_component.h" #include "port_matrix_component.h"
#include "ardour_dialog.h"
#include "pbd/i18n.h"
#include "gui_thread.h"
#include "utils.h" #include "utils.h"
#include "pbd/i18n.h"
using namespace std; using namespace std;
using namespace Gtk; using namespace Gtk;
using namespace ARDOUR; using namespace ARDOUR;
@ -733,7 +738,7 @@ PortMatrix::add_channel (boost::shared_ptr<Bundle> b, DataType t)
if (io) { if (io) {
int const r = io->add_port ("", this, t); int const r = io->add_port ("", this, t);
if (r == -1) { if (r == -1) {
Gtk::MessageDialog msg (_("It is not possible to add a port here.")); ArdourMessageDialog msg (_("It is not possible to add a port here."));
msg.set_title (_("Cannot add port")); msg.set_title (_("Cannot add port"));
msg.run (); msg.run ();
} }

11
gtk2_ardour/session_import_dialog.cc
View file

@ -35,6 +35,7 @@
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "widgets/prompter.h" #include "widgets/prompter.h"
#include "ardour_message.h"
#include "gui_thread.h" #include "gui_thread.h"
#include "session_import_dialog.h" #include "session_import_dialog.h"
#include "ui_config.h" #include "ui_config.h"
@ -134,7 +135,7 @@ SessionImportDialog::load_session (const string& filename)
if (ElementImportHandler::dirty()) { if (ElementImportHandler::dirty()) {
// Warn user // Warn user
string txt = _("Some elements had errors in them. Please see the log for details"); string txt = _("Some elements had errors in them. Please see the log for details");
MessageDialog msg (txt, false, MESSAGE_WARNING, BUTTONS_OK, true); ArdourMessageDialog msg (txt, false, MESSAGE_WARNING, BUTTONS_OK, true);
msg.run(); msg.run();
} }
} }
@ -218,7 +219,7 @@ SessionImportDialog::do_merge ()
if (ElementImportHandler::errors()) { if (ElementImportHandler::errors()) {
// Warn user // Warn user
string txt = _("Some elements had errors in them. Please see the log for details"); string txt = _("Some elements had errors in them. Please see the log for details");
MessageDialog msg (txt, false, MESSAGE_WARNING, BUTTONS_OK, true); ArdourMessageDialog msg (txt, false, MESSAGE_WARNING, BUTTONS_OK, true);
msg.run(); msg.run();
} }
} }
@ -234,7 +235,7 @@ SessionImportDialog::update (string path)
{ {
// Prompt user for verification // Prompt user for verification
string txt = _("This will select all elements of this type!"); string txt = _("This will select all elements of this type!");
MessageDialog msg (txt, false, MESSAGE_QUESTION, BUTTONS_OK_CANCEL, true); ArdourMessageDialog msg (txt, false, MESSAGE_QUESTION, BUTTONS_OK_CANCEL, true);
if (msg.run() == RESPONSE_CANCEL) { if (msg.run() == RESPONSE_CANCEL) {
(*cell)[sb_cols.queued] = false; (*cell)[sb_cols.queued] = false;
return; return;
@ -274,7 +275,7 @@ SessionImportDialog::show_info(const TreeModel::Path& path, TreeViewColumn*)
TreeModel::iterator cell = session_browser.get_model()->get_iter (path); TreeModel::iterator cell = session_browser.get_model()->get_iter (path);
string info = (*cell)[sb_cols.info]; string info = (*cell)[sb_cols.info];
MessageDialog msg (info, false, MESSAGE_INFO, BUTTONS_OK, true); ArdourMessageDialog msg (info, false, MESSAGE_INFO, BUTTONS_OK, true);
msg.run(); msg.run();
} }
@ -311,7 +312,7 @@ SessionImportDialog::open_rename_dialog (string text, string name)
bool bool
SessionImportDialog::open_prompt_dialog (string text) SessionImportDialog::open_prompt_dialog (string text)
{ {
MessageDialog msg (text, false, MESSAGE_QUESTION, BUTTONS_OK_CANCEL, true); ArdourMessageDialog msg (text, false, MESSAGE_QUESTION, BUTTONS_OK_CANCEL, true);
if (msg.run() == RESPONSE_OK) { if (msg.run() == RESPONSE_OK) {
return true; return true;
} }

25
gtk2_ardour/startup_fsm.cc
View file

@ -43,6 +43,7 @@
#include <gtkmm2ext/doi.h> #include <gtkmm2ext/doi.h>
#include <gtkmm2ext/keyboard.h> #include <gtkmm2ext/keyboard.h>
#include "ardour_message.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "debug.h" #include "debug.h"
#include "engine_dialog.h" #include "engine_dialog.h"
@ -634,7 +635,7 @@ StartupFSM::check_session_parameters (bool must_be_new)
int rv = ARDOUR::inflate_session (session_name, Config->get_default_session_parent_dir(), session_path, session_name); int rv = ARDOUR::inflate_session (session_name, Config->get_default_session_parent_dir(), session_path, session_name);
if (rv < 0) { if (rv < 0) {
MessageDialog msg (*session_dialog, string_compose (_("Extracting session-archive failed: %1"), inflate_error (rv))); ArdourMessageDialog msg (*session_dialog, string_compose (_("Extracting session-archive failed: %1"), inflate_error (rv)));
msg.run (); msg.run ();
return 1; return 1;
@ -701,10 +702,10 @@ StartupFSM::check_session_parameters (bool must_be_new)
const char illegal = Session::session_name_is_legal (session_name); const char illegal = Session::session_name_is_legal (session_name);
if (illegal) { if (illegal) {
MessageDialog msg (*session_dialog, ArdourMessageDialog msg (*session_dialog,
string_compose (_("To ensure compatibility with various systems\n" string_compose (_("To ensure compatibility with various systems\n"
"session names may not contain a '%1' character"), "session names may not contain a '%1' character"),
illegal)); illegal));
msg.run (); msg.run ();
ARDOUR_COMMAND_LINE::session_name = ""; // cancel that ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
return 1; /* keep running dialog */ return 1; /* keep running dialog */
@ -734,8 +735,7 @@ StartupFSM::check_session_parameters (bool must_be_new)
/* does not exist at present */ /* does not exist at present */
if (!requested_new) { if (!requested_new) {
ARDOUR_UI::pop_back_splash (*session_dialog); ArdourMessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
MessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
msg.run (); msg.run ();
session_dialog->clear_name(); session_dialog->clear_name();
return 1; return 1;
@ -830,18 +830,17 @@ StartupFSM::ask_about_loading_existing_session (const std::string& session_path)
{ {
std::string str = string_compose (_("This session\n%1\nalready exists. Do you want to open it?"), session_path); std::string str = string_compose (_("This session\n%1\nalready exists. Do you want to open it?"), session_path);
MessageDialog msg (str, ArdourMessageDialog msg (str,
false, false,
Gtk::MESSAGE_WARNING, Gtk::MESSAGE_WARNING,
Gtk::BUTTONS_YES_NO, Gtk::BUTTONS_YES_NO,
true); true);
msg.set_name (X_("OpenExistingDialog")); msg.set_name (X_("OpenExistingDialog"));
msg.set_title (_("Open Existing Session")); msg.set_title (_("Open Existing Session"));
msg.set_wmclass (X_("existing_session"), PROGRAM_NAME); msg.set_wmclass (X_("existing_session"), PROGRAM_NAME);
msg.set_position (Gtk::WIN_POS_CENTER); msg.set_position (Gtk::WIN_POS_CENTER);
ARDOUR_UI::pop_back_splash (msg);
switch (msg.run()) { switch (msg.run()) {
case RESPONSE_YES: case RESPONSE_YES: