Changed windows installer to not uninstall publisher so that your fav…

…orite programming language tool is not affected. Bumped version to 1.1.2
parallaxinc · Jul 26, 2017 · 91674fa · 91674fa
1 parent a02af1c
commit 91674fa
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/propside/aboutdialog.cpp b/propside/aboutdialog.cpp
@@ -20,6 +20,7 @@
 #include "aboutdialog.h"
 #include "properties.h"
 
+
 AboutDialog::AboutDialog(QString landing, QWidget *parent) : QDialog(parent)
 {
     QVBoxLayout *layout = new QVBoxLayout(this);

diff --git a/propside/mainspinwindow.cpp b/propside/mainspinwindow.cpp
@@ -5285,6 +5285,14 @@ void MainSpinWindow::programDebug()
     term->getEditor()->setPortEnable(false);
     btnConnected->setChecked(false);
 
+    /* enable terminal here so first hello world program shows content */
+    term->getEditor()->setPlainText("");
+    term->getEditor()->setPortEnable(true);
+    term->setPortName(portName);
+    term->activateWindow();
+    term->setPortEnabled(true);
+    term->show();
+
     if(runLoader("-r -t")) {
         portListener->close();
         return;
@@ -5294,12 +5302,15 @@ void MainSpinWindow::programDebug()
     portListener->open();
 
     btnConnected->setChecked(true);
+
+    /* activate terminal here so first hello world program is in focus like before */
     term->getEditor()->setPlainText("");
     term->getEditor()->setPortEnable(true);
     term->setPortName(portName);
     term->activateWindow();
     term->setPortEnabled(true);
     term->show();
+
     term->getEditor()->setFocus();
     cbPort->setEnabled(false);
 }

diff --git a/propside/propside.iss b/propside/propside.iss
@@ -3,7 +3,7 @@
 
 #define MyAppName "SimpleIDE"
 #define MyDocName "SimpleIDE"
-#define MyAppVersion "1-1-0"
+#define MyAppVersion "1-1-2"
 #define MyAppPublisher "ParallaxInc"
 #define MyAppURL "parallax.com"
 #define MyAppExeName "bin\SimpleIDE.exe"
@@ -154,7 +154,8 @@ Filename: {app}\{#FtdiChipApp}; Flags: RunAsCurrentUser NoWait;
 
 [Registry]
 ; would like to use HKLM for these things if possible for specifying compiler and user workspace fields.
-Root: HKCU; SubKey: Software\{#MyAppPublisher}; Flags: DeleteKey UninsDeleteKey; 
+;Root: HKCU; SubKey: Software\{#MyAppPublisher}; Flags: DeleteKey UninsDeleteKey; This removes all publisher keys. Don't enable it.
+Root: HKCU; SubKey: Software\{#MyAppPublisher}\SimpleIDE; Flags: DeleteKey UninsDeleteKey; 
 Root: HKCU; SubKey: Software\{#MyAppPublisher}\SimpleIDE\*; Flags: DeleteKey UninsDeleteKey; 
 ;Root: HKCU; Subkey: "Software\{#MyAppPublisher}\SimpleIDE"; ValueType: string; ValueName: SimpleIDE_Compiler; ValueData: "{app}\propeller-gcc\bin\propeller-elf-gcc.exe"; Flags: UninsDeleteKey; 
 ;Root: HKCU; Subkey: "Software\{#MyAppPublisher}\SimpleIDE"; ValueType: string; ValueName: SimpleIDE_Includes; ValueData: "{app}\propeller-gcc\propeller-load\"; Flags: UninsDeleteKey; 

diff --git a/propside/propside.pro b/propside/propside.pro
@@ -5,7 +5,7 @@
 # These define the version number in Menu->About
 DEFINES += IDEVERSION=1
 DEFINES += MINVERSION=1
-DEFINES += FIXVERSION=1
+DEFINES += FIXVERSION=2
 VERSION = IDEVERSION"."MINVERSION"."FIXVERSION
 
 QT += core