author | tille <tille> | 2003-05-16 17:30:46 (UTC) |
---|---|---|
committer | tille <tille> | 2003-05-16 17:30:46 (UTC) |
commit | 23e56debf8c8b219c974137daad07e01f873fcad (patch) (unidiff) | |
tree | 003514e0135ca24e1778641df3b251df4e652d44 | |
parent | 076926e6c7fe5bfd52f9f42879a216885ccc2cd3 (diff) | |
download | opie-23e56debf8c8b219c974137daad07e01f873fcad.zip opie-23e56debf8c8b219c974137daad07e01f873fcad.tar.gz opie-23e56debf8c8b219c974137daad07e01f873fcad.tar.bz2 |
tr
-rw-r--r-- | core/pim/osearch/doclnkitem.cpp | 6 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/core/pim/osearch/doclnkitem.cpp b/core/pim/osearch/doclnkitem.cpp index a1d0384..56eb26a 100644 --- a/core/pim/osearch/doclnkitem.cpp +++ b/core/pim/osearch/doclnkitem.cpp | |||
@@ -34,11 +34,11 @@ QString DocLnkItem::toRichText() | |||
34 | { | 34 | { |
35 | QString text; | 35 | QString text; |
36 | text += "<b><h3>" + _doc->name() + "</b></h3><br>"; | 36 | text += "<b><h3>" + _doc->name() + "</b></h3><br>"; |
37 | text += _doc->comment() + "<br>"; | 37 | text += _doc->comment() + "<br>"; |
38 | text += "File: " + _doc->file() + "<br>"; | 38 | text += QObject::tr("File: ") + _doc->file() + "<br>"; |
39 | text += "Link: " + _doc->linkFile() + "<br>"; | 39 | text += QObject::tr("Link: ") + _doc->linkFile() + "<br>"; |
40 | text += "Mimetype: " + _doc->type() + "<br>"; | 40 | text += QObject::tr("Mimetype: ") + _doc->type() + "<br>"; |
41 | if ( _doc->type().contains( "text" ) ){ | 41 | if ( _doc->type().contains( "text" ) ){ |
42 | text += "<br><br><hr><br>"; | 42 | text += "<br><br><hr><br>"; |
43 | QFile f(_doc->file()); | 43 | QFile f(_doc->file()); |
44 | if ( f.open(IO_ReadOnly) ) { | 44 | if ( f.open(IO_ReadOnly) ) { |
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp index adce926..2936b17 100644 --- a/core/pim/osearch/mainwindow.cpp +++ b/core/pim/osearch/mainwindow.cpp | |||
@@ -125,11 +125,9 @@ void MainWindow::makeMenu() | |||
125 | QPopupMenu *pop; | 125 | QPopupMenu *pop; |
126 | for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){ | 126 | for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){ |
127 | pop = s->popupMenu(); | 127 | pop = s->popupMenu(); |
128 | if (pop){ | 128 | if (pop){ |
129 | qDebug("inserting settings menu for %s",s->text(0).latin1()); | ||
130 | cfgMenu->insertItem( s->text(0), pop ); | 129 | cfgMenu->insertItem( s->text(0), pop ); |
131 | //connect( pop, SIGNAL( activated(int) ), SLOT( optionChanged(int) ) ); | ||
132 | } | 130 | } |
133 | } | 131 | } |
134 | 132 | ||
135 | 133 | ||
@@ -138,9 +136,8 @@ void MainWindow::makeMenu() | |||
138 | SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) ); | 136 | SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) ); |
139 | connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) ); | 137 | connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) ); |
140 | SearchAllAction->addTo( searchMenu ); | 138 | SearchAllAction->addTo( searchMenu ); |
141 | searchMenu->insertItem( tr( "Options" ), searchOptions ); | 139 | searchMenu->insertItem( tr( "Options" ), searchOptions ); |
142 | //connect( searchOptions, SIGNAL( activated(int) ), SLOT( optionChanged(int) ) ); | ||
143 | 140 | ||
144 | //SEARCH OPTIONS | 141 | //SEARCH OPTIONS |
145 | //actionWholeWordsOnly = new QAction( tr("Whole words only"),QString::null, 0, this, 0, true ); | 142 | //actionWholeWordsOnly = new QAction( tr("Whole words only"),QString::null, 0, this, 0, true ); |
146 | //actionWholeWordsOnly->addTo( searchOptions ); | 143 | //actionWholeWordsOnly->addTo( searchOptions ); |
@@ -182,20 +179,17 @@ void MainWindow::setCurrent(QListViewItem *item) | |||
182 | QIntDict<QString> acts = res->actions(); | 179 | QIntDict<QString> acts = res->actions(); |
183 | QButton *button; | 180 | QButton *button; |
184 | for (uint i = 0; i < acts.count(); i++){ | 181 | for (uint i = 0; i < acts.count(); i++){ |
185 | button = buttonGroupActions->find( i ); | 182 | button = buttonGroupActions->find( i ); |
186 | qDebug("action %i >%s<",i,acts[i]->latin1()); | ||
187 | if (!button) { | 183 | if (!button) { |
188 | qDebug("BUTTON"); | ||
189 | button = new QPushButton( detailsFrame ); | 184 | button = new QPushButton( detailsFrame ); |
190 | buttonLayout->addWidget( button, 0 ); | 185 | buttonLayout->addWidget( button, 0 ); |
191 | buttonGroupActions->insert( button, i); | 186 | buttonGroupActions->insert( button, i); |
192 | } | 187 | } |
193 | button->setText( *acts[i] ); | 188 | button->setText( *acts[i] ); |
194 | button->show(); | 189 | button->show(); |
195 | } | 190 | } |
196 | for (uint i = acts.count(); i < _buttonCount; i++){ | 191 | for (uint i = acts.count(); i < _buttonCount; i++){ |
197 | qDebug("remove button %i of %i",i, _buttonCount); | ||
198 | button = buttonGroupActions->find( i ); | 192 | button = buttonGroupActions->find( i ); |
199 | if (button) button->hide(); | 193 | if (button) button->hide(); |
200 | } | 194 | } |
201 | _buttonCount = acts.count(); | 195 | _buttonCount = acts.count(); |
@@ -263,7 +257,6 @@ void MainWindow::slotAction( int act ) | |||
263 | } | 257 | } |
264 | 258 | ||
265 | void MainWindow::optionChanged(int i) | 259 | void MainWindow::optionChanged(int i) |
266 | { | 260 | { |
267 | qDebug("optionChanged(%i)",i); | ||
268 | searchStringChanged(); | 261 | searchStringChanged(); |
269 | } | 262 | } |