// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "tipdlg.h"
#endif
#include "wx/dialog.h"
#include "wx/icon.h"
#include "wx/intl.h"
- #include "wx/layout.h"
#include "wx/settings.h"
#include "wx/textctrl.h"
#include "wx/statbmp.h"
+ #include "wx/stattext.h"
+ #include "wx/sizer.h"
#endif // WX_PRECOMP
#include "wx/statline.h"
+#include "wx/artprov.h"
#include "wx/tipdlg.h"
// constants
// ----------------------------------------------------------------------------
-static const int wxID_NEXT_TIP = -100; // whatever
+static const int wxID_NEXT_TIP = 32000; // whatever
// ----------------------------------------------------------------------------
// private classes
// an implementation which takes the tips from the text file - each line
// represents a tip
-class WXDLLEXPORT wxFileTipProvider : public wxTipProvider
+class WXDLLIMPEXP_ADV wxFileTipProvider : public wxTipProvider
{
public:
wxFileTipProvider(const wxString& filename, size_t currentTip);
private:
wxTextFile m_textfile;
+
+ DECLARE_NO_COPY_CLASS(wxFileTipProvider)
};
#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);
// Empty implementation for now to keep the linker happy
wxString wxRegTipProvider::GetTip()
{
- return "";
+ return wxEmptyString;
}
#endif // __WIN32__
// the dialog we show in wxShowTip()
-class WXDLLEXPORT wxTipDialog : public wxDialog
+class WXDLLIMPEXP_ADV wxTipDialog : public wxDialog
{
public:
wxTipDialog(wxWindow *parent,
wxCheckBox *m_checkbox;
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxTipDialog)
};
// ============================================================================
{
size_t count = m_textfile.GetLineCount();
if ( !count )
- return _("Tips not available, sorry!");
-
- // 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 )
{
- // wrap
- m_currentTip = 0;
+ return _("Tips not available, sorry!");
}
-
- return m_textfile.GetLine(m_currentTip++);
+
+ 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;
+ }
+ }
+
+ // 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))
+ {
+ //...and strip off the trailing '")'...
+ tip = tip.BeforeLast(wxT('\"'));
+ // ...and replace escaped quotes
+ tip.Replace(wxT("\\\""), wxT("\""));
+ }
+
+ return tip;
}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxTipDialog, wxDialog)
- EVT_BUTTON(wxID_NEXT_TIP, OnNextTip)
+ EVT_BUTTON(wxID_NEXT_TIP, wxTipDialog::OnNextTip)
END_EVENT_TABLE()
wxTipDialog::wxTipDialog(wxWindow *parent,
{
m_tipProvider = tipProvider;
- wxSize sizeBtn = GetStandardButtonSize();
- wxLayoutConstraints *c;
+ // 1) create all controls in tab order
- // create the controls in the right order, then set the constraints
wxButton *btnClose = new wxButton(this, wxID_CANCEL, _("&Close"));
- m_checkbox = new wxCheckBox(this, -1, _("&Show tips at startup"));
- wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next"));
- wxTextCtrl *text = new wxTextCtrl(this, -1, _("Did you know..."),
- wxDefaultPosition, wxDefaultSize,
- wxTE_READONLY | wxNO_BORDER);
- text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD));
- text->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE));
+ m_checkbox = new wxCheckBox(this, -1, _("&Show tips at startup"));
+ m_checkbox->SetValue(showAtStartup);
- m_text = new wxTextCtrl(this, -1, _T(""),
- wxDefaultPosition, wxDefaultSize,
- wxTE_MULTILINE | wxTE_READONLY | wxSUNKEN_BORDER);
- m_text->SetFont(wxFont(14, wxROMAN, wxNORMAL, wxNORMAL));
+ 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__) || defined(__WXPM__)
- wxIcon icon("wxICON_TIP");
+ text->SetFont(wxFont(16, wxSWISS, wxNORMAL, wxBOLD));
+#else
+ text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD));
+#endif
+//
+// text->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+
+ m_text = new wxTextCtrl(this, -1, wxT(""),
+ wxDefaultPosition, wxSize(200, 160),
+ wxTE_MULTILINE |
+ wxTE_READONLY |
+ wxTE_NO_VSCROLL |
+ wxTE_RICH | // a hack to get rid of vert scrollbar
+ wxSUNKEN_BORDER);
+#if defined(__WXMSW__)
+ m_text->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxNORMAL));
#else
- #include "wx/generic/tip.xpm"
- wxIcon icon(tipIcon);
+ m_text->SetFont(wxFont(14, wxSWISS, wxNORMAL, wxNORMAL));
#endif
+//#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, -1, vBitmap);
+//
+//#else
+
+ wxIcon icon = wxArtProvider::GetIcon(wxART_TIP, wxART_CMN_DIALOG);
wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon);
- const int iconSize = icon.GetWidth();
-
- c = new wxLayoutConstraints;
- c->top.SameAs(this, wxTop, 2*LAYOUT_Y_MARGIN);
- c->left.RightOf(bmp, 2*LAYOUT_X_MARGIN);
- c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
- c->height.Absolute(2*text->GetSize().GetHeight());
- text->SetConstraints(c);
-
- c = new wxLayoutConstraints;
- c->centreY.SameAs(text, wxCentreY);
- c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
- c->width.Absolute(iconSize);
- c->height.Absolute(iconSize);
- bmp->SetConstraints(c);
-
- c = new wxLayoutConstraints;
- c->bottom.SameAs(this, wxBottom, 2*LAYOUT_X_MARGIN);
- c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
- c->width.Absolute(sizeBtn.GetWidth());
- c->height.Absolute(sizeBtn.GetHeight());
- btnClose->SetConstraints(c);
-
- c = new wxLayoutConstraints;
- c->bottom.SameAs(this, wxBottom, 2*LAYOUT_X_MARGIN);
- c->right.LeftOf(btnClose, 2*LAYOUT_X_MARGIN);
- c->width.Absolute(sizeBtn.GetWidth());
- c->height.Absolute(sizeBtn.GetHeight());
- btnNext->SetConstraints(c);
-
- c = new wxLayoutConstraints;
- c->bottom.SameAs(this, wxBottom, 2*LAYOUT_X_MARGIN);
- c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
- c->width.AsIs();
- c->height.AsIs();
- m_checkbox->SetConstraints(c);
- m_checkbox->SetValue(showAtStartup);
+//#endif
- c = new wxLayoutConstraints;
- c->top.Below(text);
- c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
- c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
- c->bottom.Above(btnClose, -2*LAYOUT_Y_MARGIN);
- m_text->SetConstraints(c);
+ // 2) put them in boxes
- SetTipText();
+ wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
- Centre(wxBOTH | wxCENTER_FRAME);
+ 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 );
+
+ topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
- wxSize size(5*sizeBtn.GetWidth(), 10*sizeBtn.GetHeight());
- SetSize(size);
- SetSizeHints(size.x, size.y);
+ 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 );
+
+ SetTipText();
SetAutoLayout(TRUE);
+ SetSizer( topsizer );
+
+ topsizer->SetSizeHints( this );
+ topsizer->Fit( this );
+
+ Centre(wxBOTH | wxCENTER_FRAME);
+
}
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff