copy arduino sketch files in temporary folder for uploading

src/program/programtab.cpp

@@ -674,7 +674,6 @@ void ProgramTab::sendProgram() {
         return;
 	}
 
-    // see https://github.com/arduino/Arduino/blob/ide-1.5.x/build/shared/manpage.adoc
 	if (language.compare("arduino", Qt::CaseInsensitive) == 0) {
 		QProcess * process = new QProcess(this);
 		process->setProcessChannelMode(QProcess::MergedChannels);
@@ -683,17 +682,33 @@ void ProgramTab::sendProgram() {
 		connect(process, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(programProcessFinished(int, QProcess::ExitStatus)));
 		connect(process, SIGNAL(readyReadStandardOutput()), this, SLOT(programProcessReadyRead()));
 
+        // Make sure .ino is in its own folder with same name (as required by Arduino compiler),
+        // otherwise create a subfolder and copy the file there.
+        QFileInfo fileInfo(m_filename);
+        QString tmpFilePath = fileInfo.absoluteFilePath();
+        QString dirName = fileInfo.dir().dirName();
+        QString sketchName = fileInfo.baseName();
+        if (dirName.compare(sketchName, Qt::CaseInsensitive) != 0) {
+            QString tmpSketchName(sketchName.append("_TMP"));
+            fileInfo.dir().mkdir(tmpSketchName);
+            tmpFilePath = fileInfo.absolutePath().append("/").append(tmpSketchName).append("/")
+                    .append(fileInfo.baseName().append("_TMP.").append(fileInfo.suffix()));
+            if (QFile::exists(tmpFilePath)) QFile::remove(tmpFilePath);
+            QFile::copy(fileInfo.absoluteFilePath(), tmpFilePath);
+        }
+
 		QStringList args;
+        // see https://github.com/arduino/Arduino/blob/ide-1.5.x/build/shared/manpage.adoc
         //args.append(QString("--verbose"));
         args.append(QString("--board"));
         QString boardDef = m_programWindow->getBoardNames().value(m_boardComboBox->currentText());
         args.append(boardDef);
         args.append(QString("--port"));
         args.append(m_portComboBox->currentText());
         args.append(QString("--upload"));
-		args.append(QDir::toNativeSeparators(m_filename));
-		m_console->setPlainText("");
+        args.append(QDir::toNativeSeparators(tmpFilePath));
 
+        m_console->setPlainText("");
         process->start(m_programmerPath, args);
         return;
 	}

src/program/programwindow.cpp

@@ -570,7 +570,7 @@ void ProgramWindow::setTitle(const QString & filename) {
  * and setting an appropriate filename.
  */
 ProgramTab * ProgramWindow::addTab() {
-    QString name = (UntitledIndex == 1) ? untitledFileName() : tr("%1 %2").arg(untitledFileName()).arg(UntitledIndex);
+    QString name = (UntitledIndex == 1) ? untitledFileName() : tr("%1%2").arg(untitledFileName()).arg(UntitledIndex);
     ProgramTab * programTab = new ProgramTab(name, m_tabWidget);
     connect(programTab, SIGNAL(wantToSave(int)), this, SLOT(tabSave(int)));
     connect(programTab, SIGNAL(wantToSaveAs(int)), this, SLOT(tabSaveAs(int)));