correction to last commit: Korean and Romanian translations will only be in 2.9.1...

[wxWidgets.git] / samples / splash / splash.cpp

diff --git a/samples/splash/splash.cpp b/samples/splash/splash.cpp
index cd7c2ad931e2fee901d606e1081a3c340df46e0e..3b9af61fd46bb74cbe03544d697637117bbcd884 100644 (file)
--- a/samples/splash/splash.cpp
+++ b/samples/splash/splash.cpp
@@ -32,6 +32,7 @@
 
 #include "wx/image.h"
 #include "wx/splash.h"
 
 #include "wx/image.h"
 #include "wx/splash.h"

+#include "wx/mediactrl.h"

 
 // ----------------------------------------------------------------------------
 // resources
 
 // ----------------------------------------------------------------------------
 // resources


@@ -43,6 +44,10 @@
     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

+// for smartphone, pda and other small screens use resized embedded image
+// instead of full colour png dedicated to desktops
+#include "mobile.xpm"
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -71,6 +76,8 @@ public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 

+    bool m_isPda;
+

 private:
     // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 private:
     // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()


@@ -83,7 +90,7 @@ private:
 // IDs for the controls and the menu commands
 enum
 {
 // IDs for the controls and the menu commands
 enum
 {

-    Minimal_Run = wxID_HIGHEST + 1,
+    Minimal_Run = wxID_HIGHEST + 1

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -116,20 +123,35 @@ IMPLEMENT_APP(MyApp)
 // 'Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
 // 'Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

     wxImage::AddHandler(new wxPNGHandler);
 
     wxImage::AddHandler(new wxPNGHandler);
 

+    // create the main application window
+    MyFrame *frame = new MyFrame(_T("wxSplashScreen sample application"));
+

     wxBitmap bitmap;
     wxBitmap bitmap;

-    if (bitmap.LoadFile(_T("splash.png"), wxBITMAP_TYPE_PNG))
+
+    if (frame->m_isPda)
+        bitmap = wxBitmap(mobile_xpm);
+
+    bool ok = frame->m_isPda
+            ? bitmap.Ok()
+            : bitmap.LoadFile(_T("splash.png"), wxBITMAP_TYPE_PNG);
+
+    if (ok)

     {
     {

-        wxSplashScreen* splash = new wxSplashScreen(bitmap,
+        new wxSplashScreen(bitmap,

             wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
             wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,

-            6000, NULL, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+            6000, frame, wxID_ANY, wxDefaultPosition, wxDefaultSize,

             wxSIMPLE_BORDER|wxSTAY_ON_TOP);
     }
             wxSIMPLE_BORDER|wxSTAY_ON_TOP);
     }

-    wxYield();

 
 

-    // create the main application window
-    MyFrame *frame = new MyFrame(_T("wxSplashScreen sample application"));
+#if !defined(__WXGTK20__)
+    // we don't need it at least on wxGTK with GTK+ 2.12.9
+    wxYield();
+#endif

 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)


@@ -149,6 +171,8 @@ bool MyApp::OnInit()
 MyFrame::MyFrame(const wxString& title)
        : wxFrame(NULL, wxID_ANY, title)
 {
 MyFrame::MyFrame(const wxString& title)
        : wxFrame(NULL, wxID_ANY, title)
 {

+    m_isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+

     // set the frame icon
     SetIcon(wxICON(sample));
 
     // set the frame icon
     SetIcon(wxICON(sample));
 


@@ -158,7 +182,7 @@ MyFrame::MyFrame(const wxString& title)
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;

-    helpMenu->Append(wxID_ABOUT, _T("&About...\tF1"), _T("Show about dialog"));
+    helpMenu->Append(wxID_ABOUT, _T("&About...\tF1"), _T("Show about frame"));

 
     menuFile->Append(wxID_EXIT, _T("E&xit\tAlt-X"), _T("Quit this program"));
 
 
     menuFile->Append(wxID_EXIT, _T("E&xit\tAlt-X"), _T("Quit this program"));
 


@@ -189,9 +213,44 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    wxString msg;
-    msg.Printf( _T("This is the About dialog of the wxSplashScreen sample.\n")
-                _T("Welcome to %s"), wxVERSION_STRING);
+    wxBitmap bitmap;
+
+    if (m_isPda) bitmap = wxBitmap(mobile_xpm);
+
+    bool ok = m_isPda
+            ? bitmap.Ok()
+            : bitmap.LoadFile(_T("splash.png"), wxBITMAP_TYPE_PNG);
+
+    if (ok)
+    {
+        wxImage image = bitmap.ConvertToImage();
+
+        // do not scale on already small screens
+        if (!m_isPda)
+            image.Rescale( bitmap.GetWidth()/2, bitmap.GetHeight()/2 );
+
+        bitmap = wxBitmap(image);
+        wxSplashScreen *splash = new wxSplashScreen(bitmap,
+            wxSPLASH_CENTRE_ON_PARENT | wxSPLASH_NO_TIMEOUT,
+            0, this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+            wxSIMPLE_BORDER|wxSTAY_ON_TOP);

 
 

-    wxMessageBox(msg, _T("About sample"), wxOK | wxICON_INFORMATION, this);
+        wxWindow *win = splash->GetSplashWindow();
+#if wxUSE_MEDIACTRL
+        wxMediaCtrl *media = new wxMediaCtrl( win, wxID_EXIT, _T("press.mpg"), wxPoint(2,2));
+        media->Play();
+#else
+        wxStaticText *text = new wxStaticText( win,
+                                               wxID_EXIT,
+                                               _T("click somewhere\non this image"),
+                                               wxPoint(m_isPda ? 0 : 13,
+                                                       m_isPda ? 0 : 11)
+                                             );
+        text->SetBackgroundColour(*wxWHITE);
+        text->SetForegroundColour(*wxBLACK);
+        wxFont font = text->GetFont();
+        font.SetPointSize(2*font.GetPointSize()/3);
+        text->SetFont(font);
+#endif
+    }

 }
 }