Commit 12adb20e authored by Claes Sjofors's avatar Claes Sjofors

Bugfix in operator window: statusbar indikator color and display of alarm time

parent 39b3fc1e
...@@ -732,7 +732,7 @@ void OpGtk::update_alarm_info() ...@@ -732,7 +732,7 @@ void OpGtk::update_alarm_info()
time_format = time_eFormat_ComprDateAndTime; time_format = time_eFormat_ComprDateAndTime;
show_time = 1; show_time = 1;
} }
else if ( layout_mask & pwr_mOpWindLayoutMask_ShowAlarmDateAndTime) { else if ( layout_mask & pwr_mOpWindLayoutMask_ShowAlarmTime) {
time_format = time_eFormat_Time; time_format = time_eFormat_Time;
show_time = 1; show_time = 1;
} }
...@@ -1567,6 +1567,8 @@ void OpGtk::change_sup_color( void *imagew, op_eSupColor color) ...@@ -1567,6 +1567,8 @@ void OpGtk::change_sup_color( void *imagew, op_eSupColor color)
case op_eSupColor_Black: case op_eSupColor_Black:
dcli_translate_filename( fname, "$pwr_exe/xtt_ind_black.png"); dcli_translate_filename( fname, "$pwr_exe/xtt_ind_black.png");
break; break;
default:
dcli_translate_filename( fname, "$pwr_exe/xtt_ind_gray.png");
} }
gtk_image_set_from_file( GTK_IMAGE(image), fname); gtk_image_set_from_file( GTK_IMAGE(image), fname);
} }
......
...@@ -47,16 +47,18 @@ class CoWowTimer; ...@@ -47,16 +47,18 @@ class CoWowTimer;
class Op; class Op;
typedef enum { typedef enum {
op_eSupColor_,
op_eSupColor_Gray, op_eSupColor_Gray,
op_eSupColor_Green, op_eSupColor_Green,
op_eSupColor_Yellow, op_eSupColor_Yellow,
op_eSupColor_Red, op_eSupColor_Red,
op_eSupColor_Black op_eSupColor_Black,
op_eSupColor__
} op_eSupColor; } op_eSupColor;
class OpSup { class OpSup {
public: public:
OpSup() : buttonw(0), imagew(0), p(0), old_color(op_eSupColor_Gray), flash(0) OpSup() : buttonw(0), imagew(0), p(0), old_color(op_eSupColor_), flash(0)
{ strcpy( node_name, ""); strcpy( object_name, "");} { strcpy( node_name, ""); strcpy( object_name, "");}
pwr_tOid node_oid; pwr_tOid node_oid;
......
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