Skip to content

Commit

Permalink
ui fixes, print testing
Browse files Browse the repository at this point in the history
  • Loading branch information
robotsrulz committed Jun 19, 2017
1 parent 10ba634 commit c988582
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Inc/Strings.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ const StringTable LanguageTables[2] =
", layer ", // note space at end
"n/a",
"Pause",
"Baby step",
"Babystep",
"Resume",
"Cancel",

Expand Down Expand Up @@ -157,7 +157,7 @@ const StringTable LanguageTables[2] =
"Speed (mm/s)",
"Extrude",
"Retract",
"Baby stepping",
"Babystep",
"Current Z offset: ",
"Message",
"Messages",
Expand Down Expand Up @@ -225,7 +225,7 @@ const StringTable LanguageTables[2] =
"n/a",
"Пауза",
"Микрошаг",
"Продолжить",
"Продолж",
"Отмена",

// Setup page
Expand Down
10 changes: 5 additions & 5 deletions Src/UserInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -670,8 +670,8 @@ void CreatePrintingTabFields(const ColourScheme& colours)
mgr.Show(printProgressBar, false);

DisplayField::SetDefaultColours(colours.labelTextColour, colours.defaultBackColour);
mgr.AddField(timeLeftField = new TextField(row9, margin, DISPLAY_X - 2 * margin, TextAlignment::Left, strings->timeRemaining));
mgr.Show(timeLeftField, false);
// mgr.AddField(timeLeftField = new TextField(row9, margin, DISPLAY_X - 2 * margin, TextAlignment::Left, strings->timeRemaining));
// mgr.Show(timeLeftField, false);

printRoot = mgr.GetRoot();
}
Expand Down Expand Up @@ -1013,8 +1013,8 @@ namespace UI
timesLeftText.catFrom(strings->layer);
AppendTimeLeft(timesLeft[2]);
}
timeLeftField->SetValue(timesLeftText.c_str());
mgr.Show(timeLeftField, true);
// timeLeftField->SetValue(timesLeftText.c_str());
// mgr.Show(timeLeftField, true);
}
}

Expand Down Expand Up @@ -1137,7 +1137,7 @@ namespace UI
// Don't enable the time left field when we start printing, instead this will get enabled when we receive a suitable message
if (!PrintInProgress())
{
mgr.Show(timeLeftField, false);
// mgr.Show(timeLeftField, false);
}

statusField->SetValue(strings->statusValues[(unsigned int)GetStatus()]);
Expand Down
Binary file added testing.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c988582

Please sign in to comment.