Commit 1ec4a335 authored by claes's avatar claes

rt_xtt -c also works add startup xtt startup

parent 3ddda0cf
/* /*
* Proview $Id: rt_xtt_gtk.cpp,v 1.8 2007-05-16 12:37:39 claes Exp $ * Proview $Id: rt_xtt_gtk.cpp,v 1.9 2007-05-21 14:28:32 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -811,7 +811,7 @@ XttGtk::XttGtk( int argc, char *argv[], int *return_sts) : ...@@ -811,7 +811,7 @@ XttGtk::XttGtk( int argc, char *argv[], int *return_sts) :
xnav = new XNavGtk( this, xnav_form, "Plant", xnav = new XNavGtk( this, xnav_form, "Plant",
&brow_widget, (xnav_sStartMenu *)root_menu, &brow_widget, (xnav_sStartMenu *)root_menu,
opplace_str, &sts); opplace_str, op_close_button, &sts);
xnav->message_cb = &xtt_message_cb; xnav->message_cb = &xtt_message_cb;
xnav->close_cb = &close; xnav->close_cb = &close;
xnav->map_cb = ↦ xnav->map_cb = ↦
......
/* /*
* Proview $Id: rt_xtt_motif.cpp,v 1.2 2007-01-11 11:40:30 claes Exp $ * Proview $Id: rt_xtt_motif.cpp,v 1.3 2007-05-21 14:28:32 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -652,7 +652,7 @@ XttMotif::XttMotif( int argc, char *argv[], int *return_sts) : ...@@ -652,7 +652,7 @@ XttMotif::XttMotif( int argc, char *argv[], int *return_sts) :
xnav = new XNavMotif( this, xnav_form, "Plant", xnav = new XNavMotif( this, xnav_form, "Plant",
&brow_widget, (xnav_sStartMenu *)root_menu, &brow_widget, (xnav_sStartMenu *)root_menu,
opplace_str, &sts); opplace_str, op_close_button, &sts);
xnav->message_cb = &xtt_message_cb; xnav->message_cb = &xtt_message_cb;
xnav->close_cb = &close; xnav->close_cb = &close;
xnav->map_cb = ↦ xnav->map_cb = ↦
......
/* /*
* Proview $Id: xtt_xnav_gtk.cpp,v 1.1 2007-01-04 08:29:32 claes Exp $ * Proview $Id: xtt_xnav_gtk.cpp,v 1.2 2007-05-21 14:28:56 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -79,8 +79,9 @@ XNavGtk::XNavGtk( void *xn_parent_ctx, ...@@ -79,8 +79,9 @@ XNavGtk::XNavGtk( void *xn_parent_ctx,
GtkWidget **w, GtkWidget **w,
xnav_sStartMenu *root_menu, xnav_sStartMenu *root_menu,
char *xn_opplace_name, char *xn_opplace_name,
int xn_op_close_button,
pwr_tStatus *status) : pwr_tStatus *status) :
XNav( xn_parent_ctx, xn_name, root_menu, xn_opplace_name, status), XNav( xn_parent_ctx, xn_name, root_menu, xn_opplace_name, xn_op_close_button, status),
parent_wid(xn_parent_wid) parent_wid(xn_parent_wid)
{ {
......
/* /*
* Proview $Id: xtt_xnav_gtk.h,v 1.1 2007-01-04 08:29:32 claes Exp $ * Proview $Id: xtt_xnav_gtk.h,v 1.2 2007-05-21 14:28:56 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -35,6 +35,7 @@ class XNavGtk : public XNav { ...@@ -35,6 +35,7 @@ class XNavGtk : public XNav {
GtkWidget **w, GtkWidget **w,
xnav_sStartMenu *root_menu, xnav_sStartMenu *root_menu,
char *xn_opplace_name, char *xn_opplace_name,
int xn_op_close_button,
pwr_tStatus *status); pwr_tStatus *status);
~XNavGtk(); ~XNavGtk();
......
/* /*
* Proview $Id: xtt_xnav_motif.cpp,v 1.1 2007-01-04 08:30:03 claes Exp $ * Proview $Id: xtt_xnav_motif.cpp,v 1.2 2007-05-21 14:28:56 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -100,8 +100,9 @@ XNavMotif::XNavMotif( void *xn_parent_ctx, ...@@ -100,8 +100,9 @@ XNavMotif::XNavMotif( void *xn_parent_ctx,
Widget *w, Widget *w,
xnav_sStartMenu *root_menu, xnav_sStartMenu *root_menu,
char *xn_opplace_name, char *xn_opplace_name,
int xn_op_close_button,
pwr_tStatus *status) : pwr_tStatus *status) :
XNav( xn_parent_ctx, xn_name, root_menu, xn_opplace_name, status), XNav( xn_parent_ctx, xn_name, root_menu, xn_opplace_name, xn_op_close_button, status),
parent_wid(xn_parent_wid) parent_wid(xn_parent_wid)
{ {
......
/* /*
* Proview $Id: xtt_xnav_motif.h,v 1.1 2007-01-04 08:30:03 claes Exp $ * Proview $Id: xtt_xnav_motif.h,v 1.2 2007-05-21 14:28:56 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -35,6 +35,7 @@ class XNavMotif : public XNav { ...@@ -35,6 +35,7 @@ class XNavMotif : public XNav {
Widget *w, Widget *w,
xnav_sStartMenu *root_menu, xnav_sStartMenu *root_menu,
char *xn_opplace_name, char *xn_opplace_name,
int op_close_button,
pwr_tStatus *status); pwr_tStatus *status);
~XNavMotif(); ~XNavMotif();
......
/* /*
* Proview $Id: xtt_xnav.cpp,v 1.33 2007-04-25 13:39:21 claes Exp $ * Proview $Id: xtt_xnav.cpp,v 1.34 2007-05-21 14:28:32 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -1007,6 +1007,7 @@ XNav::XNav( ...@@ -1007,6 +1007,7 @@ XNav::XNav(
char *xn_name, char *xn_name,
xnav_sStartMenu *root_menu, xnav_sStartMenu *root_menu,
char *xn_opplace_name, char *xn_opplace_name,
int xn_op_close_button,
pwr_tStatus *status) : pwr_tStatus *status) :
parent_ctx(xn_parent_ctx), parent_ctx(xn_parent_ctx),
brow_cnt(0), TraceList(NULL), trace_started(0), brow_cnt(0), TraceList(NULL), trace_started(0),
...@@ -1015,7 +1016,7 @@ XNav::XNav( ...@@ -1015,7 +1016,7 @@ XNav::XNav(
menu_tree(NULL), ev(0), op(0), clog(0), closing_down(0), menu_tree(NULL), ev(0), op(0), clog(0), closing_down(0),
base_priv(pwr_mPrv_System), priv(pwr_mPrv_System), displayed(0), base_priv(pwr_mPrv_System), priv(pwr_mPrv_System), displayed(0),
current_logging_index(-1), search_last_found(0), search_compiled(0), current_logging_index(-1), search_last_found(0), search_compiled(0),
attach_audio(0), audio(0) attach_audio(0), audio(0), op_close_button(xn_op_close_button)
{ {
strcpy( name, xn_name); strcpy( name, xn_name);
strcpy( opplace_name, xn_opplace_name); strcpy( opplace_name, xn_opplace_name);
...@@ -3383,6 +3384,8 @@ int XNav::init_brow_base_cb( FlowCtx *fctx, void *client_data) ...@@ -3383,6 +3384,8 @@ int XNav::init_brow_base_cb( FlowCtx *fctx, void *client_data)
pwr_tCmd cmd; pwr_tCmd cmd;
strcpy( cmd, "open op "); strcpy( cmd, "open op ");
strcat( cmd, xnav->opplace_name); strcat( cmd, xnav->opplace_name);
if ( xnav->op_close_button)
strcat( cmd, " /closebutton");
xnav->command( cmd); xnav->command( cmd);
xnav->load_ev_from_opplace(); xnav->load_ev_from_opplace();
......
/* /*
* Proview $Id: xtt_xnav.h,v 1.20 2007-01-17 06:19:57 claes Exp $ * Proview $Id: xtt_xnav.h,v 1.21 2007-05-21 14:28:32 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -256,6 +256,7 @@ class XNav { ...@@ -256,6 +256,7 @@ class XNav {
char *xn_name, char *xn_name,
xnav_sStartMenu *root_menu, xnav_sStartMenu *root_menu,
char *xn_opplace_name, char *xn_opplace_name,
int xn_op_close_button,
pwr_tStatus *status); pwr_tStatus *status);
virtual ~XNav(); virtual ~XNav();
...@@ -304,6 +305,7 @@ class XNav { ...@@ -304,6 +305,7 @@ class XNav {
int attach_audio; int attach_audio;
XttAudio *audio; XttAudio *audio;
CoWow *wow; CoWow *wow;
int op_close_button;
static xmenu_sMenuCall *mcp; static xmenu_sMenuCall *mcp;
virtual void set_inputfocus() {} virtual void set_inputfocus() {}
......
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