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
324dbb94
Commit
324dbb94
authored
Jun 04, 2019
by
Christoffer Ackelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QT: Make XttEv windows non-modal.
parent
3cf2a08b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
12 deletions
+8
-12
xtt/lib/xtt/qt/xtt_ev_qt.cqt
xtt/lib/xtt/qt/xtt_ev_qt.cqt
+4
-7
xtt/lib/xtt/qt/xtt_ev_qt.h
xtt/lib/xtt/qt/xtt_ev_qt.h
+4
-5
No files found.
xtt/lib/xtt/qt/xtt_ev_qt.cqt
View file @
324dbb94
...
...
@@ -51,10 +51,10 @@
#include <QMenuBar>
#include <QVBoxLayout>
class CallbackWidget : public Q
Dialog
{
class CallbackWidget : public Q
Widget
{
public:
CallbackWidget(EvQtObject* parent, void (EvQtObject::*close)(), void (EvQtObject::*focus)())
: Q
Dialog
(), ev(parent), close_cb(close), focus_cb(focus) {}
: Q
Widget
(), ev(parent), close_cb(close), focus_cb(focus) {}
protected:
void closeEvent(QCloseEvent* event);
...
...
@@ -69,13 +69,13 @@ private:
void CallbackWidget::closeEvent(QCloseEvent* event)
{
((ev)->*(close_cb))();
Q
Dialog
::closeEvent(event);
Q
Widget
::closeEvent(event);
}
void CallbackWidget::focusInEvent(QFocusEvent* event)
{
((ev)->*(focus_cb))();
Q
Dialog
::focusInEvent(event);
Q
Widget
::focusInEvent(event);
}
EvQt::EvQt(void* ev_parent_ctx, char* eve_name, char* ala_name, char* blk_name,
...
...
@@ -613,19 +613,16 @@ void EvQt::unmap_blk()
void EvQt::set_transient_eve(void* basewidget)
{
parent_wid_eve->setParent(((QWidget*)basewidget));
parent_wid_eve->setModal(true);
}
void EvQt::set_transient_ala(void* basewidget)
{
parent_wid_ala->setParent(((QWidget*)basewidget));
parent_wid_ala->setModal(true);
}
void EvQt::set_transient_blk(void* basewidget)
{
parent_wid_blk->setParent(((QWidget*)basewidget));
parent_wid_blk->setModal(true);
}
void EvQt::set_title_ala(char* title)
...
...
xtt/lib/xtt/qt/xtt_ev_qt.h
View file @
324dbb94
...
...
@@ -41,7 +41,6 @@
#include "xtt_ev.h"
#include <QDialog>
#include <QWidget>
class
EvQtObject
;
...
...
@@ -54,9 +53,9 @@ public:
int
ev_eventname_seg
,
pwr_tStatus
*
status
);
~
EvQt
();
Q
Dialog
*
parent_wid_eve
;
Q
Dialog
*
parent_wid_ala
;
Q
Dialog
*
parent_wid_blk
;
Q
Widget
*
parent_wid_eve
;
Q
Widget
*
parent_wid_ala
;
Q
Widget
*
parent_wid_blk
;
QWidget
*
eve_widget
;
QWidget
*
ala_widget
;
QWidget
*
blk_widget
;
...
...
@@ -137,4 +136,4 @@ private:
EvQt
*
ev
;
};
#endif
\ No newline at end of file
#endif
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