summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Helfrich <helfrich9000@gmail.com>2008-01-23 14:10:05 +0000
committerBrian Helfrich <helfrich9000@gmail.com>2008-01-23 14:10:05 +0000
commit9fb72231f6ea91752bc0bd1c4f10a84720de8238 (patch)
tree662d455e223043fe80ad87c9594764817a6b47aa
parentc98d9badc15c111f8d9ab52e7a01353083f635e4 (diff)
downloadnanoengineer-9fb72231f6ea91752bc0bd1c4f10a84720de8238.tar.gz
nanoengineer-9fb72231f6ea91752bc0bd1c4f10a84720de8238.zip
Added log dock widget placeholder.
-rw-r--r--cad/plugins/NanoVision-1/src/Testing/CppUnit/KDevelop/cppunit.kdevelop26
-rw-r--r--cad/plugins/NanoVision-1/src/nv1.cpp6
2 files changed, 19 insertions, 13 deletions
diff --git a/cad/plugins/NanoVision-1/src/Testing/CppUnit/KDevelop/cppunit.kdevelop b/cad/plugins/NanoVision-1/src/Testing/CppUnit/KDevelop/cppunit.kdevelop
index de656e5a2..3f6092bff 100644
--- a/cad/plugins/NanoVision-1/src/Testing/CppUnit/KDevelop/cppunit.kdevelop
+++ b/cad/plugins/NanoVision-1/src/Testing/CppUnit/KDevelop/cppunit.kdevelop
@@ -14,8 +14,8 @@
<projectname>CppUnit</projectname>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
- <description></description>
- <defaultencoding></defaultencoding>
+ <description/>
+ <defaultencoding/>
</general>
<kdevfileview>
<groups>
@@ -68,7 +68,7 @@
<includePaths>.;</includePaths>
</codecompletion>
<creategettersetter>
- <prefixGet></prefixGet>
+ <prefixGet/>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>
@@ -121,16 +121,16 @@
</kdevdoctreeview>
<kdevdebugger>
<general>
- <dbgshell></dbgshell>
+ <dbgshell/>
<breakpoints/>
<programargs/>
<gdbpath>/usr/bin/gdb</gdbpath>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
- <configGdbScript></configGdbScript>
- <runShellScript></runShellScript>
- <runGdbScript></runGdbScript>
+ <configGdbScript/>
+ <runShellScript/>
+ <runGdbScript/>
<raiseGDBOnStart>false</raiseGDBOnStart>
</general>
<display>
@@ -143,10 +143,10 @@
<kdevtrollproject>
<run>
<mainprogram>/home/bh/11Nano/SVN-D/cad/plugins/NanoVision-1/src/Testing/CppUnit/KDevelop</mainprogram>
- <programargs></programargs>
+ <programargs/>
<directoryradio>executable</directoryradio>
<runarguments>
- <CppUnit></CppUnit>
+ <CppUnit/>
<HDF5_SimResultsImportExport/>
</runarguments>
<cwd>
@@ -154,10 +154,10 @@
<HDF5_SimResultsImportExport>/home/bh/11Nano/SVN-D/cad/plugins/NanoVision-1/src/Testing/CppUnit/KDevelop</HDF5_SimResultsImportExport>
</cwd>
<debugarguments>
- <CppUnit></CppUnit>
+ <CppUnit/>
<HDF5_SimResultsImportExport/>
</debugarguments>
- <globaldebugarguments></globaldebugarguments>
+ <globaldebugarguments/>
<globalcwd>/home/bh/11Nano/SVN-D/cad/plugins/NanoVision-1/src/Testing/CppUnit/KDevelop</globalcwd>
<useglobalprogram>false</useglobalprogram>
<terminal>false</terminal>
@@ -169,14 +169,14 @@
</envvars>
</run>
<general>
- <activedir>..</activedir>
+ <activedir>../../../Utility</activedir>
</general>
<make>
<abortonerror>true</abortonerror>
<runmultiplejobs>false</runmultiplejobs>
<numberofjobs>1</numberofjobs>
<dontact>false</dontact>
- <makebin></makebin>
+ <makebin/>
<prio>0</prio>
<envvars/>
</make>
diff --git a/cad/plugins/NanoVision-1/src/nv1.cpp b/cad/plugins/NanoVision-1/src/nv1.cpp
index f5e645c00..5f98b9182 100644
--- a/cad/plugins/NanoVision-1/src/nv1.cpp
+++ b/cad/plugins/NanoVision-1/src/nv1.cpp
@@ -22,6 +22,12 @@ nv1::nv1() : QMainWindow() {
readSettings();
setWindowTitle(tr("NanoVision-1"));
+
+ // Setup log dock widget
+ QDockWidget *dock = new QDockWidget(tr("Log"), this);
+ dock->setAllowedAreas(Qt::BottomDockWidgetArea);
+ dock->setWidget(new QLabel("log entries"));
+ addDockWidget(Qt::BottomDockWidgetArea, dock);
}