mirror of https://github.com/vitalif/openscad
Quick and dirty fixup
parent
59a71b7e6e
commit
22e884d08f
|
@ -84,6 +84,8 @@ else {
|
|||
TARGET = openscad
|
||||
}
|
||||
|
||||
LIBS += -lqscintilla2
|
||||
|
||||
win* {
|
||||
RC_FILE = openscad_win32.rc
|
||||
QTPLUGIN += qtaccessiblewidgets
|
||||
|
|
|
@ -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_FRAMEWORK_PATH=$OPENSCAD_LIBRARIES/lib
|
||||
export QMAKESPEC=unsupported/macx-clang
|
||||
|
|
|
@ -120,7 +120,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>936</width>
|
||||
<height>34</height>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<widget class="QMenu" name="menu_File">
|
||||
|
@ -360,25 +360,6 @@
|
|||
</layout>
|
||||
</widget>
|
||||
</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>
|
||||
</widget>
|
||||
</widget>
|
||||
|
@ -969,11 +950,6 @@
|
|||
<header>QGLView.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>Editor</class>
|
||||
<extends>QWidget</extends>
|
||||
<header>editor.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources>
|
||||
<include location="../openscad.qrc"/>
|
||||
|
|
|
@ -167,11 +167,12 @@ MainWindow::MainWindow(const QString &filename)
|
|||
: root_inst("group"), font_list_dialog(NULL), tempFile(NULL), progresswidget(NULL)
|
||||
{
|
||||
setupUi(this);
|
||||
legacy = new LegacyEditor(editorDockContents);
|
||||
editor = legacy;
|
||||
// legacy = new LegacyEditor(editorDockContents);
|
||||
// editor = legacy;
|
||||
|
||||
scintilla = new ScintillaEditor(editorDockContents);
|
||||
//editor = scintilla;
|
||||
editor = scintilla;
|
||||
editorDockContents->layout()->addWidget(editor);
|
||||
editor->setMinimumSize(editorDockContents->sizeHint());
|
||||
|
||||
setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
|
||||
ScintillaEditor::ScintillaEditor(QWidget *parent) : Editor(parent)
|
||||
{
|
||||
qsci = new QsciScintilla;
|
||||
layout = new QVBoxLayout(this);
|
||||
qsci = new QsciScintilla(this);;
|
||||
layout->addWidget(qsci);
|
||||
qsci->setMarginLineNumbers(10,true);
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
#include <QObject>
|
||||
#include <QWidget>
|
||||
#include <Qsci/qsciscintilla.h>
|
||||
#include <QVBoxLayout>
|
||||
|
||||
#include "editor.h"
|
||||
|
||||
|
@ -12,6 +13,7 @@ class ScintillaEditor : public Editor
|
|||
public:
|
||||
ScintillaEditor(QWidget *parent);
|
||||
QsciScintilla *qsci;
|
||||
QVBoxLayout *layout;
|
||||
};
|
||||
|
||||
#endif // SCINTILLAEDITOR_H
|
||||
|
|
Loading…
Reference in New Issue