X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a756f210019dd5b51331b7181c816d3882146a30..6f026b5b63fe7ccb025e84509886f74772b9df13:/src/generic/tipdlg.cpp

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 6f9ba6f7df..47d180962e 100644
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -1,10 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        tipdlg.cpp
+// Name:        src/generic/tipdlg.cpp
 // Purpose:     implementation of wxTipDialog
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     28.06.99
-// RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "tipdlg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -37,14 +32,15 @@
     #include "wx/dialog.h"
     #include "wx/icon.h"
     #include "wx/intl.h"
-    #include "wx/settings.h"
     #include "wx/textctrl.h"
     #include "wx/statbmp.h"
     #include "wx/stattext.h"
     #include "wx/sizer.h"
+    #include "wx/settings.h"
 #endif // WX_PRECOMP
 
 #include "wx/statline.h"
+#include "wx/artprov.h"
 
 #include "wx/tipdlg.h"
 
@@ -52,7 +48,21 @@
 // constants
 // ----------------------------------------------------------------------------
 
-static const int wxID_NEXT_TIP = -100;  // whatever
+static const int wxID_NEXT_TIP = 32000;  // whatever
+
+// ---------------------------------------------------------------------------
+// macros
+// ---------------------------------------------------------------------------
+
+/* Macro for avoiding #ifdefs when value have to be different depending on size of
+   device we display on - take it from something like wxDesktopPolicy in the future
+ */
+
+#if defined(__SMARTPHONE__)
+    #define wxLARGESMALL(large,small) small
+#else
+    #define wxLARGESMALL(large,small) large
+#endif
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -60,7 +70,8 @@ static const int wxID_NEXT_TIP = -100;  // whatever
 
 // an implementation which takes the tips from the text file - each line
 // represents a tip
-class WXDLLEXPORT wxFileTipProvider : public wxTipProvider
+#if wxUSE_TEXTFILE
+class WXDLLIMPEXP_ADV wxFileTipProvider : public wxTipProvider
 {
 public:
     wxFileTipProvider(const wxString& filename, size_t currentTip);
@@ -69,11 +80,14 @@ public:
 
 private:
     wxTextFile m_textfile;
+
+    wxDECLARE_NO_COPY_CLASS(wxFileTipProvider);
 };
+#endif // wxUSE_TEXTFILE
 
 #ifdef __WIN32__
 // TODO an implementation which takes the tips from the given registry key
-class WXDLLEXPORT wxRegTipProvider : public wxTipProvider
+class WXDLLIMPEXP_ADV wxRegTipProvider : public wxTipProvider
 {
 public:
     wxRegTipProvider(const wxString& keyname);
@@ -90,14 +104,14 @@ wxString wxRegTipProvider::GetTip()
 #endif // __WIN32__
 
 // the dialog we show in wxShowTip()
-class WXDLLEXPORT wxTipDialog : public wxDialog
+class WXDLLIMPEXP_ADV wxTipDialog : public wxDialog
 {
 public:
     wxTipDialog(wxWindow *parent,
                 wxTipProvider *tipProvider,
                 bool showAtStartup);
 
-    // the tip dialog has "Show tips on startup" checkbox - return TRUE if it
+    // the tip dialog has "Show tips on startup" checkbox - return true if it
     // was checked (or wasn't unchecked)
     bool ShowTipsOnStartup() const { return m_checkbox->GetValue(); }
 
@@ -114,6 +128,7 @@ private:
     wxCheckBox *m_checkbox;
 
     DECLARE_EVENT_TABLE()
+    wxDECLARE_NO_COPY_CLASS(wxTipDialog);
 };
 
 // ============================================================================
@@ -123,7 +138,7 @@ private:
 // ----------------------------------------------------------------------------
 // wxFileTipProvider
 // ----------------------------------------------------------------------------
-
+#if wxUSE_TEXTFILE
 wxFileTipProvider::wxFileTipProvider(const wxString& filename,
                                      size_t currentTip)
                  : wxTipProvider(currentTip), m_textfile(filename)
@@ -135,18 +150,61 @@ wxString wxFileTipProvider::GetTip()
 {
     size_t count = m_textfile.GetLineCount();
     if ( !count )
+    {
         return _("Tips not available, sorry!");
+    }
+
+    wxString tip;
+
+    // Comments start with a # symbol.
+    // Loop reading lines until get the first one that isn't a comment.
+    // The max number of loop executions is the number of lines in the
+    // textfile so that can't go into an eternal loop in the [oddball]
+    // case of a comment-only tips file, or the developer has vetoed
+    // them all via PreprecessTip().
+    for ( size_t i=0; i < count; i++ )
+    {
+        // The current tip may be at the last line of the textfile, (or
+        // past it, if the number of lines in the textfile changed, such
+        // as changing to a different textfile, with less tips). So check
+        // to see at last line of text file, (or past it)...
+        if ( m_currentTip >= count )
+        {
+            // .. and if so, wrap back to line 0.
+            m_currentTip = 0;
+        }
+
+        // Read the tip, and increment the current tip counter.
+        tip = m_textfile.GetLine(m_currentTip++);
+
+        // Allow a derived class's overrided virtual to modify the tip
+        // now if so desired.
+        tip = PreprocessTip(tip);
+
+        // Break if tip isn't a comment, and isn't an empty string
+        // (or only stray space characters).
+        if ( !tip.StartsWith(wxT("#")) && (tip.Trim() != wxEmptyString) )
+        {
+            break;
+        }
+    }
 
-    // notice that it may be greater, actually, if we remembered it from the
-    // last time and the number of tips changed
-    if ( m_currentTip == count )
+    // If tip starts with '_(', then it is a gettext string of format
+    // _("My \"global\" tip text") so first strip off the leading '_("'...
+    if ( tip.StartsWith(wxT("_(\"" ), &tip))
     {
-        // wrap
-        m_currentTip = 0;
+        //...and strip off the trailing '")'...
+        tip = tip.BeforeLast(wxT('\"'));
+        // ...and replace escaped quotes
+        tip.Replace(wxT("\\\""), wxT("\""));
+
+        // and translate it as requested
+        tip = wxGetTranslation(tip);
     }
 
-    return m_textfile.GetLine(m_currentTip++);
+    return tip;
 }
+#endif // wxUSE_TEXTFILE
 
 // ----------------------------------------------------------------------------
 // wxTipDialog
@@ -159,49 +217,71 @@ END_EVENT_TABLE()
 wxTipDialog::wxTipDialog(wxWindow *parent,
                          wxTipProvider *tipProvider,
                          bool showAtStartup)
-           : wxDialog(parent, -1, _("Tip of the Day"),
+           : wxDialog(GetParentForModalDialog(parent, 0), wxID_ANY, _("Tip of the Day"),
                       wxDefaultPosition, wxDefaultSize,
-                      wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+                      wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER
+                      )
 {
     m_tipProvider = tipProvider;
+    bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
 
     // 1) create all controls in tab order
 
-    wxButton *btnClose = new wxButton(this, wxID_CANCEL, _("&Close"));
+    wxStaticText *text = new wxStaticText(this, wxID_ANY, _("Did you know..."));
 
-    m_checkbox = new wxCheckBox(this, -1, _("&Show tips at startup"));
-    m_checkbox->SetValue(showAtStartup);
-
-    wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip"));
-
-    wxStaticText *text = new wxStaticText(this, -1, _("Did you know..."), wxDefaultPosition, wxSize(-1,30) );
-#if defined(__WXMSW__)
-    text->SetFont(wxFont(16, wxSWISS, wxNORMAL, wxBOLD));
-#else
-    text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD));
-#endif
-//
-//    text->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+    if (!isPda)
+    {
+        wxFont font = text->GetFont();
+        font.SetPointSize(int(1.6 * font.GetPointSize()));
+        font.SetWeight(wxFONTWEIGHT_BOLD);
+        text->SetFont(font);
+    }
 
-    m_text = new wxTextCtrl(this, -1, wxT(""),
+    m_text = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
                             wxDefaultPosition, wxSize(200, 160),
                             wxTE_MULTILINE |
                             wxTE_READONLY |
-                            wxTE_RICH | // a hack to get rid of vert scrollbar
-                            wxSUNKEN_BORDER);
+                            wxTE_NO_VSCROLL |
+                            wxTE_RICH2 | // a hack to get rid of vert scrollbar
+                            wxDEFAULT_CONTROL_BORDER
+                            );
 #if defined(__WXMSW__)
-    m_text->SetFont(wxFont(12, wxROMAN, wxNORMAL, wxNORMAL));
-#else
-    m_text->SetFont(wxFont(14, wxROMAN, wxNORMAL, wxNORMAL));
+    m_text->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxNORMAL));
 #endif
 
-#if defined(__WXMSW__) || defined(__WXPM__)
-    wxIcon icon("wxICON_TIP");
-#else
-    #include "wx/generic/tip.xpm"
-    wxIcon icon(tipIcon);
+//#if defined(__WXPM__)
+    //
+    // The only way to get icons into an OS/2 static bitmap control
+    //
+//    wxBitmap                        vBitmap;
+
+//    vBitmap.SetId(wxICON_TIP); // OS/2 specific bitmap method--OS/2 wxBitmaps all have an ID.
+//                               // and for StatBmp's under OS/2 it MUST be a valid resource ID.
+//
+//    wxStaticBitmap*                 bmp = new wxStaticBitmap(this, wxID_ANY, vBitmap);
+//
+//#else
+
+    wxIcon icon = wxArtProvider::GetIcon(wxART_TIP, wxART_CMN_DIALOG);
+    wxStaticBitmap *bmp = new wxStaticBitmap(this, wxID_ANY, icon);
+
+//#endif
+
+    m_checkbox = new wxCheckBox(this, wxID_ANY, _("&Show tips at startup"));
+    m_checkbox->SetValue(showAtStartup);
+    m_checkbox->SetFocus();
+
+    // smart phones does not support or do not waste space for wxButtons
+#ifndef __SMARTPHONE__
+    wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip"));
 #endif
-    wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon);
+
+    // smart phones does not support or do not waste space for wxButtons
+#ifndef __SMARTPHONE__
+    wxButton *btnClose = new wxButton(this, wxID_CLOSE);
+    SetAffirmativeId(wxID_CLOSE);
+#endif
+
 
     // 2) put them in boxes
 
@@ -209,39 +289,54 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
 
     wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
     icon_text->Add( bmp, 0, wxCENTER );
-    icon_text->Add( text, 1, wxCENTER | wxLEFT, 20 );
-    topsizer->Add( icon_text, 0, wxEXPAND | wxALL, 10 );
+    icon_text->Add( text, 1, wxCENTER | wxLEFT, wxLARGESMALL(20,0) );
+    topsizer->Add( icon_text, 0, wxEXPAND | wxALL, wxLARGESMALL(10,0) );
 
-    topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
+    topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, wxLARGESMALL(10,0) );
 
     wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL );
-    bottom->Add( m_checkbox, 0, wxCENTER );
-    bottom->Add( 10,10,1 );
-    bottom->Add( btnNext, 0, wxCENTER | wxLEFT, 10 );
-    bottom->Add( btnClose, 0, wxCENTER | wxLEFT, 10 );
-    topsizer->Add( bottom, 0, wxEXPAND | wxALL, 10 );
+    if (isPda)
+        topsizer->Add( m_checkbox, 0, wxCENTER|wxTOP );
+    else
+        bottom->Add( m_checkbox, 0, wxCENTER );
+
+    // smart phones does not support or do not waste space for wxButtons
+#ifdef __SMARTPHONE__
+    SetRightMenu(wxID_NEXT_TIP, _("Next"));
+    SetLeftMenu(wxID_CLOSE);
+#else
+    if (!isPda)
+        bottom->Add( 10,10,1 );
+    bottom->Add( btnNext, 0, wxCENTER | wxLEFT, wxLARGESMALL(10,0) );
+    bottom->Add( btnClose, 0, wxCENTER | wxLEFT, wxLARGESMALL(10,0) );
+#endif
+
+    if (isPda)
+        topsizer->Add( bottom, 0, wxCENTER | wxALL, 5 );
+    else
+        topsizer->Add( bottom, 0, wxEXPAND | wxALL, wxLARGESMALL(10,0) );
 
     SetTipText();
 
-    SetAutoLayout(TRUE);
     SetSizer( topsizer );
 
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre(wxBOTH | wxCENTER_FRAME);
-
 }
 
 // ----------------------------------------------------------------------------
 // our public interface
 // ----------------------------------------------------------------------------
 
+#if wxUSE_TEXTFILE
 wxTipProvider *wxCreateFileTipProvider(const wxString& filename,
                                        size_t currentTip)
 {
     return new wxFileTipProvider(filename, currentTip);
 }
+#endif // wxUSE_TEXTFILE
 
 bool wxShowTip(wxWindow *parent,
                wxTipProvider *tipProvider,
@@ -254,4 +349,3 @@ bool wxShowTip(wxWindow *parent,
 }
 
 #endif // wxUSE_STARTUP_TIPS
-