Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Touch ups to the control panel.

  • Loading branch information...
commit b18eb556752465c1af6c9bb984d91c2df11d74c9 1 parent fc0846a
@tedbrandston tedbrandston authored
View
BIN  resources/images/jog/makerbot/RightX+.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2  src/replicatorg/app/ui/controlpanel/ControlPanelWindow.java
@@ -160,7 +160,7 @@ public void actionPerformed(ActionEvent e){
if(newMachine.getMachineType() == MachineType.THE_REPLICATOR)
{
mainPanel.add(ledStripButton ,"growx");
- mainPanel.add(createBeepPanel(), "growx");
+// mainPanel.add(createBeepPanel(), "growx");
}
mainPanel.add(alternateToolsPanel(),"newline, growy");
View
8 src/replicatorg/app/ui/controlpanel/ExtruderPanel.java
@@ -427,12 +427,12 @@ else if(tools.size() > 1)
if(tool0 != null)
{
if (tool0.hasHeater()) {
- JLabel targetTempLabel = makeKeyLabel("<html>Target (&deg;C)</html>",t0TargetColor);
+ JLabel targetTempLabel = makeKeyLabel("<html>"+tool0.getName()+" Target (&deg;C)</html>",t0TargetColor);
t0TargetTemperatureField = new CallbackTextField(temperatureListener, "handleTextField", "target-temp", 9, Base.getLocalFormat());
t0TargetTemperatureField.setValue(tool0.getTargetTemperature());
- JLabel currentTempLabel = makeKeyLabel("<html>Current (&deg;C)</html>",t0MeasuredColor);
+ JLabel currentTempLabel = makeKeyLabel("<html>"+tool0.getName()+" Current (&deg;C)</html>",t0MeasuredColor);
t0CurrentTemperatureField = new JFormattedTextField(Base.getLocalFormat());
t0CurrentTemperatureField.setColumns(9);
t0CurrentTemperatureField.setEnabled(false);
@@ -446,12 +446,12 @@ else if(tools.size() > 1)
if(tool1 != null)
{
if (tool1.hasHeater()) {
- JLabel targetTempLabel = makeKeyLabel("<html>Target (&deg;C)</html>",t1TargetColor);
+ JLabel targetTempLabel = makeKeyLabel("<html>"+tool1.getName()+" Target (&deg;C)</html>",t1TargetColor);
t1TargetTemperatureField = new CallbackTextField(temperatureListener, "handleTextField", "target-temp", 9, Base.getLocalFormat());
t1TargetTemperatureField.setValue(tool1.getTargetTemperature());
- JLabel currentTempLabel = makeKeyLabel("<html>Current (&deg;C)</html>",t1MeasuredColor);
+ JLabel currentTempLabel = makeKeyLabel("<html>"+tool1.getName()+" Current (&deg;C)</html>",t1MeasuredColor);
t1CurrentTemperatureField = new JFormattedTextField(Base.getLocalFormat());
t1CurrentTemperatureField.setColumns(9);
t1CurrentTemperatureField.setEnabled(false);
Please sign in to comment.
Something went wrong with that request. Please try again.