rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-30 19:52:13 +01:00
Code Issues Releases Activity

Update notification: UX feedback

Browse Source
This commit is contained in:
Federico Fissore 2015-08-04 15:50:50 +02:00
parent 0bb7fd7e8b
commit a43757d5c3
3 changed files with 56 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/cc/arduino/contributions/ContributionsSelfCheck.java
View File

@ -59,11 +59,11 @@ public class ContributionsSelfCheck extends TimerTask {
String text; String text;
if (updatableLibraries > 0 && updatablePlatforms <= 0) { if (updatableLibraries > 0 && updatablePlatforms <= 0) {
text = I18n.format(_("Some {0}libraries{1} may be updated"), "<a href=\"http://librarymanager\">", "</a>"); text = I18n.format(_("<br/>Update available for some of your {0}libraries{1}"), "<a href=\"http://librarymanager\">", "</a>");
} else if (updatableLibraries <= 0 && updatablePlatforms > 0) { } else if (updatableLibraries <= 0 && updatablePlatforms > 0) {
text = I18n.format(_("Some {0}boards{1} may be updated"), "<a href=\"http://boardsmanager\">", "</a>"); text = I18n.format(_("<br/>Update available for some of your {0}boards{1}"), "<a href=\"http://boardsmanager\">", "</a>");
} else { } else {
text = I18n.format(_("Some {0}boards{1} and some {2}libraries{3} may be updated"), "<a href=\"http://boardsmanager\">", "</a>", "<a href=\"http://librarymanager\">", "</a>"); text = I18n.format(_("<br/>Update available for some of your {0}boards{1} and {2}libraries{3}"), "<a href=\"http://boardsmanager\">", "</a>", "<a href=\"http://librarymanager\">", "</a>");
} }
if (cancelled) { if (cancelled) {
@ -71,7 +71,7 @@ public class ContributionsSelfCheck extends TimerTask {
} }
SwingUtilities.invokeLater(() -> { SwingUtilities.invokeLater(() -> {
notificationPopup = new NotificationPopup(base.getActiveEditor(), hyperlinkListener, _("Updates available"), text); notificationPopup = new NotificationPopup(base.getActiveEditor(), hyperlinkListener, text);
notificationPopup.setVisible(true); notificationPopup.setVisible(true);
}); });
} }

84
app/src/cc/arduino/view/NotificationPopup.form
View File

@ -7,7 +7,13 @@
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="focusableWindowState" type="boolean" value="false"/> <Property name="focusableWindowState" type="boolean" value="false"/>
<Property name="undecorated" type="boolean" value="true"/> <Property name="undecorated" type="boolean" value="true"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[350, 70]"/>
</Property>
<Property name="resizable" type="boolean" value="false"/> <Property name="resizable" type="boolean" value="false"/>
<Property name="size" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[350, 70]"/>
</Property>
</Properties> </Properties>
<SyntheticProperties> <SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/> <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
@ -23,74 +29,24 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/> <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/> <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/> <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,0,0,0,2,14"/>
</AuxValues> </AuxValues>
<Layout> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
<DimensionLayout dim="0"> <Property name="useNullLayout" type="boolean" value="true"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel1" min="-2" pref="48" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="text" min="-2" pref="264" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="title" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="24" max="-2" attributes="0"/>
<Component id="closeButton" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="title" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="closeButton" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="text" min="-2" pref="42" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel1" min="-2" pref="48" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout> </Layout>
<SubComponents> <SubComponents>
<Component class="javax.swing.JLabel" name="title"> <Component class="javax.swing.JLabel" name="icon">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
<FontInfo relative="true">
<Font bold="true" component="title" property="font" relativeSize="true" size="0"/>
</FontInfo>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel1">
<Properties> <Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.RADConnectionPropertyEditor"> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="new ImageIcon(Paths.get(BaseNoGui.getContentFile(&quot;lib&quot;).getAbsolutePath(), &quot;arduino_small.png&quot;).toFile().getAbsolutePath())" type="code"/> <Connection code="new ImageIcon(Paths.get(BaseNoGui.getContentFile(&quot;lib&quot;).getAbsolutePath(), &quot;arduino_small.png&quot;).toFile().getAbsolutePath())" type="code"/>
</Property> </Property>
</Properties> </Properties>
<AuxValues> <Constraints>
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/> <AbsoluteConstraints x="10" y="10" width="50" height="50"/>
</AuxValues> </Constraint>
</Constraints>
</Component> </Component>
<Component class="javax.swing.JEditorPane" name="text"> <Component class="javax.swing.JEditorPane" name="text">
<Properties> <Properties>
@ -103,6 +59,11 @@
<Property name="contentType" type="java.lang.String" value="text/html" noResource="true"/> <Property name="contentType" type="java.lang.String" value="text/html" noResource="true"/>
<Property name="opaque" type="boolean" value="false"/> <Property name="opaque" type="boolean" value="false"/>
</Properties> </Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="70" y="10" width="270" height="50"/>
</Constraint>
</Constraints>
</Component> </Component>
<Component class="javax.swing.JButton" name="closeButton"> <Component class="javax.swing.JButton" name="closeButton">
<Properties> <Properties>
@ -118,6 +79,11 @@
<Events> <Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="closeButtonActionPerformed"/> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="closeButtonActionPerformed"/>
</Events> </Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="328" y="0" width="22" height="22"/>
</Constraint>
</Constraints>
</Component> </Component>
</SubComponents> </SubComponents>
</Form> </Form>

91
app/src/cc/arduino/view/NotificationPopup.java
View File

@ -29,7 +29,6 @@
package cc.arduino.view; package cc.arduino.view;
import cc.arduino.Constants;
import processing.app.Base; import processing.app.Base;
import processing.app.BaseNoGui; import processing.app.BaseNoGui;
@ -43,9 +42,8 @@ import java.nio.file.Paths;
public class NotificationPopup extends JDialog { public class NotificationPopup extends JDialog {
private final ComponentAdapter parentMovedListener; private final ComponentAdapter parentMovedListener;
private final Timer autoCloseAfterTimeout;
public NotificationPopup(Frame parent, HyperlinkListener hyperlinkListener, String titleText, String message) { public NotificationPopup(Frame parent, HyperlinkListener hyperlinkListener, String message) {
super(parent, false); super(parent, false);
initComponents(); initComponents();
@ -58,10 +56,15 @@ public class NotificationPopup extends JDialog {
}; };
parent.addComponentListener(parentMovedListener); parent.addComponentListener(parentMovedListener);
title.setText(titleText); text.setText("<html><body style=\"font-family:sans-serif;font-size:12pt\">" + message + "</body></html>");
text.setText("<html><body style=\"font-family:sans-serif;font-size:12pt\">" + message.replace("\n", "<br/>") + "</body></html>");
text.addHyperlinkListener(hyperlinkListener); text.addHyperlinkListener(hyperlinkListener);
text.addHyperlinkListener(e -> {
if (e.getEventType() != HyperlinkEvent.EventType.ACTIVATED) {
return;
}
close();
});
addWindowListener(new WindowAdapter() { addWindowListener(new WindowAdapter() {
@Override @Override
@ -70,24 +73,17 @@ public class NotificationPopup extends JDialog {
} }
}); });
autoCloseAfterTimeout = new Timer(Constants.NOTIFICATION_POPUP_AUTOCLOSE_DELAY, (e) -> close());
autoCloseAfterTimeout.start();
text.addHyperlinkListener(e -> {
if (e.getEventType() != HyperlinkEvent.EventType.ACTIVATED) {
return;
}
close();
});
Base.registerWindowCloseKeys(getRootPane(), e -> close()); Base.registerWindowCloseKeys(getRootPane(), e -> close());
addMouseListener(new MouseAdapter() { MouseAdapter closeOnClick = new MouseAdapter() {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
close(); close();
} }
}); };
addMouseListener(closeOnClick);
text.addMouseListener(closeOnClick);
icon.addMouseListener(closeOnClick);
} }
private void updateLocation(Frame parent) { private void updateLocation(Frame parent) {
@ -95,14 +91,10 @@ public class NotificationPopup extends JDialog {
int parentX = Double.valueOf(parentLocation.getX()).intValue(); int parentX = Double.valueOf(parentLocation.getX()).intValue();
int parentY = Double.valueOf(parentLocation.getY()).intValue(); int parentY = Double.valueOf(parentLocation.getY()).intValue();
setLocation(parentX + parent.getWidth() - getWidth(), parentY + parent.getHeight() - getHeight()); setLocation(parentX, parentY + parent.getHeight() - getHeight());
} }
public void close() { public void close() {
if (autoCloseAfterTimeout.isRunning()) {
autoCloseAfterTimeout.stop();
}
dispatchEvent(new WindowEvent(NotificationPopup.this, WindowEvent.WINDOW_CLOSING)); dispatchEvent(new WindowEvent(NotificationPopup.this, WindowEvent.WINDOW_CLOSING));
} }
@ -115,8 +107,7 @@ public class NotificationPopup extends JDialog {
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
title = new javax.swing.JLabel(); icon = new javax.swing.JLabel();
javax.swing.JLabel jLabel1 = new javax.swing.JLabel();
text = new javax.swing.JEditorPane(); text = new javax.swing.JEditorPane();
closeButton = new javax.swing.JButton(); closeButton = new javax.swing.JButton();
@ -125,16 +116,21 @@ public class NotificationPopup extends JDialog {
setFocusable(false); setFocusable(false);
setFocusableWindowState(false); setFocusableWindowState(false);
setUndecorated(true); setUndecorated(true);
setPreferredSize(new java.awt.Dimension(350, 70));
setResizable(false); setResizable(false);
setSize(new java.awt.Dimension(350, 70));
getContentPane().setLayout(null);
title.setFont(title.getFont().deriveFont(title.getFont().getStyle() | java.awt.Font.BOLD)); icon.setIcon(new ImageIcon(Paths.get(BaseNoGui.getContentFile("lib").getAbsolutePath(), "arduino_small.png").toFile().getAbsolutePath()));
getContentPane().add(icon);
jLabel1.setIcon(new ImageIcon(Paths.get(BaseNoGui.getContentFile("lib").getAbsolutePath(), "arduino_small.png").toFile().getAbsolutePath())); icon.setBounds(10, 10, 50, 50);
text.setEditable(false); text.setEditable(false);
text.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(0, 0, 0), 0, true)); text.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(0, 0, 0), 0, true));
text.setContentType("text/html"); // NOI18N text.setContentType("text/html"); // NOI18N
text.setOpaque(false); text.setOpaque(false);
getContentPane().add(text);
text.setBounds(70, 10, 270, 50);
closeButton.setIcon(new ImageIcon(Paths.get(BaseNoGui.getContentFile("lib").getAbsolutePath(), "theme", "close.png").toFile().getAbsolutePath())); closeButton.setIcon(new ImageIcon(Paths.get(BaseNoGui.getContentFile("lib").getAbsolutePath(), "theme", "close.png").toFile().getAbsolutePath()));
closeButton.setBorder(null); closeButton.setBorder(null);
@ -145,41 +141,8 @@ public class NotificationPopup extends JDialog {
closeButtonActionPerformed(evt); closeButtonActionPerformed(evt);
} }
}); });
getContentPane().add(closeButton);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); closeButton.setBounds(328, 0, 22, 22);
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 48, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(text, javax.swing.GroupLayout.PREFERRED_SIZE, 264, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap())
.addGroup(layout.createSequentialGroup()
.addComponent(title, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGap(24, 24, 24)
.addComponent(closeButton))))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addComponent(title))
.addComponent(closeButton))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(text, javax.swing.GroupLayout.PREFERRED_SIZE, 42, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 48, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
pack(); pack();
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
@ -196,7 +159,7 @@ public class NotificationPopup extends JDialog {
/* Create and display the dialog */ /* Create and display the dialog */
EventQueue.invokeLater(new Runnable() { EventQueue.invokeLater(new Runnable() {
public void run() { public void run() {
NotificationPopup dialog = new NotificationPopup(new JFrame(), System.out::println, "title", "<a href='arduinoide://boardsmanager'>test</a> test test test test test test test test\n" + NotificationPopup dialog = new NotificationPopup(new JFrame(), System.out::println, "<a href='arduinoide://boardsmanager'>test</a> test test test test test test test test\n" +
" test test test test test test test test test test test"); " test test test test test test test test test test test");
dialog.addWindowListener(new WindowAdapter() { dialog.addWindowListener(new WindowAdapter() {
@Override @Override
@ -211,8 +174,8 @@ public class NotificationPopup extends JDialog {
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton closeButton; private javax.swing.JButton closeButton;
private javax.swing.JLabel icon;
private javax.swing.JEditorPane text; private javax.swing.JEditorPane text;
private javax.swing.JLabel title;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
} }