From 51d72e0ca0c5a43770ff6e0c19b0e31e83e0437f Mon Sep 17 00:00:00 2001
From: feschi55 <yes@freechoc.de>
Date: Thu, 18 Dec 2014 17:25:00 +0100
Subject: [PATCH] Farben :) und Fonts :)

---
 HeatUp/src/de/heatup/ui/StatusPanelAdder.java          | 6 +++---
 HeatUp/src/de/heatup/ui/actionPanel/ActionControl.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java
index 309ec37..6f67288 100644
--- a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java
+++ b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java
@@ -37,9 +37,9 @@ public class StatusPanelAdder{
 	private static JLabel labelTemp= new JLabel("temperature");
 	private static JProgressBar tempBar;
 	private static JLabel labelScore= new JLabel("score");
-	private static JLabel scoreLabel= new JLabel();
+	private static JLabel scoreLabel= new JLabel(" ");
 	private static JLabel labelPowerUp = new JLabel("PowerUp");
-	private static JLabel powerUpLabel = new JLabel(/*new ImageIcon("path_to_image.png")*/"powerUpLabel");
+	private static JLabel powerUpLabel = new JLabel(" ");
 	private static JLabel labelTime=new JLabel("Time");
 	private static JLabel timeLabel = new JLabel("0");
 	private static Font emulogicheading;
@@ -124,7 +124,7 @@ public class StatusPanelAdder{
 		}
 		red=((float)(((tempBar.getValue())-30)/80.0));
 		blue=(1-red);
-		tempBarColor=new Color(red, green,blue, (float)0.65);
+		tempBarColor=new Color(red, green,blue, (float)0.525);
 		tempBar.setForeground(tempBarColor);
 		
 		
diff --git a/HeatUp/src/de/heatup/ui/actionPanel/ActionControl.java b/HeatUp/src/de/heatup/ui/actionPanel/ActionControl.java
index 57e41ae..a344ef5 100644
--- a/HeatUp/src/de/heatup/ui/actionPanel/ActionControl.java
+++ b/HeatUp/src/de/heatup/ui/actionPanel/ActionControl.java
@@ -57,7 +57,7 @@ public class ActionControl{
 		if(rd==1){
 			option=1;
 			setSmash(new Smashing().getKey());
-			String str= "Bitte die Taste "+getSmash()+" so schnell wie moeglich druecken";
+			String str= "Bitte die Taste --"+getSmash()+"-- so schnell wie moeglich druecken";
 			actionLabel.setText(str);
 			setProgressBar(0);
 			beforTime=System.nanoTime();