Skip to content

P
proview
Commit 8eb3bca0 authored by Christoffer Ackelman's avatar Christoffer Ackelman
Browse files
Options

QT: Added missing callbacks in Ev widget.

parent 6335dfe5
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 63 deletions
xtt/lib/xtt/qt/xtt_ev_qt.cqt
View file @ 8eb3bca0
......@@ -53,7 +53,7 @@
class CallbackWidget : public QDialog {
public:
CallbackWidget(EvQt* parent, void (EvQt::*close)(), void (EvQt::*focus)())
CallbackWidget(EvQtObject* parent, void (EvQtObject::*close)(), void (EvQtObject::*focus)())
: QDialog(), ev(parent), close_cb(close), focus_cb(focus){}
protected:
......@@ -61,9 +61,9 @@ protected:
void focusInEvent(QFocusEvent* event);
private:
EvQt* ev;
void (EvQt::*close_cb)();
void (EvQt::*focus_cb)();
EvQtObject* ev;
void (EvQtObject::*close_cb)();
void (EvQtObject::*focus_cb)();
};
void CallbackWidget::closeEvent(QCloseEvent* event)
......@@ -122,7 +122,7 @@ EvQt::EvQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
// Eve Window
{
parent_wid_eve = new CallbackWidget(
this, &EvQt::eve_activate_exit, &EvQt::eve_action_inputfocus);
object, &EvQtObject::eve_activate_exit, &EvQtObject::eve_action_inputfocus);
parent_wid_eve->setMinimumSize(eve_width, eve_height);
parent_wid_eve->setToolTip(fl("xtt_ev eve widget"));
parent_wid_eve->setWindowTitle(translate_utf8(eve_name));
......@@ -140,7 +140,7 @@ EvQt::EvQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
addMenuItem(object, file, "&Print", SLOT(eve_activate_print()), "",
"document-print");
addMenuItem(
object, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
object, file, "&Close", SLOT(eve_activate_exit()), "CTRL+W", "window-close");
// Functions entry
QMenu* functions = menu_bar->addMenu(translate_utf8("&Functions"));
......@@ -156,13 +156,13 @@ EvQt::EvQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
addMenuItem(object, view, "Zoom &Out", SLOT(eve_activate_zoom_out()),
"CTRL+O", "zoom-out");
addMenuItem(object, view, "Zoom &Reset", SLOT(eve_activate_zoom_reset()),
"CTRL+B", "zoom-reset");
"CTRL+B", "zoom-original");
addCheckableMenuItem(object, view, "&Display hundredth",
SLOT(eve_activate_disp_hundredth()));
SLOT(eve_activate_disp_hundredth(bool)));
addCheckableMenuItem(
object, view, "&Hide Event Name", SLOT(eve_activate_hide_object()));
object, view, "&Hide Event Name", SLOT(eve_activate_hide_object(bool)));
addCheckableMenuItem(
object, view, "Hide &Event Text", SLOT(eve_activate_hide_text()));
object, view, "Hide &Event Text", SLOT(eve_activate_hide_text(bool)));
// Help entry
QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
......@@ -227,7 +227,7 @@ EvQt::EvQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
// Ala Window
{
parent_wid_ala = new CallbackWidget(
this, &EvQt::ala_activate_exit, &EvQt::ala_action_inputfocus);
object, &EvQtObject::ala_activate_exit, &EvQtObject::ala_action_inputfocus);
parent_wid_eve->setToolTip(fl("xtt_ev ala widget"));
parent_wid_ala->setMinimumSize(ala_width, ala_height);
parent_wid_ala->setWindowTitle(translate_utf8(ala_name));
......@@ -245,7 +245,7 @@ EvQt::EvQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
addMenuItem(object, file, "&Print", SLOT(ala_activate_print()), "",
"document-print");
addMenuItem(
object, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
object, file, "&Close", SLOT(ala_activate_exit()), "CTRL+W", "window-close");
// Functions entry
QMenu* functions = menu_bar->addMenu(translate_utf8("&Functions"));
......@@ -289,13 +289,13 @@ EvQt::EvQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
addMenuItem(object, view, "Zoom &Out", SLOT(ala_activate_zoom_out()),
"CTRL+O", "zoom-out");
addMenuItem(object, view, "Zoom &Reset", SLOT(ala_activate_zoom_reset()),
"CTRL+B", "zoom-reset");
"CTRL+B", "zoom-original");
addCheckableMenuItem(object, view, "&Display hundredth",
SLOT(ala_activate_disp_hundredth()));
SLOT(ala_activate_disp_hundredth(bool)));
addCheckableMenuItem(
object, view, "&Hide Event Name", SLOT(ala_activate_hide_object()));
object, view, "&Hide Event Name", SLOT(ala_activate_hide_object(bool)));
addCheckableMenuItem(
object, view, "Hide &Event Text", SLOT(ala_activate_hide_text()));
object, view, "Hide &Event Text", SLOT(ala_activate_hide_text(bool)));
// Help entry
QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
......@@ -365,7 +365,7 @@ EvQt::EvQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
// Blk Window
{
parent_wid_blk = new CallbackWidget(
this, &EvQt::blk_activate_exit, &EvQt::blk_action_inputfocus);
object, &EvQtObject::blk_activate_exit, &EvQtObject::blk_action_inputfocus);
parent_wid_eve->setToolTip(fl("xtt_ev blk widget"));
parent_wid_blk->setMinimumSize(blk_width, blk_height);
parent_wid_blk->setWindowTitle(translate_utf8(blk_name));
......@@ -383,7 +383,7 @@ EvQt::EvQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
addMenuItem(object, file, "&Print", SLOT(blk_activate_print()), "",
"document-print");
addMenuItem(
object, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
object, file, "&Close", SLOT(blk_activate_exit()), "CTRL+W", "window-close");
// Functions entry
QMenu* functions = menu_bar->addMenu(translate_utf8("&Functions"));
......@@ -401,7 +401,7 @@ EvQt::EvQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
addMenuItem(object, view, "Zoom &Out", SLOT(blk_activate_zoom_out()),
"CTRL+O", "zoom-out");
addMenuItem(object, view, "Zoom &Reset", SLOT(blk_activate_zoom_reset()),
"CTRL+B", "zoom-reset");
"CTRL+B", "zoom-original");
// Help entry
QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
......@@ -620,43 +620,43 @@ void EvQt::set_title_ala(char* title)
parent_wid_ala->setWindowTitle(fl(title));
}
void EvQt::eve_action_inputfocus()
void EvQtObject::eve_action_inputfocus()
{
if (eve_displayed) {
eve->set_input_focus();
if (ev->eve_displayed) {
ev->eve->set_input_focus();
}
}
void EvQt::ala_action_inputfocus()
void EvQtObject::ala_action_inputfocus()
{
if (ala_displayed) {
ala->set_input_focus();
if (ev->ala_displayed) {
ev->ala->set_input_focus();
}
}
void EvQt::blk_action_inputfocus()
void EvQtObject::blk_action_inputfocus()
{
if (blk_displayed) {
blk->set_input_focus();
if (ev->blk_displayed) {
ev->blk->set_input_focus();
}
}
void EvQt::eve_activate_exit()
void EvQtObject::eve_activate_exit()
{
unmap_eve();
eve_displayed = 0;
ev->unmap_eve();
ev->eve_displayed = 0;
}
void EvQt::ala_activate_exit()
void EvQtObject::ala_activate_exit()
{
unmap_ala();
ala_displayed = 0;
ev->unmap_ala();
ev->ala_displayed = 0;
}
void EvQt::blk_activate_exit()
void EvQtObject::blk_activate_exit()
{
unmap_blk();
blk_displayed = 0;
ev->unmap_blk();
ev->blk_displayed = 0;
}
void EvQtObject::eve_activate_print()
......
xtt/lib/xtt/qt/xtt_ev_qt.h
View file @ 8eb3bca0
......@@ -81,13 +81,6 @@ public:
int width, int height, int x, int y, pwr_tObjid view,
unsigned int options = 0, void* widget = 0);
void eve_action_inputfocus();
void ala_action_inputfocus();
void blk_action_inputfocus();
void eve_activate_exit();
void ala_activate_exit();
void blk_activate_exit();
private:
EvQtObject* object;
};
......@@ -101,6 +94,12 @@ public:
}
public slots:
void eve_action_inputfocus();
void ala_action_inputfocus();
void blk_action_inputfocus();
void eve_activate_exit();
void ala_activate_exit();
void blk_activate_exit();
void eve_activate_print();
void ala_activate_print();
void blk_activate_print();
......
xtt/lib/xtt/qt/xtt_op_qt.cqt
View file @ 8eb3bca0
......@@ -96,8 +96,8 @@ static void modifyBackground(QWidget* widget, QColor& color)
QPalette pal;
pal.setColor(QPalette::Background, color);
widget->setAutoFillBackground(true);
widget->setPalette(pal);
widget->setAutoFillBackground(true);
}
static void modifyForeground(QWidget* widget, QColor& color)
......@@ -314,7 +314,7 @@ OpQt::OpQt(void* op_parent_ctx, QWidget* op_parent_wid, char* opplace,
SLOT(activate_help_proview()));
// End Help submenu
addMenuItem(
functions_close = addMenuItem(
toplevel, functions, "&Close", SLOT(close()), "CTRL+W", "window-close");
// Toolbar
......@@ -327,7 +327,7 @@ OpQt::OpQt(void* op_parent_ctx, QWidget* op_parent_wid, char* opplace,
"$pwr_exe/xtt_zoom_out.png");
addToolItem(
toplevel, tools, "Help", SLOT(activate_help()), "$pwr_exe/xtt_help.png");
addToolItem(
tools_close = addToolItem(
toplevel, tools, "Close", SLOT(close()), "$pwr_exe/xtt_close.png");
addToolItem(toplevel, tools2, "Alarm List", SLOT(activate_alarmlist()),
......@@ -395,6 +395,7 @@ OpQt::OpQt(void* op_parent_ctx, QWidget* op_parent_wid, char* opplace,
sup_vect[i].node_name);
node_label->setText(convert_utf8(text));
QPushButton* node_button = new QPushButton();
QHBoxLayout* node_hbox = new QHBoxLayout();
QWidget* node_ind = new QWidget();
......@@ -418,20 +419,19 @@ OpQt::OpQt(void* op_parent_ctx, QWidget* op_parent_wid, char* opplace,
modifyBackground(node_ind_frame, black_color);
node_ind_frame->setFixedSize(20, 20);
QWidget* node_image = layout_to_widget(node_image_layout);
if (buttonwidth) {
node_image->setFixedWidth(buttonwidth);
node_button->setFixedWidth(buttonwidth);
}
sup_vect[i].indw = (void*)node_ind;
sup_vect[i].indfiller1w = (void*)node_ind_filler1;
sup_vect[i].indfiller2w = (void*)node_ind_filler2;
sup_vect[i].textw = (void*)node_label;
sup_vect[i].textbgw = (void*)node_label;
sup_vect[i].buttonw = (void*)node_image;
sup_vect[i].buttonw = (void*)node_button;
QObject::connect(
node_image, SIGNAL(clicked()), toplevel, SLOT(activate_sup_node()));
node_button, SIGNAL(clicked()), toplevel, SLOT(activate_sup_node()));
status_bar->setContentsMargins(padding2, padding2, padding2, padding2);
status_bar->addWidget(node_image);
status_bar->addWidget(node_button);
}
if (buttonwidth) {
status_bar->setFixedWidth(xtt_monitor_geometry.width());
......@@ -925,15 +925,17 @@ int OpQt::configure(char* opplace_str)
for (i = 0;
i < sizeof(opplace_p->FastAvail) / sizeof(opplace_p->FastAvail[0]);
i++) {
if ((i + 1) % 5 == 0) {
if ((i == 0) || ((i + 1) % 5 == 0)) {
funcbox[(i + 1) / 5] = layout_to_widget(new QHBoxLayout());
appl_form->addWidget(funcbox[(i + 1) / 5]);
}
int i2 = ((int)(i / 5));
add_expanding(funcbox[i2]->layout(), appl_buttons[i]);
if (i >= 15) {
a_height = i2 + 1;
if (cdh_ObjidIsNotNull(button_aref[i].Objid)) {
int i2 = (int)(i / 5);
add_expanding(funcbox[i2]->layout(), appl_buttons[i]);
if (i >= 15) {
a_height = i2 + 1;
}
}
}
......@@ -1410,9 +1412,9 @@ void OpQt::set_color_theme(int idx)
modifyForeground(aalarm_mark, bg_text);
modifyBackground(balarm_mark, bg);
modifyForeground(balarm_mark, bg_text);
modifyBackground(balarm_active_box, bg);
modifyBackground(balarm_active, bg);
for (int i = 0; i < 5; i++) {
modifyBackground(aalarm_active_box[i], bg);
modifyBackground(aalarm_active[i], bg);
}
modifyBackground(menu_bar, menu);
......
xtt/lib/xtt/qt/xtt_op_qt.h
View file @ 8eb3bca0
......@@ -73,20 +73,18 @@ public:
QWidget* aalarm_mark;
QLabel* aalarm_label[5];
QWidget* aalarm_active[5];
QWidget* aalarm_active_box[5];
QWidget* aalarm_info[5];
QWidget* aalarm_box[5];
QLabel* balarm_label;
QWidget* balarm_active;
QWidget* balarm_active_box;
QWidget* balarm_info;
QWidget* balarm_box;
QWidget* balarm_ebox;
QLabel* balarm_mark;
QVBoxLayout* appl_form;
QWidget* decr_button;
QWidget* tools_close;
QWidget* functions_close;
QAction* tools_close;
QAction* functions_close;
QWidget* funcbox[5];
QMenuBar* menu_bar;
QLabel* title_label;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7