[Rails-commits] Branch 'rails1.7.x' - 2 commits - rails/ui readme.txt version.number

[Stefan F. <ste...@us...>]

 rails/ui/swing/GameStatus.java |    5 +++--
 readme.txt                     |   13 ++++---------
 version.number                 |    2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 18c0f865fc235df7a4d370114d3d26cb3eff4f76
Author: Stefan Frey <ste...@we...>
Date:   Mon Jul 23 17:01:38 2012 +0200

    prepared for 1.7.8 release

diff --git a/readme.txt b/readme.txt
index 33de310..111a7c4 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-Rails release 1.7.7:
+Rails release 1.7.8:
 
 A new maintenance release for Rails 1.x series
 
@@ -6,13 +6,8 @@ This release fixes several bugs.
 
 Contributors: Erik Vos, Stefan Frey
 
-Bug reported by Are-Harald Brenne, John David Galt
-
-New:
-- Added little fun variant 18Lummer
+Bugs reported by Martin Brumm, John David Galt
 
 Lists of bugs fixed:
-- Errors in UI after adding a comment at game start
-- Fixed failure on reloading a just started game
-- 1835: Manual close of Pfalzbahn is possible (to enable closing after token lay only)
-- 1835 (and others): Fixed UI issues with token relays on OO-tiles
+- All Games: Update "PD" label in GameStatus lower player names panel
+- 1835 (and others with NoMapMode): Cannot save game file with ClosePrivate action
diff --git a/version.number b/version.number
index 60520e3..f74a335 100644
--- a/version.number
+++ b/version.number
@@ -1,5 +1,5 @@
 #Property file that contains version number and the develop indicator
-version=1.7.7
+version=1.7.8
 # the following string "@DEVELOP@ is replaced by an empty string in the release version
 # this is done automatically by ant
 develop=@DEVELOP@
\ No newline at end of file


commit 59d48a43689c5128a9487290d0682e0961201c6e
Author: Erik Vos <eri...@xs...>
Date:   Mon Jul 23 12:06:11 2012 +0200

    Fix to all games: update PD in GameStatus lower player names row.(cherry picked from commit 7d694b4bc788283c72de5165dee0d54ee55cb6d1)

diff --git a/rails/ui/swing/GameStatus.java b/rails/ui/swing/GameStatus.java
index a10dd80..498522a 100644
--- a/rails/ui/swing/GameStatus.java
+++ b/rails/ui/swing/GameStatus.java
@@ -975,8 +975,9 @@ public class GameStatus extends GridPanel implements ActionListener {
     public void setPriorityPlayer(int index) {
 
         for (int j = 0; j < np; j++) {
-            upperPlayerCaption[j].setText(players.get(j).getName()
-                    + (j == index ? " PD" : ""));
+            String playerNameAndPriority = players.get(j).getName() + (j == index ? " PD" : "");
+            upperPlayerCaption[j].setText(playerNameAndPriority);
+            lowerPlayerCaption[j].setText(playerNameAndPriority);
         }
     }