no real change; just add the standard separator where it's missing

[wxWidgets.git] / src / generic / aboutdlgg.cpp

diff --git a/src/generic/aboutdlgg.cpp b/src/generic/aboutdlgg.cpp
index 25a324e74ba952d5bce0260bf76f1f05e970779e..1992228b6db1c6cde445b6dfe149cc2990c17bb8 100644 (file)
--- a/src/generic/aboutdlgg.cpp
+++ b/src/generic/aboutdlgg.cpp
@@ -27,30 +27,28 @@
 
 #ifndef WX_PRECOMP
     #include "wx/sizer.h"
 
 #ifndef WX_PRECOMP
     #include "wx/sizer.h"

-

     #include "wx/statbmp.h"
     #include "wx/stattext.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"
 #endif //WX_PRECOMP
 
 #include "wx/aboutdlg.h"
 #include "wx/generic/aboutdlgg.h"
 
 #include "wx/hyperlink.h"

+#include "wx/collpane.h"

 
 // ============================================================================
 // implementation
 // ============================================================================
 
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-// ----------------------------------------------------------------------------
-// wxAboutDialogInfo
-// ----------------------------------------------------------------------------
-

 // 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();
 // 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(", "));
     for ( size_t n = 0; n < count; n++ )
     {
         s << a[n] << (n == count - 1 ? _T("\n") : _T(", "));


@@ -59,6 +57,10 @@ static wxString AllAsString(const wxArrayString& a)
     return s;
 }
 
     return s;
 }
 

+// ----------------------------------------------------------------------------
+// wxAboutDialogInfo
+// ----------------------------------------------------------------------------
+

 wxString wxAboutDialogInfo::GetDescriptionAndCredits() const
 {
     wxString s = GetDescription();
 wxString wxAboutDialogInfo::GetDescriptionAndCredits() const
 {
     wxString s = GetDescription();


@@ -69,13 +71,13 @@ wxString wxAboutDialogInfo::GetDescriptionAndCredits() const
         s << _T('\n') << _("Developed by ") << AllAsString(GetDevelopers());
 
     if ( HasDocWriters() )
         s << _T('\n') << _("Developed by ") << AllAsString(GetDevelopers());
 
     if ( HasDocWriters() )

-        s << _T('\n') << ("Documentation by ") << AllAsString(GetDocWriters());
+        s << _T('\n') << _("Documentation by ") << AllAsString(GetDocWriters());

 
     if ( HasArtists() )
 
     if ( HasArtists() )

-        s << _T('\n') << ("Graphics art by ") << AllAsString(GetArtists());
+        s << _T('\n') << _("Graphics art by ") << AllAsString(GetArtists());

 
     if ( HasTranslators() )
 
     if ( HasTranslators() )

-        s << _T('\n') << ("Translations by ") << AllAsString(GetTranslators());
+        s << _T('\n') << _("Translations by ") << AllAsString(GetTranslators());

 
     return s;
 }
 
     return s;
 }


@@ -94,14 +96,28 @@ wxIcon wxAboutDialogInfo::GetIcon() const
     return icon;
 }
 
     return icon;
 }
 

+wxString wxAboutDialogInfo::GetCopyrightToDisplay() const
+{
+    wxString ret = m_copyright;
+
+#if wxUSE_UNICODE
+    const wxString copyrightSign = wxString::FromUTF8("\xc2\xa9");
+    ret.Replace("(c)", copyrightSign);
+    ret.Replace("(C)", copyrightSign);
+#endif // wxUSE_UNICODE
+
+    return ret;
+}
+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxAboutDialog
+// wxGenericAboutDialog

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-bool wxAboutDialog::Create(const wxAboutDialogInfo& info)
+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);
         return false;
 
     m_sizerText = new wxBoxSizer(wxVERTICAL);


@@ -117,7 +133,7 @@ bool wxAboutDialog::Create(const wxAboutDialogInfo& info)
     m_sizerText->Add(label, wxSizerFlags().Centre().Border());
     m_sizerText->AddSpacer(5);
 
     m_sizerText->Add(label, wxSizerFlags().Centre().Border());
     m_sizerText->AddSpacer(5);
 

-    AddText(info.GetCopyright());
+    AddText(info.GetCopyrightToDisplay());

     AddText(info.GetDescription());
 
     if ( info.HasWebSite() )
     AddText(info.GetDescription());
 
     if ( info.HasWebSite() )


@@ -131,9 +147,28 @@ bool wxAboutDialog::Create(const wxAboutDialogInfo& info)
 #endif // wxUSE_HYPERLINKCTRL/!wxUSE_HYPERLINKCTRL
     }
 
 #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()));
+
+    if ( info.HasArtists() )
+        AddCollapsiblePane(_("Artists"),
+                           AllAsString(info.GetArtists()));

 
 

-    // TODO: add credits (developers, artists, doc writers, translators)
+    if ( info.HasTranslators() )
+        AddCollapsiblePane(_("Translators"),
+                           AllAsString(info.GetTranslators()));
+#endif // wxUSE_COLLPANE
+
+    DoAddCustomControls();

 
 
     wxSizer *sizerIconAndText = new wxBoxSizer(wxHORIZONTAL);
 
 
     wxSizer *sizerIconAndText = new wxBoxSizer(wxHORIZONTAL);


@@ -149,35 +184,71 @@ bool wxAboutDialog::Create(const wxAboutDialogInfo& info)
 
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
     sizerTop->Add(sizerIconAndText, wxSizerFlags(1).Expand().Border());
 
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
     sizerTop->Add(sizerIconAndText, wxSizerFlags(1).Expand().Border());

-    sizerTop->Add(new wxButton(this, wxID_OK), wxSizerFlags().Right().Border());
+
+// Mac typically doesn't use OK buttons just for dismissing dialogs.
+#if !defined(__WXMAC__)
+    wxSizer *sizerBtns = CreateButtonSizer(wxOK);
+    if ( sizerBtns )
+    {
+        sizerTop->Add(sizerBtns, wxSizerFlags().Expand().Border());
+    }
+#endif
+

     SetSizerAndFit(sizerTop);
 
     CentreOnScreen();
     SetSizerAndFit(sizerTop);
 
     CentreOnScreen();

+

     return true;
 }
 
     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") );
 
 {
     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 wxAboutDialog::AddText(const wxString& text)
+void wxGenericAboutDialog::AddControl(wxWindow *win)
+{
+    AddControl(win, wxSizerFlags().Border(wxDOWN).Centre());
+}
+
+void wxGenericAboutDialog::AddText(const wxString& text)

 {
     if ( !text.empty() )
         AddControl(new wxStaticText(this, wxID_ANY, 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)
 {
 // ----------------------------------------------------------------------------
 // public functions
 // ----------------------------------------------------------------------------
 
 void wxGenericAboutBox(const wxAboutDialogInfo& info)
 {

-    wxAboutDialog dlg(info);
+#if !defined(__WXGTK__) && !defined(__WXMAC__)
+    wxGenericAboutDialog dlg(info);

     dlg.ShowModal();
     dlg.ShowModal();

+#else
+    wxGenericAboutDialog* dlg = new wxGenericAboutDialog(info);
+    dlg->Show();
+#endif

 }
 
 // currently wxAboutBox is implemented natively only under these platforms, for
 }
 
 // currently wxAboutBox is implemented natively only under these platforms, for