Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29878/src
Modified Files:
FileNames.cpp Menus.cpp Project.cpp
Log Message:
This is 'work in progress'!
Add a section to audacity/win/release.txt about updating the help files.
Add the help files (local wiki content) to the windows installer, putting them
in installDirectory/Help.
Make FileNames::HtmlHelpDir() find this new location.
(Note that for the developer, copying the help to audacity\win\unicode
debug\Help is useful)
Changed Help->Index... to Help->Help...
Changed default pref for Help->Help from 'Standard' to 'InBrowser'... (with a
view to losing 'Standard' altogether).
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -d -r1.421 -r1.422
--- Project.cpp 2 May 2009 07:27:17 -0000 1.421
+++ Project.cpp 26 May 2009 00:03:44 -0000 1.422
@@ -918,7 +918,7 @@
gPrefs->Read(wxT("/GUI/TracksFitVerticallyZoomed"),
&mTracksFitVerticallyZoomed, false);
gPrefs->Read(wxT("/GUI/SelectAllOnNone"), &mSelectAllOnNone, true);
gPrefs->Read(wxT("/GUI/ShowSplashScreen"), &mShowSplashScreen, true);
- gPrefs->Read(wxT("/GUI/Help"), &mHelpPref, wxT("Standard") );
+ gPrefs->Read(wxT("/GUI/Help"), &mHelpPref, wxT("InBrowser") );
gPrefs->Read(wxT("/Batch/CleanSpeechMode"), &mCleanSpeechMode, false);
gPrefs->Read(wxT("/AudioFiles/ShowId3Dialog"), &mShowId3Dialog, true);
Index: FileNames.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/FileNames.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- FileNames.cpp 9 Jan 2009 22:36:29 -0000 1.17
+++ FileNames.cpp 26 May 2009 00:03:44 -0000 1.18
@@ -118,14 +118,15 @@
wxString FileNames::HtmlHelpDir()
{
- // FIX-ME uses DataDir(). Should use directory where we expect help to be.
- // Perhaps it's same directory as Audacity.exe?
- return FileNames::MkDir( wxFileName( DataDir(), wxT("Help") ).GetFullPath()
);
+ // Use the Audacity.exe directory as a base (on Windows, others elsewhere)
+ wxString exeDir = wxStandardPaths::Get().GetDataDir();
+ return FileNames::MkDir( wxFileName( exeDir, wxT("Help") ).GetFullPath() );
}
wxString FileNames::HtmlHelpIndexFile()
{
- return wxFileName( HtmlHelpDir(), wxT("index.htm") ).GetFullPath();
+ wxString htmlHelpIndex = wxFileName( HtmlHelpDir(), wxT("index.html")
).GetFullPath();
+ return htmlHelpIndex;
}
wxString FileNames::ChainDir()
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -d -r1.476 -r1.477
--- Menus.cpp 25 May 2009 11:14:16 -0000 1.476
+++ Menus.cpp 26 May 2009 00:03:44 -0000 1.477
@@ -960,7 +960,7 @@
c->AddItem(wxT("About"), _("&About Audacity..."),
FN(OnAbout));
c->AddItem(wxT("Welcome"), _("&Show Welcome Message..."),
FN(OnHelpWelcome));
- c->AddItem(wxT("Help"), _("&Index..."),
FN(OnHelp));
+ c->AddItem(wxT("Help"), _("&Help..."),
FN(OnHelp));
c->AddItem(wxT("Log"), _("Show &Log..."),
FN(OnLog));
if( !mCleanSpeechMode )
@@ -5129,7 +5129,6 @@
this,
FileNames::HtmlHelpIndexFile(),
wxT("http://audacityteam.org/manual/index.php?title=Main_Page"; ));
- //wxT("http://audacity.sourceforge.net/help/documentation"; ));
}
void AudacityProject::OnLog()
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
