Skip to content

Commit 0713d0b

Browse files
committed
Updated version, loader, openspin, workspace, and fix for issue 259.
Package uses Qt5.7 ... need testing to start now.
1 parent af6a79d commit 0713d0b

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

propside/IDE_LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SimpleIDE is licensed as GNU GENERAL PUBLIC LICENSE V3 (see below).
33
+---------------------------------------------------------------------
44
SimpleIDE
5-
Copyright (c) 2012-2016 Parallax Inc.
5+
Copyright (c) 2012-2017 Parallax Inc.
66

77
Open Source Repository List:
88

propside/console.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ Console::Console(QWidget *parent) : QPlainTextEdit(parent)
4545
for(int n = 0; n < maxhex; n++)
4646
hexbyte[n] = 0;
4747
sbuff = NULL;
48+
// experimenting with wraps ... just turn it off.
49+
this->setLineWrapMode(QPlainTextEdit::NoWrap);
4850
}
4951

5052
void Console::setPortEnable(bool value)

propside/mainspinwindow.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3900,30 +3900,30 @@ QStringList MainSpinWindow::getAsFilters()
39003900

39013901
filters << "C File (*.c)";
39023902
filters << "C++ File (*.cpp)";
3903-
#ifdef SPIN
3903+
// #ifdef SPIN // always allow spin filters
39043904
filters << "Spin File (*.spin)";
3905-
#endif
3905+
// #endif
39063906
filters << "C Header File (*.h)";
39073907
filters << "COG C File (*.cogc)";
39083908

39093909
if(this->simpleViewType == false) {
39103910
filters << "E-COG C File (*.ecogc)";
3911-
#ifdef SPIN
3911+
// #ifdef SPIN // always allow spin filters
39123912
filters << "E-Spin File (*.espin)";
3913-
#endif
3913+
// #endif
39143914
}
39153915

39163916
QString comp = projectOptions->getCompiler();
39173917
if(comp.compare(projectOptions->CPP_COMPILER) == 0) {
39183918
filters.removeAt(1);
39193919
filters.insert(0,"C++ File (*.cpp)");
39203920
}
3921-
#ifdef SPIN
3921+
// #ifdef SPIN // always allow spin filters
39223922
else if(comp.compare(projectOptions->SPIN_COMPILER) == 0) {
39233923
filters.removeAt(2);
39243924
filters.insert(0,"Spin File (*.spin)");
39253925
}
3926-
#endif
3926+
// #endif
39273927

39283928
filters << "Any File (*)";
39293929

propside/propside.iss

Lines changed: 8 additions & 10 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-0-51"
6+
#define MyAppVersion "1-0-53"
77
#define MyAppPublisher "ParallaxInc"
88
#define MyAppURL "parallax.com"
99
#define MyAppExeName "bin\SimpleIDE.exe"
@@ -15,16 +15,15 @@
1515
; ---- IMPORTANT!!! ---- Set this to your QtPath
1616
; The Qt5 mingw path is the compiler used to build the app.
1717
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
18-
#define MyQtPath "C:\Qt\Qt5.4.2\5.4\mingw491_32"
18+
#define MyQtPath "C:\Qt\Qt5.7.0\5.7\mingw53_32"
1919
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2020
; This path will need to be changed to match the path containing mingw
2121
; It should be the same path used in building the application.
2222
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
23-
#define MyQtMingwPath "C:\Qt\Qt5.4.2\5.4\mingw491_32"
23+
#define MyQtMingwPath "C:\Qt\Qt5.7.0\5.7\mingw53_32"
2424
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2525
; This path contains the propeller gcc build
2626
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
27-
;#define MyGccPath "C:\mingw\msys\1.0\opt\parallax"
2827
#define MyGccPath "..\..\propeller-gcc"
2928
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
3029
; This path must contains the mingw path used for the propeller gcc build
@@ -37,10 +36,8 @@
3736
#define MyAppBin "{app}\bin"
3837
#define MyBoardFilter "..\boards.txt"
3938
#define MyFont "..\Parallax.ttf"
40-
;#define MyLoaderPath "..\..\proploader\build-proploader-Desktop_Qt_5_4_2_MinGW_32bit2-Release\Release"
4139
#define MyLoaderPath "..\..\proploader-msys-build\bin"
42-
;#define MyAppPath "..\build-propside-Qt_4_8_6-Release"
43-
#define MyAppPath "..\build-propside-Desktop_Qt_5_4_2_MinGW_32bit-Release"
40+
#define MyAppPath "..\build-propside-Desktop_Qt_5_7_0_MinGW_32bit-Release"
4441

4542
[Setup]
4643
; NOTE: The value of AppId uniquely identifies this application.
@@ -118,9 +115,10 @@ Source: "zlib1.dll"; DestDir: "{#MyAppBin}"; Flags: ignoreversion
118115
Source: "{#MyLoaderPath}\proploader.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
119116

120117
; These paths are based on the mingw distribution used in building the application and should match.
121-
Source: "{#MyQtMingwPath}\bin\icuin53.dll"; DestDir: "{#MyAppBin}"; Flags: ignoreversion
122-
Source: "{#MyQtMingwPath}\bin\icuuc53.dll"; DestDir: "{#MyAppBin}"; Flags: ignoreversion
123-
Source: "{#MyQtMingwPath}\bin\icudt53.dll"; DestDir: "{#MyAppBin}"; Flags: ignoreversion
118+
; icu not needed in 5.3+ and are not included in 5.7 mingwpath.
119+
;Source: "{#MyQtMingwPath}\bin\icuin53.dll"; DestDir: "{#MyAppBin}"; Flags: ignoreversion
120+
;Source: "{#MyQtMingwPath}\bin\icuuc53.dll"; DestDir: "{#MyAppBin}"; Flags: ignoreversion
121+
;Source: "{#MyQtMingwPath}\bin\icudt53.dll"; DestDir: "{#MyAppBin}"; Flags: ignoreversion
124122
Source: "{#MyQtMingwPath}\bin\libgcc_s_dw2-1.dll"; DestDir: "{#MyAppBin}"; Flags: ignoreversion
125123
Source: "{#MyQtMingwPath}\bin\libstdc++-6.dll"; DestDir: "{#MyAppBin}"; Flags: ignoreversion
126124
Source: "{#MyQtMingwPath}\bin\libwinpthread-1.dll"; DestDir: "{#MyAppBin}"; Flags: ignoreversion

propside/propside.pro

Lines changed: 2 additions & 2 deletions
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=0
8-
DEFINES += FIXVERSION=51
8+
DEFINES += FIXVERSION=53
99
VERSION = IDEVERSION"."MINVERSION"."FIXVERSION
1010

1111
QT += core
@@ -48,7 +48,7 @@ DEFINES += ENABLE_AUTOLIB
4848
# IDEDEBUG define sends qDebug() output to a Debug TAB.
4949
# This is most useful with windows as console output is not available there.
5050
# Don't use IDEDEBUG in release! It BREAKS Translations!
51-
# DEFINES += IDEDEBUG
51+
DEFINES += IDEDEBUG
5252

5353
# EVENT_DRIVEN QEXTSERIALPORT is no longer used.
5454
# GDBENABLE is not ready, and will only be used for development testing

0 commit comments

Comments
 (0)