Attachment 25421 Details for Bug 62276

third try

kdoctools-picture-in-submenu.diff (text/x-diff), 2.06 KB, created by Adrian Schröter on 2004-10-27 00:20:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Schröter

Created: 2004-10-27 00:20:40 UTC

Size: 2.06 KB

patch

obsolete

>--- kdoctools/kio_help.cpp
>+++ kdoctools/kio_help.cpp	2004/10/25 14:55:28
>@@ -55,7 +55,9 @@
>     kdDebug( 7119 ) << "Looking up help for: " << fname << endl;
> 
>     QString path;
>-    int slash = fname.findRev ('/');
>+    while ( fname.at(0) == '/' )
>+	fname = fname.mid(1);
>+    int slash = fname.find('/');
>     if (slash == -1 || slash == 0) {
>       path = fname;
>       fname = "";
>@@ -66,21 +68,9 @@
> 
>     QStringList langs = KGlobal::locale()->languageList();
>     QStringList::ConstIterator lang;
>-    for (lang = langs.begin(); lang != langs.end(); ++lang)
>-        if (*lang == "en")
>-	    search.append(QString("/opt/gnome/share/gnome/help/%1/C%2").arg(path).arg(fname));
>-        else
>-	    search.append(QString("/opt/gnome/share/gnome/help/%1/%2%3").arg(path).arg(*lang).arg(fname));
>-
>     langs.append( "en" );
>     langs.remove( "C" );
> 
>-    // this is kind of compat hack as we install our docs in en/ but the
>-    // default language is en_US
>-    for (QStringList::Iterator it = langs.begin(); it != langs.end(); ++it)
>-        if ( *it == "en_US" )
>-            *it = "en";
>-
>     // look up the different languages
>     int ldCount = localDoc.count();
>     for (int id=0; id < ldCount; id++)
>@@ -90,6 +80,20 @@
>             search.append(QString("%1%2/%3").arg(localDoc[id]).arg(*lang).arg(path + fname));
>     }
>
>+    bool addedC = false; 
>+    for (lang = langs.begin(); lang != langs.end(); ++lang) {
>+       if ( langs.first().left(2) == "en" ) {
>+          search.append(QString("/opt/gnome/share/gnome/help/%1/C%2").arg(path).arg(fname));
>+          addedC=true;
>+       } else {
>+  	   search.append(QString("/opt/gnome/share/gnome/help/%1/%2%3").arg(path).arg(*lang).arg(fname));
>+	   if ( (*lang).length() > 2 )
>+	      search.append(QString("/opt/gnome/share/gnome/help/%1/%2%3").arg(path).arg((*lang).left(2)).arg(fname));
>+       }
>+    }
>+    if ( ! addedC ) 
>+       search.append(QString("/opt/gnome/share/gnome/help/%1/C%2").arg(path).arg(fname));
>+
>     // try to locate the file
>     QStringList::Iterator it;
>     for (it = search.begin(); it != search.end(); ++it)

Actions: View

Attachments on bug 62276: 25039 | 25355 | 25376 | 25421