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

List:       kde-commits
Subject:    kdebase
From:       Stephan Binner <binner () kde ! org>
Date:       2005-04-05 14:21:02
Message-ID: 20050405142102.9923163E () office ! kde ! org
[Download RAW message or body]

CVS commit by binner: 

Added "Description only" menu item format


  M +11 -0     kcontrol/kicker/menutab.ui   1.40
  M +4 -0      kicker/menuext/prefmenu/prefmenu.cpp   1.12
  M +3 -0      kicker/share/kickerSettings.kcfg   1.16
  M +7 -3      kicker/ui/service_mnu.cpp   1.100


--- kdebase/kcontrol/kicker/menutab.ui  #1.39:1.40
@@ -86,4 +86,15 @@
                                 <widget class="QRadioButton" row="3" column="1">
                                     <property name="name">
+                                        <cstring>m_formatDescOnly</cstring>
+                                    </property>
+                                    <property name="text">
+                                        <string>D&amp;escription only</string>
+                                    </property>
+                                    <property name="whatsThis" stdset="0">
+                                        <string>When this option is selected, items \
in the K Menu will appear with the application's brief description next to the \
icon.</string> +                                    </property>
+                                </widget>
+                                <widget class="QRadioButton" row="4" column="1">
+                                    <property name="name">
                                         <cstring>m_formDescName</cstring>
                                     </property>

--- kdebase/kicker/share/kickerSettings.kcfg  #1.15:1.16
@@ -99,4 +99,7 @@
                 <label>Show names first on detailed entries</label>
             </choice>
+            <choice name="DescriptionOnly">
+                <label>Show only description for menu entries</label>
+            </choice>
             <choice name="DescriptionAndName">
                 <label>Show detailed menu entries</label>

--- kdebase/kicker/ui/service_mnu.cpp  #1.99:1.100
@@ -268,5 +268,5 @@ void PanelServiceMenu::fillMenu(KService
                 {
                     //just one element
-                    KServiceGroup::List listElement = element->entries(true, \
excludeNoDisplay_, true, KickerSettings::menuEntryFormat() == \
KickerSettings::DescriptionAndName); +                    KServiceGroup::List \
listElement = element->entries(true, excludeNoDisplay_, true, \
KickerSettings::menuEntryFormat() == KickerSettings::DescriptionAndName || \
KickerSettings::menuEntryFormat() == KickerSettings::DescriptionOnly);  KSycocaEntry \
* e1 = *( listElement.begin() );  if ( e1->isType( KST_KService ) )
@@ -286,5 +286,5 @@ void PanelServiceMenu::fillMenu(KService
                     break;
 
-                KServiceGroup::List listElement = rootElement->entries(true, \
excludeNoDisplay_, true, KickerSettings::menuEntryFormat() == \
KickerSettings::DescriptionAndName); +                KServiceGroup::List listElement \
= rootElement->entries(true, excludeNoDisplay_, true, \
KickerSettings::menuEntryFormat() == KickerSettings::DescriptionAndName || \
KickerSettings::menuEntryFormat() == KickerSettings::DescriptionOnly);  
                 if ( !g->inlineAlias() && !inlineHeaderName.isEmpty() )
@@ -384,5 +384,5 @@ void PanelServiceMenu::doInitialize()
         return;
 
-    KServiceGroup::List list = root->entries(true, excludeNoDisplay_, true, \
KickerSettings::menuEntryFormat() == KickerSettings::DescriptionAndName); +    \
KServiceGroup::List list = root->entries(true, excludeNoDisplay_, true, \
KickerSettings::menuEntryFormat() == KickerSettings::DescriptionAndName || \
KickerSettings::menuEntryFormat() == KickerSettings::DescriptionOnly);  
     if (list.isEmpty()) {
@@ -441,4 +441,8 @@ void PanelServiceMenu::insertMenuItem(KS
             serviceName = QString("%1 (%2)").arg(comment).arg(serviceName);
         }
+        else if (KickerSettings::menuEntryFormat() == \
KickerSettings::DescriptionOnly) +        {
+            serviceName = comment;
+        }
     }
 

--- kdebase/kicker/menuext/prefmenu/prefmenu.cpp  #1.11:1.12
@@ -93,4 +93,8 @@ void PrefMenu::insertMenuItem(KService::
             serviceName = QString("%1 (%2)").arg(comment).arg(serviceName);
         }
+        else if (KickerSettings::menuEntryFormat() == \
KickerSettings::DescriptionOnly) +        {
+            serviceName = comment;
+        }
     }
 


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