Update of /cvsroot/audacity/audacity-src/src/widgets
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7464/src/widgets
Modified Files:
ErrorDialog.cpp LinkingHtmlWindow.cpp Meter.h
Log Message:
-Progressed Checklist.
Index: Meter.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Meter.h 24 Jun 2007 23:19:14 -0000 1.9
+++ Meter.h 16 Sep 2007 13:46:02 -0000 1.10
@@ -138,11 +138,11 @@
void OnPreferences(wxCommandEvent &evt);
+ void StartMonitoring();
private:
void DrawMeterBar(wxDC &dc, MeterBar *meterBar);
void ResetBar(MeterBar *bar, bool resetClipping);
void RepaintBarsNow();
- void StartMonitoring();
void CreateIcon(int aquaOffset);
wxFont GetFont();
Index: ErrorDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/ErrorDialog.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ErrorDialog.cpp 28 Jul 2007 08:13:55 -0000 1.2
+++ ErrorDialog.cpp 16 Sep 2007 13:46:02 -0000 1.3
@@ -25,6 +25,7 @@
#include "LinkingHtmlWindow.h"
#include "../ShuttleGui.h"
+#include "../HelpText.h"
class ErrorDialog : public wxDialog
{
@@ -117,6 +118,29 @@
void ErrorDialog::OnHelp(wxCommandEvent &event)
{
+ if( dhelpURL.StartsWith("innerlink:") )
+ {
+ wxDialog Dlg(this, -1, _NoAcc(TitleText(dhelpURL.Mid( 10 )) ),
+ wxDefaultPosition, wxDefaultSize);
+ ShuttleGui S( &Dlg, eIsCreating );
+ S.StartVerticalLay();
+ {
+ wxHtmlWindow *html = new LinkingHtmlWindow(&Dlg, -1,
+ wxDefaultPosition,
+ wxSize(480, 240),
+ wxHW_SCROLLBAR_AUTO |
wxSUNKEN_BORDER);
+ html->SetPage( HelpText( dhelpURL.Mid( 10 )));
+
+ S.Prop(1).AddWindow( html, wxEXPAND );
+ S.Id( wxID_OK).AddButton( _("Close") );
+ }
+ S.EndVerticalLay();
+ Dlg.Fit();
+ Dlg.Centre();
+ Dlg.ShowModal();
+ return;
+ }
+
#if defined(__WXMSW__) || defined(__WXMAC__)
OpenInDefaultBrowser(dhelpURL);
#else
Index: LinkingHtmlWindow.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/LinkingHtmlWindow.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- LinkingHtmlWindow.cpp 24 Mar 2007 02:44:29 -0000 1.3
+++ LinkingHtmlWindow.cpp 16 Sep 2007 13:46:02 -0000 1.4
@@ -15,6 +15,7 @@
#include "LinkingHtmlWindow.h"
#include <wx/mimetype.h>
+#include "../HelpText.h"
void OpenInDefaultBrowser(const wxHtmlLinkInfo& link)
{
@@ -44,5 +45,12 @@
void LinkingHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
{
+ wxString href = link.GetHref();
+ if( href.StartsWith("innerlink:") )
+ {
+ this->SetPage( HelpText( href.Mid( 10 )));
+ this->GetParent()->SetLabel( TitleText( href.Mid( 10 )));
+ return;
+ }
OpenInDefaultBrowser(link);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
