From 75773a43d4ac711ef93c80705c3f38ce0b00c74e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 22 Feb 2017 10:26:58 +0100 Subject: [PATCH] NO-OP: whitespace --- gtk2_ardour/missing_file_dialog.cc | 202 ++++++++++++++--------------- gtk2_ardour/missing_file_dialog.h | 28 ++-- 2 files changed, 115 insertions(+), 115 deletions(-) diff --git a/gtk2_ardour/missing_file_dialog.cc b/gtk2_ardour/missing_file_dialog.cc index 47e6948412..bc14b410c8 100644 --- a/gtk2_ardour/missing_file_dialog.cc +++ b/gtk2_ardour/missing_file_dialog.cc @@ -33,33 +33,33 @@ using namespace ARDOUR; using namespace PBD; MissingFileDialog::MissingFileDialog (Session* s, const std::string& path, DataType type) - : ArdourDialog (_("Missing File"), true, false) - , filetype (type) - , chooser (_("Select a folder to search"), FILE_CHOOSER_ACTION_SELECT_FOLDER) - , use_chosen (_("Add chosen folder to search path, and try again")) - , choice_group (use_chosen.get_group()) - , stop_loading_button (choice_group, _("Stop loading this session"), false) - , all_missing_ok (choice_group, _("Skip all missing files"), false) - , this_missing_ok (choice_group, _("Skip this file"), false) + : ArdourDialog (_("Missing File"), true, false) + , filetype (type) + , chooser (_("Select a folder to search"), FILE_CHOOSER_ACTION_SELECT_FOLDER) + , use_chosen (_("Add chosen folder to search path, and try again")) + , choice_group (use_chosen.get_group()) + , stop_loading_button (choice_group, _("Stop loading this session"), false) + , all_missing_ok (choice_group, _("Skip all missing files"), false) + , this_missing_ok (choice_group, _("Skip this file"), false) { /* This dialog is always shown programatically. Center the window.*/ set_position (Gtk::WIN_POS_CENTER); set_session (s); - add_button (_("Done"), RESPONSE_OK); - set_default_response (RESPONSE_OK); + add_button (_("Done"), RESPONSE_OK); + set_default_response (RESPONSE_OK); - string typestr; + string typestr; - switch (type) { - case DataType::AUDIO: - typestr = _("audio"); - break; - case DataType::MIDI: - typestr = _("MIDI"); - break; - } + switch (type) { + case DataType::AUDIO: + typestr = _("audio"); + break; + case DataType::MIDI: + typestr = _("MIDI"); + break; + } vector source_dirs = s->source_search_path (type); vector::iterator i = source_dirs.begin(); @@ -70,114 +70,114 @@ MissingFileDialog::MissingFileDialog (Session* s, const std::string& path, DataT oss << *i << endl; } - msg.set_justify (JUSTIFY_LEFT); - msg.set_markup (string_compose (_("%1 cannot find the %2 file\n\n%3\n\nin any of these folders:\n\n\ -%4\n\n"), PROGRAM_NAME, typestr, Gtkmm2ext::markup_escape_text (path), Gtkmm2ext::markup_escape_text (oss.str()))); + msg.set_justify (JUSTIFY_LEFT); + msg.set_markup (string_compose (_("%1 cannot find the %2 file\n\n%3\n\nin any of these folders:\n\n\ + %4\n\n"), PROGRAM_NAME, typestr, Gtkmm2ext::markup_escape_text (path), Gtkmm2ext::markup_escape_text (oss.str()))); - HBox* hbox = manage (new HBox); - hbox->pack_start (msg, false, true); - hbox->show (); + HBox* hbox = manage (new HBox); + hbox->pack_start (msg, false, true); + hbox->show (); - get_vbox()->pack_start (*hbox, false, false); + get_vbox()->pack_start (*hbox, false, false); - VBox* button_packer_box = manage (new VBox); + VBox* button_packer_box = manage (new VBox); - button_packer_box->set_spacing (6); - button_packer_box->set_border_width (12); + button_packer_box->set_spacing (6); + button_packer_box->set_border_width (12); - button_packer_box->pack_start (use_chosen, false, false); - button_packer_box->pack_start (this_missing_ok, false, false); - button_packer_box->pack_start (all_missing_ok, false, false); - button_packer_box->pack_start (stop_loading_button, false, false); + button_packer_box->pack_start (use_chosen, false, false); + button_packer_box->pack_start (this_missing_ok, false, false); + button_packer_box->pack_start (all_missing_ok, false, false); + button_packer_box->pack_start (stop_loading_button, false, false); - button_packer_box->show_all (); + button_packer_box->show_all (); - get_vbox()->set_spacing (6); - get_vbox()->set_border_width (25); - get_vbox()->set_homogeneous (false); + get_vbox()->set_spacing (6); + get_vbox()->set_border_width (25); + get_vbox()->set_homogeneous (false); - hbox = manage (new HBox); - hbox->pack_start (*button_packer_box, false, true); - hbox->show (); + hbox = manage (new HBox); + hbox->pack_start (*button_packer_box, false, true); + hbox->show (); - get_vbox()->pack_start (*hbox, false, false); + get_vbox()->pack_start (*hbox, false, false); - hbox = manage (new HBox); - Label* label = manage (new Label); - label->set_text (_("Click to choose an additional folder")); + hbox = manage (new HBox); + Label* label = manage (new Label); + label->set_text (_("Click to choose an additional folder")); - hbox->set_spacing (6); - hbox->set_border_width (12); - hbox->pack_start (*label, false, false); - hbox->pack_start (chooser, true, true); - hbox->show_all (); + hbox->set_spacing (6); + hbox->set_border_width (12); + hbox->pack_start (*label, false, false); + hbox->pack_start (chooser, true, true); + hbox->show_all (); - get_vbox()->pack_start (*hbox, true, true); + get_vbox()->pack_start (*hbox, true, true); - msg.show (); + msg.show (); - chooser.set_current_folder (Glib::get_home_dir()); - chooser.set_create_folders (false); + chooser.set_current_folder (Glib::get_home_dir()); + chooser.set_create_folders (false); } void MissingFileDialog::add_chosen () { - string str; - string newdir; - vector dirs; - - switch (filetype) { - case DataType::AUDIO: - str = _session->config.get_audio_search_path(); - break; - case DataType::MIDI: - str = _session->config.get_midi_search_path(); - break; - } - - split (str, dirs, G_SEARCHPATH_SEPARATOR); - - newdir = chooser.get_filename (); - - for (vector::iterator d = dirs.begin(); d != dirs.end(); d++) { - if (*d == newdir) { - return; - } - } - - if (!str.empty()) { - str += G_SEARCHPATH_SEPARATOR; - } - - str += newdir; - - switch (filetype) { - case DataType::AUDIO: - _session->config.set_audio_search_path (str); - break; - case DataType::MIDI: - _session->config.set_midi_search_path (str); - break; - } + string str; + string newdir; + vector dirs; + + switch (filetype) { + case DataType::AUDIO: + str = _session->config.get_audio_search_path(); + break; + case DataType::MIDI: + str = _session->config.get_midi_search_path(); + break; + } + + split (str, dirs, G_SEARCHPATH_SEPARATOR); + + newdir = chooser.get_filename (); + + for (vector::iterator d = dirs.begin(); d != dirs.end(); d++) { + if (*d == newdir) { + return; + } + } + + if (!str.empty()) { + str += G_SEARCHPATH_SEPARATOR; + } + + str += newdir; + + switch (filetype) { + case DataType::AUDIO: + _session->config.set_audio_search_path (str); + break; + case DataType::MIDI: + _session->config.set_midi_search_path (str); + break; + } } int MissingFileDialog::get_action () { - if (use_chosen.get_active ()) { - add_chosen (); - return 0; - } + if (use_chosen.get_active ()) { + add_chosen (); + return 0; + } - if (this_missing_ok.get_active()) { - return -1; - } + if (this_missing_ok.get_active()) { + return -1; + } - if (all_missing_ok.get_active ()) { - return 3; - } + if (all_missing_ok.get_active ()) { + return 3; + } - return 1; + return 1; } diff --git a/gtk2_ardour/missing_file_dialog.h b/gtk2_ardour/missing_file_dialog.h index fb32a81aa6..b4b44e746b 100644 --- a/gtk2_ardour/missing_file_dialog.h +++ b/gtk2_ardour/missing_file_dialog.h @@ -35,24 +35,24 @@ namespace ARDOUR { class MissingFileDialog : public ArdourDialog { - public: - MissingFileDialog (ARDOUR::Session*, const std::string& path, ARDOUR::DataType type); +public: + MissingFileDialog (ARDOUR::Session*, const std::string& path, ARDOUR::DataType type); - int get_action(); + int get_action(); - private: - ARDOUR::DataType filetype; +private: + ARDOUR::DataType filetype; - Gtk::FileChooserButton chooser; - Gtk::RadioButton use_chosen; - Gtk::RadioButton::Group choice_group; - Gtk::RadioButton use_chosen_and_no_more_questions; - Gtk::RadioButton stop_loading_button; - Gtk::RadioButton all_missing_ok; - Gtk::RadioButton this_missing_ok; - Gtk::Label msg; + Gtk::FileChooserButton chooser; + Gtk::RadioButton use_chosen; + Gtk::RadioButton::Group choice_group; + Gtk::RadioButton use_chosen_and_no_more_questions; + Gtk::RadioButton stop_loading_button; + Gtk::RadioButton all_missing_ok; + Gtk::RadioButton this_missing_ok; + Gtk::Label msg; - void add_chosen (); + void add_chosen (); }; #endif /* __gtk_ardour_missing_file_dialog_h__ */ -- 2.30.2