summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/odict/configdlg.cpp8
-rw-r--r--noncore/apps/odict/dingwidget.cpp2
-rw-r--r--noncore/apps/odict/dingwidget.h3
-rw-r--r--noncore/apps/odict/odict.cpp99
-rw-r--r--noncore/apps/odict/odict.h5
5 files changed, 67 insertions, 50 deletions
diff --git a/noncore/apps/odict/configdlg.cpp b/noncore/apps/odict/configdlg.cpp
index eba7dec..1608486 100644
--- a/noncore/apps/odict/configdlg.cpp
+++ b/noncore/apps/odict/configdlg.cpp
@@ -65,43 +65,38 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
tab->addTab( search_tab, "zoom", tr( "Searchmethods" ) );
showMaximized();
}
void ConfigDlg::writeEntries()
{
- qDebug( "richtig beendet" );
+ //XXX wozu gibt es diese Methode?
}
void ConfigDlg::slotNewMethod()
{
SearchMethodDlg dlg( this, "SearchMethodDlg", true );
if ( dlg.exec() == QDialog::Accepted )
{
- //if ( !dlg.nameLE->text() ) return; //XXX
dlg.saveItem();
QListViewItem *item = new QListViewItem( list );
item->setText( 0 , dlg.nameLE->text() );
}
- else qDebug( "SearchMethodDlg abgebrochen" );
}
void ConfigDlg::slotChangeMethod()
{
if ( list->selectedItem() )
{
SearchMethodDlg dlg( this, "SearchMethodDlg", true, list->selectedItem()->text( 0 ) );
if ( dlg.exec() == QDialog::Accepted )
{
- //if ( !dlg.nameLE->text() ) return; //XXX geht vielleich nicht
dlg.saveItem();
QListViewItem *item = list->selectedItem();
item->setText( 0 , dlg.nameLE->text() );
}
- else qDebug( "SearchMethodDlg abgebrochen" );
}
- else qDebug( "kein item angewählt" );
}
void ConfigDlg::slotDeleteMethod()
{
if ( list->selectedItem() )
{
@@ -109,13 +104,12 @@ void ConfigDlg::slotDeleteMethod()
cfg.setGroup( "Method_"+list->selectedItem()->text(0) );
cfg.clearGroup();
//FIXME: this only removes the entries but not the group itself
list->takeItem( list->selectedItem() );
}
- else qDebug("no item selected");
}
void ConfigDlg::loadSearchMethodNames()
{
Config cfg( "odict" );
QStringList groupListCfg = cfg.groupList().grep( "Method_" );
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index abb5e75..0707bfb 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -86,12 +86,14 @@ void DingWidget::setQueryWord( QString qword )
void DingWidget::loadValues()
{
if ( !methodname ) return;
Config cfg( "odict" );
cfg.setGroup( "Method_" + methodname );
trenner = cfg.readEntry( "Seperator" );
+ lang1_name = cfg.readEntry( "Lang1" );
+ lang2_name = cfg.readEntry( "Lang2" );
}
BroswerContent DingWidget::setText( QString word )
{
queryword = word;
return parseInfo();
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index 74f40c9..d8466cb 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -27,12 +27,15 @@ class DingWidget
void setCompleteWord( bool );
void loadDict( QString );
QString loadedDict();
void setQueryWord( QString );
void setDict( QString );
void loadValues();
+
+ QString lang1_name,
+ lang2_name;
private:
BroswerContent parseInfo();
BroswerContent s_strings;
bool isCompleteWord;
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index 9f9a8d9..cb9c4e0 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -43,24 +43,27 @@ ODict::ODict() : QMainWindow()
vbox = new QVBox( this );
setCaption( tr( "OPIE-Dictionary" ) );
setupMenus();
QHBox *hbox = new QHBox( vbox );
- QLabel* query_label = new QLabel( tr( "Query:" ) , hbox ); query_label->show();
+ QLabel* query_label = new QLabel( tr( "Query:" ) , hbox );
+ query_label->show();
query_le = new QLineEdit( hbox );
query_co = new QComboBox( hbox );
- connect( query_co , SIGNAL( activated(int) ), this, SLOT( slotMethodChanged(int) ) );
+ connect( query_co , SIGNAL( activated(const QString&) ), this, SLOT( slotMethodChanged(const QString&) ) );
ok_button = new QPushButton( tr( "&Ok" ), hbox );
connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) );
+ top_name = new QLabel( vbox );
browser_top = new QTextBrowser( vbox );
+ bottom_name = new QLabel( vbox );
browser_bottom = new QTextBrowser( vbox );
ding = new DingWidget();
ding->loadValues();
-
+
loadConfig();
setCentralWidget( vbox );
}
void ODict::loadConfig()
{
@@ -75,13 +78,13 @@ void ODict::loadConfig()
query_co->clear();
for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it )
{
cfg.setGroup( *it );
query_co->insertItem( cfg.readEntry( "Name" ) );
}
- slotMethodChanged( 1 ); //FIXME: this line should not contain a integer
+//XXX slotMethodChanged( "1" ); //FIXME: this line should not contain a integer
}
void ODict::saveConfig()
{
Config cfg ( "odict" );
@@ -91,48 +94,53 @@ void ODict::saveConfig()
cfg.writeEntry( "regexp" , regexp );
cfg.writeEntry( "completewords" , completewords );
}
void ODict::slotStartQuery()
{
- /*
- * if the user has not yet defined a dictionary
- */
- if ( !query_co->currentText() )
+ if ( !query_le->text( ).isEmpty() )
{
- switch ( QMessageBox::information( this, tr( "OPIE-Dictionary" ),
- tr( "No dictionary defined" ),
- tr( "&Define one" ),
- tr( "&Cancel" ),
- 0, // Define a dict choosen
- 1 ) ) // Cancel choosen
- {
-
- case 0:
- slotSettings();
- break;
- case 1: // stop here
- return;
- }
- }
-
- /*
- * ok, the user has defined a dict
- */
- QString querystring = query_le->text();
- ding->setCaseSensitive( casesens );
- ding->setCompleteWord( completewords );
- ding->setDict( activated_name );
-
- if ( activated_name != ding->loadedDict() )
- ding->loadDict(activated_name);
-
- BroswerContent test = ding->setText( querystring );
-
- browser_top->setText( test.top );
- browser_bottom->setText( test.bottom );
+ /*
+ * if the user has not yet defined a dictionary
+ */
+ if ( !query_co->currentText() )
+ {
+ switch ( QMessageBox::information( this, tr( "OPIE-Dictionary" ),
+ tr( "No dictionary defined" ),
+ tr( "&Define one" ),
+ tr( "&Cancel" ),
+ 0, // Define a dict choosen
+ 1 ) ) // Cancel choosen
+ {
+
+ case 0:
+ slotSettings();
+ break;
+ case 1: // stop here
+ return;
+ }
+ }
+
+ /*
+ * ok, the user has defined a dict
+ */
+ QString querystring = query_le->text();
+ ding->setCaseSensitive( casesens );
+ ding->setCompleteWord( completewords );
+ ding->setDict( activated_name );
+ top_name->setText( ding->lang1_name );
+ bottom_name->setText( ding->lang2_name );
+
+ if ( activated_name != ding->loadedDict() )
+ ding->loadDict(activated_name);
+
+ BroswerContent test = ding->setText( querystring );
+
+ browser_top->setText( test.top );
+ browser_bottom->setText( test.bottom );
+ }
}
void ODict::slotSetErrorcount( int count )
{
errorTol = count;
@@ -143,13 +151,12 @@ void ODict::slotSettings()
ConfigDlg dlg( this, "Config" , true);
if ( dlg.exec() == QDialog::Accepted )
{
dlg.writeEntries();
loadConfig();
}
- else qDebug( "abgebrochen" );
}
void ODict::slotSetParameter( int count )
{
if ( count == 0 )
{
@@ -173,15 +180,23 @@ void ODict::slotSetParameter( int count )
else
regexp = true;
}
else qWarning( "ERROR" );
}
-void ODict::slotMethodChanged( int /*methodnumber*/ )
+void ODict::slotMethodChanged( const QString& methodnumber )
{
- activated_name = query_co->currentText();
+ activated_name = methodnumber;
+
+ if ( activated_name != ding->loadedDict() )
+ ding->loadDict(activated_name);
+
+ top_name->setText( ding->lang1_name );
+ top_name->setAlignment( AlignHCenter );
+ bottom_name->setText( ding->lang2_name );
+ bottom_name->setAlignment( AlignHCenter );
}
void ODict::setupMenus()
{
menu = new QMenuBar( this );
diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h
index 3065feb..b9a0778 100644
--- a/noncore/apps/odict/odict.h
+++ b/noncore/apps/odict/odict.h
@@ -6,12 +6,13 @@
* ( at your option ) any later version. *
* *
**************************************************************************/
#include <qmainwindow.h>
+class QLabel;
class QVBox;
class QPopupMenu;
class QMenuBar;
class QHBox;
class QPushButton;
class QLineEdit;
@@ -52,14 +53,16 @@ class ODict : public QMainWindow
bool casesens, completewords, regexp;
void loadConfig();
void saveConfig();
QString activated_name;
+ QLabel *bottom_name,
+ *top_name;
private slots:
void slotStartQuery();
void slotSetErrorcount( int );
void slotSettings();
void slotSetParameter( int );
- void slotMethodChanged( int );
+ void slotMethodChanged( const QString& );
};