author | cniehaus <cniehaus> | 2003-05-10 13:16:54 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2003-05-10 13:16:54 (UTC) |
commit | 8bf3021bf5e86f7f6f6083606d77427adc8d13a7 (patch) (unidiff) | |
tree | 821e9798a7d388fe57ccf2e8cdc796bb147ca780 /noncore/apps | |
parent | 882b5190d02c33aa8c893e8aa54bf3d38ac255c8 (diff) | |
download | opie-8bf3021bf5e86f7f6f6083606d77427adc8d13a7.zip opie-8bf3021bf5e86f7f6f6083606d77427adc8d13a7.tar.gz opie-8bf3021bf5e86f7f6f6083606d77427adc8d13a7.tar.bz2 |
quite some changes
-rw-r--r-- | noncore/apps/odict/configdlg.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/odict/configdlg.h | 3 | ||||
-rw-r--r-- | noncore/apps/odict/dingwidget.cpp | 19 | ||||
-rw-r--r-- | noncore/apps/odict/dingwidget.h | 4 | ||||
-rw-r--r-- | noncore/apps/odict/odict.cpp | 106 | ||||
-rw-r--r-- | noncore/apps/odict/odict.h | 8 | ||||
-rw-r--r-- | noncore/apps/odict/searchmethoddlg.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/odict/searchmethoddlg.h | 1 |
8 files changed, 86 insertions, 62 deletions
diff --git a/noncore/apps/odict/configdlg.cpp b/noncore/apps/odict/configdlg.cpp index 1608486..400298d 100644 --- a/noncore/apps/odict/configdlg.cpp +++ b/noncore/apps/odict/configdlg.cpp | |||
@@ -57,29 +57,24 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa | |||
57 | connect( new_button, SIGNAL( clicked() ), this, SLOT( slotNewMethod() ) ); | 57 | connect( new_button, SIGNAL( clicked() ), this, SLOT( slotNewMethod() ) ); |
58 | connect( change_button, SIGNAL( clicked() ), this, SLOT( slotChangeMethod() )); | 58 | connect( change_button, SIGNAL( clicked() ), this, SLOT( slotChangeMethod() )); |
59 | connect( delete_button, SIGNAL( clicked() ), this, SLOT( slotDeleteMethod() )); | 59 | connect( delete_button, SIGNAL( clicked() ), this, SLOT( slotDeleteMethod() )); |
60 | 60 | ||
61 | vbox_layout_searchtab->addWidget( hbox ); | 61 | vbox_layout_searchtab->addWidget( hbox ); |
62 | 62 | ||
63 | /*add the tabs and maximize*/ | 63 | /*add the tabs and maximize*/ |
64 | tab->addTab( settings_tab, "pass", tr( "General Settings" ) ); | 64 | tab->addTab( settings_tab, "pass", tr( "General Settings" ) ); |
65 | tab->addTab( search_tab, "zoom", tr( "Searchmethods" ) ); | 65 | tab->addTab( search_tab, "zoom", tr( "Searchmethods" ) ); |
66 | showMaximized(); | 66 | showMaximized(); |
67 | } | 67 | } |
68 | 68 | ||
69 | void ConfigDlg::writeEntries() | ||
70 | { | ||
71 | //XXX wozu gibt es diese Methode? | ||
72 | } | ||
73 | |||
74 | void ConfigDlg::slotNewMethod() | 69 | void ConfigDlg::slotNewMethod() |
75 | { | 70 | { |
76 | SearchMethodDlg dlg( this, "SearchMethodDlg", true ); | 71 | SearchMethodDlg dlg( this, "SearchMethodDlg", true ); |
77 | if ( dlg.exec() == QDialog::Accepted ) | 72 | if ( dlg.exec() == QDialog::Accepted ) |
78 | { | 73 | { |
79 | dlg.saveItem(); | 74 | dlg.saveItem(); |
80 | QListViewItem *item = new QListViewItem( list ); | 75 | QListViewItem *item = new QListViewItem( list ); |
81 | item->setText( 0 , dlg.nameLE->text() ); | 76 | item->setText( 0 , dlg.nameLE->text() ); |
82 | } | 77 | } |
83 | } | 78 | } |
84 | 79 | ||
85 | void ConfigDlg::slotChangeMethod() | 80 | void ConfigDlg::slotChangeMethod() |
diff --git a/noncore/apps/odict/configdlg.h b/noncore/apps/odict/configdlg.h index 2b7d0a1..e3ef3ce 100644 --- a/noncore/apps/odict/configdlg.h +++ b/noncore/apps/odict/configdlg.h | |||
@@ -5,34 +5,31 @@ | |||
5 | * the Free Software Foundation; either version 2 of the License, or * | 5 | * the Free Software Foundation; either version 2 of the License, or * |
6 | * ( at your option ) any later version. * | 6 | * ( at your option ) any later version. * |
7 | * * | 7 | * * |
8 | **************************************************************************/ | 8 | **************************************************************************/ |
9 | 9 | ||
10 | class QWidget; | 10 | class QWidget; |
11 | class OTabWidget; | 11 | class OTabWidget; |
12 | class QListView; | 12 | class QListView; |
13 | class QPushButton; | 13 | class QPushButton; |
14 | 14 | ||
15 | #include <qdialog.h> | 15 | #include <qdialog.h> |
16 | 16 | ||
17 | |||
18 | class ConfigDlg : public QDialog | 17 | class ConfigDlg : public QDialog |
19 | { | 18 | { |
20 | Q_OBJECT | 19 | Q_OBJECT |
21 | 20 | ||
22 | public: | 21 | public: |
23 | ConfigDlg(QWidget *parent, const char *name, bool modal=FALSE ); | 22 | ConfigDlg(QWidget *parent, const char *name, bool modal=FALSE ); |
24 | 23 | ||
25 | void writeEntries(); | ||
26 | |||
27 | private: | 24 | private: |
28 | OTabWidget *tab; | 25 | OTabWidget *tab; |
29 | QWidget *settings_tab, *search_tab; | 26 | QWidget *settings_tab, *search_tab; |
30 | QListView *list; | 27 | QListView *list; |
31 | QPushButton *new_button, *change_button, *delete_button; | 28 | QPushButton *new_button, *change_button, *delete_button; |
32 | 29 | ||
33 | void loadSearchMethodNames(); | 30 | void loadSearchMethodNames(); |
34 | 31 | ||
35 | private slots: | 32 | private slots: |
36 | void slotNewMethod(); | 33 | void slotNewMethod(); |
37 | void slotChangeMethod(); | 34 | void slotChangeMethod(); |
38 | void slotDeleteMethod(); | 35 | void slotDeleteMethod(); |
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp index 0707bfb..ed67abf 100644 --- a/noncore/apps/odict/dingwidget.cpp +++ b/noncore/apps/odict/dingwidget.cpp | |||
@@ -9,64 +9,63 @@ | |||
9 | /*************************************************************************** | 9 | /*************************************************************************** |
10 | * * | 10 | * * |
11 | * This program is free software; you can redistribute it and/or modify * | 11 | * This program is free software; you can redistribute it and/or modify * |
12 | * it under the terms of the GNU General Public License as published by * | 12 | * it under the terms of the GNU General Public License as published by * |
13 | * the Free Software Foundation; either version 2 of the License, or * | 13 | * the Free Software Foundation; either version 2 of the License, or * |
14 | * ( at your option ) any later version. * | 14 | * ( at your option ) any later version. * |
15 | * * | 15 | * * |
16 | **************************************************************************/ | 16 | **************************************************************************/ |
17 | #include "dingwidget.h" | 17 | #include "dingwidget.h" |
18 | 18 | ||
19 | #include <qfile.h> | 19 | #include <qfile.h> |
20 | #include <qpe/config.h> | 20 | #include <qpe/config.h> |
21 | #include <qhbox.h> | ||
22 | #include <qlabel.h> | ||
23 | #include <qpushbutton.h> | ||
24 | #include <qlineedit.h> | ||
25 | #include <qmainwindow.h> | ||
26 | #include <qstring.h> | 21 | #include <qstring.h> |
27 | #include <qtextstream.h> | 22 | #include <qtextstream.h> |
28 | #include <qstringlist.h> | 23 | #include <qstringlist.h> |
29 | #include <qregexp.h> | 24 | #include <qregexp.h> |
30 | #include <qtextbrowser.h> | ||
31 | //#include <stdlib.h> // for getenv | ||
32 | 25 | ||
33 | DingWidget::DingWidget( ) | 26 | DingWidget::DingWidget( ) |
34 | { | 27 | { |
35 | methodname = QString::null; | 28 | methodname = QString::null; |
36 | trenner = QString::null; | 29 | trenner = QString::null; |
37 | lines = 0L; | 30 | lines = 0L; |
38 | } | 31 | } |
39 | 32 | ||
40 | void DingWidget::loadDict( QString name ) | 33 | void DingWidget::loadDict( QString name ) |
41 | { | 34 | { |
35 | qDebug( "bin in DingWidget::loadDict(). name ist:" ); | ||
36 | qDebug( name ); | ||
37 | |||
42 | dictName = name; | 38 | dictName = name; |
43 | Config cfg( "odict" ); | 39 | Config cfg( "odict" ); |
44 | if ( !methodname ) return; | 40 | if ( !methodname ) { return; } |
45 | cfg.setGroup( "Method_" + methodname ); | 41 | cfg.setGroup( "Method_" + methodname ); |
46 | QFile file( cfg.readEntry( "file" ) ); | 42 | QFile file( cfg.readEntry( "file" ) ); |
43 | |||
44 | qDebug( cfg.readEntry( "file" ) ); | ||
47 | 45 | ||
48 | if( file.open( IO_ReadOnly ) ) | 46 | if( file.open( IO_ReadOnly ) ) |
49 | { | 47 | { |
50 | QTextStream stream( &file ); | 48 | QTextStream stream( &file ); |
51 | while ( !stream.eof() ) | 49 | while ( !stream.eof() ) |
52 | { | 50 | { |
53 | lines.append( stream.readLine() ); | 51 | lines.append( stream.readLine() ); |
54 | } | 52 | } |
55 | file.close(); | 53 | file.close(); |
56 | } | 54 | } |
57 | loadValues(); | 55 | loadValues(); |
56 | |||
58 | } | 57 | } |
59 | 58 | ||
60 | QString DingWidget::loadedDict() | 59 | QString DingWidget::loadedDict() const |
61 | { | 60 | { |
62 | return dictName; | 61 | return dictName; |
63 | } | 62 | } |
64 | 63 | ||
65 | void DingWidget::setCaseSensitive( bool caseS ) | 64 | void DingWidget::setCaseSensitive( bool caseS ) |
66 | { | 65 | { |
67 | isCaseSensitive = caseS; | 66 | isCaseSensitive = caseS; |
68 | } | 67 | } |
69 | 68 | ||
70 | void DingWidget::setDict( QString dict ) | 69 | void DingWidget::setDict( QString dict ) |
71 | { | 70 | { |
72 | methodname = dict; | 71 | methodname = dict; |
@@ -93,24 +92,26 @@ void DingWidget::loadValues() | |||
93 | lang2_name = cfg.readEntry( "Lang2" ); | 92 | lang2_name = cfg.readEntry( "Lang2" ); |
94 | } | 93 | } |
95 | 94 | ||
96 | BroswerContent DingWidget::setText( QString word ) | 95 | BroswerContent DingWidget::setText( QString word ) |
97 | { | 96 | { |
98 | queryword = word; | 97 | queryword = word; |
99 | return parseInfo(); | 98 | return parseInfo(); |
100 | } | 99 | } |
101 | 100 | ||
102 | 101 | ||
103 | BroswerContent DingWidget::parseInfo() | 102 | BroswerContent DingWidget::parseInfo() |
104 | { | 103 | { |
104 | qDebug( "bin in DingWidget::parseInfo()" ); | ||
105 | |||
105 | if ( isCompleteWord ) | 106 | if ( isCompleteWord ) |
106 | queryword = " " + queryword + " "; | 107 | queryword = " " + queryword + " "; |
107 | QStringList search = lines.grep( queryword , isCaseSensitive ); | 108 | QStringList search = lines.grep( queryword , isCaseSensitive ); |
108 | 109 | ||
109 | QString current; | 110 | QString current; |
110 | QString left; | 111 | QString left; |
111 | QString right; | 112 | QString right; |
112 | QRegExp reg_div( trenner ); | 113 | QRegExp reg_div( trenner ); |
113 | QRegExp reg_word( queryword ); | 114 | QRegExp reg_word( queryword ); |
114 | reg_word.setCaseSensitive( isCaseSensitive ); | 115 | reg_word.setCaseSensitive( isCaseSensitive ); |
115 | QStringList toplist, bottomlist; | 116 | QStringList toplist, bottomlist; |
116 | QString substitute = "<strong>"+queryword+"</strong>"; | 117 | QString substitute = "<strong>"+queryword+"</strong>"; |
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h index d8466cb..dbb55e2 100644 --- a/noncore/apps/odict/dingwidget.h +++ b/noncore/apps/odict/dingwidget.h | |||
@@ -17,34 +17,34 @@ struct BroswerContent | |||
17 | }; | 17 | }; |
18 | 18 | ||
19 | class DingWidget | 19 | class DingWidget |
20 | { | 20 | { |
21 | public: | 21 | public: |
22 | DingWidget(); | 22 | DingWidget(); |
23 | 23 | ||
24 | BroswerContent setText( QString ); | 24 | BroswerContent setText( QString ); |
25 | QStringList lines; | 25 | QStringList lines; |
26 | void setCaseSensitive( bool ); | 26 | void setCaseSensitive( bool ); |
27 | void setCompleteWord( bool ); | 27 | void setCompleteWord( bool ); |
28 | void loadDict( QString ); | 28 | void loadDict( QString ); |
29 | QString loadedDict(); | 29 | QString loadedDict() const; |
30 | void setQueryWord( QString ); | 30 | void setQueryWord( QString ); |
31 | void setDict( QString ); | 31 | void setDict( QString ); |
32 | void loadValues(); | 32 | void loadValues(); |
33 | 33 | ||
34 | QString lang1_name, | 34 | QString lang1_name, |
35 | lang2_name; | 35 | lang2_name; |
36 | 36 | ||
37 | bool isCaseSensitive; | ||
37 | private: | 38 | private: |
38 | BroswerContent parseInfo(); | 39 | BroswerContent parseInfo(); |
39 | 40 | ||
40 | BroswerContent s_strings; | 41 | BroswerContent s_strings; |
41 | bool isCompleteWord; | 42 | bool isCompleteWord; |
42 | bool isCaseSensitive; | ||
43 | 43 | ||
44 | QString dictName; | 44 | QString dictName; |
45 | 45 | ||
46 | QString search_word; | 46 | QString search_word; |
47 | QString queryword; | 47 | QString queryword; |
48 | QString methodname; | 48 | QString methodname; |
49 | QString trenner; | 49 | QString trenner; |
50 | }; | 50 | }; |
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp index cb9c4e0..0745f53 100644 --- a/noncore/apps/odict/odict.cpp +++ b/noncore/apps/odict/odict.cpp | |||
@@ -44,125 +44,162 @@ ODict::ODict() : QMainWindow() | |||
44 | vbox = new QVBox( this ); | 44 | vbox = new QVBox( this ); |
45 | setCaption( tr( "OPIE-Dictionary" ) ); | 45 | setCaption( tr( "OPIE-Dictionary" ) ); |
46 | setupMenus(); | 46 | setupMenus(); |
47 | 47 | ||
48 | QHBox *hbox = new QHBox( vbox ); | 48 | QHBox *hbox = new QHBox( vbox ); |
49 | QLabel* query_label = new QLabel( tr( "Query:" ) , hbox ); | 49 | QLabel* query_label = new QLabel( tr( "Query:" ) , hbox ); |
50 | query_label->show(); | 50 | query_label->show(); |
51 | query_le = new QLineEdit( hbox ); | 51 | query_le = new QLineEdit( hbox ); |
52 | query_co = new QComboBox( hbox ); | 52 | query_co = new QComboBox( hbox ); |
53 | connect( query_co , SIGNAL( activated(const QString&) ), this, SLOT( slotMethodChanged(const QString&) ) ); | 53 | connect( query_co , SIGNAL( activated(const QString&) ), this, SLOT( slotMethodChanged(const QString&) ) ); |
54 | ok_button = new QPushButton( tr( "&Ok" ), hbox ); | 54 | ok_button = new QPushButton( tr( "&Ok" ), hbox ); |
55 | connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) ); | 55 | connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) ); |
56 | |||
56 | top_name = new QLabel( vbox ); | 57 | top_name = new QLabel( vbox ); |
58 | top_name->setAlignment( AlignHCenter ); | ||
57 | browser_top = new QTextBrowser( vbox ); | 59 | browser_top = new QTextBrowser( vbox ); |
58 | bottom_name = new QLabel( vbox ); | 60 | bottom_name = new QLabel( vbox ); |
61 | bottom_name->setAlignment( AlignHCenter ); | ||
59 | browser_bottom = new QTextBrowser( vbox ); | 62 | browser_bottom = new QTextBrowser( vbox ); |
60 | 63 | ||
61 | ding = new DingWidget(); | 64 | ding = new DingWidget(); |
62 | ding->loadValues(); | 65 | ding->loadValues(); |
63 | 66 | ||
64 | loadConfig(); | 67 | loadConfig(); |
65 | setCentralWidget( vbox ); | 68 | setCentralWidget( vbox ); |
66 | } | 69 | } |
67 | 70 | ||
68 | void ODict::loadConfig() | 71 | void ODict::loadConfig() |
69 | { | 72 | { |
73 | /* | ||
74 | * the name of the last used dictionary | ||
75 | */ | ||
76 | QString lastname; | ||
77 | |||
70 | Config cfg ( "odict" ); | 78 | Config cfg ( "odict" ); |
71 | cfg.setGroup( "generalsettings" ); | 79 | cfg.setGroup( "generalsettings" ); |
72 | errorTol = cfg.readEntry( "errtol" ).toInt(); | ||
73 | casesens = cfg.readEntry( "casesens" ).toInt(); | 80 | casesens = cfg.readEntry( "casesens" ).toInt(); |
74 | regexp = cfg.readEntry( "regexp" ).toInt(); | 81 | regexp = cfg.readEntry( "regexp" ).toInt(); |
75 | completewords = cfg.readEntry( "completewords" ).toInt(); | 82 | completewords = cfg.readEntry( "completewords" ).toInt(); |
76 | 83 | ||
84 | QString lastDict = cfg.readEntry( "lastdict" ); | ||
85 | int i = 0, e = 0; | ||
86 | |||
77 | QStringList groupListCfg = cfg.groupList().grep( "Method_" ); | 87 | QStringList groupListCfg = cfg.groupList().grep( "Method_" ); |
78 | query_co->clear(); | 88 | query_co->clear(); |
79 | for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it ) | 89 | for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it ) |
80 | { | 90 | { |
91 | QString name; | ||
81 | cfg.setGroup( *it ); | 92 | cfg.setGroup( *it ); |
82 | query_co->insertItem( cfg.readEntry( "Name" ) ); | 93 | name = cfg.readEntry( "Name" ); |
94 | query_co->insertItem( name ); | ||
95 | |||
96 | /* | ||
97 | * this check is to look up what dictionary has been used the | ||
98 | * last time | ||
99 | */ | ||
100 | if ( lastDict == name ) | ||
101 | { | ||
102 | e = i; | ||
103 | lastname = name; | ||
104 | } | ||
105 | i++; | ||
83 | } | 106 | } |
84 | //XXXslotMethodChanged( "1" ); //FIXME: this line should not contain a integer | 107 | /* |
108 | * now set the two names of the dictionary and the correct QComboBox-Entry | ||
109 | */ | ||
110 | |||
111 | lookupLanguageNames( lastname ); | ||
112 | |||
113 | query_co->setCurrentItem( e ); | ||
114 | top_name->setText( top_name_content ); | ||
115 | bottom_name->setText( bottom_name_content ); | ||
85 | } | 116 | } |
86 | 117 | ||
118 | void ODict::lookupLanguageNames( QString dictname ) | ||
119 | { | ||
120 | Config cfg ( "odict" ); | ||
121 | cfg.setGroup( "Method_"+dictname ); | ||
122 | top_name_content = cfg.readEntry( "Lang1" ); | ||
123 | bottom_name_content = cfg.readEntry( "Lang2" ); | ||
124 | } | ||
87 | 125 | ||
88 | void ODict::saveConfig() | 126 | void ODict::saveConfig() |
89 | { | 127 | { |
90 | Config cfg ( "odict" ); | 128 | Config cfg ( "odict" ); |
91 | cfg.setGroup( "generalsettings" ); | 129 | cfg.setGroup( "generalsettings" ); |
92 | cfg.writeEntry( "errtol" , errorTol ); | ||
93 | cfg.writeEntry( "casesens" , casesens ); | 130 | cfg.writeEntry( "casesens" , casesens ); |
94 | cfg.writeEntry( "regexp" , regexp ); | 131 | cfg.writeEntry( "regexp" , regexp ); |
95 | cfg.writeEntry( "completewords" , completewords ); | 132 | cfg.writeEntry( "completewords" , completewords ); |
133 | cfg.writeEntry( "lastdict" , query_co->currentText() ); | ||
96 | } | 134 | } |
97 | 135 | ||
98 | void ODict::slotStartQuery() | 136 | void ODict::slotStartQuery() |
99 | { | 137 | { |
100 | if ( !query_le->text( ).isEmpty() ) | 138 | qDebug( "bin in slotStartQuery()" ); |
139 | |||
140 | QString querystring = query_le->text(); | ||
141 | if ( !querystring.isEmpty() ) | ||
101 | { | 142 | { |
102 | /* | 143 | /* |
103 | * if the user has not yet defined a dictionary | 144 | * if the user has not yet defined a dictionary |
104 | */ | 145 | */ |
105 | if ( !query_co->currentText() ) | 146 | if ( !query_co->currentText() ) |
106 | { | 147 | { |
107 | switch ( QMessageBox::information( this, tr( "OPIE-Dictionary" ), | 148 | switch ( QMessageBox::information( this, tr( "OPIE-Dictionary" ), |
108 | tr( "No dictionary defined" ), | 149 | tr( "No dictionary defined" ), |
109 | tr( "&Define one" ), | 150 | tr( "&Define one" ), |
110 | tr( "&Cancel" ), | 151 | tr( "&Cancel" ), |
111 | 0, // Define a dict choosen | 152 | 0, // Define a dict choosen |
112 | 1 ) ) // Cancel choosen | 153 | 1 ) ) // Cancel choosen |
113 | { | 154 | { |
114 | |||
115 | case 0: | 155 | case 0: |
116 | slotSettings(); | 156 | slotSettings(); |
117 | break; | 157 | break; |
118 | case 1: // stop here | 158 | case 1: // stop here |
119 | return; | 159 | return; |
120 | } | 160 | } |
121 | } | 161 | } |
122 | 162 | ||
123 | /* | 163 | /* |
124 | * ok, the user has defined a dict | 164 | * ok, the user has defined a dict |
125 | */ | 165 | */ |
126 | QString querystring = query_le->text(); | ||
127 | ding->setCaseSensitive( casesens ); | 166 | ding->setCaseSensitive( casesens ); |
128 | ding->setCompleteWord( completewords ); | 167 | ding->setCompleteWord( completewords ); |
168 | |||
169 | qDebug( "activated_name ist:" ); | ||
170 | qDebug( activated_name ); | ||
171 | |||
129 | ding->setDict( activated_name ); | 172 | ding->setDict( activated_name ); |
130 | top_name->setText( ding->lang1_name ); | ||
131 | bottom_name->setText( ding->lang2_name ); | ||
132 | 173 | ||
133 | if ( activated_name != ding->loadedDict() ) | 174 | //X if ( activated_name != ding->loadedDict() ) |
134 | ding->loadDict(activated_name); | 175 | ding->loadDict(activated_name); |
135 | 176 | ||
136 | BroswerContent test = ding->setText( querystring ); | 177 | BroswerContent test = ding->setText( querystring ); |
137 | 178 | ||
179 | qDebug( querystring ); | ||
180 | if ( ding->isCaseSensitive ) | ||
181 | qDebug( "ist CS"); | ||
182 | else qDebug( "kein CS" ); | ||
183 | |||
138 | browser_top->setText( test.top ); | 184 | browser_top->setText( test.top ); |
139 | browser_bottom->setText( test.bottom ); | 185 | browser_bottom->setText( test.bottom ); |
140 | } | 186 | } |
141 | } | 187 | } |
142 | 188 | ||
143 | |||
144 | void ODict::slotSetErrorcount( int count ) | ||
145 | { | ||
146 | errorTol = count; | ||
147 | } | ||
148 | |||
149 | void ODict::slotSettings() | 189 | void ODict::slotSettings() |
150 | { | 190 | { |
151 | ConfigDlg dlg( this, "Config" , true); | 191 | ConfigDlg dlg( this, "Config" , true); |
152 | if ( dlg.exec() == QDialog::Accepted ) | 192 | if ( dlg.exec() == QDialog::Accepted ) |
153 | { | 193 | saveConfig(); |
154 | dlg.writeEntries(); | ||
155 | loadConfig(); | ||
156 | } | ||
157 | } | 194 | } |
158 | 195 | ||
159 | void ODict::slotSetParameter( int count ) | 196 | void ODict::slotSetParameter( int count ) |
160 | { | 197 | { |
161 | if ( count == 0 ) | 198 | if ( count == 0 ) |
162 | { | 199 | { |
163 | if ( casesens ) | 200 | if ( casesens ) |
164 | casesens = false; | 201 | casesens = false; |
165 | else | 202 | else |
166 | casesens = true; | 203 | casesens = true; |
167 | } | 204 | } |
168 | 205 | ||
@@ -171,59 +208,52 @@ void ODict::slotSetParameter( int count ) | |||
171 | if ( completewords ) | 208 | if ( completewords ) |
172 | completewords = false; | 209 | completewords = false; |
173 | else | 210 | else |
174 | completewords = true; | 211 | completewords = true; |
175 | } | 212 | } |
176 | if ( count == 2 ) | 213 | if ( count == 2 ) |
177 | { | 214 | { |
178 | if ( regexp ) | 215 | if ( regexp ) |
179 | regexp = false; | 216 | regexp = false; |
180 | else | 217 | else |
181 | regexp = true; | 218 | regexp = true; |
182 | } | 219 | } |
183 | else qWarning( "ERROR" ); | 220 | saveConfig(); |
184 | } | 221 | } |
185 | 222 | ||
186 | void ODict::slotMethodChanged( const QString& methodnumber ) | 223 | void ODict::slotMethodChanged( const QString& methodnumber ) |
187 | { | 224 | { |
188 | activated_name = methodnumber; | 225 | activated_name = methodnumber; |
189 | 226 | ||
190 | if ( activated_name != ding->loadedDict() ) | 227 | qDebug( "activated_name in slotMethodChanged() ist:" ); |
191 | ding->loadDict(activated_name); | 228 | qDebug( activated_name ); |
192 | 229 | ||
193 | top_name->setText( ding->lang1_name ); | 230 | //X if ( activated_name != ding->loadedDict() ) |
194 | top_name->setAlignment( AlignHCenter ); | 231 | { |
195 | bottom_name->setText( ding->lang2_name ); | 232 | ding->loadDict(activated_name); |
196 | bottom_name->setAlignment( AlignHCenter ); | 233 | |
234 | lookupLanguageNames( activated_name ); | ||
235 | top_name->setText( top_name_content ); | ||
236 | bottom_name->setText( bottom_name_content ); | ||
237 | } | ||
197 | } | 238 | } |
198 | 239 | ||
199 | void ODict::setupMenus() | 240 | void ODict::setupMenus() |
200 | { | 241 | { |
201 | menu = new QMenuBar( this ); | 242 | menu = new QMenuBar( this ); |
202 | 243 | ||
203 | settings = new QPopupMenu( menu ); | 244 | settings = new QPopupMenu( menu ); |
204 | setting_a = new QAction(tr( "Configuration" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); | 245 | setting_a = new QAction(tr( "Configuration" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); |
205 | connect( setting_a, SIGNAL( activated() ), this, SLOT( slotSettings() ) ); | 246 | connect( setting_a, SIGNAL( activated() ), this, SLOT( slotSettings() ) ); |
206 | setting_a->addTo( settings ); | 247 | setting_a->addTo( settings ); |
207 | setting_b = new QAction(tr( "Searchmethods" ), Resource::loadPixmap( "edit" ), QString::null, 0, this, 0 ); | 248 | setting_b = new QAction(tr( "Searchmethods" ), Resource::loadPixmap( "edit" ), QString::null, 0, this, 0 ); |
208 | 249 | ||
209 | parameter = new QPopupMenu( menu ); | 250 | parameter = new QPopupMenu( menu ); |
210 | connect( parameter, SIGNAL( activated( int ) ), this, SLOT( slotSetParameter( int ) ) ); | 251 | connect( parameter, SIGNAL( activated( int ) ), this, SLOT( slotSetParameter( int ) ) ); |
211 | parameter->insertItem( tr( "C&ase sensitive" ), 0 ,0 ); | 252 | parameter->insertItem( tr( "C&ase sensitive" ), 0 ,0 ); |
212 | parameter->insertItem( tr( "Only &complete Words" ), 1 , 1) ; | 253 | parameter->insertItem( tr( "Only &complete Words" ), 1 , 1) ; |
213 | parameter->insertItem( tr( "Allow ®. expressions" ), 2 ); | 254 | parameter->insertItem( tr( "Allow ®. expressions" ), 2 ); |
214 | parameter->insertSeparator(); | 255 | parameter->insertSeparator(); |
215 | error_tol_menu = new QPopupMenu( menu ); | ||
216 | error_tol_menu->setCheckable( TRUE ); | ||
217 | connect( error_tol_menu, SIGNAL( activated( int ) ), this, SLOT( slotSetErrorcount( int ) ) ); | ||
218 | |||
219 | error_tol_menu->insertItem( tr( "0 Errors" ), 0 ); | ||
220 | error_tol_menu->insertItem( tr( "1 Errors" ), 1 ); | ||
221 | error_tol_menu->insertItem( tr( "2 Errors" ), 2 ); | ||
222 | error_tol_menu->insertItem( tr( "3 Errors" ), 3 ); | ||
223 | error_tol_menu->insertItem( tr( "4 Errors" ), 4 ); | ||
224 | error_tol_menu->insertItem( tr( "Until Hit" ), 5 ); | ||
225 | parameter->insertItem( tr( "&Error tolerance" ), error_tol_menu ); | ||
226 | 256 | ||
227 | menu->insertItem( tr( "Settings" ) , settings ); | 257 | menu->insertItem( tr( "Settings" ) , settings ); |
228 | menu->insertItem( tr( "Parameter" ) , parameter ); | 258 | menu->insertItem( tr( "Parameter" ) , parameter ); |
229 | } | 259 | } |
diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h index b9a0778..9c037ea 100644 --- a/noncore/apps/odict/odict.h +++ b/noncore/apps/odict/odict.h | |||
@@ -27,42 +27,44 @@ class DingWidget; | |||
27 | class ODict : public QMainWindow | 27 | class ODict : public QMainWindow |
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | 30 | ||
31 | public: | 31 | public: |
32 | ODict(); | 32 | ODict(); |
33 | QVBox *vbox; | 33 | QVBox *vbox; |
34 | QTextBrowser *browser_top, | 34 | QTextBrowser *browser_top, |
35 | *browser_bottom; | 35 | *browser_bottom; |
36 | DingWidget *ding; | 36 | DingWidget *ding; |
37 | 37 | ||
38 | private: | 38 | private: |
39 | QPopupMenu *help, *settings, *parameter, *error_tol_menu; | 39 | QPopupMenu *help, *settings, *parameter; |
40 | QMenuBar *menu; | 40 | QMenuBar *menu; |
41 | QHBox *hbox; | 41 | QHBox *hbox; |
42 | QLineEdit *query_le; | 42 | QLineEdit *query_le; |
43 | QComboBox *query_co; | 43 | QComboBox *query_co; |
44 | QPushButton *ok_button; | 44 | QPushButton *ok_button; |
45 | 45 | ||
46 | QVBoxLayout *vbox_layout; | 46 | QVBoxLayout *vbox_layout; |
47 | 47 | ||
48 | QAction *setting_a, *setting_b; | 48 | QAction *setting_a, *setting_b; |
49 | 49 | ||
50 | void setupMenus(); | 50 | void setupMenus(); |
51 | 51 | ||
52 | int errorTol; | ||
53 | bool casesens, completewords, regexp; | 52 | bool casesens, completewords, regexp; |
54 | 53 | ||
55 | void loadConfig(); | 54 | void loadConfig(); |
56 | void saveConfig(); | 55 | void saveConfig(); |
57 | 56 | ||
58 | QString activated_name; | 57 | QString activated_name; |
59 | QLabel *bottom_name, | 58 | QLabel *bottom_name, |
60 | *top_name; | 59 | *top_name; |
60 | |||
61 | QString top_name_content, bottom_name_content; | ||
62 | |||
63 | void lookupLanguageNames( QString ); | ||
61 | 64 | ||
62 | private slots: | 65 | private slots: |
63 | void slotStartQuery(); | 66 | void slotStartQuery(); |
64 | void slotSetErrorcount( int ); | ||
65 | void slotSettings(); | 67 | void slotSettings(); |
66 | void slotSetParameter( int ); | 68 | void slotSetParameter( int ); |
67 | void slotMethodChanged( const QString& ); | 69 | void slotMethodChanged( const QString& ); |
68 | }; | 70 | }; |
diff --git a/noncore/apps/odict/searchmethoddlg.cpp b/noncore/apps/odict/searchmethoddlg.cpp index 8a14703..99cd8db 100644 --- a/noncore/apps/odict/searchmethoddlg.cpp +++ b/noncore/apps/odict/searchmethoddlg.cpp | |||
@@ -82,25 +82,25 @@ void SearchMethodDlg::setupEntries( QString item ) | |||
82 | { | 82 | { |
83 | Config cfg( "odict" ); | 83 | Config cfg( "odict" ); |
84 | cfg.setGroup( "Method_"+itemName ); | 84 | cfg.setGroup( "Method_"+itemName ); |
85 | trenner->setText( cfg.readEntry( "Seperator" ) ); | 85 | trenner->setText( cfg.readEntry( "Seperator" ) ); |
86 | lang1->setText( cfg.readEntry( "Lang1" ) ); | 86 | lang1->setText( cfg.readEntry( "Lang1" ) ); |
87 | lang2->setText( cfg.readEntry( "Lang2" ) ); | 87 | lang2->setText( cfg.readEntry( "Lang2" ) ); |
88 | nameLE->setText( itemName ); | 88 | nameLE->setText( itemName ); |
89 | dictFileLE->setText( cfg.readEntry( "file" ) ); | 89 | dictFileLE->setText( cfg.readEntry( "file" ) ); |
90 | } | 90 | } |
91 | 91 | ||
92 | void SearchMethodDlg::slotBrowse() | 92 | void SearchMethodDlg::slotBrowse() |
93 | { | 93 | { |
94 | itemName=OFileDialog::getOpenFileName( OFileSelector::EXTENDED,QDir::homeDirPath()); | 94 | itemName=OFileDialog::getOpenFileName( OFileSelector::EXTENDED,QDir::homeDirPath()); |
95 | dictFileLE->setText( itemName ); | 95 | dictFileLE->setText( itemName ); |
96 | } | 96 | } |
97 | 97 | ||
98 | void SearchMethodDlg::saveItem() | 98 | void SearchMethodDlg::saveItem() |
99 | { | 99 | { |
100 | QString name = nameLE->text(); | 100 | QString name = nameLE->text(); |
101 | Config cfg( "odict" ); | 101 | Config cfg( "odict" ); |
102 | cfg.setGroup( "Method_"+name ); | 102 | cfg.setGroup( "Method_"+name ); |
103 | cfg.writeEntry( "Name", name ); | 103 | cfg.writeEntry( "Name", name ); |
104 | cfg.writeEntry( "Seperator", trenner->text() ); | 104 | cfg.writeEntry( "Seperator", trenner->text() ); |
105 | cfg.writeEntry( "Lang1", lang1->text() ); | 105 | cfg.writeEntry( "Lang1", lang1->text() ); |
106 | cfg.writeEntry( "Lang2", lang2->text() ); | 106 | cfg.writeEntry( "Lang2", lang2->text() ); |
diff --git a/noncore/apps/odict/searchmethoddlg.h b/noncore/apps/odict/searchmethoddlg.h index d98842f..706bbc1 100644 --- a/noncore/apps/odict/searchmethoddlg.h +++ b/noncore/apps/odict/searchmethoddlg.h | |||
@@ -8,25 +8,24 @@ | |||
8 | **************************************************************************/ | 8 | **************************************************************************/ |
9 | 9 | ||
10 | class QWidget; | 10 | class QWidget; |
11 | class QLineEdit; | 11 | class QLineEdit; |
12 | class OTabWidget; | 12 | class OTabWidget; |
13 | class QListView; | 13 | class QListView; |
14 | class QPushButton; | 14 | class QPushButton; |
15 | class QLabel; | 15 | class QLabel; |
16 | class QString; | 16 | class QString; |
17 | 17 | ||
18 | #include <qdialog.h> | 18 | #include <qdialog.h> |
19 | 19 | ||
20 | |||
21 | class SearchMethodDlg : public QDialog | 20 | class SearchMethodDlg : public QDialog |
22 | { | 21 | { |
23 | Q_OBJECT | 22 | Q_OBJECT |
24 | 23 | ||
25 | public: | 24 | public: |
26 | SearchMethodDlg(QWidget *parent, const char *name, bool modal=FALSE, QString itemname=0 ); | 25 | SearchMethodDlg(QWidget *parent, const char *name, bool modal=FALSE, QString itemname=0 ); |
27 | 26 | ||
28 | QString itemName; | 27 | QString itemName; |
29 | QLineEdit *nameLE; | 28 | QLineEdit *nameLE; |
30 | QLineEdit *lang1, *lang2, *trenner; | 29 | QLineEdit *lang1, *lang2, *trenner; |
31 | void saveItem(); | 30 | void saveItem(); |
32 | 31 | ||