Update of /cvsroot/audacity/audacity-src/src
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13940
Modified Files:
Tag: Audacity_UmixIt
Menus.cpp
Log Message:
changes per Audiotouch client
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.151.2.26.2.20
retrieving revision 1.151.2.26.2.21
diff -u -d -r1.151.2.26.2.20 -r1.151.2.26.2.21
--- Menus.cpp 3 Mar 2010 02:47:34 -0000 1.151.2.26.2.20
+++ Menus.cpp 16 Mar 2010 01:21:44 -0000 1.151.2.26.2.21
@@ -153,7 +153,7 @@
#if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
// For Audiotouch, commands re-ordered, and
// export commands renamed to "save as" commands and given new key codes.
- c->AddItem("Export", _("Save As...\tCtrl+S"),
FN(OnExportMix));
+ c->AddItem("Export", _("Save As and Exit...\tCtrl+S"),
FN(OnExportMix));
// per R Barr, Mar 1, 2010 c->AddItem("ExportSel", _("Save
Selection As...\tCtrl+Shift+S"), FN(OnExportSelection));
c->AddItem("Open", _("&Email...\tCtrl+E"), FN(OnEmail)); //vvv
Set enable flags.
c->AddItem("Open", _("&Open...\tCtrl+O"),
FN(OnOpen));
@@ -169,17 +169,17 @@
mRecentFiles->Load(*gPrefs);
gPrefs->SetPath("..");
c->AddSeparator();
- c->AddItem("ExportOgg", _("Save As Ogg Vorbis...\tCtrl+G"),
FN(OnExportOggMix));
+ c->AddItem("ExportOgg", _("Save As Ogg Vorbis...\tCtrl+G"),
FN(OnExportOggMix));
// per R Barr, Mar 1, 2010 c->AddItem("ExportOggSel", _("Save
Selection As Ogg Vorbis...\tCtrl+Shift+G"), FN(OnExportOggSelection));
c->AddSeparator();
- c->AddItem("ExportMP3", _("Save As MP3...\tCtrl+M"),
FN(OnExportMP3Mix));
+ c->AddItem("ExportMP3", _("Save As MP3...\tCtrl+M"),
FN(OnExportMP3Mix));
// per R Barr, Mar 1, 2010 c->AddItem("ExportMP3Sel", _("Save
Selection As MP3...\tCtrl+Shift+M"), FN(OnExportMP3Selection));
c->AddSeparator();
- c->AddItem("Save", _("&Save Project\tCtrl+P"),
FN(OnSave));
+ c->AddItem("Save", _("&Save Project and Exit\tCtrl+P"),
FN(OnSave));
c->SetCommandFlags("Save",
AudioIONotBusyFlag | UnsavedChangesFlag,
AudioIONotBusyFlag | UnsavedChangesFlag);
- c->AddItem("SaveAs", _("Save Project &As...\tCtrl+Shift+P"),
FN(OnSaveAs));
+ c->AddItem("SaveAs", _("Save Project &As and
Exit...\tCtrl+Shift+P"), FN(OnSaveAs));
c->AddSeparator();
c->AddItem("New", _("&New\tCtrl+N"),
FN(OnNew));
c->SetCommandFlags("New", 0, 0);
@@ -812,11 +812,12 @@
#if (AUDACITY_BRANDING == BRAND_AUDIOTOUCH)
// For Audiotouch, export commands renamed to "save as" commands,
re-ordered, given new key codes.
mCommandManager.Modify("Export",
- wxString::Format(_("&Save As %s..."),
- (const char *)pcmFormat));
- mCommandManager.Modify("ExportSel",
- wxString::Format(_("&Save Selection As %s..."),
+ wxString::Format(_("&Save As %s and Exit..."),
(const char *)pcmFormat));
+ // per R Barr, Mar 1, 2010
+ //mCommandManager.Modify("ExportSel",
+ // wxString::Format(_("&Save Selection As %s and
Exit..."),
+ // (const char *)pcmFormat));
#else // (AUDACITY_BRANDING != BRAND_AUDIOTOUCH)
mCommandManager.Modify("Export",
wxString::Format(_("&Export As %s..."),
@@ -1576,23 +1577,31 @@
dlog.GetPaths(selectedFiles);
+ wxString body = _("The attached audio file was generated in
Audiotouch.\n\n");
+ body += _("http://www.audiotouch.com.au/files/email_options.pdf\n\n";);
+ body += _("If the attached audio file is in .wav or .mp3 formats, it
should play on your computer with your installed software.\n\n");
+ body += _("If the attached audio file is .ogg (open source) format, you
may need to download free software to play it. Try http://www.vorbis.com/.";);
+ wxMailMessage msg(
+ _("Audiotouch audio file attached"), // const wxString& subject
+ _("replace...@somewhere.com"), // const wxString& to
+ body, // const wxString& body,
+ wxEmptyString // const wxString& from = wxEmptyString,
+ // const wxString& attachment = wxEmptyString,
+ // const wxString& attachmentTitle = wxEmptyString
+ );
+
+ // Add the attachments.
wxString fileName = wxT("");
for(ff=0; ff<selectedFiles.GetCount(); ff++) {
fileName = selectedFiles[ff];
-
- path =::wxPathOnly(fileName);
- gPrefs->Write("/DefaultOpenPath", path);
+ msg.AddAttachment(fileName);
}
+
+ // Rather than update the default path for each file,
+ // do it only for the last one.
+ path =::wxPathOnly(fileName);
+ gPrefs->Write("/DefaultOpenPath", path);
- wxMailMessage msg(
- _("Audiotouch audio file attached"), // const wxString& subject
- _("replace...@somewhere.com"), // const wxString& to
- // const wxString& body,
- _("The attached audio file was generated in Audiotouch.\n\n
http://www.audiotouch.au/\n\nIf the attached audio file is in .wav or .mp3
formats, it should play on your computer with your installed software.\n\nIf
the attached audio file is .ogg (open source) format, you may need to downalod
free software to play it. Try http://www.vorbis.com/.";),
- wxEmptyString, // const wxString& from = wxEmptyString,
- fileName // const wxString& attachment = wxEmptyString, //vvvvv Need
to handle multiple files?
- //vvv const wxString& attachmentTitle = wxEmptyString
- );
if (!wxEmail::Send(msg))
wxMessageBox(_("Email failed."), _("Email failed."), wxICON_ERROR);
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
