X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e4688beb1a0a77a86ed80a9d5313e73f1bd1225..7e0a200b08893e6dede1e57e465b1f7bbf6ddbaa:/src/generic/tipdlg.cpp diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp index 7454236ba2..9de9692a5f 100644 --- a/src/generic/tipdlg.cpp +++ b/src/generic/tipdlg.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: tipdlg.cpp +// Name: src/generic/tipdlg.cpp // Purpose: implementation of wxTipDialog // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "tipdlg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -37,11 +33,11 @@ #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" @@ -55,12 +51,27 @@ 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 // ---------------------------------------------------------------------------- // an implementation which takes the tips from the text file - each line // represents a tip +#if wxUSE_TEXTFILE class WXDLLIMPEXP_ADV wxFileTipProvider : public wxTipProvider { public: @@ -71,8 +82,9 @@ public: private: wxTextFile m_textfile; - DECLARE_NO_COPY_CLASS(wxFileTipProvider) + wxDECLARE_NO_COPY_CLASS(wxFileTipProvider); }; +#endif // wxUSE_TEXTFILE #ifdef __WIN32__ // TODO an implementation which takes the tips from the given registry key @@ -117,7 +129,7 @@ private: wxCheckBox *m_checkbox; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxTipDialog) + wxDECLARE_NO_COPY_CLASS(wxTipDialog); }; // ============================================================================ @@ -127,7 +139,7 @@ private: // ---------------------------------------------------------------------------- // wxFileTipProvider // ---------------------------------------------------------------------------- - +#if wxUSE_TEXTFILE wxFileTipProvider::wxFileTipProvider(const wxString& filename, size_t currentTip) : wxTipProvider(currentTip), m_textfile(filename) @@ -186,10 +198,14 @@ wxString wxFileTipProvider::GetTip() tip = tip.BeforeLast(wxT('\"')); // ...and replace escaped quotes tip.Replace(wxT("\\\""), wxT("\"")); + + // and translate it as requested + tip = wxGetTranslation(tip); } return tip; } +#endif // wxUSE_TEXTFILE // ---------------------------------------------------------------------------- // wxTipDialog @@ -202,36 +218,34 @@ END_EVENT_TABLE() wxTipDialog::wxTipDialog(wxWindow *parent, wxTipProvider *tipProvider, bool showAtStartup) - : wxDialog(parent, wxID_ANY, _("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")); - - m_checkbox = new wxCheckBox(this, wxID_ANY, _("&Show tips at startup")); - m_checkbox->SetValue(showAtStartup); - - wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip")); - wxStaticText *text = new wxStaticText(this, wxID_ANY, _("Did you know...")); - wxFont font = text->GetFont(); - font.SetPointSize(int(1.6 * font.GetPointSize())); - font.SetWeight(wxFONTWEIGHT_BOLD); - - text->SetFont(font); + 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, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, 160), wxTE_MULTILINE | wxTE_READONLY | wxTE_NO_VSCROLL | - wxTE_RICH | // a hack to get rid of vert scrollbar - wxSUNKEN_BORDER); + wxTE_RICH2 | // a hack to get rid of vert scrollbar + wxDEFAULT_CONTROL_BORDER + ); #if defined(__WXMSW__) m_text->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxNORMAL)); #endif @@ -254,23 +268,54 @@ wxTipDialog::wxTipDialog(wxWindow *parent, //#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 + + // 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 wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); 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(); @@ -280,18 +325,19 @@ wxTipDialog::wxTipDialog(wxWindow *parent, 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, @@ -304,4 +350,3 @@ bool wxShowTip(wxWindow *parent, } #endif // wxUSE_STARTUP_TIPS -