Hello community,
here is the log from the commit of package kdeaddons3
checked in at Wed Sep 20 16:42:09 CEST 2006.
--------
--- KDE/kdeaddons3/kdeaddons3.changes 2006-09-11 21:42:06.000000000 +0200
+++ kdeaddons3/kdeaddons3.changes 2006-09-19 13:45:00.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Sep 19 13:44:33 CEST 2006 - stbinner@suse.de
+
+- fix previous commit/regression and remember last view mode
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeaddons3.spec ++++++
--- /var/tmp/diff_new_pack.tPOErZ/_old 2006-09-20 16:41:57.000000000 +0200
+++ /var/tmp/diff_new_pack.tPOErZ/_new 2006-09-20 16:41:57.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: 4
+Release: 5
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: 7
+Release: 9
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: 7
+Release: 9
Summary: Konqueror Related Add-Ons
Group: Productivity/Networking/Web/Utilities
@@ -92,7 +92,7 @@
%package kontact
# usesubdirs kontact ksig
Version: 3.5.4
-Release: 7
+Release: 9
Requires: kdenetwork3-news
Provides: kdeaddons
Provides: kdeaddons3 = %{version}-%{release}
@@ -115,7 +115,7 @@
%package sound
# usesubdirs noatun-plugins
Version: 3.5.4
-Release: 7
+Release: 9
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: 7
+Release: 9
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: 7
+Release: 9
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
+* Tue Sep 19 2006 - stbinner@suse.de
+- fix previous commit/regression and remember last view mode
* Mon Sep 11 2006 - coolo@suse.de
- backporting patch from opensuse contributor kling-kde to fix
konqueror crashes (#204388, #204369)
++++++ permanent-searchbar.diff ++++++
--- /var/tmp/diff_new_pack.tPOErZ/_old 2006-09-20 16:41:58.000000000 +0200
+++ /var/tmp/diff_new_pack.tPOErZ/_new 2006-09-20 16:41:58.000000000 +0200
@@ -1,6 +1,6 @@
Index: konq-plugins/dirfilter/dirfilterplugin.cpp
===================================================================
---- konq-plugins/dirfilter/dirfilterplugin.cpp (revision 583205)
+--- konq-plugins/dirfilter/dirfilterplugin.cpp (revision 586270)
+++ konq-plugins/dirfilter/dirfilterplugin.cpp (working copy)
@@ -19,6 +19,8 @@
#include
@@ -19,18 +19,33 @@
#include "dirfilterplugin.h"
-@@ -144,7 +147,10 @@ void SessionManager::loadSettings()
+@@ -122,6 +125,7 @@
+
+ cfg.writeEntry ("ShowCount", showCount);
+ cfg.writeEntry ("UseMultipleFilters", useMultipleFilters);
++ cfg.writeEntry ("SearchMode", searchMode);
+ cfg.sync();
+ }
+
+@@ -135,6 +139,7 @@
+
+ showCount = cfg.readBoolEntry ("ShowCount", false);
+ useMultipleFilters = cfg.readBoolEntry ("UseMultipleFilters", true);
++ searchMode = (SearchModes)cfg.readNumEntry("SearchMode", Beagle);
+ m_pid = getpid ();
+ m_bSettingsLoaded = true;
+ }
+@@ -144,7 +149,9 @@
DirFilterPlugin::DirFilterPlugin (QObject* parent, const char* name,
const QStringList&)
:KParts::Plugin (parent, name),
-+ m_beagled_running(true),
++ m_beagled_running(false),
m_pFilterMenu(0),
+ m_popupMenu(0),
-+ m_searchMode(Beagle),
m_searchWidget(0)
{
m_part = ::qt_cast(parent);
-@@ -172,33 +178,30 @@ DirFilterPlugin::DirFilterPlugin (QObjec
+@@ -172,33 +179,26 @@
QHBox *hbox = new QHBox(m_part->widget());
hbox->hide();
@@ -52,35 +67,30 @@
- m_searchWidget = new KIconViewSearchLine(hbox);
- static_cast(m_searchWidget)->setIconView(static_cast(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);
+
-+ m_beagled_running = false;
-+ switchToFilter();
-+
+ QTimer::singleShot(0, this, SLOT(slotDetectBeagle()));
}
DirFilterPlugin::~DirFilterPlugin()
-@@ -206,6 +209,27 @@ DirFilterPlugin::~DirFilterPlugin()
+@@ -206,6 +206,35 @@
delete m_pFilterMenu;
}
@@ -89,16 +99,24 @@
+ KIO::UDSEntry uds;
+ const KURL kurl("beagle:?beagled-status");
+ if (!KIO::NetAccess::stat(kurl, uds)) {
-+ m_beagled_running = false;
+ switchToFilter();
+ }
-+ else
-+ setIcon();
++ else {
++ m_beagled_running = true;
++ if (SessionManager::self()->searchMode==SessionManager::Beagle) {
++ setIcon();
++ slotUseBeagle();
++ }
++ else {
++ setIcon();
++ switchToFilter();
++ }
++ }
+}
+
+void DirFilterPlugin::startSearch(const QString &search)
+{
-+ if( m_searchMode == Filter )
++ if( SessionManager::self()->searchMode == SessionManager::Filter )
+ return;
+
+ emit m_part->extension()->openURLRequest("beagle:"+search);
@@ -108,7 +126,7 @@
void DirFilterPlugin::slotOpenURL ()
{
KURL url = m_part->url();
-@@ -218,12 +242,13 @@ void DirFilterPlugin::slotOpenURL ()
+@@ -218,12 +247,13 @@
//Clears the hidden list which is by now outdated...
if (m_searchWidget)
{
@@ -124,7 +142,7 @@
}
m_pURL = url;
-@@ -485,6 +510,162 @@ void DirFilterPlugin::slotTimeout()
+@@ -485,6 +515,162 @@
m_part->openURL (m_part->url());
}
@@ -132,7 +150,7 @@
+{
+ QString hinttext;
+ QPixmap m_searchIcon;
-+ if (m_searchMode == Filter) {
++ if (SessionManager::self()->searchMode == SessionManager::Filter) {
+ m_searchIcon = SmallIcon("filter");
+ hinttext = i18n("Filter This Folder");
+ }
@@ -174,7 +192,7 @@
+
+void DirFilterPlugin::slotUseBeagle()
+{
-+ m_searchMode = Beagle;
++ SessionManager::self()->searchMode = SessionManager::Beagle;
+ m_searchWidget->setLineEdit(new KLineEdit(m_searchWidget));
+ m_searchWidget->lineEdit()->installEventFilter(this);
+ m_searchWidget->setFocus();
@@ -191,7 +209,7 @@
+
+void DirFilterPlugin::switchToFilter()
+{
-+ m_searchMode = Filter;
++ SessionManager::self()->searchMode = SessionManager::Filter;
+ if ( ::qt_cast(m_part->scrollWidget()) ) {
+ KListViewSearchLine* searchlineWidget = new KListViewSearchLine(m_searchWidget);
+ m_searchWidget->setLineEdit(searchlineWidget);
@@ -289,7 +307,7 @@
Index: konq-plugins/dirfilter/dirfilterplugin.rc
===================================================================
---- konq-plugins/dirfilter/dirfilterplugin.rc (revision 583205)
+--- konq-plugins/dirfilter/dirfilterplugin.rc (revision 586270)
+++ konq-plugins/dirfilter/dirfilterplugin.rc (working copy)
@@ -9,5 +9,6 @@
<Action name="filterdir"/>
@@ -300,7 +318,7 @@
</kpartplugin>
Index: konq-plugins/dirfilter/dirfilterplugin.h
===================================================================
---- konq-plugins/dirfilter/dirfilterplugin.h (revision 583205)
+--- konq-plugins/dirfilter/dirfilterplugin.h (revision 586270)
+++ konq-plugins/dirfilter/dirfilterplugin.h (working copy)
@@ -27,10 +27,13 @@
#include
@@ -316,7 +334,20 @@
namespace KParts
-@@ -108,6 +111,7 @@ protected:
+@@ -54,8 +57,12 @@
+ void save (const KURL& url, const QStringList& filters);
+ void save (const KURL& url, const QString& typedFilter);
+
++ /** Possible search modes */
++ enum SearchModes { Beagle = 0, Filter };
++
+ bool showCount;
+ bool useMultipleFilters;
++ SearchModes searchMode;
+
+ protected:
+
+@@ -108,6 +115,7 @@
void loadSettings();
void saveSettings();
@@ -324,7 +355,7 @@
private slots:
void slotReset();
-@@ -119,14 +123,88 @@ private slots:
+@@ -119,14 +127,85 @@
void slotItemSelected(int);
void slotItemRemoved(const KFileItem *);
void slotItemsAdded(const KFileItemList &);
@@ -337,15 +368,12 @@
private:
+ void switchToFilter();
+
-+ /** Possible search modes */
-+ enum SearchModes { Beagle = 0, Filter };
+
+ bool m_beagled_running;
KURL m_pURL;
KonqDirPart* m_part;
KActionMenu* m_pFilterMenu;
+ QPopupMenu* m_popupMenu;
-+ SearchModes m_searchMode;
+ KAction *m_clear;
- KLineEdit *m_searchWidget;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org