jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:openscad/openscad

Browse source
This commit is contained in:
Marius Kintel 2015-12-01 22:43:58 -05:00
commit 701faecf49
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/MainWindow.ui
View file

@ -394,6 +394,7 @@
</widget>
<widget class="QStatusBar" name="statusbar"/>
<widget class="Dock" name="editorDock">
<addaction name="editActionRedo_2"/>
<attribute name="dockWidgetArea">
<number>1</number>
</attribute>
@ -642,6 +643,14 @@
<enum>Qt::WidgetWithChildrenShortcut</enum>
</property>
</action>
<action name="editActionRedo_2">
<property name="shortcut">
<string>Ctrl+Y</string>
</property>
<property name="shortcutContext">
<enum>Qt::WidgetWithChildrenShortcut</enum>
</property>
</action>
<action name="editActionCut">
<property name="text">
<string>Cu&amp;t</string>

1
src/mainwin.cc
View file

@ -337,6 +337,7 @@ MainWindow::MainWindow(const QString &filename)
// Edit menu
connect(this->editActionUndo, SIGNAL(triggered()), editor, SLOT(undo()));
connect(this->editActionRedo, SIGNAL(triggered()), editor, SLOT(redo()));
connect(this->editActionRedo_2, SIGNAL(triggered()), editor, SLOT(redo()));
connect(this->editActionCut, SIGNAL(triggered()), editor, SLOT(cut()));
connect(this->editActionCopy, SIGNAL(triggered()), editor, SLOT(copy()));
connect(this->editActionPaste, SIGNAL(triggered()), editor, SLOT(paste()));

1
src/scintillaeditor.cpp
View file

@ -134,6 +134,7 @@ ScintillaEditor::ScintillaEditor(QWidget *parent) : EditorInterface(parent)
// Ctrl-Shift-Z should redo on all platforms
c = qsci->standardCommands()->find(QsciCommand::Redo);
c->setKey(Qt::Key_Z | Qt::CTRL | Qt::SHIFT);
c->setAlternateKey(Qt::Key_Y | Qt::CTRL);
scintillaLayout->setContentsMargins(0, 0, 0, 0);
scintillaLayout->addWidget(qsci);