Menu
▾
▴
SF.net SVN: jazzplusplus:[732] trunk/jazz
|
From: <pst...@us...> - 2009-06-21 20:55:01
|
Revision: 732
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=732&view=rev
Author: pstieber
Date: 2009-06-21 20:54:58 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
Added new versions of the search and replace and transpose dialogs.
Modified Paths:
--------------
trunk/jazz/src/Dialogs.cpp
trunk/jazz/src/Dialogs.h
trunk/jazz/src/EventWindow.cpp
trunk/jazz/src/Makefile.am
trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Added Paths:
-----------
trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp
trunk/jazz/src/Dialogs/SearchAndReplaceDialog.h
trunk/jazz/src/Dialogs/TransposeDialog.cpp
trunk/jazz/src/Dialogs/TransposeDialog.h
Added: trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp (rev 0)
+++ trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp 2009-06-21 20:54:58 UTC (rev 732)
@@ -0,0 +1,133 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2009 Peter J. Stieber, all rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
+#include "SearchAndReplaceDialog.h"
+
+#include "../Configuration.h"
+#include "../Globals.h"
+#include "../Help.h"
+
+#include <wx/button.h>
+#include <wx/listbox.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
+using namespace std;
+
+//*****************************************************************************
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+BEGIN_EVENT_TABLE(JZSearchAndReplaceDialog, wxDialog)
+
+ EVT_BUTTON(wxID_HELP, JZSearchAndReplaceDialog::OnHelp)
+
+END_EVENT_TABLE()
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZSearchAndReplaceDialog::JZSearchAndReplaceDialog(
+ short From,
+ short To,
+ wxWindow* pParent)
+ : wxDialog(
+ pParent,
+ wxID_ANY,
+ wxString("Search and replace controller types")),
+ mFrom(From),
+ mTo(To),
+ mpFromListBox(0),
+ mpToListBox(0)
+
+{
+ mpFromListBox = new wxListBox(this, wxID_ANY);
+ mpToListBox = new wxListBox(this, wxID_ANY);
+
+ const vector<pair<string, int> >& ControlNames =
+ gpConfig->GetControlNames();
+ for (
+ vector<pair<string, int> >::const_iterator iControlName =
+ ControlNames.begin();
+ iControlName != ControlNames.end();
+ ++iControlName)
+ {
+ const string& ControlName = iControlName->first;
+ if (!ControlName.empty())
+ {
+ mpFromListBox->Append(ControlName);
+ mpToListBox->Append(ControlName);
+ }
+ }
+
+ wxButton* pOkButton = new wxButton(this, wxID_OK, "&OK");
+ wxButton* pCancelButton = new wxButton(this, wxID_CANCEL, "Cancel");
+ wxButton* pHelpButton = new wxButton(this, wxID_HELP, "Help");
+ pOkButton->SetDefault();
+
+ wxBoxSizer* pTopSizer = new wxBoxSizer(wxVERTICAL);
+
+ pTopSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Search and replace controller types"),
+ 0,
+ wxALIGN_CENTER | wxALL,
+ 6);
+
+ wxBoxSizer* pLeftSizer = new wxBoxSizer(wxVERTICAL);
+ pLeftSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Search for"),
+ 0,
+ wxALL,
+ 3);
+ pLeftSizer->Add(mpFromListBox, 0, wxALIGN_CENTER | wxALL, 3);
+
+ wxBoxSizer* pRightSizer = new wxBoxSizer(wxVERTICAL);
+ pRightSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Replace with"),
+ 0,
+ wxALL,
+ 3);
+ pRightSizer->Add(mpToListBox, 0, wxALIGN_CENTER | wxALL, 3);
+
+ wxBoxSizer* pListBoxSizer = new wxBoxSizer(wxHORIZONTAL);
+ pListBoxSizer->Add(pLeftSizer, 0, wxALL, 3);
+ pListBoxSizer->Add(pRightSizer, 0, wxALL, 3);
+
+ pTopSizer->Add(pListBoxSizer, 0, wxALL, 3);
+
+ wxBoxSizer* pButtonSizer = new wxBoxSizer(wxHORIZONTAL);
+ pButtonSizer->Add(pOkButton, 0, wxALL, 5);
+ pButtonSizer->Add(pCancelButton, 0, wxALL, 5);
+ pButtonSizer->Add(pHelpButton, 0, wxALL, 5);
+
+ pTopSizer->Add(pButtonSizer, 0, wxALIGN_CENTER | wxBOTTOM, 6);
+
+ SetAutoLayout(true);
+ SetSizer(pTopSizer);
+
+ pTopSizer->SetSizeHints(this);
+ pTopSizer->Fit(this);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZSearchAndReplaceDialog::OnHelp(wxCommandEvent& Event)
+{
+ gpHelpInstance->ShowTopic("Search Replace");
+}
Property changes on: trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/jazz/src/Dialogs/SearchAndReplaceDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/SearchAndReplaceDialog.h (rev 0)
+++ trunk/jazz/src/Dialogs/SearchAndReplaceDialog.h 2009-06-21 20:54:58 UTC (rev 732)
@@ -0,0 +1,51 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2009 Peter J. Stieber, all rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
+#ifndef JZ_SEARCHANDREPLACEDIALOG_H
+#define JZ_SEARCHANDREPLACEDIALOG_H
+
+#include <wx/dialog.h>
+
+class wxListBox;
+
+//*****************************************************************************
+//*****************************************************************************
+class JZSearchAndReplaceDialog : public wxDialog
+{
+ public:
+
+ JZSearchAndReplaceDialog(short From, short To, wxWindow* pParent);
+
+ private:
+
+ void OnHelp(wxCommandEvent& Event);
+
+ private:
+
+ short mFrom;
+ short mTo;
+
+ wxListBox* mpFromListBox;
+ wxListBox* mpToListBox;
+
+ DECLARE_EVENT_TABLE();
+};
+
+#endif // !defined(JZ_SEARCHANDREPLACEDIALOG_H)
Property changes on: trunk/jazz/src/Dialogs/SearchAndReplaceDialog.h
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/jazz/src/Dialogs/TransposeDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/TransposeDialog.cpp (rev 0)
+++ trunk/jazz/src/Dialogs/TransposeDialog.cpp 2009-06-21 20:54:58 UTC (rev 732)
@@ -0,0 +1,175 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2009 Peter J. Stieber, all rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
+#include "TransposeDialog.h"
+
+#include "../Globals.h"
+#include "../Help.h"
+#include "../Knob.h"
+#include "../Resources.h"
+
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/combobox.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
+#include <sstream>
+
+using namespace std;
+
+//*****************************************************************************
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+BEGIN_EVENT_TABLE(JZTransposeDialog, wxDialog)
+
+ EVT_KNOB_CHANGED(
+ IDC_KB_AMOUNT,
+ JZTransposeDialog::OnAmountChange)
+
+ EVT_BUTTON(wxID_HELP, JZTransposeDialog::OnHelp)
+
+END_EVENT_TABLE()
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZTransposeDialog::JZTransposeDialog(
+ int CurrentScale,
+ int Notes,
+ int Scale,
+ bool FitIntoScale,
+ wxWindow* pParent)
+ : wxDialog(pParent, wxID_ANY, wxString("Transpose")),
+ mNotes(Notes),
+ mScale(Scale),
+ mFitIntoScale(FitIntoScale),
+ mpAmountKnob(0),
+ mpAmountValue(0),
+ mpFitIntoScaleCheckBox(0),
+ mpScaleNamesComboBox(0)
+{
+ wxString CurrentSelectionText;
+ CurrentSelectionText
+ << "Current selection looks like " << gScaleNames[CurrentScale + 2].first;
+
+ mpAmountKnob = new JZKnob(this, IDC_KB_AMOUNT, 0, -12, 12);
+ mpAmountValue = new wxStaticText(this, wxID_ANY, "-00");
+
+ mpFitIntoScaleCheckBox = new wxCheckBox(this, wxID_ANY, "Fit into Scale");
+
+ mpScaleNamesComboBox = new wxComboBox(this, wxID_ANY);
+
+ for (
+ vector<pair<string, int> >::const_iterator iPair = gScaleNames.begin();
+ iPair != gScaleNames.end();
+ ++iPair)
+ {
+ const string& String = iPair->first;
+ mpScaleNamesComboBox->Append(String.c_str());
+ }
+
+ wxButton* pOkButton = new wxButton(this, wxID_OK, "&OK");
+ wxButton* pCancelButton = new wxButton(this, wxID_CANCEL, "Cancel");
+ wxButton* pHelpButton = new wxButton(this, wxID_HELP, "Help");
+ pOkButton->SetDefault();
+
+ wxBoxSizer* pTopSizer = new wxBoxSizer(wxVERTICAL);
+
+ pTopSizer->Add(
+ new wxStaticText(this, wxID_ANY, CurrentSelectionText),
+ 0,
+ wxALIGN_CENTER | wxALL,
+ 5);
+
+ wxFlexGridSizer* pFlexGridSizer = new wxFlexGridSizer(1, 3, 4, 2);
+
+ pFlexGridSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Amount:"),
+ 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ pFlexGridSizer->Add(
+ mpAmountValue,
+ 0,
+ wxALIGN_CENTER_VERTICAL | wxFIXED_MINSIZE);
+ pFlexGridSizer->Add(mpAmountKnob, 0, wxALIGN_CENTER_VERTICAL);
+
+ pTopSizer->Add(pFlexGridSizer, 0, wxALIGN_CENTER | wxALL, 5);
+
+ pTopSizer->Add(mpFitIntoScaleCheckBox, 0, wxALIGN_CENTER | wxALL, 5);
+
+ pTopSizer->Add(mpScaleNamesComboBox, 0, wxALIGN_CENTER | wxALL, 5);
+
+ wxBoxSizer* pButtonSizer = new wxBoxSizer(wxHORIZONTAL);
+ pButtonSizer->Add(pOkButton, 0, wxALL, 5);
+ pButtonSizer->Add(pCancelButton, 0, wxALL, 5);
+ pButtonSizer->Add(pHelpButton, 0, wxALL, 5);
+
+ pTopSizer->Add(pButtonSizer, 0, wxALIGN_CENTER | wxBOTTOM, 6);
+
+ SetAutoLayout(true);
+ SetSizer(pTopSizer);
+
+ pTopSizer->SetSizeHints(this);
+ pTopSizer->Fit(this);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+bool JZTransposeDialog::TransferDataToWindow()
+{
+ mpFitIntoScaleCheckBox->SetValue(mFitIntoScale);
+
+ ostringstream Oss;
+
+ Oss << mNotes;
+ mpAmountValue->SetLabel(Oss.str().c_str());
+ mpAmountKnob->SetValue(mNotes);
+
+ return true;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+bool JZTransposeDialog::TransferDataFromWindow()
+{
+ mFitIntoScale = mpFitIntoScaleCheckBox->GetValue();
+
+ mNotes = mpAmountKnob->GetValue();
+
+ return true;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZTransposeDialog::OnAmountChange(JZKnobEvent& Event)
+{
+ int Value = Event.GetValue();
+ ostringstream Oss;
+ Oss << Value;
+ mpAmountValue->SetLabel(Oss.str().c_str());
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZTransposeDialog::OnHelp(wxCommandEvent& Event)
+{
+ gpHelpInstance->ShowTopic("Transpose");
+}
Property changes on: trunk/jazz/src/Dialogs/TransposeDialog.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/jazz/src/Dialogs/TransposeDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/TransposeDialog.h (rev 0)
+++ trunk/jazz/src/Dialogs/TransposeDialog.h 2009-06-21 20:54:58 UTC (rev 732)
@@ -0,0 +1,69 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2009 Peter J. Stieber, all rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
+#ifndef JZ_TRANSPOSEDIALOG_H
+#define JZ_TRANSPOSEDIALOG_H
+
+#include <wx/dialog.h>
+
+class JZKnob;
+class JZKnobEvent;
+class wxCheckBox;
+class wxComboBox;
+class wxStaticText;
+
+//*****************************************************************************
+//*****************************************************************************
+class JZTransposeDialog : public wxDialog
+{
+ public:
+
+ JZTransposeDialog(
+ int CurrentScale,
+ int Notes,
+ int Scale,
+ bool FitIntoScale,
+ wxWindow* pParent);
+
+ private:
+
+ virtual bool TransferDataToWindow();
+
+ virtual bool TransferDataFromWindow();
+
+ void OnAmountChange(JZKnobEvent& Event);
+
+ void OnHelp(wxCommandEvent& Event);
+
+ private:
+
+ int& mNotes;
+ int& mScale;
+ bool& mFitIntoScale;
+
+ JZKnob* mpAmountKnob;
+ wxStaticText* mpAmountValue;
+ wxCheckBox* mpFitIntoScaleCheckBox;
+ wxComboBox* mpScaleNamesComboBox;
+
+ DECLARE_EVENT_TABLE();
+};
+
+#endif // !defined(JZ_TRANSPOSEDIALOG_H)
Property changes on: trunk/jazz/src/Dialogs/TransposeDialog.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp 2009-06-21 20:46:58 UTC (rev 731)
+++ trunk/jazz/src/Dialogs.cpp 2009-06-21 20:54:58 UTC (rev 732)
@@ -127,11 +127,6 @@
return false;
}
-void tSearchReplaceDlg::OnHelp()
-{
- gpHelpInstance->ShowTopic("Search Replace");
-}
-
void tSearchReplaceDlg::AddProperties()
{
sheet->AddProperty(new wxProperty(
@@ -149,65 +144,7 @@
-
//*****************************************************************************
-// Transpose
-//*****************************************************************************
-
-int tTransposeDlg::Notes = 0;
-int tTransposeDlg::Scale = gScaleChromatic;
-bool tTransposeDlg::FitIntoScale = 0;
-
-tTransposeDlg::tTransposeDlg(JZEventWindow* w, JZFilter *f)
- : tPropertyListDlg("Transpose")
-{
- Filter = f;
- Song = f->GetSong();
-}
-
-
-bool tTransposeDlg::OnClose()
-{
- tCmdTranspose trn(Filter, Notes, Scale, FitIntoScale);
- trn.Execute();
-
- JZProjectManager::Instance()->UpdateAllViews();
-
- return false;
-}
-
-void tTransposeDlg::OnHelp()
-{
- gpHelpInstance->ShowTopic("Transpose");
-}
-
-
-void tTransposeDlg::AddProperties()
-{
- int s = tScale::Analyze(Filter);
-
- sheet->AddProperty(new wxProperty(
- "selection looks like",
- wxPropertyValue(gScaleNames[s + 2].first),
- "string"));
- sheet->AddProperty(new wxProperty(
- "Amount",
- wxPropertyValue(&Notes),
- "integer",
- new wxIntegerListValidator(-12, 12)));
- sheet->AddProperty(new wxProperty(
- "Fit into Scale",
- wxPropertyValue((bool*)&FitIntoScale),
- "bool"));
-}
-
-
-
-
-
-
-
-//*****************************************************************************
// seqLength
//*****************************************************************************
Modified: trunk/jazz/src/Dialogs.h
===================================================================
--- trunk/jazz/src/Dialogs.h 2009-06-21 20:46:58 UTC (rev 731)
+++ trunk/jazz/src/Dialogs.h 2009-06-21 20:54:58 UTC (rev 732)
@@ -68,25 +68,6 @@
void OnHelp();
};
-// Transpose
-class tTransposeDlg : public tPropertyListDlg
-{
- public:
-
- static int Notes; // 0
- static bool FitIntoScale;
- static int Scale;
-
- JZFilter *Filter;
- JZSong *Song;
-
- //tNamedChoice ScaleDlg;
- tTransposeDlg(JZEventWindow* w, JZFilter *f);
- void AddProperties();
- bool OnClose();
- void OnHelp();
-};
-
// seqLength
class tSeqLengthDlg : public tPropertyListDlg
{
Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp 2009-06-21 20:46:58 UTC (rev 731)
+++ trunk/jazz/src/EventWindow.cpp 2009-06-21 20:54:58 UTC (rev 732)
@@ -28,7 +28,9 @@
#include "Dialogs/LengthDialog.h"
#include "Dialogs/MidiChannelDialog.h"
#include "Dialogs/QuantizeDialog.h"
+#include "Dialogs/SearchAndReplaceDialog.h"
#include "Dialogs/ShiftDialog.h"
+#include "Dialogs/TransposeDialog.h"
#include "Dialogs/VelocityDialog.h"
#include "Dialogs.h"
#include "EventFrame.h"
@@ -217,8 +219,23 @@
//-----------------------------------------------------------------------------
void JZEventWindow::Transpose()
{
- tTransposeDlg * dlg = new tTransposeDlg(this, mpFilter);
- dlg->Create();
+ int CurrentScale = tScale::Analyze(mpFilter);
+ int Notes = 0, Scale = gScaleChromatic;
+ bool FitIntoScale = false;
+
+ JZTransposeDialog TransposeDialog(
+ CurrentScale,
+ Notes,
+ Scale,
+ FitIntoScale,
+ this);
+ if (TransposeDialog.ShowModal() == wxID_OK)
+ {
+ tCmdTranspose TransposeCommand(mpFilter, Notes, Scale, FitIntoScale);
+ TransposeCommand.Execute();
+
+ JZProjectManager::Instance()->UpdateAllViews();
+ }
}
//-----------------------------------------------------------------------------
@@ -313,8 +330,17 @@
//-----------------------------------------------------------------------------
void JZEventWindow::SearchReplace()
{
- tSearchReplaceDlg * dlg = new tSearchReplaceDlg(this, mpFilter);
- dlg->Create();
+ short From = 1, To = 1;
+
+ JZSearchAndReplaceDialog SearchAndReplaceDialog(From, To, this);
+ if (SearchAndReplaceDialog.ShowModal() == wxID_OK)
+ {
+ tCmdSearchReplace SearchAndReplaceCommand(mpFilter, From - 1, To - 1);
+
+ SearchAndReplaceCommand.Execute();
+
+ JZProjectManager::Instance()->UpdateAllViews();
+ }
}
//-----------------------------------------------------------------------------
Modified: trunk/jazz/src/Makefile.am
===================================================================
--- trunk/jazz/src/Makefile.am 2009-06-21 20:46:58 UTC (rev 731)
+++ trunk/jazz/src/Makefile.am 2009-06-21 20:54:58 UTC (rev 732)
@@ -31,10 +31,12 @@
Dialogs/MetronomeSettingsDialog.cpp \
Dialogs/MidiChannelDialog.cpp \
Dialogs/QuantizeDialog.cpp \
+Dialogs/SearchAndReplaceDialog.cpp \
Dialogs/ShiftDialog.cpp \
Dialogs/SnapDialog.cpp \
Dialogs/SynthesizerSettingsDialog.cpp \
Dialogs/TrackDialog.cpp \
+Dialogs/TransposeDialog.cpp \
Dialogs/VelocityDialog.cpp \
Dialogs.cpp \
DynamicArray.cpp \
@@ -117,10 +119,12 @@
Dialogs/MetronomeSettingsDialog.cpp \
Dialogs/MidiChannelDialog.cpp \
Dialogs/QuantizeDialog.cpp \
+Dialogs/SearchAndReplaceDialog.cpp \
Dialogs/ShiftDialog.cpp \
Dialogs/SnapDialog.cpp \
Dialogs/SynthesizerSettingsDialog.cpp \
Dialogs/TrackDialog.cpp \
+Dialogs/TransposeDialog.cpp \
Dialogs/VelocityDialog.cpp \
Dialogs.cpp \
DynamicArray.cpp \
@@ -208,10 +212,12 @@
Dialogs/MetronomeSettingsDialog.h \
Dialogs/MidiChannelDialog.h \
Dialogs/QuantizeDialog.h \
+Dialogs/SearchAndReplaceDialog.h \
Dialogs/ShiftDialog.h \
Dialogs/SnapDialog.h \
Dialogs/SynthesizerSettingsDialog.h \
Dialogs/TrackDialog.h \
+Dialogs/TransposeDialog.h \
Dialogs/VelocityDialog.h \
Dialogs.h \
DynamicArray.h \
Modified: trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
===================================================================
--- trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2009-06-21 20:46:58 UTC (rev 731)
+++ trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2009-06-21 20:54:58 UTC (rev 732)
@@ -47,7 +47,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.9-VC8\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.10-VC8\include";..\src;..\src\mswin"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -70,7 +70,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.9-VC8\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC8\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -81,7 +81,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
@@ -147,7 +147,7 @@
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.9-VC8\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.10-VC8\include";..\src;..\src\mswin"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX"
StringPooling="true"
RuntimeLibrary="2"
@@ -171,7 +171,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.9-VC8\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC8\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -182,7 +182,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC8\lib\vc_lib""
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
SubSystem="2"
@@ -899,6 +899,14 @@
>
</File>
<File
+ RelativePath="..\src\Dialogs\SearchAndReplaceDialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Dialogs\SearchAndReplaceDialog.h"
+ >
+ </File>
+ <File
RelativePath="..\src\Dialogs\ShiftDialog.cpp"
>
</File>
@@ -931,6 +939,14 @@
>
</File>
<File
+ RelativePath="..\src\Dialogs\TransposeDialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Dialogs\TransposeDialog.h"
+ >
+ </File>
+ <File
RelativePath="..\src\Dialogs\VelocityDialog.cpp"
>
</File>
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2009-06-21 20:46:58 UTC (rev 731)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2009-06-21 20:54:58 UTC (rev 732)
@@ -48,7 +48,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.9-VC9\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.10-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -72,7 +72,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.9-VC9\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC9\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -83,7 +83,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
@@ -148,7 +148,7 @@
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.9-VC9\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.10-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX"
StringPooling="true"
RuntimeLibrary="2"
@@ -173,7 +173,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.9-VC9\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.10-VC9\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -184,7 +184,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.10-VC9\lib\vc_lib""
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
SubSystem="2"
@@ -828,7 +828,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Performing Custom Help Build Step"
- CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.9-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.9-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
+ CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.10-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.10-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
Outputs="$(InputDir)$(InputName)_contents.html;$(InputDir)$(InputName).hhc;$(InputDir)$(InputName).hhp;$(InputDir)$(InputName).hhk;$(InputDir)$(InputName).ref;$(InputDir)$(InputName).con;$(InputDir)$(InputName).htx"
/>
</FileConfiguration>
@@ -837,7 +837,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.9-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.9-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
+ CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.10-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.10-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
Outputs="$(InputDir)$(InputName)_contents.html"
/>
</FileConfiguration>
@@ -919,6 +919,14 @@
>
</File>
<File
+ RelativePath="..\src\Dialogs\SearchAndReplaceDialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Dialogs\SearchAndReplaceDialog.h"
+ >
+ </File>
+ <File
RelativePath="..\src\Dialogs\ShiftDialog.cpp"
>
</File>
@@ -951,6 +959,14 @@
>
</File>
<File
+ RelativePath="..\src\Dialogs\TransposeDialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Dialogs\TransposeDialog.h"
+ >
+ </File>
+ <File
RelativePath="..\src\Dialogs\VelocityDialog.cpp"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
