-rw-r--r-- | noncore/apps/odict/configdlg.cpp | 22 | ||||
-rw-r--r-- | noncore/apps/odict/configdlg.h | 2 | ||||
-rw-r--r-- | noncore/apps/odict/odict.cpp | 12 | ||||
-rw-r--r-- | noncore/apps/odict/odict.h | 2 | ||||
-rw-r--r-- | noncore/apps/odict/odict.pro | 2 | ||||
-rw-r--r-- | noncore/apps/odict/opie-odict.control | 2 |
6 files changed, 10 insertions, 32 deletions
diff --git a/noncore/apps/odict/configdlg.cpp b/noncore/apps/odict/configdlg.cpp index 400298d..2103df9 100644 --- a/noncore/apps/odict/configdlg.cpp +++ b/noncore/apps/odict/configdlg.cpp | |||
@@ -20,58 +20,48 @@ | |||
20 | #include <qdialog.h> | 20 | #include <qdialog.h> |
21 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
22 | #include <qlayout.h> | 22 | #include <qlayout.h> |
23 | 23 | ||
24 | #include <qhbox.h> | 24 | #include <qhbox.h> |
25 | #include <qvbox.h> | 25 | #include <qvbox.h> |
26 | #include <qlabel.h> | 26 | #include <qlabel.h> |
27 | #include <qlistview.h> | 27 | #include <qlistview.h> |
28 | #include <qpushbutton.h> | 28 | #include <qpushbutton.h> |
29 | #include <qlineedit.h> | 29 | #include <qlineedit.h> |
30 | #include <qstringlist.h> | 30 | #include <qstringlist.h> |
31 | 31 | ||
32 | #include <opie/otabwidget.h> | ||
33 | |||
34 | ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(parent, name, modal) | 32 | ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(parent, name, modal) |
35 | { | 33 | { |
36 | setCaption( tr( "Options" ) ); | 34 | setCaption( tr( "Options" ) ); |
37 | QVBoxLayout *vbox_layout = new QVBoxLayout( this ); | 35 | QVBoxLayout *vbox_layout = new QVBoxLayout( this ); |
38 | tab = new OTabWidget( this, "OTabWidget_tab", OTabWidget::Global, OTabWidget::Bottom ); | 36 | search_tab = new QWidget( this , "search_tab" ); |
39 | vbox_layout->addWidget( tab ); | ||
40 | |||
41 | /*general settings*/ | ||
42 | settings_tab = new QWidget( tab , "settings_tab" ); | ||
43 | |||
44 | /*searchmethods*/ | ||
45 | search_tab = new QWidget( tab , "search_tab" ); | ||
46 | QVBoxLayout *vbox_layout_searchtab = new QVBoxLayout( search_tab, 4 , 4 ,"blah" ); | 37 | QVBoxLayout *vbox_layout_searchtab = new QVBoxLayout( search_tab, 4 , 4 ,"blah" ); |
47 | 38 | ||
48 | QHBox *hbox = new QHBox( search_tab ); | 39 | QHBox *hbox = new QHBox( search_tab ); |
49 | list = new QListView( hbox ); | 40 | list = new QListView( hbox ); |
50 | list->addColumn( tr( "Searchmethod" ) ); | 41 | list->addColumn( tr( "Searchmethod" ) ); |
51 | loadSearchMethodNames(); | 42 | loadSearchMethodNames(); |
52 | 43 | ||
53 | QVBox *vbox = new QVBox( hbox ); | 44 | QVBox *vbox = new QVBox( hbox ); |
54 | new_button = new QPushButton( "New" , vbox ); | 45 | new_button = new QPushButton( tr( "New" ) , vbox ); |
55 | change_button = new QPushButton( "Change" , vbox ); | 46 | change_button = new QPushButton( tr( "Change" ) , vbox ); |
56 | delete_button = new QPushButton( "Delete" , vbox ); | 47 | delete_button = new QPushButton( tr( "Delete" ) , vbox ); |
57 | connect( new_button, SIGNAL( clicked() ), this, SLOT( slotNewMethod() ) ); | 48 | connect( new_button, SIGNAL( clicked() ), this, SLOT( slotNewMethod() ) ); |
58 | connect( change_button, SIGNAL( clicked() ), this, SLOT( slotChangeMethod() )); | 49 | connect( change_button, SIGNAL( clicked() ), this, SLOT( slotChangeMethod() )); |
59 | connect( delete_button, SIGNAL( clicked() ), this, SLOT( slotDeleteMethod() )); | 50 | connect( delete_button, SIGNAL( clicked() ), this, SLOT( slotDeleteMethod() )); |
60 | 51 | ||
61 | vbox_layout_searchtab->addWidget( hbox ); | 52 | vbox_layout_searchtab->addWidget( hbox ); |
62 | 53 | ||
63 | /*add the tabs and maximize*/ | 54 | vbox_layout->addWidget( search_tab ); |
64 | tab->addTab( settings_tab, "pass", tr( "General Settings" ) ); | 55 | |
65 | tab->addTab( search_tab, "zoom", tr( "Searchmethods" ) ); | ||
66 | showMaximized(); | 56 | showMaximized(); |
67 | } | 57 | } |
68 | 58 | ||
69 | void ConfigDlg::slotNewMethod() | 59 | void ConfigDlg::slotNewMethod() |
70 | { | 60 | { |
71 | SearchMethodDlg dlg( this, "SearchMethodDlg", true ); | 61 | SearchMethodDlg dlg( this, "SearchMethodDlg", true ); |
72 | if ( dlg.exec() == QDialog::Accepted ) | 62 | if ( dlg.exec() == QDialog::Accepted ) |
73 | { | 63 | { |
74 | dlg.saveItem(); | 64 | dlg.saveItem(); |
75 | QListViewItem *item = new QListViewItem( list ); | 65 | QListViewItem *item = new QListViewItem( list ); |
76 | item->setText( 0 , dlg.nameLE->text() ); | 66 | item->setText( 0 , dlg.nameLE->text() ); |
77 | } | 67 | } |
diff --git a/noncore/apps/odict/configdlg.h b/noncore/apps/odict/configdlg.h index e3ef3ce..6c85989 100644 --- a/noncore/apps/odict/configdlg.h +++ b/noncore/apps/odict/configdlg.h | |||
@@ -1,36 +1,34 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * * | 2 | * * |
3 | * This program is free software; you can redistribute it and/or modify * | 3 | * This program is free software; you can redistribute it and/or modify * |
4 | * it under the terms of the GNU General Public License as published by * | 4 | * it under the terms of the GNU General Public License as published by * |
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; | ||
12 | class QListView; | 11 | class QListView; |
13 | class QPushButton; | 12 | class QPushButton; |
14 | 13 | ||
15 | #include <qdialog.h> | 14 | #include <qdialog.h> |
16 | 15 | ||
17 | class ConfigDlg : public QDialog | 16 | class ConfigDlg : public QDialog |
18 | { | 17 | { |
19 | Q_OBJECT | 18 | Q_OBJECT |
20 | 19 | ||
21 | public: | 20 | public: |
22 | ConfigDlg(QWidget *parent, const char *name, bool modal=FALSE ); | 21 | ConfigDlg(QWidget *parent, const char *name, bool modal=FALSE ); |
23 | 22 | ||
24 | private: | 23 | private: |
25 | OTabWidget *tab; | ||
26 | QWidget *settings_tab, *search_tab; | 24 | QWidget *settings_tab, *search_tab; |
27 | QListView *list; | 25 | QListView *list; |
28 | QPushButton *new_button, *change_button, *delete_button; | 26 | QPushButton *new_button, *change_button, *delete_button; |
29 | 27 | ||
30 | void loadSearchMethodNames(); | 28 | void loadSearchMethodNames(); |
31 | 29 | ||
32 | private slots: | 30 | private slots: |
33 | void slotNewMethod(); | 31 | void slotNewMethod(); |
34 | void slotChangeMethod(); | 32 | void slotChangeMethod(); |
35 | void slotDeleteMethod(); | 33 | void slotDeleteMethod(); |
36 | }; | 34 | }; |
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp index 2028701..010545e 100644 --- a/noncore/apps/odict/odict.cpp +++ b/noncore/apps/odict/odict.cpp | |||
@@ -32,25 +32,25 @@ | |||
32 | #include <qaction.h> | 32 | #include <qaction.h> |
33 | #include <qtextbrowser.h> | 33 | #include <qtextbrowser.h> |
34 | #include <qcombobox.h> | 34 | #include <qcombobox.h> |
35 | 35 | ||
36 | #include <qpe/resource.h> | 36 | #include <qpe/resource.h> |
37 | #include <qpe/config.h> | 37 | #include <qpe/config.h> |
38 | 38 | ||
39 | ODict::ODict() : QMainWindow() | 39 | ODict::ODict() : QMainWindow() |
40 | { | 40 | { |
41 | activated_name = QString::null; | 41 | activated_name = QString::null; |
42 | 42 | ||
43 | vbox = new QVBox( this ); | 43 | vbox = new QVBox( this ); |
44 | setCaption( tr( "OPIE-Dictionary" ) ); | 44 | setCaption( tr( "Opie-Dictionary" ) ); |
45 | setupMenus(); | 45 | setupMenus(); |
46 | 46 | ||
47 | QHBox *hbox = new QHBox( vbox ); | 47 | QHBox *hbox = new QHBox( vbox ); |
48 | QLabel* query_label = new QLabel( tr( "Query:" ) , hbox ); | 48 | QLabel* query_label = new QLabel( tr( "Query:" ) , hbox ); |
49 | query_label->show(); | 49 | query_label->show(); |
50 | query_le = new QLineEdit( hbox ); | 50 | query_le = new QLineEdit( hbox ); |
51 | query_co = new QComboBox( hbox ); | 51 | query_co = new QComboBox( hbox ); |
52 | connect( query_co , SIGNAL( activated(const QString&) ), this, SLOT( slotMethodChanged(const QString&) ) ); | 52 | connect( query_co , SIGNAL( activated(const QString&) ), this, SLOT( slotMethodChanged(const QString&) ) ); |
53 | ok_button = new QPushButton( tr( "&Ok" ), hbox ); | 53 | ok_button = new QPushButton( tr( "&Ok" ), hbox ); |
54 | connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) ); | 54 | connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) ); |
55 | 55 | ||
56 | top_name = new QLabel( vbox ); | 56 | top_name = new QLabel( vbox ); |
@@ -67,25 +67,24 @@ ODict::ODict() : QMainWindow() | |||
67 | } | 67 | } |
68 | 68 | ||
69 | void ODict::loadConfig() | 69 | void ODict::loadConfig() |
70 | { | 70 | { |
71 | /* | 71 | /* |
72 | * the name of the last used dictionary | 72 | * the name of the last used dictionary |
73 | */ | 73 | */ |
74 | QString lastname; | 74 | QString lastname; |
75 | 75 | ||
76 | Config cfg ( "odict" ); | 76 | Config cfg ( "odict" ); |
77 | cfg.setGroup( "generalsettings" ); | 77 | cfg.setGroup( "generalsettings" ); |
78 | casesens = cfg.readEntry( "casesens" ).toInt(); | 78 | casesens = cfg.readEntry( "casesens" ).toInt(); |
79 | regexp = cfg.readEntry( "regexp" ).toInt(); | ||
80 | 79 | ||
81 | QString lastDict = cfg.readEntry( "lastdict" ); | 80 | QString lastDict = cfg.readEntry( "lastdict" ); |
82 | int i = 0, e = 0; | 81 | int i = 0, e = 0; |
83 | 82 | ||
84 | QStringList groupListCfg = cfg.groupList().grep( "Method_" ); | 83 | QStringList groupListCfg = cfg.groupList().grep( "Method_" ); |
85 | query_co->clear(); | 84 | query_co->clear(); |
86 | for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it ) | 85 | for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it ) |
87 | { | 86 | { |
88 | QString name; | 87 | QString name; |
89 | cfg.setGroup( *it ); | 88 | cfg.setGroup( *it ); |
90 | name = cfg.readEntry( "Name" ); | 89 | name = cfg.readEntry( "Name" ); |
91 | query_co->insertItem( name ); | 90 | query_co->insertItem( name ); |
@@ -118,25 +117,24 @@ void ODict::lookupLanguageNames( QString dictname ) | |||
118 | { | 117 | { |
119 | Config cfg ( "odict" ); | 118 | Config cfg ( "odict" ); |
120 | cfg.setGroup( "Method_"+dictname ); | 119 | cfg.setGroup( "Method_"+dictname ); |
121 | top_name_content = cfg.readEntry( "Lang1" ); | 120 | top_name_content = cfg.readEntry( "Lang1" ); |
122 | bottom_name_content = cfg.readEntry( "Lang2" ); | 121 | bottom_name_content = cfg.readEntry( "Lang2" ); |
123 | } | 122 | } |
124 | 123 | ||
125 | void ODict::saveConfig() | 124 | void ODict::saveConfig() |
126 | { | 125 | { |
127 | Config cfg ( "odict" ); | 126 | Config cfg ( "odict" ); |
128 | cfg.setGroup( "generalsettings" ); | 127 | cfg.setGroup( "generalsettings" ); |
129 | cfg.writeEntry( "casesens" , casesens ); | 128 | cfg.writeEntry( "casesens" , casesens ); |
130 | cfg.writeEntry( "regexp" , regexp ); | ||
131 | cfg.writeEntry( "lastdict" , query_co->currentText() ); | 129 | cfg.writeEntry( "lastdict" , query_co->currentText() ); |
132 | } | 130 | } |
133 | 131 | ||
134 | void ODict::slotStartQuery() | 132 | void ODict::slotStartQuery() |
135 | { | 133 | { |
136 | QString querystring = query_le->text(); | 134 | QString querystring = query_le->text(); |
137 | if ( !querystring.isEmpty() ) | 135 | if ( !querystring.isEmpty() ) |
138 | { | 136 | { |
139 | /* | 137 | /* |
140 | * if the user has not yet defined a dictionary | 138 | * if the user has not yet defined a dictionary |
141 | */ | 139 | */ |
142 | if ( !query_co->currentText() ) | 140 | if ( !query_co->currentText() ) |
@@ -176,31 +174,24 @@ void ODict::slotSettings() | |||
176 | } | 174 | } |
177 | 175 | ||
178 | void ODict::slotSetParameter( int count ) | 176 | void ODict::slotSetParameter( int count ) |
179 | { | 177 | { |
180 | if ( count == 0 ) | 178 | if ( count == 0 ) |
181 | { | 179 | { |
182 | if ( casesens ) | 180 | if ( casesens ) |
183 | casesens = false; | 181 | casesens = false; |
184 | else | 182 | else |
185 | casesens = true; | 183 | casesens = true; |
186 | } | 184 | } |
187 | 185 | ||
188 | if ( count == 1 ) | ||
189 | { | ||
190 | if ( regexp ) | ||
191 | regexp = false; | ||
192 | else | ||
193 | regexp = true; | ||
194 | } | ||
195 | saveConfig(); | 186 | saveConfig(); |
196 | } | 187 | } |
197 | 188 | ||
198 | void ODict::slotMethodChanged( const QString& methodnumber ) | 189 | void ODict::slotMethodChanged( const QString& methodnumber ) |
199 | { | 190 | { |
200 | activated_name = methodnumber; | 191 | activated_name = methodnumber; |
201 | 192 | ||
202 | if ( activated_name != ding->loadedDict() ) | 193 | if ( activated_name != ding->loadedDict() ) |
203 | { | 194 | { |
204 | ding->loadDict(activated_name); | 195 | ding->loadDict(activated_name); |
205 | 196 | ||
206 | lookupLanguageNames( activated_name ); | 197 | lookupLanguageNames( activated_name ); |
@@ -213,18 +204,17 @@ void ODict::setupMenus() | |||
213 | { | 204 | { |
214 | menu = new QMenuBar( this ); | 205 | menu = new QMenuBar( this ); |
215 | 206 | ||
216 | settings = new QPopupMenu( menu ); | 207 | settings = new QPopupMenu( menu ); |
217 | setting_a = new QAction(tr( "Configuration" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); | 208 | setting_a = new QAction(tr( "Configuration" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); |
218 | connect( setting_a, SIGNAL( activated() ), this, SLOT( slotSettings() ) ); | 209 | connect( setting_a, SIGNAL( activated() ), this, SLOT( slotSettings() ) ); |
219 | setting_a->addTo( settings ); | 210 | setting_a->addTo( settings ); |
220 | setting_b = new QAction(tr( "Searchmethods" ), Resource::loadPixmap( "edit" ), QString::null, 0, this, 0 ); | 211 | setting_b = new QAction(tr( "Searchmethods" ), Resource::loadPixmap( "edit" ), QString::null, 0, this, 0 ); |
221 | 212 | ||
222 | parameter = new QPopupMenu( menu ); | 213 | parameter = new QPopupMenu( menu ); |
223 | connect( parameter, SIGNAL( activated( int ) ), this, SLOT( slotSetParameter( int ) ) ); | 214 | connect( parameter, SIGNAL( activated( int ) ), this, SLOT( slotSetParameter( int ) ) ); |
224 | parameter->insertItem( tr( "C&ase sensitive" ), 0 ,0 ); | 215 | parameter->insertItem( tr( "C&ase sensitive" ), 0 ,0 ); |
225 | parameter->insertItem( tr( "Allow ®. expressions" ), 2 ); | ||
226 | parameter->insertSeparator(); | 216 | parameter->insertSeparator(); |
227 | 217 | ||
228 | menu->insertItem( tr( "Settings" ) , settings ); | 218 | menu->insertItem( tr( "Settings" ) , settings ); |
229 | menu->insertItem( tr( "Parameter" ) , parameter ); | 219 | menu->insertItem( tr( "Parameter" ) , parameter ); |
230 | } | 220 | } |
diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h index 9c037ea..be2a532 100644 --- a/noncore/apps/odict/odict.h +++ b/noncore/apps/odict/odict.h | |||
@@ -40,25 +40,25 @@ class ODict : public QMainWindow | |||
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 | bool casesens, completewords, regexp; | 52 | bool casesens, completewords; |
53 | 53 | ||
54 | void loadConfig(); | 54 | void loadConfig(); |
55 | void saveConfig(); | 55 | void saveConfig(); |
56 | 56 | ||
57 | QString activated_name; | 57 | QString activated_name; |
58 | QLabel *bottom_name, | 58 | QLabel *bottom_name, |
59 | *top_name; | 59 | *top_name; |
60 | 60 | ||
61 | QString top_name_content, bottom_name_content; | 61 | QString top_name_content, bottom_name_content; |
62 | 62 | ||
63 | void lookupLanguageNames( QString ); | 63 | void lookupLanguageNames( QString ); |
64 | 64 | ||
diff --git a/noncore/apps/odict/odict.pro b/noncore/apps/odict/odict.pro index 427a5c6..82f6a41 100644 --- a/noncore/apps/odict/odict.pro +++ b/noncore/apps/odict/odict.pro | |||
@@ -1,19 +1,19 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on debug | 2 | CONFIG = qt warn_on debug |
3 | #CONFIG = qt warn_on release | 3 | #CONFIG = qt warn_on release |
4 | HEADERS = odict.h \ | 4 | HEADERS = odict.h \ |
5 | searchmethoddlg.h \ | 5 | searchmethoddlg.h \ |
6 | configdlg.h \ | 6 | configdlg.h \ |
7 | dingwidget.h \ | 7 | dingwidget.h |
8 | 8 | ||
9 | SOURCES = main.cpp \ | 9 | SOURCES = main.cpp \ |
10 | odict.cpp \ | 10 | odict.cpp \ |
11 | searchmethoddlg.cpp \ | 11 | searchmethoddlg.cpp \ |
12 | configdlg.cpp \ | 12 | configdlg.cpp \ |
13 | dingwidget.cpp | 13 | dingwidget.cpp |
14 | INCLUDEPATH += $(OPIEDIR)/include | 14 | INCLUDEPATH += $(OPIEDIR)/include |
15 | DEPENDPATH += $(OPIEDIR)/include | 15 | DEPENDPATH += $(OPIEDIR)/include |
16 | LIBS += -lqpe -lstdc++ -lopie | 16 | LIBS += -lqpe -lstdc++ -lopie |
17 | TARGET = odict | 17 | TARGET = odict |
18 | DESTDIR = $(OPIEDIR)/bin | 18 | DESTDIR = $(OPIEDIR)/bin |
19 | 19 | ||
diff --git a/noncore/apps/odict/opie-odict.control b/noncore/apps/odict/opie-odict.control index 2fa731f..f684716 100644 --- a/noncore/apps/odict/opie-odict.control +++ b/noncore/apps/odict/opie-odict.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-odict | 1 | Package: opie-odict |
2 | Files: bin/odict apps/Applications/odict.desktop pics/odict/odict.png | 2 | Files: bin/odict apps/Applications/odict.desktop pics/odict/odict.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: applications | 4 | Section: applications |
5 | Maintainer: Carsten Niehaus <cniehaus@handhelds.org> | 5 | Maintainer: Carsten Niehaus <cniehaus@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Dictionarylookupprogram | 8 | Description: Dictionarylookupprogram |
10 | Look up words :) | 9 | Look up words :) |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||