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

List:       kde-commits
Subject:    KDE/kdeplasma-addons/libs
From:       Ivan Čukić <ivan.cukic () kde ! org>
Date:       2010-10-13 18:20:59
Message-ID: 20101013182059.5012BAC895 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1185558 by ivan:

& in file names is not an accelerator anymore

BUG: 248322



 M  +2 -1      lancelot-datamodels/Applications.cpp  
 M  +5 -1      lancelot/models/StandardActionListModel.cpp  


--- trunk/KDE/kdeplasma-addons/libs/lancelot-datamodels/Applications.cpp #1185557:1185558
@@ -90,7 +90,8 @@
                 continue;
 
             data.icon = KIcon(service->icon());
-            data.name = service->name().replace('&', "&&");
+            // data.name = service->name().replace('&', "&&");
+            data.name = service->name();
             data.description = service->genericName();
             data.desktopFile = service->entryPath();
 
--- trunk/KDE/kdeplasma-addons/libs/lancelot/models/StandardActionListModel.cpp #1185557:1185558
@@ -51,7 +51,11 @@
 QString StandardActionListModel::title(int index) const
 {
     if (index >= d->items.size()) return "";
-    return d->items.at(index).title;
+
+    QString result = d->items.at(index).title;
+
+    result.replace('&', "&&");
+    return result;
 }
 
 QString StandardActionListModel::description(int index) const
[prev in list] [next in list] [prev in thread] [next in thread]