Menu
▾
▴
[Rails-commits] 18xx/rails/ui/swing GameStatus.java, 1.40, 1.41 ORPanel.java, 1.47, 1.48
|
From: Erik V. <ev...@us...> - 2010-03-04 22:08:34
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17059/rails/ui/swing Modified Files: GameStatus.java ORPanel.java Log Message: Various changes for 1835 Index: GameStatus.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameStatus.java,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** GameStatus.java 3 Mar 2010 00:44:33 -0000 1.40 --- GameStatus.java 4 Mar 2010 22:08:24 -0000 1.41 *************** *** 510,517 **** futureTrainsWidth, 1, 0, true); ! // Train cost overview String text = gameUIManager.getGameManager().getTrainManager().getTrainCostOverview(); addField (new Caption(text), poolTrainsXOffset, newTrainsYOffset + 1, futureTrainsWidth + 2, 1, 0, true); dummyButton = new ClickField("", "", "", this, buySellGroup); --- 510,519 ---- futureTrainsWidth, 1, 0, true); ! // Train cost overview - removed, now added to Info menu ! /* String text = gameUIManager.getGameManager().getTrainManager().getTrainCostOverview(); addField (new Caption(text), poolTrainsXOffset, newTrainsYOffset + 1, futureTrainsWidth + 2, 1, 0, true); + */ dummyButton = new ClickField("", "", "", this, buySellGroup); *************** *** 672,676 **** index = options.indexOf(sp); } ! } else if (options.size() == 1) { int result = JOptionPane.showConfirmDialog(this, options.get(0), --- 674,678 ---- index = options.indexOf(sp); } ! } else if (options.size() == 1) { int result = JOptionPane.showConfirmDialog(this, options.get(0), *************** *** 704,708 **** cca.setAmount(amount); chosenAction = cca; ! } else { chosenAction = processGameSpecificActions(actor, actions.get(0)); --- 706,711 ---- cca.setAmount(amount); chosenAction = cca; ! } else { ! chosenAction = processGameSpecificActions(actor, actions.get(0)); *************** *** 953,957 **** certInTreasuryButton[i].setVisible(clickable); } ! private void setCompanyCashButton(int i, boolean clickable, PossibleAction action){ boolean visible = rowVisibilityObservers[i].lastValue(); --- 956,960 ---- certInTreasuryButton[i].setVisible(clickable); } ! private void setCompanyCashButton(int i, boolean clickable, PossibleAction action){ boolean visible = rowVisibilityObservers[i].lastValue(); *************** *** 961,968 **** } else { compCashButton[i].clearPossibleActions(); ! } compCash[i].setVisible(visible && !clickable); compCashButton[i].setVisible(visible && clickable); - if (action != null) compCashButton[i].addPossibleAction(action); --- 964,970 ---- } else { compCashButton[i].clearPossibleActions(); ! } compCash[i].setVisible(visible && !clickable); compCashButton[i].setVisible(visible && clickable); if (action != null) compCashButton[i].addPossibleAction(action); Index: ORPanel.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** ORPanel.java 2 Mar 2010 22:15:40 -0000 1.47 --- ORPanel.java 4 Mar 2010 22:08:24 -0000 1.48 *************** *** 93,98 **** private Caption tileCaption, tokenCaption, revenueCaption, trainCaption, privatesCaption, loansCaption; ! ! private ActionButton buttonOC; // sfy: button for operating costs private ActionButton button1; private ActionButton button2; --- 93,98 ---- private Caption tileCaption, tokenCaption, revenueCaption, trainCaption, privatesCaption, loansCaption; ! ! private ActionButton buttonOC; // sfy: button for operating costs private ActionButton button1; private ActionButton button2; *************** *** 484,488 **** List<CompanyTypeI> comps = cm.getCompanyTypes(); JMenu compMenu, menu, item; ! compMenu = new JMenu(LocalText.getText("Companies")); compMenu.setEnabled(true); --- 484,488 ---- List<CompanyTypeI> comps = cm.getCompanyTypes(); JMenu compMenu, menu, item; ! compMenu = new JMenu(LocalText.getText("Companies")); compMenu.setEnabled(true); *************** *** 508,512 **** List<TrainTypeI> types = tm.getTrainTypes(); JMenu item; - StringBuffer b = new StringBuffer("<html>"); trainsInfoMenu = new JMenu(LocalText.getText("TRAINS")); --- 508,511 ---- *************** *** 515,533 **** for (TrainTypeI type : types) { - b.setLength(6); - if (Util.hasValue(type.getStartedPhaseName())) { - appendInfoText(b, LocalText.getText("StartsPhase", type.getStartedPhaseName())); - } - if (type.getRustedTrainType() != null) { - appendInfoText(b, LocalText.getText("RustsTrains", type.getRustedTrainType().getName())); - } - if (type.getReleasedTrainType() != null) { - appendInfoText(b, LocalText.getText("ReleasesTrains", type.getReleasedTrainType().getName())); - } - if (b.length() == 6) b.append(LocalText.getText("None")); - item = new JMenu (LocalText.getText("N_Train", type.getName())); item.setEnabled(true); ! item.add(new JMenuItem(b.toString())); trainsInfoMenu.add(item); } --- 514,520 ---- for (TrainTypeI type : types) { item = new JMenu (LocalText.getText("N_Train", type.getName())); item.setEnabled(true); ! item.add(new JMenuItem(type.getInfo())); trainsInfoMenu.add(item); } *************** *** 695,699 **** button1.setVisible(true); } ! public void initPayoutStep(int orCompIndex, SetDividend action, boolean withhold, boolean split, boolean payout) { --- 682,686 ---- button1.setVisible(true); } ! public void initPayoutStep(int orCompIndex, SetDividend action, boolean withhold, boolean split, boolean payout) { *************** *** 755,759 **** // operating costs sfy public void initOperatingCosts(boolean enabled) { ! buttonOC.setEnabled(enabled); buttonOC.setVisible(enabled); --- 742,746 ---- // operating costs sfy public void initOperatingCosts(boolean enabled) { ! buttonOC.setEnabled(enabled); buttonOC.setVisible(enabled); *************** *** 761,765 **** tokenCaption.setHighlight(enabled); } ! public void initPrivateBuying(boolean enabled) { --- 748,752 ---- tokenCaption.setHighlight(enabled); } ! public void initPrivateBuying(boolean enabled) { |
