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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/kopete
From:       Frank Osterfeld <frank.osterfeld () kdemail ! net>
Date:       2008-06-07 18:40:18
Message-ID: 1212864018.864941.30734.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 818108 by osterfeld:

OS X: use correct configure action for appmenu->"Preferences"

 M  +3 -2      kopetewindow.cpp  


--- trunk/KDE/kdenetwork/kopete/kopete/kopetewindow.cpp #818107:818108
@@ -127,7 +127,7 @@
 	setFixedSize( 16, 16 );
 	setPixmap( SmallIcon( "flag-black" ) );
 	setToolTip( i18n( "Service messages" ) );
-	
+
 	connect( Kopete::InfoEventManager::self(), SIGNAL(changed()), this, \
SLOT(updateIcon()) );  }
 
@@ -354,7 +354,7 @@
 	d->infoEventWidget->setVisible ( false );
 	connect ( d->infoEventWidget, SIGNAL(showRequest()), this, \
SLOT(slotShowInfoEventWidget()) );  l->addWidget ( d->infoEventWidget );
-	
+
 	setCentralWidget ( w );
 	d->contactlist->setFocus();
 }
@@ -427,6 +427,7 @@
 	actionCollection()->addAction ( "settings_keys", act );
 
 	KAction *configureGlobalShortcutsAction = new KAction ( KIcon ( \
"configure-shortcuts" ), i18n ( "Configure &Global Shortcuts..." ), this ); \
+	configureGlobalShortcutsAction->setMenuRole( QAction::NoRole ); //OS X: prevent Qt \
heuristics to move action to app menu->"Preferences"  actionCollection()->addAction ( \
"settings_global", configureGlobalShortcutsAction );  connect ( \
configureGlobalShortcutsAction, SIGNAL ( triggered ( bool ) ), this, SLOT ( \
slotConfGlobalKeys() ) );  


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