Skip to content

Commit

Permalink
Fix templates, rework mainwindow and change version to v0.1
Browse files Browse the repository at this point in the history 
Signed-off-by: Martin Ribelotta <[email protected]>
  • Loading branch information
@martinribelotta
martinribelotta committed Oct 10, 2016
1 parent 334f7ef commit aeeb5b4
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 197 deletions.
120 changes: 5 additions & 115 deletions MainWindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
<width>64</width>
<height>64</height>
</size>
</property>
<attribute name="toolBarArea">
Expand All @@ -47,6 +47,9 @@
<addaction name="actionProjectExport"/>
<addaction name="actionProjectClose"/>
<addaction name="actionSave_All"/>
<addaction name="actionConfigure"/>
<addaction name="actionHelp"/>
<addaction name="actionExit"/>
</widget>
<widget class="QDockWidget" name="dockWidget">
<property name="features">
Expand Down Expand Up @@ -163,59 +166,6 @@
</attribute>
<widget class="ProjectView" name="projectView"/>
</widget>
<widget class="QToolBar" name="debuggerToolbar">
<property name="windowTitle">
<string>toolBar_3</string>
</property>
<property name="movable">
<bool>false</bool>
</property>
<property name="allowedAreas">
<set>Qt::LeftToolBarArea</set>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<attribute name="toolBarArea">
<enum>LeftToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="actionStart_Debug"/>
<addaction name="actionDebugStep_Over"/>
<addaction name="actionDebugStep_Into"/>
<addaction name="actionDebugStep_Out"/>
</widget>
<widget class="QToolBar" name="programToolbar">
<property name="windowTitle">
<string>toolBar_4</string>
</property>
<property name="movable">
<bool>false</bool>
</property>
<property name="allowedAreas">
<set>Qt::LeftToolBarArea</set>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<attribute name="toolBarArea">
<enum>LeftToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="actionConfigure"/>
<addaction name="actionHelp"/>
<addaction name="actionExit"/>
</widget>
<action name="actionProjectNew">
<property name="icon">
<iconset theme="project-development-new-template" resource="resources.qrc">
Expand Down Expand Up @@ -306,66 +256,6 @@
<string>Configure</string>
</property>
</action>
<action name="actionStart_Debug">
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset theme="debug-run" resource="resources.qrc">
<normaloff>:/icon-theme/icon-theme/debug-run.png</normaloff>:/icon-theme/icon-theme/debug-run.png</iconset>
</property>
<property name="text">
<string>Start Debug</string>
</property>
<property name="toolTip">
<string>Start Debugger</string>
</property>
</action>
<action name="actionDebugStep_Over">
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icon-theme/icon-theme/debug-step-over.png</normaloff>:/icon-theme/icon-theme/debug-step-over.png</iconset>
</property>
<property name="text">
<string>Step Over</string>
</property>
<property name="toolTip">
<string>Step Over</string>
</property>
<property name="visible">
<bool>false</bool>
</property>
</action>
<action name="actionDebugStep_Into">
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icon-theme/icon-theme/debug-step-into.png</normaloff>:/icon-theme/icon-theme/debug-step-into.png</iconset>
</property>
<property name="text">
<string>Step Into</string>
</property>
<property name="toolTip">
<string>Step Into</string>
</property>
<property name="visible">
<bool>false</bool>
</property>
</action>
<action name="actionDebugStep_Out">
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icon-theme/icon-theme/debug-step-out.png</normaloff>:/icon-theme/icon-theme/debug-step-out.png</iconset>
</property>
<property name="text">
<string>Step Out</string>
</property>
<property name="toolTip">
<string>Step to function out</string>
</property>
<property name="visible">
<bool>false</bool>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
Expand Down
4 changes: 3 additions & 1 deletion embedded-ide.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ HEADERS += mainwindow.h \
etags.h \
projectview.h \
filedownloader.h \
version.h
version.h \
templates/ciaa-lpcopen.template

FORMS += mainwindow.ui \
editorwidget.ui \
Expand All @@ -81,6 +82,7 @@ RESOURCES += \

OTHER_FILES += \
templates/generic-make.template \
templates/ciaa-lpcopen.template \
templates/sAPI.template \
project-filters.txt

Expand Down
12 changes: 0 additions & 12 deletions mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,15 +277,3 @@ void MainWindow::on_textLog_anchorClicked(const QUrl &url)
// qDebug() << "Opening" << file << row << col;
ui->centralWidget->fileOpen(file, row, col, &ui->projectView->makeInfo());
}

void MainWindow::on_actionStart_Debug_toggled(bool debugOn)
{
ui->projectView->setDebugOn(debugOn);
QList<QAction*> al = this->findChildren<QAction*>(QRegExp("actionDebug.*"));
foreach(QAction *a, al)
a->setVisible(debugOn);
if (debugOn) {
} else {

}
}
2 changes: 0 additions & 2 deletions mainwindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ private slots:

void on_textLog_anchorClicked(const QUrl &url);

void on_actionStart_Debug_toggled(bool debugOn);

private:
Ui::MainWindow *ui;
};
Expand Down
66 changes: 3 additions & 63 deletions mainwindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>1000</width>
<height>586</height>
<height>600</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -32,7 +32,7 @@
</property>
<property name="iconSize">
<size>
<width>72</width>
<width>64</width>
<height>64</height>
</size>
</property>
Expand Down Expand Up @@ -168,7 +168,7 @@
</widget>
<action name="actionProjectNew">
<property name="icon">
<iconset resource="resources.qrc">
<iconset theme="project-development-new-template" resource="resources.qrc">
<normaloff>:/icon-theme/icon-theme/project-development-new-template.png</normaloff>:/icon-theme/icon-theme/project-development-new-template.png</iconset>
</property>
<property name="text">
Expand Down Expand Up @@ -256,66 +256,6 @@
<string>Configure</string>
</property>
</action>
<action name="actionStart_Debug">
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset theme="debug-run" resource="resources.qrc">
<normaloff>:/icon-theme/icon-theme/debug-run.png</normaloff>:/icon-theme/icon-theme/debug-run.png</iconset>
</property>
<property name="text">
<string>Start Debug</string>
</property>
<property name="toolTip">
<string>Start Debugger</string>
</property>
</action>
<action name="actionDebugStep_Over">
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icon-theme/icon-theme/debug-step-over.png</normaloff>:/icon-theme/icon-theme/debug-step-over.png</iconset>
</property>
<property name="text">
<string>Step Over</string>
</property>
<property name="toolTip">
<string>Step Over</string>
</property>
<property name="visible">
<bool>false</bool>
</property>
</action>
<action name="actionDebugStep_Into">
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icon-theme/icon-theme/debug-step-into.png</normaloff>:/icon-theme/icon-theme/debug-step-into.png</iconset>
</property>
<property name="text">
<string>Step Into</string>
</property>
<property name="toolTip">
<string>Step Into</string>
</property>
<property name="visible">
<bool>false</bool>
</property>
</action>
<action name="actionDebugStep_Out">
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icon-theme/icon-theme/debug-step-out.png</normaloff>:/icon-theme/icon-theme/debug-step-out.png</iconset>
</property>
<property name="text">
<string>Step Out</string>
</property>
<property name="toolTip">
<string>Step to function out</string>
</property>
<property name="visible">
<bool>false</bool>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
Expand Down
1 change: 1 addition & 0 deletions resources.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
<file>templates/generic-make.template</file>
<file>templates/sAPI.template</file>
<file>project-filters.txt</file>
<file>templates/ciaa-lpcopen.template</file>
</qresource>
<qresource prefix="/">
<file>style.css</file>
Expand Down
4 changes: 2 additions & 2 deletions templates/ciaa-lpcopen.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ diff -aur --unidirectional-new-file -x '.git*' -x '*.o' -x '*.d' -x '*.elf' -x '
+MODULES=app lpc_chip_43xx lpc_board_ciaa_edu_4337
+DEFINES=CORE_M4 __USE_LPCOPEN __USE_NEWLIB
+
+VERBOSE=${{Verbose_build items:y|n}
+VERBOSE=${{Verbose_build items:n|y}}
diff -aur --unidirectional-new-file -x '.git*' -x '*.o' -x '*.d' -x '*.elf' -x '*.lst' -x '*.map' -x '.config*' -x '*.conf' -x autoconf.h a_HTOeHw/lpc_board_ciaa_edu_4337/inc/board_api.h ./lpc_board_ciaa_edu_4337/inc/board_api.h
--- a_HTOeHw/lpc_board_ciaa_edu_4337/inc/board_api.h 1969-12-31 21:00:00.000000000 -0300
+++ ./lpc_board_ciaa_edu_4337/inc/board_api.h 2016-10-08 23:15:59.519834655 -0300
Expand Down Expand Up @@ -36321,7 +36321,7 @@ diff -aur --unidirectional-new-file -x '.git*' -x '*.o' -x '*.d' -x '*.elf' -x '
+CC=$(CROSS)gcc
+LD=$(CROSS)gcc
+SIZE=$(CROSS)size
+LIST=$(CROSS)objdump -xCedlSwz
+LIST=$(CROSS)objdump -xdS
+OBJCOPY=$(CROSS)objcopy
+GDB=$(CROSS)gdb
+OOCD=openocd
Expand Down
2 changes: 1 addition & 1 deletion templates/sAPI.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ diff -aur --unidirectional-new-file -x '.git*' -x '*.o' -x '*.d' -x '*.elf' -x '
+MODULES=app lpc_chip_43xx lpc_board_ciaa_edu_4337 sapi_bm
+DEFINES=CORE_M4 __USE_LPCOPEN __USE_NEWLIB
+
+VERBOSE=${{Verbose_build items:y|n}
+VERBOSE=${{Verbose_build items:n|y}}
diff -aur --unidirectional-new-file -x '.git*' -x '*.o' -x '*.d' -x '*.elf' -x '*.lst' -x '*.map' -x '.config*' -x '*.conf' -x autoconf.h a_SdMdjL/lpc_board_ciaa_edu_4337/inc/board_api.h ./lpc_board_ciaa_edu_4337/inc/board_api.h
--- a_SdMdjL/lpc_board_ciaa_edu_4337/inc/board_api.h 1969-12-31 21:00:00.000000000 -0300
+++ ./lpc_board_ciaa_edu_4337/inc/board_api.h 2016-10-08 23:44:36.331826200 -0300
Expand Down
2 changes: 1 addition & 1 deletion version.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "version.h"

const char *VERSION = "v0.1-rc2";
const char *VERSION = "v0.1";
const char *BUILD_DATE = __DATE__ " " __TIME__;

0 comments on commit aeeb5b4

Please sign in to comment.