Hello community,
here is the log from the commit of package kdebase3
checked in at Tue Apr 3 21:35:26 CEST 2007.
--------
--- KDE/kdebase3/kdebase3.changes 2007-03-30 20:09:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2007-04-03 18:29:55.000000000 +0200
@@ -1,0 +2,10 @@
+Tue Apr 3 18:25:30 CEST 2007 - stbinner@suse.de
+
+- update 3_5_BRANCH.diff
+- update kickoff.diff from SVN:
+ * prefer user over system media label (#257007)
+ * implement listening to Beagle KAddressbook hits and do not
+ search addressbooks via kabc by default (#249287)
+ * make drawing of Geeko eye an option with default off
+
+-------------------------------------------------------------------
Old:
----
kicker_suspend_with_dbus_send.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.j20882/_old 2007-04-03 21:34:13.000000000 +0200
+++ /var/tmp/diff_new_pack.j20882/_new 2007-04-03 21:34:13.000000000 +0200
@@ -55,7 +55,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.6
-Release: 22
+Release: 24
%define kde_version 3.5.6
Source0: kdebase-%{kde_version}.tar.bz2
Source3: startkde.suse.sh
@@ -195,8 +195,6 @@
Patch203: show-konqueror-in-menu.diff
Patch204: fix-desktop-icons.diff
Patch205: kcmkdm-default-grub.diff
-#remove on next kickoff update
-Patch206: kicker_suspend_with_dbus_send.diff
%description
This package contains kdebase, one of the basic packages of the K
@@ -383,7 +381,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 257
+Release: 259
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -557,7 +555,6 @@
%patch203
%patch204
%patch205
-%patch206
cp %SOURCE17 l10n/tw/flag.png
. /etc/opt/kde3/common_options
cd ../fileshareset2
@@ -1570,6 +1567,13 @@
%endif
%changelog
+* Tue Apr 03 2007 - stbinner@suse.de
+- update 3_5_BRANCH.diff
+- update kickoff.diff from SVN:
+ * prefer user over system media label (#257007)
+ * implement listening to Beagle KAddressbook hits and do not
+ search addressbooks via kabc by default (#249287)
+ * make drawing of Geeko eye an option with default off
* Fri Mar 30 2007 - wstephenson@suse.de
- Add fix for dbus error message after resume (#223775)
* Sun Mar 25 2007 - aj@suse.de
++++++ 3_5_BRANCH.diff ++++++
++++ 47683 lines (skipped)
++++ between KDE/kdebase3/3_5_BRANCH.diff
++++ and /mounts/work_src_done/STABLE/kdebase3/3_5_BRANCH.diff
++++++ kickoff.diff ++++++
--- /var/tmp/diff_new_pack.j20882/_old 2007-04-03 21:34:16.000000000 +0200
+++ /var/tmp/diff_new_pack.j20882/_new 2007-04-03 21:34:16.000000000 +0200
@@ -170,7 +170,7 @@
--- libkicker/kickerSettings.kcfg
+++ libkicker/kickerSettings.kcfg
-@@ -98,6 +98,65 @@
+@@ -98,6 +98,70 @@
<label>A list of extensions that have been loaded at runtime. In the case of a crash these extensions will not be loaded at the next Kicker start, in case they caused the crash</label>
</entry>
@@ -208,7 +208,12 @@
+
+<entry name="KickoffSearchAddressBook" type="Bool" >
+ <label>When this option is enabled, kabc is utilized to search for addresses. This may start KMail.</label>
-+ <default>true</default>
++ <default>false</default>
++ </entry>
++
++<entry name="KickoffDrawGeekoEye" type="Bool" >
++ <label>When this option is enabled, the Geeko eye moves when the mouse hovers the start menu button</label>
++ <default>false</default>
+ </entry>
+
+<entry name="KickoffTabBarFormat" type="Enum" >
@@ -236,7 +241,7 @@
</group>
<group name="menus">
-@@ -172,6 +231,19 @@
+@@ -172,6 +236,19 @@
<default>false</default>
</entry>
@@ -256,7 +261,7 @@
</group>
<group name="button_tiles">
-@@ -337,6 +409,29 @@
+@@ -337,6 +414,29 @@
</group>
@@ -953,7 +958,7 @@
+
--- kicker/plugins/kickoff-beagle-plugin.cpp
+++ kicker/plugins/kickoff-beagle-plugin.cpp
-@@ -0,0 +1,475 @@
+@@ -0,0 +1,499 @@
+/***************************************************************************
+ * Copyright (C) 2006 by Stephan Binner *
+ * Copyright (c) 2006 Debajyoti Bera *
@@ -1007,6 +1012,9 @@
+QString fixme_speakingto = "fixme:speakingto";
+QString fixme_starttime = "fixme:starttime";
+QString comma_string = ",";
++QString vCard_FN = "vCard:FN";
++QString vCard_PREFEMAIL = "vCard:PREFEMAIL";
++QString fixme_uid = "fixme:uid";
+
+static CATEGORY getHitCategory (Hit *hit)
+{
@@ -1054,6 +1062,9 @@
+ if (hitsource == "Files")
+ return FILES;
+
++ if (hitsource == "KAddressBook")
++ return ACTIONS;
++
+ return OTHER;
+}
+
@@ -1181,6 +1192,24 @@
+ : uristr.section ('/', -2, -2));
+ }
+ break;
++ case ACTIONS:
++ {
++ if (hit->getSource()=="KAddressBook"){
++ title = i18n("Send Email to %1").arg((*hit)[vCard_FN]);
++ info = (*hit)[vCard_PREFEMAIL];
++ uri = "mailto:"+(*hit)[vCard_PREFEMAIL];
++ mimetype = hit->getMimeType ();
++ icon = "mail_new";
++
++ HitMenuItem * first_item=new HitMenuItem (title, info, uri, mimetype, 0, category, icon, score);
++ kickoffSearchInterface()->addHitMenuItem(first_item);
++
++ title =i18n("Open Addressbook at %1").arg((*hit)[vCard_FN]);
++ uri = "kaddressbook:/"+(*hit)[fixme_uid];
++ icon = "kaddressbook";
++ }
++ break;
++ }
+ case MAILS:
+ {
+ QString prefix = QString::null;
@@ -2855,7 +2884,7 @@
+}
--- kicker/ui/k_new_mnu.cpp
+++ kicker/ui/k_new_mnu.cpp
-@@ -0,0 +1,3767 @@
+@@ -0,0 +1,3777 @@
+/*****************************************************************
+
+ Copyright (c) 1996-2000 the kicker authors. See file AUTHORS.
@@ -3066,11 +3095,12 @@
+ m_tabs[FavoriteTab] = new QTab;
+ m_tabBar->addTab(m_tabs[FavoriteTab]);
+ m_tabBar->setToolTip(FavoriteTab, "<qt>" + i18n( "Most commonly used applications and documents" ) + "</qt>" );
-+ m_tabs[HistoryTab] = new QTab;
-+ m_tabBar->addTab(m_tabs[HistoryTab]);
-+ m_tabBar->setToolTip(HistoryTab, "<qt>" + i18n( "Recently used applications and documents" ) +
++ m_tabs[ApplicationsTab] = new QTab;
++ m_tabBar->addTab(m_tabs[ApplicationsTab]);
++ m_tabBar->setToolTip(ApplicationsTab, "<qt>" + i18n( "List of installed applications" ) +
+ "</qt>" );
-+ m_tabs[ComputerTab] = new QTab;
++
++ m_tabs[ComputerTab] = new QTab;
+ m_tabBar->addTab(m_tabs[ComputerTab]);
+ m_tabBar->setToolTip(ComputerTab, "<qt>" + i18n( "Information and configuration of your "
+ "system, access to personal files, network resources and connected disk drives")
@@ -3079,9 +3109,9 @@
+ m_tabs[SearchTab] = new QTab;
+ m_tabBar->addTab(m_tabs[SearchTab]);
+#endif
-+ m_tabs[ApplicationsTab] = new QTab;
-+ m_tabBar->addTab(m_tabs[ApplicationsTab]);
-+ m_tabBar->setToolTip(ApplicationsTab, "<qt>" + i18n( "List of installed applications" ) +
++ m_tabs[HistoryTab] = new QTab;
++ m_tabBar->addTab(m_tabs[HistoryTab]);
++ m_tabBar->setToolTip(HistoryTab, "<qt>" + i18n( "Recently used applications and documents" ) +
+ "</qt>" );
+ m_tabs[LeaveTab] = new QTab;
+ m_tabBar->addTab(m_tabs[LeaveTab]);
@@ -3309,7 +3339,7 @@
+ || e->type() == QEvent::Wheel) {
+ QPoint p;
+
-+ if (e->type() == QEvent::MouseMove) {
++ if (e->type() == QEvent::MouseMove || e->type() == QEvent::MouseButtonPress) {
+ QMouseEvent* me = static_cast(e);
+ p = me->globalPos();
+ }
@@ -3375,8 +3405,16 @@
+ }
+
+ if (m_sloppyRegion.contains(p)) {
-+ if (!m_sloppyTimer.isActive() || m_sloppySource != raiseRect)
-+ m_sloppyTimer.start(style().styleHint(QStyle::SH_PopupMenu_SubMenuPopupDelay));
++ if (e->type() == QEvent::MouseButtonPress /*&& m_sloppyTimer.isActive()*/)
++ m_sloppySourceClicked = true;
++
++ if (!m_sloppyTimer.isActive() || m_sloppySource != raiseRect) {
++ int timeout= style().styleHint(QStyle::SH_PopupMenu_SubMenuPopupDelay);
++ if (m_sloppySourceClicked)
++ timeout = 3000;
++ m_sloppyTimer.start(timeout);
++ }
++
+ m_sloppyWidget = raiseWidget;
+ m_sloppySource = raiseRect;
+ return false;
@@ -3501,27 +3539,28 @@
+ {
+ QPointArray points(4);
+
++ // hmm, eventually this should be mouse position + 10px, not
++ // just worst case. but worst case seems to work fine enough.
++ QPoint edge(raiseRect.topLeft());
++ edge.setX(edge.x()+raiseRect.center().x());
++
+ if (m_orientation == BottomUp)
+ {
+ points.setPoint(0, m_stacker->mapToGlobal(m_stacker->rect().bottomLeft()));
+ points.setPoint(1, m_stacker->mapToGlobal(m_stacker->rect().bottomRight()));
++
++ edge.setY(edge.y()+raiseRect.height());
++ points.setPoint(2, edge+QPoint(+raiseRect.width()/4,0));
++ points.setPoint(3, edge+QPoint(-raiseRect.width()/4,0));
+ }
+ else
+ {
+ points.setPoint(0, m_stacker->mapToGlobal(m_stacker->rect().topLeft()));
+ points.setPoint(1, m_stacker->mapToGlobal(m_stacker->rect().topRight()));
++ points.setPoint(2, edge+QPoint(-raiseRect.width()/4,0));
++ points.setPoint(3, edge+QPoint(+raiseRect.width()/4,0));
+ }
+
-+ // hmm, eventually this should be mouse position + 10px, not
-+ // just worst case. but worst case seems to work fine enough.
-+ QPoint edge(raiseRect.topLeft());
-+ if (m_orientation == BottomUp)
-+ edge.setY(edge.y()+raiseRect.height());
-+ edge.setX(edge.x()+raiseRect.center().x());
-+
-+ points.setPoint(2, edge+QPoint(-16,0));
-+ points.setPoint(3, edge+QPoint(16,0));
-+
+ m_sloppyRegion = QRegion(points);
+ }
+
@@ -3539,6 +3578,7 @@
+ m_sloppyWidget = 0;
+ m_sloppySource = QRect();
+ m_sloppyRegion = QRegion();
++ m_sloppySourceClicked = false;
+ }
+ }
+ m_sloppyTimer.stop();
@@ -4710,7 +4750,6 @@
+
+void KMenu::popup(const QPoint&, int)
+{
-+ qDebug("KMenu::popup called!");
+ showMenu();
+}
+
@@ -5019,7 +5058,7 @@
+ }
+
+ hit_item = new HitMenuItem (i18n("Open Addressbook at %1").arg(realName), (*it).preferredEmail(),
-+ "kaddressbook --uid "+(*it).uid(), QString::null, 0, ACTIONS, "kaddressbook");
++ "kaddressbook:/"+(*it).uid(), QString::null, 0, ACTIONS, "kaddressbook");
+
+ insertSearchResult(hit_item);
+
@@ -5265,7 +5304,7 @@
+
+void KMenu::addHitMenuItem(HitMenuItem* item)
+{
-+ if (checkUriInMenu(item->uri.path()))
++ if (checkUriInMenu(item->uri))
+ return;
+
+ // if number of hits in this category is more than allowed, dont process this
@@ -5535,9 +5574,9 @@
+ }
+ else {
+ addToHistory();
-+ if (u.startsWith("kaddressbook --uid")) {
++ if (u.startsWith("kaddressbook:/")) {
+ KProcess *proc = new KProcess;
-+ *proc << "kaddressbook" << "--uid" << u.mid(19);
++ *proc << "kaddressbook" << "--uid" << u.mid(14);
+ proc->start();
+ accept();
+ return;
@@ -5635,7 +5674,7 @@
+ }
+
+ if (source!=m_exitView) {
-+ if (m_popupService || (!m_popupPath.path.startsWith("kicker:/") && !m_popupPath.path.startsWith("system:/") && !m_popupPath.path.startsWith("kaddressbook --uid"))) {
++ if (m_popupService || (!m_popupPath.path.startsWith("kicker:/") && !m_popupPath.path.startsWith("system:/") && !m_popupPath.path.startsWith("kaddressbook:/"))) {
+ if (hasEntries)
+ m_popupMenu->insertSeparator();
+
@@ -6089,7 +6128,7 @@
+ return pos + 1;
+}
+
-+bool KMenu::checkUriInMenu( const QString &uri)
++bool KMenu::checkUriInMenu( const KURL &uri)
+{
+ QPtrListIterator<HitMenuItem> it (m_current_menu_items);
+ const HitMenuItem *cur_item;
@@ -6344,7 +6383,7 @@
+ }
+ }
+ }
-+ m_systemView->insertItem( iconName, label,
++ m_systemView->insertItem( iconName, userLabel.isEmpty() ? label : userLabel,
+ descr, "system:/media/" + name, nId++, -1 );
+
+ ++it; // skip separator
@@ -6571,11 +6610,11 @@
+ i18n("Suspend Computer");
+
+ if ( suspend_disk )
-+ m_exitView->leftView()->insertItem( "player_pause", i18n( "Suspend to Disk" ),
++ m_exitView->leftView()->insertItem( "suspend2disk", i18n( "Suspend to Disk" ),
+ i18n( "Pause without logging out" ), "kicker:/suspend_disk", nId++, index++ );
+
+ if ( suspend_ram )
-+ m_exitView->leftView()->insertItem( "player_pause", i18n( "Suspend to RAM" ),
++ m_exitView->leftView()->insertItem( "suspend2ram", i18n( "Suspend to RAM" ),
+ i18n( "Pause without logging out" ), "kicker:/suspend_ram", nId++, index++ );
+
+ if ( standby )
@@ -6589,7 +6628,7 @@
+#ifdef KDELIBS_SUSE
+ int error = 0;
+ int wake = 0;
-+ DBusMessage *reply;
++ DBusMessage *reply = 0;
+
+ if (id == 1) {
+ error = liblazy_dbus_system_send_method_call(DBUS_HAL_INTERFACE,
@@ -7169,7 +7208,7 @@
+#endif
--- kicker/ui/k_new_mnu.h
+++ kicker/ui/k_new_mnu.h
-@@ -0,0 +1,341 @@
+@@ -0,0 +1,342 @@
+/*****************************************************************
+
+ Copyright (c) 1996-2000 the kicker authors. See file AUTHORS.
@@ -7389,6 +7428,7 @@
+ MediaWatcher * m_mediaWatcher;
+ QRegion m_sloppyRegion;
+ QRect m_sloppySource;
++ bool m_sloppySourceClicked;
+ QWidget * m_sloppyWidget;
+ ItemView * m_recentlyView;
+ ItemView * m_favoriteView;
@@ -7441,7 +7481,7 @@
+ QPtrList<HitMenuItem> m_current_menu_items;
+ QListViewItem *m_searchIndex, *m_searchInternet;
+
-+ bool checkUriInMenu(const QString &uri);
++ bool checkUriInMenu(const KURL &uri);
+
+ QRegExp emailRegExp,uriRegExp,uri2RegExp,authRegExp;
+
@@ -7457,8 +7497,8 @@
+ QString title, description, icon, path, menuPath;
+ };
+
-+ enum KickoffTabEntry { FavoriteTab, HistoryTab, ComputerTab,
-+ ApplicationsTab, LeaveTab, SearchTab, NumTabs };
++ enum KickoffTabEntry { FavoriteTab, ApplicationsTab, ComputerTab,
++ HistoryTab, LeaveTab, SearchTab, NumTabs };
+
+ KPopupMenu* m_popupMenu;
+ KService* m_popupService;
@@ -8529,7 +8569,7 @@
+#endif
--- kicker/ui/Makefile.am
+++ kicker/ui/Makefile.am
-@@ -1,38 +1,44 @@
+@@ -1,38 +1,46 @@
INCLUDES = -I$(srcdir)/../core -I../core -I$(srcdir)/../buttons \
-I../../libkicker -I$(srcdir)/../../libkicker \
- -I$(top_srcdir)/libkonq -I$(top_srcdir)/kdmlib $(all_includes)
@@ -8537,6 +8577,8 @@
noinst_LTLIBRARIES = libkicker_ui.la
++libkicker_ui_la_COMPILE_FIRST = kmenubase.h
++
libkicker_ui_la_SOURCES = addbutton_mnu.cpp appletitem.ui appletview.ui addapplet.cpp \
addapplet_mnu.cpp appletop_mnu.cpp \
browser_mnu.cpp client_mnu.cpp dirdrop_mnu.cpp \
@@ -9264,7 +9306,7 @@
+
+ItemView::ItemView(QWidget* parent, const char* name)
+ : KListView(parent, name), m_spacer( 0 ),
-+ m_mouseMoveSelects(true), m_iconSize(32)
++ m_mouseMoveSelects(true), m_iconSize(QMAX(16,KickerSettings::menuEntryHeight()))
+{
+ setHScrollBarMode( QScrollView::AlwaysOff );
+ setFrameStyle( QFrame::NoFrame );
@@ -9694,7 +9736,7 @@
+ o->addDragObject(new KURLDrag(KURL::List(KURL("programs:/"+kitem->menuPath())), 0));
+ return o;
+ }
-+ else if(!kitem->path().isEmpty() && !kitem->path().startsWith("kicker:/") && !kitem->path().startsWith("kaddressbook --uid")) {
++ else if(!kitem->path().isEmpty() && !kitem->path().startsWith("kicker:/") && !kitem->path().startsWith("kaddressbook:/")) {
+ QString uri = kitem->path();
+
+ if (uri.startsWith(locateLocal("data", QString::fromLatin1("RecentDocuments/")))) {
@@ -10001,7 +10043,7 @@
--- kicker/buttons/knewbutton.cpp
+++ kicker/buttons/knewbutton.cpp
-@@ -0,0 +1,441 @@
+@@ -0,0 +1,443 @@
+/*****************************************************************
+
+Copyright (c) 2006 Stephan Binner
@@ -10215,7 +10257,7 @@
+ }
+ }
+
-+ if (e->type() == QEvent::MouseMove)
++ if (KickerSettings::kickoffDrawGeekoEye() && e->type() == QEvent::MouseMove)
+ {
+ QMouseEvent *me = static_cast(e);
+ if ((me->state() & MouseButtonMask) == NoButton)
@@ -10249,12 +10291,14 @@
+ m_iconSize = pixmap.size();
+ sf = buttonScaleFactor(size());
+
-+ QPainter p(&pixmap);
-+ p.setPen(white);
-+ p.setBrush(white);
-+ // p.setPen(QColor(110,185,55));
-+ p.drawRect(eye_x+dx, eye_y+dy, 2, 2);
-+ p.end();
++ if (KickerSettings::kickoffDrawGeekoEye()) {
++ QPainter p(&pixmap);
++ p.setPen(white);
++ p.setBrush(white);
++ // p.setPen(QColor(110,185,55));
++ p.drawRect(eye_x+dx, eye_y+dy, 2, 2);
++ p. end();
++ }
+ }
+
+ QWMatrix matrix;
++++++ restore-description-parens.diff ++++++
--- /var/tmp/diff_new_pack.j20882/_old 2007-04-03 21:34:17.000000000 +0200
+++ /var/tmp/diff_new_pack.j20882/_new 2007-04-03 21:34:17.000000000 +0200
@@ -4,8 +4,8 @@
{
if (comment.find(serviceName, 0, true) == -1)
{
-- serviceName = QString("%1 %2").arg(serviceName, comment);
-+ serviceName = QString("%1 (%2)").arg(serviceName, comment);
+- serviceName = i18n("Entries in K-menu: %1 app name, %2 description", "%1 - %2").arg(serviceName, comment);
++ serviceName = i18n("Entries in K-menu: %1 app name, %2 description", "%1 (%2)").arg(serviceName, comment);
}
else
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org