--- gigedit/trunk/src/gigedit/mainwindow.cpp 2009/07/31 10:15:27 1959 +++ gigedit/trunk/src/gigedit/mainwindow.cpp 2013/02/24 15:19:39 2423 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 Andreas Persson + * Copyright (C) 2006-2013 Andreas Persson * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -20,32 +20,24 @@ #include #include +#include +#include +#include +#include +#include #include #include #include #include #include +#include #include +#if GTKMM_MAJOR_VERSION < 3 #include "wrapLabel.hh" - -#include "global.h" - -#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2 -#define ABOUT_DIALOG -#include #endif -#if (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION < 6) || GLIBMM_MAJOR_VERSION < 2 -namespace Glib { -Glib::ustring filename_display_basename(const std::string& filename) -{ - gchar* gstr = g_path_get_basename(filename.c_str()); - Glib::ustring str(gstr); - g_free(gstr); - return Glib::filename_to_utf8(str); -} -} -#endif +#include "global.h" +#include "compat.h" #include #include @@ -61,30 +53,6 @@ return ss.str(); } -Table::Table(int x, int y) : Gtk::Table(x, y), rowno(0) { } - -void Table::add(BoolEntry& boolentry) -{ - attach(boolentry.widget, 0, 2, rowno, rowno + 1, - Gtk::FILL, Gtk::SHRINK); - rowno++; -} - -void Table::add(BoolEntryPlus6& boolentry) -{ - attach(boolentry.widget, 0, 2, rowno, rowno + 1, - Gtk::FILL, Gtk::SHRINK); - rowno++; -} - -void Table::add(LabelWidget& prop) -{ - attach(prop.label, 1, 2, rowno, rowno + 1, - Gtk::FILL, Gtk::SHRINK); - attach(prop.widget, 2, 3, rowno, rowno + 1, - Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK); - rowno++; -} MainWindow::MainWindow() : dimreg_label(_("Changes apply to:")), @@ -179,16 +147,18 @@ action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP); actionGroup->add(Gtk::Action::create("MenuHelp", action->property_label())); -#ifdef ABOUT_DIALOG actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT), sigc::mem_fun( *this, &MainWindow::on_action_help_about)); -#endif actionGroup->add( Gtk::Action::create("AddInstrument", _("Add _Instrument")), sigc::mem_fun(*this, &MainWindow::on_action_add_instrument) ); actionGroup->add( + Gtk::Action::create("DupInstrument", _("_Duplicate Instrument")), + sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument) + ); + actionGroup->add( Gtk::Action::create("RemoveInstrument", Gtk::Stock::REMOVE), sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument) ); @@ -239,15 +209,14 @@ " " " " " " -#ifdef ABOUT_DIALOG " " " " " " -#endif " " " " " " " " + " " " " " " " " @@ -272,6 +241,8 @@ m_VBox.pack_start(m_DimRegionChooser, Gtk::PACK_SHRINK); m_VBox.pack_start(m_StatusBar, Gtk::PACK_SHRINK); + set_file_is_shared(false); + // Status Bar: m_StatusBar.pack_start(m_AttachedStateLabel, Gtk::PACK_SHRINK); m_StatusBar.pack_start(m_AttachedStateImage, Gtk::PACK_SHRINK); @@ -308,8 +279,8 @@ ); // establish drag&drop between samples tree view and dimension region 'Sample' text entry - std::list drag_target_gig_sample; - drag_target_gig_sample.push_back( Gtk::TargetEntry("gig::Sample") ); + std::vector drag_target_gig_sample; + drag_target_gig_sample.push_back(Gtk::TargetEntry("gig::Sample")); m_TreeViewSamples.drag_source_set(drag_target_gig_sample); m_TreeViewSamples.signal_drag_begin().connect( sigc::mem_fun(*this, &MainWindow::on_sample_treeview_drag_begin) @@ -327,9 +298,9 @@ sigc::mem_fun(*this, &MainWindow::file_changed)); m_DimRegionChooser.signal_region_changed().connect( sigc::mem_fun(*this, &MainWindow::file_changed)); - instrumentProps.signal_instrument_changed().connect( + instrumentProps.signal_changed().connect( sigc::mem_fun(*this, &MainWindow::file_changed)); - propDialog.signal_info_changed().connect( + propDialog.signal_changed().connect( sigc::mem_fun(*this, &MainWindow::file_changed)); dimreg_edit.signal_dimreg_to_be_changed().connect( @@ -374,7 +345,6 @@ file = 0; file_is_changed = false; - set_file_is_shared(false); show_all_children(); @@ -478,7 +448,7 @@ void Loader::progress_callback(float fraction) { { - Glib::Mutex::Lock lock(progressMutex); + Glib::Threads::Mutex::Lock lock(progressMutex); progress = fraction; } progress_dispatcher(); @@ -486,7 +456,7 @@ void Loader::thread_function() { - printf("thread_function self=%x\n", Glib::Thread::self()); + printf("thread_function self=%x\n", Glib::Threads::Thread::self()); printf("Start %s\n", filename); RIFF::File* riff = new RIFF::File(filename); gig = new gig::File(riff); @@ -500,13 +470,17 @@ } Loader::Loader(const char* filename) - : thread(0), filename(filename) + : filename(filename), thread(0) { } void Loader::launch() { +#ifdef OLD_THREADS thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true); +#else + thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function)); +#endif printf("launch thread=%x\n", thread); } @@ -514,7 +488,7 @@ { float res; { - Glib::Mutex::Lock lock(progressMutex); + Glib::Threads::Mutex::Lock lock(progressMutex); res = progress; } return res; @@ -544,10 +518,12 @@ Gtk::MenuItem* instrument_menu = dynamic_cast(uiManager->get_widget("/MenuBar/MenuInstrument")); instrument_menu->hide(); - for (int i = 0; i < instrument_menu->get_submenu()->items().size(); i++) { - delete &instrument_menu->get_submenu()->items()[i]; + Gtk::Menu* menu = instrument_menu->get_submenu(); + while (menu->get_children().size()) { + Gtk::Widget* child = *menu->get_children().begin(); + menu->remove(*child); + delete child; } - instrument_menu->get_submenu()->items().clear(); // forget all samples that ought to be imported m_SampleImportQueue.clear(); // clear the samples and instruments tree views @@ -582,9 +558,7 @@ Glib::filename_display_basename(filename).c_str()); Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE); g_free(msg); -#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2 dialog.set_secondary_text(_("If you close without saving, your changes will be lost.")); -#endif dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO); dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); dialog.add_button(file_has_name ? Gtk::Stock::SAVE : Gtk::Stock::SAVE_AS, Gtk::RESPONSE_YES); @@ -598,13 +572,10 @@ bool MainWindow::leaving_shared_mode_dialog() { Glib::ustring msg = _("Detach from sampler and proceed working stand-alone?"); Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE); -#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2 dialog.set_secondary_text( _("If you proceed to work on another instrument file, it won't be " "used by the sampler until you tell the sampler explicitly to " - "load it.") - ); -#endif + "load it.")); dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES); dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); dialog.set_default_response(Gtk::RESPONSE_CANCEL); @@ -623,8 +594,13 @@ dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK); dialog.set_default_response(Gtk::RESPONSE_OK); +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 Gtk::FileFilter filter; filter.add_pattern("*.gig"); +#else + Glib::RefPtr filter = Gtk::FileFilter::create(); + filter->add_pattern("*.gig"); +#endif dialog.set_filter(filter); if (current_gig_dir != "") { dialog.set_current_folder(current_gig_dir); @@ -632,7 +608,7 @@ if (dialog.run() == Gtk::RESPONSE_OK) { std::string filename = dialog.get_filename(); printf("filename=%s\n", filename.c_str()); - printf("on_action_file_open self=%x\n", Glib::Thread::self()); + printf("on_action_file_open self=%x\n", Glib::Threads::Thread::self()); load_file(filename.c_str()); current_gig_dir = Glib::path_get_dirname(filename); } @@ -674,7 +650,7 @@ void MainWindow::on_loader_finished() { printf("Loader finished!\n"); - printf("on_loader_finished self=%x\n", Glib::Thread::self()); + printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self()); load_gig(loader->gig, loader->filename); load_dialog->hide(); } @@ -746,13 +722,15 @@ dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK); dialog.set_default_response(Gtk::RESPONSE_OK); - -#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 8) || GTKMM_MAJOR_VERSION > 2 dialog.set_do_overwrite_confirmation(); - // TODO: an overwrite dialog for gtkmm < 2.8 -#endif + +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 Gtk::FileFilter filter; filter.add_pattern("*.gig"); +#else + Glib::RefPtr filter = Gtk::FileFilter::create(); + filter->add_pattern("*.gig"); +#endif dialog.set_filter(filter); // set initial dir and filename of the Save As dialog @@ -775,7 +753,12 @@ descriptionArea.set_spacing(15); Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG)); descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK); +#if GTKMM_MAJOR_VERSION < 3 view::WrapLabel description; +#else + Gtk::Label description; + description.set_line_wrap(); +#endif description.set_markup( _("\nCAUTION: You MUST use the " "\"Save\" dialog instead of " @@ -827,6 +810,7 @@ SF_INFO info; info.format = 0; SNDFILE* hFile = sf_open((*iter).sample_path.c_str(), SFM_READ, &info); + sf_command(hFile, SFC_SET_SCALE_FLOAT_INT_READ, 0, SF_TRUE); try { if (!hFile) throw std::string(_("could not open file")); // determine sample's bit depth @@ -917,7 +901,6 @@ void MainWindow::on_action_help_about() { -#ifdef ABOUT_DIALOG Gtk::AboutDialog dialog; #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 12) || GTKMM_MAJOR_VERSION > 2 dialog.set_program_name("Gigedit"); @@ -925,7 +908,7 @@ dialog.set_name("Gigedit"); #endif dialog.set_version(VERSION); - dialog.set_copyright("Copyright (C) 2006-2009 Andreas Persson"); + dialog.set_copyright("Copyright (C) 2006-2013 Andreas Persson"); dialog.set_comments(_( "Released under the GNU General Public License.\n" "\n" @@ -938,12 +921,10 @@ dialog.set_website("http://www.linuxsampler.org"); dialog.set_website_label("http://www.linuxsampler.org"); dialog.run(); -#endif } PropDialog::PropDialog() - : table(2,1), - eName(_("Name")), + : eName(_("Name")), eCreationDate(_("Creation date")), eComments(_("Comments")), eProduct(_("Product")), @@ -960,7 +941,7 @@ eCommissioned(_("Commissioned")), eSubject(_("Subject")), quitButton(Gtk::Stock::CLOSE), - update_model(0) + table(2, 1) { set_title(_("File Properties")); eName.set_width_chars(50); @@ -1008,7 +989,7 @@ buttonBox.set_border_width(5); buttonBox.show(); buttonBox.pack_start(quitButton); - quitButton.set_flags(Gtk::CAN_DEFAULT); + quitButton.set_can_default(); quitButton.grab_focus(); quitButton.signal_clicked().connect( sigc::mem_fun(*this, &PropDialog::hide)); @@ -1020,79 +1001,40 @@ void PropDialog::set_info(DLS::Info* info) { - this->info = info; - update_model++; - eName.set_value(info->Name); - eCreationDate.set_value(info->CreationDate); - eComments.set_value(info->Comments); - eProduct.set_value(info->Product); - eCopyright.set_value(info->Copyright); - eArtists.set_value(info->Artists); - eGenre.set_value(info->Genre); - eKeywords.set_value(info->Keywords); - eEngineer.set_value(info->Engineer); - eTechnician.set_value(info->Technician); - eSoftware.set_value(info->Software); - eMedium.set_value(info->Medium); - eSource.set_value(info->Source); - eSourceForm.set_value(info->SourceForm); - eCommissioned.set_value(info->Commissioned); - eSubject.set_value(info->Subject); - update_model--; + update(info); } -sigc::signal& PropDialog::signal_info_changed() -{ - return info_changed; -} void InstrumentProps::set_IsDrum(bool value) { - instrument->IsDrum = value; + m->IsDrum = value; } void InstrumentProps::set_MIDIBank(uint16_t value) { - instrument->MIDIBank = value; + m->MIDIBank = value; } void InstrumentProps::set_MIDIProgram(uint32_t value) { - instrument->MIDIProgram = value; -} - -void InstrumentProps::set_DimensionKeyRange_low(uint8_t value) -{ - instrument->DimensionKeyRange.low = value; - if (value > instrument->DimensionKeyRange.high) { - eDimensionKeyRangeHigh.set_value(value); - } -} - -void InstrumentProps::set_DimensionKeyRange_high(uint8_t value) -{ - instrument->DimensionKeyRange.high = value; - if (value < instrument->DimensionKeyRange.low) { - eDimensionKeyRangeLow.set_value(value); - } + m->MIDIProgram = value; } -InstrumentProps::InstrumentProps() - : table(2,1), - quitButton(Gtk::Stock::CLOSE), - eName(_("Name")), - eIsDrum(_("Is drum")), - eMIDIBank(_("MIDI bank"), 0, 16383), - eMIDIProgram(_("MIDI program")), - eAttenuation(_("Attenuation"), 0, 96, 0, 1), - eGainPlus6(_("Gain +6dB"), eAttenuation, -6), - eEffectSend(_("Effect send"), 0, 65535), - eFineTune(_("Fine tune"), -8400, 8400), - ePitchbendRange(_("Pitchbend range"), 0, 12), - ePianoReleaseMode(_("Piano release mode")), - eDimensionKeyRangeLow(_("Keyswitching range low")), - eDimensionKeyRangeHigh(_("Keyswitching range high")), - update_model(0) +InstrumentProps::InstrumentProps() : + quitButton(Gtk::Stock::CLOSE), + table(2,1), + eName(_("Name")), + eIsDrum(_("Is drum")), + eMIDIBank(_("MIDI bank"), 0, 16383), + eMIDIProgram(_("MIDI program")), + eAttenuation(_("Attenuation"), 0, 96, 0, 1), + eGainPlus6(_("Gain +6dB"), eAttenuation, -6), + eEffectSend(_("Effect send"), 0, 65535), + eFineTune(_("Fine tune"), -8400, 8400), + ePitchbendRange(_("Pitchbend range"), 0, 12), + ePianoReleaseMode(_("Piano release mode")), + eDimensionKeyRangeLow(_("Keyswitching range low")), + eDimensionKeyRangeHigh(_("Keyswitching range high")) { set_title(_("Instrument Properties")); @@ -1114,10 +1056,8 @@ connect(eFineTune, &gig::Instrument::FineTune); connect(ePitchbendRange, &gig::Instrument::PitchbendRange); connect(ePianoReleaseMode, &gig::Instrument::PianoReleaseMode); - connect(eDimensionKeyRangeLow, - &InstrumentProps::set_DimensionKeyRange_low); - connect(eDimensionKeyRangeHigh, - &InstrumentProps::set_DimensionKeyRange_high); + connect(eDimensionKeyRangeLow, eDimensionKeyRangeHigh, + &gig::Instrument::DimensionKeyRange); table.set_col_spacings(5); @@ -1143,7 +1083,7 @@ buttonBox.set_border_width(5); buttonBox.show(); buttonBox.pack_start(quitButton); - quitButton.set_flags(Gtk::CAN_DEFAULT); + quitButton.set_can_default(); quitButton.grab_focus(); quitButton.signal_clicked().connect( @@ -1156,28 +1096,15 @@ void InstrumentProps::set_instrument(gig::Instrument* instrument) { - this->instrument = instrument; + update(instrument); update_model++; - eName.set_value(instrument->pInfo->Name); eIsDrum.set_value(instrument->IsDrum); eMIDIBank.set_value(instrument->MIDIBank); eMIDIProgram.set_value(instrument->MIDIProgram); - eAttenuation.set_value(instrument->Attenuation); - eGainPlus6.set_value(instrument->Attenuation); - eEffectSend.set_value(instrument->EffectSend); - eFineTune.set_value(instrument->FineTune); - ePitchbendRange.set_value(instrument->PitchbendRange); - ePianoReleaseMode.set_value(instrument->PianoReleaseMode); - eDimensionKeyRangeLow.set_value(instrument->DimensionKeyRange.low); - eDimensionKeyRangeHigh.set_value(instrument->DimensionKeyRange.high); update_model--; } -sigc::signal& InstrumentProps::signal_instrument_changed() -{ - return instrument_changed; -} void MainWindow::file_changed() { @@ -1249,6 +1176,11 @@ // select the first instrument Glib::RefPtr tree_sel_ref = m_TreeView.get_selection(); tree_sel_ref->select(Gtk::TreePath("0")); + + gig::Instrument* instrument = get_instrument(); + if (instrument) { + instrumentProps.set_instrument(instrument); + } } void MainWindow::show_instr_props() @@ -1328,6 +1260,31 @@ file_changed(); } +void MainWindow::on_action_duplicate_instrument() { + if (!file) return; + + // retrieve the currently selected instrument + // (being the original instrument to be duplicated) + Glib::RefPtr sel = m_TreeView.get_selection(); + Gtk::TreeModel::iterator itSelection = sel->get_selected(); + if (!itSelection) return; + Gtk::TreeModel::Row row = *itSelection; + gig::Instrument* instrOrig = row[m_Columns.m_col_instr]; + if (!instrOrig) return; + + // duplicate the orginal instrument + gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig); + instrNew->pInfo->Name = + instrOrig->pInfo->Name + " (" + _("Copy") + ")"; + + // update instrument tree view + Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append(); + Gtk::TreeModel::Row rowInstr = *iterInstr; + rowInstr[m_Columns.m_col_name] = instrNew->pInfo->Name.c_str(); + rowInstr[m_Columns.m_col_instr] = instrNew; + file_changed(); +} + void MainWindow::on_action_remove_instrument() { if (!file) return; if (file_is_shared) { @@ -1352,6 +1309,13 @@ // remove respective row from instruments tree view m_refTreeModel->erase(it); file_changed(); + + instr = get_instrument(); + if (instr) { + instrumentProps.set_instrument(instr); + } else { + instrumentProps.hide(); + } } catch (RIFF::Exception e) { Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR); msg.run(); @@ -1405,7 +1369,13 @@ dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK); dialog.set_select_multiple(true); - Gtk::FileFilter soundfilter; // matches all file types supported by libsndfile + + // matches all file types supported by libsndfile +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 + Gtk::FileFilter soundfilter; +#else + Glib::RefPtr soundfilter = Gtk::FileFilter::create(); +#endif const char* const supportedFileTypes[] = { "*.wav", "*.WAV", "*.aiff", "*.AIFF", "*.aifc", "*.AIFC", "*.snd", "*.SND", "*.au", "*.AU", "*.paf", "*.PAF", "*.iff", "*.IFF", @@ -1413,12 +1383,27 @@ "*.W64", "*.pvf", "*.PVF", "*.xi", "*.XI", "*.htk", "*.HTK", "*.caf", "*.CAF", NULL }; + const char* soundfiles = _("Sound Files"); + const char* allfiles = _("All Files"); +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 for (int i = 0; supportedFileTypes[i]; i++) soundfilter.add_pattern(supportedFileTypes[i]); - soundfilter.set_name(_("Sound Files")); - Gtk::FileFilter allpassfilter; // matches every file + soundfilter.set_name(soundfiles); + + // matches every file + Gtk::FileFilter allpassfilter; allpassfilter.add_pattern("*.*"); - allpassfilter.set_name(_("All Files")); + allpassfilter.set_name(allfiles); +#else + for (int i = 0; supportedFileTypes[i]; i++) + soundfilter->add_pattern(supportedFileTypes[i]); + soundfilter->set_name(soundfiles); + + // matches every file + Glib::RefPtr allpassfilter = Gtk::FileFilter::create(); + allpassfilter->add_pattern("*.*"); + allpassfilter->set_name(allfiles); +#endif dialog.add_filter(soundfilter); dialog.add_filter(allpassfilter); if (current_sample_dir != "") { @@ -1427,8 +1412,8 @@ if (dialog.run() == Gtk::RESPONSE_OK) { current_sample_dir = dialog.get_current_folder(); Glib::ustring error_files; - Glib::SListHandle filenames = dialog.get_filenames(); - for (Glib::SListHandle::iterator iter = filenames.begin(); + std::vector filenames = dialog.get_filenames(); + for (std::vector::iterator iter = filenames.begin(); iter != filenames.end(); ++iter) { printf("Adding sample %s\n",(*iter).c_str()); // use libsndfile to retrieve file informations @@ -1480,7 +1465,6 @@ { sample->MIDIUnityNote = instrument.basenote; -#if HAVE_SF_INSTRUMENT_LOOPS if (instrument.loop_count && instrument.loops[0].mode != SF_LOOP_NONE) { sample->Loops = 1; @@ -1500,7 +1484,6 @@ sample->LoopPlayCount = instrument.loops[0].count; sample->LoopSize = sample->LoopEnd - sample->LoopStart + 1; } -#endif } // schedule resizing the sample (which will be done @@ -1543,7 +1526,7 @@ if (!file) return; Gtk::FileChooserDialog dialog(*this, _("Select Folder"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER); - view::WrapLabel description( + const char* str = _("This is a very specific function. It tries to replace all samples " "in the current gig file by samples located in the chosen " "directory.\n\n" @@ -1557,10 +1540,15 @@ "the sample in the gig file accordingly. If you don't need an " "extension, blank the field below. Any gig sample where no " "appropriate sample file could be found will be reported and left " - "untouched.\n") - ); + "untouched.\n"); +#if GTKMM_MAJOR_VERSION < 3 + view::WrapLabel description(str); +#else + Gtk::Label description(str); + description.set_line_wrap(); +#endif Gtk::HBox entryArea; - Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_RIGHT); + Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_START); Gtk::Entry postfixEntryBox; postfixEntryBox.set_text(".wav"); entryArea.pack_start(entryLabel); @@ -1579,7 +1567,7 @@ { current_sample_dir = dialog.get_current_folder(); Glib::ustring error_files; - Glib::ustring folder = dialog.get_filename(); + std::string folder = dialog.get_filename(); for (gig::Sample* sample = file->GetFirstSample(); sample; sample = file->GetNextSample()) {