suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0000530: Python Console allows editing of history

Browse Source 
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5258 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
wmayer 2011-12-10 18:40:03 +00:00
parent c1b91f6f11
commit 0748b1fa77
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Gui/PythonConsole.cpp
View File

@ -69,7 +69,7 @@ struct PythonConsoleP
InteractiveInterpreter* interpreter;
CallTipsList* callTipsList;
ConsoleHistory history;
QString output, error;
QString output, error, info;
QStringList statements;
bool interactive;
QMap<QString, QColor> colormap; // Color map
@ -388,9 +388,10 @@ PythonConsole::PythonConsole(QWidget *parent)
const char* version = PyString_AsString(PySys_GetObject("version"));
const char* platform = PyString_AsString(PySys_GetObject("platform"));
d->output = QString::fromAscii("Python %1 on %2\n"
d->info = QString::fromAscii("Python %1 on %2\n"
"Type 'help', 'copyright', 'credits' or 'license' for more information.")
.arg(QString::fromAscii(version)).arg(QString::fromAscii(platform));
d->output = d->info;
printPrompt(false);
}
@ -467,8 +468,17 @@ void PythonConsole::keyPressEvent(QKeyEvent * e)
break;
default:
if (e->text().isEmpty() || e->matches( QKeySequence::Copy ))
{ TextEdit::keyPressEvent(e); }
if (e->text().isEmpty() ||
e->matches(QKeySequence::Copy) ||
e->matches(QKeySequence::SelectAll)) {
TextEdit::keyPressEvent(e);
}
else if (!e->text().isEmpty() &&
(e->modifiers() == Qt::NoModifier ||
e->modifiers() == Qt::ShiftModifier)) {
this->moveCursor(QTextCursor::End);
TextEdit::keyPressEvent(e);
}
break;
}
}
@ -1022,6 +1032,12 @@ void PythonConsole::contextMenuEvent ( QContextMenuEvent * e )
{
QMenu menu(this);
QAction *a;
// construct reference cursor at begin of input line ...
QTextCursor cursor = this->textCursor();
QTextCursor inputLineBegin = cursor;
inputLineBegin.movePosition(QTextCursor::End);
inputLineBegin.movePosition(QTextCursor::StartOfLine);
inputLineBegin.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor, promptLength);
a = menu.addAction(tr("&Copy"), this, SLOT(copy()), Qt::CTRL+Qt::Key_C);
a->setEnabled(textCursor().hasSelection());
@ -1036,13 +1052,17 @@ void PythonConsole::contextMenuEvent ( QContextMenuEvent * e )
a->setEnabled(!d->history.isEmpty());
menu.addSeparator();
a = menu.addAction(tr("&Paste"), this, SLOT(paste()), Qt::CTRL+Qt::Key_V);
const QMimeData *md = QApplication::clipboard()->mimeData();
a->setEnabled(md && canInsertFromMimeData(md));
a->setEnabled(cursor >= inputLineBegin && md && canInsertFromMimeData(md));
a = menu.addAction(tr("Select All"), this, SLOT(selectAll()), Qt::CTRL+Qt::Key_A);
a->setEnabled(!document()->isEmpty());
a = menu.addAction(tr("Clear console"), this, SLOT(onClearConsole()));
a->setEnabled(!document()->isEmpty());
menu.addSeparator();
menu.addAction( tr("Insert file name..."), this, SLOT(onInsertFileName()));
menu.addSeparator();
@ -1058,6 +1078,13 @@ void PythonConsole::contextMenuEvent ( QContextMenuEvent * e )
}
}
void PythonConsole::onClearConsole()
{
clear();
d->output = d->info;
printPrompt(false);
}
void PythonConsole::onSaveHistoryAs()
{
QString cMacroPath = QString::fromUtf8(getDefaultParameter()->GetGroup( "Macro" )->

1
src/Gui/PythonConsole.h
View File

@ -107,6 +107,7 @@ public Q_SLOTS:
void onInsertFileName();
void onCopyHistory();
void onCopyCommand();
void onClearConsole();
private Q_SLOTS:
void visibilityChanged (bool visible);