Skip to content

Commit

Permalink
Fix #6 and #4 improve icons
Browse files Browse the repository at this point in the history
Use 32x32 icons in toolbar
Review the dashboard icons to remove glitches
  • Loading branch information
mbats committed Feb 17, 2015
1 parent 5341a2e commit e2eef0e
Show file tree
Hide file tree
Showing 39 changed files with 211 additions and 17 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed plugins/fr.obeo.dsl.arduino.ui/icons/delete.png
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
25 changes: 25 additions & 0 deletions plugins/fr.obeo.dsl.arduino.ui/icons/svg/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
All the icons are coming from : http://iconmonstr.com/
Licence : http://iconmonstr.com/license/
"License Agreement

By copying or downloading any icons from iconmonstr, you automatically agree to the following terms and conditions:

All ownership and copyright of the icons remain the property of iconmonstr.
All icons from iconmonstr are provided as-is without any express or implied warranty.
All trademarks of social icons are copyright of their respective trademark owners.
You are allowed to ...


Use in both personal and commercial projects with no attribution required.

Use in a website or presentation template or application as part of your design with no attribution required.

Modify in shape, color, size or otherwise manipulate for your needs.

Up to 50 icons embed in a font or regenerate as web font via 3rd party tools.
You are not allowed to ...


The icons may not be sub-licensed, resold, rented, redistributed or detached from a template, application or web page.

The icons may not be included in any online or offline archive or archived downloadable format."
27 changes: 27 additions & 0 deletions plugins/fr.obeo.dsl.arduino.ui/icons/svg/hardware.svg
53 changes: 53 additions & 0 deletions plugins/fr.obeo.dsl.arduino.ui/icons/svg/hardware2.svg
19 changes: 19 additions & 0 deletions plugins/fr.obeo.dsl.arduino.ui/icons/svg/newProject.svg
19 changes: 19 additions & 0 deletions plugins/fr.obeo.dsl.arduino.ui/icons/svg/openProject.svg
16 changes: 16 additions & 0 deletions plugins/fr.obeo.dsl.arduino.ui/icons/svg/preferences.svg
14 changes: 14 additions & 0 deletions plugins/fr.obeo.dsl.arduino.ui/icons/svg/sketch.svg
21 changes: 21 additions & 0 deletions plugins/fr.obeo.dsl.arduino.ui/icons/svg/upload.svg
8 changes: 4 additions & 4 deletions plugins/fr.obeo.dsl.arduino.ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,28 @@
id="fr.obeo.dsl.arduino.menus.toolbar">
<command
commandId="fr.obeo.dsl.arduino.menus.commands.project"
icon="icons/project.png"
icon="icons/32x32/project.png"
label="Open dashboard"
style="push"
tooltip="Open the dashboard">
</command>
<command
commandId="fr.obeo.dsl.arduino.commands.openHardware"
icon="icons/newHardware.png"
icon="icons/32x32/hardware.png"
label="Open hardware"
style="push"
tooltip="Open the hardware view">
</command>
<command
commandId="fr.obeo.dsl.arduino.commands.openSketch"
icon="icons/newSketch.png"
icon="icons/32x32/sketch.png"
label="Open sketch"
style="push"
tooltip="Open the sketch">
</command>
<command
commandId="fr.obeo.dsl.arduino.commands.upload"
icon="icons/upload.png"
icon="icons/32x32/upload.png"
label="Upload sketch"
style="push"
tooltip="Upload the sketch on the arduino platform">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@ public class DashboardView extends ViewPart implements IPartListener2,
private static final String HARDWARE_MSG = "Open the hardware";
private static final String HARDWARE_INVALID_MSG = "The hardware is invalid. You must define a platform and connect at least one module.";
public final static String VIEW_ID = "fr.obeo.dsl.arduino.ui.dashboard";
private static final String HARDWARE_IMAGE = "icons/hardware.png";
private static final String HARDWARE_HOVER_IMAGE = "icons/hardwareHover.png";
private static final String HARDWARE_INVALID_IMAGE = "icons/hardwareInvalid.png";
private static final String HARDWARE_INVALID_HOVER_IMAGE = "icons/hardwareInvalidHover.png";
private static final String SKETCH_IMAGE = "icons/sketch.png";
private static final String SKETCH_HOVER_IMAGE = "icons/sketchHover.png";
private static final String SKETCH_INVALID_IMAGE = "icons/sketchInvalid.png";
private static final String SKETCH_INVALID_HOVER_IMAGE = "icons/sketchInvalidHover.png";
private static final String UPLOAD_IMAGE = "icons/upload.png";
private static final String UPLOAD_HOVER_IMAGE = "icons/uploadHover.png";
private static final String HARDWARE_IMAGE = "icons/128x128/hardware.png";
private static final String HARDWARE_HOVER_IMAGE = "icons/128x128/hardwareHover.png";
private static final String HARDWARE_INVALID_IMAGE = "icons/128x128/hardwareInvalid.png";
private static final String HARDWARE_INVALID_HOVER_IMAGE = "icons/128x128/hardwareInvalidHover.png";
private static final String SKETCH_IMAGE = "icons/128x128/sketch.png";
private static final String SKETCH_HOVER_IMAGE = "icons/128x128/sketchHover.png";
private static final String SKETCH_INVALID_IMAGE = "icons/128x128/sketchInvalid.png";
private static final String SKETCH_INVALID_HOVER_IMAGE = "icons/128x128/sketchInvalidHover.png";
private static final String UPLOAD_IMAGE = "icons/128x128/upload.png";
private static final String UPLOAD_HOVER_IMAGE = "icons/128x128/uploadHover.png";
private FormToolkit toolkit;
private ScrolledForm form;
private List<Image> images = new ArrayList<Image>();
Expand Down Expand Up @@ -197,7 +197,7 @@ private void setHardwareLinkEnablement() {

private void createPreferencesHyperLink(final Shell shell) {
ImageHyperlink preferencesLink = createImageHyperlink(form.getBody(),
"icons/preferences.png", "icons/preferencesHover.png",
"icons/128x128/preferences.png", "icons/128x128/preferencesHover.png",
"Set the preferences (arduino SDK ,serial port...)");
preferencesLink.addHyperlinkListener(new HyperlinkAdapter() {
public void linkActivated(HyperlinkEvent e) {
Expand All @@ -209,7 +209,7 @@ public void linkActivated(HyperlinkEvent e) {
private void createOpenProjectHyperLink(final Composite parent,
final Shell shell) {
ImageHyperlink openProjectLink = createImageHyperlink(form.getBody(),
"icons/openProject.png", "icons/openProjectHover.png",
"icons/128x128/openProject.png", "icons/128x128/openProjectHover.png",
"Open an existing project");
openProjectLink.addHyperlinkListener(new HyperlinkAdapter() {
public void linkActivated(HyperlinkEvent e) {
Expand All @@ -221,7 +221,7 @@ public void linkActivated(HyperlinkEvent e) {
private void createNewProjectHyperLink(final Composite parent,
final Shell shell) {
ImageHyperlink newProjectLink = createImageHyperlink(form.getBody(),
"icons/newProject.png", "icons/newProjectHover.png",
"icons/128x128/newProject.png", "icons/128x128/newProjectHover.png",
"Create a new project");
newProjectLink.addHyperlinkListener(new HyperlinkAdapter() {
public void linkActivated(HyperlinkEvent e) {
Expand Down

0 comments on commit e2eef0e

Please sign in to comment.