diff options
| author | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-02 14:23:19 +0100 |
|---|---|---|
| committer | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-02 14:23:19 +0100 |
| commit | ed2b6731ab373ac335fde87af177351facbd2f15 (patch) | |
| tree | 81cc3d45c8c30aceadb4f597be819dc2863a3a3a /opensuse/core/tdelibs/kfile-beagle.diff | |
| parent | 021036598a306d8cf7204d6d62ff090278f7ecf1 (diff) | |
| parent | 5f93960dbb108c2c6d09964d1ee0d2e390b1498c (diff) | |
| download | tde-packaging-ed2b6731ab373ac335fde87af177351facbd2f15.tar.gz tde-packaging-ed2b6731ab373ac335fde87af177351facbd2f15.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
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 ) |