diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/hardware.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/hardware.png similarity index 100% rename from plugins/fr.obeo.dsl.arduino.ui/icons/hardware.png rename to plugins/fr.obeo.dsl.arduino.ui/icons/128x128/hardware.png diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/hardwareHover.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/hardwareHover.png new file mode 100644 index 0000000..1b70ba2 Binary files /dev/null and b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/hardwareHover.png differ diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/hardwareInvalid.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/hardwareInvalid.png new file mode 100644 index 0000000..04b4148 Binary files /dev/null and b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/hardwareInvalid.png differ diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/hardwareInvalidHover.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/hardwareInvalidHover.png new file mode 100644 index 0000000..972434c Binary files /dev/null and b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/hardwareInvalidHover.png differ diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/iconmonstr-bug-icon-128.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/iconmonstr-bug-icon-128.png new file mode 100644 index 0000000..d756baa Binary files /dev/null and b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/iconmonstr-bug-icon-128.png differ diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/iconmonstr-laptop-3-icon-128.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/iconmonstr-laptop-3-icon-128.png new file mode 100644 index 0000000..9fd6a15 Binary files /dev/null and b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/iconmonstr-laptop-3-icon-128.png differ diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/newProject.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/newProject.png similarity index 100% rename from plugins/fr.obeo.dsl.arduino.ui/icons/newProject.png rename to plugins/fr.obeo.dsl.arduino.ui/icons/128x128/newProject.png diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/newProjectHover.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/newProjectHover.png similarity index 100% rename from plugins/fr.obeo.dsl.arduino.ui/icons/newProjectHover.png rename to plugins/fr.obeo.dsl.arduino.ui/icons/128x128/newProjectHover.png diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/openProject.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/openProject.png similarity index 100% rename from plugins/fr.obeo.dsl.arduino.ui/icons/openProject.png rename to plugins/fr.obeo.dsl.arduino.ui/icons/128x128/openProject.png diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/openProjectHover.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/openProjectHover.png similarity index 100% rename from plugins/fr.obeo.dsl.arduino.ui/icons/openProjectHover.png rename to plugins/fr.obeo.dsl.arduino.ui/icons/128x128/openProjectHover.png diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/preferences.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/preferences.png similarity index 100% rename from plugins/fr.obeo.dsl.arduino.ui/icons/preferences.png rename to plugins/fr.obeo.dsl.arduino.ui/icons/128x128/preferences.png diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/preferencesHover.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/preferencesHover.png similarity index 100% rename from plugins/fr.obeo.dsl.arduino.ui/icons/preferencesHover.png rename to plugins/fr.obeo.dsl.arduino.ui/icons/128x128/preferencesHover.png diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/sketch.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/sketch.png similarity index 100% rename from plugins/fr.obeo.dsl.arduino.ui/icons/sketch.png rename to plugins/fr.obeo.dsl.arduino.ui/icons/128x128/sketch.png diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/sketchHover.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/sketchHover.png similarity index 100% rename from plugins/fr.obeo.dsl.arduino.ui/icons/sketchHover.png rename to plugins/fr.obeo.dsl.arduino.ui/icons/128x128/sketchHover.png diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/sketchInvalid.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/sketchInvalid.png new file mode 100644 index 0000000..ec6e404 Binary files /dev/null and b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/sketchInvalid.png differ diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/sketchInvalidHover.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/sketchInvalidHover.png new file mode 100644 index 0000000..6d2ba1a Binary files /dev/null and b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/sketchInvalidHover.png differ diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/upload.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/upload.png similarity index 100% rename from plugins/fr.obeo.dsl.arduino.ui/icons/upload.png rename to plugins/fr.obeo.dsl.arduino.ui/icons/128x128/upload.png diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/uploadHover.png b/plugins/fr.obeo.dsl.arduino.ui/icons/128x128/uploadHover.png similarity index 100% rename from plugins/fr.obeo.dsl.arduino.ui/icons/uploadHover.png rename to plugins/fr.obeo.dsl.arduino.ui/icons/128x128/uploadHover.png diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/newHardware.png b/plugins/fr.obeo.dsl.arduino.ui/icons/32x32/hardware.png similarity index 100% rename from plugins/fr.obeo.dsl.arduino.ui/icons/newHardware.png rename to plugins/fr.obeo.dsl.arduino.ui/icons/32x32/hardware.png diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/newHardwareKit.png b/plugins/fr.obeo.dsl.arduino.ui/icons/32x32/newHardwareKit.png similarity index 100% rename from plugins/fr.obeo.dsl.arduino.ui/icons/newHardwareKit.png rename to plugins/fr.obeo.dsl.arduino.ui/icons/32x32/newHardwareKit.png diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/project.png b/plugins/fr.obeo.dsl.arduino.ui/icons/32x32/project.png similarity index 100% rename from plugins/fr.obeo.dsl.arduino.ui/icons/project.png rename to plugins/fr.obeo.dsl.arduino.ui/icons/32x32/project.png diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/newSketch.png b/plugins/fr.obeo.dsl.arduino.ui/icons/32x32/sketch.png similarity index 100% rename from plugins/fr.obeo.dsl.arduino.ui/icons/newSketch.png rename to plugins/fr.obeo.dsl.arduino.ui/icons/32x32/sketch.png diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/32x32/upload.png b/plugins/fr.obeo.dsl.arduino.ui/icons/32x32/upload.png new file mode 100644 index 0000000..a0b8413 Binary files /dev/null and b/plugins/fr.obeo.dsl.arduino.ui/icons/32x32/upload.png differ diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/delete.png b/plugins/fr.obeo.dsl.arduino.ui/icons/delete.png deleted file mode 100644 index e7ac012..0000000 Binary files a/plugins/fr.obeo.dsl.arduino.ui/icons/delete.png and /dev/null differ diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/hardwareHover.png b/plugins/fr.obeo.dsl.arduino.ui/icons/hardwareHover.png deleted file mode 100644 index d01314c..0000000 Binary files a/plugins/fr.obeo.dsl.arduino.ui/icons/hardwareHover.png and /dev/null differ diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/hardwareInvalid.png b/plugins/fr.obeo.dsl.arduino.ui/icons/hardwareInvalid.png deleted file mode 100644 index 8f7f46b..0000000 Binary files a/plugins/fr.obeo.dsl.arduino.ui/icons/hardwareInvalid.png and /dev/null differ diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/hardwareInvalidHover.png b/plugins/fr.obeo.dsl.arduino.ui/icons/hardwareInvalidHover.png deleted file mode 100644 index afbc2ff..0000000 Binary files a/plugins/fr.obeo.dsl.arduino.ui/icons/hardwareInvalidHover.png and /dev/null differ diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/sketchInvalid.png b/plugins/fr.obeo.dsl.arduino.ui/icons/sketchInvalid.png deleted file mode 100644 index 560f18f..0000000 Binary files a/plugins/fr.obeo.dsl.arduino.ui/icons/sketchInvalid.png and /dev/null differ diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/sketchInvalidHover.png b/plugins/fr.obeo.dsl.arduino.ui/icons/sketchInvalidHover.png deleted file mode 100644 index 4b91e84..0000000 Binary files a/plugins/fr.obeo.dsl.arduino.ui/icons/sketchInvalidHover.png and /dev/null differ diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/svg/README b/plugins/fr.obeo.dsl.arduino.ui/icons/svg/README new file mode 100644 index 0000000..9b7f979 --- /dev/null +++ b/plugins/fr.obeo.dsl.arduino.ui/icons/svg/README @@ -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." \ No newline at end of file diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/svg/hardware.svg b/plugins/fr.obeo.dsl.arduino.ui/icons/svg/hardware.svg new file mode 100644 index 0000000..b1894d4 --- /dev/null +++ b/plugins/fr.obeo.dsl.arduino.ui/icons/svg/hardware.svg @@ -0,0 +1,27 @@ + + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/svg/hardware2.svg b/plugins/fr.obeo.dsl.arduino.ui/icons/svg/hardware2.svg new file mode 100644 index 0000000..150b627 --- /dev/null +++ b/plugins/fr.obeo.dsl.arduino.ui/icons/svg/hardware2.svg @@ -0,0 +1,53 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/svg/newProject.svg b/plugins/fr.obeo.dsl.arduino.ui/icons/svg/newProject.svg new file mode 100644 index 0000000..4bb9394 --- /dev/null +++ b/plugins/fr.obeo.dsl.arduino.ui/icons/svg/newProject.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/svg/openProject.svg b/plugins/fr.obeo.dsl.arduino.ui/icons/svg/openProject.svg new file mode 100644 index 0000000..6aaf50c --- /dev/null +++ b/plugins/fr.obeo.dsl.arduino.ui/icons/svg/openProject.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/svg/preferences.svg b/plugins/fr.obeo.dsl.arduino.ui/icons/svg/preferences.svg new file mode 100644 index 0000000..733b643 --- /dev/null +++ b/plugins/fr.obeo.dsl.arduino.ui/icons/svg/preferences.svg @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/svg/sketch.svg b/plugins/fr.obeo.dsl.arduino.ui/icons/svg/sketch.svg new file mode 100644 index 0000000..24f9435 --- /dev/null +++ b/plugins/fr.obeo.dsl.arduino.ui/icons/svg/sketch.svg @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino.ui/icons/svg/upload.svg b/plugins/fr.obeo.dsl.arduino.ui/icons/svg/upload.svg new file mode 100644 index 0000000..817192a --- /dev/null +++ b/plugins/fr.obeo.dsl.arduino.ui/icons/svg/upload.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino.ui/plugin.xml b/plugins/fr.obeo.dsl.arduino.ui/plugin.xml index 14c3794..1985e1e 100644 --- a/plugins/fr.obeo.dsl.arduino.ui/plugin.xml +++ b/plugins/fr.obeo.dsl.arduino.ui/plugin.xml @@ -30,28 +30,28 @@ id="fr.obeo.dsl.arduino.menus.toolbar"> diff --git a/plugins/fr.obeo.dsl.arduino.ui/src/fr/obeo/dsl/arduino/views/DashboardView.java b/plugins/fr.obeo.dsl.arduino.ui/src/fr/obeo/dsl/arduino/views/DashboardView.java index d1e9273..0517fdc 100644 --- a/plugins/fr.obeo.dsl.arduino.ui/src/fr/obeo/dsl/arduino/views/DashboardView.java +++ b/plugins/fr.obeo.dsl.arduino.ui/src/fr/obeo/dsl/arduino/views/DashboardView.java @@ -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 images = new ArrayList(); @@ -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) { @@ -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) { @@ -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) {