[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/khelpcenter
From:       Cornelius Schumacher <schumacher () kde ! org>
Date:       2005-01-26 14:49:14
Message-ID: 20050126144914.738DA1D1AB () office ! kde ! org
[Download RAW message or body]

CVS commit by cschumac: 

Cleaner results page.


  M +1 -1      docmetainfo.cpp   1.22
  M +13 -2     formatter.cpp   1.2
  M +2 -0      formatter.h   1.2
  M +4 -1      searchengine.cpp   1.25


--- kdebase/khelpcenter/docmetainfo.cpp  #1.21:1.22
@@ -30,5 +30,5 @@ DocMetaInfo::DocMetaInfo()
   mHtmlSearch = new HTMLSearch;
 
-  mRootEntry.setName( "root entry" );
+  mRootEntry.setName( i18n("Top-Level Documentation") );
 }
 

--- kdebase/khelpcenter/formatter.cpp  #1.1:1.2
@@ -163,10 +163,10 @@ QString Formatter::separator()
 QString Formatter::docTitle( const QString &title )
 {
-  return "<h2><font color=\"red\">" + title + "</font></h2>";
+  return "<h3><font color=\"red\">" + title + "</font></h3>";
 }
 
 QString Formatter::sectionHeader( const QString &section )
 {
-  return "<h1><font color=\"blue\">" + section + "</font></h1>";
+  return "<h2><font color=\"blue\">" + section + "</font></h2>";
 }
 
@@ -210,3 +210,14 @@ QString Formatter::processResult( const 
   return result;
 }
+
+QString Formatter::paragraph( const QString &str )
+{
+  return "<p>" + str + "</p>";
+}
+
+QString Formatter::title( const QString &title )
+{
+  return "<h2>" + title + "</h2>";
+}
+
 // vim:ts=2:sw=2:et

--- kdebase/khelpcenter/formatter.h  #1.1:1.2
@@ -39,4 +39,6 @@ class Formatter
     virtual QString docTitle( const QString & );
     virtual QString sectionHeader( const QString & );
+    virtual QString paragraph( const QString & );
+    virtual QString title( const QString & );
     
     virtual QString processResult( const QString & );

--- kdebase/khelpcenter/searchengine.cpp  #1.24:1.25
@@ -49,5 +49,6 @@ SearchTraverser::~SearchTraverser()
 
   if ( !mResult.isEmpty() ) {
-    mEngine->view()->writeSearchResult( mEngine->formatter()->sectionHeader( section ) );
+    mEngine->view()->writeSearchResult(
+      mEngine->formatter()->sectionHeader( section ) );
     mEngine->view()->writeSearchResult( mResult );
   }
@@ -213,4 +214,6 @@ bool SearchEngine::search( QString words
     mView->beginSearchResult();
     mView->writeSearchResult( formatter()->header( i18n("Search Results") ) );
+    mView->writeSearchResult( formatter()->title(
+      i18n("Search Results for '%1':").arg( words ) ) );
 
     if ( mRootTraverser ) {


[prev in list] [next in list] [prev in thread] [next in thread]