Hello community,
here is the log from the commit of package kerry
checked in at Thu Oct 19 13:38:47 CEST 2006.
--------
--- KDE/kerry/kerry.changes 2006-10-16 12:27:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/kerry/kerry.changes 2006-10-18 16:13:30.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Oct 18 16:13:04 CEST 2006 - stbinner@suse.de
+
+- update to svn version:
+ * smaller minimum height
+ * add dcop search call with scope for Kickoff
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kerry.spec ++++++
--- /var/tmp/diff_new_pack.8V6dQc/_old 2006-10-19 13:38:11.000000000 +0200
+++ /var/tmp/diff_new_pack.8V6dQc/_new 2006-10-19 13:38:11.000000000 +0200
@@ -12,12 +12,12 @@
Name: kerry
BuildRequires: kdebase3-devel libbeagle-devel
-License: GPL
+License: GNU General Public License (GPL) - all versions
Group: System/GUI/KDE
Summary: Desktop search tool
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Version: 0.1.91
-Release: 9
+Release: 11
Source: %{name}-%{version}.tar.bz2
Patch: sortbytype.diff
Patch1: svn.diff
@@ -76,6 +76,10 @@
/opt/kde3/shutdown/beagled-shutdown.sh
%changelog -n kerry
+* Wed Oct 18 2006 - stbinner@suse.de
+- update to svn version:
+ * smaller minimum height
+ * add dcop search call with scope for Kickoff
* Mon Oct 16 2006 - stbinner@suse.de
- update to svn version:
* OR, - and "" for non-Beagle searches/path name filtering
++++++ svn.diff ++++++
--- /var/tmp/diff_new_pack.8V6dQc/_old 2006-10-19 13:38:11.000000000 +0200
+++ /var/tmp/diff_new_pack.8V6dQc/_new 2006-10-19 13:38:11.000000000 +0200
@@ -1,7 +1,7 @@
Index: src/beaglesearch.cpp
===================================================================
--- src/beaglesearch.cpp (revision 586153)
-+++ src/beaglesearch.cpp (revision 595961)
++++ src/beaglesearch.cpp (revision 596791)
@@ -451,6 +451,6 @@
g_main_loop_quit (client->main_loop);
@@ -13,7 +13,7 @@
Index: src/query.cpp
===================================================================
--- src/query.cpp (revision 0)
-+++ src/query.cpp (revision 595961)
++++ src/query.cpp (revision 596791)
@@ -0,0 +1,136 @@
+/*****************************************************************
+
@@ -151,10 +151,22 @@
+
+ return false;
+}
+Index: src/dcopinterface.h
+===================================================================
+--- src/dcopinterface.h (revision 586153)
++++ src/dcopinterface.h (revision 596791)
+@@ -29,6 +29,7 @@
+ k_dcop:
+ virtual ASYNC showSearchDialog() = 0;
+ virtual ASYNC search(const QString&) = 0;
++ virtual ASYNC search(const QString&, const QString&) = 0;
+ };
+
+ #endif // DCOPINTERFACE_H
Index: src/kerry.desktop
===================================================================
--- src/kerry.desktop (revision 586153)
-+++ src/kerry.desktop (revision 595961)
++++ src/kerry.desktop (revision 596791)
@@ -6,6 +6,7 @@
GenericName[br]=Klask ar vurev
GenericName[cs]=Vyhledávání v počítači
@@ -163,10 +175,18 @@
GenericName[es]=Búsqueda de escritorio
GenericName[ga]=Cuardach Deisce
GenericName[gl]=Procuras no Escritório
+@@ -16,6 +17,7 @@
+ GenericName[pt]=Pesquisa no Ambiente de Trabalho
+ GenericName[sk]=Vyhladávanie na pracovnej ploche
+ GenericName[sv]=Skrivbordssökning
++GenericName[th]=โปรแกรมค้นหาภายในเครื่อง
+ GenericName[zh_CN]=桌面搜索
+ Exec=kerry --show-searchdialog
+ Icon=kerry
Index: src/searchdlg_layout.ui
===================================================================
--- src/searchdlg_layout.ui (revision 586153)
-+++ src/searchdlg_layout.ui (revision 595961)
++++ src/searchdlg_layout.ui (revision 596791)
@@ -8,8 +8,8 @@
<rect>
<x>0</x>
@@ -1069,7 +1089,7 @@
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
-+ <height>80</height>
++ <height>1</height>
+ </size>
+ </property>
+ </spacer>
@@ -1219,7 +1239,7 @@
Index: src/kerryapp.cpp
===================================================================
--- src/kerryapp.cpp (revision 586153)
-+++ src/kerryapp.cpp (revision 595961)
++++ src/kerryapp.cpp (revision 596791)
@@ -46,6 +46,7 @@
#include
@@ -1283,7 +1303,7 @@
Index: src/searchdlg.h
===================================================================
--- src/searchdlg.h (revision 586153)
-+++ src/searchdlg.h (revision 595961)
++++ src/searchdlg.h (revision 596791)
@@ -23,6 +23,7 @@
#include
#include "kerryapp.h"
@@ -1292,7 +1312,15 @@
#include
#include
#include
-@@ -110,7 +111,7 @@
+@@ -75,6 +76,7 @@
+
+ public slots:
+ void search(const QString& text);
++ void search(const QString& text, const QString& scope);
+ void showSearchDialog();
+
+ protected:
+@@ -110,7 +112,7 @@
private:
BeagleSearch* beagle_search;
@@ -1301,7 +1329,7 @@
QPtrList<BeagleSearch> toclean_client_list;
QMutex toclean_list_mutex;
-@@ -143,7 +144,6 @@
+@@ -143,7 +145,6 @@
QString takeProperty( const QString& property, QStringList& propertyList);
QDateTime datetimeFromString( const QString& );
@@ -1312,7 +1340,7 @@
Index: src/kerry.autostart.desktop
===================================================================
--- src/kerry.autostart.desktop (revision 586153)
-+++ src/kerry.autostart.desktop (revision 595961)
++++ src/kerry.autostart.desktop (revision 596791)
@@ -6,6 +6,7 @@
GenericName[br]=Klask ar vurev
GenericName[cs]=Vyhledávání v počítači
@@ -1321,10 +1349,18 @@
GenericName[es]=Búsqueda de escritorio
GenericName[ga]=Cuardach Deisce
GenericName[gl]=Procuras no Escritório
+@@ -16,6 +17,7 @@
+ GenericName[pt]=Pesquisa no Ambiente de Trabalho
+ GenericName[sk]=Vyhladávanie na pracovnej ploche
+ GenericName[sv]=Skrivbordssökning
++GenericName[th]=โปรแกรมค้นหาภายในเครื่อง
+ GenericName[zh_CN]=桌面搜索
+ Exec=kerry
+ Icon=kerry
Index: src/beagled.desktop
===================================================================
--- src/beagled.desktop (revision 586153)
-+++ src/beagled.desktop (revision 595961)
++++ src/beagled.desktop (revision 596791)
@@ -6,6 +6,7 @@
Name[br]=Diaoul Beagle
Name[cs]=Démon Beagle
@@ -1333,10 +1369,18 @@
Name[es]=Demonio Beagle
Name[ga]=Deamhan Beagle
Name[gl]=Servizo Beagle
+@@ -14,6 +15,7 @@
+ Name[ka]=Beagle დემონი
+ Name[pt]=Servidor do Beagle
+ Name[sv]=Beagle-demon
++Name[th]=แดมอน Beagle
+ Name[zh_CN]=Beagle 守护进程
+ X-KDE-autostart-condition=kerryrc:Beagle:AutoStart:true
+ X-KDE-StartupNotify=false
Index: src/query.h
===================================================================
--- src/query.h (revision 0)
-+++ src/query.h (revision 595961)
++++ src/query.h (revision 596791)
@@ -0,0 +1,55 @@
+/*****************************************************************
+
@@ -1396,7 +1440,7 @@
Index: src/Makefile.am
===================================================================
--- src/Makefile.am (revision 586153)
-+++ src/Makefile.am (revision 595961)
++++ src/Makefile.am (revision 596791)
@@ -2,7 +2,7 @@
INCLUDES = $(all_includes) $(LIBBEAGLE_CFLAGS) $(GLIB_CFLAGS)
@@ -1418,7 +1462,7 @@
Index: src/searchdlg.cpp
===================================================================
--- src/searchdlg.cpp (revision 586153)
-+++ src/searchdlg.cpp (revision 595961)
++++ src/searchdlg.cpp (revision 596791)
@@ -71,7 +71,6 @@
g_type_init();
@@ -1452,7 +1496,48 @@
bookmarkManager = 0;
m_addressBook = 0;
-@@ -262,6 +261,11 @@
+@@ -193,18 +192,36 @@
+
+ void SearchDlg::search(const QString & search)
+ {
+-static QLabel* showSwitches[9] = {showEverything, showApplications, showContacts, showDocuments,
++ SearchDlg::search(search, "everything");
++}
++
++void SearchDlg::search(const QString & search, const QString &scope)
++{
++#define showSwitchesCount 9
++static QLabel* showSwitches[showSwitchesCount] = {showEverything, showApplications, showContacts, showDocuments,
+ showConversations, showImages, showMedia, showWebPages, showFilePathName};
++static QString nameSwitches[showSwitchesCount] = {"everything", "applications", "contacts", "documents",
++ "conversations", "images", "media", "webpages", "path"};
+
+ pending_showQuickTips=false;
+ showSearchDialog();
+- if (showSwitches[showMode]!=showEverything) {
++
++ QLabel* newShowLabel = showEverything;
++ ScopeType newShowMode = Everywhere;
++ for (int i=0; ifont();
+ f.setBold(false);
+ showSwitches[showMode]->setFont(f);
+- showMode = Everywhere;
++ showMode = newShowMode;
+ f.setBold(true);
+- showEverything->setFont(f);
++ newShowLabel->setFont(f);
+ }
+ editSearch->lineEdit()->setText(search);
+ this->search();
+@@ -262,6 +279,11 @@
void SearchDlg::slotClear()
{
@@ -1464,7 +1549,7 @@
displayOffset = 0;
stopPreview();
tableHits->clear();
-@@ -339,17 +343,17 @@
+@@ -339,17 +361,17 @@
void SearchDlg::search()
{
@@ -1486,7 +1571,7 @@
item->insertHeaderWidget(0,headerLabel);
item->icon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_critical", KIcon::NoGroup, KIcon::SizeLarge));
-@@ -395,7 +399,7 @@
+@@ -395,7 +417,7 @@
searchAddressbook();
@@ -1495,7 +1580,7 @@
beagle_search->start();
}
-@@ -469,6 +473,9 @@
+@@ -469,6 +491,9 @@
}
} else if (e->type () == KILLME) {
BeagleSearch *client = (BeagleSearch *) e->data ();
@@ -1505,7 +1590,7 @@
if (client->finished ())
delete client;
else {
-@@ -929,7 +936,7 @@
+@@ -929,7 +954,7 @@
for (BeagleSearch::BeagleResultList::ConstIterator it = items.begin(); it != items.end(); ++it) {
BeagleSearch::beagle_result_struct* result = (*it);
if ((*(result->uri)).find(encodingRegexp)>0) {
@@ -1514,7 +1599,7 @@
*(result->uri)=kurl.url();
}
if (!checkUriInResults(*(result->uri))) {
-@@ -974,7 +981,7 @@
+@@ -974,7 +999,7 @@
show = ( result->tilegroup == BeagleSearch::Website);
break;
case FilePathName:
@@ -1523,7 +1608,7 @@
default:
break;
}
-@@ -1068,9 +1075,9 @@
+@@ -1068,9 +1093,9 @@
KURL kuri = KURL(item->uri());
QString uri = kuri.path();
if (mimetype=="beagle/x-kopete-log")
@@ -1535,7 +1620,7 @@
if (!proc->start()) {
// KMessageBox::error(0,i18n("Could not start instant message log viewer."));
if (mimetype=="beagle/x-kopete-log")
-@@ -1092,7 +1099,7 @@
+@@ -1092,7 +1117,7 @@
else if (item->uri().startsWith("note:/")) {
KProcess *proc = new KProcess;
*proc << "tomboy";
@@ -1544,7 +1629,7 @@
if (!proc->start()) {
KMessageBox::error(0,i18n("Could not start Tomboy."));
return;
-@@ -1230,7 +1237,7 @@
+@@ -1230,7 +1255,7 @@
tableHits->clear();
HitWidget* item = new HitWidget(QString::null, QString::null);
QLabel *headerLabel = new QLabel(item);
@@ -1553,7 +1638,7 @@
item->insertHeaderWidget(0,headerLabel);
item->icon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeLarge));
-@@ -1394,8 +1401,6 @@
+@@ -1394,8 +1419,6 @@
void SearchDlg::searchProgramList(QString relPath)
{
@@ -1562,7 +1647,7 @@
KServiceGroup::Ptr group = KServiceGroup::group(relPath);
if (!group || !group->isValid())
return;
-@@ -1416,9 +1421,9 @@
+@@ -1416,9 +1439,9 @@
} else if(e->isType(KST_KService)) {
KService::Ptr s(static_cast(e));
if(s->type() == "Application" && !s->noDisplay() && !checkUriInResults(locate("apps", s->desktopEntryPath()))) {
@@ -1575,7 +1660,7 @@
continue;
BeagleSearch::beagle_result_struct *result = new BeagleSearch::beagle_result_struct;
-@@ -1451,14 +1456,12 @@
+@@ -1451,14 +1474,12 @@
void SearchDlg::searchBookmarks(KBookmarkGroup group)
{
@@ -1591,7 +1676,7 @@
bookmark = group.next(bookmark);
continue;
}
-@@ -1489,11 +1492,9 @@
+@@ -1489,11 +1510,9 @@
if (!m_addressBook)
m_addressBook = KABC::StdAddressBook::self( false );
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org