Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20935/src
Modified Files:
AboutDialog.cpp AboutDialog.h AllThemeResources.h HelpText.cpp
Menus.cpp SplashDialog.cpp SplashDialog.h Theme.cpp
Log Message:
tweaks to Splash and About dialogs
Index: SplashDialog.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/SplashDialog.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SplashDialog.h 16 Sep 2007 20:44:12 -0000 1.2
+++ SplashDialog.h 24 Sep 2007 05:06:56 -0000 1.3
@@ -34,6 +34,8 @@
void Populate( ShuttleGui & S );
void OnDontShow( wxCommandEvent & Evt );
+ wxStaticBitmap* m_pIcon;
+ wxBitmap* m_pLogo; //vvv
};
//void ShowSplashScreen( AudacityProject * pProj );
Index: AboutDialog.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AboutDialog.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- AboutDialog.h 4 Jul 2007 10:03:09 -0000 1.10
+++ AboutDialog.h 24 Sep 2007 05:06:56 -0000 1.11
@@ -37,7 +37,7 @@
wxBoxSizer *topsizer;
wxStaticBitmap *icon;
-// wxBitmap *logo;
+ wxBitmap *logo; //vvv
DECLARE_EVENT_TABLE()
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -d -r1.344 -r1.345
--- Menus.cpp 20 Sep 2007 23:15:57 -0000 1.344
+++ Menus.cpp 24 Sep 2007 05:06:56 -0000 1.345
@@ -728,7 +728,7 @@
else
c->AddItem(wxT("About"), _("&About Audacity..."),
FN(OnAbout));
- c->AddItem(wxT("Welcome"), _("&Start Up Message..."),
FN(OnHelpWelcome));
+ c->AddItem(wxT("Welcome"), _("&Show Welcome Message..."),
FN(OnHelpWelcome));
c->AddItem(wxT("Help"), _("&Index..."),
FN(OnHelp));
Index: AboutDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AboutDialog.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- AboutDialog.cpp 18 Sep 2007 10:08:24 -0000 1.52
+++ AboutDialog.cpp 24 Sep 2007 05:06:56 -0000 1.53
@@ -130,8 +130,7 @@
}
// ----------------------------------------------------------------------------
-// icons
-// ----------------------------------------------------------------------------
+
BEGIN_EVENT_TABLE(AboutDialog, wxDialog)
EVT_BUTTON(wxID_OK, AboutDialog::OnOK)
END_EVENT_TABLE()
@@ -320,14 +319,20 @@
// New way to add to About box....
S.StartNotebookPage( _("Audacity") );
S.StartVerticalLay(1);
+
+ //vvv For now, change to AudacityLogoWithName via old-fashioned way, not
Theme.
+ logo = new wxBitmap((const char **) AudacityLogoWithName_xpm); //vvv
icon =
- new wxStaticBitmap(S.GetParent(), -1, theTheme.Bitmap(bmpAudacityLogo),
wxPoint(93, 10),
- wxSize(215, 190));
+ new wxStaticBitmap(S.GetParent(), -1,
+ *logo, //vvv
+ //vvv theTheme.Bitmap(bmpAudacityLogo), wxPoint(93,
10), wxSize(215, 190));
+ //vvv theTheme.Bitmap(bmpAudacityLogoWithName),
+ wxDefaultPosition, wxSize(LOGOWITHNAME_WIDTH,
LOGOWITHNAME_HEIGHT));
S.Prop(0).AddWindow( icon );
wxHtmlWindow *html = new LinkingHtmlWindow(S.GetParent(), -1,
wxDefaultPosition,
- wxSize(480, 240),
+ wxSize(LOGOWITHNAME_WIDTH, 264), //
wxSize(480, 240),
wxHW_SCROLLBAR_AUTO |
wxSUNKEN_BORDER);
html->SetPage(creditStr);
S.Prop(1).AddWindow( html, wxEXPAND );
@@ -384,7 +389,7 @@
S.StartVerticalLay(1);
wxHtmlWindow *html = new wxHtmlWindow(S.GetParent(), -1,
wxDefaultPosition,
- wxSize(480, 240),
+ wxSize(LOGOWITHNAME_WIDTH, 264), //
wxSize(480, 240),
wxHW_SCROLLBAR_AUTO |
wxSUNKEN_BORDER);
// I tried using <pre> here to get a monospaced font,
Index: HelpText.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/HelpText.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- HelpText.cpp 18 Sep 2007 11:49:26 -0000 1.4
+++ HelpText.cpp 24 Sep 2007 05:06:56 -0000 1.5
@@ -57,7 +57,7 @@
{
if(Key==wxT("welcome"))
{
- return _("Welcome!");
+ return _("Welcome to Audacity!");
}
if(Key ==wxT("play") )
@@ -112,7 +112,7 @@
Link( wxT("norecord"), _("isn't recording anything"))+ _( " when ")+
_("you expect it to. Or you may prefer to just try using Audacity and see ")+
_("what you can do. You can always get back to these instructions by using ")+
-_("the 'Help' option in the menus, and then clicking on 'Start Up Message' ")+
+_("the 'Help' option in the menus, and then 'Show Welcome Message...' ")+
wxT("<br><br>")+
_("Welcome to Audacity.")
);
Index: Theme.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Theme.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Theme.cpp 5 Jul 2007 11:55:36 -0000 1.31
+++ Theme.cpp 24 Sep 2007 05:06:56 -0000 1.32
@@ -174,7 +174,8 @@
#include "../images/GlyphImages.h"
#include "../images/UploadImages.h"
-#include "../images/AudacityLogo.xpm"
+#include "../images/AudacityLogoWithName.xpm"
+//#include "../images/AudacityLogo.xpm"
#include "../images/AudacityLogo48x48.xpm"
#endif
@@ -531,7 +532,10 @@
}
-const int ImageCacheWidth = 440;// Must be wide enough for Audacity logo which
is 215, use double width.
+// Must be wide enough for AudacityLogoWithName. Use double width + 10.
+//vvv const int ImageCacheWidth = (2 * LOGOWITHNAME_WIDTH) + 10;
+const int ImageCacheWidth = 440;// Must be wide enough for AudacityLogo which
is 215, use double width.
+
const int ImageCacheHeight = 836;
void ThemeBase::CreateImageCache( bool bBinarySave )
Index: SplashDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/SplashDialog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SplashDialog.cpp 16 Sep 2007 20:44:12 -0000 1.3
+++ SplashDialog.cpp 24 Sep 2007 05:06:56 -0000 1.4
@@ -54,10 +54,12 @@
IMPLEMENT_CLASS(SplashDialog, wxDialog)
SplashDialog::SplashDialog(wxWindow * parent)
- : wxDialog(parent, -1, _NoAcc("&Welcome!"),
+ : wxDialog(parent, -1, _NoAcc("&Welcome to Audacity!"),
wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE |
wxRESIZE_BORDER)
{
this->SetBackgroundColour(theTheme.Colour( clrAboutBoxBackground ));
+ m_pIcon = NULL;
+ m_pLogo = NULL; //vvv
ShuttleGui S( this, eIsCreating );
Populate( S );
Fit();
@@ -70,9 +72,18 @@
bool bShow;
gPrefs->Read(wxT("/GUI/ShowSplashScreen"), &bShow, true );
S.StartVerticalLay(1);
+
+ //vvv For now, change to AudacityLogoWithName via old-fashioned ways, not
Theme.
+ m_pLogo = new wxBitmap((const char **) AudacityLogoWithName_xpm); //vvv
+ m_pIcon =
+ new wxStaticBitmap(S.GetParent(), -1,
+ *m_pLogo, //vvv
theTheme.Bitmap(bmpAudacityLogoWithName),
+ wxDefaultPosition, wxSize(LOGOWITHNAME_WIDTH,
LOGOWITHNAME_HEIGHT));
+ S.Prop(0).AddWindow( m_pIcon );
+
wxHtmlWindow *html = new LinkingHtmlWindow(S.GetParent(), -1,
wxDefaultPosition,
- wxSize(480, 300),
+ wxSize(LOGOWITHNAME_WIDTH, 280),
wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER
);
html->SetPage(HelpText( wxT("welcome") ));
S.Prop(1).AddWindow( html, wxEXPAND );
@@ -92,7 +103,7 @@
SplashDialog::~SplashDialog()
{
-// delete icon;
+ delete m_pLogo;
}
void SplashDialog::OnDontShow( wxCommandEvent & Evt )
Index: AllThemeResources.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AllThemeResources.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- AllThemeResources.h 5 Jul 2007 11:55:35 -0000 1.8
+++ AllThemeResources.h 24 Sep 2007 05:06:56 -0000 1.9
@@ -199,7 +199,17 @@
DEFINE_IMAGE( bmpUploadUp, wxImage( 16, 16 ), wxT("UploadUp"));
SET_THEME_FLAGS( resFlagNewLine );
- DEFINE_IMAGE( bmpAudacityLogo, wxImage( 215, 190 ), wxT("AudacityLogo"));
+
+#define LOGOWITHNAME_WIDTH 506
+#define LOGOWITHNAME_HEIGHT 200
+//vvv For now, do the new image the old-fashioned way, not via Theme.
+ // DEFINE_IMAGE(bmpAudacityLogoWithName, wxImage(LOGOWITHNAME_WIDTH,
LOGOWITHNAME_HEIGHT), wxT("AudacityLogoWithName"));
+#ifndef HAVE_AUDACITYLOGOWITHNAME
+ #define HAVE_AUDACITYLOGOWITHNAME
+ #include "../images/AudacityLogoWithName.xpm"
+#endif
+
+ //DEFINE_IMAGE( bmpAudacityLogo, wxImage( 215, 190 ), wxT("AudacityLogo"));
//vvv
DEFINE_IMAGE( bmpAudacityLogo48x48, wxImage( 48, 48 ),
wxT("AudacityLogo48x48"));
#ifdef OLD_COLOURS
-------------------------------------------------------------------------
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
