summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/odict/dingwidget.cpp59
-rw-r--r--noncore/apps/odict/odict.cpp4
2 files changed, 14 insertions, 49 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index cfef84d..16164ed 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -31,5 +31,4 @@
#include <stdlib.h> // for getenv
-
DingWidget::DingWidget( )
{
@@ -90,4 +89,12 @@ void DingWidget::setQueryWord( QString qword )
}
+
+void DingWidget::loadValues()
+{
+ Config cfg( "odict" );
+ cfg.setGroup( "Method_" + methodname );
+ trenner = cfg.readEntry( "Seperator" );
+}
+
BroswerContent DingWidget::setText( QString word )
{
@@ -98,14 +105,9 @@ BroswerContent DingWidget::setText( QString word )
}
-void DingWidget::loadValues()
-{
- Config cfg( "odict" );
- cfg.setGroup( "Method_" + methodname );
- trenner = cfg.readEntry( "Seperator" );
-}
BroswerContent DingWidget::parseInfo()
{
- if ( isCompleteWord ) queryword = " " + queryword + " ";
+ if ( isCompleteWord )
+ queryword = " " + queryword + " ";
QStringList search = lines.grep( queryword , isCaseSensitive );
@@ -119,37 +121,4 @@ BroswerContent DingWidget::parseInfo()
QString substitute = "<strong>"+queryword+"</strong>";
- /* Dieser Block ist von Patrik. Ich versuche einen neuen
- * Ansatz. Zum einen ist HTML scheiße an dieser Stelle und
- * zum andern funktioniert der Code nicht so wie er sollte.
- QString substitute = "<a href=''>"+queryword+"</a>";
-
- QString html_header = "<html><table>";
- QString html_footer = "</table></html>";
- QString html_table_left = "<tr><td width='50'>";
- QString html_table_sep = "</td><td>";
- QString html_table_right = "</td></tr>";
-
- for( QStringList::Iterator it = search.begin() ; it != search.end() ; ++it )
- {
- current = *it;
- left = current.left( current.find(reg_div) );
- right = current.right( current.length() - current.find(reg_div) - 1 );
- if ( left.contains( reg_word ) )
- {
- left.replace( queryword, substitute );
- toplist.append( html_table_left + left + html_table_sep + right + html_table_right );
- }
- else
- {
- right.replace( reg_word, substitute );
- bottomlist.append( html_table_left + right + html_table_sep + left + html_table_right );
- }
- }
-
- //thats it, the lists are rendered. Lets put them in one string
- s_strings.bottom = html_header + bottomlist.join( "<br>" ) + html_footer;
- s_strings.top = html_header + toplist.join( "<br>" ) + html_footer;
- */
-
for( QStringList::Iterator it = search.begin() ; it != search.end() ; ++it )
{
@@ -157,10 +126,10 @@ BroswerContent DingWidget::parseInfo()
left = current.left( current.find( trenner ) );
- right = current.right( current.length() - current.find(trenner) -2 );
+ right = current.right( current.length() - current.find(trenner) - trenner.length() );
if ( left.contains( queryword , isCaseSensitive ) )
{
left.replace( queryword, substitute );
- left = left + "-->" + right;
+ left = left + " -- " + right;
toplist.append( left );
}
@@ -168,11 +137,11 @@ BroswerContent DingWidget::parseInfo()
{
right.replace( queryword, substitute );
- left = right + "-->" + left;
+ left = right + " -- " + left;
bottomlist.append( right );
}
}
- s_strings.bottom = bottomlist.join( "\n" );
s_strings.top = toplist.join( "\n" );
+ s_strings.bottom = bottomlist.join( "\n" );
return s_strings;
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index c4114f7..58cff5f 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -202,9 +202,5 @@ void ODict::setupMenus()
parameter->insertItem( tr( "&Error tolerance" ), error_tol_menu );
- help = new QPopupMenu( menu );
- help->insertItem("&About",this,SLOT( slotDisplayAbout() ));
-
menu->insertItem( tr( "Settings" ) , settings );
menu->insertItem( tr( "Parameter" ) , parameter );
- menu->insertItem( tr( "Help" ) , help );
}