Merge remote-tracking branch 'origin/v1-2-0'

Author: francoiscampbell

META-INF/plugin.xml

@@ -38,7 +38,7 @@
 <idea-plugin version="2">
  <id>io.github.francoiscambell.clionarduinoplugin</id>
  <name>CLion Arduino</name>
- <version>1.1.0</version>
+ <version>1.2.0</version>
  <vendor email="" url="https://github.com/francoiscampbell/CLionArduinoPlugin">Francois Campbell</vendor>
 
  <description><![CDATA[
@@ -55,13 +55,17 @@
  project from queezythegreat.
  <br>
  <br>
- The current features are to convert a default CLion project into an Arduino CMake one in one click, and to create new sketch files. When CLion adds the ability to hook into project creation directly, I will be able to make it selectable at project creation time, but for now, we're stuck with having to create a new CLion project and then convert it.
+ The current features are to create an Arduino CMake project in one click, and to create new sketch files.
  <br>
  <br>
- Future features are to add menu option to easily change the board type, port number, etc.
+ Future features are to add menu option to easily change the board type, port number, import existing Arduino projects, etc.
  ]]></description>
 
  <change-notes><![CDATA[
+ <b>1.2.0</b>
+ <ul>
+ <li>Added new project creation to Welcome Screen and File menu</li>
+ </ul>
  <b>1.1.0</b>
  <ul>
  <li>Compatiblity with Arduino SDK 1.6 on Mac OS X</li>
@@ -96,8 +100,11 @@
  on how to target different products -->
  <depends>com.intellij.modules.clion</depends>
 
+
  <extensions defaultExtensionNs="com.intellij">
  <!-- Add your extensions here -->
+ <!--<moduleType id="ARDUINO" implementationClass="io.github.francoiscambell.clionarduinoplugin.module.ArduinoModuleType"/>-->
+ <!--<moduleBuilder builderClass="io.github.francoiscambell.clionarduinoplugin.module.ArduinoModuleBuilder"/>-->
  </extensions>
 
  <application-components>
@@ -112,18 +119,20 @@
  <!-- Add your project components here -->
  </project-components>
 
+
  <actions>
  <!-- Add your actions here -->
  <action id="Sketch.New" class="io.github.francoiscambell.clionarduinoplugin.actions.NewSketchFile"
  text="Arduino Sketch" description="New Arduino Sketch File"
  icon="/io/github/francoiscambell/clionarduinoplugin/resources/icons/Arduino_Logo.png">
  <add-to-group group-id="NewGroup" anchor="last"/>
  </action>
- <action id="SketchProject.Convert"
- class="io.github.francoiscambell.clionarduinoplugin.actions.ConvertToSketchProject"
- text="Convert to Arduino Sketch project" description="Converts a CMake project to an Arduino Sketch"
+ <action id="SketchProject.New"
+ class="io.github.francoiscambell.clionarduinoplugin.actions.NewArduinoProjectAction"
+ text="New Arduino Sketch Project" description="Creates a new Arduino sketch project"
  icon="/io/github/francoiscambell/clionarduinoplugin/resources/icons/Arduino_Logo.png">
- <add-to-group group-id="ProjectViewPopupMenu" anchor="last"/>
+ <add-to-group group-id="FileMenu" anchor="first"/>
+ <add-to-group group-id="WelcomeScreen.QuickStart" anchor="first"/>
  </action>
  </actions>
 

README.md

@@ -2,9 +2,17 @@
 
 This is a JetBrains CLion plugin that integrates [Arduino CMake](https://github.com/queezythegreat/arduino-cmake) into the IDE.
 
-The current features are to convert a default CLion project into an Arduino CMake one in one click, and to create new sketch files. When CLion adds the ability to hook into project creation directly, I will be able to make it selectable at project creation time, but for now, we're stuck with having to create a new CLion project and then convert it.
+The current features are to create an Arduino CMake project in one click, and to create new sketch files.
 
-Future features are to add menu option to easily change the board type, port number, etc.
+Future features are to add menu option to easily change the board type, port number, import existing Arduino projects, etc.
+
+**1.2.0**
+
+* Added new project creation to Welcome Screen and File menu
+
+**1.1.0**
+
+* Compatiblity with Arduino SDK 1.6 on Mac OS X
 
 **1.0.2**
 

src/io/github/francoiscambell/clionarduinoplugin/ArduinoSketchFileCreator.java

@@ -39,6 +39,6 @@ public void run() {
  }
 
  public static void addFileToCMakeLists(final Project project, final VirtualFile file) {
- CMakeListsEditor.getInstance(project).set("SOURCE_FILES", file.getName());
+ CMakeListsEditor.getInstance(project.getBaseDir()).set("SOURCE_FILES", file.getName());
  }
 }

src/io/github/francoiscambell/clionarduinoplugin/CMakeListsEditor.java

@@ -4,33 +4,33 @@
 import com.intellij.openapi.command.*;
 import com.intellij.openapi.editor.*;
 import com.intellij.openapi.fileEditor.*;
-import com.intellij.openapi.project.*;
 import com.intellij.openapi.vfs.*;
-import io.github.francoiscambell.clionarduinoplugin.resources.*;
+
+import java.util.*;
 
 /**
  * Created by francois on 15-08-04.
  */
 public class CMakeListsEditor {
- private static CMakeListsEditor INSTANCE;
- private Project project;
+ private static Map<VirtualFile, CMakeListsEditor> INSTANCES = new WeakHashMap<VirtualFile, CMakeListsEditor>();
+ private VirtualFile cMakeListsVirtualFile;
 
- private CMakeListsEditor(Project project) {
- this.project = project;
+ private CMakeListsEditor(VirtualFile cMakeLists) {
+ this.cMakeListsVirtualFile = cMakeLists;
  }
 
- public static CMakeListsEditor getInstance(Project project) {
- if (INSTANCE == null) {
- INSTANCE = new CMakeListsEditor(project);
+ public static CMakeListsEditor getInstance(VirtualFile cMakeLists) {
+ if (!INSTANCES.containsKey(cMakeLists)) {
+ INSTANCES.put(cMakeLists, new CMakeListsEditor(cMakeLists));
  }
- return INSTANCE;
+ return INSTANCES.get(cMakeLists);
  }
 
- public VirtualFile getCMakeListsVirtualFile() {
- return project.getBaseDir().findChild(Strings.CMAKE_LISTS_FILENAME);
+ private VirtualFile getCMakeListsVirtualFile() {
+ return cMakeListsVirtualFile;
  }
 
- public Document getCMakeListsDocument() {
+ private Document getCMakeListsDocument() {
  return FileDocumentManager.getInstance().getDocument(getCMakeListsVirtualFile());
  }
 
@@ -39,10 +39,11 @@ public void clear() {
  ApplicationManager.getApplication().runWriteAction(new Runnable() {
  @Override
  public void run() {
- CommandProcessor.getInstance().executeCommand(project, new Runnable() {
+ CommandProcessor.getInstance().executeCommand(null, new Runnable() {
  @Override
  public void run() {
- cMakeLists.deleteString(0, getCMakeListsDocument().getTextLength());
+ cMakeLists.deleteString(0, cMakeLists.getTextLength());
+ FileDocumentManager.getInstance().saveDocument(cMakeLists);
  }
  }, null, null, cMakeLists);
  }
@@ -56,10 +57,11 @@ public void addLine(int line, final String text) {
  ApplicationManager.getApplication().runWriteAction(new Runnable() {
  @Override
  public void run() {
- CommandProcessor.getInstance().executeCommand(project, new Runnable() {
+ CommandProcessor.getInstance().executeCommand(null, new Runnable() {
  @Override
  public void run() {
  cMakeLists.insertString(lineEndOffset, text + "\n");
+ FileDocumentManager.getInstance().saveDocument(cMakeLists);
  }
  }, null, null, cMakeLists);
  }

src/io/github/francoiscambell/clionarduinoplugin/actions/ConvertToSketchProject.java

@@ -0,0 +1,28 @@
+package io.github.francoiscambell.clionarduinoplugin.actions;
+
+import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.wm.impl.welcomeScreen.*;
+import io.github.francoiscambell.clionarduinoplugin.resources.icons.*;
+import io.github.francoiscambell.clionarduinoplugin.wizards.*;
+
+/**
+ * Created by francois on 15-08-14.
+ */
+public class NewArduinoProjectAction extends AnAction {
+ public void update(AnActionEvent event) {
+ Presentation presentation = event.getPresentation();
+ if (ActionPlaces.isMainMenuOrActionSearch(event.getPlace())) {
+ presentation.setIcon(null);
+ }
+
+ if (NewWelcomeScreen.isNewWelcomeScreen(event)) {
+ event.getPresentation().setIcon(ArduinoIcon.ARDUINO_ICON);
+ }
+
+ }
+
+ @Override
+ public void actionPerformed(AnActionEvent e) {
+ (new NewArduinoProjectWizard()).runWizard();
+ }
+}

src/io/github/francoiscambell/clionarduinoplugin/actions/NewArduinoProjectAction.java

@@ -1,7 +1,6 @@
 package io.github.francoiscambell.clionarduinoplugin.resources;
 
 import com.intellij.openapi.application.*;
-import com.intellij.openapi.project.*;
 import com.intellij.openapi.vfs.*;
 import org.apache.sanselan.util.*;
 
@@ -19,12 +18,12 @@ public static InputStream getArduinoCmake() {
  return ArduinoToolchainFiles.class.getResourceAsStream("arduino-cmake/cmake/Platform/Arduino.cmake");
  }
 
- public static void copyToProject(final Project project) {
+ public static void copyToDirectory(final VirtualFile projectRoot) {
  ApplicationManager.getApplication().runWriteAction(new Runnable() {
  @Override
  public void run() {
  try {
- VirtualFile cmakeDirectory = project.getBaseDir().createChildDirectory(this, "cmake");
+ VirtualFile cmakeDirectory = projectRoot.createChildDirectory(this, "cmake");
  VirtualFile platformDirectory = cmakeDirectory.createChildDirectory(this, "Platform");
 
  VirtualFile arduinoToolchain = cmakeDirectory.createChildData(this, "ArduinoToolchain.cmake");