[Freecol-commits] SF.net SVN: freecol:[5333] freecol/trunk/src/net/sf/freecol/client

[<mp...@us...>]

Revision: 5333
          http://freecol.svn.sourceforge.net/freecol/?rev=5333&view=rev
Author:   mpope
Date:     2009-04-23 10:35:12 +0000 (Thu, 23 Apr 2009)

Log Message:
-----------
Improved native trade dialog.

Modified Paths:
--------------
    freecol/trunk/src/net/sf/freecol/client/control/InGameController.java
    freecol/trunk/src/net/sf/freecol/client/gui/Canvas.java
    freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages.properties

Modified: freecol/trunk/src/net/sf/freecol/client/control/InGameController.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/control/InGameController.java	2009-04-22 06:53:36 UTC (rev 5332)
+++ freecol/trunk/src/net/sf/freecol/client/control/InGameController.java	2009-04-23 10:35:12 UTC (rev 5333)
@@ -1402,7 +1402,7 @@
         boolean canGift = transactionSession.get("canGift");
         
         // Show main dialog
-        TradeAction tradeType = canvas.showIndianSettlementTradeDialog(canBuy,canSell,canGift);
+        TradeAction tradeType = canvas.showIndianSettlementTradeDialog(settlement, canBuy, canSell, canGift);
         while (tradeType != null) {
             boolean tradeFinished = false;
             switch(tradeType) {
@@ -1439,7 +1439,7 @@
                 break;
             }
             // Still has options for trade, show the main menu again
-            tradeType = canvas.showIndianSettlementTradeDialog(canBuy, canSell, canGift);
+            tradeType = canvas.showIndianSettlementTradeDialog(settlement, canBuy, canSell, canGift);
         }
         CloseTransactionMessage message = new CloseTransactionMessage(unit, settlement);
         freeColClient.getClient().ask(message.toXMLElement());

Modified: freecol/trunk/src/net/sf/freecol/client/gui/Canvas.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/Canvas.java	2009-04-22 06:53:36 UTC (rev 5332)
+++ freecol/trunk/src/net/sf/freecol/client/gui/Canvas.java	2009-04-23 10:35:12 UTC (rev 5333)
@@ -1524,7 +1524,16 @@
         colonyPanel.requestFocus();
     }
 
-    public TradeAction showIndianSettlementTradeDialog(boolean showBuy, boolean showSell, boolean showGift) {
+    /**
+     * Displays the panel for trading with an <code>IndianSettlement</code>.
+     * 
+     * @param settlement The native settlement to trade with.
+     * @param showBuy Show a "buy" option.
+     * @param showSell Show a "sell" option.
+     * @param showGift Show a "gift" option.
+     */
+    public TradeAction showIndianSettlementTradeDialog(Settlement settlement,
+                                                       boolean showBuy, boolean showSell, boolean showGift) {
         ArrayList<ChoiceItem<TradeAction>> choices = new ArrayList<ChoiceItem<TradeAction>>();
         if (showBuy){
             choices.add(new ChoiceItem<TradeAction>(Messages.message("tradeProposition.toBuy"),
@@ -1539,7 +1548,10 @@
                                                     TradeAction.GIFT));
         }
         
-        TradeAction choice = showChoiceDialog(Messages.message("tradeProposition.welcome"), 
+        String prompt = Messages.message("tradeProposition.welcome",
+                                         "%nation%", settlement.getOwner().getNationAsString(),
+                                         "%settlement%", settlement.getName()); 
+        TradeAction choice = showChoiceDialog(prompt,
                                               Messages.message("tradeProposition.cancel"), 
                                               choices);
         

Modified: freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages.properties
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages.properties	2009-04-22 06:53:36 UTC (rev 5332)
+++ freecol/trunk/src/net/sf/freecol/client/gui/i18n/FreeColMessages.properties	2009-04-23 10:35:12 UTC (rev 5333)
@@ -694,7 +694,7 @@
 notANumber=Please enter a number.
 enterSomeText=Please enter some text.
 
-tradeProposition.welcome=What do you wish to do?
+tradeProposition.welcome=Trading with the %nation% at %settlement%
 tradeProposition.toBuy=Buy
 tradeProposition.toSell=Sell
 tradeProposition.toGift=Deliver gift


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.