From 33da6e75ad9dfdfe5e7444ec25ae118ca294bb01 Mon Sep 17 00:00:00 2001 From: Waldo Bastian Date: Sat, 26 Aug 2000 23:10:36 +0000 Subject: [PATCH] fixes the following problems with konsole: - The menu items of the file menu had a different font size - If I click on the file menu, it closes immediately, but still has the focus. Patch by Andreas Zehender and Carsten Pfeiffer svn path=/trunk/kdebase/konsole/; revision=61983 --- include/konsole.h | 1 + src/konsole.C | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/konsole.h b/include/konsole.h index cab3b1df..47cc87c0 100644 --- a/include/konsole.h +++ b/include/konsole.h @@ -130,6 +130,7 @@ private: QPopupMenu* m_schema; QPopupMenu* m_keytab; QPopupMenu* m_codec; + QPopupMenu* m_toolbarSessionsCommands; KToggleAction *showToolbar; bool b_toolbarvis; diff --git a/src/konsole.C b/src/konsole.C index c199266b..4c4e0807 100644 --- a/src/konsole.C +++ b/src/konsole.C @@ -228,13 +228,15 @@ void Konsole::makeMenu() m_file = new QPopupMenu(this); connect(m_file, SIGNAL(activated(int)), SLOT(newSession(int))); + m_toolbarSessionsCommands = new QPopupMenu(this); + connect(m_toolbarSessionsCommands, SIGNAL(activated(int)), SLOT(newSession(int))); KAction *newsession = KStdAction::openNew(this , SLOT(newSessionSelect())); newsession->plug(toolBar()); QObjectList *l = toolBar()->queryList( "KToolBarButton" ); if ( l && l->first() ) { - ( (KToolBarButton*)l->first() )->setDelayedPopup( m_file ); + ( (KToolBarButton*)l->first() )->setDelayedPopup( m_toolbarSessionsCommands ); connect( (KToolBarButton*)l->first() , SIGNAL(clicked()), this, SLOT(newSession())); } @@ -1005,6 +1007,7 @@ void Konsole::addSessionCommand(const QString &path) delete co; return; // ignore } m_file->insertItem(txt, ++cmd_serial); + m_toolbarSessionsCommands->insertItem(txt, cmd_serial); no2command.insert(cmd_serial,co); }