Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2013-01-14 09:42:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2013-01-08 14:31:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2013-01-14 09:42:19.000000000 +0100 @@ -1,0 +2,20 @@ +Sun Jan 13 19:15:53 UTC 2013 - [email protected] + +- Added patch opensuse-kinfocenter.diff to have some additional + openSUSE information in kinfocenter. Kinfocenter will be the + replacement for kio_sysinfo. +- Added Require for openSUSE-release as that kinfocenter uses the + info from here. + +------------------------------------------------------------------- +Sun Jan 13 14:14:04 UTC 2013 - [email protected] + +- Update patch plasma-branding-defaults-applets.diff to remove + kio_sysinfo from kickoff + +------------------------------------------------------------------- +Tue Jan 8 18:12:26 UTC 2013 - [email protected] + +- added patch krunner-no-crash.diff to fix a possible krunner crash + +------------------------------------------------------------------- New: ---- krunner-no-crash.diff opensuse-kinfocenter.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.NibaDB/_old 2013-01-14 09:42:21.000000000 +0100 +++ /var/tmp/diff_new_pack.NibaDB/_new 2013-01-14 09:42:21.000000000 +0100 @@ -126,6 +126,10 @@ Patch400: kdm_plymouth.patch # PATCH-FIX-OPENSUSE opensuse-homepage.diff Patch401: opensuse-homepage.diff +# PATCH-FIX-OPENSUSE opensuse-kinfocenter.diff (created by Alin M. Elena to have some openSUSE distro info in kinfocenter) +Patch402: opensuse-kinfocenter.diff + +Patch901: krunner-no-crash.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 1200 Requires: %{name}-branding = %{version} @@ -152,6 +156,8 @@ Requires: xprop %endif Requires: kdebase4-artwork +# The openSUSE-release package should always be installed, but just to make sure as that kinfocenter needs it +Requires: openSUSE-release Recommends: kdebase4-SuSE Recommends: kwin Recommends: plasma-addons @@ -369,6 +375,8 @@ %endif %patch400 -p0 %patch401 -p1 +%patch402 -p1 +%patch901 -p1 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png %build ++++++ krunner-no-crash.diff ++++++ diff --git a/plasma/generic/runners/bookmarks/browsers/firefox.cpp b/plasma/generic/runners/bookmarks/browsers/firefox.cpp index 09785cc..7414f95 100644 --- a/plasma/generic/runners/bookmarks/browsers/firefox.cpp +++ b/plasma/generic/runners/bookmarks/browsers/firefox.cpp @@ -33,7 +33,9 @@ #include "faviconfromblob.h" Firefox::Firefox(QObject *parent) : - QObject(parent), m_favicon(new FallbackFavicon(this)) + QObject(parent), + m_favicon(new FallbackFavicon(this)), + m_fetchsqlite(0) { reloadConfiguration(); kDebug(kdbg_code) << "Loading Firefox Bookmarks Browser"; ++++++ opensuse-kinfocenter.diff ++++++ diff --git a/kinfocenter/Modules/infosummary/defaultboxwidget.cpp b/kinfocenter/Modules/infosummary/defaultboxwidget.cpp index 2d522ea..184735c 100644 --- a/kinfocenter/Modules/infosummary/defaultboxwidget.cpp +++ b/kinfocenter/Modules/infosummary/defaultboxwidget.cpp @@ -39,10 +39,10 @@ void DefaultBoxWidget::createDisplay() m_iconLabel = new QLabel(); m_iconLabel->setAlignment(Qt::AlignCenter); m_iconLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); - + QFont bFont; bFont.setBold(true); - + m_info0Label = new QLabel(); m_info0Label->setFont(bFont); m_info0NameLabel = new QLabel(); @@ -55,7 +55,7 @@ void DefaultBoxWidget::createDisplay() m_info2Label->setFont(bFont); m_info2NameLabel = new QLabel(); - m_layout->addWidget(m_iconLabel,1,1,3,1,Qt::AlignCenter); + m_layout->addWidget(m_iconLabel,1,1,3,1,Qt::AlignCenter); m_layout->addWidget(m_info0Label,1,2,1,1); m_layout->addWidget(m_info0NameLabel,1,3,1,1); @@ -65,6 +65,7 @@ void DefaultBoxWidget::createDisplay() m_layout->addWidget(m_info2Label,3,2,1,1); m_layout->addWidget(m_info2NameLabel,3,3,1,1); + } void DefaultBoxWidget::setLabelTitles(const QString &first, const QString &second, const QString &third) diff --git a/kinfocenter/Modules/infosummary/defaultboxwidget.h b/kinfocenter/Modules/infosummary/defaultboxwidget.h index 2aa10be..271d666 100644 --- a/kinfocenter/Modules/infosummary/defaultboxwidget.h +++ b/kinfocenter/Modules/infosummary/defaultboxwidget.h @@ -42,8 +42,8 @@ class DefaultBoxWidget : public QGroupBox void setLabelOne(const QString &); void setLabelTwo(const QString &); void setLabelThree(const QString &); - void setIcon(const KIcon &icon); - + void setIcon(const KIcon &icon); + private: void createDisplay(); diff --git a/kinfocenter/Modules/infosummary/infosum.cpp b/kinfocenter/Modules/infosummary/infosum.cpp index 276d00c..c36c311 100644 --- a/kinfocenter/Modules/infosummary/infosum.cpp +++ b/kinfocenter/Modules/infosummary/infosum.cpp @@ -47,7 +47,7 @@ void InfoSumPlugin::createDisplay() m_layout = new QVBoxLayout(this); m_layout->setAlignment(Qt::AlignTop); m_layout->setSpacing(10); - + createOsBox(); createCpuBox(); //createMemBox(); // Awaiting Mem class from kdereview @@ -58,12 +58,12 @@ void InfoSumPlugin::createDisplay() void InfoSumPlugin::createOsBox() { DefaultBoxWidget *osWidget = new DefaultBoxWidget(); - osWidget->setIcon(KIcon("kde")); - osWidget->setLabelTitles(i18n("OS Version"),i18n("KDE SC Version"), i18n("Hostname")); + osWidget->setIcon(KIcon("suse")); + osWidget->setLabelTitles(i18n("OS Version"),i18n("KDE Platform Version"), i18n("Hostname")); OsDepInfo *osInfo = new OsDepInfo(); - osWidget->setLabelOne(osInfo->osVersion()); + osWidget->setLabelOne(osInfo->osVersion()+'\n'+osInfo->distroName()); osWidget->setLabelTwo(QString(KDE_VERSION_STRING)); osWidget->setLabelThree(osInfo->hostName()); osWidget->setWhatsThis(i18nc("OS whats this","This shows information about your Operating System")); diff --git a/kinfocenter/Modules/infosummary/infosum.h b/kinfocenter/Modules/infosummary/infosum.h index 463aebb..536a8b8 100644 --- a/kinfocenter/Modules/infosummary/infosum.h +++ b/kinfocenter/Modules/infosummary/infosum.h @@ -66,7 +66,7 @@ class InfoSumPlugin : public KCModule void createOsBox(); void createCpuBox(); void createMemBox(); - void createHdBox(); + void createHdBox(); QVBoxLayout *m_layout; }; diff --git a/kinfocenter/Modules/infosummary/osdepinfo.cpp b/kinfocenter/Modules/infosummary/osdepinfo.cpp index 34afecc..af1ec45 100644 --- a/kinfocenter/Modules/infosummary/osdepinfo.cpp +++ b/kinfocenter/Modules/infosummary/osdepinfo.cpp @@ -37,6 +37,12 @@ const QString OsDepInfo::osVersion() return m_osVersion; } +const QString OsDepInfo::distroName() +{ + return m_distroName; +} + + #if defined(Q_OS_UNIX) #include "osdepinfo_unix.cpp" #else @@ -50,6 +56,7 @@ void OsDepInfo::setDepInfo() { m_osVersion.clear(); m_hostName.clear(); + m_distroName.clear(); } #endif // Q_OS_UNIX diff --git a/kinfocenter/Modules/infosummary/osdepinfo.h b/kinfocenter/Modules/infosummary/osdepinfo.h index 3452e8b..564a86c 100644 --- a/kinfocenter/Modules/infosummary/osdepinfo.h +++ b/kinfocenter/Modules/infosummary/osdepinfo.h @@ -32,12 +32,14 @@ class OsDepInfo const QString hostName(); const QString osVersion(); + const QString distroName(); private: void setDepInfo(); QString m_hostName; QString m_osVersion; + QString m_distroName; }; #endif //OSDEPINFO diff --git a/kinfocenter/Modules/infosummary/osdepinfo_unix.cpp b/kinfocenter/Modules/infosummary/osdepinfo_unix.cpp index d237337..9cbdcd9 100644 --- a/kinfocenter/Modules/infosummary/osdepinfo_unix.cpp +++ b/kinfocenter/Modules/infosummary/osdepinfo_unix.cpp @@ -23,6 +23,18 @@ #include "osdepinfo.h" #include <sys/utsname.h> +#include <KConfig> +#include <KConfigGroup> +#include <QString> + +QString getDistro() +{ + KConfig osRelease( "/etc/os-release", KConfig::SimpleConfig ); + KConfigGroup osR( &osRelease, "" ); + QString pretty = osR.readEntry("PRETTY_NAME"); + pretty.remove('"'); + return(pretty); +} void OsDepInfo::setDepInfo() { @@ -31,4 +43,5 @@ void OsDepInfo::setDepInfo() m_osVersion = QString(unixInfo.sysname) + ' ' + QString(unixInfo.release); m_hostName = QString(unixInfo.nodename); + m_distroName = getDistro(); } ++++++ plasma-branding-defaults-applets.diff ++++++ --- /var/tmp/diff_new_pack.NibaDB/_old 2013-01-14 09:42:22.000000000 +0100 +++ /var/tmp/diff_new_pack.NibaDB/_new 2013-01-14 09:42:22.000000000 +0100 @@ -56,7 +56,7 @@ =================================================================== --- plasma/desktop/applets/kickoff/core/models.cpp.orig +++ plasma/desktop/applets/kickoff/core/models.cpp -@@ -177,7 +177,19 @@ QStringList Kickoff::systemApplicationLi +@@ -177,7 +177,16 @@ QStringList Kickoff::systemApplicationLi { KConfigGroup appsGroup = componentData().config()->group("SystemApplications"); QStringList apps; @@ -71,9 +71,6 @@ + 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; } @@ -90,53 +87,6 @@ << i18n("Places") << i18n("Removable Storage") << i18n("Storage"); -@@ -217,19 +217,33 @@ QVariant SystemModel::data(const QModelI - } - - KService::Ptr service = d->appsList[index.row()]; -- -- switch (role) { -- case Qt::DisplayRole: -- return service->name(); -- case Qt::DecorationRole: -- return KIcon(service->icon()); -- case SubTitleRole: -- return service->genericName(); -- case UrlRole: -- return service->entryPath(); -- default: -- return QVariant(); -- } -+ if (service->name()=="sysinfo") { -+ switch(role) { -+ case Qt::DisplayRole: -+ return i18n("My Computer"); -+ case Qt::DecorationRole: -+ return KIcon("hwinfo"); -+ case SubTitleRole: -+ return "sysinfo:/"; -+ case UrlRole: -+ return "sysinfo:/"; -+ default: -+ return QVariant(); -+ } -+ } else { -+ switch (role) { -+ case Qt::DisplayRole: -+ return service->name(); -+ case Qt::DecorationRole: -+ return KIcon(service->icon()); -+ case SubTitleRole: -+ return service->genericName(); -+ case UrlRole: -+ return service->entryPath(); -+ default: -+ return QVariant(); -+ } -+ } - } - - if (role == UrlRole && !d->placesModel->isHidden(mapToSource(index))) { Index: plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp =================================================================== --- plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.orig -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
