![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package kdebase4-workspace checked in at Wed Jun 25 19:51:02 CEST 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-06-23 22:39:49.000000000 +0200 +++ kdebase4-workspace/kdebase4-wallpapers.changes 2008-06-25 19:46:28.289794000 +0200 @@ -1,0 +2,10 @@ +Tue Jun 24 14:51:45 CEST 2008 - dmueller@suse.de + +- update to 4.0.83 + +------------------------------------------------------------------- +Tue Jun 24 13:22:41 CEST 2008 - stbinner@suse.de + +- add plasma.diff for basic branding and integration + +------------------------------------------------------------------- kdebase4-workspace.changes: same change Old: ---- dotkde4.diff kdebase-workspace-4.0.82.tar.bz2 New: ---- kdebase-workspace-4.0.83.tar.bz2 plasma.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.P22173/_old 2008-06-25 19:47:32.000000000 +0200 +++ /var/tmp/diff_new_pack.P22173/_new 2008-06-25 19:47:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-wallpapers (Version 4.0.82) +# spec file for package kdebase4-wallpapers (Version 4.0.83) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,7 +21,7 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 4.0.82 +Version: 4.0.83 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,6 +59,10 @@ /usr/share/wallpapers %changelog +* Tue Jun 24 2008 dmueller@suse.de +- update to 4.0.83 +* Tue Jun 24 2008 stbinner@suse.de +- add plasma.diff for basic branding and integration * Mon Jun 23 2008 dmueller@suse.de - update to 4.0.82 * Thu Jun 05 2008 wstephenson@suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.P22173/_old 2008-06-25 19:47:32.000000000 +0200 +++ /var/tmp/diff_new_pack.P22173/_new 2008-06-25 19:47:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-workspace (Version 4.0.82) +# spec file for package kdebase4-workspace (Version 4.0.83) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -26,7 +26,7 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 4.0.82 +Version: 4.0.83 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 Source2: titlebar_decor.png @@ -34,7 +34,7 @@ Source91: kdebase4-workspace-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: 4_1_BRANCH.diff -Patch1: dotkde4.diff +Patch1: plasma.diff Patch8: kwin-suse.diff Patch10: kwin-two-desktops.diff Patch18: startkde.diff @@ -530,6 +530,7 @@ /usr/share/autostart/klipper.desktop /usr/share/autostart/krunner.desktop %config %_kde_config_dir/background.knsrc +%config %_kde_config_dir/plasmoids.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 @@ -586,8 +587,10 @@ %if %suse_version > 1030 %_libdir/kde4/solid_networkmanager07.so %else +%if %suse_version > 1020 %_libdir/kde4/solid_networkmanager.so %endif +%endif %_libdir/libsolidcontrol.so.* %_libdir/libsolidcontrolifaces.so.* %_libdir/kde4/kcm_keyboard_layout.so @@ -700,6 +703,10 @@ %exclude /usr/share/wallpapers/default_blue.jpg.desktop %changelog +* Tue Jun 24 2008 dmueller@suse.de +- update to 4.0.83 +* Tue Jun 24 2008 stbinner@suse.de +- add plasma.diff for basic branding and integration * Mon Jun 23 2008 dmueller@suse.de - update to 4.0.82 * Thu Jun 05 2008 wstephenson@suse.de ++++++ 4_1_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.P22173/_old 2008-06-25 19:47:32.000000000 +0200 +++ /var/tmp/diff_new_pack.P22173/_new 2008-06-25 19:47:32.000000000 +0200 @@ -1,17 +1,90 @@ -package: kdebase-workspace-4.0.82.tar.bz2 +package: kdebase-workspace-4.0.83.tar.bz2 kdemod: kdebase/workspace --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: -+svn di between //trunk/KDE/kdebase/workspace@819047 and //trunk/KDE/kdebase/workspace ---- kscreensaver/libkscreensaver/kscreensaver.cpp -+++ kscreensaver/libkscreensaver/kscreensaver.cpp -@@ -51,6 +51,7 @@ - bool r = QWidget::event(e); - if (e->type() == QEvent::Polish) - setAttribute(Qt::WA_StyledBackground, false); -+ return r; - } ++current HEAD: 821903 ++svn di between //tags/KDE/4.0.83/kdebase/workspace and //trunk/KDE/kdebase/workspace +--- kcontrol/kfontinst/kio/KioFonts.cpp ++++ kcontrol/kfontinst/kio/KioFonts.cpp +@@ -2243,20 +2243,17 @@ + { + KFI_DBUG << "timout:" << timeout << " folder:" << (int)folder << " clearList:" << clearList; - void KScreenSaver::embed( QWidget *w ) +- if(FOLDER_SYS!=folder || itsRoot) ++ if(dirs.count()) + { +- if(dirs.count()) +- { +- CDirList::ConstIterator it(dirs.begin()), +- end(dirs.end()); ++ CDirList::ConstIterator it(dirs.begin()), ++ end(dirs.end()); + +- for(; it!=end; ++it) +- itsFolders[folder].modified.add(*it); +- } +- else +- itsFolders[folder].modified.add(itsFolders[folder].location); +- setTimeoutSpecialCommand(timeout ? timeout : -1); ++ for(; it!=end; ++it) ++ itsFolders[folder].modified.add(*it); + } ++ else ++ itsFolders[folder].modified.add(itsFolders[folder].location); ++ setTimeoutSpecialCommand(timeout ? timeout : -1); + + if(clearList) + clearFontList(); // List of fonts has changed.../ +--- kcontrol/kfontinst/lib/Misc.cpp ++++ kcontrol/kfontinst/lib/Misc.cpp +@@ -426,7 +426,7 @@ + { + int len = home.length(); + +- if(len>=0 && (path.length() == len || path[len] == '/')) ++ if(len>1 && (path.length() == len || path[len] == '/')) + return path.replace(0, len, QString::fromLatin1("~")); + } + } +--- kwin/scene_xrender.cpp ++++ kwin/scene_xrender.cpp +@@ -139,6 +139,7 @@ + } + XRenderFreePicture( display(), front ); + XRenderFreePicture( display(), buffer ); ++ buffer = None; + wspace->destroyOverlay(); + foreach( Window* w, windows ) + delete w; +@@ -153,8 +154,6 @@ + // so it is done manually using this buffer, + void SceneXrender::createBuffer() + { +- if( buffer != None ) +- XRenderFreePicture( display(), buffer ); + Pixmap pixmap = XCreatePixmap( display(), rootWindow(), displayWidth(), displayHeight(), DefaultDepth( display(), DefaultScreen( display()))); + buffer = XRenderCreatePicture( display(), pixmap, format, 0, 0 ); + XFreePixmap( display(), pixmap ); // The picture owns the pixmap now +--- plasma/applets/lock_logout/plasma-applet-lockout.desktop ++++ plasma/applets/lock_logout/plasma-applet-lockout.desktop +@@ -84,7 +84,7 @@ + Comment[x-test]=xxLets user lock screen or end sessionxx + Comment[zh_CN]=让用户锁定屏幕或结束会话 + Comment[zh_TW]=讓使用者鎖定螢幕或結束工作階段 +-Icon=system-log-out ++Icon=system-shutdown + Type=Service + X-KDE-ServiceTypes=Plasma/Applet + +--- plasma/applets/tasks/windowtaskitem.cpp ++++ plasma/applets/tasks/windowtaskitem.cpp +@@ -321,7 +321,7 @@ + if (option->state & QStyle::State_Sunken) { + alphaPixmap->fill(QColor(0, 0, 0, 50)); + } else { +- alphaPixmap->fill(QColor(0, 0, 0, 255 * (1.0 - m_alpha))); ++ alphaPixmap->fill(QColor(0, 0, 0, 255 * m_alpha)); + } + + { ++++++ kde4-migrate.diff ++++++ --- /var/tmp/diff_new_pack.P22173/_old 2008-06-25 19:47:32.000000000 +0200 +++ /var/tmp/diff_new_pack.P22173/_new 2008-06-25 19:47:32.000000000 +0200 @@ -1,16 +1,6 @@ --- startkde.cmake +++ startkde.cmake -@@ -48,15 +48,20 @@ - # - # * Then ksmserver is started which takes control of the rest of the startup sequence - --# The user's personal KDE directory is usually ~/.kde, but this setting -+# The user's personal KDE directory is usually ~/.kde4, but this setting - # may be overridden by setting KDEHOME. - - kdehome=`kde4-config --localprefix` - if test $? -ne 0; then - kdehome=$HOME/.kde4 +@@ -48,6 +48,11 @@ fi test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"` ++++++ kdebase-workspace-4.0.82.tar.bz2 -> kdebase-workspace-4.0.83.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.0.82.tar.bz2 kdebase4-workspace/kdebase-workspace-4.0.83.tar.bz2 differ: byte 11, line 1 ++++++ plasma.diff ++++++ Index: plasma/containments/desktop/backgrounddialog.cpp =================================================================== --- plasma/containments/desktop/backgrounddialog.cpp (revision 823825) +++ plasma/containments/desktop/backgrounddialog.cpp (working copy) @@ -635,12 +635,17 @@ } m_selected = config.readEntry("selected", QStringList()); m_model->reload(m_selected); - QString currentPath = config.readEntry("wallpaper", - KStandardDirs::locate("wallpaper", "EOS/contents/images/1920x1200.jpg")); + KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasmarc"); + KConfigGroup group = KConfigGroup(defaultconfig, "Defaults"); + QString defaultPath = group.readEntry("wallpaper", "EOS/contents/images/1920x1200.jpg"); + + QString currentPath = config.readEntry("wallpaper", defaultPath); + kDebug() << "Default would be" << KStandardDirs::locate("wallpaper", "EOS/contents/images/1920x1200.jpg"); kDebug() << "but we're loading" << currentPath << "instead"; + m_model->addBackground(currentPath); int index = m_model->indexOf(currentPath); if (index != -1) { m_view->setCurrentIndex(index); Index: plasma/containments/desktop/desktop.cpp =================================================================== --- plasma/containments/desktop/desktop.cpp (revision 823825) +++ plasma/containments/desktop/desktop.cpp (working copy) @@ -243,7 +247,9 @@ void DefaultDesktop::updateBackground() { if (m_wallpaperPath.isEmpty() && m_backgroundMode != BackgroundDialog::kNoBackground) { - QString defaultPath = QString("EOS/contents/images/%1x%2.jpg"); + KSharedConfigPtr config = KSharedConfig::openConfig("plasmarc"); + KConfigGroup group = KConfigGroup(config, "Defaults"); + QString defaultPath = group.readEntry("wallpaper", "EOS/contents/images/%1x%2.jpg"); QString testPath = defaultPath.arg(geometry().width()).arg(geometry().height()); m_wallpaperPath = KStandardDirs::locate("wallpaper", testPath); Index: plasma/applets/kickoff/simpleapplet/simpleapplet.cpp =================================================================== --- plasma/applets/kickoff/simpleapplet/simpleapplet.cpp (revision 823825) +++ plasma/applets/kickoff/simpleapplet/simpleapplet.cpp (working copy) @@ -30,6 +30,7 @@ #include <QMetaEnum> #include <QPointer> #include <QGraphicsLinearLayout> +#include <QFile> // KDE #include <KIcon> @@ -122,7 +123,10 @@ QString viewIcon() { switch( viewtype ) { case Combined: - return "start-here-kde"; + if (QFile::exists("/usr/share/icons/oxygen/scalable/places/start-here-branding.svg")) + return "start-here-branding"; + else + return "start-here-kde"; case Favorites: return "bookmarks"; case Applications: Index: plasma/applets/kickoff/applet/applet.cpp =================================================================== --- plasma/applets/kickoff/applet/applet.cpp (revision 823825) +++ plasma/applets/kickoff/applet/applet.cpp (working copy) @@ -29,6 +29,7 @@ #include <QVBoxLayout> #include <QLabel> #include <QGraphicsLinearLayout> +#include <QFile> // KDE #include <KIcon> @@ -77,7 +78,10 @@ { setHasConfigurationInterface(true); setBackgroundHints(NoBackground); - d->icon = new Plasma::Icon(KIcon("start-here-kde"), QString(), this); + if (QFile::exists("/usr/share/icons/oxygen/scalable/places/start-here-branding.svg")) + d->icon = new Plasma::Icon(KIcon("start-here-branding"), QString(), this); + else + d->icon = new Plasma::Icon(KIcon("start-here-kde"), QString(), this); d->icon->setFlag(ItemIsMovable, false); connect(d->icon, SIGNAL(pressed(bool)), this, SLOT(toggleMenu(bool))); connect(this, SIGNAL(activate()), this, SLOT(toggleMenu())); Index: plasma/applets/kickoff/core/systemmodel.cpp =================================================================== --- plasma/applets/kickoff/core/systemmodel.cpp (revision 823825) +++ plasma/applets/kickoff/core/systemmodel.cpp (working copy) @@ -87,7 +87,7 @@ connect(placesModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), q, SLOT(sourceRowsRemoved(QModelIndex,int,int))); - topLevelSections << i18n("Applications") + topLevelSections << i18n("Administration") << i18n("Places") << i18n("Removable Storage") << i18n("Storage"); Index: plasma/applets/kickoff/core/models.cpp =================================================================== --- plasma/applets/kickoff/core/models.cpp (revision 823825) +++ plasma/applets/kickoff/core/models.cpp (working copy) @@ -155,7 +155,19 @@ { KConfigGroup appsGroup = componentData().config()->group("SystemApplications"); QStringList apps; - apps << "systemsettings"; + + if (QFile::exists("/usr/share/applications/YaST.desktop")) + apps << "YaST.desktop"; + + if (QFile::exists("/usr/share/applications/package-manager.desktop")) + apps << "package-manager.desktop"; + + if (KService::serviceByStorageId("YaST2/live-installer.desktop")) + apps << "YaST2/live-installer.desktop"; +/* + if (QFile::exists("/usr/share/kde4/services/sysinfo.protocol")) + apps << "/usr/share/kde4/services/sysinfo.protocol"; +*/ apps = appsGroup.readEntry("DesktopFiles", apps); return apps; } Index: plasma/applets/kickoff/core/favoritesmodel.cpp =================================================================== --- plasma/applets/kickoff/core/favoritesmodel.cpp (revision 823825) +++ plasma/applets/kickoff/core/favoritesmodel.cpp (working copy) @@ -85,12 +85,14 @@ static QList<QString> defaultFavorites() { QList<QString> applications; - applications << "konqbrowser" << "kmail" << "systemsettings" << "dolphin"; + applications << "MozillaFirefox.desktop" << "kde4-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(); } Index: plasma/applets/kickoff/ui/launcher.cpp =================================================================== --- plasma/applets/kickoff/ui/launcher.cpp (revision 823825) +++ plasma/applets/kickoff/ui/launcher.cpp (working copy) @@ -866,7 +866,7 @@ void Launcher::openHomepage() { hide(); - KToolInvocation::invokeBrowser("http://www.kde.org/"); + KToolInvocation::invokeBrowser("http://www.opensuse.org/"); } void Launcher::resultsAvailable() Index: plasma/plasma/desktopcorona.cpp =================================================================== --- plasma/plasma/desktopcorona.cpp (revision 823825) +++ plasma/plasma/desktopcorona.cpp (working copy) @@ -132,11 +134,30 @@ // some default applets to get a usable UI Plasma::Applet *launcher = panel->addApplet("launcher"); launcher->setGlobalShortcut(KShortcut("Alt+F1")); - panel->addApplet("notifier"); + + if (QFile::exists("/usr/share/kde4/services/plasma-applet-showdashboard.desktop")) + panel->addApplet("showdashboard"); + + 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); + } + panel->addApplet("pager"); panel->addApplet("tasks"); panel->addApplet("systemtray"); + panel->addApplet("notifier"); panel->addApplet("digital-clock"); + panel->addApplet("lockout"); } void DesktopCorona::screenResized(int screen) Index: plasma/plasma/desktopcorona.cpp =================================================================== --- plasma/plasma/desktopcorona.cpp (revision 823825) +++ plasma/plasma/desktopcorona.cpp (working copy) @@ -23,6 +23,7 @@ #include <QDesktopWidget> #include <QDir> #include <QGraphicsLayout> +#include <QFile> #include <KDebug> #include <KDialog> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de