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

List:       kde-commits
Subject:    kdebase/kicker/ui
From:       Laurent Montel <montel () kde ! org>
Date:       2005-03-16 17:20:19
Message-ID: 20050316172019.DBA7B17D06 () office ! kde ! org
[Download RAW message or body]

CVS commit by mlaurent: 

Spec said "When inline item + header + alias_inline we doesn't display header"


  M +1 -9      service_mnu.cpp   1.97


--- kdebase/kicker/ui/service_mnu.cpp  #1.96:1.97
@@ -269,12 +269,4 @@ void PanelServiceMenu::fillMenu( KServic
                     if ( e1->isType( KST_KService ) )
                     {
-                        if ( g->showInlineHeader() )
-                        {
-                            if ( !inlineHeaderName.isEmpty() )
-                            {
-                                int mid = insertItem(new \
                PopupMenuTitle(inlineHeaderName, font()), id + 1, id++);
-                                setItemEnabled( mid, false );
-                            }
-                        }
                         KService::Ptr s(static_cast<KService *>(e1));
                         insertMenuItem(s, id++, -1, \
&suppressGenericNames,g->caption()); @@ -293,5 +285,5 @@ void \
PanelServiceMenu::fillMenu( KServic  KServiceGroup::List listElement = \
rootElement->entries(true, excludeNoDisplay_, true, \
KickerSettings::detailedMenuEntries() \
&&!KickerSettings::detailedEntriesNamesFirst());  
-                if ( !inlineHeaderName.isEmpty() )
+                if ( !g->inlineAlias() && !inlineHeaderName.isEmpty() )
                 {
                     int mid = insertItem(new PopupMenuTitle(inlineHeaderName, \
font()), id + 1, id++);


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