[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-13 3:11:00
Message-ID: 20100413031100.38048AC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1114209 by bcooksley:

Lost and Found needs to be registered with the Sycoca.
BUG: 234216

 M  +4 -2      app/SettingsBase.cpp  
 M  +1 -0      app/SettingsBase.h  
 M  +1 -0      categories/CMakeLists.txt  
 A             categories/settings-lost-and-found.desktop  
 M  +0 -5      core/MenuItem.cpp  
 M  +0 -7      core/MenuItem.h  


--- trunk/KDE/kdebase/workspace/systemsettings/app/SettingsBase.cpp #1114208:1114209
@@ -84,8 +84,6 @@
     rootModule = new MenuItem( true, 0 );
     initMenuList(rootModule);
     // Handle lost+found modules...
-    MenuItem * lostFound = new MenuItem( true, rootModule->children().first() );
-    lostFound->setName( i18n("Lost and Found") );
     for (int i = 0; i < modules.size(); ++i) {
         const KService::Ptr entry = modules.at(i);
         MenuItem * infoItem = new MenuItem(false, lostFound);
@@ -195,6 +193,10 @@
         if ( parentCategory == parent->category() ) {
             MenuItem * menuItem = new MenuItem(true, parent);
             menuItem->setService( entry );
+            if( menuItem->category() == "lost-and-found" ) {
+                lostFound = menuItem;
+                continue;
+            }
             initMenuList( menuItem );
         }
     }
--- trunk/KDE/kdebase/workspace/systemsettings/app/SettingsBase.h #1114208:1114209
@@ -87,6 +87,7 @@
     QStackedWidget * stackedWidget;
     // The module list
     MenuItem * rootModule;
+    MenuItem * lostFound;
     KService::List categories;
     KService::List modules;
     // The about dialog
--- trunk/KDE/kdebase/workspace/systemsettings/categories/CMakeLists.txt #1114208:1114209
@@ -19,6 +19,7 @@
          settings-regional-and-language.desktop
          settings-window-behaviour.desktop
          settings-network-settings.desktop
+         settings-lost-and-found.desktop
          DESTINATION  ${SERVICES_INSTALL_DIR} )
 
 if (NOT WIN32)
--- trunk/KDE/kdebase/workspace/systemsettings/core/MenuItem.cpp #1114208:1114209
@@ -136,8 +136,3 @@
         d->weight = 100;
     }
 }
-
-void MenuItem::setName( const QString& name )
-{
-    d->name = name;
-}
--- trunk/KDE/kdebase/workspace/systemsettings/core/MenuItem.h #1114208:1114209
@@ -155,13 +155,6 @@
      */
     void setService( const KService::Ptr& service );
 
-    /**
-     * Sets the name of the object, which is used for categories which have no service object
-     *
-     * @param name The name of the item.
-     */
-    void setName( const QString& name );
-
 private:
     class Private;
     Private *const d;
[prev in list] [next in list] [prev in thread] [next in thread]