Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
82b8cdcf
Commit
82b8cdcf
authored
Dec 17, 2018
by
Christoffer Ackelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QT: Fixed missing menu callbacks in alarmlist/eventlist satellite widgets.
parent
b4a1add2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
12 deletions
+18
-12
xtt/lib/xtt/qt/xtt_evala_qt.cqt
xtt/lib/xtt/qt/xtt_evala_qt.cqt
+9
-6
xtt/lib/xtt/qt/xtt_eveve_qt.cqt
xtt/lib/xtt/qt/xtt_eveve_qt.cqt
+9
-6
No files found.
xtt/lib/xtt/qt/xtt_evala_qt.cqt
View file @
82b8cdcf
...
...
@@ -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()),
"CTRL+O", "zoom-out");
addMenuItem(toplevel, view, "Zoom &Reset", SLOT(ala_activate_zoom_reset()),
"CTRL+B", "zoom-
reset
");
"CTRL+B", "zoom-
original
");
addCheckableMenuItem(toplevel, view, "&Display hundredth",
SLOT(ala_activate_disp_hundredth()));
SLOT(ala_activate_disp_hundredth(
bool
)));
addCheckableMenuItem(
toplevel, view, "&Hide Event Name", SLOT(ala_activate_hide_object()));
toplevel, view, "&Hide Event Name", SLOT(ala_activate_hide_object(
bool
)));
addCheckableMenuItem(
toplevel, view, "Hide &Event Text", SLOT(ala_activate_hide_text()));
toplevel, view, "Hide &Event Text", SLOT(ala_activate_hide_text(
bool
)));
// Help entry
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,
EvAlaQt::~EvAlaQt()
{
debug_print("EvAlaQt::~EvAlaQt\n");
if (ala) {
delete ala;
}
ala = NULL;
delete ala_methodtoolbar;
delete ala_sup_methodtoolbar;
}
...
...
@@ -281,7 +285,6 @@ void EvAlaQtWidget::focusInEvent(QFocusEvent* event)
void EvAlaQtWidget::closeEvent(QCloseEvent* event)
{
debug_print("EvAlaQtWidget::closeEvent\n");
if (!(ala->options & ev_mAlaOptions_Embedded)) {
delete ala;
}
...
...
xtt/lib/xtt/qt/xtt_eveve_qt.cqt
View file @
82b8cdcf
...
...
@@ -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()),
"CTRL+O", "zoom-out");
addMenuItem(toplevel, view, "Zoom &Reset", SLOT(eve_activate_zoom_reset()),
"CTRL+B", "zoom-
reset
");
"CTRL+B", "zoom-
original
");
addCheckableMenuItem(toplevel, view, "&Display hundredth",
SLOT(eve_activate_disp_hundredth()));
SLOT(eve_activate_disp_hundredth(
bool
)));
addCheckableMenuItem(
toplevel, view, "&Hide Event Name", SLOT(eve_activate_hide_object()));
toplevel, view, "&Hide Event Name", SLOT(eve_activate_hide_object(
bool
)));
addCheckableMenuItem(
toplevel, view, "Hide &Event Text", SLOT(eve_activate_hide_text()));
toplevel, view, "Hide &Event Text", SLOT(eve_activate_hide_text(
bool
)));
// Help entry
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,
EvEveQt::~EvEveQt()
{
debug_print("EvEveQt::~EvEveQt\n");
if (ala) {
delete ala;
}
ala = NULL;
delete eve_methodtoolbar;
delete eve_sup_methodtoolbar;
}
...
...
@@ -269,7 +273,6 @@ void EvEveQtWidget::focusInEvent(QFocusEvent* event)
void EvEveQtWidget::closeEvent(QCloseEvent* event)
{
debug_print("EvEveQtWidget::closeEvent\n");
if (!(eve->options & ev_mAlaOptions_Embedded)) {
delete eve;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment