Update of /cvsroot/audacity/audacity-src/src/toolbars
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8564/toolbars
Modified Files:
Tag: Audacity_1_3_5-Camp_Jam
BrandToolBar.cpp SelectionBar.cpp ToolManager.cpp
Log Message:
company name change for custom version
Index: SelectionBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/SelectionBar.cpp,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -u -d -r1.23.2.2 -r1.23.2.3
--- SelectionBar.cpp 11 Oct 2008 00:25:18 -0000 1.23.2.2
+++ SelectionBar.cpp 24 Nov 2008 04:22:53 -0000 1.23.2.3
@@ -137,8 +137,8 @@
// Top row (mostly labels)
//
-#if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
- // Camp Jam Easy version wants only the Audio Position control.
+#if (AUDACITY_BRANDING == BRAND_JAMLING__EASY)
+ // Jamling Easy version wants only the Audio Position control.
mainSizer->Add(5, 1);
mainSizer->Add(new wxStaticText(this, wxID_ANY, _("Audio Position:")),
0, wxALIGN_CENTER_VERTICAL | wxLEFT, 0);
@@ -279,7 +279,7 @@
wxSize(1, toolbarSingle),
wxLI_VERTICAL),
0, wxRIGHT, 5);
-#endif // (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+#endif // (AUDACITY_BRANDING == BRAND_JAMLING__EASY)
mAudioTime = new TimeTextCtrl(this, -1, format, 0.0, mRate);
mAudioTime->SetName(_("Audio Position:"));
Index: ToolManager.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ToolManager.cpp,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -d -r1.16.2.2 -r1.16.2.3
--- ToolManager.cpp 3 Nov 2008 05:27:50 -0000 1.16.2.2
+++ ToolManager.cpp 24 Nov 2008 04:22:53 -0000 1.16.2.3
@@ -543,7 +543,7 @@
// Read in all the settings
gPrefs->Read( wxT("Dock"), &dock, ndx == SelectionBarID ? BotDockID :
TopDockID );
gPrefs->Read( wxT("Order"), &ord, NoBarID );
- #if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ #if (AUDACITY_BRANDING == BRAND_JAMLING__EASY)
show[ndx] = this->DefaultShow(ndx);
#else
gPrefs->Read( wxT("Show"), &show[ ndx ], this->DefaultShow(ndx) );
@@ -797,7 +797,7 @@
bool ToolManager::DefaultShow(int type)
{
bool bShow = true;
- #if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ #if (AUDACITY_BRANDING == BRAND_JAMLING__EASY)
bShow = (type != ToolsBarID) &&
(type != TranscriptionBarID) &&
(type != DeviceBarID);
Index: BrandToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/Attic/BrandToolBar.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- BrandToolBar.cpp 3 Nov 2008 19:59:21 -0000 1.1.2.1
+++ BrandToolBar.cpp 24 Nov 2008 04:22:53 -0000 1.1.2.2
@@ -39,7 +39,7 @@
ID_BUTTON_WELCOME,
};
-#define BUTTON_WELCOME_TEXT _("Show Jam Window") //vvv Camp Jam only for now.
+#define BUTTON_WELCOME_TEXT _("Show Jamling Window") //v Jamling only for now.
IMPLEMENT_CLASS(BrandToolBar, ToolBar);
@@ -62,7 +62,7 @@
#if (AUDACITY_BRANDING != BRAND_AUDACITY)
// Build in the brand-specific logo and mouse-over bitmaps.
// The data global vars in these MUST be named company_logo_xpm and
company_logo_over_xpm.
- #if ((AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY) || (AUDACITY_BRANDING ==
BRAND_CAMP_JAM__FULL))
+ #if ((AUDACITY_BRANDING == BRAND_JAMLING__EASY) || (AUDACITY_BRANDING ==
BRAND_JAMLING__FULL))
#include "../images/Branding/CampJam.xpm" // 162x64 image var is called
company_logo_xpm.
#include "../images/Branding/CampJam_over.xpm" // 162x64
#endif
-------------------------------------------------------------------------
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
