Update of /cvsroot/audacity/audacity-src/src/prefs
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv29741
Modified Files:
FileFormatPrefs.cpp FileFormatPrefs.h
Log Message:
Add download button for LAME
Index: FileFormatPrefs.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/FileFormatPrefs.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- FileFormatPrefs.h 8 Apr 2007 09:11:32 -0000 1.14
+++ FileFormatPrefs.h 21 Apr 2007 19:33:44 -0000 1.15
@@ -13,16 +13,10 @@
#ifndef __AUDACITY_FILE_FORMAT_PREFS__
#define __AUDACITY_FILE_FORMAT_PREFS__
-#include "../Project.h"
#include "PrefsPanel.h"
-class wxButton;
-class wxCheckBox;
-class wxChoice;
class wxCommandEvent;
-class wxRadioButton;
class wxStaticText;
-class wxSlider;
class wxWindow;
class ShuttleGui;
@@ -35,20 +29,12 @@
private:
void Populate();
- void PopulateOrExchange( ShuttleGui & S );
- void GetNamesAndLabels();
- void OnFormatChoice(wxCommandEvent& evt);
+ void PopulateOrExchange(ShuttleGui & S);
void OnMP3FindButton(wxCommandEvent& evt);
+ void OnMP3DownButton(wxCommandEvent& evt);
void SetMP3VersionText();
- void OpenOtherFormatDialog();
-
- int mFormat;
-
- wxArrayString mFormatNames;
- wxString mFormatFromChoice;
wxStaticText *mMP3Version;
- wxChoice *mDefaultExportFormat;
public:
DECLARE_EVENT_TABLE();
Index: FileFormatPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/FileFormatPrefs.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- FileFormatPrefs.cpp 14 Apr 2007 06:58:48 -0000 1.49
+++ FileFormatPrefs.cpp 21 Apr 2007 19:33:44 -0000 1.50
@@ -23,25 +23,22 @@
#include <wx/defs.h>
#include <wx/intl.h>
-#include <wx/choice.h>
#include <wx/stattext.h>
-#include <wx/radiobut.h>
#include <wx/button.h>
-#include <wx/arrstr.h>
-
-#include "sndfile.h"
#include "../export/ExportMP3.h"
-#include "../FileFormats.h"
#include "../Prefs.h"
#include "../ShuttleGui.h"
+#include "../widgets/LinkingHtmlWindow.h"
+
#include "FileFormatPrefs.h"
-#define ID_MP3_FIND_BUTTON 7001
-#define ID_EXPORT_OPTIONS_BUTTON 7002
+#define ID_MP3_FIND_BUTTON 7001
+#define ID_MP3_DOWN_BUTTON 7002
BEGIN_EVENT_TABLE(FileFormatPrefs, wxPanel)
EVT_BUTTON(ID_MP3_FIND_BUTTON, FileFormatPrefs::OnMP3FindButton)
+ EVT_BUTTON(ID_MP3_DOWN_BUTTON, FileFormatPrefs::OnMP3DownButton)
END_EVENT_TABLE()
FileFormatPrefs::FileFormatPrefs(wxWindow * parent):
@@ -103,12 +100,18 @@
S.EndStatic();
S.StartStatic( _("MP3 Export Setup"));
{
- S.StartThreeColumn();
- S.AddFixedText( _("MP3 Library Version:"), true);
- mMP3Version = S.AddVariableText( wxT("CAPITAL LETTERS"), true);
- S.Id( ID_MP3_FIND_BUTTON ).AddButton( _("&Find Library"),
- wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL);
- S.EndThreeColumn();
+ S.StartHorizontalLay(wxEXPAND, true);
+ S.AddVariableText( _("MP3 Library Version:"),
+ true,
+ wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL );
+ mMP3Version = S.AddVariableText( wxT("9.99"),
+ true,
+ wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL );
+ S.Id( ID_MP3_FIND_BUTTON ).AddButton( _("&Find Library"),
+ wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL );
+ S.Id( ID_MP3_DOWN_BUTTON ).AddButton( _("&Download free copy of
LAME"),
+ wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL );
+ S.EndHorizontalLay();
}
S.EndStatic();
}
@@ -137,6 +140,14 @@
}
}
+/// Opens a file-finder dialog so that the user can
+/// tell us where the MP3 library is.
+void FileFormatPrefs::OnMP3DownButton(wxCommandEvent& evt)
+{
+ wxString url = wxT("http://audacity.sourceforge.net/lame.html";);
+ ::OpenInDefaultBrowser(url);
+}
+
/// Takes the settings from the dilaog and puts them into prefs.
/// Most of the preferences are set by the ShuttleGui, but for some
/// specially handled ones we need to do this ourselves.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
