Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28460/src
Modified Files:
AudacityApp.cpp AudacityApp.h Menus.cpp Menus.h Project.cpp
Log Message:
Separate the menu/command text and the associated shortcut keycombo. This
is a fix for keycombos being translated and not being recognized by the
command mananger and wxWidgets as valid key identifiers.
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -d -r1.423 -r1.424
--- Project.cpp 29 May 2009 17:07:39 -0000 1.423
+++ Project.cpp 30 May 2009 19:54:12 -0000 1.424
@@ -666,7 +666,7 @@
mWantSaveCompressed(false),
mLastEffect(NULL),
mLastEffectType(0),
- mLastEffectDesc(_("Repeat Last Effect\tCtrl+R"))
+ mLastEffectDesc(_("Repeat Last Effect"))
{
int widths[] = {-1, 130};
mStatusBar = CreateStatusBar(2);
Index: AudacityApp.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudacityApp.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- AudacityApp.h 30 May 2009 04:32:02 -0000 1.54
+++ AudacityApp.h 30 May 2009 19:54:12 -0000 1.55
@@ -50,7 +50,10 @@
// These flags represent the majority of the states that affect
// whether or not items in menus are enabled or disabled.
-enum {
+enum
+{
+ AlwaysEnabledFlag = 0x00000000,
+
AudioIONotBusyFlag = 0x00000001,
TimeSelectedFlag = 0x00000002,
TracksSelectedFlag = 0x00000004,
@@ -77,7 +80,9 @@
WaveTracksExistFlag = 0x00400000,
NoteTracksExistFlag = 0x00800000, //gsw
NoteTracksSelectedFlag = 0x01000000, //gsw
- HaveRecentFiles = 0x02000000
+ HaveRecentFiles = 0x02000000,
+
+ NoFlagsSpecifed = 0xffffffff
};
class AudacityApp:public wxApp {
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -d -r1.483 -r1.484
--- Menus.cpp 30 May 2009 16:50:56 -0000 1.483
+++ Menus.cpp 30 May 2009 19:54:12 -0000 1.484
@@ -185,495 +185,458 @@
EffectArray *effects;
wxArrayString names;
wxArrayInt indices;
-#ifndef EFFECT_CATEGORIES
- unsigned int i;
-#endif
wxMenuBar *menubar = c->AddMenuBar(wxT("appmenu"));
- //
+
/////////////////////////////////////////////////////////////////////////////
[...1296 lines suppressed...]
+ c->AddCommand(wxT("OutputGainDec"), _("Decrease output gain"),
FN(OnOutputGainDec));
+ c->AddCommand(wxT("InputGain"), _("Adjust input gain"), FN(OnInputGain));
+ c->AddCommand(wxT("InputGainInc"), _("Increase input gain"),
FN(OnInputGainInc));
+ c->AddCommand(wxT("InputGainDec"), _("Decrease input gain"),
FN(OnInputGainDec));
+
+ c->AddCommand(wxT("InputSource"), _("Adjust input source"),
FN(OnInputSource),
+ AudioIONotBusyFlag,
+ AudioIONotBusyFlag);
mLastFlags = 0;
@@ -2426,7 +2428,7 @@
if ((f->GetEffectFlags() & (INSERT_EFFECT | ANALYZE_EFFECT))==0) {
mLastEffect = f;
mLastEffectType = type;
- mLastEffectDesc.Printf(_("Repeat %s\tCtrl+R"), shortDesc.c_str());
+ mLastEffectDesc.Printf(_("Repeat %s"), shortDesc.c_str());
mCommandManager.Modify(wxT("RepeatLastEffect"), mLastEffectDesc);
}
Index: AudacityApp.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudacityApp.cpp,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- AudacityApp.cpp 30 May 2009 04:32:02 -0000 1.234
+++ AudacityApp.cpp 30 May 2009 19:54:12 -0000 1.235
@@ -800,12 +800,11 @@
wxMenu *fileMenu = new wxMenu();
wxMenu *recentMenu = new wxMenu();
- fileMenu->Append(wxID_NEW, wxT("&New\tCtrl+N"));
- fileMenu->Append(wxID_OPEN, wxT("&Open...\tCtrl+O"));
- fileMenu->AppendSubMenu(recentMenu, wxT("Open &Recent..."));
+ fileMenu->Append(wxID_NEW, wxString(_("&New")) + wxT("\tCtrl+N"));
+ fileMenu->Append(wxID_OPEN, wxString(_("&Open...")) + wxT("\tCtrl+O"));
+ fileMenu->AppendSubMenu(recentMenu, _("Open &Recent..."));
fileMenu->Append(wxID_ABOUT, _("&About Audacity..."));
- /* i18n-hint: Mac OS X shortcut should be Ctrl+, */
- fileMenu->Append(wxID_PREFERENCES, _("&Preferences...\tCtrl+,"));
+ fileMenu->Append(wxID_PREFERENCES, wxString(_("&Preferences...")) +
wxT("\tCtrl+,"));
wxMenuBar *menuBar = new wxMenuBar();
menuBar->Append(fileMenu, wxT("&File"));
Index: Menus.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.h,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- Menus.h 14 Apr 2009 05:25:32 -0000 1.133
+++ Menus.h 30 May 2009 19:54:12 -0000 1.134
@@ -239,8 +239,6 @@
void OnShowClipping();
-void OnSelectionFormat(int index);
-
void OnPlotSpectrum();
void OnContrast();
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp as they present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
