Mailinglist Archive: opensuse-commit (1262 mails)

< Previous Next >
commit kdeaddons3
  • From: root@xxxxxxx (h_root)
  • Date: Sat, 2 Sep 2006 19:01:42 +0200 (CEST)
  • Message-id: <20060902170142.570A69527D@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package kdeaddons3
checked in at Sat Sep 2 19:01:42 CEST 2006.

--------
--- KDE/kdeaddons3/kdeaddons3.changes 2006-08-23 11:17:55.000000000 +0200
+++ kdeaddons3/kdeaddons3.changes 2006-09-01 17:31:34.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Sep 1 17:25:51 CEST 2006 - stbinner@xxxxxxx
+
+- improve permanent-searchbar.diff (synchronious check, other icon)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdeaddons3.spec ++++++
--- /var/tmp/diff_new_pack.apytHj/_old 2006-09-02 19:00:54.000000000 +0200
+++ /var/tmp/diff_new_pack.apytHj/_new 2006-09-02 19:00:54.000000000 +0200
@@ -20,7 +20,7 @@
Summary: Additional Modules for Kate, Kicker, Konqueror, and Noatun
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Version: 3.5.4
-Release: 2
+Release: 3
Url: http://www.kde.org
Requires: kdelibs3 >= %(rpm -q --queryformat '%{VERSION}' kdelibs3)
Source: kdeaddons-%{version}.tar.bz2
@@ -51,7 +51,7 @@
%package games
# usesubdirs atlantikdesigner
Version: 3.5.4
-Release: 3
+Release: 5
Provides: kdeaddons3 = %{version}-%{release}
Summary: Additional Modules for Atlantik
Group: System/GUI/KDE
@@ -73,7 +73,7 @@
Provides: kdeaddons3:/opt/kde3/share/apps/khtml/kpartplugins/plugin_babelfish.rc
Provides: kdeaddons3 = %{version}-%{release}
Version: 3.5.4
-Release: 3
+Release: 5
Summary: Konqueror Related Add-Ons
Group: Productivity/Networking/Web/Utilities

@@ -92,7 +92,7 @@
%package kontact
# usesubdirs kontact ksig
Version: 3.5.4
-Release: 3
+Release: 5
Requires: kdenetwork3-news
Provides: kdeaddons
Provides: kdeaddons3 = %{version}-%{release}
@@ -115,7 +115,7 @@
%package sound
# usesubdirs noatun-plugins
Version: 3.5.4
-Release: 3
+Release: 5
Provides: kdeaddons
Provides: kdeaddons3:/opt/kde3/bin/noatunsynaescope.bin
Provides: kdeaddons3 = %{version}-%{release}
@@ -135,7 +135,7 @@
%package kate
# usesubdirs kate
Version: 3.5.4
-Release: 3
+Release: 5
Provides: kdeaddons
Provides: kdeaddons3:/opt/kde3/bin/dcop_kate
Provides: kdeaddons3 = %{version}-%{release}
@@ -156,7 +156,7 @@
%package kicker
# usesubdirs kicker-applets
Version: 3.5.4
-Release: 3
+Release: 5
Provides: kdeaddons
Provides: kdeaddons3:/opt/kde3/share/apps/kicker/applets/ktimemon.desktop
Provides: kdeaddons3 = %{version}-%{release}
@@ -359,6 +359,8 @@
/opt/kde3/share/icons/*/*/*/ksig.*

%changelog -n kdeaddons3
+* Fri Sep 01 2006 - stbinner@xxxxxxx
+- improve permanent-searchbar.diff (synchronious check, other icon)
* Wed Aug 23 2006 - stbinner@xxxxxxx
- update 3_5_BRANCH.diff (Akregator and Kate plugin fixes)
* Sun Jul 23 2006 - coolo@xxxxxxx

++++++ permanent-searchbar.diff ++++++
--- /var/tmp/diff_new_pack.apytHj/_old 2006-09-02 19:00:54.000000000 +0200
+++ /var/tmp/diff_new_pack.apytHj/_new 2006-09-02 19:00:54.000000000 +0200
@@ -1,7 +1,5 @@
-Index: konq-plugins/dirfilter/dirfilterplugin.cpp
-===================================================================
---- konq-plugins/dirfilter/dirfilterplugin.cpp (revision 560806)
-+++ konq-plugins/dirfilter/dirfilterplugin.cpp (working copy)
+--- konq-plugins/dirfilter/dirfilterplugin.cpp 2006/09/01 14:56:08 1.1
++++ konq-plugins/dirfilter/dirfilterplugin.cpp 2006/09/01 15:22:09
@@ -19,6 +19,8 @@
#include <unistd.h>
#include <sys/types.h>
@@ -11,16 +9,15 @@
#include <qtimer.h>
#include <qapplication.h>
#include <qlabel.h>
-@@ -45,6 +47,8 @@
+@@ -45,6 +47,7 @@
#include <kstaticdeleter.h>
#include <kgenericfactory.h>
#include <kparts/browserextension.h>
-+#include <kio/jobclasses.h>
-+#include <kio/job.h>
++#include <kio/netaccess.h>

#include "dirfilterplugin.h"

-@@ -144,7 +148,10 @@
+@@ -144,7 +147,10 @@
DirFilterPlugin::DirFilterPlugin (QObject* parent, const char* name,
const QStringList&)
:KParts::Plugin (parent, name),
@@ -31,7 +28,7 @@
m_searchWidget(0)
{
m_part = ::qt_cast<KonqDirPart*>(parent);
-@@ -172,33 +179,30 @@
+@@ -172,33 +178,34 @@
QHBox *hbox = new QHBox(m_part->widget());
hbox->hide();

@@ -53,34 +50,39 @@
- m_searchWidget = new KIconViewSearchLine(hbox);
- static_cast<KIconViewSearchLine*>(m_searchWidget)->setIconView(static_cast<QIconView*>(m_part->scrollWidget()));
- }
+-
+-
+- if ( m_searchWidget )
+- {
+- QWhatsThis::add(m_searchWidget, i18n("Enter here a text which an item in the view must contain anywhere to be shown."));
+- connect(clear, SIGNAL(activated()), m_searchWidget, SLOT(clear()));
+- }
+ m_searchWidget = new SearchBarCombo(hbox, "search combo");
+ m_searchWidget->setDuplicatesEnabled(false);
+ m_searchWidget->setMaxCount(5);
+ m_searchWidget->setFixedWidth(180);
-
++
+ connect(m_searchWidget, SIGNAL(activated(const QString &)),
+ SLOT(startSearch(const QString &)));
+ connect(m_searchWidget, SIGNAL(iconClicked()), SLOT(showSelectionMenu()));
+ slotUseBeagle();

-- if ( m_searchWidget )
-- {
-- QWhatsThis::add(m_searchWidget, i18n("Enter here a text which an item in the view must contain anywhere to be shown."));
-- connect(clear, SIGNAL(activated()), m_searchWidget, SLOT(clear()));
-- }
--
KWidgetAction *filterAction = new KWidgetAction(hbox, i18n("Filter Field"),
0, 0, 0, actionCollection(), "toolbar_filter_field");
filterAction->setShortcutConfigurable(false);
+
-+ setIcon();
-+
-+ KIO::SimpleJob *job = KIO::stat("beagle:?beagled-status", FALSE);
-+ connect(job, SIGNAL(result(KIO::Job *)), SLOT(slotStatResult(KIO::Job *)));
++ KIO::UDSEntry uds;
++ const KURL kurl("beagle:?beagled-status");
++ if (!KIO::NetAccess::stat(kurl, uds)) {
++ m_beagled_running = false;
++ switchToFilter();
++ }
++ else
++ setIcon();
}

DirFilterPlugin::~DirFilterPlugin()
-@@ -206,6 +210,15 @@
+@@ -206,6 +213,15 @@
delete m_pFilterMenu;
}

@@ -96,7 +98,7 @@
void DirFilterPlugin::slotOpenURL ()
{
KURL url = m_part->url();
-@@ -218,12 +231,13 @@
+@@ -218,12 +234,13 @@
//Clears the hidden list which is by now outdated...
if (m_searchWidget)
{
@@ -112,7 +114,7 @@
}

m_pURL = url;
-@@ -485,6 +499,173 @@
+@@ -485,6 +502,162 @@
m_part->openURL (m_part->url());
}

@@ -125,7 +127,7 @@
+ hinttext = i18n("Filter This Folder");
+ }
+ else {
-+ m_searchIcon = SmallIcon("kerry");
++ m_searchIcon = SmallIcon("kio_beagle");
+ hinttext = i18n("Search Index");
+ }
+
@@ -154,7 +156,7 @@
+ if(!m_popupMenu)
+ {
+ m_popupMenu = new QPopupMenu(m_searchWidget, "search mode selection");
-+ m_popupMenu->insertItem(SmallIcon("kerry"), i18n("Search Index"), this, SLOT(slotUseBeagle()));
++ m_popupMenu->insertItem(SmallIcon("kio_beagle"), i18n("Search Index"), this, SLOT(slotUseBeagle()));
+ m_popupMenu->insertItem(SmallIcon("filter"), i18n("Filter This Folder"), this, SLOT(slotUseFilter()));
+ }
+ m_popupMenu->popup(m_searchWidget->mapToGlobal(QPoint(0, m_searchWidget->height() + 1)), 0);
@@ -196,17 +198,6 @@
+ setIcon();
+}
+
-+void DirFilterPlugin::slotStatResult(KIO::Job * job)
-+{
-+ if (job->error()) {
-+ kdDebug() << "no beagled running" << endl;
-+ m_beagled_running = false;
-+ switchToFilter();
-+ QFocusEvent fe( QEvent::FocusOut );
-+ QApplication::sendEvent( m_searchWidget->lineEdit(), &fe );
-+ }
-+}
-+
+SearchBarCombo::SearchBarCombo(QWidget *parent, const char *name) :
+ KHistoryCombo(parent, name),
+ m_pluginActive(true)
@@ -297,10 +288,8 @@
+ <Action name="toolbar_filter_field" />
</ToolBar>
</kpartplugin>
-Index: konq-plugins/dirfilter/dirfilterplugin.h
-===================================================================
---- konq-plugins/dirfilter/dirfilterplugin.h (revision 560806)
-+++ konq-plugins/dirfilter/dirfilterplugin.h (working copy)
+--- konq-plugins/dirfilter/dirfilterplugin.h 2006/09/01 14:56:10 1.1
++++ konq-plugins/dirfilter/dirfilterplugin.h 2006/09/01 15:19:26
@@ -27,10 +27,13 @@
#include <kfileitem.h>
#include <klibloader.h>
@@ -323,7 +312,7 @@

private slots:
void slotReset();
-@@ -119,14 +123,88 @@
+@@ -119,14 +123,87 @@
void slotItemSelected(int);
void slotItemRemoved(const KFileItem *);
void slotItemsAdded(const KFileItemList &);
@@ -331,7 +320,6 @@
+ void slotUseBeagle();
+ void slotUseFilter();
+ void startSearch(const QString &search);
-+ void slotStatResult(KIO::Job *job);

private:
+ void switchToFilter();


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread