| -rw-r--r-- | noncore/apps/odict/configdlg.cpp | 9 | ||||
| -rw-r--r-- | noncore/apps/odict/odict.cpp | 8 |
2 files changed, 14 insertions, 3 deletions
diff --git a/noncore/apps/odict/configdlg.cpp b/noncore/apps/odict/configdlg.cpp index 33296e3..89bc6f6 100644 --- a/noncore/apps/odict/configdlg.cpp +++ b/noncore/apps/odict/configdlg.cpp @@ -1,119 +1,126 @@ /*************************************************************************** application: : ODict begin : December 2002 copyright : ( C ) 2002, 2003 by Carsten Niehaus email : cniehaus@handhelds.org **************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * ( at your option ) any later version. * * * **************************************************************************/ #include "configdlg.h" #include "searchmethoddlg.h" #include <qdialog.h> #include <qpe/config.h> #include <qlayout.h> #include <qhbox.h> #include <qvbox.h> #include <qlabel.h> #include <qlistview.h> #include <qpushbutton.h> #include <qlineedit.h> #include <qstringlist.h> #include <opie/otabwidget.h> ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(parent, name, modal) { setCaption( tr( "Options" ) ); QVBoxLayout *vbox_layout = new QVBoxLayout( this ); tab = new OTabWidget( this, "OTabWidget_tab", OTabWidget::Global, OTabWidget::Bottom ); vbox_layout->addWidget( tab ); /*general settings*/ settings_tab = new QWidget( tab , "settings_tab" ); /*searchmethods*/ search_tab = new QWidget( tab , "search_tab" ); QVBoxLayout *vbox_layout_searchtab = new QVBoxLayout( search_tab, 4 , 4 ,"blah" ); QHBox *hbox = new QHBox( search_tab ); list = new QListView( hbox ); list->addColumn( tr( "Searchmethod" ) ); loadSearchMethodNames(); QVBox *vbox = new QVBox( hbox ); new_button = new QPushButton( "New" , vbox ); change_button = new QPushButton( "Change" , vbox ); delete_button = new QPushButton( "Delete" , vbox ); connect( new_button, SIGNAL( clicked() ), this, SLOT( slotNewMethod() ) ); connect( change_button, SIGNAL( clicked() ), this, SLOT( slotChangeMethod() )); connect( delete_button, SIGNAL( clicked() ), this, SLOT( slotDeleteMethod() )); vbox_layout_searchtab->addWidget( hbox ); /*add the tabs and maximize*/ tab->addTab( settings_tab, "pass", tr( "General Settings" ) ); tab->addTab( search_tab, "zoom", tr( "Searchmethods" ) ); showMaximized(); } void ConfigDlg::writeEntries() { qDebug( "richtig beendet" ); } void ConfigDlg::slotNewMethod() { SearchMethodDlg dlg( this, "SearchMethodDlg", true ); if ( dlg.exec() == QDialog::Accepted ) { 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 ) { dlg.saveItem(); - QListViewItem *item = new QListViewItem( list ); + 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() ) + { + Config cfg ( "odict" ); + 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_" ); for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it ) { QListViewItem *item = new QListViewItem( list ); cfg.setGroup( *it ); item->setText( 0 , cfg.readEntry( "Name" ) ); } } diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp index 1fbdb85..e0104eb 100644 --- a/noncore/apps/odict/odict.cpp +++ b/noncore/apps/odict/odict.cpp @@ -1,189 +1,193 @@ /*************************************************************************** application: : ODict begin : December 2002 copyright : ( C ) 2002, 2003 by Carsten Niehaus email : cniehaus@handhelds.org **************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * ( at your option ) any later version. * * * **************************************************************************/ #include "odict.h" #include "configdlg.h" #include "dingwidget.h" #include <qlayout.h> #include <qpopupmenu.h> #include <qmenubar.h> #include <qmessagebox.h> #include <qpe/config.h> #include <qhbox.h> #include <qvbox.h> #include <qlabel.h> #include <qpushbutton.h> #include <qlineedit.h> #include <qmainwindow.h> #include <qstring.h> #include <qaction.h> #include <qtextbrowser.h> #include <qcombobox.h> #include <qpe/resource.h> ODict::ODict() : QMainWindow() { activated_name = QString::null; 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(); query_le = new QLineEdit( hbox ); query_co = new QComboBox( hbox ); connect( query_co , SIGNAL( activated(int) ), this, SLOT( slotMethodChanged(int) ) ); ok_button = new QPushButton( tr( "&Ok" ), hbox ); connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) ); browser_top = new QTextBrowser( vbox ); browser_bottom = new QTextBrowser( vbox ); loadConfig(); setCentralWidget( vbox ); } void ODict::loadConfig() { Config cfg ( "odict" ); cfg.setGroup( "generalsettings" ); errorTol = cfg.readEntry( "errtol" ).toInt(); casesens = cfg.readEntry( "casesens" ).toInt(); regexp = cfg.readEntry( "regexp" ).toInt(); completewords = cfg.readEntry( "completewords" ).toInt(); QStringList groupListCfg = cfg.groupList().grep( "Method_" ); + query_co->clear(); for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it ) { cfg.setGroup( *it ); query_co->insertItem( cfg.readEntry( "Name" ) ); } } void ODict::saveConfig() { Config cfg ( "odict" ); cfg.setGroup( "generalsettings" ); cfg.writeEntry( "errtol" , errorTol ); cfg.writeEntry( "casesens" , casesens ); cfg.writeEntry( "regexp" , regexp ); cfg.writeEntry( "completewords" , completewords ); } void ODict::slotDisplayAbout() { - QMessageBox::about( this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten Niehaus \n cniehaus@handhelds.org \n Version 20030103" ) ); + QMessageBox::about( this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten Niehaus \n cniehaus@handhelds.org \n Version 20030104" ) ); } void ODict::slotStartQuery() { QString querystring = query_le->text(); qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1()); if (querystring.isEmpty()){ - qWarning("empty querysting"); + qWarning("empty querystring"); return; } if (!activated_name || activated_name.isEmpty()) QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") ); else DingWidget *ding = new DingWidget( querystring , browser_top, browser_bottom, activated_name ); } void ODict::slotSetErrorcount( int count ) { errorTol = count; } 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 ) { if ( casesens ) casesens = false; else casesens = true; } if ( count == 1 ) { if ( completewords ) completewords = false; else completewords = true; } if ( count == 2 ) { if ( regexp ) regexp = false; else regexp = true; } else qWarning( "ERROR" ); } void ODict::slotMethodChanged( int methodnumber ) { activated_name = query_co->currentText(); } void ODict::setupMenus() { menu = new QMenuBar( this ); settings = new QPopupMenu( menu ); setting_a = new QAction(tr( "Config" ), Resource::loadPixmap( "today/config" ), QString::null, 0, this, 0 ); connect( setting_a, SIGNAL( activated() ), this, SLOT( slotSettings() ) ); setting_a->addTo( settings ); setting_b = new QAction(tr( "Searchmethods" ), Resource::loadPixmap( "today/config" ), QString::null, 0, this, 0 ); parameter = new QPopupMenu( menu ); connect( parameter, SIGNAL( activated( int ) ), this, SLOT( slotSetParameter( int ) ) ); parameter->insertItem( tr( "C&ase sensitive" ), 0 ,0 ); parameter->insertItem( tr( "Only &complete Words" ), 1 , 1) ; parameter->insertItem( tr( "Allow ®. expressions" ), 2 ); parameter->insertSeparator(); error_tol_menu = new QPopupMenu( menu ); error_tol_menu->setCheckable( TRUE ); connect( error_tol_menu, SIGNAL( activated( int ) ), this, SLOT( slotSetErrorcount( int ) ) ); error_tol_menu->insertItem( tr( "0 Errors" ), 0 ); error_tol_menu->insertItem( tr( "1 Errors" ), 1 ); error_tol_menu->insertItem( tr( "2 Errors" ), 2 ); error_tol_menu->insertItem( tr( "3 Errors" ), 3 ); error_tol_menu->insertItem( tr( "4 Errors" ), 4 ); error_tol_menu->insertItem( tr( "Until Hit" ), 5 ); 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 ); } |