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
@@ -32,3 +32,2 @@
-
DingWidget::DingWidget( )
@@ -91,2 +90,10 @@ void DingWidget::setQueryWord( QString qword )
+
+void DingWidget::loadValues()
+{
+ Config cfg( "odict" );
+ cfg.setGroup( "Method_" + methodname );
+ trenner = cfg.readEntry( "Seperator" );
+}
+
BroswerContent DingWidget::setText( QString word )
@@ -99,8 +106,2 @@ BroswerContent DingWidget::setText( QString word )
-void DingWidget::loadValues()
-{
- Config cfg( "odict" );
- cfg.setGroup( "Method_" + methodname );
- trenner = cfg.readEntry( "Seperator" );
-}
@@ -108,3 +109,4 @@ BroswerContent DingWidget::parseInfo()
{
- if ( isCompleteWord ) queryword = " " + queryword + " ";
+ if ( isCompleteWord )
+ queryword = " " + queryword + " ";
QStringList search = lines.grep( queryword , isCaseSensitive );
@@ -120,35 +122,2 @@ BroswerContent DingWidget::parseInfo()
- /* 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 )
@@ -158,3 +127,3 @@ BroswerContent DingWidget::parseInfo()
- right = current.right( current.length() - current.find(trenner) -2 );
+ right = current.right( current.length() - current.find(trenner) - trenner.length() );
@@ -163,3 +132,3 @@ BroswerContent DingWidget::parseInfo()
left.replace( queryword, substitute );
- left = left + "-->" + right;
+ left = left + " -- " + right;
toplist.append( left );
@@ -169,3 +138,3 @@ BroswerContent DingWidget::parseInfo()
right.replace( queryword, substitute );
- left = right + "-->" + left;
+ left = right + " -- " + left;
bottomlist.append( right );
@@ -174,4 +143,4 @@ BroswerContent DingWidget::parseInfo()
- s_strings.bottom = bottomlist.join( "\n" );
s_strings.top = toplist.join( "\n" );
+ s_strings.bottom = bottomlist.join( "\n" );
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
@@ -203,8 +203,4 @@ void ODict::setupMenus()
- 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 );
}