Commit 82b8cdcf authored by Christoffer Ackelman's avatar Christoffer Ackelman

QT: Fixed missing menu callbacks in alarmlist/eventlist satellite widgets.

parent b4a1add2
...@@ -151,13 +151,13 @@ EvAlaQt::EvAlaQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* ala_name, ...@@ -151,13 +151,13 @@ EvAlaQt::EvAlaQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* ala_name,
addMenuItem(toplevel, view, "Zoom &Out", SLOT(ala_activate_zoom_out()), addMenuItem(toplevel, view, "Zoom &Out", SLOT(ala_activate_zoom_out()),
"CTRL+O", "zoom-out"); "CTRL+O", "zoom-out");
addMenuItem(toplevel, view, "Zoom &Reset", SLOT(ala_activate_zoom_reset()), addMenuItem(toplevel, view, "Zoom &Reset", SLOT(ala_activate_zoom_reset()),
"CTRL+B", "zoom-reset"); "CTRL+B", "zoom-original");
addCheckableMenuItem(toplevel, view, "&Display hundredth", addCheckableMenuItem(toplevel, view, "&Display hundredth",
SLOT(ala_activate_disp_hundredth())); SLOT(ala_activate_disp_hundredth(bool)));
addCheckableMenuItem( addCheckableMenuItem(
toplevel, view, "&Hide Event Name", SLOT(ala_activate_hide_object())); toplevel, view, "&Hide Event Name", SLOT(ala_activate_hide_object(bool)));
addCheckableMenuItem( addCheckableMenuItem(
toplevel, view, "Hide &Event Text", SLOT(ala_activate_hide_text())); toplevel, view, "Hide &Event Text", SLOT(ala_activate_hide_text(bool)));
// Help entry // Help entry
QMenu* help = menu_bar->addMenu(translate_utf8("&Help")); QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
...@@ -244,7 +244,11 @@ EvAlaQt::EvAlaQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* ala_name, ...@@ -244,7 +244,11 @@ EvAlaQt::EvAlaQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* ala_name,
EvAlaQt::~EvAlaQt() EvAlaQt::~EvAlaQt()
{ {
debug_print("EvAlaQt::~EvAlaQt\n"); if (ala) {
delete ala;
}
ala = NULL;
delete ala_methodtoolbar; delete ala_methodtoolbar;
delete ala_sup_methodtoolbar; delete ala_sup_methodtoolbar;
} }
...@@ -281,7 +285,6 @@ void EvAlaQtWidget::focusInEvent(QFocusEvent* event) ...@@ -281,7 +285,6 @@ void EvAlaQtWidget::focusInEvent(QFocusEvent* event)
void EvAlaQtWidget::closeEvent(QCloseEvent* event) void EvAlaQtWidget::closeEvent(QCloseEvent* event)
{ {
debug_print("EvAlaQtWidget::closeEvent\n");
if (!(ala->options & ev_mAlaOptions_Embedded)) { if (!(ala->options & ev_mAlaOptions_Embedded)) {
delete ala; delete ala;
} }
......
...@@ -142,13 +142,13 @@ EvEveQt::EvEveQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name, ...@@ -142,13 +142,13 @@ EvEveQt::EvEveQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
addMenuItem(toplevel, view, "Zoom &Out", SLOT(eve_activate_zoom_out()), addMenuItem(toplevel, view, "Zoom &Out", SLOT(eve_activate_zoom_out()),
"CTRL+O", "zoom-out"); "CTRL+O", "zoom-out");
addMenuItem(toplevel, view, "Zoom &Reset", SLOT(eve_activate_zoom_reset()), addMenuItem(toplevel, view, "Zoom &Reset", SLOT(eve_activate_zoom_reset()),
"CTRL+B", "zoom-reset"); "CTRL+B", "zoom-original");
addCheckableMenuItem(toplevel, view, "&Display hundredth", addCheckableMenuItem(toplevel, view, "&Display hundredth",
SLOT(eve_activate_disp_hundredth())); SLOT(eve_activate_disp_hundredth(bool)));
addCheckableMenuItem( addCheckableMenuItem(
toplevel, view, "&Hide Event Name", SLOT(eve_activate_hide_object())); toplevel, view, "&Hide Event Name", SLOT(eve_activate_hide_object(bool)));
addCheckableMenuItem( addCheckableMenuItem(
toplevel, view, "Hide &Event Text", SLOT(eve_activate_hide_text())); toplevel, view, "Hide &Event Text", SLOT(eve_activate_hide_text(bool)));
// Help entry // Help entry
QMenu* help = menu_bar->addMenu(translate_utf8("&Help")); QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
...@@ -232,7 +232,11 @@ EvEveQt::EvEveQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name, ...@@ -232,7 +232,11 @@ EvEveQt::EvEveQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
EvEveQt::~EvEveQt() EvEveQt::~EvEveQt()
{ {
debug_print("EvEveQt::~EvEveQt\n"); if (ala) {
delete ala;
}
ala = NULL;
delete eve_methodtoolbar; delete eve_methodtoolbar;
delete eve_sup_methodtoolbar; delete eve_sup_methodtoolbar;
} }
...@@ -269,7 +273,6 @@ void EvEveQtWidget::focusInEvent(QFocusEvent* event) ...@@ -269,7 +273,6 @@ void EvEveQtWidget::focusInEvent(QFocusEvent* event)
void EvEveQtWidget::closeEvent(QCloseEvent* event) void EvEveQtWidget::closeEvent(QCloseEvent* event)
{ {
debug_print("EvEveQtWidget::closeEvent\n");
if (!(eve->options & ev_mAlaOptions_Embedded)) { if (!(eve->options & ev_mAlaOptions_Embedded)) {
delete eve; delete eve;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment