Update of /cvsroot/audacity/audacity-src/src/effects
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28811
Modified Files:
Contrast.cpp Contrast.h
Log Message:
Updates to 'Measure' buttons and 'Information' box.
Index: Contrast.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Contrast.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Contrast.cpp 5 Nov 2008 23:29:47 -0000 1.2
+++ Contrast.cpp 9 Nov 2008 18:39:41 -0000 1.3
@@ -67,7 +67,6 @@
{
ContrastDialog dlog(this, mParent);
- dlog.TransferDataToWindow();
dlog.CentreOnParent();
dlog.ShowModal();
@@ -191,6 +190,7 @@
foregrounddB = m_pEffect->GetDB();
mForegroundRMSText->SetLabel(wxString::Format(_("%.1f dB"), foregrounddB));
m_pButton_GetForeground->Enable(false);
+ m_pButton_GetForeground->SetLabel(_("Measured"));
results();
}
@@ -201,6 +201,7 @@
backgrounddB = m_pEffect->GetDB();
mBackgroundRMSText->SetLabel(wxString::Format(_("%.1f dB"), backgrounddB));
m_pButton_GetBackground->Enable(false);
+ m_pButton_GetBackground->SetLabel(_("Measured"));
results();
}
@@ -224,15 +225,6 @@
{
wxTextValidator vld(wxFILTER_NUMERIC);
wxString number;
-/* wxString step1Label;
- wxString step1Prompt;
- wxString step2Label;
- wxString step2Prompt;
-
- step1Label = _("Step 1");
- step1Prompt = _("Select the dialogue (foreground) then click Measure
Foreground:");
- step2Label = _("Step 2");
- step2Prompt = _("Select the background noise to measure, then click Measure
Background:");*/
S.StartHorizontalLay(wxCENTER, false);
{
@@ -240,22 +232,6 @@
}
S.EndHorizontalLay();
-/* S.StartStatic(step1Label);
- {
- S.AddVariableText(step1Prompt);
- m_pButton_GetBackground = S.Id(ID_BUTTON_GETFOREGROUND).
- AddButton(_("Measure Foreground"));
- }
- S.EndStatic();
-
- S.StartStatic(step2Label);
- {
- S.AddVariableText(step2Prompt);
- m_pButton_GetForeground = S.Id(ID_BUTTON_GETBACKGROUND).
- AddButton(_("Measure Background"));
- }
- S.EndStatic();*/
-
S.StartStatic( _("Parameters") );
{
S.StartMultiColumn(5, wxEXPAND);
@@ -287,7 +263,7 @@
S.AddFixedText(_("seconds"), false);
}
S.EndMultiColumn();
- m_pButton_GetForeground =
S.Id(ID_BUTTON_GETFOREGROUND).AddButton(_("Measure"));
+ m_pButton_GetForeground =
S.Id(ID_BUTTON_GETFOREGROUND).AddButton(_("Measured"));
m_pButton_GetForeground->Enable(false); // Disabled as we do the
measurement as we put up the dialog
mForegroundRMSText=S.Id(ID_FOREGROUNDDB_TEXT).AddVariableText(wxString::Format(wxT("%.1f
dB"), foregrounddB));
@@ -310,7 +286,7 @@
S.AddFixedText(_("seconds"));
}
S.EndMultiColumn();
- m_pButton_GetBackground =
S.Id(ID_BUTTON_GETBACKGROUND).AddButton(_("Measure"));
+ m_pButton_GetBackground =
S.Id(ID_BUTTON_GETBACKGROUND).AddButton(_("Measured"));
m_pButton_GetBackground->Enable(false);
mBackgroundRMSText=S.Id(ID_BACKGROUNDDB_TEXT).AddVariableText(wxString::Format(wxT("%.1f
dB"), backgrounddB));
}
@@ -336,6 +312,9 @@
//Information
S.StartStatic( _("Information") );
{
+ S.AddFixedText(_("Before you open this tool,"));
+ S.AddFixedText(_(" Ctrl+Alt+F sets the 'foreground' times."));
+ S.AddFixedText(_(" Ctrl+Alt+B sets the 'background' times."));
m_pButton_GetURL = S.Id(ID_BUTTON_GETURL).AddButton(_("WCAG Information
on web"));
}
S.EndStatic();
@@ -346,6 +325,7 @@
wxString val = mForegroundStartText->GetValue();
val.ToDouble(&startTimeF);
m_pButton_GetForeground->Enable(true);
+ m_pButton_GetForeground->SetLabel(_("Measure"));
}
void ContrastDialog::OnForegroundEndText(wxCommandEvent & event)
@@ -353,6 +333,7 @@
wxString val = mForegroundEndText->GetValue();
val.ToDouble(&endTimeF);
m_pButton_GetForeground->Enable(true);
+ m_pButton_GetForeground->SetLabel(_("Measure"));
}
void ContrastDialog::OnBackgroundStartText(wxCommandEvent & event)
@@ -360,6 +341,7 @@
wxString val = mBackgroundStartText->GetValue();
val.ToDouble(&startTimeB);
m_pButton_GetBackground->Enable(true);
+ m_pButton_GetBackground->SetLabel(_("Measure"));
}
void ContrastDialog::OnBackgroundEndText(wxCommandEvent & event)
@@ -367,6 +349,7 @@
wxString val = mBackgroundEndText->GetValue();
val.ToDouble(&endTimeB);
m_pButton_GetBackground->Enable(true);
+ m_pButton_GetBackground->SetLabel(_("Measure"));
}
void ContrastDialog::results()
Index: Contrast.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Contrast.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Contrast.h 5 Nov 2008 23:29:47 -0000 1.2
+++ Contrast.h 9 Nov 2008 18:39:41 -0000 1.3
@@ -84,11 +84,11 @@
ContrastDialog(EffectContrast * effect,
wxWindow *parent);
- wxSizer *MakeContrastDialog(bool call_fit = true,
- bool set_sizer = true);
+// wxSizer *MakeContrastDialog(bool call_fit = true,
+// bool set_sizer = true);
void PopulateOrExchange(ShuttleGui & S);
- void UpdateDisplay();
+// void UpdateDisplay();
private:
// handlers
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
