Update of /cvsroot/audacity/audacity-src/src/toolbars
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv24461
Modified Files:
ControlToolBar.cpp DeviceToolBar.cpp EditToolBar.cpp
MeterToolBar.cpp MixerToolBar.cpp SelectionBar.cpp ToolBar.cpp
ToolBar.h ToolsToolBar.cpp TranscriptionToolBar.cpp
Log Message:
Add untranslated preferences label to prevent multiple sections from being
defined.
Index: ControlToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ControlToolBar.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ControlToolBar.cpp 18 Nov 2006 07:45:20 -0000 1.7
+++ ControlToolBar.cpp 22 Feb 2007 06:48:48 -0000 1.8
@@ -79,7 +79,7 @@
//Standard constructor
ControlToolBar::ControlToolBar()
-: ToolBar(ControlBarID, _("Control"))
+: ToolBar(ControlBarID, _("Control"), wxT("Control"))
{
mPaused = false;
mSizer = NULL;
Index: ToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ToolBar.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ToolBar.cpp 19 Nov 2006 11:14:15 -0000 1.7
+++ ToolBar.cpp 22 Feb 2007 06:48:48 -0000 1.8
@@ -85,12 +85,14 @@
//
ToolBar::ToolBar( int type,
const wxString &label,
+ const wxString §ion,
bool resizable )
: wxPanel()
{
// Save parameters
mType = type;
mLabel = label;
+ mSection = section;
mTitle.Printf( _("Audacity %s ToolBar"), mLabel.c_str() );
mResizable = resizable;
@@ -126,6 +128,14 @@
}
//
+// Returns the toolbar preferences section
+//
+wxString ToolBar::GetSection()
+{
+ return mSection;
+}
+
+//
// Returns the toolbar type
//
int ToolBar::GetType()
Index: TranscriptionToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/TranscriptionToolBar.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TranscriptionToolBar.cpp 19 Oct 2006 18:34:27 -0000 1.5
+++ TranscriptionToolBar.cpp 22 Feb 2007 06:48:48 -0000 1.6
@@ -78,7 +78,7 @@
////Standard Constructor
TranscriptionToolBar::TranscriptionToolBar()
-: ToolBar(TranscriptionBarID, _("Transcription"))
+: ToolBar(TranscriptionBarID, _("Transcription"), wxT("Transcription"))
{
}
Index: ToolsToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ToolsToolBar.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ToolsToolBar.cpp 20 Nov 2006 23:37:10 -0000 1.5
+++ ToolsToolBar.cpp 22 Feb 2007 06:48:48 -0000 1.6
@@ -87,7 +87,7 @@
//Standard constructor
ToolsToolBar::ToolsToolBar()
-: ToolBar(ToolsBarID, _("Tools"))
+: ToolBar(ToolsBarID, _("Tools"), wxT("Tools"))
{
//Read the following wxASSERTs as documentating a design decision
wxASSERT( selectTool == selectTool - firstTool );
Index: ToolBar.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ToolBar.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ToolBar.h 22 Oct 2006 09:54:26 -0000 1.3
+++ ToolBar.h 22 Feb 2007 06:48:48 -0000 1.4
@@ -75,7 +75,7 @@
public:
- ToolBar(int type, const wxString & label, bool resizable = false);
+ ToolBar(int type, const wxString & label, const wxString & section, bool
resizable = false);
virtual ~ToolBar();
virtual void Create(wxWindow *parent);
@@ -87,6 +87,7 @@
int GetType();
wxString GetTitle();
wxString GetLabel();
+ wxString GetSection();
ToolDock *GetDock();
bool Expose( bool show = true );
@@ -166,6 +167,7 @@
wxString mTitle;
wxString mLabel;
+ wxString mSection;
int mType;
bool mVisible;
Index: MeterToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/MeterToolBar.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MeterToolBar.cpp 22 Oct 2006 09:54:26 -0000 1.2
+++ MeterToolBar.cpp 22 Feb 2007 06:48:48 -0000 1.3
@@ -46,7 +46,7 @@
//Standard contructor
MeterToolBar::MeterToolBar()
-: ToolBar(MeterBarID, _("Meter"), true)
+: ToolBar(MeterBarID, _("Meter"), wxT("Meter"), true)
{
mSizer = NULL;
mPlayMeter = NULL;
Index: EditToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/EditToolBar.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- EditToolBar.cpp 16 Sep 2006 05:54:36 -0000 1.1
+++ EditToolBar.cpp 22 Feb 2007 06:48:48 -0000 1.2
@@ -72,7 +72,7 @@
//Standard contructor
EditToolBar::EditToolBar()
-: ToolBar(EditBarID, _("Edit"))
+: ToolBar(EditBarID, _("Edit"), wxT("Edit"))
{
}
Index: SelectionBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/SelectionBar.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- SelectionBar.cpp 19 Feb 2007 06:25:51 -0000 1.6
+++ SelectionBar.cpp 22 Feb 2007 06:48:48 -0000 1.7
@@ -72,7 +72,7 @@
END_EVENT_TABLE()
SelectionBar::SelectionBar()
-: ToolBar(SelectionBarID, _("Selection")),
+: ToolBar(SelectionBarID, _("Selection"), wxT("Selection")),
mStart(0.0), mEnd(0.0), mAudio(0.0),
mModifyingSelection(false), mLeftTime(NULL)
{
Index: DeviceToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/DeviceToolBar.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DeviceToolBar.cpp 24 Sep 2006 18:11:10 -0000 1.1
+++ DeviceToolBar.cpp 22 Feb 2007 06:48:48 -0000 1.2
@@ -51,7 +51,7 @@
//Standard contructor
DeviceToolBar::DeviceToolBar()
-: ToolBar(DeviceBarID, _("Device"))
+: ToolBar(DeviceBarID, _("Device"), wxT("Device"))
{
}
Index: MixerToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/MixerToolBar.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- MixerToolBar.cpp 22 Oct 2006 23:51:41 -0000 1.4
+++ MixerToolBar.cpp 22 Feb 2007 06:48:48 -0000 1.5
@@ -55,7 +55,7 @@
//Standard contructor
MixerToolBar::MixerToolBar()
-: ToolBar(MixerBarID, _("Mixer"))
+: ToolBar(MixerBarID, _("Mixer"), wxT("Mixer"))
{
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
