vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Quick and dirty fixup

master
Marius Kintel 2014-06-06 20:52:38 -04:00 committed by Torsten Paul
parent 59a71b7e6e
commit 22e884d08f
6 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openscad.pro
View File

@ -84,6 +84,8 @@ else {
TARGET = openscad TARGET = openscad
} }
LIBS += -lqscintilla2
win* { win* {
RC_FILE = openscad_win32.rc RC_FILE = openscad_win32.rc
QTPLUGIN += qtaccessiblewidgets QTPLUGIN += qtaccessiblewidgets

2
setenv_mac-qt4.sh
View File

@ -1,4 +1,4 @@
export OPENSCAD_LIBRARIES=$PWD/../libraries/install export OPENSCAD_LIBRARIES=$PWD/../libraries/install-qt4
export DYLD_LIBRARY_PATH=$OPENSCAD_LIBRARIES/lib export DYLD_LIBRARY_PATH=$OPENSCAD_LIBRARIES/lib
export DYLD_FRAMEWORK_PATH=$OPENSCAD_LIBRARIES/lib export DYLD_FRAMEWORK_PATH=$OPENSCAD_LIBRARIES/lib
export QMAKESPEC=unsupported/macx-clang export QMAKESPEC=unsupported/macx-clang

26
src/MainWindow.ui
View File

@ -120,7 +120,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>936</width> <width>936</width>
<height>34</height> <height>22</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menu_File"> <widget class="QMenu" name="menu_File">
@ -360,25 +360,6 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="Editor" name="editor" native="true">
<property name="minimumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
<property name="font">
<font>
<family>Monaco</family>
<pointsize>8</pointsize>
</font>
</property>
<property name="focusPolicy">
<enum>Qt::WheelFocus</enum>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>
@ -969,11 +950,6 @@
<header>QGLView.h</header> <header>QGLView.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>Editor</class>
<extends>QWidget</extends>
<header>editor.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../openscad.qrc"/> <include location="../openscad.qrc"/>

7
src/mainwin.cc
View File

@ -167,11 +167,12 @@ MainWindow::MainWindow(const QString &filename)
: root_inst("group"), font_list_dialog(NULL), tempFile(NULL), progresswidget(NULL) : root_inst("group"), font_list_dialog(NULL), tempFile(NULL), progresswidget(NULL)
{ {
setupUi(this); setupUi(this);
legacy = new LegacyEditor(editorDockContents); // legacy = new LegacyEditor(editorDockContents);
editor = legacy; // editor = legacy;
scintilla = new ScintillaEditor(editorDockContents); scintilla = new ScintillaEditor(editorDockContents);
//editor = scintilla; editor = scintilla;
editorDockContents->layout()->addWidget(editor);
editor->setMinimumSize(editorDockContents->sizeHint()); editor->setMinimumSize(editorDockContents->sizeHint());
setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea); setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);

4
src/scintillaeditor.cpp
View File

@ -2,6 +2,8 @@
ScintillaEditor::ScintillaEditor(QWidget *parent) : Editor(parent) ScintillaEditor::ScintillaEditor(QWidget *parent) : Editor(parent)
{ {
qsci = new QsciScintilla; layout = new QVBoxLayout(this);
qsci = new QsciScintilla(this);;
layout->addWidget(qsci);
qsci->setMarginLineNumbers(10,true); qsci->setMarginLineNumbers(10,true);
} }

2
src/scintillaeditor.h
View File

@ -4,6 +4,7 @@
#include <QObject> #include <QObject>
#include <QWidget> #include <QWidget>
#include <Qsci/qsciscintilla.h> #include <Qsci/qsciscintilla.h>
#include <QVBoxLayout>
#include "editor.h" #include "editor.h"
@ -12,6 +13,7 @@ class ScintillaEditor : public Editor
public: public:
ScintillaEditor(QWidget *parent); ScintillaEditor(QWidget *parent);
QsciScintilla *qsci; QsciScintilla *qsci;
QVBoxLayout *layout;
}; };
#endif // SCINTILLAEDITOR_H #endif // SCINTILLAEDITOR_H