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 <az@azweb.de> and Carsten Pfeiffer <carpdjih@cetus.zrz.TU-Berlin.DE>

svn path=/trunk/kdebase/konsole/; revision=61983
wilder-portage
Waldo Bastian 26 years ago
parent 0160582685
commit 33da6e75ad
  1. 1
      include/konsole.h
  2. 5
      src/konsole.C

@ -130,6 +130,7 @@ private:
QPopupMenu* m_schema;
QPopupMenu* m_keytab;
QPopupMenu* m_codec;
QPopupMenu* m_toolbarSessionsCommands;
KToggleAction *showToolbar;
bool b_toolbarvis;

@ -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);
}

Loading…
Cancel
Save