Mercurial > hg > release > thermostat-1.4
changeset 1805:f362b59a5aec
Add label suggesting user note credentials at end of quick setup
Reviewed-by: jerboaa
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-September/016219.html
PR2640
| author | Andrew Azores <aazores@redhat.com> |
|---|---|
| date | Mon, 21 Sep 2015 10:45:22 -0400 |
| parents | f57cc3785d25 |
| children | 5ac98bfdbd1e |
| files | setup/command/src/main/java/com/redhat/thermostat/setup/command/internal/SetupCompleteView.java setup/command/src/main/java/com/redhat/thermostat/setup/command/internal/SetupWindow.java setup/command/src/main/java/com/redhat/thermostat/setup/command/locale/LocaleResources.java setup/command/src/main/resources/com/redhat/thermostat/setup/locale/strings.properties |
| diffstat | 4 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/setup/command/src/main/java/com/redhat/thermostat/setup/command/internal/SetupCompleteView.java Fri Sep 18 15:19:05 2015 +0200 +++ b/setup/command/src/main/java/com/redhat/thermostat/setup/command/internal/SetupCompleteView.java Mon Sep 21 10:45:22 2015 -0400 @@ -97,10 +97,17 @@ translator.localize(LocaleResources.AGENT_CRED_TITLE).getContents(), translator.localize(LocaleResources.AGENT_HELP_INFO).getContents()); + JLabel textLabel = new JLabel(translator.localize(LocaleResources.SETUP_COMPLETE_NOTE_CREDENTIALS_TEXT).getContents()); + JPanel textLabelPanel = new JPanel(); + textLabelPanel.setOpaque(false); + textLabelPanel.setLayout(new BoxLayout(textLabelPanel, BoxLayout.LINE_AXIS)); + textLabelPanel.add(textLabel); + midPanel = new JPanel(); midPanel.setLayout(new BoxLayout(midPanel, BoxLayout.PAGE_AXIS)); midPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); - midPanel.add(Box.createRigidArea(new Dimension(0, 20))); + midPanel.add(textLabelPanel); + midPanel.add(Box.createRigidArea(new Dimension(0, 10))); midPanel.add(clientInfoPanel); midPanel.add(Box.createRigidArea(new Dimension(0, 20))); midPanel.add(agentInfoPanel);
--- a/setup/command/src/main/java/com/redhat/thermostat/setup/command/internal/SetupWindow.java Fri Sep 18 15:19:05 2015 +0200 +++ b/setup/command/src/main/java/com/redhat/thermostat/setup/command/internal/SetupWindow.java Mon Sep 21 10:45:22 2015 -0400 @@ -113,7 +113,7 @@ private static final Logger logger = LoggingUtils.getLogger(SetupWindow.class); private static final int FRAME_WIDTH = 600; - private static final int FRAME_HEIGHT = 380; + private static final int FRAME_HEIGHT = 400; private static final int FRAME_LARGE_HEIGHT = 600; public SetupWindow(ThermostatSetup thermostatSetup) {
--- a/setup/command/src/main/java/com/redhat/thermostat/setup/command/locale/LocaleResources.java Fri Sep 18 15:19:05 2015 +0200 +++ b/setup/command/src/main/java/com/redhat/thermostat/setup/command/locale/LocaleResources.java Mon Sep 21 10:45:22 2015 -0400 @@ -104,6 +104,7 @@ SHOW_MORE_ERROR_INFO, SHOW_LESS_ERROR_INFO, STEPS_TO_RESOLVE_ERROR_LABEL_TEXT, + SETUP_COMPLETE_NOTE_CREDENTIALS_TEXT, ; static final String RESOURCE_BUNDLE =
--- a/setup/command/src/main/resources/com/redhat/thermostat/setup/locale/strings.properties Fri Sep 18 15:19:05 2015 +0200 +++ b/setup/command/src/main/resources/com/redhat/thermostat/setup/locale/strings.properties Mon Sep 21 10:45:22 2015 -0400 @@ -162,4 +162,7 @@ <li>Examine the log files.</li>\ <li>Read the <a href="{0}">user guide</a>.</li>\ </ol>\ - </html> \ No newline at end of file + </html> +SETUP_COMPLETE_NOTE_CREDENTIALS_TEXT=<html>Please take note of the credentials listed here \ + as they will be required in order to use certain components of Thermostat. \ + You can hover your mouse over the info icons for more information.</html>