Hello community, here is the log from the commit of package kdebase4-workspace checked in at Fri Jan 11 11:50:07 CET 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-01-03 17:41:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-01-11 11:49:04.748777000 +0100 @@ -1,0 +2,5 @@ +Sat Jan 5 19:09:51 CET 2008 - stbinner@suse.de + +- update to 4.0 release + +------------------------------------------------------------------- kdebase4-workspace.changes: same change Old: ---- kdebase-workspace-3.97.2.tar.bz2 New: ---- 4_0_BRANCH.diff kdebase-workspace-4.0.0.tar.bz2 kickoff-defaults.diff kickoff-favorites-starter.diff kickoff-footer.diff kwin-suse.diff opensuse.png titlebar_decor.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.X23175/_old 2008-01-11 11:49:33.000000000 +0100 +++ /var/tmp/diff_new_pack.X23175/_new 2008-01-11 11:49:33.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-wallpapers (Version 3.97.2) +# spec file for package kdebase4-wallpapers (Version 4.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,12 +20,12 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 3.97.2 +Version: 4.0 Release: 1 -Source0: kdebase-workspace-%version.tar.bz2 +%define rversion 4.0.0 +Source0: kdebase-workspace-%rversion.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Conflicts: kdebase3 %description This package contains the wallpapers of KDE 4. @@ -37,7 +37,7 @@ The KDE Team <kde@kde.org> %prep -%setup -q -n kdebase-workspace-%version +%setup -q -n kdebase-workspace-%rversion %build %cmake_kde4 -d build @@ -47,7 +47,7 @@ %install cd build/wallpapers %makeinstall - rm $RPM_BUILD_ROOT/usr/share/wallpapers/plasma-default.* + rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/EOS %kde_post_install %clean @@ -59,6 +59,8 @@ /usr/share/wallpapers %changelog +* Sat Jan 05 2008 - stbinner@suse.de +- update to 4.0 release * Wed Jan 02 2008 - stbinner@suse.de - update to 3.97.2 * Thu Dec 20 2007 - stbinner@suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.X23175/_old 2008-01-11 11:49:33.000000000 +0100 +++ /var/tmp/diff_new_pack.X23175/_new 2008-01-11 11:49:33.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-workspace (Version 3.97.2) +# spec file for package kdebase4-workspace (Version 4.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,17 +21,24 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 3.97.2 +Version: 4.0 Release: 1 -%define rversion 3.97.2 +%define rversion 4.0.0 Source0: kdebase-workspace-%rversion.tar.bz2 +Source1: opensuse.png +Source2: titlebar_decor.png Source90: _upstream Source91: kdebase4-workspace-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch0: 4_0_BRANCH.diff Patch1: dotkde4.diff Patch3: show-runtime-only-in-kde.diff Patch4: plasma-pager.diff Patch5: kickoff-better-presentation.diff +Patch6: kickoff-defaults.diff +Patch7: kickoff-footer.diff +Patch8: kwin-suse.diff +Patch9: kickoff-favorites-starter.diff %kde4_runtime_requires Conflicts: yast2-theme-NLD Suggests: kdebase4-ksysguardd @@ -51,10 +58,15 @@ %prep %setup -q -n kdebase-workspace-%rversion +%patch %patch1 %patch3 #%patch4 %patch5 +%patch6 +%patch7 +%patch8 +%patch9 %build %cmake_kde4 -d build @@ -63,13 +75,15 @@ %install cd build %makeinstall + install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/kde4/apps/desktoptheme/default/ + install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/kde4/apps/kwin/ %create_subdir_filelist -d kdm %create_subdir_filelist -d kwin cd .. %create_exclude_filelist - mv $RPM_BUILD_ROOT/usr/share/wallpapers/plasma-default.* $RPM_BUILD_ROOT/usr/share/ - rm $RPM_BUILD_ROOT/usr/share/wallpapers/* - mv $RPM_BUILD_ROOT/usr/share/plasma-default.* $RPM_BUILD_ROOT/usr/share/wallpapers/ + mv $RPM_BUILD_ROOT/usr/share/wallpapers/EOS $RPM_BUILD_ROOT/usr/share/ + rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/* + mv $RPM_BUILD_ROOT/usr/share/EOS $RPM_BUILD_ROOT/usr/share/wallpapers/ mkdir -p $RPM_BUILD_ROOT/etc mv $RPM_BUILD_ROOT/usr/etc/ksysguarddrc $RPM_BUILD_ROOT/etc/ mv $RPM_BUILD_ROOT/usr/etc/systemsettingsrc $RPM_BUILD_ROOT/etc/ @@ -147,6 +161,7 @@ %defattr(-,root,root) %doc COPYING COPYING-DOCS README %dir /usr/share/kde4/services/kwin +/usr/share/kde4/apps/kwin/titlebar_decor.png %package devel Requires: libkdepimlibs4-devel @@ -169,18 +184,20 @@ %doc COPYING COPYING-DOCS README /usr/include/* %_kde_share_dir/apps/cmake -/usr/%_lib/libsolidcontrolifaces.so -/usr/%_lib/libsolidcontrol.so -/usr/%_lib/libkdecorations.so -/usr/%_lib/libkworkspace.so -/usr/%_lib/libkscreensaver.so -/usr/%_lib/libprocesscore.so -/usr/%_lib/libprocessui.so -/usr/%_lib/libksgrd.so -/usr/%_lib/libkwineffects.so -/usr/%_lib/libplasma.so -/usr/%_lib/libtaskmanager.so -/usr/%_lib/libweather_ion.so +%_libdir/libsolidcontrolifaces.so +%_libdir/libsolidcontrol.so +%_libdir/libkdecorations.so +%_libdir/libkworkspace.so +%_libdir/libkscreensaver.so +%_libdir/libprocesscore.so +%_libdir/libprocessui.so +%_libdir/libksgrd.so +%_libdir/libkwineffects.so +%_libdir/libplasma.so +%_libdir/libtaskmanager.so +%_libdir/libweather_ion.so +%_libdir/libkfontinst.so +%_libdir/libkfontinstui.so %package -n kde4-kdm Group: System/GUI/KDE @@ -220,9 +237,9 @@ %defattr(-,root,root) %doc COPYING COPYING-DOCS README %doc %lang(en) /usr/share/doc/kde/HTML/en/kdm -/usr/%_lib/kde4/kgreet_classic.so -/usr/%_lib/kde4/kgreet_winbind.so -/usr/%_lib/kde4/kcm_kdm.so +%_libdir/kde4/kgreet_classic.so +%_libdir/kde4/kgreet_winbind.so +%_libdir/kde4/kcm_kdm.so %_kde_share_dir/services/kdm.desktop %config %_kde_config_dir/kdm.knsrc %dir /usr/share/kde4/apps/doc @@ -232,6 +249,8 @@ %defattr(-,root,root) %doc COPYING COPYING-DOCS README /usr/bin/kaccess +/usr/bin/kfontinst +/usr/bin/kfontview /usr/bin/kapplymousetheme /usr/bin/kblankscrn.kss %verify(not mode) %attr(4755,root,shadow) %_kde4_modules/libexec/kcheckpass @@ -261,14 +280,19 @@ /usr/bin/plasmoidviewer /usr/bin/kdostartupconfig4 /usr/bin/kstartupconfig4 -/usr/%_lib/kde4/krunner_webshortcuts.so -/usr/%_lib/kde4/kcm_colors.so -/usr/%_lib/kde4/plasma_*.so -/usr/%_lib/kde4/ion_bbcukmet.so -/usr/%_lib/kde4/ion_envcan.so -/usr/%_lib/kde4/ion_noaa.so -/usr/%_lib/libtaskmanager.so.* -/usr/%_lib/libweather_ion.so.* +%_libdir/kde4/krunner_webshortcuts.so +%_libdir/kde4/kcm_colors.so +%_libdir/kde4/plasma_*.so +%_libdir/kde4/ion_bbcukmet.so +%_libdir/kde4/ion_envcan.so +%_libdir/kde4/ion_noaa.so +%_libdir/kde4/fontthumbnail.so +%_libdir/kde4/kcm_fontinst.so +%_libdir/kde4/kio_fonts.so +%_libdir/kde4/libexec/kfontprint +%_libdir/kde4/libexec/kio_fonts_helper +%_libdir/libtaskmanager.so.* +%_libdir/libweather_ion.so.* %dir /usr/share/autostart /usr/share/autostart/plasma.desktop /usr/share/kde4/services/plasma-applet-devicenotifier.desktop @@ -294,7 +318,6 @@ %_kde_share_dir/services/plasma-dataengine-mouse.desktop %_kde_share_dir/services/plasma-dataengine-tasks.desktop %_kde_share_dir/services/plasma-pager-default.desktop -%_kde_share_dir/services/plasma-runner-search.desktop %_kde_share_dir/services/plasma-runner-bookmarks.desktop %_kde_share_dir/services/desktop.desktop %_kde_share_dir/services/plasma-runner-calculator.desktop @@ -332,7 +355,6 @@ /usr/%_lib/kde4/kded_khotkeys.so #/usr/%_lib/kde4/klipper_panelapplet.so /usr/%_lib/kde4/krunner_calculatorrunner.so -/usr/%_lib/kde4/krunner_searchrunner.so /usr/%_lib/kde4/krunner_bookmarksrunner.so /usr/%_lib/kde4/kstyle_keramik_config.so /usr/%_lib/kde4/kcm_kwincompositing.so @@ -360,7 +382,11 @@ /usr/%_lib/libplasma.so.* /usr/%_lib/libprocesscore.so.* /usr/%_lib/libprocessui.so.* +/usr/%_lib/libkfontinst.so.* +/usr/%_lib/libkfontinstui.so.* +/usr/%_lib/strigi/strigita_font.so /usr/share/applications/kde4/klipper.desktop +/usr/share/applications/kde4/kfontview.desktop /usr/share/applications/kde4/kmenuedit.desktop /usr/share/applications/kde4/krandrtray.desktop /usr/share/applications/kde4/ksysguard.desktop @@ -384,10 +410,13 @@ %_kde_share_dir/apps/kdisplay %_kde_share_dir/apps/khotkeys %_kde_share_dir/apps/kicker +%_kde_share_dir/apps/kfontinst +%_kde_share_dir/apps/kfontview %_kde_share_dir/apps/kmenuedit %_kde_share_dir/apps/ksplash %_kde_share_dir/apps/ksysguard %_kde_share_dir/apps/kthememanager +%_kde_share_dir/apps/konqsidebartng %_kde_share_dir/apps/color-schemes /usr/share/autostart/khotkeys.desktop /usr/share/autostart/klipper.desktop @@ -417,6 +446,8 @@ %_kde_share_dir/services/dma.desktop %_kde_share_dir/services/energy.desktop %_kde_share_dir/services/fonts.desktop +%_kde_share_dir/services/fonts.protocol +%_kde_share_dir/services/ServiceMenus/installfont.desktop %_kde_share_dir/services/installktheme.desktop %_kde_share_dir/services/interrupts.desktop %_kde_share_dir/services/ioports.desktop @@ -449,6 +480,10 @@ %_kde_share_dir/services/style.desktop %_kde_share_dir/services/xinerama.desktop %_kde_share_dir/services/xserver.desktop +%_kde_share_dir/services/fontinst.desktop +%_kde_share_dir/services/fonts.desktop +%_kde_share_dir/services/fontthumbnail.desktop +%_kde_share_dir/services/kfontviewpart.desktop %_kde_share_dir/servicetypes/plasma-runner.desktop %_kde_share_dir/servicetypes/screensaver.desktop /usr/share/wallpapers @@ -456,18 +491,18 @@ /etc/systemsettingsrc /usr/bin/solidshell /usr/bin/systemsettings -/usr/%_lib/kde4/kcm_solid.so -/usr/%_lib/kde4/kded_networkstatus.so -/usr/%_lib/kde4/solid_bluez.so -/usr/%_lib/kde4/solid_fakebluetooth.so -/usr/%_lib/kde4/solid_fakenet.so -/usr/%_lib/kde4/solid_hal_power.so +%_libdir/kde4/kcm_solid.so +%_libdir/kde4/kded_networkstatus.so +%_libdir/kde4/solid_bluez.so +%_libdir/kde4/solid_fakebluetooth.so +%_libdir/kde4/solid_fakenet.so +%_libdir/kde4/solid_hal_power.so %if %suse_version > 1020 -/usr/%_lib/kde4/solid_networkmanager.so +%_libdir/kde4/solid_networkmanager.so %endif -/usr/%_lib/libsolidcontrol.so.* -/usr/%_lib/libsolidcontrolifaces.so.* -/usr/%_lib/kde4/kcm_keyboard_layout.so +%_libdir/libsolidcontrol.so.* +%_libdir/libsolidcontrolifaces.so.* +%_libdir/kde4/kcm_keyboard_layout.so #/usr/%_lib/kde4/kxkb_part.so #/usr/share/kde4/services/kxkb_part.desktop /usr/share/kde4/apps/solid @@ -502,11 +537,14 @@ /usr/share/kde4/servicetypes/solidnetworkmanager.desktop /usr/share/kde4/servicetypes/solidpowermanager.desktop /usr/share/kde4/servicetypes/systemsettingscategory.desktop +/usr/share/icons/oxygen/*/mimetypes/fonts-package.* /usr/share/icons/oxygen/*/apps/computer.* +/usr/share/icons/oxygen/*/apps/kfontview.* /usr/share/icons/oxygen/*/apps/daemon.* /usr/share/icons/oxygen/*/apps/kdeapp.* /usr/share/icons/oxygen/*/apps/kernel.* /usr/share/icons/oxygen/*/apps/ksysguardd.* +/usr/share/icons/oxygen/*/apps/preferences-desktop-font-installer.* %if %suse_version > 1020 /usr/share/icons/oxygen/*/apps/networkmanager.* %endif @@ -533,10 +571,14 @@ /etc/kde4/klipperrc /etc/kde4/wallpaper.knsrc /usr/bin/kcheckrunning -/usr/%_lib/kde4/krunner_locations.so +%_libdir/kde4/krunner_locations.so /usr/share/kde4/services/plasma-runner-locations.desktop +/usr/share/kde4/services/settings-display.desktop +/usr/%_lib/kde4/kfontviewpart.so %changelog +* Sat Jan 05 2008 - stbinner@suse.de +- update to 4.0 release * Wed Jan 02 2008 - stbinner@suse.de - update to 3.97.2 * Thu Dec 20 2007 - stbinner@suse.de ++++++ 4_0_BRANCH.diff ++++++ ++++ 4434 lines (skipped) ++++++ kdebase-workspace-3.97.2.tar.bz2 -> kdebase-workspace-4.0.0.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-3.97.2.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase-workspace-4.0.0.tar.bz2 differ: byte 11, line 1 ++++++ kickoff-better-presentation.diff ++++++ --- /var/tmp/diff_new_pack.X23175/_old 2008-01-11 11:49:33.000000000 +0100 +++ /var/tmp/diff_new_pack.X23175/_new 2008-01-11 11:49:33.000000000 +0100 @@ -35,9 +35,9 @@ } } -Index: workspace/plasma/applets/kickoff/ui/itemdelegate.cpp +Index: plasma/applets/kickoff/ui/itemdelegate.cpp =================================================================== ---- plasma/applets/kickoff/ui/itemdelegate.cpp (revision 749593) +--- plasma/applets/kickoff/ui/itemdelegate.cpp (revision 758549) +++ plasma/applets/kickoff/ui/itemdelegate.cpp (working copy) @@ -73,13 +73,13 @@ @@ -65,7 +65,16 @@ textAreaRect.adjust(decorationRect.width() + ICON_TEXT_MARGIN - 3, 0, -(titleRect.width() - actualTextWidth) + 3, -@@ -109,12 +109,16 @@ +@@ -100,7 +100,7 @@ + // for the background + backgroundColor.setAlphaF(0.5); + painter->setBrush(QBrush(backgroundColor)); +- painter->drawPath(roundedRectangle(textAreaRect, 5)); ++ painter->drawPath(roundedRectangle(option.rect, 5)); + painter->restore(); + } + +@@ -112,12 +112,16 @@ // draw title painter->setFont(titleFont); @@ -85,7 +94,7 @@ } painter->restore(); -@@ -199,7 +203,7 @@ +@@ -202,7 +206,7 @@ subTitleFont.setPointSize(qMax(subTitleFont.pointSize() - 2, KGlobalSettings::smallestReadableFont().pointSize())); QFontMetrics subMetrics(subTitleFont); @@ -94,3 +103,16 @@ // kDebug() << "size hint is" << size << (metrics.height() + subMetrics.ascent()); return size; +Index: plasma/applets/kickoff/ui/itemdelegate.h +=================================================================== +--- plasma/applets/kickoff/ui/itemdelegate.h (revision 758549) ++++ plasma/applets/kickoff/ui/itemdelegate.h (working copy) +@@ -59,7 +59,7 @@ + + static const int ITEM_LEFT_MARGIN = 25; + static const int ITEM_RIGHT_MARGIN = 7; +- static const int ITEM_HEIGHT = 32; ++ static const int ITEM_HEIGHT = 32 + 4; + static const int TOP_OFFSET = 5; + + static const int BACK_ARROW_WIDTH = 20; ++++++ kickoff-defaults.diff ++++++ Index: plasma/applets/kickoff/core/systemmodel.cpp =================================================================== --- plasma/applets/kickoff/core/systemmodel.cpp (revision 758549) +++ plasma/applets/kickoff/core/systemmodel.cpp (working copy) @@ -110,7 +110,11 @@ { KConfigGroup appsGroup = componentData().config()->group("SystemApplications"); QStringList defaultApps; - defaultApps << "kde4-systemsettings.desktop"; + defaultApps << "kde4-systemsettings.desktop" << "YaST.desktop" << "package-manager.desktop"; + + if (KService::serviceByStorageId("YaST2/live-installer.desktop")) + defaultApps << "YaST2/live-installer.desktop"; + appsList = appsGroup.readEntry("DesktopFiles", defaultApps); } Index: plasma/applets/kickoff/core/favoritesmodel.cpp =================================================================== --- plasma/applets/kickoff/core/favoritesmodel.cpp (revision 758549) +++ plasma/applets/kickoff/core/favoritesmodel.cpp (working copy) @@ -67,12 +67,15 @@ static QList<QString> defaultFavorites() { QList<QString> applications; - applications << "konqbrowser" << "kmail" << "systemsettings" << "dolphin"; + applications << "konqbrowser.desktop" << "MozillaFirefox.desktop" << "kde-Kontact.desktop" + << "writer.desktop" << "kde-amarok.desktop" << "kde-digikam.desktop" << "kde4-dolphin.desktop" + << "kde4-systemsettings.desktop" << "kde4-Help.desktop" << "kde4-konsole.desktop"; + QList<QString> desktopFiles; foreach(const QString& application,applications) { - KService::Ptr service = KService::serviceByStorageId("kde4-" + application + ".desktop"); + KService::Ptr service = KService::serviceByStorageId(application); if (service) { desktopFiles << service->entryPath(); } ++++++ kickoff-favorites-starter.diff ++++++ --- plasma/applets/kickoff/ui/launcher.cpp 2008/01/10 16:35:37 1.1 +++ plasma/applets/kickoff/ui/launcher.cpp 2008/01/10 16:36:58 @@ -506,6 +506,7 @@ void Launcher::showEvent(QShowEvent *e) { d->searchBar->setFocus(); + d->contentSwitcher->setCurrentIndex(0); QWidget::showEvent(e); } ++++++ kickoff-footer.diff ++++++ Index: plasma/applets/kickoff/ui/launcher.cpp =================================================================== --- plasma/applets/kickoff/ui/launcher.cpp (revision 758549) +++ plasma/applets/kickoff/ui/launcher.cpp (working copy) @@ -18,6 +18,8 @@ Boston, MA 02110-1301, USA. */ +#include <unistd.h> + // Own #include "ui/launcher.h" @@ -30,12 +32,16 @@ #include <QStackedWidget> #include <QTabBar> #include <QVBoxLayout> +#include <QLabel> +#include <QToolButton> // KDE #include <KLocalizedString> #include <KIcon> #include <solid/device.h> #include <solid/deviceinterface.h> +#include <ktoolinvocation.h> +#include <kuser.h> // Local #include "core/favoritesmodel.h" @@ -62,6 +68,7 @@ : q(launcher) , urlLauncher(new UrlItemLauncher(launcher)) , searchBar(0) + , footer(0) , contentArea(0) , contentSwitcher(0) , searchView(0) @@ -233,6 +240,7 @@ Launcher * const q; UrlItemLauncher *urlLauncher; SearchBar *searchBar; + QWidget *footer; QStackedWidget *contentArea; TabBar *contentSwitcher; QAbstractItemView *searchView; @@ -268,6 +276,35 @@ layout->addWidget(d->contentArea); layout->addWidget(d->contentSwitcher); + // Add status information footer + d->footer = new QWidget; + d->footer->setBackgroundRole(QPalette::AlternateBase); + d->footer->setAutoFillBackground(true); + + char hostname[256]; + hostname[0] = '\0'; + if (!gethostname( hostname, sizeof(hostname) )) + hostname[sizeof(hostname)-1] = '\0'; + QLabel *userinfo = new QLabel(i18n( "User <b>%1</b> on <b>%2</b>", KUser().loginName(), hostname ) ); + userinfo->setForegroundRole(QPalette::Dark); + + QToolButton *branding = new QToolButton; + QPixmap icon = QPixmap("/usr/share/kde4/apps/desktoptheme/default/opensuse.png"); + branding->setIcon(icon); + branding->setIconSize(icon.size()); + connect( branding, SIGNAL(clicked()), SLOT(openHomepage())); + + QHBoxLayout *footerlayout = new QHBoxLayout; + footerlayout->insertSpacing(0, 2); + footerlayout->setMargin(0); + footerlayout->addWidget(userinfo); + footerlayout->insertStretch(2); + footerlayout->addWidget(branding); + footerlayout->insertSpacing(2, 10); + d->footer->setLayout(footerlayout); + + layout->addWidget(d->footer); + setLayout(layout); } @@ -284,7 +321,7 @@ //size.rheight() += 102; size.rheight() = d->searchBar->sizeHint().height() + - d->contentSwitcher->sizeHint().height() + + d->contentSwitcher->sizeHint().height() + d->footer->sizeHint().height() + ItemDelegate::ITEM_HEIGHT * d->visibleItemCount; return size; @@ -486,5 +523,11 @@ p.drawRect(rect().adjusted(0, 0, -1, -1)); } +void Launcher::openHomepage() +{ + hide(); + KToolInvocation::invokeBrowser("http://opensuse.org"); +} + #include "launcher.moc" Index: plasma/applets/kickoff/ui/launcher.h =================================================================== --- plasma/applets/kickoff/ui/launcher.h (revision 758549) +++ plasma/applets/kickoff/ui/launcher.h (working copy) @@ -76,6 +76,7 @@ void focusSearchView(const QString& query); void focusFavoritesView(); void showViewContextMenu(const QPoint& pos); + void openHomepage(); private: class Private; ++++++ kwin-suse.diff ++++++ Index: workspace/kwin/clients/oxygen/oxygenclient.cpp =================================================================== --- kwin/clients/oxygen/oxygenclient.cpp (revision 758549) +++ kwin/clients/oxygen/oxygenclient.cpp (working copy) @@ -57,6 +57,9 @@ #include "oxygenbutton.h" #include "oxygen.h" +#define logourl "/usr/share/kde4/apps/kwin/titlebar_decor.png" +#define logooffset 5 + namespace Oxygen { @@ -73,6 +76,7 @@ , colorCacheInvalid_(true) , helper_(*globalHelper) { + logo.load(logourl); } OxygenClient::~OxygenClient() @@ -277,7 +281,7 @@ const int titleWidth = frame.width() - titleEdgeLeft - layoutMetric(LM_TitleEdgeRight) - buttonsLeftWidth() - buttonsRightWidth() - - marginLeft - marginRight; + marginLeft - marginRight - logo.width() - logooffset; int splitY = qMin(300, 3*frame.height()/4); @@ -309,6 +313,12 @@ painter.drawText(titleLeft, titleTop-1, titleWidth, titleHeight, // -1 is to go into top resizearea OxygenFactory::titleAlign() | Qt::AlignVCenter, caption()); + if (isActive()) { + QFontMetrics fm(options()->font(isActive(), false)); + painter.drawImage(titleEdgeLeft + layoutMetric(LM_TitleEdgeRight) + buttonsLeftWidth() + + qMin(fm.width(caption()), titleWidth) + logooffset, titleTop, logo); + } + painter.setRenderHint(QPainter::Antialiasing); // Draw dividing line Index: workspace/kwin/clients/oxygen/oxygenclient.h =================================================================== --- kwin/clients/oxygen/oxygenclient.h (revision 758549) +++ kwin/clients/oxygen/oxygenclient.h (working copy) @@ -57,6 +57,7 @@ QColor titlebarTextColor(const QPalette &palette); bool colorCacheInvalid_; QColor cachedTitlebarTextColor_; + QImage logo; protected: friend class OxygenButton; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org