aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/editor/ScriptEditorImplementation.cpp
diff options
context:
space:
mode:
authorGravatar Fabio Bas2012-02-26 14:57:49 +0000
committerGravatar Fabio Bas2012-02-26 14:57:49 +0000
commitb2891fe17c395b885b4fac8634fa8cca1a45fbb6 (patch)
treee9fcfdebc14137188b3cf02376fe90145d52943d /src/modules/editor/ScriptEditorImplementation.cpp
parentSome mixed changes, mostly related to osx development: (diff)
downloadKVIrc-b2891fe17c395b885b4fac8634fa8cca1a45fbb6.tar.gz
KVIrc-b2891fe17c395b885b4fac8634fa8cca1a45fbb6.tar.bz2
KVIrc-b2891fe17c395b885b4fac8634fa8cca1a45fbb6.zip
Dropped the KviTalPopupMenu layer, ported the involved code to QAction.
This fixes most of the random crashes on osx, and is the base for a next change in the menubar. Addiotional fix: "disconnect" menu entry was broken since the 3.x era git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6072 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/editor/ScriptEditorImplementation.cpp')
-rw-r--r--src/modules/editor/ScriptEditorImplementation.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/editor/ScriptEditorImplementation.cpp b/src/modules/editor/ScriptEditorImplementation.cpp
index cbab328f7..1d4f838e3 100644
--- a/src/modules/editor/ScriptEditorImplementation.cpp
+++ b/src/modules/editor/ScriptEditorImplementation.cpp
@@ -795,11 +795,11 @@ ScriptEditorImplementation::ScriptEditorImplementation(QWidget * par)
b->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
g->addWidget(b,1,0);
- KviTalPopupMenu * pop = new KviTalPopupMenu(b);
- pop->insertItem(__tr2qs_ctx("&Open...","editor"),this,SLOT(loadFromFile()));
- pop->insertItem(__tr2qs_ctx("&Save As...","editor"),this,SLOT(saveToFile()));
- pop->insertSeparator();
- pop->insertItem(__tr2qs_ctx("&Configure Editor...","editor"),this,SLOT(configureColors()));
+ QMenu * pop = new QMenu(b);
+ pop->addAction(__tr2qs_ctx("&Open...","editor"),this,SLOT(loadFromFile()));
+ pop->addAction(__tr2qs_ctx("&Save As...","editor"),this,SLOT(saveToFile()));
+ pop->addSeparator();
+ pop->addAction(__tr2qs_ctx("&Configure Editor...","editor"),this,SLOT(configureColors()));
b->setMenu(pop);
b->setPopupMode(QToolButton::InstantPopup);