#ifndef WX_PRECOMP
#include "wx/sizer.h"
-
#include "wx/statbmp.h"
#include "wx/stattext.h"
+ #include "wx/button.h"
#endif //WX_PRECOMP
#include "wx/aboutdlg.h"
#include "wx/generic/aboutdlgg.h"
#include "wx/hyperlink.h"
+#include "wx/collpane.h"
// ============================================================================
-// wxAboutDialog implementation
+// implementation
// ============================================================================
-bool wxAboutDialog::Create(const wxAboutDialogInfo& info)
+// helper function: returns all array elements in a single comma-separated and
+// newline-terminated string
+static wxString AllAsString(const wxArrayString& a)
+{
+ wxString s;
+ const size_t count = a.size();
+ s.reserve(20*count);
+ for ( size_t n = 0; n < count; n++ )
+ {
+ s << a[n] << (n == count - 1 ? _T("\n") : _T(", "));
+ }
+
+ return s;
+}
+
+// ----------------------------------------------------------------------------
+// wxAboutDialogInfo
+// ----------------------------------------------------------------------------
+
+wxString wxAboutDialogInfo::GetDescriptionAndCredits() const
+{
+ wxString s = GetDescription();
+ if ( !s.empty() )
+ s << _T('\n');
+
+ if ( HasDevelopers() )
+ s << _T('\n') << _("Developed by ") << AllAsString(GetDevelopers());
+
+ if ( HasDocWriters() )
+ s << _T('\n') << _("Documentation by ") << AllAsString(GetDocWriters());
+
+ if ( HasArtists() )
+ s << _T('\n') << _("Graphics art by ") << AllAsString(GetArtists());
+
+ if ( HasTranslators() )
+ s << _T('\n') << _("Translations by ") << AllAsString(GetTranslators());
+
+ return s;
+}
+
+wxIcon wxAboutDialogInfo::GetIcon() const
+{
+ wxIcon icon = m_icon;
+ if ( !icon.Ok() && wxTheApp )
+ {
+ const wxTopLevelWindow * const
+ tlw = wxDynamicCast(wxTheApp->GetTopWindow(), wxTopLevelWindow);
+ if ( tlw )
+ icon = tlw->GetIcon();
+ }
+
+ return icon;
+}
+
+// ----------------------------------------------------------------------------
+// wxGenericAboutDialog
+// ----------------------------------------------------------------------------
+
+bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info)
{
- // TODO: should we use main frame as parent by default here?
- if ( !wxDialog::Create(NULL, wxID_ANY, _("About ") + info.GetName()) )
+ // this is a modal dialog thus we'll use GetParentForModalDialog:
+ if ( !wxDialog::Create(GetParentForModalDialog(), wxID_ANY, _("About ") + info.GetName(),
+ wxDefaultPosition, wxDefaultSize, wxRESIZE_BORDER|wxDEFAULT_DIALOG_STYLE) )
return false;
m_sizerText = new wxBoxSizer(wxVERTICAL);
#endif // wxUSE_HYPERLINKCTRL/!wxUSE_HYPERLINKCTRL
}
- // TODO: add licence
+#if wxUSE_COLLPANE
+ if ( info.HasLicence() )
+ AddCollapsiblePane(_("License"), info.GetLicence());
+
+ if ( info.HasDevelopers() )
+ AddCollapsiblePane(_("Developers"),
+ AllAsString(info.GetDevelopers()));
+
+ if ( info.HasDocWriters() )
+ AddCollapsiblePane(_("Documentation writers"),
+ AllAsString(info.GetDocWriters()));
- // TODO: add credits (developers, artists, doc writers, translators)
+ if ( info.HasArtists() )
+ AddCollapsiblePane(_("Artists"),
+ AllAsString(info.GetArtists()));
+
+ if ( info.HasTranslators() )
+ AddCollapsiblePane(_("Translators"),
+ AllAsString(info.GetTranslators()));
+#endif // wxUSE_COLLPANE
+
+ DoAddCustomControls();
wxSizer *sizerIconAndText = new wxBoxSizer(wxHORIZONTAL);
#if wxUSE_STATBMP
- if ( info.HasIcon() )
- sizerIconAndText->Add(new wxStaticBitmap(this, wxID_ANY, info.GetIcon()));
+ wxIcon icon = info.GetIcon();
+ if ( icon.Ok() )
+ {
+ sizerIconAndText->Add(new wxStaticBitmap(this, wxID_ANY, icon),
+ wxSizerFlags().Border(wxRIGHT));
+ }
#endif // wxUSE_STATBMP
sizerIconAndText->Add(m_sizerText, wxSizerFlags(1).Expand());
wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
sizerTop->Add(sizerIconAndText, wxSizerFlags(1).Expand().Border());
- sizerTop->Add(new wxButton(this, wxID_OK), wxSizerFlags().Right().Border());
+
+ wxSizer *sizerBtns = CreateButtonSizer(wxOK);
+ if ( sizerBtns )
+ {
+ sizerTop->Add(sizerBtns, wxSizerFlags().Expand().Border());
+ }
+
SetSizerAndFit(sizerTop);
CentreOnScreen();
+
return true;
}
-void wxAboutDialog::AddControl(wxWindow *win)
+void wxGenericAboutDialog::AddControl(wxWindow *win, const wxSizerFlags& flags)
{
wxCHECK_RET( m_sizerText, _T("can only be called after Create()") );
wxASSERT_MSG( win, _T("can't add NULL window to about dialog") );
- m_sizerText->Add(win, wxSizerFlags().Border(wxDOWN).Centre());
+ m_sizerText->Add(win, flags);
+}
+
+void wxGenericAboutDialog::AddControl(wxWindow *win)
+{
+ AddControl(win, wxSizerFlags().Border(wxDOWN).Centre());
}
-void wxAboutDialog::AddText(const wxString& text)
+void wxGenericAboutDialog::AddText(const wxString& text)
{
if ( !text.empty() )
AddControl(new wxStaticText(this, wxID_ANY, text));
}
+void wxGenericAboutDialog::AddCollapsiblePane(const wxString& title,
+ const wxString& text)
+{
+ wxCollapsiblePane *pane = new wxCollapsiblePane(this, wxID_ANY, title);
+ wxStaticText *txt = new wxStaticText(pane->GetPane(), wxID_ANY, text,
+ wxDefaultPosition, wxDefaultSize,
+ wxALIGN_CENTRE);
+
+ // don't make the text unreasonably wide
+ static const int maxWidth = wxGetDisplaySize().x/3;
+ txt->Wrap(maxWidth);
+
+ // NB: all the wxCollapsiblePanes must be added with a null proportion value
+ m_sizerText->Add(pane, wxSizerFlags(0).Expand().Border(wxBOTTOM));
+}
+
// ----------------------------------------------------------------------------
// public functions
// ----------------------------------------------------------------------------
void wxGenericAboutBox(const wxAboutDialogInfo& info)
{
- wxAboutDialog dlg(info);
+ wxGenericAboutDialog dlg(info);
dlg.ShowModal();
}
-// currently wxAboutBox is implemented natively only under wxMSW, so we provide
-// it here for the other platforms (this is going to change when GTK+ and Mac
-// native versions are implemented)
-#ifndef __WXMSW__
+// currently wxAboutBox is implemented natively only under these platforms, for
+// the others we provide a generic fallback here
+#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXGTK26__)
void wxAboutBox(const wxAboutDialogInfo& info)
{
projects / wxWidgets.git / blobdiff