From d9e0a534a58252ed36a32c36b0b5e756af39eec9 Mon Sep 17 00:00:00 2001 From: Nikolay Date: Tue, 9 Dec 2014 11:57:30 +0200 Subject: [PATCH] [Summary] Message Dialog rework [Reviewed] VKamyshniy --- gtk2_ardour/ardour_ui.cc | 116 +++---- gtk2_ardour/ardour_ui.h | 3 +- gtk2_ardour/ardour_ui_dialogs.cc | 2 +- gtk2_ardour/editor.cc | 8 +- gtk2_ardour/editor_audio_import.cc | 47 ++- gtk2_ardour/editor_export_audio.cc | 20 +- gtk2_ardour/editor_mixer.cc | 2 +- gtk2_ardour/editor_ops.cc | 23 +- gtk2_ardour/engine_dialog.cc | 2 +- gtk2_ardour/export_dialog.cc | 3 +- gtk2_ardour/export_filename_selector.cc | 5 +- gtk2_ardour/export_range_markers_dialog.cc | 6 +- .../macosx/tracks.xcodeproj/project.pbxproj | 80 ++--- gtk2_ardour/main.cc | 21 +- gtk2_ardour/mixer_strip.cc | 5 +- gtk2_ardour/plugin_selector.cc | 3 +- gtk2_ardour/processor_box.cc | 3 +- gtk2_ardour/route_ui.cc | 12 +- gtk2_ardour/tracks_control_panel.logic.cc | 6 +- gtk2_ardour/ui/waves_clean_up_dialog.xml | 62 ++++ .../waves_connect_to_backend_error_dialog.xml | 62 ++++ .../ui/waves_excessive_split_dialog.xml | 63 ++++ gtk2_ardour/ui/waves_export_dialog.xml | 302 ++++++++++++++++++ gtk2_ardour/ui/waves_file_exists_dialog.xml | 65 ++++ .../ui/waves_how_to_import_dialog_1.xml | 62 ++++ .../ui/waves_how_to_import_dialog_2.xml | 62 ++++ gtk2_ardour/ui/waves_route_rename_dialog.xml | 64 ++++ 27 files changed, 892 insertions(+), 217 deletions(-) create mode 100644 gtk2_ardour/ui/waves_clean_up_dialog.xml create mode 100644 gtk2_ardour/ui/waves_connect_to_backend_error_dialog.xml create mode 100644 gtk2_ardour/ui/waves_excessive_split_dialog.xml create mode 100644 gtk2_ardour/ui/waves_export_dialog.xml create mode 100644 gtk2_ardour/ui/waves_file_exists_dialog.xml create mode 100644 gtk2_ardour/ui/waves_how_to_import_dialog_1.xml create mode 100644 gtk2_ardour/ui/waves_how_to_import_dialog_2.xml create mode 100644 gtk2_ardour/ui/waves_route_rename_dialog.xml diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 952926bf11..b89c684633 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -483,10 +483,9 @@ was not fast enough. Try to restart\n\ the audio backend and save the session."), PROGRAM_NAME); } - MessageDialog msg (*editor, msgstr); + WavesMessageDialog msg ("", msgstr); pop_back_splash (msg); - msg.set_keep_above (true); - msg.run (); + msg.run (); if (free_reason) { free (const_cast (reason)); @@ -986,11 +985,11 @@ ARDOUR_UI::finish() /* use the default name */ if (save_state_canfail ("")) { /* failed - don't quit */ - MessageDialog msg (*editor, + WavesMessageDialog msg ("", string_compose (_("\ %1 was unable to save your session.\n\n\ If you still wish to quit, please use the\n\n\ -\"Just quit\" option."), PROGRAM_NAME)); +\"Don't save\" option."), PROGRAM_NAME)); pop_back_splash(msg); msg.run (); return; @@ -1502,7 +1501,7 @@ bool ARDOUR_UI::check_audioengine () { if (!AudioEngine::instance()->connected()) { - MessageDialog msg (string_compose ( + WavesMessageDialog msg ("", string_compose ( _("%1 is not connected to any audio backend.\n" "You cannot open or close sessions in this condition"), PROGRAM_NAME)); @@ -1560,7 +1559,7 @@ ARDOUR_UI::session_add_mixed_track (const ChanCount& input, const ChanCount& out } catch (...) { - MessageDialog msg (*editor, + WavesMessageDialog msg ("", string_compose (_("There are insufficient ports available\n\ to create a new track or bus.\n\ You should save %1, exit and\n\ @@ -1621,7 +1620,7 @@ ARDOUR_UI::session_add_audio_route ( } catch (...) { - MessageDialog msg (*editor, + WavesMessageDialog msg ("", string_compose (_("There are insufficient ports available\n\ to create a new track or bus.\n\ You should save %1, exit and\n\ @@ -1768,7 +1767,7 @@ ARDOUR_UI::transport_record (bool roll) switch (_session->record_status()) { case Session::Disabled: if (_session->ntracks() == 0) { - MessageDialog msg (*editor, _("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.")); + WavesMessageDialog msg ("", _("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 (); return; } @@ -2281,7 +2280,7 @@ ARDOUR_UI::snapshot_session (bool switch_to_it) if (do_save) { char illegal = Session::session_name_is_legal(snapname); if (illegal) { - MessageDialog msg (string_compose (_("To ensure compatibility with various systems\n" + WavesMessageDialog msg ("", string_compose (_("To ensure compatibility with various systems\n" "snapshot names may not contain a '%1' character"), illegal)); msg.run (); goto again; @@ -2346,7 +2345,7 @@ ARDOUR_UI::rename_session () char illegal = Session::session_name_is_legal (name); if (illegal) { - MessageDialog msg (string_compose (_("To ensure compatibility with various systems\n" + WavesMessageDialog msg ("", string_compose (_("To ensure compatibility with various systems\n" "session names may not contain a '%1' character"), illegal)); msg.run (); goto again; @@ -2354,7 +2353,7 @@ ARDOUR_UI::rename_session () switch (_session->rename (name)) { case -1: { - MessageDialog msg (_("That name is already in use by another directory/folder. Please try again.")); + WavesMessageDialog msg ("", _("That name is already in use by another directory/folder. Please try again.")); msg.set_position (WIN_POS_MOUSE); msg.run (); goto again; @@ -2363,7 +2362,7 @@ ARDOUR_UI::rename_session () case 0: break; default: { - MessageDialog msg (_("Renaming this session failed.\nThings could be seriously messed up at this point")); + WavesMessageDialog msg ("", _("Renaming this session failed.\nThings could be seriously messed up at this point")); msg.set_position (WIN_POS_MOUSE); msg.run (); break; @@ -2520,16 +2519,7 @@ 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); - MessageDialog msg (str, - false, - Gtk::MESSAGE_WARNING, - Gtk::BUTTONS_YES_NO, - true); - - - msg.set_name (X_("OpenExistingDialog")); - msg.set_title (_("Open Existing Session")); - msg.set_wmclass (X_("existing_session"), PROGRAM_NAME); + WavesMessageDialog msg ("",str, WavesMessageDialog::BUTTON_YES | WavesMessageDialog::BUTTON_NO); msg.set_position (Gtk::WIN_POS_MOUSE); pop_back_splash (msg); @@ -2902,7 +2892,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri if (!likely_new) { pop_back_splash (session_dialog); - MessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path)); + WavesMessageDialog msg ("", string_compose (_("There is no existing session at \"%1\""), session_path)); msg.run (); ARDOUR_COMMAND_LINE::session_name = ""; // cancel that continue; @@ -2912,7 +2902,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri if (illegal) { pop_back_splash (session_dialog); - MessageDialog msg (session_dialog, string_compose(_("To ensure compatibility with various systems\n" + WavesMessageDialog msg ("", string_compose(_("To ensure compatibility with various systems\n" "session names may not contain a '%1' character"), illegal)); msg.run (); ARDOUR_COMMAND_LINE::session_name = ""; // cancel that @@ -3004,23 +2994,14 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name, catch (AudioEngine::PortRegistrationFailure& err) { - MessageDialog msg (err.what(), - true, - Gtk::MESSAGE_INFO, - Gtk::BUTTONS_CLOSE); - - msg.set_title (_("Port Registration Error")); - msg.set_secondary_text (_("Click the Close button to try again.")); + WavesMessageDialog msg ("Port Registration Error", string( err.what() ) + "\nClick the Close button to try again.", WavesMessageDialog::BUTTON_CLOSE ); msg.set_position (Gtk::WIN_POS_CENTER); pop_back_splash (msg); msg.present (); - int response = msg.run (); - msg.hide (); - switch (response) { - case RESPONSE_CANCEL: + case RESPONSE_CLOSE: exit (1); default: break; @@ -3115,7 +3096,7 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name, catch (...) { - MessageDialog msg (string_compose(_("Could not create session in \"%1\""), path)); + WavesMessageDialog msg ("", string_compose(_("Could not create session in \"%1\""), path)); pop_back_splash (msg); msg.run (); return -1; @@ -3213,17 +3194,12 @@ ARDOUR_UI::display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* lis removed = rep.paths.size(); if (removed == 0) { - MessageDialog msgd (*editor, - _("No files were ready for clean-up"), - true, - Gtk::MESSAGE_INFO, - Gtk::BUTTONS_OK); - msgd.set_title (_("Clean-up")); - msgd.set_secondary_text (_("If this seems suprising, \n\ + WavesMessageDialog msgd ("", _("No files were ready for clean-up\n" +"If this seems suprising, \n\ check for any existing snapshots.\n\ These may still include regions that\n\ require some unused files to continue to exist.")); - + msgd.run (); return; } @@ -3354,28 +3330,13 @@ ARDOUR_UI::cleanup () /* shouldn't happen: menu item is insensitive */ return; } - - - MessageDialog checker (_("Are you sure you want to clean-up?"), - true, - Gtk::MESSAGE_QUESTION, - Gtk::BUTTONS_NONE); - - checker.set_title (_("Clean-up")); - - checker.set_secondary_text(_("Clean-up is a destructive operation.\n\ + + WavesMessageDialog msg("waves_clean_up_dialog.xml","", _("Are you sure want to clean-up?\n Clean-up is a destructive operation.\n\ ALL undo/redo information will be lost if you clean-up.\n\ -Clean-up will move all unused files to a \"dead\" location.")); +Clean-up will move all unused files to a \"dead\" location."), + WavesMessageDialog::BUTTON_CANCEL | WavesMessageDialog::BUTTON_ACCEPT); - checker.add_button ("CANCEL", RESPONSE_CANCEL); - checker.add_button (_("Clean-up"), RESPONSE_ACCEPT); - checker.set_default_response (RESPONSE_CANCEL); - - checker.set_name (_("CleanupDialog")); - checker.set_wmclass (X_("ardour_cleanup"), PROGRAM_NAME); - checker.set_position (Gtk::WIN_POS_MOUSE); - - switch (checker.run()) { + switch (msg.run()) { case RESPONSE_ACCEPT: break; default: @@ -3400,7 +3361,7 @@ Clean-up will move all unused files to a \"dead\" location.")); editor->finish_cleanup (); - checker.hide(); + msg.hide (); display_cleanup_results (rep, _("Cleaned Files"), false); } @@ -3898,8 +3859,7 @@ ARDOUR_UI::create_xrun_marker (framepos_t where) void ARDOUR_UI::halt_on_xrun_message () { - MessageDialog msg (*editor, - _("Recording was stopped because your system could not keep up.")); + WavesMessageDialog msg ("", _("Recording was stopped because your system could not keep up.")); msg.run (); } @@ -3928,7 +3888,7 @@ ARDOUR_UI::disk_overrun_handler () if (!have_disk_speed_dialog_displayed) { have_disk_speed_dialog_displayed = true; - MessageDialog* msg = new MessageDialog (*editor, string_compose (_("\ + WavesMessageDialog* msg = new WavesMessageDialog ("", string_compose (_("\ The disk system on your computer\n\ was not able to keep up with %1.\n\ \n\ @@ -4056,8 +4016,8 @@ ARDOUR_UI::disk_underrun_handler () if (!have_disk_speed_dialog_displayed) { have_disk_speed_dialog_displayed = true; - MessageDialog* msg = new MessageDialog ( - *editor, string_compose (_("The disk system on your computer\n\ + WavesMessageDialog* msg = new WavesMessageDialog ( + "", string_compose (_("The disk system on your computer\n\ was not able to keep up with %1.\n\ \n\ Specifically, it failed to read data from disk\n\ @@ -4068,7 +4028,7 @@ quickly enough to keep up with playback.\n"), PROGRAM_NAME)); } void -ARDOUR_UI::disk_speed_dialog_gone (int /*ignored_response*/, MessageDialog* msg) +ARDOUR_UI::disk_speed_dialog_gone (int /*ignored_response*/, WavesMessageDialog* msg) { have_disk_speed_dialog_displayed = false; delete msg; @@ -4149,7 +4109,7 @@ ARDOUR_UI::disconnect_from_engine () halt_connection.disconnect (); if (AudioEngine::instance()->stop ()) { - MessageDialog msg (*editor, _("Could not disconnect from Audio/MIDI engine")); + WavesMessageDialog msg ("", _("Could not disconnect from Audio/MIDI engine")); msg.run (); return -1; } else { @@ -4163,13 +4123,9 @@ int ARDOUR_UI::reconnect_to_engine () { if (AudioEngine::instance()->start ()) { - if (editor) { - MessageDialog msg (*editor, _("Could not reconnect to the Audio/MIDI engine")); - msg.run (); - } else { - MessageDialog msg (_("Could not reconnect to the Audio/MIDI engine")); - msg.run (); - } + WavesMessageDialog msg ("", _("Could not reconnect to the Audio/MIDI engine")); + msg.run (); + return -1; } diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index e3d6066959..a053f014df 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -75,6 +75,7 @@ #include "session_lock_dialog.h" #include "tracks_control_panel.h" #include "marker_inspector_dialog.h" +#include "waves_message_dialog.h" #include "ui_config.h" #include "enums.h" #include "visibility_group.h" @@ -729,7 +730,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr ARDOUR::microseconds_t last_shuttle_request; bool have_disk_speed_dialog_displayed; - void disk_speed_dialog_gone (int ignored_response, Gtk::MessageDialog*); + void disk_speed_dialog_gone (int ignored_response, WavesMessageDialog*); void disk_overrun_handler (); void disk_underrun_handler (); void gui_idle_handler (); diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 9841a42aea..a12100b0af 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -380,7 +380,7 @@ ARDOUR_UI::goto_mixer_window () } if (g_getenv ("ARDOUR_LOVES_STUPID_TINY_SCREENS") == 0 && screen && screen->get_height() < 700) { - Gtk::MessageDialog msg (_("This screen is not tall enough to display the mixer window")); + WavesMessageDialog msg ("",_("This screen is not tall enough to display the mixer window")); msg.run (); return; } diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index e614b9545d..919608af6a 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4877,14 +4877,10 @@ Editor::show_rhythm_ferret () void Editor::first_idle () { - MessageDialog* dialog = 0; + WavesMessageDialog* dialog = 0; if (track_views.size() > 1) { - dialog = new MessageDialog ( - *this, - string_compose (_("Please wait while %1 loads visual data."), PROGRAM_NAME), - true - ); + dialog = new WavesMessageDialog ("", string_compose (_("Please wait while %1 loads visual data."), PROGRAM_NAME) ); dialog->present (); ARDOUR_UI::instance()->flush_pending (); } diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 1655add62f..6510e70a9c 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -74,7 +74,7 @@ void Editor::add_external_audio_action (ImportMode mode_hint) { if (_session == 0) { - MessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded.")); + WavesMessageDialog msg ("", _("You can't import or embed an audiofile until you have a session loaded.")); msg.run (); return; } @@ -96,7 +96,7 @@ Editor::external_audio_dialog () uint32_t midi_track_cnt; if (_session == 0) { - MessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded.")); + WavesMessageDialog msg ("", _("You can't import or embed an audiofile until you have a session loaded.")); msg.run (); return; } @@ -166,40 +166,37 @@ Editor::check_whether_and_how_to_import(string path, bool all_or_nothing) already_exists = true; } - int function = 1; - - if (already_exists) { + if (already_exists) + { string message; + std::string layout_name; + if (all_or_nothing) { // updating is still disabled //message = string_compose(_("The session already contains a source file named %1. Do you want to update that file (and thus all regions using the file) or import this file as a new file?"),wave_name); - message = string_compose (_("The session already contains a source file named %1. Do you want to import %1 as a new file, or skip it?"), wave_name); + layout_name = "waves_how_to_import_dialog_1.xml"; + message = string_compose (_("The session already contains a source file named %1. Do you want to import %1 as a new file, or skip it?"), wave_name); } else { + layout_name = "waves_how_to_import_dialog_2.xml"; 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); + + WavesMessageDialog msg (layout_name, "", message, WavesMessageDialog::BUTTON_OK | WavesMessageDialog::BUTTON_CANCEL ); + msg.set_position (Gtk::WIN_POS_CENTER); + + switch ( msg.run() ) { + case Gtk::RESPONSE_OK: + return 1; + break; + case Gtk::RESPONSE_CANCEL: + return 2; + break; + } - if (all_or_nothing) { - // disabled - //dialog.add_button("Update", 0); - dialog.add_button("Import", 1); - dialog.add_button("Skip", 2); - } else { - dialog.add_button("Import", 1); - dialog.add_button("Cancel", 2); - } - - //dialog.add_button("Skip all", 4); // All or rest? - - dialog.show(); - - function = dialog.run (); - - dialog.hide(); } - return function; + return 1; } boost::shared_ptr diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index f9128419ec..2c2c8bcebd 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -51,6 +51,7 @@ #include "public_editor.h" #include "selection.h" #include "time_axis_view.h" +#include "waves_message_dialog.h" #include "i18n.h" @@ -142,21 +143,10 @@ Editor::export_region () if (Glib::file_test (path, Glib::FILE_TEST_EXISTS)) { - MessageDialog checker (_("File Exists!"), - true, - Gtk::MESSAGE_WARNING, - Gtk::BUTTONS_NONE); - - checker.set_title (_("File Exists!")); - - checker.add_button ("CANCEL", RESPONSE_CANCEL); - checker.add_button (_("Overwrite Existing File"), RESPONSE_ACCEPT); - checker.set_default_response (RESPONSE_CANCEL); - - checker.set_wmclass (X_("midi_export_file_exists"), PROGRAM_NAME); - checker.set_position (Gtk::WIN_POS_MOUSE); - - ret = checker.run (); + WavesMessageDialog msg ("waves_file_exists_dialog.xml", "", _("File Exists!"), WavesMessageDialog::BUTTON_CANCEL | WavesMessageDialog::BUTTON_ACCEPT); + msg.set_position (Gtk::WIN_POS_MOUSE); + + ret = msg.run (); switch (ret) { case Gtk::RESPONSE_ACCEPT: diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index 00cd90ccfa..1fda0c73ed 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -90,7 +90,7 @@ Editor::show_editor_mixer (bool yn) } if (g_getenv ("ARDOUR_LOVES_STUPID_TINY_SCREENS") == 0 && screen && screen->get_height() < 700) { - Gtk::MessageDialog msg (_("This screen is not tall enough to display the editor mixer")); + WavesMessageDialog msg ("", _("This screen is not tall enough to display the editor mixer")); msg.run (); return; } diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 5d5c019453..0d1bec2a5b 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -6108,23 +6108,11 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList } - 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); - MessageDialog msg (msgstr, - false, - Gtk::MESSAGE_INFO, - Gtk::BUTTONS_OK_CANCEL); - - if (can_ferret) { - msg.add_button (_("Call for the Ferret!"), RESPONSE_APPLY); - msg.set_secondary_text (_("Press OK to continue with this split operation\nor ask the Ferret dialog to tune the analysis")); - } else { - msg.set_secondary_text (_("Press OK to continue with this split operation")); - } - - msg.set_title (_("Excessive split?")); + if (positions.size() > 20 && can_ferret) + { + string message = string_compose (_("You are about to split\n%1\ninto %2 pieces.\nThis could take a long time.\nPress OK to continue with this split operation\nor ask the Ferret dialog to tune the analysis"), r->name(), positions.size() + 1); + WavesMessageDialog msg ("waves_excessive_split_dialog.xml", "", message, WavesMessageDialog::BUTTON_CANCEL | WavesMessageDialog::BUTTON_OK | WavesMessageDialog::BUTTON_ACCEPT ); msg.present (); - int response = msg.run(); msg.hide (); @@ -6919,7 +6907,8 @@ Editor::fit_tracks (TrackViewList & tracks) double first_y_pos = DBL_MAX; if (h < TimeAxisView::preset_height (HeightSmall)) { - MessageDialog msg (*this, _("There are too many tracks to fit in the current window")); + WavesMessageDialog msg ("", _("There are too many tracks to fit in the current window")); + msg.run (); /* too small to be displayed */ return; } diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index 437aea7d39..219591e6cf 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -105,7 +105,7 @@ EngineControl::EngineControl () vector backends = ARDOUR::AudioEngine::instance()->available_backends(); 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)); + WavesMessageDialog 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 (); throw failed_constructor (); } diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index 16afb24c68..332909b102 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -27,6 +27,7 @@ #include "ardour/export_status.h" #include "ardour/export_handler.h" +#include "waves_message_dialog.h" #include "export_dialog.h" #include "gui_thread.h" #include "nag.h" @@ -180,7 +181,7 @@ ExportDialog::notify_errors (bool force) { if (force || status->errors()) { std::string txt = _("Export has been aborted due to an error!\nSee the Log for details."); - Gtk::MessageDialog msg (txt, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); + WavesMessageDialog msg ("", txt); msg.run(); } } diff --git a/gtk2_ardour/export_filename_selector.cc b/gtk2_ardour/export_filename_selector.cc index 0ed6fcac2b..6f7584166d 100644 --- a/gtk2_ardour/export_filename_selector.cc +++ b/gtk2_ardour/export_filename_selector.cc @@ -21,6 +21,7 @@ #include #include "export_filename_selector.h" +#include "waves_message_dialog.h" #include "i18n.h" @@ -247,7 +248,7 @@ ExportFilenameSelector::check_folder () } if (!Glib::file_test (path_entry.get_text(), Glib::FILE_TEST_IS_DIR|Glib::FILE_TEST_EXISTS)) { - Gtk::MessageDialog msg (string_compose (_("%1: this is only the directory/folder name, not the filename.\n\ + WavesMessageDialog msg ("", string_compose (_("%1: this is only the directory/folder name, not the filename.\n\ The filename will be chosen from the information just above the folder selector."), path_entry.get_text())); msg.run (); path_entry.set_text (Glib::path_get_dirname (path_entry.get_text())); @@ -333,7 +334,7 @@ ExportFilenameSelector::open_browse_dialog () std::string filename = dialog.get_filename(); if (!Glib::file_test (filename, Glib::FILE_TEST_IS_DIR|Glib::FILE_TEST_EXISTS)) { - Gtk::MessageDialog msg (string_compose (_("%1: this is only the directory/folder name, not the filename.\n\ + WavesMessageDialog msg ("", string_compose (_("%1: this is only the directory/folder name, not the filename.\n\ The filename will be chosen from the information just above the folder selector."), filename)); msg.run (); continue; diff --git a/gtk2_ardour/export_range_markers_dialog.cc b/gtk2_ardour/export_range_markers_dialog.cc index 97a8dba25f..3e1a8df5f6 100644 --- a/gtk2_ardour/export_range_markers_dialog.cc +++ b/gtk2_ardour/export_range_markers_dialog.cc @@ -140,7 +140,7 @@ ExportRangeMarkersDialog::is_filepath_valid(string &filepath) if (filepath.empty()) { // warning dialog string txt = _("Please enter a valid target directory."); - MessageDialog msg (*this, txt, false, MESSAGE_ERROR, BUTTONS_OK, true); + WavesMessageDialog msg ("", txt); msg.run(); return false; } @@ -148,7 +148,7 @@ ExportRangeMarkersDialog::is_filepath_valid(string &filepath) if ( (stat (filepath.c_str(), &statbuf) != 0) || (!S_ISDIR (statbuf.st_mode)) ) { string txt = _("Please select an existing target directory. Files are not allowed!"); - MessageDialog msg (*this, txt, false, MESSAGE_ERROR, BUTTONS_OK, true); + WavesMessageDialog msg ("", txt); msg.run(); return false; } @@ -157,7 +157,7 @@ ExportRangeMarkersDialog::is_filepath_valid(string &filepath) string dirpath = Glib::path_get_dirname (filepath); if (!exists_and_writable (dirpath)) { string txt = _("Cannot write file in: ") + dirpath; - MessageDialog msg (*this, txt, false, MESSAGE_ERROR, BUTTONS_OK, true); + WavesMessageDialog msg ("", txt); msg.run(); return false; } diff --git a/gtk2_ardour/macosx/tracks.xcodeproj/project.pbxproj b/gtk2_ardour/macosx/tracks.xcodeproj/project.pbxproj index e91111cc81..a2f9373e29 100644 --- a/gtk2_ardour/macosx/tracks.xcodeproj/project.pbxproj +++ b/gtk2_ardour/macosx/tracks.xcodeproj/project.pbxproj @@ -271,19 +271,24 @@ 43B351ED194F04E00038C140 /* step_editing.bindings in Resources */ = {isa = PBXBuildFile; fileRef = 43B351C0194F04E00038C140 /* step_editing.bindings */; }; 95176F7A1A08E6E800E32046 /* file_sample_rate_mismatch_dialog.cc in Sources */ = {isa = PBXBuildFile; fileRef = 95176F791A08E6E800E32046 /* file_sample_rate_mismatch_dialog.cc */; }; 95176F7E1A08E76F00E32046 /* file_sample_rate_mismatch_dialog.xml in Resources */ = {isa = PBXBuildFile; fileRef = 95176F7D1A08E76F00E32046 /* file_sample_rate_mismatch_dialog.xml */; }; - 95176F861A092A2900E32046 /* ok_dialog.xml in Resources */ = {isa = PBXBuildFile; fileRef = 95176F841A092A2900E32046 /* ok_dialog.xml */; }; 95176F871A092A2900E32046 /* yes_no_dialog.xml in Resources */ = {isa = PBXBuildFile; fileRef = 95176F851A092A2900E32046 /* yes_no_dialog.xml */; }; - 95176F8F1A092A5B00E32046 /* ok_dialog.cc in Sources */ = {isa = PBXBuildFile; fileRef = 95176F8D1A092A5B00E32046 /* ok_dialog.cc */; }; 95176F901A092A5B00E32046 /* yes_no_dialog.cc in Sources */ = {isa = PBXBuildFile; fileRef = 95176F8E1A092A5B00E32046 /* yes_no_dialog.cc */; }; 952E0B3C1A0A1D7000F375D0 /* buildlog.txt in Resources */ = {isa = PBXBuildFile; fileRef = 952E0B3B1A0A1D7000F375D0 /* buildlog.txt */; }; 954DCFBD1A0239DA00B7160E /* about_dialog.cc in Sources */ = {isa = PBXBuildFile; fileRef = 954DCFBC1A0239DA00B7160E /* about_dialog.cc */; }; 954DCFC11A023AAB00B7160E /* about_dialog.xml in Resources */ = {isa = PBXBuildFile; fileRef = 954DCFBF1A023AAB00B7160E /* about_dialog.xml */; }; 954DCFC21A023AAB00B7160E /* license_dialog.xml in Resources */ = {isa = PBXBuildFile; fileRef = 954DCFC01A023AAB00B7160E /* license_dialog.xml */; }; - 954DCFDC1A07A07600B7160E /* read_only_session_dialog.cc in Sources */ = {isa = PBXBuildFile; fileRef = 954DCFDB1A07A07600B7160E /* read_only_session_dialog.cc */; }; 954DCFDE1A07A14E00B7160E /* read_only_session_dialog.xml in Resources */ = {isa = PBXBuildFile; fileRef = 954DCFDD1A07A14E00B7160E /* read_only_session_dialog.xml */; }; - 954DCFE11A07C70400B7160E /* sample_rate_mismatch_dialog.cc in Sources */ = {isa = PBXBuildFile; fileRef = 954DCFE01A07C70400B7160E /* sample_rate_mismatch_dialog.cc */; }; - 954DCFE51A07D1C800B7160E /* sample_rate_mismatch_dialog.xml in Resources */ = {isa = PBXBuildFile; fileRef = 954DCFE41A07D1C800B7160E /* sample_rate_mismatch_dialog.xml */; }; + 957EF44B1A30BFB300F1500E /* waves_message_dialog.cc in Sources */ = {isa = PBXBuildFile; fileRef = 957EF44A1A30BFB300F1500E /* waves_message_dialog.cc */; }; 95A134DE1A0239080008E3D6 /* license_dialog.cc in Sources */ = {isa = PBXBuildFile; fileRef = 95A134DD1A0239080008E3D6 /* license_dialog.cc */; }; + 95F9DFD71A35A8BD0007E953 /* waves_message_dialog.xml in Resources */ = {isa = PBXBuildFile; fileRef = 95F9DFD61A35A8BD0007E953 /* waves_message_dialog.xml */; }; + 95F9DFE01A35F3310007E953 /* waves_clean_up_dialog.xml in Resources */ = {isa = PBXBuildFile; fileRef = 95F9DFD81A35F3310007E953 /* waves_clean_up_dialog.xml */; }; + 95F9DFE11A35F3310007E953 /* waves_connect_to_backend_error_dialog.xml in Resources */ = {isa = PBXBuildFile; fileRef = 95F9DFD91A35F3310007E953 /* waves_connect_to_backend_error_dialog.xml */; }; + 95F9DFE21A35F3310007E953 /* waves_excessive_split_dialog.xml in Resources */ = {isa = PBXBuildFile; fileRef = 95F9DFDA1A35F3310007E953 /* waves_excessive_split_dialog.xml */; }; + 95F9DFE31A35F3310007E953 /* waves_export_dialog.xml in Resources */ = {isa = PBXBuildFile; fileRef = 95F9DFDB1A35F3310007E953 /* waves_export_dialog.xml */; }; + 95F9DFE41A35F3310007E953 /* waves_file_exists_dialog.xml in Resources */ = {isa = PBXBuildFile; fileRef = 95F9DFDC1A35F3310007E953 /* waves_file_exists_dialog.xml */; }; + 95F9DFE51A35F3310007E953 /* waves_how_to_import_dialog_1.xml in Resources */ = {isa = PBXBuildFile; fileRef = 95F9DFDD1A35F3310007E953 /* waves_how_to_import_dialog_1.xml */; }; + 95F9DFE61A35F3310007E953 /* waves_how_to_import_dialog_2.xml in Resources */ = {isa = PBXBuildFile; fileRef = 95F9DFDE1A35F3310007E953 /* waves_how_to_import_dialog_2.xml */; }; + 95F9DFE71A35F3310007E953 /* waves_route_rename_dialog.xml in Resources */ = {isa = PBXBuildFile; fileRef = 95F9DFDF1A35F3310007E953 /* waves_route_rename_dialog.xml */; }; CE1A907A199A37AE00ECA62B /* add_tracks_dialog.cc in Sources */ = {isa = PBXBuildFile; fileRef = CE1A9079199A37AE00ECA62B /* add_tracks_dialog.cc */; }; CE1C6DCE19879F04006BDB03 /* compact_meter_bridge.cc in Sources */ = {isa = PBXBuildFile; fileRef = CE1C6DCC19879F04006BDB03 /* compact_meter_bridge.cc */; }; CE1C6DCF19879F04006BDB03 /* compact_meter_strip.cc in Sources */ = {isa = PBXBuildFile; fileRef = CE1C6DCD19879F04006BDB03 /* compact_meter_strip.cc */; }; @@ -446,8 +451,6 @@ 432790F2194EFFB9003C9FEA /* gprofhelper.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gprofhelper.c; path = ../gprofhelper.c; sourceTree = SOURCE_ROOT; }; 432790F3194EFFB9003C9FEA /* group_tabs.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = group_tabs.cc; path = ../group_tabs.cc; sourceTree = SOURCE_ROOT; }; 432790F5194EFFB9003C9FEA /* gtk_pianokeyboard.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gtk_pianokeyboard.c; path = ../gtk_pianokeyboard.c; sourceTree = SOURCE_ROOT; }; - 432790F7194EFFB9003C9FEA /* gtk-custom-hruler.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "gtk-custom-hruler.c"; path = "../gtk-custom-hruler.c"; sourceTree = SOURCE_ROOT; }; - 432790F9194EFFB9003C9FEA /* gtk-custom-ruler.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "gtk-custom-ruler.c"; path = "../gtk-custom-ruler.c"; sourceTree = SOURCE_ROOT; }; 432790FB194EFFB9003C9FEA /* gui_object.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gui_object.cc; path = ../gui_object.cc; sourceTree = SOURCE_ROOT; }; 432790FE194EFFB9003C9FEA /* hit.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hit.cc; path = ../hit.cc; sourceTree = SOURCE_ROOT; }; 43279101194EFFB9003C9FEA /* insert_time_dialog.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = insert_time_dialog.cc; path = ../insert_time_dialog.cc; sourceTree = SOURCE_ROOT; }; @@ -502,7 +505,6 @@ 43279164194EFFB9003C9FEA /* note.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = note.cc; path = ../note.cc; sourceTree = SOURCE_ROOT; }; 43279166194EFFB9003C9FEA /* nsm.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = nsm.cc; path = ../nsm.cc; sourceTree = SOURCE_ROOT; }; 43279168194EFFB9003C9FEA /* nsmclient.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = nsmclient.cc; path = ../nsmclient.cc; sourceTree = SOURCE_ROOT; }; - 4327916B194EFFB9003C9FEA /* open_file_dialog.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = open_file_dialog.cc; path = ../open_file_dialog.cc; sourceTree = SOURCE_ROOT; }; 4327916D194EFFB9003C9FEA /* open_file_dialog.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = open_file_dialog.mm; path = ../open_file_dialog.mm; sourceTree = SOURCE_ROOT; }; 4327916E194EFFB9003C9FEA /* option_editor.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = option_editor.cc; path = ../option_editor.cc; sourceTree = SOURCE_ROOT; }; 43279170194EFFB9003C9FEA /* opts.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = opts.cc; path = ../opts.cc; sourceTree = SOURCE_ROOT; }; @@ -560,7 +562,6 @@ 432791E2194EFFBA003C9FEA /* shuttle_control.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = shuttle_control.cc; path = ../shuttle_control.cc; sourceTree = SOURCE_ROOT; }; 432791E4194EFFBA003C9FEA /* speaker_dialog.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = speaker_dialog.cc; path = ../speaker_dialog.cc; sourceTree = SOURCE_ROOT; }; 432791E6194EFFBA003C9FEA /* splash.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = splash.cc; path = ../splash.cc; sourceTree = SOURCE_ROOT; }; - 432791E8194EFFBA003C9FEA /* startup.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = startup.cc; path = ../startup.cc; sourceTree = SOURCE_ROOT; }; 432791EA194EFFBA003C9FEA /* step_editor.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = step_editor.cc; path = ../step_editor.cc; sourceTree = SOURCE_ROOT; }; 432791EC194EFFBA003C9FEA /* step_entry.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = step_entry.cc; path = ../step_entry.cc; sourceTree = SOURCE_ROOT; }; 432791EE194EFFBA003C9FEA /* stereo_panner_editor.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stereo_panner_editor.cc; path = ../stereo_panner_editor.cc; sourceTree = SOURCE_ROOT; }; @@ -951,8 +952,6 @@ 43B3513D194F04E00038C140 /* global_signals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = global_signals.h; path = ../global_signals.h; sourceTree = SOURCE_ROOT; }; 43B3513E194F04E00038C140 /* group_tabs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = group_tabs.h; path = ../group_tabs.h; sourceTree = SOURCE_ROOT; }; 43B3513F194F04E00038C140 /* gtk_pianokeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gtk_pianokeyboard.h; path = ../gtk_pianokeyboard.h; sourceTree = SOURCE_ROOT; }; - 43B35140194F04E00038C140 /* gtk-custom-hruler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "gtk-custom-hruler.h"; path = "../gtk-custom-hruler.h"; sourceTree = SOURCE_ROOT; }; - 43B35141194F04E00038C140 /* gtk-custom-ruler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "gtk-custom-ruler.h"; path = "../gtk-custom-ruler.h"; sourceTree = SOURCE_ROOT; }; 43B35142194F04E00038C140 /* gui_object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gui_object.h; path = ../gui_object.h; sourceTree = SOURCE_ROOT; }; 43B35143194F04E00038C140 /* gui_thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gui_thread.h; path = ../gui_thread.h; sourceTree = SOURCE_ROOT; }; 43B35144194F04E00038C140 /* hit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hit.h; path = ../hit.h; sourceTree = SOURCE_ROOT; }; @@ -1129,25 +1128,28 @@ 95176F781A08E6D800E32046 /* file_sample_rate_mismatch_dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = file_sample_rate_mismatch_dialog.h; path = ../file_sample_rate_mismatch_dialog.h; sourceTree = ""; }; 95176F791A08E6E800E32046 /* file_sample_rate_mismatch_dialog.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = file_sample_rate_mismatch_dialog.cc; path = ../file_sample_rate_mismatch_dialog.cc; sourceTree = ""; }; 95176F7D1A08E76F00E32046 /* file_sample_rate_mismatch_dialog.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = file_sample_rate_mismatch_dialog.xml; sourceTree = ""; }; - 95176F841A092A2900E32046 /* ok_dialog.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = ok_dialog.xml; sourceTree = ""; }; 95176F851A092A2900E32046 /* yes_no_dialog.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = yes_no_dialog.xml; sourceTree = ""; }; - 95176F8B1A092A4700E32046 /* ok_dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ok_dialog.h; path = ../ok_dialog.h; sourceTree = ""; }; 95176F8C1A092A4700E32046 /* yes_no_dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = yes_no_dialog.h; path = ../yes_no_dialog.h; sourceTree = ""; }; - 95176F8D1A092A5B00E32046 /* ok_dialog.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ok_dialog.cc; path = ../ok_dialog.cc; sourceTree = ""; }; 95176F8E1A092A5B00E32046 /* yes_no_dialog.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = yes_no_dialog.cc; path = ../yes_no_dialog.cc; sourceTree = ""; }; 952E0B3B1A0A1D7000F375D0 /* buildlog.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = buildlog.txt; path = ../../../buildlog.txt; sourceTree = ""; }; 954DCFBC1A0239DA00B7160E /* about_dialog.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = about_dialog.cc; path = ../about_dialog.cc; sourceTree = ""; }; 954DCFBE1A0239EC00B7160E /* about_dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = about_dialog.h; path = ../about_dialog.h; sourceTree = ""; }; 954DCFBF1A023AAB00B7160E /* about_dialog.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = about_dialog.xml; sourceTree = ""; }; 954DCFC01A023AAB00B7160E /* license_dialog.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = license_dialog.xml; sourceTree = ""; }; - 954DCFD71A07A06300B7160E /* read_only_session_dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = read_only_session_dialog.h; path = ../read_only_session_dialog.h; sourceTree = ""; }; - 954DCFDB1A07A07600B7160E /* read_only_session_dialog.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = read_only_session_dialog.cc; path = ../read_only_session_dialog.cc; sourceTree = ""; }; 954DCFDD1A07A14E00B7160E /* read_only_session_dialog.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = read_only_session_dialog.xml; sourceTree = ""; }; - 954DCFDF1A07C6F200B7160E /* sample_rate_mismatch_dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sample_rate_mismatch_dialog.h; path = ../sample_rate_mismatch_dialog.h; sourceTree = ""; }; - 954DCFE01A07C70400B7160E /* sample_rate_mismatch_dialog.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sample_rate_mismatch_dialog.cc; path = ../sample_rate_mismatch_dialog.cc; sourceTree = ""; }; - 954DCFE41A07D1C800B7160E /* sample_rate_mismatch_dialog.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = sample_rate_mismatch_dialog.xml; sourceTree = ""; }; + 957EF44A1A30BFB300F1500E /* waves_message_dialog.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = waves_message_dialog.cc; path = ../waves_message_dialog.cc; sourceTree = ""; }; + 957EF44F1A30BFBF00F1500E /* waves_message_dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = waves_message_dialog.h; path = ../waves_message_dialog.h; sourceTree = ""; }; 95A134DD1A0239080008E3D6 /* license_dialog.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = license_dialog.cc; path = ../license_dialog.cc; sourceTree = ""; }; 95A134DF1A02391F0008E3D6 /* license_dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = license_dialog.h; path = ../license_dialog.h; sourceTree = ""; }; + 95F9DFD61A35A8BD0007E953 /* waves_message_dialog.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = waves_message_dialog.xml; sourceTree = ""; }; + 95F9DFD81A35F3310007E953 /* waves_clean_up_dialog.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = waves_clean_up_dialog.xml; sourceTree = ""; }; + 95F9DFD91A35F3310007E953 /* waves_connect_to_backend_error_dialog.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = waves_connect_to_backend_error_dialog.xml; sourceTree = ""; }; + 95F9DFDA1A35F3310007E953 /* waves_excessive_split_dialog.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = waves_excessive_split_dialog.xml; sourceTree = ""; }; + 95F9DFDB1A35F3310007E953 /* waves_export_dialog.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = waves_export_dialog.xml; sourceTree = ""; }; + 95F9DFDC1A35F3310007E953 /* waves_file_exists_dialog.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = waves_file_exists_dialog.xml; sourceTree = ""; }; + 95F9DFDD1A35F3310007E953 /* waves_how_to_import_dialog_1.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = waves_how_to_import_dialog_1.xml; sourceTree = ""; }; + 95F9DFDE1A35F3310007E953 /* waves_how_to_import_dialog_2.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = waves_how_to_import_dialog_2.xml; sourceTree = ""; }; + 95F9DFDF1A35F3310007E953 /* waves_route_rename_dialog.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = waves_route_rename_dialog.xml; sourceTree = ""; }; CE1A9079199A37AE00ECA62B /* add_tracks_dialog.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = add_tracks_dialog.cc; path = ../add_tracks_dialog.cc; sourceTree = ""; }; CE1A907E199A37BF00ECA62B /* add_tracks_dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = add_tracks_dialog.h; path = ../add_tracks_dialog.h; sourceTree = ""; }; CE1C6DCC19879F04006BDB03 /* compact_meter_bridge.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = compact_meter_bridge.cc; path = ../compact_meter_bridge.cc; sourceTree = ""; }; @@ -1235,11 +1237,9 @@ 43279040194EFF38003C9FEA /* source */ = { isa = PBXGroup; children = ( - 95176F8D1A092A5B00E32046 /* ok_dialog.cc */, + 957EF44A1A30BFB300F1500E /* waves_message_dialog.cc */, 95176F8E1A092A5B00E32046 /* yes_no_dialog.cc */, 95176F791A08E6E800E32046 /* file_sample_rate_mismatch_dialog.cc */, - 954DCFE01A07C70400B7160E /* sample_rate_mismatch_dialog.cc */, - 954DCFDB1A07A07600B7160E /* read_only_session_dialog.cc */, 954DCFBC1A0239DA00B7160E /* about_dialog.cc */, 95A134DD1A0239080008E3D6 /* license_dialog.cc */, CE294C6B19CAD54500D12768 /* marker_io_dialog.cc */, @@ -1360,8 +1360,6 @@ 432790F2194EFFB9003C9FEA /* gprofhelper.c */, 432790F3194EFFB9003C9FEA /* group_tabs.cc */, 432790F5194EFFB9003C9FEA /* gtk_pianokeyboard.c */, - 432790F7194EFFB9003C9FEA /* gtk-custom-hruler.c */, - 432790F9194EFFB9003C9FEA /* gtk-custom-ruler.c */, 432790FB194EFFB9003C9FEA /* gui_object.cc */, 432790FE194EFFB9003C9FEA /* hit.cc */, 43279101194EFFB9003C9FEA /* insert_time_dialog.cc */, @@ -1416,7 +1414,6 @@ 43279164194EFFB9003C9FEA /* note.cc */, 43279166194EFFB9003C9FEA /* nsm.cc */, 43279168194EFFB9003C9FEA /* nsmclient.cc */, - 4327916B194EFFB9003C9FEA /* open_file_dialog.cc */, 4327916D194EFFB9003C9FEA /* open_file_dialog.mm */, 4327916E194EFFB9003C9FEA /* option_editor.cc */, 43279170194EFFB9003C9FEA /* opts.cc */, @@ -1474,7 +1471,6 @@ 432791E2194EFFBA003C9FEA /* shuttle_control.cc */, 432791E4194EFFBA003C9FEA /* speaker_dialog.cc */, 432791E6194EFFBA003C9FEA /* splash.cc */, - 432791E8194EFFBA003C9FEA /* startup.cc */, 432791EA194EFFBA003C9FEA /* step_editor.cc */, 432791EC194EFFBA003C9FEA /* step_entry.cc */, 432791EE194EFFBA003C9FEA /* stereo_panner_editor.cc */, @@ -1843,10 +1839,17 @@ 43279429194F0062003C9FEA /* ui */ = { isa = PBXGroup; children = ( - 95176F841A092A2900E32046 /* ok_dialog.xml */, + 95F9DFD81A35F3310007E953 /* waves_clean_up_dialog.xml */, + 95F9DFD91A35F3310007E953 /* waves_connect_to_backend_error_dialog.xml */, + 95F9DFDA1A35F3310007E953 /* waves_excessive_split_dialog.xml */, + 95F9DFDB1A35F3310007E953 /* waves_export_dialog.xml */, + 95F9DFDC1A35F3310007E953 /* waves_file_exists_dialog.xml */, + 95F9DFDD1A35F3310007E953 /* waves_how_to_import_dialog_1.xml */, + 95F9DFDE1A35F3310007E953 /* waves_how_to_import_dialog_2.xml */, + 95F9DFDF1A35F3310007E953 /* waves_route_rename_dialog.xml */, + 95F9DFD61A35A8BD0007E953 /* waves_message_dialog.xml */, 95176F851A092A2900E32046 /* yes_no_dialog.xml */, 95176F7D1A08E76F00E32046 /* file_sample_rate_mismatch_dialog.xml */, - 954DCFE41A07D1C800B7160E /* sample_rate_mismatch_dialog.xml */, 954DCFDD1A07A14E00B7160E /* read_only_session_dialog.xml */, 954DCFBF1A023AAB00B7160E /* about_dialog.xml */, 954DCFC01A023AAB00B7160E /* license_dialog.xml */, @@ -1892,11 +1895,9 @@ 43279480194F00CB003C9FEA /* headers */ = { isa = PBXGroup; children = ( - 95176F8B1A092A4700E32046 /* ok_dialog.h */, + 957EF44F1A30BFBF00F1500E /* waves_message_dialog.h */, 95176F8C1A092A4700E32046 /* yes_no_dialog.h */, 95176F781A08E6D800E32046 /* file_sample_rate_mismatch_dialog.h */, - 954DCFDF1A07C6F200B7160E /* sample_rate_mismatch_dialog.h */, - 954DCFD71A07A06300B7160E /* read_only_session_dialog.h */, 954DCFBE1A0239EC00B7160E /* about_dialog.h */, 95A134DF1A02391F0008E3D6 /* license_dialog.h */, CE294C7E19CAD58500D12768 /* ardour_dropdown.h */, @@ -1993,8 +1994,6 @@ 43B3513D194F04E00038C140 /* global_signals.h */, 43B3513E194F04E00038C140 /* group_tabs.h */, 43B3513F194F04E00038C140 /* gtk_pianokeyboard.h */, - 43B35140194F04E00038C140 /* gtk-custom-hruler.h */, - 43B35141194F04E00038C140 /* gtk-custom-ruler.h */, 43B35142194F04E00038C140 /* gui_object.h */, 43B35143194F04E00038C140 /* gui_thread.h */, 43B35144194F04E00038C140 /* hit.h */, @@ -2310,9 +2309,9 @@ 43279334194F003A003C9FEA /* application-x-ardour_22px.png in Resources */, 43279335194F003A003C9FEA /* application-x-ardour_32px.png in Resources */, 43279336194F003A003C9FEA /* application-x-ardour_48px.png in Resources */, - 954DCFE51A07D1C800B7160E /* sample_rate_mismatch_dialog.xml in Resources */, 43279337194F003A003C9FEA /* ardour-app-icon_osx.png in Resources */, 43279338194F003A003C9FEA /* ardour-app-icon_osx_mask.png in Resources */, + 95F9DFE71A35F3310007E953 /* waves_route_rename_dialog.xml in Resources */, 43279339194F003A003C9FEA /* ardour_icon_16px.png in Resources */, 4327933A194F003A003C9FEA /* ardour_icon_22px.png in Resources */, 4327933B194F003A003C9FEA /* ardour_icon_256px.png in Resources */, @@ -2334,6 +2333,7 @@ 4327934B194F003A003C9FEA /* fadein-fast-cut.png in Resources */, 4327934C194F003A003C9FEA /* fadein-linear.png in Resources */, 4327934D194F003A003C9FEA /* fadein-long-cut.png in Resources */, + 95F9DFE11A35F3310007E953 /* waves_connect_to_backend_error_dialog.xml in Resources */, 4327934E194F003A003C9FEA /* fadein-S1.png in Resources */, 4327934F194F003A003C9FEA /* fadein-S2.png in Resources */, 43279350194F003A003C9FEA /* fadein-short-cut.png in Resources */, @@ -2418,7 +2418,6 @@ 4327939E194F003A003C9FEA /* record-normal-enabled.png in Resources */, 4327939F194F003A003C9FEA /* record-normal-in-progress.png in Resources */, 432793A0194F003A003C9FEA /* record-step.png in Resources */, - 95176F861A092A2900E32046 /* ok_dialog.xml in Resources */, 432793A1194F003A003C9FEA /* record_disabled_grey.png in Resources */, 432793A2194F003A003C9FEA /* record_normal_red.png in Resources */, 432793A3194F003A003C9FEA /* record_tape_red.png in Resources */, @@ -2429,6 +2428,7 @@ 432793A8194F003A003C9FEA /* resize_right_cursor.png in Resources */, 432793A9194F003A003C9FEA /* resize_top_cursor.png in Resources */, 432793AA194F003A003C9FEA /* resize_top_left_cursor.png in Resources */, + 95F9DFE31A35F3310007E953 /* waves_export_dialog.xml in Resources */, 432793AB194F003A003C9FEA /* resize_top_right_cursor.png in Resources */, 432793AC194F003A003C9FEA /* sae.png in Resources */, 432793AD194F003A003C9FEA /* sessionlock.png in Resources */, @@ -2511,12 +2511,14 @@ 432793F6194F003A003C9FEA /* vertical_zoom_fader_face.png in Resources */, 432793F7194F003A003C9FEA /* wholenote.png in Resources */, 432793F8194F003A003C9FEA /* zoom_fader_handle.png in Resources */, + 95F9DFE61A35F3310007E953 /* waves_how_to_import_dialog_2.xml in Resources */, 432793F9194F003A003C9FEA /* zoom_fader_handle_active.png in Resources */, 432793FA194F003A003C9FEA /* zoom_full.png in Resources */, 432793FB194F003A003C9FEA /* zoom_in.png in Resources */, 432793FC194F003A003C9FEA /* zoom_in_cursor.png in Resources */, 432793FD194F003A003C9FEA /* zoom_out.png in Resources */, 432793FE194F003A003C9FEA /* zoom_out_cursor.png in Resources */, + 95F9DFE41A35F3310007E953 /* waves_file_exists_dialog.xml in Resources */, 43279431194F0062003C9FEA /* forwardblarrow.xpm in Resources */, 43279432194F0062003C9FEA /* h_meter_strip.xpm in Resources */, 43279433194F0062003C9FEA /* hiin.xpm in Resources */, @@ -2542,8 +2544,11 @@ 43279447194F0062003C9FEA /* toggle-button-00.xpm in Resources */, 43279448194F0062003C9FEA /* toggle-button-01.xpm in Resources */, 43279449194F0062003C9FEA /* tool_audition.xpm in Resources */, + 95F9DFE51A35F3310007E953 /* waves_how_to_import_dialog_1.xml in Resources */, + 95F9DFE21A35F3310007E953 /* waves_excessive_split_dialog.xml in Resources */, 4327944A194F0062003C9FEA /* tool_gain.xpm in Resources */, 4327944B194F0062003C9FEA /* tool_object.xpm in Resources */, + 95F9DFE01A35F3310007E953 /* waves_clean_up_dialog.xml in Resources */, 4327944C194F0062003C9FEA /* tool_range.xpm in Resources */, 4327944D194F0062003C9FEA /* tool_stretch.xpm in Resources */, 4327944E194F0062003C9FEA /* tool_zoom.xpm in Resources */, @@ -2572,6 +2577,7 @@ CEB9D792197516BE00B21780 /* automation_time_axis.xml in Resources */, CEB9D793197516BE00B21780 /* editor_mixer.xml in Resources */, 952E0B3C1A0A1D7000F375D0 /* buildlog.txt in Resources */, + 95F9DFD71A35A8BD0007E953 /* waves_message_dialog.xml in Resources */, CEB9D794197516BE00B21780 /* inspector_gain_meter.xml in Resources */, CEB9D795197516BE00B21780 /* master_ui_gain_meter.xml in Resources */, CEB9D796197516BE00B21780 /* master_ui.xml in Resources */, @@ -2598,7 +2604,6 @@ buildActionMask = 2147483647; files = ( 43279254194EFFF1003C9FEA /* main.m in Sources */, - 95176F8F1A092A5B00E32046 /* ok_dialog.cc in Sources */, 4327925B194EFFF1003C9FEA /* AppDelegate.m in Sources */, CEAFC770195445560016ACF0 /* bbt_time.cc in Sources */, CEAFC771195445560016ACF0 /* time.cc in Sources */, @@ -2606,13 +2611,13 @@ CEB0A9F219583F96006D269A /* session_close_dialog.cc in Sources */, CE1C6DCE19879F04006BDB03 /* compact_meter_bridge.cc in Sources */, CE1C6DCF19879F04006BDB03 /* compact_meter_strip.cc in Sources */, - 954DCFDC1A07A07600B7160E /* read_only_session_dialog.cc in Sources */, 95A134DE1A0239080008E3D6 /* license_dialog.cc in Sources */, CE1C6DE01987A924006BDB03 /* master_bus_ui.cc in Sources */, 954DCFBD1A0239DA00B7160E /* about_dialog.cc in Sources */, CE1A907A199A37AE00ECA62B /* add_tracks_dialog.cc in Sources */, 95176F7A1A08E6E800E32046 /* file_sample_rate_mismatch_dialog.cc in Sources */, CE294C7519CAD54500D12768 /* marker_io_dialog.cc in Sources */, + 957EF44B1A30BFB300F1500E /* waves_message_dialog.cc in Sources */, CE294C7619CAD54500D12768 /* mixer_bridge_view.cc in Sources */, CE294C7719CAD54500D12768 /* open_file_dialog_nix.cc in Sources */, CE294C7819CAD54500D12768 /* open_file_dialog_windows.cc in Sources */, @@ -2621,7 +2626,6 @@ CE294C7B19CAD54500D12768 /* waves_dropdown.cc in Sources */, CE294C7C19CAD54500D12768 /* waves_grid.cc in Sources */, CE294C7D19CAD54500D12768 /* waves_zoom_control.cc in Sources */, - 954DCFE11A07C70400B7160E /* sample_rate_mismatch_dialog.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index a851d58c40..ecb2d7953c 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -53,6 +53,7 @@ #include "opts.h" #include "enums.h" #include "bundle_env.h" +#include "waves_message_dialog.h" #include "i18n.h" @@ -76,13 +77,7 @@ static const char* localedir = LOCALEDIR; void gui_jack_error () { - MessageDialog win (string_compose (_("%1 could not connect to the audio backend."), PROGRAM_NAME), - false, - Gtk::MESSAGE_INFO, - Gtk::BUTTONS_NONE); - - win.add_button ("QUIT", RESPONSE_CLOSE); - win.set_default_response (RESPONSE_CLOSE); + WavesMessageDialog win ("waves_connect_to_backend_error_dialog.xml", "", string_compose (_("%1 could not connect to the audio backend."), PROGRAM_NAME) ); win.show_all (); win.set_position (Gtk::WIN_POS_CENTER); @@ -101,15 +96,16 @@ tell_about_backend_death (void* /* ignored */) { if (AudioEngine::instance()->processed_frames() == 0) { /* died during startup */ - MessageDialog 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_secondary_text (string_compose (_( + string message1 = string_compose (_("The audio backend (%1) has failed, or terminated\n"), AudioEngine::instance()->current_backend_name()); + string message2 = (string_compose (_( "%2 exited unexpectedly, and without notifying %1.\n\ \n\ This could be due to misconfiguration or to an error inside %2.\n\ \n\ Click OK to exit %1."), PROGRAM_NAME, AudioEngine::instance()->current_backend_name())); + WavesMessageDialog msg ("", message1+message2); + msg.set_position (Gtk::WIN_POS_CENTER); msg.run (); _exit (0); @@ -117,9 +113,10 @@ Click OK to exit %1."), PROGRAM_NAME, AudioEngine::instance()->current_backend_n /* engine has already run, so this is a mid-session backend death */ - 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."), + string message1 = (string_compose (_("The audio backend (%1) has failed, or terminated\n"), AudioEngine::instance()->current_backend_name())); + string message2 = (string_compose (_("%2 exited unexpectedly, and without notifying %1."), PROGRAM_NAME, AudioEngine::instance()->current_backend_name())); + WavesMessageDialog msg ("", message1+message2); msg.present (); } return false; /* do not call again */ diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 9cb7a34c01..cd9a5a1bce 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -70,6 +70,7 @@ #include "gui_thread.h" #include "route_group_menu.h" #include "meter_patterns.h" +#include "waves_message_dialog.h" #include "i18n.h" #include "dbg_msg.h" @@ -711,7 +712,7 @@ MixerStrip::output_press (GdkEventButton *ev) { using namespace Menu_Helpers; if (!_session->engine().connected()) { - MessageDialog msg (_("Not connected to audio engine - no I/O changes are possible")); + WavesMessageDialog msg ("", _("Not connected to audio engine - no I/O changes are possible")); msg.run (); return true; } @@ -839,7 +840,7 @@ MixerStrip::input_press (GdkEventButton *ev) citems.clear(); if (!_session->engine().connected()) { - MessageDialog msg (_("Not connected to audio engine - no I/O changes are possible")); + WavesMessageDialog msg ("", _("Not connected to audio engine - no I/O changes are possible")); msg.run (); return true; } diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc index c3406eb206..b1b5df5846 100644 --- a/gtk2_ardour/plugin_selector.cc +++ b/gtk2_ardour/plugin_selector.cc @@ -41,6 +41,7 @@ #include "ardour_ui.h" #include "plugin_selector.h" #include "gui_thread.h" +#include "waves_message_dialog.h" #include "i18n.h" @@ -493,7 +494,7 @@ PluginSelector::run () if (p) { plugins.push_back (p); } else { - MessageDialog msg (string_compose (_("The plugin \"%1\" could not be loaded\n\nSee the Log window for more details (maybe)"), pp->name)); + WavesMessageDialog msg ("", string_compose (_("The plugin \"%1\" could not be loaded\n\nSee the Log window for more details (maybe)"), pp->name)); msg.run (); } } diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index bef1a86bde..4326e328ec 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -76,6 +76,7 @@ #include "return_ui.h" #include "route_processor_selection.h" #include "send_ui.h" +#include "waves_message_dialog.h" #include "i18n.h" @@ -2422,7 +2423,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr processor, bool us } else if ((port_insert = boost::dynamic_pointer_cast (processor)) != 0) { if (!_session->engine().connected()) { - MessageDialog msg ( _("Not connected to audio engine - no I/O changes are possible")); + WavesMessageDialog msg ("", _("Not connected to audio engine - no I/O changes are possible")); msg.run (); return 0; } diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 071f9c562d..8b48a949b7 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -45,6 +45,7 @@ #include "automation_time_axis.h" #include "route_time_axis.h" #include "group_tabs.h" +#include "waves_message_dialog.h" #include "ardour/audio_track.h" #include "ardour/audioengine.h" @@ -654,7 +655,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev) } if (!_session->engine().connected()) { - MessageDialog msg (_("Not connected to AudioEngine - cannot engage record")); + WavesMessageDialog msg ("", _("Not connected to AudioEngine - cannot engage record")); msg.run (); return true; } @@ -1533,14 +1534,9 @@ RouteUI::verify_new_route_name (const std::string& name) return true; } - MessageDialog colon_msg ( - _("The use of colons (':') is discouraged in track and bus names.\nDo you want to use this new name?"), - false, MESSAGE_QUESTION, BUTTONS_NONE - ); + WavesMessageDialog colon_msg ("waves_route_rename_dialog.xml", "", _("The use of colons (':') is discouraged in track and bus names.\nDo you want to use this new name?"), + WavesMessageDialog::BUTTON_ACCEPT | WavesMessageDialog::BUTTON_CANCEL); - colon_msg.add_button (_("Use the new name"), Gtk::RESPONSE_ACCEPT); - colon_msg.add_button (_("Re-edit the name"), Gtk::RESPONSE_CANCEL); - return (colon_msg.run () == Gtk::RESPONSE_ACCEPT); } diff --git a/gtk2_ardour/tracks_control_panel.logic.cc b/gtk2_ardour/tracks_control_panel.logic.cc index 19ef4c5509..c748b23bc1 100644 --- a/gtk2_ardour/tracks_control_panel.logic.cc +++ b/gtk2_ardour/tracks_control_panel.logic.cc @@ -1325,7 +1325,8 @@ TracksControlPanel::on_buffer_size_dropdown_item_clicked (WavesDropdown*, int) _buffer_size_dropdown.set_text(buffer_size_str); } - MessageDialog( _("Buffer size set to the value which is not supported"), PROGRAM_NAME).run(); + WavesMessageDialog msg("", _("Buffer size set to the value which is not supported")); + msg.run(); } void @@ -1350,7 +1351,8 @@ TracksControlPanel::on_sample_rate_dropdown_item_clicked (WavesDropdown*, int) _sample_rate_dropdown.set_text(sample_rate_str); } - MessageDialog( _("Sample rate set to the value which is not supported"), PROGRAM_NAME).run(); + WavesMessageDialog msg("", _("Sample rate set to the value which is not supported")); + msg.run(); } diff --git a/gtk2_ardour/ui/waves_clean_up_dialog.xml b/gtk2_ardour/ui/waves_clean_up_dialog.xml new file mode 100644 index 0000000000..cad76340c3 --- /dev/null +++ b/gtk2_ardour/ui/waves_clean_up_dialog.xml @@ -0,0 +1,62 @@ + + +