diff options
| author | Robert Xu <rxu@linux-zdwj.site> | 2012-02-01 00:31:59 -0500 |
|---|---|---|
| committer | Robert Xu <rxu@linux-zdwj.site> | 2012-02-01 00:31:59 -0500 |
| commit | f599f39717d771b8b7a2aff006cda6c31e8b12da (patch) | |
| tree | f601e3c0303a193cda6f8c6f956619dda9673c70 /opensuse/core/tdelibs/kfile-beagle.diff | |
| parent | ead369ac94473139a2320a1c90cda64dd887b94a (diff) | |
| parent | 27c9e783c6283f8916ebee3a23c6d1ba909a5126 (diff) | |
| download | tde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.tar.gz tde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.zip | |
Merge branch 'suse'
Diffstat (limited to 'opensuse/core/tdelibs/kfile-beagle.diff')
| -rw-r--r-- | opensuse/core/tdelibs/kfile-beagle.diff | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/opensuse/core/tdelibs/kfile-beagle.diff b/opensuse/core/tdelibs/kfile-beagle.diff new file mode 100644 index 000000000..467e68ed4 --- /dev/null +++ b/opensuse/core/tdelibs/kfile-beagle.diff @@ -0,0 +1,42 @@ +Index: kio/kfile/kurlbar.cpp +=================================================================== +--- kio/kfile/kurlbar.cpp.orig ++++ kio/kfile/kurlbar.cpp +@@ -605,8 +605,19 @@ void KURLBar::readItem( int i, KConfig * + if ( !url.isValid() || !KProtocolInfo::isKnownProtocol( url )) + return; // nothing we could do. + ++ QString description = config->readEntry( QString("Description_") + number ); ++ ++ if (description.isEmpty() && url.protocol()=="beagle") { ++ KIO::UDSEntry uds; ++ const KURL kurl("beagle:?beagled-status"); ++ if (!KIO::NetAccess::stat(kurl, uds)) ++ return; ++ ++ description = i18n("Desktop Search"); ++ } ++ + insertItem( url, +- config->readEntry( QString("Description_") + number ), ++ description, + applicationLocal, + config->readEntry( QString("Icon_") + number ), + static_cast<KIcon::Group>( +Index: kio/kfile/kfiledialog.cpp +=================================================================== +--- kio/kfile/kfiledialog.cpp.orig ++++ kio/kfile/kfiledialog.cpp +@@ -1165,6 +1165,12 @@ void KFileDialog::urlEntered(const KURL& + d->pathCombo->setURL( url ); + } + ++ if (url.protocol()=="beagle" && url.path()=="/") { ++ d->pathCombo->setEditText("beagle:/<"+i18n("search term")+">"); ++ d->pathCombo->lineEdit()->setSelection(8,255); ++ d->pathCombo->setFocus(); ++ } ++ + locationEdit->blockSignals( true ); + locationEdit->setCurrentItem( 0 ); + if ( d->keepLocation ) |