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
78c8cba3
Commit
78c8cba3
authored
Dec 06, 2018
by
Christoffer Ackelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QT: Simplified the ge widget slightly.
parent
e671c9e5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
54 deletions
+35
-54
xtt/lib/ge/qt/ge_qt.cqt
xtt/lib/ge/qt/ge_qt.cqt
+35
-53
xtt/lib/ge/qt/ge_qt.h
xtt/lib/ge/qt/ge_qt.h
+0
-1
No files found.
xtt/lib/ge/qt/ge_qt.cqt
View file @
78c8cba3
...
@@ -1061,48 +1061,30 @@ void GeQtWidget::activate_view_plant(bool set)
...
@@ -1061,48 +1061,30 @@ void GeQtWidget::activate_view_plant(bool set)
void GeQtWidget::activate_view_graphlist(bool set)
void GeQtWidget::activate_view_graphlist(bool set)
{
{
bool pane_visible = ge->hpaned3->isVisible();
bool objectnav_visible = ge->objectnav_w->isVisible();
if (sender() != ge->view_graphlist_w) {
if (sender() != ge->view_graphlist_w) {
ge->view_graphlist_w->setChecked(set);
ge->view_graphlist_w->setChecked(set);
}
}
if (set) {
if (set) {
if (!pane_visible) {
ge->hpaned3->setVisible(true);
}
ge->graph_list->setVisible(true);
ge->graph_list->setVisible(true);
} else {
} else {
ge->graph_list->setVisible(false);
ge->graph_list->setVisible(false);
if (!objectnav_visible && pane_visible) {
ge->hpaned3->setVisible(false);
}
}
}
ge->set_focus(0);
ge->set_focus(0);
}
}
void GeQtWidget::activate_view_objectnav(bool set)
void GeQtWidget::activate_view_objectnav(bool set)
{
{
bool pane_visible = ge->hpaned3->isVisible();
bool graph_list_visible = ge->graph_list->isVisible();
if (sender() != ge->view_objectnav_w) {
if (sender() != ge->view_objectnav_w) {
ge->view_objectnav_w->setChecked(set);
ge->view_objectnav_w->setChecked(set);
}
}
if (set) {
if (set) {
if (!pane_visible) {
ge->hpaned3->setVisible(true);
}
ge->objectnav_w->setVisible(true);
ge->objectnav_w->setVisible(true);
ge->set_focus(ge->objectnav);
ge->set_focus(ge->objectnav);
ge->objectnav_mapped = 1;
ge->objectnav_mapped = 1;
} else {
} else {
ge->objectnav_w->setVisible(false);
ge->objectnav_w->setVisible(false);
if (!graph_list_visible && pane_visible) {
ge->hpaned3->setVisible(false);
}
ge->set_focus(0);
ge->set_focus(0);
ge->objectnav_mapped = 0;
ge->objectnav_mapped = 0;
}
}
...
@@ -1527,7 +1509,7 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
...
@@ -1527,7 +1509,7 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
// Submenu Conpoint Direction
// Submenu Conpoint Direction
QActionGroup* condir_group = new QActionGroup(toplevel);
QActionGroup* condir_group = new QActionGroup(toplevel);
QMenu* cons_condir = cons->addMenu(translate_utf8("Conpoint &Direction"));
QMenu* cons_condir = cons->addMenu(translate_utf8("Conpoint &Direction"));
addMenuRadioItem(toplevel, cons_condir, "&Center",
QAction* cons_condir_center =
addMenuRadioItem(toplevel, cons_condir, "&Center",
SLOT(activate_condir_center()), condir_group);
SLOT(activate_condir_center()), condir_group);
addMenuRadioItem(toplevel, cons_condir, "&Left", SLOT(activate_condir_left()),
addMenuRadioItem(toplevel, cons_condir, "&Left", SLOT(activate_condir_left()),
condir_group);
condir_group);
...
@@ -1537,6 +1519,7 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
...
@@ -1537,6 +1519,7 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
toplevel, cons_condir, "&Up", SLOT(activate_condir_up()), condir_group);
toplevel, cons_condir, "&Up", SLOT(activate_condir_up()), condir_group);
addMenuRadioItem(toplevel, cons_condir, "&Down", SLOT(activate_condir_down()),
addMenuRadioItem(toplevel, cons_condir, "&Down", SLOT(activate_condir_down()),
condir_group);
condir_group);
cons_condir_center->setChecked(true);
// Submenu Corners
// Submenu Corners
QActionGroup* corners_group = new QActionGroup(toplevel);
QActionGroup* corners_group = new QActionGroup(toplevel);
...
@@ -1755,9 +1738,10 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
...
@@ -1755,9 +1738,10 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
tools_textfont->setFont(QFont("Courier"));
tools_textfont->setFont(QFont("Courier"));
// Bold checkbutton
// Bold checkbutton
addCheckableToolItem(toplevel, tools3,
QCheckBox* bold = new QCheckBox("Bold");
"Set bold on selected text, and as default",
bold->setToolTip(fl("Set bold on selected text, and as default"));
SLOT(activate_textbold(bool)), "");
QObject::connect(bold, SIGNAL(toggled(bool)), toplevel, SLOT(activate_textbold(bool)));
tools3->addWidget(bold);
// Toolbar 2 (again)
// Toolbar 2 (again)
...
@@ -1784,6 +1768,8 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
...
@@ -1784,6 +1768,8 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
addToolItem(toplevel, tools2, "Increase brightness",
addToolItem(toplevel, tools2, "Increase brightness",
SLOT(activate_incr_lightness()), "$pwr_exe/ge_brightness.png");
SLOT(activate_incr_lightness()), "$pwr_exe/ge_brightness.png");
tools2->addWidget(new_image_label(tools2, "$pwr_exe/ge_brightness.png"));
// Separator
// Separator
tools2->addSeparator();
tools2->addSeparator();
...
@@ -1793,6 +1779,8 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
...
@@ -1793,6 +1779,8 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
addToolItem(toplevel, tools2, "Increase color intensity",
addToolItem(toplevel, tools2, "Increase color intensity",
SLOT(activate_incr_intensity()), "$pwr_exe/ge_arrowright.png");
SLOT(activate_incr_intensity()), "$pwr_exe/ge_arrowright.png");
tools2->addWidget(new_image_label(tools2, "$pwr_exe/ge_color.png"));
// Separator
// Separator
tools2->addSeparator();
tools2->addSeparator();
...
@@ -1802,6 +1790,8 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
...
@@ -1802,6 +1790,8 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
addToolItem(toplevel, tools2, "Shift color", SLOT(activate_incr_shift()),
addToolItem(toplevel, tools2, "Shift color", SLOT(activate_incr_shift()),
"$pwr_exe/ge_arrowright.png");
"$pwr_exe/ge_arrowright.png");
tools2->addWidget(new_image_label(tools2, "$pwr_exe/ge_colorshift.png"));
// Gradient option menu
// Gradient option menu
tools_gradient = addToolMenu(toplevel, tools2, SLOT(activate_gradient(int)));
tools_gradient = addToolMenu(toplevel, tools2, SLOT(activate_gradient(int)));
tools_gradient->addItem(get_icon("$pwr_exe/ge_gradient_no.png"),
tools_gradient->addItem(get_icon("$pwr_exe/ge_gradient_no.png"),
...
@@ -1920,19 +1910,18 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
...
@@ -1920,19 +1910,18 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
graph->refresh_objects_cb = &Ge::refresh_objects_cb;
graph->refresh_objects_cb = &Ge::refresh_objects_cb;
// Vertical palette pane
// Vertical palette pane
QSplitter* vpaned1 = new QSplitter(Qt::Vertical);
QSplitter* vpaned = new QSplitter(Qt::Vertical);
QSplitter* vpaned2 = new QSplitter(Qt::Vertical);
QHBoxLayout* palbox = new QHBoxLayout();
QHBoxLayout* palbox = new QHBoxLayout();
// SubGraphs palette
// SubGraphs palette
subpalette
subpalette
= new SubPaletteQt(this,
vpaned1
, "SubGraphs", &subpalette_widget, &sts);
= new SubPaletteQt(this,
toplevel
, "SubGraphs", &subpalette_widget, &sts);
subpalette->message_cb = &Ge::message_cb;
subpalette->message_cb = &Ge::message_cb;
subpalette->set_focus_cb = &Ge::set_focus_cb;
subpalette->set_focus_cb = &Ge::set_focus_cb;
subpalette->traverse_focus_cb = &Ge::traverse_focus;
subpalette->traverse_focus_cb = &Ge::traverse_focus;
subpalette->help_cb = help_cb;
subpalette->help_cb = help_cb;
add_expanding(palbox,
subpalette_widget);
palbox->addWidget(
subpalette_widget);
subpalette_mapped = 1;
subpalette_mapped = 1;
// Color palette
// Color palette
...
@@ -1942,17 +1931,14 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
...
@@ -1942,17 +1931,14 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
if (ldhses) {
if (ldhses) {
plantctx = new NavQt(
plantctx = new NavQt(
this,
vpaned1
, "Plant", ldhses, "NavigatorW1", &plant_widget, &sts);
this,
toplevel
, "Plant", ldhses, "NavigatorW1", &plant_widget, &sts);
((NavQt*)plantctx)->get_plant_select_cb = Ge::get_plant_select_cb;
((NavQt*)plantctx)->get_plant_select_cb = Ge::get_plant_select_cb;
((NavQt*)plantctx)->set_focus_cb = Ge::set_focus_cb;
((NavQt*)plantctx)->set_focus_cb = Ge::set_focus_cb;
((NavQt*)plantctx)->traverse_focus_cb = Ge::traverse_focus;
((NavQt*)plantctx)->traverse_focus_cb = Ge::traverse_focus;
add_expanding(palbox,
plant_widget);
palbox->addWidget(
plant_widget);
}
}
QSplitter* hpaned2 = new QSplitter(Qt::Horizontal);
objectnav = new AttrQt(toplevel, this, attr_eType_ObjectTree, 0, 0, 0);
hpaned3 = new QSplitter(Qt::Horizontal);
objectnav = new AttrQt(hpaned3, this, attr_eType_ObjectTree, 0, 0, 0);
objectnav_w = ((AttrQt*)objectnav)->brow_widget;
objectnav_w = ((AttrQt*)objectnav)->brow_widget;
assert(objectnav_w != NULL);
assert(objectnav_w != NULL);
objectnav->set_graph(graph);
objectnav->set_graph(graph);
...
@@ -1972,37 +1958,31 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
...
@@ -1972,37 +1958,31 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
objectnav->set_inputfocus_cb = set_focus_cb;
objectnav->set_inputfocus_cb = set_focus_cb;
objectnav->traverse_inputfocus_cb = traverse_focus;
objectnav->traverse_inputfocus_cb = traverse_focus;
add_expanding(vpaned
1
, palbox);
add_expanding(vpaned, palbox);
vpaned
1
->addWidget(colpal_main_widget);
vpaned->addWidget(colpal_main_widget);
((GraphQt*)graph)->create_navigator();
((GraphQt*)graph)->create_navigator();
add_expanding(vpaned2, vpaned1);
vpaned->addWidget(((GraphQt*)graph)->nav_widget);
vpaned1->addWidget(((GraphQt*)graph)->nav_widget);
// Horizontal pane
QSplitter* hpaned = new QSplitter(Qt::Horizontal);
add_expanding(hpaned, grow_widget);
hpaned->addWidget(vpaned2);
GeItemViewQt* item_view = new GeItemViewQt(this);
GeItemViewQt* item_view = new GeItemViewQt(this);
graph_list = item_view->widget();
graph_list = item_view->widget();
hpaned3->addWidget(graph_list);
// Horizontal pane
add_expanding(hpaned3, objectnav_w);
QSplitter* hpaned = new QSplitter(Qt::Horizontal);
hpaned->addWidget(graph_list);
hpaned2->addWidget(hpaned3);
hpaned->addWidget(objectnav_w);
add_expanding(hpaned2, hpaned);
add_expanding(hpaned, grow_widget);
hpaned->addWidget(vpaned);
QVBoxLayout* vbox = new QVBoxLayout(toplevel);
QVBoxLayout* vbox = new QVBoxLayout(toplevel);
vbox->setMenuBar(menu_bar);
vbox->setMenuBar(menu_bar);
vbox->addWidget(tools3);
vbox->addWidget(tools3);
vbox->addWidget(tools2);
vbox->addWidget(tools2);
vbox->addWidget(tools);
vbox->addWidget(tools);
add_expanding(vbox, hpaned
2
);
add_expanding(vbox, hpaned);
vbox->addWidget(statusbar);
vbox->addWidget(statusbar);
toplevel->setLayout(vbox);
toplevel->setLayout(vbox);
toplevel->show();
toplevel->show();
tools_textfont->setFixedHeight(tools_textsize->height());
tools_textfont->setFixedHeight(tools_textsize->height());
...
@@ -2011,12 +1991,14 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
...
@@ -2011,12 +1991,14 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
graph_list->setVisible(false);
graph_list->setVisible(false);
objectnav_w->setVisible(false);
objectnav_w->setVisible(false);
hpaned3->setVisible(false);
set_pane_position(hpaned2, 150);
QList<int> pane_sizes;
set_pane_position(hpaned, -palette_width - 175);
pane_sizes << 150 << 150 << window_width - palette_width - 325 << palette_width + 25;
set_pane_position(vpaned1, -380);
hpaned->setSizes(pane_sizes);
set_pane_position(vpaned2, -290);
pane_sizes.clear();
pane_sizes << window_height - 380 << 90 << 290;
vpaned->setSizes(pane_sizes);
if (ldhses) {
if (ldhses) {
plant_widget->setVisible(false);
plant_widget->setVisible(false);
...
...
xtt/lib/ge/qt/ge_qt.h
View file @
78c8cba3
...
@@ -72,7 +72,6 @@ public:
...
@@ -72,7 +72,6 @@ public:
QAction
*
view_objectnav_w
;
QAction
*
view_objectnav_w
;
QWidget
*
graph_list
;
QWidget
*
graph_list
;
QWidget
*
objectnav_w
;
QWidget
*
objectnav_w
;
QSplitter
*
hpaned3
;
CoWowRecall
*
text_recall
;
CoWowRecall
*
text_recall
;
CoWowRecall
*
name_recall
;
CoWowRecall
*
name_recall
;
CoWowRecall
*
value_recall
;
CoWowRecall
*
value_recall
;
...
...
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