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
d83a335b
Commit
d83a335b
authored
Jul 09, 2018
by
Christoffer Ackelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed crash when opening help several times.
parent
2299fc12
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
23 additions
and
26 deletions
+23
-26
wb/lib/wb/qt/wb_wtt_qt.cqt
wb/lib/wb/qt/wb_wtt_qt.cqt
+5
-5
xtt/lib/cow/qt/cow_xhelp_qt.cqt
xtt/lib/cow/qt/cow_xhelp_qt.cqt
+0
-1
xtt/lib/cow/qt/cow_xhelpnav_qt.cpp
xtt/lib/cow/qt/cow_xhelpnav_qt.cpp
+1
-1
xtt/lib/flow/qt/flow_draw_qt.cqt
xtt/lib/flow/qt/flow_draw_qt.cqt
+2
-2
xtt/lib/flow/qt/flow_scroll_widget_qt.cqt
xtt/lib/flow/qt/flow_scroll_widget_qt.cqt
+6
-7
xtt/lib/flow/qt/flow_scroll_widget_qt.h
xtt/lib/flow/qt/flow_scroll_widget_qt.h
+1
-1
xtt/lib/glow/qt/glow_draw_qt.cqt
xtt/lib/glow/qt/glow_draw_qt.cqt
+1
-1
xtt/lib/glow/qt/glow_scroll_widget_qt.cqt
xtt/lib/glow/qt/glow_scroll_widget_qt.cqt
+6
-7
xtt/lib/glow/qt/glow_scroll_widget_qt.h
xtt/lib/glow/qt/glow_scroll_widget_qt.h
+1
-1
No files found.
wb/lib/wb/qt/wb_wtt_qt.cqt
View file @
d83a335b
...
@@ -2443,7 +2443,7 @@ void OptionsDialog::activate_options_cancel()
...
@@ -2443,7 +2443,7 @@ void OptionsDialog::activate_options_cancel()
}
}
OptionsDialog::OptionsDialog(WttQt *parent_ctx, QWidget *parent)
OptionsDialog::OptionsDialog(WttQt *parent_ctx, QWidget *parent)
: QDialog(
parent
), wtt(parent_ctx)
: QDialog(), wtt(parent_ctx)
{
{
setMinimumSize(650, 450);
setMinimumSize(650, 450);
setWindowTitle(fl("Options"));
setWindowTitle(fl("Options"));
...
@@ -2455,7 +2455,7 @@ OptionsDialog::OptionsDialog(WttQt *parent_ctx, QWidget *parent)
...
@@ -2455,7 +2455,7 @@ OptionsDialog::OptionsDialog(WttQt *parent_ctx, QWidget *parent)
wtt->show_plant_w = new QCheckBox(fl("Plant Configuration"), this);
wtt->show_plant_w = new QCheckBox(fl("Plant Configuration"), this);
wtt->show_node_w = new QCheckBox(fl("Node Configuration"), this);
wtt->show_node_w = new QCheckBox(fl("Node Configuration"), this);
QVBoxLayout *hier_vbox = new QVBoxLayout(
this
);
QVBoxLayout *hier_vbox = new QVBoxLayout();
hier_vbox->addWidget(hier_label);
hier_vbox->addWidget(hier_label);
hier_vbox->addWidget(wtt->enable_comment_w);
hier_vbox->addWidget(wtt->enable_comment_w);
hier_vbox->addWidget(wtt->enable_revisions_w);
hier_vbox->addWidget(wtt->enable_revisions_w);
...
@@ -2471,7 +2471,7 @@ OptionsDialog::OptionsDialog(WttQt *parent_ctx, QWidget *parent)
...
@@ -2471,7 +2471,7 @@ OptionsDialog::OptionsDialog(WttQt *parent_ctx, QWidget *parent)
wtt->show_attrref_w = new QCheckBox(fl("Attribute Reference"), this);
wtt->show_attrref_w = new QCheckBox(fl("Attribute Reference"), this);
wtt->show_attrxref_w = new QCheckBox(fl("Attribute Cross Reference"), this);
wtt->show_attrxref_w = new QCheckBox(fl("Attribute Cross Reference"), this);
QVBoxLayout *entry_vbox = new QVBoxLayout(
this
);
QVBoxLayout *entry_vbox = new QVBoxLayout();
entry_vbox->addWidget(entry_label);
entry_vbox->addWidget(entry_label);
entry_vbox->addWidget(wtt->show_class_w);
entry_vbox->addWidget(wtt->show_class_w);
entry_vbox->addWidget(wtt->show_alias_w);
entry_vbox->addWidget(wtt->show_alias_w);
...
@@ -2490,7 +2490,7 @@ OptionsDialog::OptionsDialog(WttQt *parent_ctx, QWidget *parent)
...
@@ -2490,7 +2490,7 @@ OptionsDialog::OptionsDialog(WttQt *parent_ctx, QWidget *parent)
wtt->build_manual_w = new QCheckBox(fl("Manual"), this);
wtt->build_manual_w = new QCheckBox(fl("Manual"), this);
wtt->build_nocopy_w = new QCheckBox(fl("Disable Copy"), this);
wtt->build_nocopy_w = new QCheckBox(fl("Disable Copy"), this);
QVBoxLayout *build_vbox = new QVBoxLayout(
this
);
QVBoxLayout *build_vbox = new QVBoxLayout();
build_vbox->addWidget(build_label);
build_vbox->addWidget(build_label);
build_vbox->addWidget(wtt->build_force_w);
build_vbox->addWidget(wtt->build_force_w);
build_vbox->addWidget(wtt->build_debug_w);
build_vbox->addWidget(wtt->build_debug_w);
...
@@ -2500,7 +2500,7 @@ OptionsDialog::OptionsDialog(WttQt *parent_ctx, QWidget *parent)
...
@@ -2500,7 +2500,7 @@ OptionsDialog::OptionsDialog(WttQt *parent_ctx, QWidget *parent)
build_vbox->addWidget(wtt->build_manual_w);
build_vbox->addWidget(wtt->build_manual_w);
build_vbox->addWidget(wtt->build_nocopy_w);
build_vbox->addWidget(wtt->build_nocopy_w);
QHBoxLayout *hbox = new QHBoxLayout(
this
);
QHBoxLayout *hbox = new QHBoxLayout();
hbox->addLayout(hier_vbox);
hbox->addLayout(hier_vbox);
hbox->addWidget(separator(QFrame::VLine));
hbox->addWidget(separator(QFrame::VLine));
hbox->addLayout(entry_vbox);
hbox->addLayout(entry_vbox);
...
...
xtt/lib/cow/qt/cow_xhelp_qt.cqt
View file @
d83a335b
...
@@ -208,7 +208,6 @@ CoXHelpQt::CoXHelpQt(QWidget *xa_parent_wid, void *xa_parent_ctx,
...
@@ -208,7 +208,6 @@ CoXHelpQt::CoXHelpQt(QWidget *xa_parent_wid, void *xa_parent_ctx,
toplevel->setToolTip(fl("cow_xhelp widget"));
toplevel->setToolTip(fl("cow_xhelp widget"));
toplevel->setFixedSize(700, 600);
toplevel->setFixedSize(700, 600);
toplevel->setWindowTitle(fl(title));
toplevel->setWindowTitle(fl(title));
toplevel->setAttribute(Qt::WA_DeleteOnClose);
CoWowQt::SetWindowIcon(toplevel);
CoWowQt::SetWindowIcon(toplevel);
...
...
xtt/lib/cow/qt/cow_xhelpnav_qt.cpp
View file @
d83a335b
...
@@ -68,7 +68,7 @@ CoXHelpNavQt::CoXHelpNavQt(void *xn_parent_ctx, QWidget *xn_parent_wid,
...
@@ -68,7 +68,7 @@ CoXHelpNavQt::CoXHelpNavQt(void *xn_parent_ctx, QWidget *xn_parent_wid,
QWidget
**
w
,
pwr_tStatus
*
status
)
QWidget
**
w
,
pwr_tStatus
*
status
)
:
CoXHelpNav
(
xn_parent_ctx
,
xn_name
,
xn_utility
,
status
)
:
CoXHelpNav
(
xn_parent_ctx
,
xn_name
,
xn_utility
,
status
)
{
{
debug_print
(
"creating a scrolledbrowwidgetqt
\n
"
);
debug_print
(
"
CoXHelpNavQt:
creating a scrolledbrowwidgetqt
\n
"
);
form_widget
=
scrolledbrowwidgetqt_new
(
CoXHelpNav
::
init_brow_base_cb
,
this
,
form_widget
=
scrolledbrowwidgetqt_new
(
CoXHelpNav
::
init_brow_base_cb
,
this
,
&
brow_widget
);
&
brow_widget
);
...
...
xtt/lib/flow/qt/flow_draw_qt.cqt
View file @
d83a335b
...
@@ -1582,7 +1582,7 @@ void FlowDrawQt::clear(FlowCtx *ctx)
...
@@ -1582,7 +1582,7 @@ void FlowDrawQt::clear(FlowCtx *ctx)
painter->setBackground(QBrush(background));
painter->setBackground(QBrush(background));
//debug_print("clear color=%s\n", painter->background().color().name().toAscii().data());
//debug_print("clear color=%s\n", painter->background().color().name().toAscii().data());
painter->eraseRect(window->rect());
painter->eraseRect(window
_canvas
->rect());
delete painter;
delete painter;
}
}
...
@@ -1595,7 +1595,7 @@ void FlowDrawQt::nav_clear(FlowCtx *ctx)
...
@@ -1595,7 +1595,7 @@ void FlowDrawQt::nav_clear(FlowCtx *ctx)
painter->setBackground(QBrush(background));
painter->setBackground(QBrush(background));
//debug_print("nav_clear color=%s\n", painter->background().color().name().toAscii().data());
//debug_print("nav_clear color=%s\n", painter->background().color().name().toAscii().data());
painter->eraseRect(nav_window->rect());
painter->eraseRect(nav_window
_canvas
->rect());
delete painter;
delete painter;
}
}
...
...
xtt/lib/flow/qt/flow_scroll_widget_qt.cqt
View file @
d83a335b
...
@@ -46,12 +46,11 @@
...
@@ -46,12 +46,11 @@
#include "cow_qt_helpers.h"
#include "cow_qt_helpers.h"
QImage
QtScrollWidgetFlow::createBuffer(QSize size)
void
QtScrollWidgetFlow::createBuffer(QSize size)
{
{
QImage
image = QImage(size, QImage::Format_RGB32);
this->
image = QImage(size, QImage::Format_RGB32);
QPainter imPainter(&image);
QPainter imPainter(&image);
imPainter.fillRect(image.rect(), palette().color(QPalette::Background));
imPainter.fillRect(image.rect(), palette().color(QPalette::Background));
return image;
}
}
void QtScrollWidgetFlow::init(
void QtScrollWidgetFlow::init(
...
@@ -59,7 +58,7 @@ void QtScrollWidgetFlow::init(
...
@@ -59,7 +58,7 @@ void QtScrollWidgetFlow::init(
void *client_data, int (*init_proc2)(QWidget *w, FlowCtx *ctx,
void *client_data, int (*init_proc2)(QWidget *w, FlowCtx *ctx,
void *client_data))
void *client_data))
{
{
this->image =
createBuffer(size());
createBuffer(size());
this->ctxType = eCtxType;
this->ctxType = eCtxType;
this->init_proc = init_proc;
this->init_proc = init_proc;
this->init_widget_proc = init_proc2;
this->init_widget_proc = init_proc2;
...
@@ -71,7 +70,7 @@ QWidget *QtScrollWidgetFlow::initScroll(
...
@@ -71,7 +70,7 @@ QWidget *QtScrollWidgetFlow::initScroll(
void *client_data, int (*init_proc2)(QWidget *w, FlowCtx *ctx,
void *client_data, int (*init_proc2)(QWidget *w, FlowCtx *ctx,
void *client_data))
void *client_data))
{
{
this->image =
createBuffer(size());
createBuffer(size());
this->ctxType = eCtxType;
this->ctxType = eCtxType;
this->init_proc = init_proc;
this->init_proc = init_proc;
this->init_widget_proc = init_proc2;
this->init_widget_proc = init_proc2;
...
@@ -103,7 +102,7 @@ bool QScrollAreaFlow::event(QEvent *event)
...
@@ -103,7 +102,7 @@ bool QScrollAreaFlow::event(QEvent *event)
void QtScrollWidgetFlow::init(unsigned int eCtxType, QWidget *main)
void QtScrollWidgetFlow::init(unsigned int eCtxType, QWidget *main)
{
{
this->image =
createBuffer(size());
createBuffer(size());
this->ctxType = eCtxType;
this->ctxType = eCtxType;
is_navigator = 1;
is_navigator = 1;
main_widget = main;
main_widget = main;
...
@@ -260,7 +259,7 @@ void QtScrollWidgetFlow::handleEvent(QEvent *event)
...
@@ -260,7 +259,7 @@ void QtScrollWidgetFlow::handleEvent(QEvent *event)
bool QtScrollWidgetFlow::event(QEvent *event)
bool QtScrollWidgetFlow::event(QEvent *event)
{
{
if (event->type() == QEvent::Resize) {
if (event->type() == QEvent::Resize) {
this->image =
createBuffer(((QResizeEvent *) event)->size());
createBuffer(((QResizeEvent *) event)->size());
}
}
if (!is_realized && (event->type() == QEvent::Show || event->type() == QEvent::Resize)) {
if (!is_realized && (event->type() == QEvent::Show || event->type() == QEvent::Resize)) {
realize();
realize();
...
...
xtt/lib/flow/qt/flow_scroll_widget_qt.h
View file @
d83a335b
...
@@ -122,7 +122,7 @@ protected:
...
@@ -122,7 +122,7 @@ protected:
unsigned
int
ctxType
;
unsigned
int
ctxType
;
private:
private:
QImage
createBuffer
(
QSize
size
);
void
createBuffer
(
QSize
size
);
public
slots
:
public
slots
:
void
scroll_h_action
(
int
value
);
void
scroll_h_action
(
int
value
);
...
...
xtt/lib/glow/qt/glow_draw_qt.cqt
View file @
d83a335b
...
@@ -1498,7 +1498,7 @@ void GlowDrawQt::clear(GlowWind *wind)
...
@@ -1498,7 +1498,7 @@ void GlowDrawQt::clear(GlowWind *wind)
DrawWindQt *w = (DrawWindQt *) wind->window;
DrawWindQt *w = (DrawWindQt *) wind->window;
if (!w->double_buffer_on) {
if (!w->double_buffer_on) {
QPainter(w->buffer).eraseRect(w->
window
->rect());
QPainter(w->buffer).eraseRect(w->
buffer
->rect());
} else {
} else {
buffer_background(w, 0);
buffer_background(w, 0);
}
}
...
...
xtt/lib/glow/qt/glow_scroll_widget_qt.cqt
View file @
d83a335b
...
@@ -46,12 +46,11 @@
...
@@ -46,12 +46,11 @@
#include "cow_qt_helpers.h"
#include "cow_qt_helpers.h"
QImage
QtScrollWidgetGlow::createBuffer(QSize size)
void
QtScrollWidgetGlow::createBuffer(QSize size)
{
{
QImage
image = QImage(size, QImage::Format_RGB32);
this->
image = QImage(size, QImage::Format_RGB32);
QPainter imPainter(&image);
QPainter imPainter(&image);
imPainter.fillRect(image.rect(), palette().color(QPalette::Background));
imPainter.fillRect(image.rect(), palette().color(QPalette::Background));
return image;
}
}
void QtScrollWidgetGlow::init(
void QtScrollWidgetGlow::init(
...
@@ -59,7 +58,7 @@ void QtScrollWidgetGlow::init(
...
@@ -59,7 +58,7 @@ void QtScrollWidgetGlow::init(
void *client_data, int (*init_proc2)(QWidget *w, GlowCtx *ctx,
void *client_data, int (*init_proc2)(QWidget *w, GlowCtx *ctx,
void *client_data))
void *client_data))
{
{
this->image =
createBuffer(size());
createBuffer(size());
this->ctxType = eCtxType;
this->ctxType = eCtxType;
this->init_proc = init_proc;
this->init_proc = init_proc;
this->init_widget_proc = init_proc2;
this->init_widget_proc = init_proc2;
...
@@ -71,7 +70,7 @@ QWidget *QtScrollWidgetGlow::initScroll(
...
@@ -71,7 +70,7 @@ QWidget *QtScrollWidgetGlow::initScroll(
void *client_data, int (*init_proc2)(QWidget *w, GlowCtx *ctx,
void *client_data, int (*init_proc2)(QWidget *w, GlowCtx *ctx,
void *client_data))
void *client_data))
{
{
this->image =
createBuffer(size());
createBuffer(size());
this->ctxType = eCtxType;
this->ctxType = eCtxType;
this->init_proc = init_proc;
this->init_proc = init_proc;
this->init_widget_proc = init_proc2;
this->init_widget_proc = init_proc2;
...
@@ -103,7 +102,7 @@ bool QScrollAreaGlow::event(QEvent *event)
...
@@ -103,7 +102,7 @@ bool QScrollAreaGlow::event(QEvent *event)
void QtScrollWidgetGlow::init(unsigned int eCtxType, QWidget *main)
void QtScrollWidgetGlow::init(unsigned int eCtxType, QWidget *main)
{
{
this->image =
createBuffer(size());
createBuffer(size());
this->ctxType = eCtxType;
this->ctxType = eCtxType;
is_navigator = 1;
is_navigator = 1;
main_widget = main;
main_widget = main;
...
@@ -260,7 +259,7 @@ void QtScrollWidgetGlow::handleEvent(QEvent *event)
...
@@ -260,7 +259,7 @@ void QtScrollWidgetGlow::handleEvent(QEvent *event)
bool QtScrollWidgetGlow::event(QEvent *event)
bool QtScrollWidgetGlow::event(QEvent *event)
{
{
if (event->type() == QEvent::Resize) {
if (event->type() == QEvent::Resize) {
this->image =
createBuffer(((QResizeEvent *) event)->size());
createBuffer(((QResizeEvent *) event)->size());
}
}
if (!is_realized && (event->type() == QEvent::Show || event->type() == QEvent::Resize)) {
if (!is_realized && (event->type() == QEvent::Show || event->type() == QEvent::Resize)) {
realize();
realize();
...
...
xtt/lib/glow/qt/glow_scroll_widget_qt.h
View file @
d83a335b
...
@@ -122,7 +122,7 @@ protected:
...
@@ -122,7 +122,7 @@ protected:
unsigned
int
ctxType
;
unsigned
int
ctxType
;
private:
private:
QImage
createBuffer
(
QSize
size
);
void
createBuffer
(
QSize
size
);
public
slots
:
public
slots
:
void
scroll_h_action
(
int
value
);
void
scroll_h_action
(
int
value
);
...
...
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