Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Thu Apr 2 20:14:07 CEST 2009. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2009-03-24 20:27:28.000000000 +0100 +++ kdebase4-workspace/kdebase4-wallpapers.changes 2009-04-02 20:12:50.977784000 +0200 @@ -1,0 +2,6 @@ +Fri Mar 27 00:43:01 CET 2009 - dmueller@suse.de + +- update to 4.2.2 + * see http://kde.org/announcements/changelogs/changelog4_2_1to4_2_2.php + +------------------------------------------------------------------- kdebase4-workspace.changes: same change python-kdebase4.changes: same change calling whatdependson for head-i586 Old: ---- kdebase-workspace-4.2.1.tar.bz2 New: ---- kdebase-workspace-4.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.r11278/_old 2009-04-02 20:12:59.000000000 +0200 +++ /var/tmp/diff_new_pack.r11278/_new 2009-04-02 20:12:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-wallpapers (Version 4.2.1) +# spec file for package kdebase4-wallpapers (Version 4.2.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 4.2.1 -Release: 4 +Version: 4.2.2 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -67,6 +67,9 @@ /usr/share/wallpapers %changelog +* Fri Mar 27 2009 dmueller@suse.de +- update to 4.2.2 + * see http://kde.org/announcements/changelogs/changelog4_2_1to4_2_2.php * Sun Mar 15 2009 coolo@suse.de - update 4_2_BRANCH.diff - several kickoff fixes * Fri Mar 06 2009 coolo@suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.r11278/_old 2009-04-02 20:12:59.000000000 +0200 +++ /var/tmp/diff_new_pack.r11278/_new 2009-04-02 20:12:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-workspace (Version 4.2.1) +# spec file for package kdebase4-workspace (Version 4.2.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -37,8 +37,8 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 4.2.1 -Release: 4 +Version: 4.2.2 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 Source1: rediff-plasma.sh Source2: titlebar_decor.png @@ -231,7 +231,7 @@ %defattr(-,root,root) %doc COPYING %if 0 -%_kde_share_dir/apps/desktoptheme/default/widgets/branding.svg +%_kde_share_dir/apps/desktoptheme/default/widgets/branding.svgz %endif %_kde_share_dir/apps/kwin/titlebar_decor.png @@ -837,6 +837,9 @@ /usr/share/kde4/services/kded/kwrited.desktop %changelog +* Fri Mar 27 2009 dmueller@suse.de +- update to 4.2.2 + * see http://kde.org/announcements/changelogs/changelog4_2_1to4_2_2.php * Sun Mar 15 2009 coolo@suse.de - update 4_2_BRANCH.diff - several kickoff fixes * Fri Mar 06 2009 coolo@suse.de ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.r11278/_old 2009-04-02 20:13:00.000000000 +0200 +++ /var/tmp/diff_new_pack.r11278/_new 2009-04-02 20:13:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-kdebase4 (Version 4.2.1) +# spec file for package python-kdebase4 (Version 4.2.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ Group: System/GUI/KDE Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ -Version: 4.2.1 -Release: 3 +Version: 4.2.2 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python-kde4 = %{version} @@ -68,6 +68,9 @@ %_kde_share_dir/services/plasma-*.desktop %changelog +* Fri Mar 27 2009 dmueller@suse.de +- update to 4.2.2 + * see http://kde.org/announcements/changelogs/changelog4_2_1to4_2_2.php * Sun Mar 15 2009 coolo@suse.de - update 4_2_BRANCH.diff - several kickoff fixes * Fri Mar 06 2009 coolo@suse.de ++++++ 4_2_BRANCH.diff ++++++ ++++ 10945 lines (skipped) ++++ between KDE/kdebase4-workspace/4_2_BRANCH.diff ++++ and kdebase4-workspace/4_2_BRANCH.diff ++++++ kdebase-workspace-4.2.1.tar.bz2 -> kdebase-workspace-4.2.2.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.2.1.tar.bz2 kdebase4-workspace/kdebase-workspace-4.2.2.tar.bz2 differ: byte 11, line 1 ++++++ kwin-suse.diff ++++++ --- /var/tmp/diff_new_pack.r11278/_old 2009-04-02 20:13:00.000000000 +0200 +++ /var/tmp/diff_new_pack.r11278/_new 2009-04-02 20:13:00.000000000 +0200 @@ -1,5 +1,3 @@ -Index: kwin/clients/ozone/oxygenclient.cpp -================================================================================ --- kwin/clients/ozone/oxygenclient.cpp +++ kwin/clients/ozone/oxygenclient.cpp @@ -59,6 +59,9 @@ @@ -12,14 +10,14 @@ namespace Ozone { namespace Oxygen -@@ -93,6 +96,7 @@ - - OxygenClient::~OxygenClient() +@@ -89,6 +92,7 @@ + , helper_(*globalHelper) { + qAddPostRoutine(oxkwincleanupBefore); + logo.load(logourl); } - QString OxygenClient::visibleName() const - { + + OxygenClient::~OxygenClient() @@ -305,7 +309,7 @@ const int titleWidth = frame.width() - titleEdgeLeft - layoutMetric(LM_TitleEdgeRight) - ++++++ plasma.diff ++++++ --- /var/tmp/diff_new_pack.r11278/_old 2009-04-02 20:13:00.000000000 +0200 +++ /var/tmp/diff_new_pack.r11278/_new 2009-04-02 20:13:00.000000000 +0200 @@ -19,17 +19,44 @@ c->setScreen(screen, desktop); c->setFormFactor(Plasma::Planar); c->flushPendingConstraintsEvents(); -@@ -210,6 +213,10 @@ +@@ -209,6 +212,23 @@ + applet->setGlobalShortcut(KShortcut("Alt+F1")); + } + ++ if (QFile::exists("/usr/share/kde4/services/plasma-applet-showdashboard.desktop")) ++ loadDefaultApplet("showdashboard", panel); ++ ++ QVariantList args; ++ if (QFile::exists("/usr/share/applications/kde4/dolphin.desktop")) { ++ args << "/usr/share/applications/kde4/dolphin.desktop"; ++ QRectF rect; ++ panel->addApplet("icon", args, rect); ++ } ++ ++ args.clear(); ++ if (QFile::exists("/usr/share/applications/kde4/konqbrowser.desktop")) { ++ args << "/usr/share/applications/kde4/konqbrowser.desktop"; ++ QRectF rect; ++ panel->addApplet("icon", args, rect); ++ } ++ + loadDefaultApplet("notifier", panel); + loadDefaultApplet("pager", panel); + loadDefaultApplet("tasks", panel); +@@ -224,7 +244,13 @@ } engines->unloadEngine("powermanagement"); - + + if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) { + loadDefaultApplet("networkmanagement", panel); + } + loadDefaultApplet("digital-clock", panel); ++ loadDefaultApplet("lockout", panel); ++ emit containmentAdded(panel); - + + QTimer::singleShot(1000, this, SLOT(saveDefaultSetup())); --- plasma/containments/CMakeLists.txt +++ plasma/containments/CMakeLists.txt @@ -2,3 +2,4 @@ @@ -2693,3 +2720,126 @@ /** * FIXME This is a temporary workaround to map the icon names found * in the desktop directory files (from /usr/share/desktop-directories) +Index: plasma/wallpapers/image/backgroundpackage.h +=================================================================== +--- plasma/wallpapers/image/backgroundpackage.h (revision 945879) ++++ plasma/wallpapers/image/backgroundpackage.h (working copy) +@@ -124,7 +124,7 @@ + virtual QString license() const; + virtual bool isValid() const; + private: +- QString m_file; ++ QString m_file, m_author, m_title; + float m_ratio; + + mutable bool m_resizer_started; +Index: plasma/wallpapers/image/backgroundpackage.cpp +=================================================================== +--- plasma/wallpapers/image/backgroundpackage.cpp (revision 945879) ++++ plasma/wallpapers/image/backgroundpackage.cpp (working copy) +@@ -27,6 +27,8 @@ + #include <KDebug> + #include <KLocalizedString> + #include <KStandardDirs> ++#include <KDesktopFile> ++#include <KConfigGroup> + #include <KSvgRenderer> + #include + #include +@@ -313,9 +315,17 @@ + + BackgroundFile::BackgroundFile(const QString &file, float ratio) + : m_file(file) ++, m_author(QString()) ++, m_title(QFileInfo(m_file).baseName()) + , m_ratio(ratio) + , m_resizer_started(false) + { ++ if (QFile::exists(file+".desktop")) { ++ KDesktopFile config(file+".desktop"); ++ KConfigGroup cg = config.group("Wallpaper"); ++ m_title = cg.readEntry("Name", m_title); ++ m_author = cg.readEntry("Author", QString()); ++ } + } + + BackgroundFile::~BackgroundFile() +@@ -358,12 +368,12 @@ + //TODO: impl + QString BackgroundFile::author() const + { +- return QString(); ++ return m_author; + } + + QString BackgroundFile::title() const + { +- return QFileInfo(m_file).completeBaseName(); ++ return m_title; + } + + //TODO: impl +Index: plasma/wallpapers/image/backgroundlistmodel.cpp +=================================================================== +--- plasma/wallpapers/image/backgroundlistmodel.cpp (revision 945879) ++++ plasma/wallpapers/image/backgroundlistmodel.cpp (working copy) +@@ -14,6 +14,8 @@ + + #include <KGlobal> + #include <KStandardDirs> ++#include <KDesktopFile> ++#include <KConfigGroup> + + #include "backgroundpackage.h" + #include "backgrounddelegate.h" +@@ -175,7 +177,13 @@ + dir.setFilter(QDir::Files | QDir::Hidden | QDir::Readable); + QFileInfoList files = dir.entryInfoList(); + foreach (const QFileInfo &wp, files) { +- if (!container || !container->contains(wp.filePath())) { ++ bool hidden = false; ++ if (QFile::exists(wp.filePath()+".desktop")) { ++ KDesktopFile config(wp.filePath()+".desktop"); ++ KConfigGroup cg = config.group("Wallpaper"); ++ hidden = cg.readEntry("Hidden", false); ++ } ++ if (!hidden && (!container || !container->contains(wp.filePath()))) { + //kDebug() << " adding image file" << wp.filePath(); + res.append(new BackgroundFile(wp.filePath(), ratio)); + } +Index: plasma/shells/desktop/panelcontroller.cpp +=================================================================== +--- plasma/shells/desktop/panelcontroller.cpp (revision 945879) ++++ plasma/shells/desktop/panelcontroller.cpp (working copy) +@@ -883,6 +883,7 @@ + newX - screenGeom.left() <= screenGeom.width()/3) { + move(newX, pos().y()); + d->resizeFrameHeight(geometry().left() - screenGeom.left()); ++ d->sizeTool->setText(i18n("Width: %1", screenGeom.left() + (mapToGlobal(event->pos()).x() - d->startDragPos.x()))); + } + break; + } +@@ -892,6 +893,7 @@ + newX + width() - screenGeom.left() >= 2*(screenGeom.width()/3)) { + move(newX, pos().y()); + d->resizeFrameHeight(screenGeom.right() - geometry().right()); ++ d->sizeTool->setText(i18n("Width: %1", screenGeom.right() - (mapToGlobal(event->pos()).x() - d->startDragPos.x()) - width() + 1)); + } + break; + } +@@ -901,6 +903,7 @@ + newY - screenGeom.top()<= screenGeom.height()/3) { + move(pos().x(), newY); + d->resizeFrameHeight(geometry().top() - screenGeom.top()); ++ d->sizeTool->setText(i18n("Height: %1", screenGeom.top() + (mapToGlobal(event->pos()).y() - d->startDragPos.y()))); + } + break; + } +@@ -911,6 +914,7 @@ + newY + height() - screenGeom.top() >= 2*(screenGeom.height()/3)) { + move(pos().x(), newY); + d->resizeFrameHeight(screenGeom.bottom() - geometry().bottom()); ++ d->sizeTool->setText(i18n("Height: %1", screenGeom.bottom() - (mapToGlobal(event->pos()).y() - d->startDragPos.y()) - height() + 1)); + } + break; + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org