move handling of shared manuals (like h100 series) to a new setting in rbutil.ini instead of a hardcoded list.

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

4 files changed, 37 insertions, 8 deletions

diff --git a/rbutil/rbutil.h b/rbutil/rbutil.h
index 3c61bd0c4e..cc53a80be7 100644
--- a/rbutil/rbutil.h
+++ b/rbutil/rbutil.h
@@ -98,6 +98,7 @@ public:
     wxArrayString           plat_bootloadermethod;
     wxArrayString           plat_bootloadername;
     wxArrayString           plat_resolution;
+    wxArrayString           plat_manualname;
     wxString                download_url;
     wxString                daily_url;
     wxString                bleeding_url;
diff --git a/rbutil/rbutil.ini b/rbutil/rbutil.ini
index a4976ce51b..74e5d75bc5 100644
--- a/rbutil/rbutil.ini
+++ b/rbutil/rbutil.ini
@@ -8,7 +8,7 @@ last_release=2.5
 prog_name=rockbox
 bootloader_url=http://download.rockbox.org/bootloader
 themes_url=http://www.rockbox-themes.org/
-manual_url=http://download.rockbox.org/manual/rockbox-
+manual_url=http://download.rockbox.org/manual
 doom_url=http://download.rockbox.org/useful/rockdoom.zip
 
 [platforms]
@@ -47,6 +47,7 @@ needsbootloader=no
 bootloadermethod=
 bootloadername=
 resolution=11x2x1
+manualname=
 
 [recorder]
 name=Archos Jukebox Recorder 10, 20
@@ -56,6 +57,7 @@ needsbootloader=no
 bootloadermethod=
 bootloadername=
 resolution=112x64x1
+manualname=
 
 [recorder8mb]
 name=Archos Jukebox Recorder 10, 20 (with 8mb memory)
@@ -65,6 +67,7 @@ needsbootloader=no
 bootloadermethod=
 bootloadername=
 resolution=112x64x1
+manualname=rockbox-recorder
 
 [recorderv2]
 name=Archos Jukebox Recorder v2 (20GB)
@@ -74,6 +77,7 @@ needsbootloader=no
 bootloadermethod=
 bootloadername=
 resolution=112x64x1
+manualname=
 
 [fmrecorder]
 name=Archos Jukebox Recorder FM
@@ -83,6 +87,7 @@ needsbootloader=no
 bootloadermethod=
 bootloadername=
 resolution=112x64x1
+manualname=
 
 [fmrecorder8mb]
 name=Archos Jukebox Recorder FM (with 8mb memory)
@@ -92,6 +97,7 @@ needsbootloader=no
 bootloadermethod=
 bootloadername=
 resolution=112x64x1
+manualname=rockbox-fmrecorder
 
 [ondiosp]
 name=Archos Ondio SP
@@ -101,6 +107,7 @@ needsbootloader=no
 bootloadermethod=
 bootloadername=
 resolution=112x64x1
+manualname=
 
 [ondiofm]
 name=Archos Ondio FM
@@ -110,6 +117,7 @@ needsbootloader=no
 bootloadermethod=
 bootloadername=
 resolution=112x64x1
+manualname=
 
 [h100]
 name=Iriver iHP100, iHP110
@@ -119,6 +127,7 @@ needsbootloader=yes
 bootloadermethod=fwpatcher
 bootloadername=bootloader-h100.bin
 resolution=160x128x2
+manualname=rockbox-h1xx
 
 [h120]
 name=Iriver iHP120, iHP140, H120, H140
@@ -128,6 +137,7 @@ needsbootloader=yes
 bootloadermethod=fwpatcher
 bootloadername=bootloader-h120.bin
 resolution=160x128x2
+manualname=rockbox-h1xx
 
 [h300]
 name=Iriver H320, H340
@@ -137,6 +147,7 @@ needsbootloader=yes
 bootloadermethod=fwpatcher
 bootloadername=bootloader-h300.bin
 resolution=220x176x16
+manualname=
 
 [h10_5gbums]
 name=Iriver H10 (5/6GB) UMS
@@ -146,6 +157,7 @@ needsbootloader=yes
 bootloadermethod=h10
 bootloadername=H10.mi4
 resolution=128x128x16
+manualname=
 
 [h10_5gbmtp]
 name=Iriver H10 (5/6GB) MTP
@@ -155,6 +167,7 @@ needsbootloader=yes
 bootloadermethod=h10
 bootloadername=H10_5GB-MTP/H10.mi4
 resolution=128x128x16
+manualname=
 
 [h10]
 name=Iriver H10 (20GB)
@@ -164,6 +177,7 @@ needsbootloader=yes
 bootloadermethod=h10
 bootloadername=H10_20GC.mi4
 resolution=160x128x16
+manualname=
 
 [ipodcolor]
 name=Apple Ipod Colour/Photo/U2 (4th gen)
@@ -173,6 +187,7 @@ needsbootloader=yes
 bootloadermethod=ipodpatcher
 bootloadername=ipodcolor
 resolution=220x176x16
+manualname=
 
 [ipodnano]
 name=Apple Ipod Nano (1st gen)
@@ -182,6 +197,7 @@ needsbootloader=yes
 bootloadermethod=ipodpatcher
 bootloadername=ipodnano
 resolution=176x132x16
+manualname=
 
 [ipod4gray]
 name=Apple Ipod (4th gen, greyscale)
@@ -191,6 +207,7 @@ needsbootloader=yes
 bootloadermethod=ipodpatcher
 bootloadername=ipod4g
 resolution=160x128x2
+manualname=
 
 [ipodvideo]
 name=Apple Ipod Video (5th gen)
@@ -200,6 +217,7 @@ needsbootloader=yes
 bootloadermethod=ipodpatcher
 bootloadername=ipodvideo
 resolution=320x240x16
+manualname=
 
 [ipod3g]
 name=Apple Ipod (3rd gen)
@@ -209,6 +227,7 @@ needsbootloader=yes
 bootloadermethod=ipodpatcher
 bootloadername=ipod3g
 resolution=160x128x2
+manualname=
 
 [ipodmini1g]
 name=Apple Ipod Mini (1st gen)
@@ -218,6 +237,7 @@ needsbootloader=yes
 bootloadermethod=ipodpatcher
 bootloadername=ipodmini
 resolution=138x110x2
+manualname=rockbox-ipodmini2g
 
 [ipodmini2g]
 name=Apple Ipod Mini (2nd gen)
@@ -227,6 +247,7 @@ needsbootloader=yes
 bootloadermethod=ipodpatcher
 bootloadername=ipodmini2g
 resolution=138x110x2
+manualname=rockbox-ipodmini2g
 
 [iaudiox5]
 name=Cowon iAudio X5 , X5L
@@ -236,6 +257,7 @@ needsbootloader=yes
 bootloadermethod=iaudio
 bootloadername=x5_fw.bin
 resolution=160x128x16
+manualname=
 
 [iaudiox5v]
 name=Cowon iAudio X5V
@@ -245,6 +267,7 @@ needsbootloader=yes
 bootloadermethod=iaudio
 bootloadername=x5v_fw.bin
 resolution=160x128x2
+manualname=
 
 [iaudiom5]
 name=Cowon iAudio M5 , M5L
@@ -254,6 +277,7 @@ needsbootloader=yes
 bootloadermethod=iaudio
 bootloadername=m5_fw.bin
 resolution=160x128x16
+manualname=
 
 [gigabeatf]
 name=Toshiba Gigabeat F , X
@@ -262,6 +286,7 @@ needsbootloader=yes
 bootloadermethod=gigabeatf
 bootloadername=FWIMG01.DAT
 resolution=240x320x16
+manualname=
 
 [sansae200]
 name=Sandisk Sansa E200
@@ -271,3 +296,4 @@ needsbootloader=yes
 bootloadermethod=sansapatcher
 bootloadername=PP5022.mi4
 resolution=176x220x16
+manualname=
diff --git a/rbutil/rbutilApp.cpp b/rbutil/rbutilApp.cpp
index b95dfd1e3a..2e84d6dad8 100644
--- a/rbutil/rbutilApp.cpp
+++ b/rbutil/rbutilApp.cpp
@@ -184,6 +184,9 @@ bool rbutilFrmApp::ReadGlobalConfig(rbutilFrm* myFrame)
         gv->GlobalConfig->Read(buf.Format(wxT("/%s/resolution"),
             cur.c_str()), &tmpstr);
         gv->plat_resolution.Add(tmpstr);
+        gv->GlobalConfig->Read(buf.Format(wxT("/%s/manualname"),
+            cur.c_str()), &tmpstr);
+        gv->plat_manualname.Add(tmpstr);
 
         i++;
     }
diff --git a/rbutil/rbutilFrm.cpp b/rbutil/rbutilFrm.cpp
index 9b4a19b887..76224f6475 100644
--- a/rbutil/rbutilFrm.cpp
+++ b/rbutil/rbutilFrm.cpp
@@ -324,12 +324,11 @@ void rbutilFrm::CreateGUIControls(void)
 
 void  rbutilFrm::OnManualUpdate(wxUpdateUIEvent& event)
 {
-    wxString tmp = gv->curplat;
+    wxString tmp = wxT("/rockbox-") + gv->curplat;
 
-    if(tmp == wxT("h120")) tmp = wxT("h100");   //h120 has the h100 manual
-         if(tmp == wxT("fmrecorder8mb")) tmp = wxT("fmrecorder");
-         if(tmp == wxT("ipodmini1g")) tmp = wxT("ipodmini2g");
-         if(tmp == wxT("recorder8mb")) tmp = wxT("recorder");
+    int index = GetDeviceId();
+    if(gv->plat_manualname[index] != wxT(""))
+        tmp = wxT("/") + gv->plat_manualname[index];
 
     if( tmp == curManualDevice)
         return;
@@ -338,12 +337,12 @@ void  rbutilFrm::OnManualUpdate(wxUpdateUIEvent& event)
 
     // construct link to pdf
     wxString pdflink;
-    pdflink = gv->manual_url + curManualDevice + wxT(".pdf");
+    pdflink = gv->manual_url + tmp + wxT(".pdf");
     manuallink->SetURL(pdflink);
 
     // construct link to html
     wxString htmllink;
-    htmllink = gv->manual_url + curManualDevice + wxT("/rockbox-build.html");
+    htmllink = gv->manual_url + tmp + wxT("/rockbox-build.html");
     if(!manual->LoadPage(htmllink))
         manual->SetPage(wxT("<p>unable to display manual -- please use the PDF link above</p>"));