summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-06-14 18:07:42 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-06-14 18:07:42 +0200
commit751d5a3aa98461bf27f2a21a157e72f8da89406a (patch)
treecce58b28e6140fc5f2d904e472c2d32851ffa7c2
parentc84bebceb7690410c33ae15f61ca2e01c79342b8 (diff)
downloadJRummikub-751d5a3aa98461bf27f2a21a157e72f8da89406a.tar
JRummikub-751d5a3aa98461bf27f2a21a157e72f8da89406a.zip
Fixed player name label HTML bug
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@440 72836036-5685-4462-b002-a69064685172
-rw-r--r--src/jrummikub/view/impl/GameListPanel.java1
-rw-r--r--src/jrummikub/view/impl/PausePanel.java1
-rw-r--r--src/jrummikub/view/impl/PlayerPanel.java1
-rw-r--r--src/jrummikub/view/impl/SettingsPanel.java1
-rw-r--r--src/jrummikub/view/impl/StartTurnPanel.java1
5 files changed, 5 insertions, 0 deletions
diff --git a/src/jrummikub/view/impl/GameListPanel.java b/src/jrummikub/view/impl/GameListPanel.java
index 3041d1a..b7b170b 100644
--- a/src/jrummikub/view/impl/GameListPanel.java
+++ b/src/jrummikub/view/impl/GameListPanel.java
@@ -53,6 +53,7 @@ class GameListPanel extends JPanel implements IGameListPanel {
title = new JLabel();
title.setFont(title.getFont().deriveFont(16.0f));
+ title.putClientProperty("html.disable", Boolean.TRUE);
add(title, c);
add(Box.createVerticalStrut(3), c);
diff --git a/src/jrummikub/view/impl/PausePanel.java b/src/jrummikub/view/impl/PausePanel.java
index 60e7038..f9e99ad 100644
--- a/src/jrummikub/view/impl/PausePanel.java
+++ b/src/jrummikub/view/impl/PausePanel.java
@@ -43,6 +43,7 @@ class PausePanel extends JPanel {
pauseLabel.setHorizontalTextPosition(JLabel.CENTER);
pauseLabel.setVerticalAlignment(JLabel.CENTER);
pauseLabel.setVerticalTextPosition(JLabel.CENTER);
+ pauseLabel.putClientProperty("html.disable", Boolean.TRUE);
add(pauseLabel);
endPauseButton = new JButton("Spiel fortsetzen");
diff --git a/src/jrummikub/view/impl/PlayerPanel.java b/src/jrummikub/view/impl/PlayerPanel.java
index f18f053..2481f7e 100644
--- a/src/jrummikub/view/impl/PlayerPanel.java
+++ b/src/jrummikub/view/impl/PlayerPanel.java
@@ -133,6 +133,7 @@ class PlayerPanel extends JPanel implements IPlayerPanel {
currentPlayerNameLabel = new JLabel();
currentPlayerNameLabel.setHorizontalAlignment(JLabel.CENTER);
currentPlayerNameLabel.setVerticalAlignment(JLabel.CENTER);
+ currentPlayerNameLabel.putClientProperty("html.disable", Boolean.TRUE);
leftPanel.add(currentPlayerNameLabel);
hasLaidOutLabel = new JLabel();
diff --git a/src/jrummikub/view/impl/SettingsPanel.java b/src/jrummikub/view/impl/SettingsPanel.java
index 8daf1fa..d5599a1 100644
--- a/src/jrummikub/view/impl/SettingsPanel.java
+++ b/src/jrummikub/view/impl/SettingsPanel.java
@@ -948,6 +948,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
colorButton = new JButton();
nameLabel = new JLabel();
nameLabel.setBorder(new EmptyBorder(3, 7, 3, 7));
+ nameLabel.putClientProperty("html.disable", Boolean.TRUE);
colorButton.addActionListener(new ActionListener() {
@Override
diff --git a/src/jrummikub/view/impl/StartTurnPanel.java b/src/jrummikub/view/impl/StartTurnPanel.java
index 10cd8a0..6d6e1b5 100644
--- a/src/jrummikub/view/impl/StartTurnPanel.java
+++ b/src/jrummikub/view/impl/StartTurnPanel.java
@@ -43,6 +43,7 @@ class StartTurnPanel extends JPanel {
startTurnLabel.setHorizontalTextPosition(JLabel.CENTER);
startTurnLabel.setVerticalAlignment(JLabel.CENTER);
startTurnLabel.setVerticalTextPosition(JLabel.CENTER);
+ startTurnLabel.putClientProperty("html.disable", Boolean.TRUE);
add(startTurnLabel);
startTurnButton = new JButton("Zug beginnen");