Menu
▾
▴
SF.net SVN: jazzplusplus:[958] trunk/jazz/src
|
From: <pst...@us...> - 2013-03-17 10:53:50
|
Revision: 958
http://sourceforge.net/p/jazzplusplus/code/958
Author: pstieber
Date: 2013-03-17 10:53:46 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Added a "Visit Web Site..." button to the about dialog.
Modified Paths:
--------------
trunk/jazz/src/AboutDialog.cpp
trunk/jazz/src/AboutDialog.h
trunk/jazz/src/JazzPlusPlusApplication.h
trunk/jazz/src/Resources.h
Modified: trunk/jazz/src/AboutDialog.cpp
===================================================================
--- trunk/jazz/src/AboutDialog.cpp 2013-03-17 10:18:20 UTC (rev 957)
+++ trunk/jazz/src/AboutDialog.cpp 2013-03-17 10:53:46 UTC (rev 958)
@@ -45,6 +45,8 @@
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(JZAboutDialog, wxDialog)
+ EVT_BUTTON(IDC_BN_VISIT_WEB_SITE, JZAboutDialog::OnVisitWebSite)
+
EVT_BUTTON(wxID_HELP, JZAboutDialog::OnHelp)
END_EVENT_TABLE()
@@ -102,11 +104,6 @@
// + Paragraph2String +
// "</p>"
- "<p><center>"
- "<a href=\"http://jazzplusplus.sourceforge.net/\">"
- "http://jazzplusplus.sourceforge.net/</a>"
- "</center></p>"
-
"<p><center>" + InformationString + "</center></p>"
"<center><h5>" + "Credits" + "</h5></center>"
@@ -167,6 +164,11 @@
wxBoxSizer* pButtonsSizer = new wxBoxSizer(wxHORIZONTAL);
pButtonsSizer->Add(new wxButton(this, wxID_OK, "OK"), 0, wxALL, 10);
+ pButtonsSizer->Add(
+ new wxButton(this, IDC_BN_VISIT_WEB_SITE, "Visit Web Site..."),
+ 0,
+ wxALL,
+ 10);
pButtonsSizer->Add(new wxButton(this, wxID_HELP, "Help"), 0, wxALL, 10);
pTopSizer->Add(pButtonsSizer, 0, wxALIGN_CENTER);
@@ -190,6 +192,13 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+void JZAboutDialog::OnVisitWebSite(wxCommandEvent&)
+{
+ wxLaunchDefaultBrowser("http://jazzplusplus.sourceforge.net/");
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void JZAboutDialog::OnHelp(wxCommandEvent& Event)
{
::wxGetApp().DisplayHelpContents();
Modified: trunk/jazz/src/AboutDialog.h
===================================================================
--- trunk/jazz/src/AboutDialog.h 2013-03-17 10:18:20 UTC (rev 957)
+++ trunk/jazz/src/AboutDialog.h 2013-03-17 10:53:46 UTC (rev 958)
@@ -41,6 +41,8 @@
protected:
+ void OnVisitWebSite(wxCommandEvent& Event);
+
void OnHelp(wxCommandEvent& Event);
protected:
Modified: trunk/jazz/src/JazzPlusPlusApplication.h
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.h 2013-03-17 10:18:20 UTC (rev 957)
+++ trunk/jazz/src/JazzPlusPlusApplication.h 2013-03-17 10:53:46 UTC (rev 958)
@@ -164,9 +164,11 @@
// looking at old commit messages.
// 11 1/21/2008 See minor version 3.
// 12 9/1/2008 See minor version 4.
+// 13 3/17/2013 Fixed closing while recording and/or playing back.
+// 14 3/17/2013 Added "Visit Web Site..." button to the about dialog.
//-----------------------------------------------------------------------------
inline
int JZJazzPlusPlusApplication::GetBuildNumber() const
{
- return 12;
+ return 14;
}
Modified: trunk/jazz/src/Resources.h
===================================================================
--- trunk/jazz/src/Resources.h 2013-03-17 10:18:20 UTC (rev 957)
+++ trunk/jazz/src/Resources.h 2013-03-17 10:53:46 UTC (rev 958)
@@ -29,112 +29,114 @@
// of wxID_HIGHEST here.
#define wxID_HIGHEST 5999
-#define ID_FILE_REVERT_TO_SAVED wxID_HIGHEST + 1
+#define ID_FILE_REVERT_TO_SAVED (wxID_HIGHEST + 1)
-#define ID_IMPORT_MIDI wxID_HIGHEST + 2
-#define ID_EXPORT_MIDI wxID_HIGHEST + 3
-#define ID_EXPORT_SELECTION_AS_MIDI wxID_HIGHEST + 4
+#define ID_IMPORT_MIDI (wxID_HIGHEST + 2)
+#define ID_EXPORT_MIDI (wxID_HIGHEST + 3)
+#define ID_EXPORT_SELECTION_AS_MIDI (wxID_HIGHEST + 4)
-#define ID_SETTINGS_METRONOME wxID_HIGHEST + 10
-#define ID_SETTINGS_SYNTHESIZER wxID_HIGHEST + 11
-#define ID_SETTINGS_MIDI_DEVICE wxID_HIGHEST + 12
-#define ID_SETTINGS_PITCH_PAINTER wxID_HIGHEST + 13
-#define ID_SETTINGS_WAHWAH wxID_HIGHEST + 14
+#define ID_SETTINGS_METRONOME (wxID_HIGHEST + 10)
+#define ID_SETTINGS_SYNTHESIZER (wxID_HIGHEST + 11)
+#define ID_SETTINGS_MIDI_DEVICE (wxID_HIGHEST + 12)
+#define ID_SETTINGS_PITCH_PAINTER (wxID_HIGHEST + 13)
+#define ID_SETTINGS_WAHWAH (wxID_HIGHEST + 14)
-#define ID_EDIT_PASTE_MERGE wxID_HIGHEST + 15
-#define ID_EDIT_MAXIMIZE_VOLUME wxID_HIGHEST + 16
+#define ID_EDIT_PASTE_MERGE (wxID_HIGHEST + 15)
+#define ID_EDIT_MAXIMIZE_VOLUME (wxID_HIGHEST + 16)
-#define ID_AUDIO_GLOBAL_SETTINGS wxID_HIGHEST + 20
-#define ID_AUDIO_SAMPLE_SETTINGS wxID_HIGHEST + 21
-#define ID_AUDIO_LOAD_SAMPLE_SET wxID_HIGHEST + 22
-#define ID_AUDIO_SAVE_SAMPLE_SET wxID_HIGHEST + 23
-#define ID_AUDIO_SAVE_SAMPLE_SET_AS wxID_HIGHEST + 24
-#define ID_AUDIO_NEW_SAMPLE_SET wxID_HIGHEST + 25
+#define ID_AUDIO_GLOBAL_SETTINGS (wxID_HIGHEST + 20)
+#define ID_AUDIO_SAMPLE_SETTINGS (wxID_HIGHEST + 21)
+#define ID_AUDIO_LOAD_SAMPLE_SET (wxID_HIGHEST + 22)
+#define ID_AUDIO_SAVE_SAMPLE_SET (wxID_HIGHEST + 23)
+#define ID_AUDIO_SAVE_SAMPLE_SET_AS (wxID_HIGHEST + 24)
+#define ID_AUDIO_NEW_SAMPLE_SET (wxID_HIGHEST + 25)
-#define ID_EFFECTS_EQUALIZER wxID_HIGHEST + 27
-#define ID_EFFECTS_FILTER wxID_HIGHEST + 28
-#define ID_EFFECTS_DISTORTION wxID_HIGHEST + 29
-#define ID_EFFECTS_REVERB wxID_HIGHEST + 30
-#define ID_EFFECTS_ECHO wxID_HIGHEST + 31
-#define ID_EFFECTS_CHORUS wxID_HIGHEST + 32
-#define ID_EFFECTS_PITCH_SHIFTER wxID_HIGHEST + 33
-#define ID_EFFECTS_STRETCHER wxID_HIGHEST + 34
-#define ID_EFFECTS_REVERSE wxID_HIGHEST + 35
-#define ID_EFFECTS_SYNTH wxID_HIGHEST + 36
+#define ID_EFFECTS_EQUALIZER (wxID_HIGHEST + 27)
+#define ID_EFFECTS_FILTER (wxID_HIGHEST + 28)
+#define ID_EFFECTS_DISTORTION (wxID_HIGHEST + 29)
+#define ID_EFFECTS_REVERB (wxID_HIGHEST + 30)
+#define ID_EFFECTS_ECHO (wxID_HIGHEST + 31)
+#define ID_EFFECTS_CHORUS (wxID_HIGHEST + 32)
+#define ID_EFFECTS_PITCH_SHIFTER (wxID_HIGHEST + 33)
+#define ID_EFFECTS_STRETCHER (wxID_HIGHEST + 34)
+#define ID_EFFECTS_REVERSE (wxID_HIGHEST + 35)
+#define ID_EFFECTS_SYNTH (wxID_HIGHEST + 36)
-#define ID_PAINTERS_VOLUME wxID_HIGHEST + 37
-#define ID_PAINTER_WAHWAH wxID_HIGHEST + 38
-#define ID_PAINTER_PAN wxID_HIGHEST + 39
-#define ID_PAINTER_PITCH wxID_HIGHEST + 40
-#define ID_PAINTER_NONE wxID_HIGHEST + 41
+#define ID_PAINTERS_VOLUME (wxID_HIGHEST + 37)
+#define ID_PAINTER_WAHWAH (wxID_HIGHEST + 38)
+#define ID_PAINTER_PAN (wxID_HIGHEST + 39)
+#define ID_PAINTER_PITCH (wxID_HIGHEST + 40)
+#define ID_PAINTER_NONE (wxID_HIGHEST + 41)
-#define ID_TRIM wxID_HIGHEST + 50
-#define ID_QUANTIZE wxID_HIGHEST + 51
-#define ID_SET_CHANNEL wxID_HIGHEST + 52
-#define ID_SHIFT wxID_HIGHEST + 53
-#define ID_SHIFT_LEFT wxID_HIGHEST + 54
-#define ID_SHIFT_RIGHT wxID_HIGHEST + 55
-#define ID_SNAP wxID_HIGHEST + 56
-#define ID_SNAP_8 wxID_HIGHEST + 57
-#define ID_SNAP_8D wxID_HIGHEST + 58
-#define ID_SNAP_16 wxID_HIGHEST + 59
-#define ID_SNAP_16D wxID_HIGHEST + 60
-#define ID_MIXER wxID_HIGHEST + 61
-#define ID_PIANOWIN wxID_HIGHEST + 62
-#define ID_METRONOME_TOGGLE wxID_HIGHEST + 63
-#define ID_VELOCITY wxID_HIGHEST + 64
-#define ID_LENGTH wxID_HIGHEST + 65
-#define ID_MISC_TRACK_MERGE wxID_HIGHEST + 66
-#define ID_MISC_SPLIT_TRACKS wxID_HIGHEST + 67
-#define ID_MISC_METER_CHANGE wxID_HIGHEST + 68
-#define ID_MISC_RESET_MIDI wxID_HIGHEST + 69
-#define ID_MISC_SET_COPYRIGHT wxID_HIGHEST + 70
-#define ID_TRANSPOSE wxID_HIGHEST + 71
-#define ID_CLEANUP wxID_HIGHEST + 72
-#define ID_SEARCH_AND_REPLACE wxID_HIGHEST + 73
+#define ID_TRIM (wxID_HIGHEST + 50)
+#define ID_QUANTIZE (wxID_HIGHEST + 51)
+#define ID_SET_CHANNEL (wxID_HIGHEST + 52)
+#define ID_SHIFT (wxID_HIGHEST + 53)
+#define ID_SHIFT_LEFT (wxID_HIGHEST + 54)
+#define ID_SHIFT_RIGHT (wxID_HIGHEST + 55)
+#define ID_SNAP (wxID_HIGHEST + 56)
+#define ID_SNAP_8 (wxID_HIGHEST + 57)
+#define ID_SNAP_8D (wxID_HIGHEST + 58)
+#define ID_SNAP_16 (wxID_HIGHEST + 59)
+#define ID_SNAP_16D (wxID_HIGHEST + 60)
+#define ID_MIXER (wxID_HIGHEST + 61)
+#define ID_PIANOWIN (wxID_HIGHEST + 62)
+#define ID_METRONOME_TOGGLE (wxID_HIGHEST + 63)
+#define ID_VELOCITY (wxID_HIGHEST + 64)
+#define ID_LENGTH (wxID_HIGHEST + 65)
+#define ID_MISC_TRACK_MERGE (wxID_HIGHEST + 66)
+#define ID_MISC_SPLIT_TRACKS (wxID_HIGHEST + 67)
+#define ID_MISC_METER_CHANGE (wxID_HIGHEST + 68)
+#define ID_MISC_RESET_MIDI (wxID_HIGHEST + 69)
+#define ID_MISC_SET_COPYRIGHT (wxID_HIGHEST + 70)
+#define ID_TRANSPOSE (wxID_HIGHEST + 71)
+#define ID_CLEANUP (wxID_HIGHEST + 72)
+#define ID_SEARCH_AND_REPLACE (wxID_HIGHEST + 73)
-#define ID_PLAY wxID_HIGHEST + 80
-#define ID_PLAY_LOOP wxID_HIGHEST + 81
-#define ID_RECORD wxID_HIGHEST + 82
+#define ID_PLAY (wxID_HIGHEST + 80)
+#define ID_PLAY_LOOP (wxID_HIGHEST + 81)
+#define ID_RECORD (wxID_HIGHEST + 82)
-#define ID_SELECT wxID_HIGHEST + 85
+#define ID_SELECT (wxID_HIGHEST + 85)
-#define ID_CHANGE_LENGTH wxID_HIGHEST + 90
+#define ID_CHANGE_LENGTH (wxID_HIGHEST + 90)
-#define ID_EVENT_DIALOG wxID_HIGHEST + 91
-#define ID_CUT_PASTE_EVENTS wxID_HIGHEST + 92
-#define ID_SHOW_ALL_EVENTS_FROM_ALL_TRACKS wxID_HIGHEST + 93
+#define ID_EVENT_DIALOG (wxID_HIGHEST + 91)
+#define ID_CUT_PASTE_EVENTS (wxID_HIGHEST + 92)
+#define ID_SHOW_ALL_EVENTS_FROM_ALL_TRACKS (wxID_HIGHEST + 93)
-#define ID_TOOLS_HARMONY_BROWSER wxID_HIGHEST + 95
+#define ID_TOOLS_HARMONY_BROWSER (wxID_HIGHEST + 95)
-#define ID_HELP_PIANO_WINDOW wxID_HIGHEST + 100
+#define ID_HELP_PIANO_WINDOW (wxID_HIGHEST + 100)
-#define MEN_CLEAR wxID_HIGHEST + 110
-#define ID_VIEW_SETTINGS wxID_HIGHEST + 120
+#define MEN_CLEAR (wxID_HIGHEST + 110)
+#define ID_VIEW_SETTINGS (wxID_HIGHEST + 120)
-#define IDC_KB_VOLUME wxID_HIGHEST + 1000
+#define IDC_BN_VISIT_WEB_SITE (wxID_HIGHEST + 1000)
-#define IDC_KB_VELOCITY wxID_HIGHEST + 1100
-#define IDC_KB_OFF_VELOCITY wxID_HIGHEST + 1101
-#define IDC_KB_CHANNEL wxID_HIGHEST + 1102
+#define IDC_KB_VOLUME (wxID_HIGHEST + 1050)
+#define IDC_KB_VELOCITY (wxID_HIGHEST + 1100)
+#define IDC_KB_OFF_VELOCITY (wxID_HIGHEST + 1101)
+#define IDC_KB_CHANNEL (wxID_HIGHEST + 1102)
+
// JZVelocityDialog resource IDs.
-#define IDC_KB_VELOCITY_START wxID_HIGHEST + 1200
-#define IDC_KB_VELOCITY_STOP wxID_HIGHEST + 1201
+#define IDC_KB_VELOCITY_START (wxID_HIGHEST + 1200)
+#define IDC_KB_VELOCITY_STOP (wxID_HIGHEST + 1201)
// JZLengthDialog resource IDs.
-#define IDC_KB_LENGTH_START wxID_HIGHEST + 1210
-#define IDC_KB_LENGTH_STOP wxID_HIGHEST + 1211
+#define IDC_KB_LENGTH_START (wxID_HIGHEST + 1210)
+#define IDC_KB_LENGTH_STOP (wxID_HIGHEST + 1211)
// JZMidiChannelDialog resource IDs.
-#define IDC_KB_MIDI_CHANNEL wxID_HIGHEST + 1220
+#define IDC_KB_MIDI_CHANNEL (wxID_HIGHEST + 1220)
// JZQuantizeDialog resource IDs.
-#define IDC_KB_GROOVE wxID_HIGHEST + 1230
-#define IDC_KB_DELAY wxID_HIGHEST + 1231
+#define IDC_KB_GROOVE (wxID_HIGHEST + 1230)
+#define IDC_KB_DELAY (wxID_HIGHEST + 1231)
// JZTransposeDialog resource IDs.
-#define IDC_KB_AMOUNT wxID_HIGHEST + 1232
+#define IDC_KB_AMOUNT (wxID_HIGHEST + 1232)
// JZSamplesDialog resource IDs.
-#define IDC_BN_SD_FILE_SELECT_BROWSE wxID_HIGHEST + 1240
+#define IDC_BN_SD_FILE_SELECT_BROWSE (wxID_HIGHEST + 1240)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
