Xtt operator window, alarm info button for moretext added

xtt/lib/xtt/gtk/xtt_op_gtk.h

@@ -72,9 +72,12 @@ class OpGtk : public Op {
   GtkWidget		*alarmcnt_label;
   GtkWidget		*aalarm_label[5];
   GtkWidget		*aalarm_active[5];
+  GtkWidget		*aalarm_info[5];
+  GtkWidget		*aalarm_filler[5];
   GtkWidget		*aalarm_box[5];
   GtkWidget		*balarm_label;
   GtkWidget		*balarm_active;
+  GtkWidget		*balarm_info;
   GtkWidget		*balarm_box;
   GtkWidget		*balarm_ebox;
   GtkWidget		*balarm_mark;
@@ -88,6 +91,8 @@ class OpGtk : public Op {
   int			a_height;
   int			a_exist[5];
   int			a_active[5];
+  char			a_alarm_moretext[5][256];
+  char			b_alarm_moretext[256];
   int			text_size;
   CoWowFocusTimerGtk 	poptimer;
   vector<OpCmd> cmd_vect;
@@ -152,6 +157,7 @@ class OpGtk : public Op {
   static void activate_appl23( GtkWidget *w, gpointer data);
   static void activate_appl24( GtkWidget *w, gpointer data);
   static void activate_appl25( GtkWidget *w, gpointer data);
+  static void activate_info( GtkWidget *w, gpointer data);
 };
 
 #endif

xtt/lib/xtt/src/xtt_evlist.cpp

@@ -2395,6 +2395,8 @@ int EvList::get_alarm_info( evlist_sAlarmInfo *info)
                     break;
                   strncpy( info->a_alarm_text[a_cnt], eventtext, 
 			   sizeof(info->a_alarm_text[0]));
+                  strncpy( info->a_alarm_moretext[a_cnt], object_item->eventmoretext, 
+			   sizeof(info->a_alarm_moretext[0]));
 		  info->a_alarm_text[a_cnt][sizeof(info->a_alarm_text[0])-1] = 0;
                   strncpy( info->a_alarm_alias[a_cnt], object_item->alias, 
 			  sizeof(info->a_alarm_alias[0]));
@@ -2408,6 +2410,8 @@ int EvList::get_alarm_info( evlist_sAlarmInfo *info)
                     break;
                   strncpy( info->b_alarm_text[b_cnt], eventtext,
 			   sizeof(info->b_alarm_text[0]));
+                  strncpy( info->b_alarm_moretext[b_cnt], object_item->eventmoretext, 
+			   sizeof(info->b_alarm_moretext[0]));
 		  info->b_alarm_text[b_cnt][sizeof(info->b_alarm_text[0])-1] = 0;
                   strncpy( info->b_alarm_alias[b_cnt], object_item->alias,
 			   sizeof(info->b_alarm_alias[0]));
@@ -2421,6 +2425,8 @@ int EvList::get_alarm_info( evlist_sAlarmInfo *info)
                     break;
                   strncpy( info->c_alarm_text[c_cnt], eventtext,
 			   sizeof(info->c_alarm_text[0]));
+                  strncpy( info->c_alarm_moretext[c_cnt], object_item->eventmoretext, 
+			   sizeof(info->c_alarm_moretext[0]));
 		  info->c_alarm_text[c_cnt][sizeof(info->c_alarm_text[0])-1] = 0;
                   strncpy( info->c_alarm_alias[c_cnt], object_item->alias,
 			   sizeof(info->c_alarm_alias[0]));
@@ -2434,6 +2440,8 @@ int EvList::get_alarm_info( evlist_sAlarmInfo *info)
                     break;
                   strncpy( info->d_alarm_text[d_cnt], eventtext,
 			   sizeof(info->d_alarm_text[0]));
+                  strncpy( info->d_alarm_moretext[d_cnt], object_item->eventmoretext, 
+			   sizeof(info->d_alarm_moretext[0]));
 		  info->d_alarm_text[d_cnt][sizeof(info->d_alarm_text[0])-1] = 0;
                   strncpy( info->d_alarm_alias[d_cnt], object_item->alias,
 			   sizeof(info->d_alarm_alias[0]));
@@ -2455,6 +2463,8 @@ int EvList::get_alarm_info( evlist_sAlarmInfo *info)
                 break;
               strncpy( info->i_alarm_text[i_cnt], object_item->eventtext,
 		       sizeof(info->i_alarm_text[0]));
+	      strncpy( info->i_alarm_moretext[i_cnt], object_item->eventmoretext, 
+		       sizeof(info->i_alarm_moretext[0]));
               strncpy( info->i_alarm_alias[i_cnt], object_item->alias,
 		       sizeof(info->i_alarm_alias[0]));
 	      info->i_alarm_time[i_cnt] = object_item->time;

xtt/lib/xtt/src/xtt_evlist.h

@@ -76,27 +76,32 @@ class ItemAlarm;
 #define ALARM_INFO_I_SIZE  2
 typedef struct {
 	char	a_alarm_text[ALARM_INFO_A_SIZE][80];
+	char	a_alarm_moretext[ALARM_INFO_A_SIZE][256];
 	char	a_alarm_alias[ALARM_INFO_A_SIZE][40];
 	pwr_tTime a_alarm_time[ALARM_INFO_A_SIZE];
 	int	a_alarm_active[ALARM_INFO_A_SIZE];
 	int	a_alarm_exist[ALARM_INFO_A_SIZE];
 	char	b_alarm_text[ALARM_INFO_B_SIZE][80];
-	char	b_alarm_alias[ALARM_INFO_A_SIZE][40];
+	char	b_alarm_moretext[ALARM_INFO_B_SIZE][256];
+	char	b_alarm_alias[ALARM_INFO_B_SIZE][40];
 	pwr_tTime b_alarm_time[ALARM_INFO_B_SIZE];
 	int	b_alarm_active[ALARM_INFO_B_SIZE];
 	int	b_alarm_exist[ALARM_INFO_B_SIZE];
 	char	c_alarm_text[ALARM_INFO_C_SIZE][80];
-	char	c_alarm_alias[ALARM_INFO_A_SIZE][40];
+	char	c_alarm_moretext[ALARM_INFO_C_SIZE][256];
+	char	c_alarm_alias[ALARM_INFO_C_SIZE][40];
 	pwr_tTime c_alarm_time[ALARM_INFO_C_SIZE];
 	int	c_alarm_active[ALARM_INFO_C_SIZE];
 	int	c_alarm_exist[ALARM_INFO_C_SIZE];
 	char	d_alarm_text[ALARM_INFO_D_SIZE][80];
+	char	d_alarm_moretext[ALARM_INFO_A_SIZE][256];
 	char	d_alarm_alias[ALARM_INFO_A_SIZE][40];
 	pwr_tTime d_alarm_time[ALARM_INFO_D_SIZE];
 	int	d_alarm_active[ALARM_INFO_D_SIZE];
 	int	d_alarm_exist[ALARM_INFO_D_SIZE];
 	char	i_alarm_text[ALARM_INFO_I_SIZE][80];
-	char	i_alarm_alias[ALARM_INFO_A_SIZE][40];
+	char	i_alarm_moretext[ALARM_INFO_I_SIZE][256];
+	char	i_alarm_alias[ALARM_INFO_I_SIZE][40];
 	pwr_tTime i_alarm_time[ALARM_INFO_I_SIZE];
 	int	i_alarm_active[ALARM_INFO_I_SIZE];
 	int	i_alarm_exist[ALARM_INFO_I_SIZE];