Commit ff017ce5 authored by Claes Sjofors's avatar Claes Sjofors

Second window in wb navigator disabled in ProjectList and GblVolumeList

parent b2393312
...@@ -532,6 +532,11 @@ void WttGtk::set_edit_show() ...@@ -532,6 +532,11 @@ void WttGtk::set_edit_show()
void WttGtk::set_twowindows( int two, int display_wnav, int display_wnavnode) void WttGtk::set_twowindows( int two, int display_wnav, int display_wnavnode)
{ {
if ( disable_w2) {
display_wnav = 1;
display_wnavnode = 0;
two = 0;
}
if ( display_wnav || display_wnavnode) { if ( display_wnav || display_wnavnode) {
if ( display_wnav && ! wnav_mapped) { if ( display_wnav && ! wnav_mapped) {
g_object_set( wnav_brow_widget, "visible", TRUE, NULL); g_object_set( wnav_brow_widget, "visible", TRUE, NULL);
...@@ -1808,8 +1813,8 @@ WttGtk::WttGtk( ...@@ -1808,8 +1813,8 @@ WttGtk::WttGtk(
set_focus_disabled(0), disfocus_timerid(0), selection_timerid(0), avoid_deadlock(0), set_focus_disabled(0), disfocus_timerid(0), selection_timerid(0), avoid_deadlock(0),
clock_cursor(0), realized(0) clock_cursor(0), realized(0)
{ {
const int window_width = 900; int window_width = 900;
const int window_height = 800; int window_height = 800;
// int palette_width = 220; // int palette_width = 220;
pwr_tStatus sts; pwr_tStatus sts;
char title[80]; char title[80];
...@@ -1821,7 +1826,6 @@ WttGtk::WttGtk( ...@@ -1821,7 +1826,6 @@ WttGtk::WttGtk(
char layout_palette[80]; char layout_palette[80];
char title_w1[40]; char title_w1[40];
char title_w2[40]; char title_w2[40];
int hide_wnavnode = 0;
pwr_tFileName fname; pwr_tFileName fname;
if ( wbctx && volid) { if ( wbctx && volid) {
...@@ -1894,7 +1898,9 @@ WttGtk::WttGtk( ...@@ -1894,7 +1898,9 @@ WttGtk::WttGtk(
strcpy( title_w1, "Plant Configuration"); strcpy( title_w1, "Plant Configuration");
strcpy( title_w2, "Node Configuration"); strcpy( title_w2, "Node Configuration");
sprintf( title, "PwR Navigator Buffer %s, %s", volname, name); sprintf( title, "PwR Navigator Buffer %s, %s", volname, name);
hide_wnavnode = 1; window_width = 500;
window_height = 400;
disable_w2 = 1;
break; break;
case pwr_eClass_ExternVolume: { case pwr_eClass_ExternVolume: {
switch ( volid) { switch ( volid) {
...@@ -1906,7 +1912,9 @@ WttGtk::WttGtk( ...@@ -1906,7 +1912,9 @@ WttGtk::WttGtk(
strcpy( title_w1, "Project List"); strcpy( title_w1, "Project List");
strcpy( title_w2, ""); strcpy( title_w2, "");
sprintf( title, "PwR Project List"); sprintf( title, "PwR Project List");
hide_wnavnode = 1; window_width = 500;
window_height = 400;
disable_w2 = 1;
break; break;
case ldh_cGlobalVolumeListVolume: case ldh_cGlobalVolumeListVolume:
wb_type = wb_eType_ExternVolume; wb_type = wb_eType_ExternVolume;
...@@ -1916,7 +1924,9 @@ WttGtk::WttGtk( ...@@ -1916,7 +1924,9 @@ WttGtk::WttGtk(
strcpy( title_w1, "Global Volume List"); strcpy( title_w1, "Global Volume List");
strcpy( title_w2, ""); strcpy( title_w2, "");
sprintf( title, "PwR Global Volume List"); sprintf( title, "PwR Global Volume List");
hide_wnavnode = 1; window_width = 500;
window_height = 400;
disable_w2 = 1;
break; break;
case ldh_cUserDatabaseVolume: case ldh_cUserDatabaseVolume:
wb_type = wb_eType_ExternVolume; wb_type = wb_eType_ExternVolume;
...@@ -1926,7 +1936,9 @@ WttGtk::WttGtk( ...@@ -1926,7 +1936,9 @@ WttGtk::WttGtk(
strcpy( title_w1, "User Database"); strcpy( title_w1, "User Database");
strcpy( title_w2, ""); strcpy( title_w2, "");
sprintf( title, "PwR User Database"); sprintf( title, "PwR User Database");
hide_wnavnode = 1; window_width = 500;
window_height = 400;
disable_w2 = 1;
break; break;
default: default:
wb_type = wb_eType_ExternVolume; wb_type = wb_eType_ExternVolume;
...@@ -2692,6 +2704,9 @@ WttGtk::WttGtk( ...@@ -2692,6 +2704,9 @@ WttGtk::WttGtk(
gtk_widget_show_all( toplevel); gtk_widget_show_all( toplevel);
realized = 1; realized = 1;
if ( disable_w2)
wnavnode_mapped = 0;
if ( !wnav_mapped) if ( !wnav_mapped)
g_object_set( wnav_brow_widget, "visible", FALSE, NULL); g_object_set( wnav_brow_widget, "visible", FALSE, NULL);
if ( !wnavnode_mapped) if ( !wnavnode_mapped)
......
...@@ -2080,7 +2080,7 @@ Wtt::Wtt( ...@@ -2080,7 +2080,7 @@ Wtt::Wtt(
select_attr(0), select_type(0), select_attr(0), select_type(0),
wnav_mapped(0), wnavnode_mapped(0), utedctx(0), wpkg(0), wnav_mapped(0), wnavnode_mapped(0), utedctx(0), wpkg(0),
close_cb(0), open_volume_cb(0), open_project_volume_cb(0), time_to_exit_cb(0), close_cb(0), open_volume_cb(0), open_project_volume_cb(0), time_to_exit_cb(0),
mcp(0) mcp(0), disable_w2(0)
{ {
strcpy( name, wt_name); strcpy( name, wt_name);
*status = 1; *status = 1;
......
...@@ -181,6 +181,7 @@ class Wtt : public WUtility { ...@@ -181,6 +181,7 @@ class Wtt : public WUtility {
void (*open_project_volume_cb)(void *ctx); void (*open_project_volume_cb)(void *ctx);
int (*time_to_exit_cb)(void *ctx); int (*time_to_exit_cb)(void *ctx);
ldh_sMenuCall *mcp; ldh_sMenuCall *mcp;
int disable_w2;
int restore_settings(); int restore_settings();
int save_settings(); int save_settings();
......
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