Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv21232
Modified Files:
Tag: Audacity_UmixIt
AColor.cpp LyricsWindow.cpp MixerBoard.cpp
Log Message:
MixerBoard adjustments for Windows
Index: LyricsWindow.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/LyricsWindow.cpp,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- LyricsWindow.cpp 27 Feb 2007 10:32:41 -0000 1.1.2.7
+++ LyricsWindow.cpp 1 Mar 2007 02:28:18 -0000 1.1.2.8
@@ -28,7 +28,7 @@
((parent->GetName() == wxEmptyString) ?
wxT("") :
wxString::Format(
- wxT("- %s"),
+ wxT(" - %s"),
parent->GetName().c_str()).c_str())),
wxDefaultPosition, gSize,
wxDEFAULT_FRAME_STYLE
Index: MixerBoard.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/MixerBoard.cpp,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -d -r1.1.2.12 -r1.1.2.13
--- MixerBoard.cpp 27 Feb 2007 11:26:06 -0000 1.1.2.12
+++ MixerBoard.cpp 1 Mar 2007 02:28:18 -0000 1.1.2.13
@@ -5,6 +5,7 @@
MixerBoard.cpp
Vaughan Johnson, January 2007
+ Dominic Mazzoni
**********************************************************************/
@@ -96,7 +97,7 @@
wxBitmap* bitmap = mMixerBoard->GetMusicalInstrumentBitmap(mLeftTrack);
wxASSERT(bitmap);
mStaticBitmap_MusicalInstrument =
- new wxStaticBitmap(this, -1, *bitmap, ctrlPos, ctrlSize,
wxSUNKEN_BORDER);
+ new wxStaticBitmap(this, -1, *bitmap, ctrlPos, ctrlSize);
//pBoxSizer_MixerTrackCluster->Add(mStaticBitmap_MusicalInstrument, 0,
wxALIGN_CENTER | wxALL, kDoubleInset);
@@ -149,7 +150,10 @@
// gain slider & level meter
ctrlPos.x = kDoubleInset;
ctrlPos.y += PAN_HEIGHT + kQuadrupleInset;
- ctrlSize = wxSize((nHalfWidth - kQuadrupleInset - kExtraMeter),
+
+ //v For the slider width, subtracting kTripleInset instead of
kQuadrupleInset makes it not show
+ // ticks on Windows -- wxSlider bug. But it looks better this way with
the now wider meter.
+ ctrlSize = wxSize((nHalfWidth - kTripleInset - kExtraMeter),
(size.GetHeight() - ctrlPos.y - kQuadrupleInset));
// ASlider doesn't do vertical, so use wxSlider for now.
@@ -510,7 +514,7 @@
// class MixerBoard
-#define MIXER_BOARD_MIN_HEIGHT 480
+#define MIXER_BOARD_MIN_HEIGHT 500
#define MIXER_TRACK_CLUSTER_WIDTH 100 - kInset
#define DEFAULT_NUM_TRACKCLUSTERS 8 // Default to fitting 8 tracks.
const wxSize kDefaultSize =
@@ -530,7 +534,7 @@
wxString::Format(_("Audacity Mixer Board%s"),
((parent->GetName() == wxEmptyString) ?
wxT("") :
- wxString::Format(wxT("- %s"),
+ wxString::Format(wxT(" - %s"),
parent->GetName().c_str()).c_str())),
wxDefaultPosition, kDefaultSize,
wxDEFAULT_FRAME_STYLE
Index: AColor.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AColor.cpp,v
retrieving revision 1.10.2.6.2.1
retrieving revision 1.10.2.6.2.2
diff -u -d -r1.10.2.6.2.1 -r1.10.2.6.2.2
--- AColor.cpp 23 Nov 2006 03:45:43 -0000 1.10.2.6.2.1
+++ AColor.cpp 1 Mar 2007 02:28:18 -0000 1.10.2.6.2.2
@@ -393,6 +393,7 @@
case 5: return gBlue;
case 6: return gPurple;
}
+ return gRed;
}
-------------------------------------------------------------------------
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
