Hello community, here is the log from the commit of package kdebase3 checked in at Fri Sep 1 10:14:15 CEST 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-08-31 13:57:01.000000000 +0200 +++ kdebase3/kdebase3.changes 2006-09-01 07:29:48.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Sep 1 07:29:42 CEST 2006 - coolo@suse.de + +- adding SUSE menu + +------------------------------------------------------------------- New: ---- kickoff-data.tar.bz2 kickoff.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.K62szr/_old 2006-09-01 10:13:54.000000000 +0200 +++ /var/tmp/diff_new_pack.K62szr/_new 2006-09-01 10:13:54.000000000 +0200 @@ -11,7 +11,7 @@ # norootforbuild Name: kdebase3 -BuildRequires: OpenEXR-devel cups-devel db-devel doxygen graphviz hal-devel kdelibs3-devel krb5-devel libsmbclient libsmbclient-devel mDNSResponder-devel openldap2 openldap2-devel openmotif openmotif-devel openslp-devel openssh pam-devel pcsc-lite powersave-devel qt3-devel-doc samba-client utempter xorg-x11 +BuildRequires: OpenEXR-devel cups-devel db-devel doxygen graphviz hal-devel kdelibs3-devel krb5-devel libbeagle-devel libsmbclient libsmbclient-devel mDNSResponder-devel openldap2 openldap2-devel openmotif openmotif-devel openslp-devel openssh pam-devel pcsc-lite powersave-devel qt3-devel-doc samba-client utempter xorg-x11 %ifnarch s390 s390x BuildRequires: sensors %endif @@ -37,7 +37,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.4 -Release: 10 +Release: 11 %define kde_version 3.5.4 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -58,6 +58,7 @@ Source17: zh_TW.flag.png Source18: fileshareset.8.gz Source19: kcheckpass.8.gz +Source20: kickoff-data.tar.bz2 Patch0: 3_5_BRANCH.diff Patch1: disable-kcm-modules.diff Patch3: startkde.diff @@ -140,6 +141,7 @@ Patch157: kcmsamba_log.diff Patch160: khelpcenter-localindices.patch Patch161: switch-applet-lock-logout.diff +Patch162: kickoff.diff Provides: kdebase %description @@ -313,7 +315,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 111 +Release: 112 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -424,7 +426,6 @@ %patch117 %if %suse_version > 1000 %patch123 -%patch125 %patch126 %patch131 %patch141 -p1 @@ -439,7 +440,12 @@ %patch157 %patch160 %patch161 +%patch162 +%if %suse_version > 1000 +%patch125 +%endif cp %SOURCE17 l10n/tw/flag.png +tar xvfj %SOURCE20 . /etc/opt/kde3/common_options cd ../fileshareset2 aclocal @@ -1355,6 +1361,8 @@ %endif %changelog -n kdebase3 +* Fri Sep 01 2006 - coolo@suse.de +- adding SUSE menu * Thu Aug 31 2006 - stbinner@suse.de - add man pages for fileshareset and kcheckpass (#187356) * Mon Aug 28 2006 - stbinner@suse.de ++++++ kicker-defaults.diff ++++++ --- /var/tmp/diff_new_pack.K62szr/_old 2006-09-01 10:13:55.000000000 +0200 +++ /var/tmp/diff_new_pack.K62szr/_new 2006-09-01 10:13:55.000000000 +0200 @@ -11,11 +11,19 @@ </entry> <entry name="RecentAppsStat" type="StringList" > -Index: kcontrol/kicker/menutab_impl.cpp -=================================================================== ---- kcontrol/kicker/menutab_impl.cpp (Revision 500974) -+++ kcontrol/kicker/menutab_impl.cpp (Arbeitskopie) -@@ -154,10 +154,11 @@ +--- kicker/menuext/system/systemmenu.desktop 2006/03/31 11:48:12 1.1 ++++ kicker/menuext/system/systemmenu.desktop 2006/03/31 11:48:26 +@@ -1,6 +1,6 @@ + [Desktop Entry] + Encoding=UTF-8 +-Name=System Menu ++Name=My System + Name[af]=Stelsel Kieslys + Name[bg]=Системно меню + Name[bn]=সিস্টেম মেনু +--- kcontrol/kicker/menutab_impl.cpp 2006/08/09 15:16:17 1.141 ++++ kcontrol/kicker/menutab_impl.cpp 2006/08/09 15:18:43 +@@ -160,10 +160,11 @@ QListViewItem *item(0); for (item = m_subMenus->firstChild(); item; item = item->nextSibling()) { @@ -27,26 +35,20 @@ - m_quickBrowserMenu->setOn(true); + m_bookmarkMenu->setOn(false); + m_quickBrowserMenu->setOn(false); - + m_kmenuGroup->setChecked(false); m_showFrequent->setChecked(true); } ---- kicker/menuext/system/systemmenu.desktop 2006/03/31 11:48:12 1.1 -+++ kicker/menuext/system/systemmenu.desktop 2006/03/31 11:48:26 -@@ -1,6 +1,6 @@ - [Desktop Entry] - Encoding=UTF-8 --Name=System Menu -+Name=My System - Name[af]=Stelsel Kieslys - Name[bg]=Системно меню - Name[bn]=সিস্টেম মেনু ---- kcontrol/kcontrol/KControl.desktop 2006/03/31 11:48:56 1.1 -+++ kcontrol/kcontrol/KControl.desktop 2006/03/31 11:49:16 -@@ -6,7 +6,7 @@ +Index: kcontrol/kcontrol/KControl.desktop +=================================================================== +--- kcontrol/kcontrol/KControl.desktop (Revision 563426) ++++ kcontrol/kcontrol/KControl.desktop (Arbeitskopie) +@@ -6,7 +6,9 @@ DocPath=kcontrol/index.html X-KDE-StartupNotify=true -Name=Control Center ++GenericName=Configure Desktop ++GenericName[de]=Desktop-Einstellungen +Name=Personal Settings Name[af]=Beheer Sentrum Name[ar]=مركز التحكم ++++++ kickoff.diff ++++++ ++++ 10485 lines (skipped) ++++++ kmenu-search-fs20050503-fixed.diff ++++++ --- /var/tmp/diff_new_pack.K62szr/_old 2006-09-01 10:13:55.000000000 +0200 +++ /var/tmp/diff_new_pack.K62szr/_new 2006-09-01 10:13:55.000000000 +0200 @@ -1,177 +1,3 @@ ---- kicker/kicker/ui/Makefile.am -+++ kicker/kicker/ui/Makefile.am -@@ -13,7 +13,7 @@ - recentapps.cpp browser_dlg.cpp \ - removeapplet_mnu.cpp removeextension_mnu.cpp removecontainer_mnu.cpp \ - removebutton_mnu.cpp popupmenutitle.cpp hidebutton.cpp \ -- addappletvisualfeedback.cpp -+ addappletvisualfeedback.cpp clicklineedit.cpp - - libkicker_ui_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kdmlib/libdmctl.la - -@@ -25,7 +25,7 @@ - addextension_mnu.h extensionop_mnu.h \ - recentapps.h browser_dlg.h \ - removeapplet_mnu.h removeextension_mnu.h removecontainer_mnu.h \ -- removebutton_mnu.h popupmenutitle.h hidebutton.h addappletvisualfeedback.h -+ removebutton_mnu.h popupmenutitle.h hidebutton.h addappletvisualfeedback.h clicklineedit.h - - removecontainer_mnu.lo: ../../libkicker/kickerSettings.h - removeextension_mnu.lo: ../../libkicker/kickerSettings.h ---- kicker/kicker/ui/clicklineedit.cpp -+++ kicker/kicker/ui/clicklineedit.cpp -@@ -0,0 +1,85 @@ -+/* -+ This file is part of libkdepim. -+ Copyright (c) 2004 Daniel Molkentin <molkentin@kde.org> -+ based on code by Cornelius Schumacher <schumacher@kde.org> -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public License -+ along with this library; see the file COPYING.LIB. If not, write to -+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+ -+#include "clicklineedit.h" -+ -+#include "qpainter.h" -+ -+using namespace KPIM; -+ -+ClickLineEdit::ClickLineEdit(QWidget *parent, const QString &msg, const char* name) : -+ KLineEdit(parent, name) -+{ -+ mDrawClickMsg = true; -+ setClickMessage( msg ); -+} -+ -+ClickLineEdit::~ClickLineEdit() {} -+ -+ -+void ClickLineEdit::setClickMessage( const QString &msg ) -+{ -+ mClickMessage = msg; -+ repaint(); -+} -+ -+void ClickLineEdit::setText( const QString &txt ) -+{ -+ mDrawClickMsg = txt.isEmpty(); -+ repaint(); -+ KLineEdit::setText( txt ); -+} -+ -+void ClickLineEdit::drawContents( QPainter *p ) -+{ -+ KLineEdit::drawContents( p ); -+ -+ if ( mDrawClickMsg == true && !hasFocus() ) { -+ QPen tmp = p->pen(); -+ p->setPen( gray ); -+ QRect cr = contentsRect(); -+ p->drawText( cr, AlignAuto|AlignVCenter, mClickMessage ); -+ p->setPen( tmp ); -+ } -+} -+ -+void ClickLineEdit::focusInEvent( QFocusEvent *ev ) -+{ -+ if ( mDrawClickMsg == true ) -+ { -+ mDrawClickMsg = false; -+ repaint(); -+ } -+ QLineEdit::focusInEvent( ev ); -+} -+ -+void ClickLineEdit::focusOutEvent( QFocusEvent *ev ) -+{ -+ if ( text().isEmpty() ) -+ { -+ mDrawClickMsg = true; -+ repaint(); -+ } -+ QLineEdit::focusOutEvent( ev ); -+} -+ -+#include "clicklineedit.moc" ---- kicker/kicker/ui/clicklineedit.h -+++ kicker/kicker/ui/clicklineedit.h -@@ -0,0 +1,63 @@ -+/* -+ This file is part of libkdepim. -+ Copyright (c) 2004 Daniel Molkentin <molkentin@kde.org> -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public License -+ along with this library; see the file COPYING.LIB. If not, write to -+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#ifndef CLICKLINEEDIT_H -+#define CLICKLINEEDIT_H -+ -+#include <klineedit.h> -+ -+ -+namespace KPIM { -+ -+/** -+ This class provides a KLineEdit which contains a greyed-out hinting -+ text as long as the user didn't enter any text -+ -+ @short LineEdit with customizable "Click here" text -+ @author Daniel Molkentin -+*/ -+class KDE_EXPORT ClickLineEdit : public KLineEdit -+{ -+ Q_OBJECT -+ public: -+ ClickLineEdit( QWidget *parent, const QString &msg = QString::null, const char* name = 0 ); -+ ~ClickLineEdit(); -+ -+ void setClickMessage( const QString &msg ); -+ QString clickMessage() const { return mClickMessage; } -+ -+ virtual void setText( const QString& txt ); -+ -+ protected: -+ virtual void drawContents( QPainter *p ); -+ virtual void focusInEvent( QFocusEvent *ev ); -+ virtual void focusOutEvent( QFocusEvent *ev ); -+ -+ private: -+ QString mClickMessage; -+ bool mDrawClickMsg; -+ -+}; -+ -+} -+ -+#endif // CLICKLINEEDIT_H -+ -+ --- kicker/kicker/ui/k_mnu.cpp +++ kicker/kicker/ui/k_mnu.cpp @@ -26,9 +26,13 @@ @@ -204,7 +30,7 @@ #include "quickbrowser_mnu.h" #include "recentapps.h" -+#include "clicklineedit.h" ++ #include "k_mnu.h" #include "k_mnu.moc" @@ -247,7 +73,7 @@ + // Insert search field + QHBox* hbox = new QHBox( this ); + KToolBarButton *clearButton = new KToolBarButton( "locationbar_erase", 0, hbox ); -+ searchEdit = new KPIM::ClickLineEdit(hbox, " "+i18n("Press '/' to search...")); ++ searchEdit = new KLineEdit(hbox); searchEdit->setClickMessage(" "+i18n("Press '/' to search...")); + hbox->setFocusPolicy(QWidget::StrongFocus); + hbox->setFocusProxy(searchEdit); + hbox->setSpacing( 3 ); @@ -318,18 +144,6 @@ +} --- kicker/kicker/ui/k_mnu.h +++ kicker/kicker/ui/k_mnu.h -@@ -30,6 +30,11 @@ - - #include "service_mnu.h" - -+namespace KPIM { -+ // Yes, ClickLineEdit was copied from libkdepim. -+ // Can we have it in kdelibs please? -+ class ClickLineEdit; -+} - class KickerClientMenu; - class KBookmarkMenu; - class KActionCollection; @@ -73,6 +78,8 @@ void slotSaveSession(); void slotRunCommand(); @@ -352,7 +166,7 @@ KActionCollection *actionCollection; KBookmarkOwner *bookmarkOwner; PopupMenuList dynamicSubMenus; -+ KPIM::ClickLineEdit *searchEdit; ++ KLineEdit *searchEdit; + static const int searchLineID; }; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org