Update of /cvsroot/rails/18xx/rails/ui/swing
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27417/rails/ui/swing
Modified Files:
GameUIManager.java
Log Message:
Map is now visible during CGR formation (but the dialogs are still modal)
Index: GameUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameUIManager.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** GameUIManager.java 26 Nov 2009 22:15:27 -0000 1.26
--- GameUIManager.java 29 Dec 2009 23:41:17 -0000 1.27
***************
*** 224,227 ****
--- 224,229 ----
log.debug("UI entering Stock Round");
+ orWindow.setVisible(false);
+ stockChart.setVisible(true);
} else if (OperatingRound.class.isAssignableFrom(currentRoundType)) {
***************
*** 229,234 ****
--- 231,241 ----
log.debug("UI entering Operating Round");
orUIManager.initOR((OperatingRound) currentRound);
+ orWindow.setVisible(true);
+ stockChart.setVisible(false);
+
} else if (SwitchableUIRound.class.isAssignableFrom(currentRoundType) ) {
log.debug("UI entering switchable round type");
+ orWindow.setVisible(true);
+ stockChart.setVisible(true);
}
}
***************
*** 245,249 ****
} else if (OperatingRound.class.isAssignableFrom(previousRoundUItype)) {
log.debug("Leaving Operating Round UI type");
! orWindow.setVisible(false);
}
}
--- 252,256 ----
} else if (OperatingRound.class.isAssignableFrom(previousRoundUItype)) {
log.debug("Leaving Operating Round UI type");
! //orWindow.setVisible(false);
}
}
***************
*** 254,258 ****
log.debug("Entering Start Round UI type");
activeWindow = startRoundWindow;
! stockChart.setVisible(false);
} else if (StockRound.class.isAssignableFrom(currentRoundUItype)) {
--- 261,265 ----
log.debug("Entering Start Round UI type");
activeWindow = startRoundWindow;
! //stockChart.setVisible(false);
} else if (StockRound.class.isAssignableFrom(currentRoundUItype)) {
***************
*** 260,265 ****
log.debug("Entering Stock Round UI type");
activeWindow = statusWindow;
! stockChart.setVisible(true);
! statusWindow.setVisible(true);
} else if (OperatingRound.class.isAssignableFrom(currentRoundUItype)) {
--- 267,272 ----
log.debug("Entering Stock Round UI type");
activeWindow = statusWindow;
! //stockChart.setVisible(true);
! //statusWindow.setVisible(true);
} else if (OperatingRound.class.isAssignableFrom(currentRoundUItype)) {
***************
*** 267,272 ****
log.debug("Entering Operating Round UI type ");
activeWindow = orWindow;
! stockChart.setVisible(false);
! orWindow.setVisible(true);
}
}
--- 274,279 ----
log.debug("Entering Operating Round UI type ");
activeWindow = orWindow;
! //stockChart.setVisible(false);
! //orWindow.setVisible(true);
}
}
|
