Skip to content

Commit 91674fa

Browse files
committed
Changed windows installer to not uninstall publisher so that your favorite programming language tool is not affected. Bumped version to 1.1.2
1 parent a02af1c commit 91674fa

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

propside/aboutdialog.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "aboutdialog.h"
2121
#include "properties.h"
2222

23+
2324
AboutDialog::AboutDialog(QString landing, QWidget *parent) : QDialog(parent)
2425
{
2526
QVBoxLayout *layout = new QVBoxLayout(this);

propside/mainspinwindow.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5285,6 +5285,14 @@ void MainSpinWindow::programDebug()
52855285
term->getEditor()->setPortEnable(false);
52865286
btnConnected->setChecked(false);
52875287

5288+
/* enable terminal here so first hello world program shows content */
5289+
term->getEditor()->setPlainText("");
5290+
term->getEditor()->setPortEnable(true);
5291+
term->setPortName(portName);
5292+
term->activateWindow();
5293+
term->setPortEnabled(true);
5294+
term->show();
5295+
52885296
if(runLoader("-r -t")) {
52895297
portListener->close();
52905298
return;
@@ -5294,12 +5302,15 @@ void MainSpinWindow::programDebug()
52945302
portListener->open();
52955303

52965304
btnConnected->setChecked(true);
5305+
5306+
/* activate terminal here so first hello world program is in focus like before */
52975307
term->getEditor()->setPlainText("");
52985308
term->getEditor()->setPortEnable(true);
52995309
term->setPortName(portName);
53005310
term->activateWindow();
53015311
term->setPortEnabled(true);
53025312
term->show();
5313+
53035314
term->getEditor()->setFocus();
53045315
cbPort->setEnabled(false);
53055316
}

propside/propside.iss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#define MyAppName "SimpleIDE"
55
#define MyDocName "SimpleIDE"
6-
#define MyAppVersion "1-1-0"
6+
#define MyAppVersion "1-1-2"
77
#define MyAppPublisher "ParallaxInc"
88
#define MyAppURL "parallax.com"
99
#define MyAppExeName "bin\SimpleIDE.exe"
@@ -154,7 +154,8 @@ Filename: {app}\{#FtdiChipApp}; Flags: RunAsCurrentUser NoWait;
154154

155155
[Registry]
156156
; would like to use HKLM for these things if possible for specifying compiler and user workspace fields.
157-
Root: HKCU; SubKey: Software\{#MyAppPublisher}; Flags: DeleteKey UninsDeleteKey;
157+
;Root: HKCU; SubKey: Software\{#MyAppPublisher}; Flags: DeleteKey UninsDeleteKey; This removes all publisher keys. Don't enable it.
158+
Root: HKCU; SubKey: Software\{#MyAppPublisher}\SimpleIDE; Flags: DeleteKey UninsDeleteKey;
158159
Root: HKCU; SubKey: Software\{#MyAppPublisher}\SimpleIDE\*; Flags: DeleteKey UninsDeleteKey;
159160
;Root: HKCU; Subkey: "Software\{#MyAppPublisher}\SimpleIDE"; ValueType: string; ValueName: SimpleIDE_Compiler; ValueData: "{app}\propeller-gcc\bin\propeller-elf-gcc.exe"; Flags: UninsDeleteKey;
160161
;Root: HKCU; Subkey: "Software\{#MyAppPublisher}\SimpleIDE"; ValueType: string; ValueName: SimpleIDE_Includes; ValueData: "{app}\propeller-gcc\propeller-load\"; Flags: UninsDeleteKey;

propside/propside.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# These define the version number in Menu->About
66
DEFINES += IDEVERSION=1
77
DEFINES += MINVERSION=1
8-
DEFINES += FIXVERSION=1
8+
DEFINES += FIXVERSION=2
99
VERSION = IDEVERSION"."MINVERSION"."FIXVERSION
1010

1111
QT += core

0 commit comments

Comments
 (0)