[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/systemsettings
From:       Ben Cooksley <sourtooth () gmail ! com>
Date:       2010-04-19 10:21:46
Message-ID: 20100419102146.DE9C7AC89D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1116375 by bcooksley:

Add support for X-KDE-System-Settings-Parent-Category-V2 to allow modules to keep \
compatibility with 4.4 if desired

 M  +2 -1      app/SettingsBase.cpp  
 M  +4 -0      categories/systemsettingscategory.desktop  


--- trunk/KDE/kdebase/workspace/systemsettings/app/SettingsBase.cpp #1116374:1116375
@@ -207,7 +207,8 @@
     for (int i = 0; i < modules.size(); ++i) {
         const KService::Ptr entry = modules.at(i);
         const QString category = \
                entry->property("X-KDE-System-Settings-Parent-Category").toString();
-        if( !parent->category().isEmpty() && category == parent->category() ) {
+        const QString category2 = \
entry->property("X-KDE-System-Settings-Parent-Category-V2").toString(); +        if( \
!parent->category().isEmpty() && (category == parent->category() || category2 == \
parent->category()) ) {  // Add the module info to the menu
             MenuItem * infoItem = new MenuItem(false, parent);
             infoItem->setService( entry );
--- trunk/KDE/kdebase/workspace/systemsettings/categories/systemsettingscategory.desktop \
#1116374:1116375 @@ -84,3 +84,7 @@
 # the parent category identifier
 [PropertyDef::X-KDE-System-Settings-Parent-Category]
 Type=QString
+
+# parent category identifier version 2
+[PropertyDef::X-KDE-System-Settings-Parent-Category-V2]
+Type=QString


[prev in list] [next in list] [prev in thread] [next in thread]