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
c25dd394
Commit
c25dd394
authored
Jan 07, 2019
by
Christoffer Ackelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QT: Cleaned up rt_xtt_cmd.
parent
8f9c3183
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
19 deletions
+11
-19
xtt/exe/rt_xtt_cmd/qt/rt_xtt_cmd_qt.cpp
xtt/exe/rt_xtt_cmd/qt/rt_xtt_cmd_qt.cpp
+10
-18
xtt/exe/rt_xtt_cmd/qt/rt_xtt_cmd_qt.h
xtt/exe/rt_xtt_cmd/qt/rt_xtt_cmd_qt.h
+1
-1
No files found.
xtt/exe/rt_xtt_cmd/qt/rt_xtt_cmd_qt.cpp
View file @
c25dd394
...
@@ -52,12 +52,12 @@
...
@@ -52,12 +52,12 @@
#include <QApplication>
#include <QApplication>
#include <QMainWindow>
#include <QMainWindow>
XttCmdQt
::
XttCmdQt
(
QWidget
*
w
)
XttCmdQt
::
XttCmdQt
()
{
{
pwr_tStatus
sts
;
pwr_tStatus
sts
;
pwr_tOName
opplace
=
""
;
pwr_tOName
opplace
=
""
;
xnav
=
new
XNavQt
(
this
,
w
,
"Plant"
,
&
brow_widget
,
(
xnav_sStartMenu
*
)
root_menu
,
xnav
=
new
XNavQt
(
this
,
NULL
,
"Plant"
,
&
brow_widget
,
(
xnav_sStartMenu
*
)
root_menu
,
opplace
,
0
,
&
sts
);
opplace
,
0
,
&
sts
);
xnav
->
message_cb
=
&
message_cb
;
xnav
->
message_cb
=
&
message_cb
;
...
@@ -67,9 +67,7 @@ XttCmdQt::XttCmdQt(QWidget* w)
...
@@ -67,9 +67,7 @@ XttCmdQt::XttCmdQt(QWidget* w)
static
int
timeout_func
()
static
int
timeout_func
()
{
{
while
(
QApplication
::
hasPendingEvents
())
{
QApplication
::
processEvents
();
QApplication
::
processEvents
();
}
return
1
;
return
1
;
}
}
...
@@ -135,17 +133,13 @@ int main(int argc, char* argv[])
...
@@ -135,17 +133,13 @@ int main(int argc, char* argv[])
strcpy
(
title
,
"Xtt Cmd"
);
strcpy
(
title
,
"Xtt Cmd"
);
// Qt
// Qt
QMainWindow
*
toplevel
=
new
QMainWindow
();
cmd
=
new
XttCmdQt
();
toplevel
->
setMinimumSize
(
400
,
700
);
cmd
->
brow_widget
->
setMinimumSize
(
400
,
700
);
toplevel
->
setWindowTitle
(
fl
(
title
));
cmd
->
brow_widget
->
setWindowTitle
(
fl
(
title
));
toplevel
->
setAttribute
(
Qt
::
WA_DeleteOnClose
);
cmd
->
brow_widget
->
setAttribute
(
Qt
::
WA_DeleteOnClose
);
cmd
->
brow_widget
->
show
();
cmd
=
new
XttCmdQt
(
toplevel
);
toplevel
->
setCentralWidget
(
cmd
->
brow_widget
);
toplevel
->
show
();
if
(
hide
)
{
if
(
hide
)
{
toplevel
->
setVisible
(
false
);
cmd
->
brow_widget
->
setVisible
(
false
);
}
}
if
(
!
quiet
)
{
if
(
!
quiet
)
{
...
@@ -195,8 +189,6 @@ GNU General Public License for more details.\n\n";
...
@@ -195,8 +189,6 @@ GNU General Public License for more details.\n\n";
str_trim
(
str
,
str
);
str_trim
(
str
,
str
);
sts
=
cmd
->
xnav
->
command
(
str
);
sts
=
cmd
->
xnav
->
command
(
str
);
while
(
QApplication
::
hasPendingEvents
())
{
QApplication
::
processEvents
();
QApplication
::
processEvents
();
}
}
}
}
}
\ No newline at end of file
xtt/exe/rt_xtt_cmd/qt/rt_xtt_cmd_qt.h
View file @
c25dd394
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
class
XttCmdQt
:
public
XttCmd
{
class
XttCmdQt
:
public
XttCmd
{
public:
public:
XttCmdQt
(
QWidget
*
w
);
XttCmdQt
();
QWidget
*
brow_widget
;
QWidget
*
brow_widget
;
};
};
...
...
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