rails-commits

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

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

 rails/ui/swing/ORUIManager.java |    9 ++++-----
 readme.txt                      |   23 ++++++-----------------
 version.number                  |    2 +-
 3 files changed, 11 insertions(+), 23 deletions(-)

New commits:
commit 727d742bdfed911891d18fb829ed8eaa79f02c9d
Author: Stefan Frey <ste...@we...>
Date:   Wed Apr 4 16:56:16 2012 +0200

    prepared for rails 1.7.2

diff --git a/readme.txt b/readme.txt
index c615a0f..d6da496 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,25 +1,14 @@
-Rails release 1.7.1:
+Rails release 1.7.2:
 
 A new maintenance release for Rails 1.x series
 
 This release fixes several recent bugs.
 
-Contributors: Erik Vos, Martin Brumm, Stefan Frey
+Contributors: Erik Vos, Stefan Frey
 
-Bugs reported by John David Galt, Volker Schnell, Mike Bourke, Arne Östlund, Jerry Anderson
-(I hope I forgot to list no one).
-
-A few minor improvements to the rails setup:
-- An (initial) configuration profile for face-to-face/hotseat play is added ("hotseat"): Activates autosave and changes filename pattern
-suggested for save. 
-- Windows settings (including docking settings if activated) and autosave backup are stored in the centralized rails configuraton folder.
-Thus from this release on those settings should survive upgrades to new releases.
+Bugs reported by John David Galt, Phil Davies
 
 List of bugs fixed:
-
-- Typo in manifest that caused image errors in some background maps
-- 18EU: Not possible to lay home token for companies started outside of current network.
-- 1856, 18EU, 1830 Coalfield and others: Fixed wrong calculation for routes for Goderich tile, red off-board run-through (-939)
-- 18Kaas: Enables unlimited D-trains option
-- 1835: Fixed wrong total player worth calculation
-- 1835: Fixed wrong revenue calculation with respect to Elsas/Alsace outside of green phase
+- Fixed error in creation of new profiles on Windows OS systems
+- Made configuration system more robust against corrupted/misconfigured profiles
+- Fixed missing options after "Destinations reached" dialogue without any selection
diff --git a/version.number b/version.number
index 982695a..83bbf18 100644
--- a/version.number
+++ b/version.number
@@ -1,5 +1,5 @@
 #Property file that contains version number and the develop indicator
-version=1.7.1
+version=1.7.2
 # 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 d0c6540a9250e2f48bc6b7b772c56db16fc0acfa
Author: Erik Vos <eri...@xs...>
Date:   Tue Apr 3 15:32:06 2012 +0200

    Fixed: after 'Destinations reached' dialog with no checks, buttons remained disabled.
    
    Reported by John David Galt.(cherry picked from commit 7394b2bb745bfd1cc665fb3ee5513f7a9461c6e2)

diff --git a/rails/ui/swing/ORUIManager.java b/rails/ui/swing/ORUIManager.java
index 0c634df..0224995 100644
--- a/rails/ui/swing/ORUIManager.java
+++ b/rails/ui/swing/ORUIManager.java
@@ -9,9 +9,7 @@ import org.apache.log4j.Logger;
 import org.jgrapht.graph.SimpleGraph;
 
 import rails.algorithms.*;
-import rails.common.Config;
-import rails.common.GuiDef;
-import rails.common.LocalText;
+import rails.common.*;
 import rails.game.*;
 import rails.game.action.*;
 import rails.game.correct.*;
@@ -590,12 +588,13 @@ public class ORUIManager implements DialogOwner {
 
             // Prevent that a null action gets processed
             if (action.getReachedCompanies() == null
-                    || action.getReachedCompanies().isEmpty()) return;
+                    || action.getReachedCompanies().isEmpty()) currentDialogAction = null;
 
         } else {
-            return;
+            currentDialogAction = null;
         }
 
+        // Required even if no action is executed, to update the UI, re-enable buttons etc.
         gameUIManager.processAction(currentDialogAction);
     }
 

[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);
         }
     }