Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13475/src
Modified Files:
Menus.cpp TimeDialog.cpp TimeDialog.h
Log Message:
TimeDialog prompt was wrong for any other than a Generate effect. Provided a
means of have a task specific label.
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -d -r1.488 -r1.489
--- Menus.cpp 3 Jun 2009 03:48:44 -0000 1.488
+++ Menus.cpp 13 Jun 2009 03:08:44 -0000 1.489
@@ -2048,7 +2048,7 @@
{
wxString fmt = gPrefs->Read(wxT("/SelectionFormat"), wxT(""));
- TimeDialog D(this, wxID_ANY, _("Set Left Selection Bound"));
+ TimeDialog D(this, _("Set Left Selection Boundary"), _("Position"));
D.SetSampleRate(mRate);
D.SetFormatString(fmt);
D.SetTimeValue(mViewInfo.sel0);
@@ -2084,7 +2084,7 @@
{
wxString fmt = gPrefs->Read(wxT("/SelectionFormat"), wxT(""));
- TimeDialog D(this, wxID_ANY, _("Set Right Selection Bound"));
+ TimeDialog D(this, _("Set Right Selection Boundary"), _("Position"));
D.SetSampleRate(mRate);
D.SetFormatString(fmt);
D.SetTimeValue(mViewInfo.sel1);
Index: TimeDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TimeDialog.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- TimeDialog.cpp 9 Jan 2009 01:40:49 -0000 1.7
+++ TimeDialog.cpp 13 Jun 2009 03:08:45 -0000 1.8
@@ -29,17 +29,14 @@
END_EVENT_TABLE()
TimeDialog::TimeDialog(wxWindow *parent,
- wxWindowID id,
- const wxString &title,
- const wxPoint &pos,
- const wxSize &size,
- long style,
- const wxString &name)
-: wxDialog(parent, id, title, pos, size, style, name),
- mFormat(wxT("seconds")),
- mRate(44100),
- mTime(0.0),
- mTimeCtrl(NULL)
+ const wxString &title,
+ const wxString &prompt)
+: wxDialog(parent, wxID_ANY, title),
+ mPrompt(prompt),
+ mFormat(wxT("seconds")),
+ mRate(44100),
+ mTime(0.0),
+ mTimeCtrl(NULL)
{
ShuttleGui S(this, eIsCreating);
PopulateOrExchange(S);
@@ -50,7 +47,7 @@
S.SetBorder(5);
S.StartVerticalLay(true);
{
- S.StartStatic(_("Duration"), true);
+ S.StartStatic(mPrompt, true);
{
mTimeCtrl = new
TimeTextCtrl(this,
@@ -61,7 +58,7 @@
wxDefaultPosition,
wxDefaultSize,
true);
- mTimeCtrl->SetName(_("Duration"));
+ mTimeCtrl->SetName(mPrompt);
mTimeCtrl->SetFormatString(mTimeCtrl->GetBuiltinFormat(mFormat));
S.AddWindow(mTimeCtrl);
mTimeCtrl->EnableMenu();
Index: TimeDialog.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TimeDialog.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TimeDialog.h 22 Jul 2006 22:52:49 -0000 1.2
+++ TimeDialog.h 13 Jun 2009 03:08:45 -0000 1.3
@@ -25,12 +25,8 @@
public:
TimeDialog(wxWindow *parent,
- wxWindowID id,
- const wxString &title,
- const wxPoint &pos = wxDefaultPosition,
- const wxSize &size = wxDefaultSize,
- long style = wxDEFAULT_DIALOG_STYLE,
- const wxString &name = wxDialogNameStr);
+ const wxString &title,
+ const wxString &prompt = _("Duration"));
void SetFormatString(wxString formatString);
void SetSampleRate(double sampleRate);
@@ -47,6 +43,7 @@
private:
+ wxString mPrompt;
wxString mFormat;
double mRate;
double mTime;
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
