File opensuse-kinfocenter.diff of Package kdebase4-workspace

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(); 
 }