Commit 40d83890 authored by Christoffer Ackelman's avatar Christoffer Ackelman Committed by Esteban Blanc

QT: Changed from checkboxes to radiobuttons for selecting mode in the PLC editor.

parent 73afcc2a
...@@ -436,37 +436,33 @@ void WFoeQtWidget::activate_helpclass() ...@@ -436,37 +436,33 @@ void WFoeQtWidget::activate_helpclass()
// (and not directly by the user ) the event is 0. // (and not directly by the user ) the event is 0.
// These callbacks are use to determine in which mode the user works: // These callbacks are use to determine in which mode the user works:
// SG 01.05.91 // SG 01.05.91
void WFoeQtWidget::activate_trace_togg(bool set) void WFoeQtWidget::activate_trace_togg()
{ {
foe->activate_trace_togg(set); foe->activate_trace_togg(true);
} }
// Callbacks from the toggle buttons under the customize entry. // Callbacks from the toggle buttons under the customize entry.
void WFoeQtWidget::activate_simulate_togg(bool set) void WFoeQtWidget::activate_simulate_togg()
{ {
foe->activate_simulate_togg(set); foe->activate_simulate_togg(true);
} }
void WFoeQtWidget::activate_view_togg(bool set) void WFoeQtWidget::activate_view_togg()
{ {
if (sender() != foe->view_togg) { if (sender() != foe->view_togg) {
foe->view_togg->setChecked(true); foe->view_togg->setChecked(true);
} }
set = foe->view_togg->isChecked(); foe->activate_view_togg(true);
foe->activate_view_togg(set);
} }
void WFoeQtWidget::activate_edit_togg(bool set) void WFoeQtWidget::activate_edit_togg()
{ {
if (sender() != foe->edit_togg) { if (sender() != foe->edit_togg) {
foe->edit_togg->setChecked(true); foe->edit_togg->setChecked(true);
} }
set = foe->edit_togg->isChecked(); foe->activate_edit_togg(true);
foe->activate_edit_togg(set);
} }
void WFoeQtWidget::valchanged_textinput() void WFoeQtWidget::valchanged_textinput()
...@@ -757,7 +753,7 @@ pwr_tStatus WFoeQt::create_window(int x_top, int y_top, int width_adb, ...@@ -757,7 +753,7 @@ pwr_tStatus WFoeQt::create_window(int x_top, int y_top, int width_adb,
// File Entry // File Entry
QMenu* file = menu_bar->addMenu(translate_utf8("&File")); QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
save = addMenuItem( save = addMenuItem(
toplevel, file, "Save", SLOT(activate_save()), "", "document-save"); toplevel, file, "Save", SLOT(activate_save()), "CTRL+S", "document-save");
// Submenu Print // Submenu Print
QMenu* file_print = file->addMenu(translate_utf8("&Print")); QMenu* file_print = file->addMenu(translate_utf8("&Print"));
...@@ -949,14 +945,16 @@ pwr_tStatus WFoeQt::create_window(int x_top, int y_top, int width_adb, ...@@ -949,14 +945,16 @@ pwr_tStatus WFoeQt::create_window(int x_top, int y_top, int width_adb,
// Mode entry // Mode entry
QMenu* mode = menu_bar->addMenu(translate_utf8("&Mode")); QMenu* mode = menu_bar->addMenu(translate_utf8("&Mode"));
view_togg = addCheckableMenuItem( QActionGroup* mode_group = new QActionGroup(toplevel);
toplevel, mode, "&View", SLOT(activate_view_togg(bool))); view_togg = addMenuRadioItem(
edit_togg = addCheckableMenuItem( toplevel, mode, "&View", SLOT(activate_view_togg()), mode_group);
toplevel, mode, "&Edit", SLOT(activate_edit_togg(bool)), "CTRL+E"); edit_togg = addMenuRadioItem(
trace_togg = addCheckableMenuItem( toplevel, mode, "&Edit", SLOT(activate_edit_togg()), mode_group);
toplevel, mode, "&Trace", SLOT(activate_trace_togg(bool))); edit_togg->setShortcut(fl("CTRL+E"));
simulate_togg = addCheckableMenuItem( trace_togg = addMenuRadioItem(
toplevel, mode, "&Simulate", SLOT(activate_simulate_togg(bool))); toplevel, mode, "&Trace", SLOT(activate_trace_togg()), mode_group);
simulate_togg = addMenuRadioItem(
toplevel, mode, "&Simulate", SLOT(activate_simulate_togg()), mode_group);
// Menu Help // Menu Help
QMenu* help = menu_bar->addMenu(translate_utf8("&Help")); QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
......
...@@ -228,10 +228,10 @@ public slots: ...@@ -228,10 +228,10 @@ public slots:
void activate_helpplc(); void activate_helpplc();
void activate_helpplclist(); void activate_helpplclist();
void activate_helpclass(); void activate_helpclass();
void activate_trace_togg(bool set); void activate_trace_togg();
void activate_simulate_togg(bool set); void activate_simulate_togg();
void activate_view_togg(bool set); void activate_view_togg();
void activate_edit_togg(bool set); void activate_edit_togg();
void valchanged_textinput(); void valchanged_textinput();
void popup_unmap_cb(); void popup_unmap_cb();
......
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