yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tool tips to not show '&' added by KAcceleratorManager

Browse source 
I have no idea why you don't see them, Martin. It may be possible
to disable automatic accelerator assignment in KDE via some
configuration option. Check the code to find out ;)

See http://reviewboard.kde.org/r/5191/

BUG: 241073
FIXED-IN: 4.6.0

svn path=/trunk/KDE/kdebase/workspace/; revision=1170350
This commit is contained in:
Christoph Feck 2010-08-31 16:39:34 +00:00
parent 1adaf8c8ea
commit daec4364bd
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kcmkwin/kwinscreenedges/monitor.cpp
View file

@ -22,6 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "monitor.h" #include "monitor.h"
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <qgraphicsitem.h> #include <qgraphicsitem.h>
#include <qgraphicsview.h> #include <qgraphicsview.h>
@ -157,7 +158,10 @@ void Monitor::selectEdgeItem( int edge, int index )
{ {
popup_actions[ edge ][ index ]->setChecked( true ); popup_actions[ edge ][ index ]->setChecked( true );
setEdge( edge, !popup_actions[ edge ][ 0 ]->isChecked()); setEdge( edge, !popup_actions[ edge ][ 0 ]->isChecked());
items[ edge ]->setToolTip( popup_actions[ edge ][ index ]->text() ); QString actionText = popup_actions[ edge ][ index ]->text();
// remove accelerators added by KAcceleratorManager
actionText = KGlobal::locale()->removeAcceleratorMarker( actionText );
items[ edge ]->setToolTip( actionText );
} }
int Monitor::selectedEdgeItem( int edge ) const int Monitor::selectedEdgeItem( int edge ) const
@ -183,7 +187,7 @@ void Monitor::popup( Corner* c, QPoint pos )
selectEdgeItem( i, popup_actions[ i ].indexOf( a )); selectEdgeItem( i, popup_actions[ i ].indexOf( a ));
emit changed(); emit changed();
emit edgeSelectionChanged( i, popup_actions[ i ].indexOf( a )); emit edgeSelectionChanged( i, popup_actions[ i ].indexOf( a ));
c->setToolTip( a->text() ); c->setToolTip( KGlobal::locale()->removeAcceleratorMarker( a->text() ));
} }
return; return;
} }