From b26f5bf5fdd5e2621b9120d33d2da44a393427a9 Mon Sep 17 00:00:00 2001 From: feschi55 Date: Sat, 27 Dec 2014 18:56:00 +0100 Subject: [PATCH] =?UTF-8?q?StatusPanelVer=C3=A4nderung=20bei=20Textsetzung?= =?UTF-8?q?=20von=20PowerUp=20ge=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HeatUp/src/de/heatup/ui/StatusPanelAdder.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java index 6f67288..5f209bb 100644 --- a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java +++ b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java @@ -3,6 +3,7 @@ package de.heatup.ui; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; +import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.io.File; @@ -38,7 +39,7 @@ public class StatusPanelAdder{ private static JProgressBar tempBar; private static JLabel labelScore= new JLabel("score"); private static JLabel scoreLabel= new JLabel(" "); - private static JLabel labelPowerUp = new JLabel("PowerUp"); + private static JLabel labelPowerUp = new JLabel("! PowerUp !"); private static JLabel powerUpLabel = new JLabel(" "); private static JLabel labelTime=new JLabel("Time"); private static JLabel timeLabel = new JLabel("0"); @@ -74,7 +75,7 @@ public class StatusPanelAdder{ * @param newPanel das zu verwendende Panel zur Bearbeitung */ public static void setPanel(JPanel newPanel){ - newPanel.setLayout(new FlowLayout(FlowLayout.CENTER, hgap,5)); + newPanel.setLayout(new FlowLayout(FlowLayout.CENTER, 45, vgap)); panel=newPanel; } public static void setPUText(String s){ @@ -122,6 +123,9 @@ public class StatusPanelAdder{ tempPlus=-1; } } + /* + * Änderung der Farbe der TempBar + */ red=((float)(((tempBar.getValue())-30)/80.0)); blue=(1-red); tempBarColor=new Color(red, green,blue, (float)0.525); @@ -129,7 +133,9 @@ public class StatusPanelAdder{ - + /* + * Logging von Temp + */ if (temping!=0){ Logger.write("Temperatur: " + tempBar.getValue()); @@ -195,6 +201,7 @@ public class StatusPanelAdder{ powerUpPanel.add(labelPowerUp, BorderLayout.NORTH); powerUpPanel.add(powerUpLabel, BorderLayout.SOUTH); powerUpPanel.setBackground(Color.BLACK); + //powerUpPanel.setPreferredSize(new Dimension(160,60)); JPanel timePanel=new JPanel(); labelTime.setFont(emulogicheading);