-rw-r--r-- | noncore/apps/odict/main.cpp | 11 | ||||
-rw-r--r-- | noncore/apps/odict/odict.cpp | 34 | ||||
-rw-r--r-- | noncore/apps/odict/odict.h | 4 | ||||
-rw-r--r-- | noncore/apps/odict/odict.pro | 5 |
4 files changed, 23 insertions, 31 deletions
diff --git a/noncore/apps/odict/main.cpp b/noncore/apps/odict/main.cpp index c68253f..0642022 100644 --- a/noncore/apps/odict/main.cpp +++ b/noncore/apps/odict/main.cpp | |||
@@ -19,11 +19,6 @@ | |||
19 | #include <qpe/qpeapplication.h> | 19 | #include <qpe/qpeapplication.h> |
20 | #include <opie/oapplicationfactory.h> | ||
20 | #include "odict.h" | 21 | #include "odict.h" |
21 | 22 | ||
22 | int main(int argc, char **argv) | 23 | |
23 | { | 24 | OPIE_EXPORT_APP( OApplicationFactory<ODict> ) |
24 | QPEApplication app(argc, argv); | ||
25 | ODict *odict= new ODict(); | ||
26 | app.setMainWidget(odict); | ||
27 | odict->showMaximized(); | ||
28 | return app.exec(); | ||
29 | } | ||
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp index 010545e..9718c5c 100644 --- a/noncore/apps/odict/odict.cpp +++ b/noncore/apps/odict/odict.cpp | |||
@@ -38,6 +38,6 @@ | |||
38 | 38 | ||
39 | ODict::ODict() : QMainWindow() | 39 | ODict::ODict(QWidget* parent, const char* name, WFlags fl ) : QMainWindow(parent, name, fl ) |
40 | { | 40 | { |
41 | activated_name = QString::null; | 41 | activated_name = QString::null; |
42 | 42 | ||
43 | vbox = new QVBox( this ); | 43 | vbox = new QVBox( this ); |
@@ -47,3 +47,3 @@ ODict::ODict() : QMainWindow() | |||
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(); |
@@ -54,3 +54,3 @@ ODict::ODict() : QMainWindow() | |||
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 ); |
@@ -74,3 +74,3 @@ void ODict::loadConfig() | |||
74 | QString lastname; | 74 | QString lastname; |
75 | 75 | ||
76 | Config cfg ( "odict" ); | 76 | Config cfg ( "odict" ); |
@@ -81,3 +81,3 @@ void ODict::loadConfig() | |||
81 | int i = 0, e = 0; | 81 | int i = 0, e = 0; |
82 | 82 | ||
83 | QStringList groupListCfg = cfg.groupList().grep( "Method_" ); | 83 | QStringList groupListCfg = cfg.groupList().grep( "Method_" ); |
@@ -119,4 +119,4 @@ void ODict::lookupLanguageNames( QString dictname ) | |||
119 | cfg.setGroup( "Method_"+dictname ); | 119 | cfg.setGroup( "Method_"+dictname ); |
120 | top_name_content = cfg.readEntry( "Lang1" ); | 120 | top_name_content = cfg.readEntry( "Lang1" ); |
121 | bottom_name_content = cfg.readEntry( "Lang2" ); | 121 | bottom_name_content = cfg.readEntry( "Lang2" ); |
122 | } | 122 | } |
@@ -143,3 +143,3 @@ void ODict::slotStartQuery() | |||
143 | tr( "No dictionary defined" ), | 143 | tr( "No dictionary defined" ), |
144 | tr( "&Define one" ), | 144 | tr( "&Define one" ), |
145 | tr( "&Cancel" ), | 145 | tr( "&Cancel" ), |
@@ -147,3 +147,3 @@ void ODict::slotStartQuery() | |||
147 | 1 ) ) // Cancel choosen | 147 | 1 ) ) // Cancel choosen |
148 | { | 148 | { |
149 | case 0: | 149 | case 0: |
@@ -154,3 +154,3 @@ void ODict::slotStartQuery() | |||
154 | } | 154 | } |
155 | } | 155 | } |
156 | 156 | ||
@@ -159,3 +159,3 @@ void ODict::slotStartQuery() | |||
159 | */ | 159 | */ |
160 | ding->setCaseSensitive( casesens ); | 160 | ding->setCaseSensitive( casesens ); |
161 | 161 | ||
@@ -191,3 +191,3 @@ void ODict::slotMethodChanged( const QString& methodnumber ) | |||
191 | activated_name = methodnumber; | 191 | activated_name = methodnumber; |
192 | 192 | ||
193 | if ( activated_name != ding->loadedDict() ) | 193 | if ( activated_name != ding->loadedDict() ) |
@@ -195,3 +195,3 @@ void ODict::slotMethodChanged( const QString& methodnumber ) | |||
195 | ding->loadDict(activated_name); | 195 | ding->loadDict(activated_name); |
196 | 196 | ||
197 | lookupLanguageNames( activated_name ); | 197 | lookupLanguageNames( activated_name ); |
@@ -205,3 +205,3 @@ void ODict::setupMenus() | |||
205 | menu = new QMenuBar( this ); | 205 | menu = new QMenuBar( this ); |
206 | 206 | ||
207 | settings = new QPopupMenu( menu ); | 207 | settings = new QPopupMenu( menu ); |
@@ -211,3 +211,3 @@ void ODict::setupMenus() | |||
211 | 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 ); |
212 | 212 | ||
213 | parameter = new QPopupMenu( menu ); | 213 | parameter = new QPopupMenu( menu ); |
@@ -216,3 +216,3 @@ void ODict::setupMenus() | |||
216 | parameter->insertSeparator(); | 216 | parameter->insertSeparator(); |
217 | 217 | ||
218 | menu->insertItem( tr( "Settings" ) , settings ); | 218 | menu->insertItem( tr( "Settings" ) , settings ); |
diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h index be2a532..68a8f95 100644 --- a/noncore/apps/odict/odict.h +++ b/noncore/apps/odict/odict.h | |||
@@ -31,3 +31,3 @@ class ODict : public QMainWindow | |||
31 | public: | 31 | public: |
32 | ODict(); | 32 | ODict(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
33 | QVBox *vbox; | 33 | QVBox *vbox; |
@@ -36,3 +36,3 @@ class ODict : public QMainWindow | |||
36 | DingWidget *ding; | 36 | DingWidget *ding; |
37 | 37 | static QString appName() { return QString::fromLatin1("odict"); } | |
38 | private: | 38 | private: |
diff --git a/noncore/apps/odict/odict.pro b/noncore/apps/odict/odict.pro index 82f6a41..4ad287b 100644 --- a/noncore/apps/odict/odict.pro +++ b/noncore/apps/odict/odict.pro | |||
@@ -1,4 +1,2 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG = qt warn_on release quick-app |
2 | CONFIG = qt warn_on debug | ||
3 | #CONFIG = qt warn_on release | ||
4 | HEADERS = odict.h \ | 2 | HEADERS = odict.h \ |
@@ -17,3 +15,2 @@ LIBS += -lqpe -lstdc++ -lopie | |||
17 | TARGET = odict | 15 | TARGET = odict |
18 | DESTDIR = $(OPIEDIR)/bin | ||
19 | 16 | ||