summaryrefslogtreecommitdiff
authorcniehaus <cniehaus>2003-05-02 22:10:18 (UTC)
committer cniehaus <cniehaus>2003-05-02 22:10:18 (UTC)
commite83acc761bfe83ccd80b8ef6ab1275ee5c26e14f (patch) (unidiff)
tree6211385225d342dc9062615f080d5764d7251beb
parentadefcec2af37482266dbbd0e56b7e57f483c0540 (diff)
downloadopie-e83acc761bfe83ccd80b8ef6ab1275ee5c26e14f.zip
opie-e83acc761bfe83ccd80b8ef6ab1275ee5c26e14f.tar.gz
opie-e83acc761bfe83ccd80b8ef6ab1275ee5c26e14f.tar.bz2
265 lines diff :) mostly markupstuff. But also one bug less
Diffstat (more/less context) (show 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.cpp27
-rw-r--r--noncore/apps/odict/odict.h5
5 files changed, 31 insertions, 14 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
@@ -68,7 +68,7 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
68 68
69void ConfigDlg::writeEntries() 69void ConfigDlg::writeEntries()
70{ 70{
71 qDebug( "richtig beendet" ); 71 //XXX wozu gibt es diese Methode?
72} 72}
73 73
74void ConfigDlg::slotNewMethod() 74void ConfigDlg::slotNewMethod()
@@ -76,12 +76,10 @@ void ConfigDlg::slotNewMethod()
76 SearchMethodDlg dlg( this, "SearchMethodDlg", true ); 76 SearchMethodDlg dlg( this, "SearchMethodDlg", true );
77 if ( dlg.exec() == QDialog::Accepted ) 77 if ( dlg.exec() == QDialog::Accepted )
78 { 78 {
79 //if ( !dlg.nameLE->text() ) return; //XXX
80 dlg.saveItem(); 79 dlg.saveItem();
81 QListViewItem *item = new QListViewItem( list ); 80 QListViewItem *item = new QListViewItem( list );
82 item->setText( 0 , dlg.nameLE->text() ); 81 item->setText( 0 , dlg.nameLE->text() );
83 } 82 }
84 else qDebug( "SearchMethodDlg abgebrochen" );
85} 83}
86 84
87void ConfigDlg::slotChangeMethod() 85void ConfigDlg::slotChangeMethod()
@@ -91,14 +89,11 @@ void ConfigDlg::slotChangeMethod()
91 SearchMethodDlg dlg( this, "SearchMethodDlg", true, list->selectedItem()->text( 0 ) ); 89 SearchMethodDlg dlg( this, "SearchMethodDlg", true, list->selectedItem()->text( 0 ) );
92 if ( dlg.exec() == QDialog::Accepted ) 90 if ( dlg.exec() == QDialog::Accepted )
93 { 91 {
94 //if ( !dlg.nameLE->text() ) return; //XXX geht vielleich nicht
95 dlg.saveItem(); 92 dlg.saveItem();
96 QListViewItem *item = list->selectedItem(); 93 QListViewItem *item = list->selectedItem();
97 item->setText( 0 , dlg.nameLE->text() ); 94 item->setText( 0 , dlg.nameLE->text() );
98 } 95 }
99 else qDebug( "SearchMethodDlg abgebrochen" );
100 } 96 }
101 else qDebug( "kein item angewählt" );
102} 97}
103 98
104void ConfigDlg::slotDeleteMethod() 99void ConfigDlg::slotDeleteMethod()
@@ -112,7 +107,6 @@ void ConfigDlg::slotDeleteMethod()
112 107
113 list->takeItem( list->selectedItem() ); 108 list->takeItem( list->selectedItem() );
114 } 109 }
115 else qDebug("no item selected");
116} 110}
117 111
118void ConfigDlg::loadSearchMethodNames() 112void ConfigDlg::loadSearchMethodNames()
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
@@ -89,6 +89,8 @@ void DingWidget::loadValues()
89 Config cfg( "odict" ); 89 Config cfg( "odict" );
90 cfg.setGroup( "Method_" + methodname ); 90 cfg.setGroup( "Method_" + methodname );
91 trenner = cfg.readEntry( "Seperator" ); 91 trenner = cfg.readEntry( "Seperator" );
92 lang1_name = cfg.readEntry( "Lang1" );
93 lang2_name = cfg.readEntry( "Lang2" );
92} 94}
93 95
94BroswerContent DingWidget::setText( QString word ) 96BroswerContent DingWidget::setText( QString word )
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
@@ -31,6 +31,9 @@ class DingWidget
31 void setDict( QString ); 31 void setDict( QString );
32 void loadValues(); 32 void loadValues();
33 33
34 QString lang1_name,
35 lang2_name;
36
34 private: 37 private:
35 BroswerContent parseInfo(); 38 BroswerContent parseInfo();
36 39
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
@@ -46,13 +46,16 @@ ODict::ODict() : QMainWindow()
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 ); query_label->show(); 49 QLabel* query_label = new QLabel( tr( "Query:" ) , hbox );
50 query_label->show();
50 query_le = new QLineEdit( hbox ); 51 query_le = new QLineEdit( hbox );
51 query_co = new QComboBox( hbox ); 52 query_co = new QComboBox( hbox );
52 connect( query_co , SIGNAL( activated(int) ), this, SLOT( slotMethodChanged(int) ) ); 53 connect( query_co , SIGNAL( activated(const QString&) ), this, SLOT( slotMethodChanged(const QString&) ) );
53 ok_button = new QPushButton( tr( "&Ok" ), hbox ); 54 ok_button = new QPushButton( tr( "&Ok" ), hbox );
54 connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) ); 55 connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) );
56 top_name = new QLabel( vbox );
55 browser_top = new QTextBrowser( vbox ); 57 browser_top = new QTextBrowser( vbox );
58 bottom_name = new QLabel( vbox );
56 browser_bottom = new QTextBrowser( vbox ); 59 browser_bottom = new QTextBrowser( vbox );
57 60
58 ding = new DingWidget(); 61 ding = new DingWidget();
@@ -78,7 +81,7 @@ void ODict::loadConfig()
78 cfg.setGroup( *it ); 81 cfg.setGroup( *it );
79 query_co->insertItem( cfg.readEntry( "Name" ) ); 82 query_co->insertItem( cfg.readEntry( "Name" ) );
80 } 83 }
81 slotMethodChanged( 1 ); //FIXME: this line should not contain a integer 84 //XXXslotMethodChanged( "1" ); //FIXME: this line should not contain a integer
82} 85}
83 86
84 87
@@ -94,6 +97,8 @@ void ODict::saveConfig()
94 97
95void ODict::slotStartQuery() 98void ODict::slotStartQuery()
96{ 99{
100 if ( !query_le->text( ).isEmpty() )
101 {
97 /* 102 /*
98 * if the user has not yet defined a dictionary 103 * if the user has not yet defined a dictionary
99 */ 104 */
@@ -122,6 +127,8 @@ void ODict::slotStartQuery()
122 ding->setCaseSensitive( casesens ); 127 ding->setCaseSensitive( casesens );
123 ding->setCompleteWord( completewords ); 128 ding->setCompleteWord( completewords );
124 ding->setDict( activated_name ); 129 ding->setDict( activated_name );
130 top_name->setText( ding->lang1_name );
131 bottom_name->setText( ding->lang2_name );
125 132
126 if ( activated_name != ding->loadedDict() ) 133 if ( activated_name != ding->loadedDict() )
127 ding->loadDict(activated_name); 134 ding->loadDict(activated_name);
@@ -131,6 +138,7 @@ void ODict::slotStartQuery()
131 browser_top->setText( test.top ); 138 browser_top->setText( test.top );
132 browser_bottom->setText( test.bottom ); 139 browser_bottom->setText( test.bottom );
133} 140}
141}
134 142
135 143
136void ODict::slotSetErrorcount( int count ) 144void ODict::slotSetErrorcount( int count )
@@ -146,7 +154,6 @@ void ODict::slotSettings()
146 dlg.writeEntries(); 154 dlg.writeEntries();
147 loadConfig(); 155 loadConfig();
148 } 156 }
149 else qDebug( "abgebrochen" );
150} 157}
151 158
152void ODict::slotSetParameter( int count ) 159void ODict::slotSetParameter( int count )
@@ -176,9 +183,17 @@ void ODict::slotSetParameter( int count )
176 else qWarning( "ERROR" ); 183 else qWarning( "ERROR" );
177} 184}
178 185
179void ODict::slotMethodChanged( int /*methodnumber*/ ) 186void ODict::slotMethodChanged( const QString& methodnumber )
180{ 187{
181 activated_name = query_co->currentText(); 188 activated_name = methodnumber;
189
190 if ( activated_name != ding->loadedDict() )
191 ding->loadDict(activated_name);
192
193 top_name->setText( ding->lang1_name );
194 top_name->setAlignment( AlignHCenter );
195 bottom_name->setText( ding->lang2_name );
196 bottom_name->setAlignment( AlignHCenter );
182} 197}
183 198
184void ODict::setupMenus() 199void ODict::setupMenus()
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
@@ -9,6 +9,7 @@
9 9
10#include <qmainwindow.h> 10#include <qmainwindow.h>
11 11
12class QLabel;
12class QVBox; 13class QVBox;
13class QPopupMenu; 14class QPopupMenu;
14class QMenuBar; 15class QMenuBar;
@@ -55,11 +56,13 @@ class ODict : public QMainWindow
55 void saveConfig(); 56 void saveConfig();
56 57
57 QString activated_name; 58 QString activated_name;
59 QLabel *bottom_name,
60 *top_name;
58 61
59 private slots: 62 private slots:
60 void slotStartQuery(); 63 void slotStartQuery();
61 void slotSetErrorcount( int ); 64 void slotSetErrorcount( int );
62 void slotSettings(); 65 void slotSettings();
63 void slotSetParameter( int ); 66 void slotSetParameter( int );
64 void slotMethodChanged( int ); 67 void slotMethodChanged( const QString& );
65}; 68};