Attachment 69822 Details for Bug 151492

[patch] kdebase3 patch - short-menus.diff

short-menus.diff (text/plain), 8.25 KB, created by Lubos Lunak on 2006-02-22 16:04:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubos Lunak

Created: 2006-02-22 16:04:31 UTC

Size: 8.25 KB

patch

obsolete

>--- kdesktop/Makefile.am
>+++ kdesktop/Makefile.am	2005/02/08 11:08:16
>@@ -6,6 +6,8 @@
> 
> SUBDIRS = . lock pics patterns programs init kwebdesktop
> 
>+KDE_OPTIONS = nofinal
>+
> ####### Files
> 
> bin_PROGRAMS = kcheckrunning
>--- kicker/libkicker/kickerSettings.kcfg.sav	2006-02-10 14:55:12.000000000 +0100
>+++ kicker/libkicker/kickerSettings.kcfg	2006-02-10 14:55:19.000000000 +0100
>@@ -126,6 +126,11 @@
>       <default>true</default>
>    </entry>
> 
>+<entry name="ReduceMenuDepth" type="Bool" >
>+      <label>Simplify menus with only a single item inside</label>
>+      <default>false</default>
>+   </entry>
>+
> <entry name="MenuEntryHeight" type="Int" >
>       <label>Height of menu entries in pixels</label>
>       <default>0</default>
>--- kicker/kicker/ui/service_mnu.cpp.sav	2006-02-10 14:55:12.000000000 +0100
>+++ kicker/kicker/ui/service_mnu.cpp	2006-02-10 15:07:24.000000000 +0100
>@@ -111,6 +111,11 @@
>     QStringList suppressGenericNames = _root->suppressGenericNames();
> 
>     KServiceGroup::List::ConstIterator it = _list.begin();
>+    KSortableValueList<KSharedPtr<KSycocaEntry>,QCString> slist;
>+    KSortableValueList<KSharedPtr<KSycocaEntry>,QCString> glist;
>+    QMap<QString,QString> specialTitle;
>+    QMap<QString,QString> categoryIcon;
>+
>     bool separatorNeeded = false;
>     for (; it != _list.end(); ++it)
>     {
>@@ -118,19 +123,99 @@
> 
>         if (e->isType(KST_KServiceGroup))
>         {
>+            KServiceGroup::Ptr g(static_cast<KServiceGroup *>(e));
>+            if ( KickerSettings::reduceMenuDepth() && g->SuSEshortMenu() ){
>+               KServiceGroup::List l = g->entries(true, excludeNoDisplay_ );
>+               if ( l.count() == 1 ) {
>+                  // the special case, we want to short the menu.
>+                  // TOFIX? : this works only for one level
>+                  KServiceGroup::List::ConstIterator _it=l.begin();
>+                  KSycocaEntry *_e = *_it;
>+                  if (_e->isType(KST_KService)) {
>+                     KService::Ptr s(static_cast<KService *>(_e));
>+		     QString key;
>+                     if ( g->SuSEgeneralDescription() ) {
>+			// we use the application name
>+                        key = s->name();
>+                        if( !s->genericName().isEmpty()) {
>+                           if (KickerSettings::menuEntryFormat() == KickerSettings::NameAndDescription)
>+                               key = s->name() + " (" + s->genericName() + ")";
>+			   else if (KickerSettings::menuEntryFormat() == KickerSettings::DescriptionAndName)
>+                               key = s->genericName() + " (" + s->name() + ")";
>+			   else if (KickerSettings::menuEntryFormat() == KickerSettings::DescriptionOnly)
>+                             key = s->genericName();
>+                        }
>+                     }
>+		     else
>+			// we use the normal menu description
>+			key = g->caption();
>+		     specialTitle.insert( _e->name(), key );
>+		     categoryIcon.insert( _e->name(), g->icon() );
>+                    // slist.insert( key.local8Bit(), _e );
>+                     // and escape from here
>+                     continue;
>+                  }
>+               }
>+            }
>+            glist.insert( g->caption().local8Bit(), e );
>+        }else if( e->isType(KST_KService)) {
>+            KService::Ptr s(static_cast<KService *>(e));
>+            QString name = s->name();
>+            if( !s->genericName().isEmpty()) {
>+               if (KickerSettings::menuEntryFormat() == KickerSettings::NameAndDescription)
>+                   name = s->name() + " (" + s->genericName() + ")";
>+	       else if (KickerSettings::menuEntryFormat() == KickerSettings::DescriptionAndName)
>+                   name = s->genericName() + " (" + s->name() + ")";
>+	       else if (KickerSettings::menuEntryFormat() == KickerSettings::DescriptionOnly)
>+                   name = s->genericName();
>+            }
>+            slist.insert( name.local8Bit(), e );
>+        } else
>+            slist.insert( e->name().local8Bit(), e );
>+    }
>+
>+    _list = _root->SuSEsortEntries( slist, glist, excludeNoDisplay_, true );
>+    it = _list.begin();
>+
>+    for (; it != _list.end(); ++it) {
> 
>+        KSycocaEntry * e = *it;
>+
>+        if (e->isType(KST_KServiceGroup)) {
>             KServiceGroup::Ptr g(static_cast<KServiceGroup *>(e));
>+            if ( KickerSettings::reduceMenuDepth() && g->SuSEshortMenu() ){
>+               KServiceGroup::List l = g->entries(true, excludeNoDisplay_ );
>+               if ( l.count() == 1 ) {
>+                  // the special case, we want to short the menu.
>+                  // TOFIX? : this works only for one level
>+                  KServiceGroup::List::ConstIterator _it=l.begin();
>+                  KSycocaEntry *_e = *_it;
>+                  if (_e->isType(KST_KService)) {
>+                     KService::Ptr s(static_cast<KService *>(_e));
>+                     if ( g->SuSEgeneralDescription() )
>+                       // we use the application name
>+                       insertMenuItem(s, id++, -1, 0, QString::null, QString::null, g->icon() );
>+                    else
>+                       // we use the normal menu description
>+                       insertMenuItem(s, id++, -1, 0, QString::null, g->caption(), g->icon() );
>+                     // and escape from here
>+                     continue;
>+                  }   
>+               }      
>+            }         
>+            // standard sub menu
>+                      
>             QString groupCaption = g->caption();
>-
>+                      
>            // Avoid adding empty groups.
>             KServiceGroup::Ptr subMenuRoot = KServiceGroup::group(g->relPath());
>-
>+                      
>             int nbChildCount = subMenuRoot->childCount();
>             if (nbChildCount == 0 && !g->showEmptyMenu())
>-            {
>+            {         
>                 continue;
>-            }
>-
>+            }         
>+                      
>             QString inlineHeaderName = g->showInlineHeader() ? groupCaption : "";
>             // Item names may contain ampersands. To avoid them being converted
>             // to accelerators, replace them with two ampersands.
>@@ -214,7 +299,7 @@
>             }
> 
>             KService::Ptr s(static_cast<KService *>(e));
>-            insertMenuItem(s, id++, -1, &suppressGenericNames);
>+            insertMenuItem(s, id++, -1, &suppressGenericNames, QString::null, specialTitle[s->name()], categoryIcon[s->name()] );
>         }
>         else if (e->isType(KST_KServiceSeparator))
>         {
>@@ -350,7 +435,8 @@
> void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId,
>                                       int nIndex/*= -1*/,
>                                       const QStringList *suppressGenericNames /* = 0 */,
>-                                      const QString & aliasname)
>+                                      const QString & aliasname, const QString & label /*=QString::NULL*/,
>+                                      const QString & categoryIcon /*=QString::null*/)
> {
>     QString serviceName = aliasname.isEmpty() ? s->name():aliasname;
>     // add comment
>@@ -393,7 +479,15 @@
>     // to accelerators, replace them with two ampersands.
>     serviceName.replace("&", "&&");
> 
>-    int newId = insertItem(getIconSet(s->icon()), serviceName, nId, nIndex);
>+    QString icon = s->icon();
>+    if (icon=="unknown")
>+        icon = categoryIcon;
>+
>+    int newId;
>+    if ( label.isEmpty() )
>+       newId = insertItem(getIconSet(icon), serviceName, nId, nIndex);
>+    else
>+       newId = insertItem(getIconSet(icon), label, nId, nIndex);
>     entryMap_.insert(newId, static_cast<KSycocaEntry*>(s));
> }
> 
>--- kicker/kicker/ui/service_mnu.h.sav	2006-02-10 14:55:12.000000000 +0100
>+++ kicker/kicker/ui/service_mnu.h	2006-02-10 14:55:19.000000000 +0100
>@@ -83,7 +83,8 @@
> protected:
>     void insertMenuItem(KService::Ptr & s, int nId, int nIndex = -1,
>                         const QStringList *suppressGenericNames=0,
>-                        const QString &aliasname = QString::null);
>+                        const QString &aliasname = QString::null,
>+                        const QString &label = QString::null, const QString &categoryIcon = QString::null);
>     virtual PanelServiceMenu * newSubMenu(const QString & label,
>                                           const QString & relPath,
>                                           QWidget * parent, const char * name,

Actions: View | Diff

Attachments on bug 151492: 68835 | 69822