Minor updates for compilation against 2.8.0. Cosmetic changes.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11758 a1c6a512-1295-4272-9138-f99709370657

5 files changed, 52 insertions, 32 deletions

diff --git a/rbutil/credits.h b/rbutil/credits.h
index 52ce7c599c..b783d29b64 100644
--- a/rbutil/credits.h
+++ b/rbutil/credits.h
@@ -24,20 +24,17 @@
 #define RBUTIL_FULLNAME "The Rockbox Utility"
 #define RBUTIL_VERSION "Version 0.2.1.0"
 
-static char* rbutil_developers[] = {
+static const char* rbutil_developers[] = {
     "Christi Alice Scarborough",
-    "Dave Chapman"
+    "Dave Chapman",
+    ""
 };
 
-//static char* rbutil_translators[] = (
-//    ""
-//);
-
 #define RBUTIL_WEBSITE "http://www.rockbox.org/"
-#define RBUTIL_COPYRIGHT "(C) 2005-6 The Rockbox Team - " \
+#define RBUTIL_COPYRIGHT "(C) 2005-6 The Rockbox Team\n" \
         "released under the GNU Public License v2"
-#define RBUTIL_DESCRIPTION "Utility for performing housekeepng tasks for" \
-        "the Rockbox open\nsource digital audio player firmware."
+#define RBUTIL_DESCRIPTION "Installer and housekeeping utility for " \
+        "the Rockbox open source digital audio player firmware."
 
 
 class AboutDlg: public wxDialog
diff --git a/rbutil/rbutil.h b/rbutil/rbutil.h
index fe8a8aaee8..c1816d5d0b 100644
--- a/rbutil/rbutil.h
+++ b/rbutil/rbutil.h
@@ -52,7 +52,6 @@
 #include <wx/wizard.h>
 #include <wx/event.h>
 
-
 #ifdef __WXMSW__
 #define PATH_SEP "\\"
 #define PATH_SEP_CHR '\\'
diff --git a/rbutil/rbutilApp.cpp b/rbutil/rbutilApp.cpp
index 8b7a722a1e..215e9ebc8e 100644
--- a/rbutil/rbutilApp.cpp
+++ b/rbutil/rbutilApp.cpp
@@ -36,9 +36,9 @@ bool rbutilFrmApp::OnInit()
     // DANGER!  GetDataDir() doesn't portably return the application directory
     // We want to use the form below instead, but not until wxWidgets 2.8 is
     // released.
-    //    gv->AppDir = gv->stdpaths->GetExecutablePath()->BeforeLast(&pathsep);
-    buf = gv->stdpaths->GetDataDir(); buf.Append(PATH_SEP);
-    gv->AppDir = buf.BeforeLast(PATH_SEP_CHR).c_str();
+    gv->AppDir = gv->stdpaths->GetExecutablePath().BeforeLast(PATH_SEP_CHR);
+//    buf = gv->stdpaths->GetDataDir(); buf.Append(PATH_SEP);
+//    gv->AppDir = buf.BeforeLast(PATH_SEP_CHR).c_str();
 
     buf = gv->stdpaths->GetUserDataDir();
     if (! wxDirExists(buf) )
diff --git a/rbutil/rbutilFrm.cpp b/rbutil/rbutilFrm.cpp
index 49ff6248b5..0d56e9c5b1 100644
--- a/rbutil/rbutilFrm.cpp
+++ b/rbutil/rbutilFrm.cpp
@@ -215,24 +215,22 @@ void rbutilFrm::OnFileAbout(wxCommandEvent& event)
 /*
     wxAboutDialogInfo *info = new wxAboutDialogInfo();
 
-    info->SetName(_(RBUTIL_LONGNAME));
+    info->SetName(_(RBUTIL_FULLNAME));
     info->SetVersion(_(RBUTIL_VERSION));
     info->SetCopyright(_(RBUTIL_COPYRIGHT));
     info->SetDescription(_(RBUTIL_DESCRIPTION));
-    info->SetWebsite(_(RBUTIL_WEBSITE));
-    ind
-    wxArrayString *array = new wxArrayString(sizeof(rbutil_developers[]).
-        rbutil_developers);
-    info->SetDevelopers(array);
-    delete array;
-
-//    array = new wxArrayString(sizeof(rbutil_translators[]),
-//        rbutil_translators);
-//    info->SetTranslators(array);
-//    delete array;
-
-    wxAboutBox(info);
+    info->SetWebSite(_(RBUTIL_WEBSITE));
+
+    long i = 0;
+    while (rbutil_developers[i] != "")
+    {
+        info->AddDeveloper(wxT(rbutil_developers[i++]));
+    }
+
+    wxAboutBox(*info);
+    delete info;
 */
+
     AboutDlg(this).ShowModal();
 }
 
@@ -565,20 +563,44 @@ AboutDlg::AboutDlg(rbutilFrm* parent)
     this->SetSizer(WxBoxSizer1);
     this->SetAutoLayout(TRUE);
 
-    wxBitmap WxBitmap1 = wxBitmap(rblogo_xpm);
+    wxBoxSizer* WxBoxSizer2 = new wxBoxSizer(wxHORIZONTAL);
+
+    wxBitmap WxBitmap1 = wxBitmap(rbutilFrm_XPM);
     wxStaticBitmap* WxStaticBitmap1 = new wxStaticBitmap(this, wxID_ANY,
         WxBitmap1);
-    WxBoxSizer1->Add(WxStaticBitmap1, 0, wxALL, 5);
+    WxBoxSizer2->Add(WxStaticBitmap1, 0, wxALL | wxCENTER, 5);
 
     wxStaticText* WxStaticText1 = new wxStaticText(this, wxID_ANY,
-        _(RBUTIL_FULLNAME "\n" RBUTIL_VERSION "\n" RBUTIL_DESCRIPTION "\n\n"
-            RBUTIL_COPYRIGHT));
-    WxBoxSizer1->Add(WxStaticText1, 0, wxALL, 5);
+        _(RBUTIL_FULLNAME), wxDefaultPosition, wxDefaultSize,
+        wxALIGN_CENTER | wxST_NO_AUTORESIZE );
+    WxBoxSizer2->Add(WxStaticText1, 0, wxALL | wxCENTER, 5);
+    WxBoxSizer1->Add(WxBoxSizer2, 0, wxALL, 5);
+
+    wxStaticText* WxStaticText2 = new wxStaticText(this, wxID_ANY,
+        _(RBUTIL_VERSION "\n" RBUTIL_DESCRIPTION "\n\n" RBUTIL_COPYRIGHT));
+    WxStaticText2->Wrap(400);
+    WxBoxSizer1->Add(WxStaticText2, 0, wxALL, 5);
 
     wxHyperlinkCtrl* WxHyperlink1 = new wxHyperlinkCtrl(this, wxID_ANY,
         wxT(RBUTIL_WEBSITE), wxT(RBUTIL_WEBSITE) );
     WxBoxSizer1->Add(WxHyperlink1, 0, wxALL, 5);
 
+    wxStaticBox* WxStaticBox1 = new wxStaticBox(this, wxID_ANY, _("Contributors:"));
+    wxStaticBoxSizer* WxStaticBoxSizer2 = new wxStaticBoxSizer(WxStaticBox1,
+        wxVERTICAL);
+    wxTextCtrl* WxTextCtrl1 = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
+        wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY);
+
+    long i = 0;
+    while ( rbutil_developers[i] != "")
+    {
+        WxTextCtrl1->AppendText(rbutil_developers[i++]);
+        WxTextCtrl1->AppendText("\n");
+    }
+
+    WxBoxSizer1->Add(WxStaticBoxSizer2, 1, wxGROW | wxALL, 5);
+    WxStaticBoxSizer2->Add(WxTextCtrl1, 1, wxGROW | wxALL, 0);
+
     wxStdDialogButtonSizer* WxStdDialogButtonSizer1 = new wxStdDialogButtonSizer();
     wxButton* WxOKButton = new wxButton(this, wxID_OK);
     WxStdDialogButtonSizer1->AddButton(WxOKButton);
diff --git a/rbutil/rbutilFrm.h b/rbutil/rbutilFrm.h
index 8ba7361c84..b0332d0c74 100644
--- a/rbutil/rbutilFrm.h
+++ b/rbutil/rbutilFrm.h
@@ -37,6 +37,8 @@
 
 #include <wx/frame.h>
 #include <wx/valgen.h>
+//#include <wx/aboutdlg.h>
+#include <wx/richtext/richtextctrl.h>
 
 #include "rbutil.h"
 #include "wizard_pages.h"