///////////////////////////////////////////////////////////////////////////////
-// Name: tipdlg.cpp
+// Name: src/generic/tipdlg.cpp
// Purpose: implementation of wxTipDialog
// Author: Vadim Zeitlin
// Modified by:
// 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"
#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"
// ---------------------------------------------------------------------------
/* Macro for avoiding #ifdefs when value have to be different depending on size of
- device we display on
+ device we display on - take it from something like wxDesktopPolicy in the future
*/
#if defined(__SMARTPHONE__)
// 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:
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
wxCheckBox *m_checkbox;
DECLARE_EVENT_TABLE()
- DECLARE_NO_COPY_CLASS(wxTipDialog)
+ wxDECLARE_NO_COPY_CLASS(wxTipDialog);
};
// ============================================================================
// ----------------------------------------------------------------------------
// wxFileTipProvider
// ----------------------------------------------------------------------------
-
+#if wxUSE_TEXTFILE
wxFileTipProvider::wxFileTipProvider(const wxString& filename,
size_t currentTip)
: wxTipProvider(currentTip), m_textfile(filename)
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
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
-#ifndef __SMARTPHONE__
- wxButton *btnClose = new wxButton(this, wxID_CANCEL, wxSTOCK_CLOSE);
-#endif
-
- m_checkbox = new wxCheckBox(this, wxID_ANY, _("&Show tips at startup"));
- m_checkbox->SetValue(showAtStartup);
-
-#ifndef __SMARTPHONE__
- wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip"));
-#endif
-
wxStaticText *text = new wxStaticText(this, wxID_ANY, _("Did you know..."));
-#ifndef __SMARTPHONE__
- wxFont font = text->GetFont();
- font.SetPointSize(int(1.6 * font.GetPointSize()));
- font.SetWeight(wxFONTWEIGHT_BOLD);
- text->SetFont(font);
-#endif
+ 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
//#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 );
topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, wxLARGESMALL(10,0) );
wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL );
- bottom->Add( m_checkbox, 0, wxCENTER );
+ if (isPda)
+ topsizer->Add( m_checkbox, 0, wxCENTER|wxTOP );
+ else
+ bottom->Add( m_checkbox, 0, wxCENTER );
-#ifndef __SMARTPHONE__
- bottom->Add( 10,10,1 );
+ // 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
- topsizer->Add( bottom, 0, wxEXPAND | wxALL, wxLARGESMALL(10,0) );
+ if (isPda)
+ topsizer->Add( bottom, 0, wxCENTER | wxALL, 5 );
+ else
+ topsizer->Add( bottom, 0, wxEXPAND | wxALL, wxLARGESMALL(10,0) );
SetTipText();
topsizer->Fit( this );
Centre(wxBOTH | wxCENTER_FRAME);
-
-#ifdef __SMARTPHONE__
- SetRightMenu(wxID_NEXT_TIP, _("Next"));
- SetLeftMenu(wxID_CANCEL, _("Close"));
-#endif
-
}
// ----------------------------------------------------------------------------
// 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,
}
#endif // wxUSE_STARTUP_TIPS
-
projects / wxWidgets.git / blobdiff