Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv14342/src
Modified Files:
AudacityApp.h Menus.cpp Project.cpp SplashDialog.cpp
SplashDialog.h
Log Message:
-Grey out when no tracks
-Resizable SplashDialog
-Possible fix for Linux compilation.
Index: SplashDialog.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/SplashDialog.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SplashDialog.h 16 Sep 2007 13:46:00 -0000 1.1
+++ SplashDialog.h 16 Sep 2007 20:44:12 -0000 1.2
@@ -36,7 +36,7 @@
};
-void ShowSplashScreen( AudacityProject * pProj );
+//void ShowSplashScreen( AudacityProject * pProj );
#endif
Index: AudacityApp.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudacityApp.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- AudacityApp.h 16 Sep 2007 15:16:32 -0000 1.39
+++ AudacityApp.h 16 Sep 2007 20:44:12 -0000 1.40
@@ -65,7 +65,8 @@
AudioIOBusyFlag = 0x00040000, //lll
PlayRegionLockedFlag = 0x00080000, //msmeyer
PlayRegionNotLockedFlag= 0x00100000, //msmeyer
- CutCopyAvailableFlag = 0x00200000
+ CutCopyAvailableFlag = 0x00200000,
+ WaveTracksExistFlag = 0x00400000
};
class AudacityApp:public wxApp {
Index: SplashDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/SplashDialog.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SplashDialog.cpp 16 Sep 2007 16:39:40 -0000 1.2
+++ SplashDialog.cpp 16 Sep 2007 20:44:12 -0000 1.3
@@ -55,7 +55,7 @@
SplashDialog::SplashDialog(wxWindow * parent)
: wxDialog(parent, -1, _NoAcc("&Welcome!"),
- wxDefaultPosition, wxDefaultSize)
+ wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE |
wxRESIZE_BORDER)
{
this->SetBackgroundColour(theTheme.Colour( clrAboutBoxBackground ));
ShuttleGui S( this, eIsCreating );
@@ -72,8 +72,8 @@
S.StartVerticalLay(1);
wxHtmlWindow *html = new LinkingHtmlWindow(S.GetParent(), -1,
wxDefaultPosition,
- wxSize(480, 240),
- wxHW_SCROLLBAR_AUTO |
wxSUNKEN_BORDER);
+ wxSize(480, 300),
+ wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER
);
html->SetPage(HelpText( wxT("welcome") ));
S.Prop(1).AddWindow( html, wxEXPAND );
S.Prop(0).StartMultiColumn(2, wxEXPAND);
@@ -107,12 +107,14 @@
}
+#if 0
void ShowSplashScreen( AudacityProject * pProj )
{
SplashDialog dlog(pProj);
dlog.ShowModal();
}
+#endif
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
// version control system. Please do not modify past this point.
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -d -r1.341 -r1.342
--- Menus.cpp 16 Sep 2007 13:45:58 -0000 1.341
+++ Menus.cpp 16 Sep 2007 20:44:12 -0000 1.342
@@ -1039,6 +1039,7 @@
}
}
else if (t->GetKind() == Track::Wave) {
+ flags |= WaveTracksExistFlag;
if (t->GetSelected()) {
flags |= TracksSelectedFlag;
if (t->GetLinked()) {
@@ -1135,7 +1136,7 @@
wxUint32 flags = GetUpdateFlags();
// JKC change to grey out effects less often...
- if( mSelectAllOnNone )
+ if( mSelectAllOnNone && ((flags & WaveTracksExistFlag) != 0 ))
flags |= /*AudioIONotBusyFlag |*/ TimeSelectedFlag |
WaveTracksSelectedFlag;
if (flags == mLastFlags)
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -d -r1.326 -r1.327
--- Project.cpp 16 Sep 2007 13:45:59 -0000 1.326
+++ Project.cpp 16 Sep 2007 20:44:12 -0000 1.327
@@ -1370,6 +1370,8 @@
wxUint32 MissingFlags = (flags & ~flagsRqd) & mask;
// IF selecting all audio won't do any good, THEN return with failure.
+ if( (flags & WaveTracksExistFlag) == 0 )
+ return false;
if( (MissingFlags & ~( TimeSelectedFlag | WaveTracksSelectedFlag))!=0)
return false;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
