Hello community, here is the log from the commit of package kdebase4-workspace checked in at Thu Dec 20 16:28:01 CET 2007. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2007-12-12 20:45:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2007-12-20 16:27:35.963615000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 20 13:13:36 CET 2007 - stbinner@suse.de + +- update to 3.97.1 + +------------------------------------------------------------------- kdebase4-workspace.changes: same change Old: ---- kdebase-workspace-3.97.0.tar.bz2 New: ---- kdebase-workspace-3.97.1.tar.bz2 kickoff-better-presentation.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.x18794/_old 2007-12-20 16:27:44.000000000 +0100 +++ /var/tmp/diff_new_pack.x18794/_new 2007-12-20 16:27:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-wallpapers (Version 3.97.0) +# spec file for package kdebase4-wallpapers (Version 3.97.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,7 +20,7 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 3.97.0 +Version: 3.97.1 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,6 +59,8 @@ /usr/share/wallpapers %changelog +* Thu Dec 20 2007 - stbinner@suse.de +- update to 3.97.1 * Sat Dec 08 2007 - dmueller@suse.de - update to 3.97.0 * Sat Dec 08 2007 - stbinner@suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.x18794/_old 2007-12-20 16:27:44.000000000 +0100 +++ /var/tmp/diff_new_pack.x18794/_new 2007-12-20 16:27:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-workspace (Version 3.97.0) +# spec file for package kdebase4-workspace (Version 3.97.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ Name: kdebase4-workspace BuildRequires: NetworkManager-devel bluez-libs libkde4-devel libqimageblitz-devel -BuildRequires: libsmbclient-devel libxklavier-devel +BuildRequires: libraw1394-devel libsmbclient-devel libusb-devel libxklavier-devel %if %suse_version > 1020 BuildRequires: fdupes libusb-devel %else @@ -21,9 +21,9 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 3.97.0 +Version: 3.97.1 Release: 1 -%define rversion 3.97.0 +%define rversion 3.97.1 Source0: kdebase-workspace-%rversion.tar.bz2 Source90: _upstream Source91: kdebase4-workspace-rpmlintrc @@ -31,6 +31,7 @@ Patch1: dotkde4.diff Patch3: show-runtime-only-in-kde.diff Patch4: plasma-pager.diff +Patch5: kickoff-better-presentation.diff %kde4_runtime_requires Conflicts: yast2-theme-NLD Suggests: kdebase4-ksysguardd @@ -53,6 +54,7 @@ %patch1 %patch3 #%patch4 +%patch5 %build %cmake_kde4 -d build @@ -278,7 +280,8 @@ /usr/share/kde4/services/plasma-applet-devicenotifier.desktop /usr/share/kde4/services/plasma-applet-lockout.desktop /usr/share/kde4/services/plasma-applet-launcher.desktop -/usr/share/kde4/services/plasma-applet-url.desktop +/usr/share/kde4/services/plasma-applet-icon.desktop +/usr/share/kde4/services/plasma-applet-simplelauncher.desktop %_kde_share_dir/services/plasma-animator-default.desktop %_kde_share_dir/services/plasma-dataengine-hotplug.desktop %_kde_share_dir/services/plasma-dataengine-places.desktop @@ -306,6 +309,9 @@ #%_libdir/kde4/kickoff_plasma_applet_launcher.so %dir /usr/%_lib/kconf_update_bin /usr/%_lib/kconf_update_bin/khotkeys_update +/usr/%_lib/kde4/kcm_view1394.so +/usr/share/kde4/apps/kcmview1394 +/usr/share/kde4/services/kcmview1394.desktop /usr/%_lib/kde4/kcm_accessibility.so /usr/%_lib/kde4/kcm_access.so /usr/%_lib/kde4/kcm_background.so @@ -399,6 +405,7 @@ %config %_kde_config_dir/background.knsrc #%_kde_share_dir/config.kcfg/kcm_useraccount_pass.kcfg /usr/share/dbus-1/interfaces/org.kde.krunner.App.xml +/usr/share/dbus-1/interfaces/org.kde.khotkeys.xml %_kde_share_dir/config.kcfg/klaunch.kcfg %_kde_share_dir/config.kcfg/kscreensaversettings.kcfg /usr/share/dbus-1/interfaces/org.freedesktop.ScreenSaver.xml @@ -535,6 +542,8 @@ %doc %lang(en) /usr/share/doc/kde/HTML/en/plasma %changelog +* Thu Dec 20 2007 - stbinner@suse.de +- update to 3.97.1 * Sat Dec 08 2007 - dmueller@suse.de - update to 3.97.0 * Sat Dec 08 2007 - stbinner@suse.de ++++++ kdebase-workspace-3.97.0.tar.bz2 -> kdebase-workspace-3.97.1.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-3.97.0.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase-workspace-3.97.1.tar.bz2 differ: byte 11, line 1 ++++++ kickoff-better-presentation.diff ++++++ Index: workspace/plasma/applets/kickoff/ui/flipscrollview.cpp =================================================================== --- plasma/applets/kickoff/ui/flipscrollview.cpp (revision 749593) +++ plasma/applets/kickoff/ui/flipscrollview.cpp (working copy) @@ -127,9 +127,12 @@ bool first = true; while (branchIndex.isValid()) { QFont font = painter->font(); + QString prefix; if (first) { font.setBold(true); first = false; + if (branchIndex.parent().isValid()) + prefix = " "; } else { font.setBold(false); } @@ -137,7 +140,7 @@ painter->drawText(QRect(rect.left(),top,rect.width(),metrics.height()), Qt::AlignLeft, - branchIndex.data(Qt::DisplayRole).value<QString>()); + prefix+branchIndex.data(Qt::DisplayRole).value<QString>()); branchIndex = branchIndex.parent(); top -= metrics.height();// + metrics.lineSpacing(); @@ -391,8 +394,8 @@ { QAbstractItemView::setModel(model); if (model) { -// setCurrentIndex(model->index(0,0)); -// d->itemHeight = sizeHintForIndex(model->index(0, 0)).height(); + setCurrentIndex(model->index(0,0)); + d->itemHeight = sizeHintForIndex(model->index(0, 0)).height(); } } Index: workspace/plasma/applets/kickoff/ui/itemdelegate.cpp =================================================================== --- plasma/applets/kickoff/ui/itemdelegate.cpp (revision 749593) +++ plasma/applets/kickoff/ui/itemdelegate.cpp (working copy) @@ -73,13 +73,13 @@ QRect titleRect = textRect; - if (subTitleText.isEmpty()) { - subTitleText = " "; + if (subTitleText == titleText) { + subTitleText = QString::null; } titleRect.setHeight(titleRect.height() / 2); QRect subTitleRect = titleRect; - subTitleRect.translate(0, subTitleRect.height()); + subTitleRect.translate(0, subTitleRect.height() - 1); QFont subTitleFont = fontForSubTitle(option.font); QFont titleFont(option.font); @@ -91,7 +91,7 @@ QFontMetrics titleMetrics(titleFont); QFontMetrics subTitleMetrics(subTitleFont); QRect textAreaRect = contentRect; - qreal actualTextWidth = qMax(titleMetrics.width(titleText), subTitleMetrics.width(subTitleText)); + qreal actualTextWidth = qMax(titleMetrics.width(titleText), subTitleMetrics.width(" "+subTitleText)); textAreaRect.adjust(decorationRect.width() + ICON_TEXT_MARGIN - 3, 0, -(titleRect.width() - actualTextWidth) + 3, 1); // use a slightly translucent version of the palette's highlight color // for the background @@ -109,12 +109,16 @@ // draw title painter->setFont(titleFont); - painter->drawText(titleRect, Qt::AlignLeft|Qt::AlignVCenter, titleText); + QRect paintRect = titleRect; + if (subTitleText.isEmpty()) + paintRect.translate(0, (titleRect.height()/2)-1); + painter->drawText(paintRect, Qt::AlignLeft|Qt::AlignVCenter, titleText); - if (hover) { + if (!(subTitleText.isEmpty())) { // draw sub-title + painter->setPen(QPen(option.palette.dark(), 0)); painter->setFont(subTitleFont); - painter->drawText(subTitleRect, Qt::AlignLeft|Qt::AlignVCenter, subTitleText); + painter->drawText(subTitleRect, Qt::AlignLeft|Qt::AlignVCenter, " " + subTitleText); } painter->restore(); @@ -199,7 +203,7 @@ subTitleFont.setPointSize(qMax(subTitleFont.pointSize() - 2, KGlobalSettings::smallestReadableFont().pointSize())); QFontMetrics subMetrics(subTitleFont); - size.setHeight(qMax(option.decorationSize.height(), qMax(size.height(), metrics.height() + subMetrics.ascent()) + 3)); + size.setHeight(qMax(option.decorationSize.height(), qMax(size.height(), metrics.height() + subMetrics.ascent()) + 3) + 4); // kDebug() << "size hint is" << size << (metrics.height() + subMetrics.ascent()); return size; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org