Menu
▾
▴
SF.net SVN: jazzplusplus:[992] trunk/jazz/src
|
From: <pst...@us...> - 2013-03-20 15:59:29
|
Revision: 992
http://sourceforge.net/p/jazzplusplus/code/992
Author: pstieber
Date: 2013-03-20 15:59:26 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Updated help usage.
Modified Paths:
--------------
trunk/jazz/src/Audio.cpp
trunk/jazz/src/Dialogs/CleanupDialog.cpp
trunk/jazz/src/Dialogs/DeleteDialog.cpp
trunk/jazz/src/Dialogs/EndOfTrackDialog.cpp
trunk/jazz/src/Dialogs/LengthDialog.cpp
trunk/jazz/src/Dialogs/MeterChangeDialog.cpp
trunk/jazz/src/Dialogs/MidiChannelDialog.cpp
trunk/jazz/src/Dialogs/PitchWheelDialog.cpp
trunk/jazz/src/Dialogs/QuantizeDialog.cpp
trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp
trunk/jazz/src/Dialogs/SetTempoDialog.cpp
trunk/jazz/src/Dialogs/SnapDialog.cpp
trunk/jazz/src/Dialogs/SysexDialog.cpp
trunk/jazz/src/Dialogs/TextDialog.cpp
trunk/jazz/src/Dialogs/TransposeDialog.cpp
trunk/jazz/src/Dialogs/VelocityDialog.cpp
trunk/jazz/src/Dialogs.cpp
trunk/jazz/src/Harmony.cpp
trunk/jazz/src/PianoFrame.cpp
trunk/jazz/src/PianoWindow.cpp
trunk/jazz/src/SampleDialog.cpp
trunk/jazz/src/SampleFrame.cpp
trunk/jazz/src/SampleWindow.cpp
trunk/jazz/src/Track.cpp
trunk/jazz/src/TrackFrame.cpp
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Audio.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -762,7 +762,7 @@
void OnHelp()
{
- gpHelpInstance->ShowTopic("Global Settings");
+ JZHelp::Instance().ShowTopic("Global Settings");
}
void OnOk()
@@ -1341,7 +1341,7 @@
//-----------------------------------------------------------------------------
void JZSamplesDlg::OnHelpButton()
{
- gpHelpInstance->ShowTopic("Sample Settings");
+ JZHelp::Instance().ShowTopic("Sample Settings");
}
//-----------------------------------------------------------------------------
Modified: trunk/jazz/src/Dialogs/CleanupDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/CleanupDialog.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Dialogs/CleanupDialog.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -152,5 +152,5 @@
//-----------------------------------------------------------------------------
void JZCleanupDialog::OnHelp(wxCommandEvent& Event)
{
- gpHelpInstance->ShowTopic("Cleanup");
+ JZHelp::Instance().ShowTopic("Cleanup");
}
Modified: trunk/jazz/src/Dialogs/DeleteDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/DeleteDialog.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Dialogs/DeleteDialog.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -89,5 +89,5 @@
//-----------------------------------------------------------------------------
void JZDeleteDialog::OnHelp(wxCommandEvent& Event)
{
- gpHelpInstance->ShowTopic("Delete");
+ JZHelp::Instance().ShowTopic("Delete");
}
Modified: trunk/jazz/src/Dialogs/EndOfTrackDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/EndOfTrackDialog.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Dialogs/EndOfTrackDialog.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -114,5 +114,5 @@
//-----------------------------------------------------------------------------
void JZEndOfTrackDialog::OnHelp(wxCommandEvent& Event)
{
- gpHelpInstance->ShowTopic("Template");
+ JZHelp::Instance().ShowTopic("Template");
}
Modified: trunk/jazz/src/Dialogs/LengthDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/LengthDialog.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Dialogs/LengthDialog.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -246,5 +246,5 @@
//-----------------------------------------------------------------------------
void JZLengthDialog::OnHelp(wxCommandEvent& Event)
{
- gpHelpInstance->ShowTopic("Length");
+ JZHelp::Instance().ShowTopic("Length");
}
Modified: trunk/jazz/src/Dialogs/MeterChangeDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/MeterChangeDialog.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Dialogs/MeterChangeDialog.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -78,5 +78,5 @@
//-----------------------------------------------------------------------------
void JZMeterChangeDialog::OnHelp(wxCommandEvent& Event)
{
- gpHelpInstance->ShowTopic("Meterchange");
+ JZHelp::Instance().ShowTopic("Meterchange");
}
Modified: trunk/jazz/src/Dialogs/MidiChannelDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/MidiChannelDialog.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Dialogs/MidiChannelDialog.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -135,5 +135,5 @@
//-----------------------------------------------------------------------------
void JZMidiChannelDialog::OnHelp(wxCommandEvent& Event)
{
- gpHelpInstance->ShowTopic("Set MIDI Channel");
+ JZHelp::Instance().ShowTopic("Set MIDI Channel");
}
Modified: trunk/jazz/src/Dialogs/PitchWheelDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/PitchWheelDialog.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Dialogs/PitchWheelDialog.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -83,5 +83,5 @@
//-----------------------------------------------------------------------------
void JZPitchWheelDialog::OnHelp(wxCommandEvent& Event)
{
- gpHelpInstance->ShowTopic("Pitch Wheel Dialog");
+ JZHelp::Instance().ShowTopic("Pitch Wheel Dialog");
}
Modified: trunk/jazz/src/Dialogs/QuantizeDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/QuantizeDialog.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Dialogs/QuantizeDialog.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -230,5 +230,5 @@
//-----------------------------------------------------------------------------
void JZQuantizeDialog::OnHelp(wxCommandEvent& Event)
{
- gpHelpInstance->ShowTopic("Quantize");
+ JZHelp::Instance().ShowTopic("Quantize");
}
Modified: trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -129,5 +129,5 @@
//-----------------------------------------------------------------------------
void JZSearchAndReplaceDialog::OnHelp(wxCommandEvent& Event)
{
- gpHelpInstance->ShowTopic("Search Replace");
+ JZHelp::Instance().ShowTopic("Search Replace");
}
Modified: trunk/jazz/src/Dialogs/SetTempoDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SetTempoDialog.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Dialogs/SetTempoDialog.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -139,5 +139,5 @@
//-----------------------------------------------------------------------------
void JZSetTempoDialog::OnHelp(wxCommandEvent& Event)
{
- gpHelpInstance->ShowTopic("Set Tempo Dialog");
+ JZHelp::Instance().ShowTopic("Set Tempo Dialog");
}
Modified: trunk/jazz/src/Dialogs/SnapDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SnapDialog.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Dialogs/SnapDialog.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -131,5 +131,5 @@
//-----------------------------------------------------------------------------
void JZSnapDialog::OnHelp(wxCommandEvent& Event)
{
- gpHelpInstance->ShowTopic("Snap");
+ JZHelp::Instance().ShowTopic("Snap");
}
Modified: trunk/jazz/src/Dialogs/SysexDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SysexDialog.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Dialogs/SysexDialog.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -205,5 +205,5 @@
//-----------------------------------------------------------------------------
void JZSysexDialog::OnHelp(wxCommandEvent& Event)
{
- gpHelpInstance->ShowTopic("Sysex Dialog");
+ JZHelp::Instance().ShowTopic("Sysex Dialog");
}
Modified: trunk/jazz/src/Dialogs/TextDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/TextDialog.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Dialogs/TextDialog.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -130,5 +130,5 @@
//-----------------------------------------------------------------------------
void JZTextDialog::OnHelp(wxCommandEvent& Event)
{
- gpHelpInstance->ShowTopic("Text Dialog");
+ JZHelp::Instance().ShowTopic("Text Dialog");
}
Modified: trunk/jazz/src/Dialogs/TransposeDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/TransposeDialog.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Dialogs/TransposeDialog.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -171,5 +171,5 @@
//-----------------------------------------------------------------------------
void JZTransposeDialog::OnHelp(wxCommandEvent& Event)
{
- gpHelpInstance->ShowTopic("Transpose");
+ JZHelp::Instance().ShowTopic("Transpose");
}
Modified: trunk/jazz/src/Dialogs/VelocityDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/VelocityDialog.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Dialogs/VelocityDialog.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -225,5 +225,5 @@
//-----------------------------------------------------------------------------
void JZVelocityDialog::OnHelp(wxCommandEvent& Event)
{
- gpHelpInstance->ShowTopic("Velocity");
+ JZHelp::Instance().ShowTopic("Velocity");
}
Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Dialogs.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -87,7 +87,7 @@
//-----------------------------------------------------------------------------
//void JZShiftDlg::OnHelp()
//{
-// gpHelpInstance->ShowTopic("Shift");
+// JZHelp::Instance().ShowTopic("Shift");
//}
//-----------------------------------------------------------------------------
@@ -180,7 +180,7 @@
void JZSeqLengthDlg::OnHelp()
{
- gpHelpInstance->ShowTopic("SeqLength");
+ JZHelp::Instance().ShowTopic("SeqLength");
}
@@ -224,7 +224,7 @@
void JZMidiDelayDlg::OnHelp()
{
- gpHelpInstance->ShowTopic("MidiDelay");
+ JZHelp::Instance().ShowTopic("MidiDelay");
}
@@ -310,7 +310,7 @@
//void JZEventDlg::OnHelp()
//{
-// gpHelpInstance->ShowTopic("Piano Window");
+// JZHelp::Instance().ShowTopic("Piano Window");
//}
// -------------------------------- Play track ---------------------------
Modified: trunk/jazz/src/Harmony.cpp
===================================================================
--- trunk/jazz/src/Harmony.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Harmony.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -387,7 +387,7 @@
}
void OnHelp()
{
- gpHelpInstance->ShowTopic("Harmony browser");
+ JZHelp::Instance().ShowTopic("Harmony browser");
}
};
#endif
@@ -1889,7 +1889,7 @@
void JZHarmonyBrowserContextDlg::OnHelp()
{
- gpHelpInstance->ShowTopic("Edit chord");
+ JZHelp::Instance().ShowTopic("Edit chord");
}
@@ -2380,7 +2380,7 @@
//-----------------------------------------------------------------------------
void JZHarmonyBrowserFrame::OnHelp(wxCommandEvent& Event)
{
-// gpHelpInstance->ShowTopic("Harmony browser");
+ JZHelp::Instance().ShowTopic("Harmony browser");
}
//-----------------------------------------------------------------------------
Modified: trunk/jazz/src/PianoFrame.cpp
===================================================================
--- trunk/jazz/src/PianoFrame.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/PianoFrame.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -581,7 +581,7 @@
void JZVisibleDlg::OnHelp()
{
- gpHelpInstance->ShowTopic("Events");
+ JZHelp::Instance().ShowTopic("Events");
}
Modified: trunk/jazz/src/PianoWindow.cpp
===================================================================
--- trunk/jazz/src/PianoWindow.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/PianoWindow.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -1171,7 +1171,7 @@
switch (Id)
{
case ID_HELP_PIANO_WINDOW:
- gpHelpInstance->ShowTopic("Piano Window");
+ JZHelp::Instance().ShowTopic("Piano Window");
break;
}
}
Modified: trunk/jazz/src/SampleDialog.cpp
===================================================================
--- trunk/jazz/src/SampleDialog.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/SampleDialog.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -671,8 +671,8 @@
break;
case SYN_HELP:
- gpHelpInstance->ShowTopic("{Additive Synthesis");
- break;
+ JZHelp::Instance().ShowTopic("{Additive Synthesis");
+ break;
}
}
@@ -921,7 +921,7 @@
void JZReverbForm::OnHelp()
{
- gpHelpInstance->ShowTopic("Reverb");
+ JZHelp::Instance().ShowTopic("Reverb");
}
@@ -1038,7 +1038,7 @@
void JZShifterForm::OnHelp()
{
- gpHelpInstance->ShowTopic("Pitch shifter");
+ JZHelp::Instance().ShowTopic("Pitch shifter");
}
@@ -1149,7 +1149,7 @@
void JZSplFilterForm::OnHelp()
{
- gpHelpInstance->ShowTopic("Filter");
+ JZHelp::Instance().ShowTopic("Filter");
}
@@ -1259,7 +1259,7 @@
void JZWahSettingsForm::OnHelp()
{
- gpHelpInstance->ShowTopic("Settings");
+ JZHelp::Instance().ShowTopic("Settings");
}
void JZWahSettingsForm::OnOk()
@@ -1307,7 +1307,7 @@
void JZSplPitchForm::OnHelp()
{
- gpHelpInstance->ShowTopic("Settings");
+ JZHelp::Instance().ShowTopic("Settings");
}
@@ -1390,7 +1390,7 @@
void JZChorusForm::OnHelp()
{
- gpHelpInstance->ShowTopic("Chorus");
+ JZHelp::Instance().ShowTopic("Chorus");
}
// -----------------------------------------------------------------------
@@ -1473,7 +1473,7 @@
void JZStretcherForm::OnHelp()
{
- gpHelpInstance->ShowTopic("Time Stretcher");
+ JZHelp::Instance().ShowTopic("Time Stretcher");
}
Modified: trunk/jazz/src/SampleFrame.cpp
===================================================================
--- trunk/jazz/src/SampleFrame.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/SampleFrame.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -782,9 +782,9 @@
}
break;
- case MEN_HELP:
- gpHelpInstance->ShowTopic("Sample Editor");
- break;
+ case MEN_HELP:
+ JZHelp::Instance().ShowTopic("Sample Editor");
+ break;
default:
break;
Modified: trunk/jazz/src/SampleWindow.cpp
===================================================================
--- trunk/jazz/src/SampleWindow.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/SampleWindow.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -136,7 +136,7 @@
}
void OnHelp()
{
- gpHelpInstance->ShowTopic("Settings");
+ JZHelp::Instance().ShowTopic("Settings");
}
private:
JZSampleFrame& mpSampleFrame;
@@ -521,5 +521,3 @@
playpos->StartListen(fr_smpl, to_smpl);
}
}
-
-
Modified: trunk/jazz/src/Track.cpp
===================================================================
--- trunk/jazz/src/Track.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/Track.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -1670,7 +1670,7 @@
void JZTrackDlg::OnHelp()
{
- gpHelpInstance->ShowTopic("Trackname, midi channel etc");
+ JZHelp::Instance().ShowTopic("Trackname, midi channel etc");
}
void JZTrackDlg::OnOk()
Modified: trunk/jazz/src/TrackFrame.cpp
===================================================================
--- trunk/jazz/src/TrackFrame.cpp 2013-03-20 15:56:17 UTC (rev 991)
+++ trunk/jazz/src/TrackFrame.cpp 2013-03-20 15:59:26 UTC (rev 992)
@@ -28,6 +28,7 @@
#include "Dialogs/SynthesizerSettingsDialog.h"
#include "Globals.h"
#include "Harmony.h"
+#include "Help.h"
#include "JazzPlusPlusApplication.h"
#include "Player.h"
#include "Project.h"
@@ -814,7 +815,7 @@
//-----------------------------------------------------------------------------
void JZTrackFrame::OnHelpContents(wxCommandEvent& Event)
{
- ::wxGetApp().DisplayHelpContents();
+ JZHelp::Instance().DisplayHelpContents();
}
//-----------------------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
