feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: add a line edit to the log input pane

Browse Source 
That should make the possibility to use it as input more obvious.
This commit is contained in:
hjk
2011-02-16 12:12:09 +01:00
parent 467c13e11c
commit e360083427
2 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/plugins/debugger/logwindow.cpp
View File

@@ -42,6 +42,8 @@
#include <QtGui/QHBoxLayout> #include <QtGui/QHBoxLayout>
#include <QtGui/QVBoxLayout> #include <QtGui/QVBoxLayout>
#include <QtGui/QLabel>
#include <QtGui/QLineEdit>
#include <QtGui/QKeyEvent> #include <QtGui/QKeyEvent>
#include <QtGui/QMenu> #include <QtGui/QMenu>
#include <QtGui/QSpacerItem> #include <QtGui/QSpacerItem>
@@ -351,18 +353,38 @@ LogWindow::LogWindow(QWidget *parent)
QSplitter *m_splitter = new Core::MiniSplitter(Qt::Horizontal); QSplitter *m_splitter = new Core::MiniSplitter(Qt::Horizontal);
m_splitter->setParent(this); m_splitter->setParent(this);
// mixed input/output
// Mixed input/output.
m_combinedText = new CombinedPane(this); m_combinedText = new CombinedPane(this);
m_combinedText->setReadOnly(true); m_combinedText->setReadOnly(true);
m_combinedText->setReadOnly(false); m_combinedText->setReadOnly(false);
m_combinedText->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); m_combinedText->setSizePolicy(QSizePolicy::MinimumExpanding,
QSizePolicy::MinimumExpanding);
// input only // Input only.
m_inputText = new InputPane(this); m_inputText = new InputPane(this);
m_inputText->setReadOnly(false); m_inputText->setReadOnly(false);
m_inputText->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); m_inputText->setSizePolicy(QSizePolicy::MinimumExpanding,
QSizePolicy::MinimumExpanding);
m_splitter->addWidget(m_inputText); m_commandLabel = new QLabel(tr("Command:"), this);
m_commandEdit = new QLineEdit(this);
QHBoxLayout *commandBox = new QHBoxLayout;
commandBox->addWidget(m_commandLabel);
commandBox->addWidget(m_commandEdit);
commandBox->setMargin(2);
commandBox->setSpacing(6);
QVBoxLayout *leftBox = new QVBoxLayout;
leftBox->addWidget(m_inputText);
leftBox->addItem(commandBox);
leftBox->setMargin(0);
leftBox->setSpacing(0);
QWidget *leftDummy = new QWidget;
leftDummy->setLayout(leftBox);
m_splitter->addWidget(leftDummy);
m_splitter->addWidget(m_combinedText); m_splitter->addWidget(m_combinedText);
m_splitter->setStretchFactor(0, 1); m_splitter->setStretchFactor(0, 1);
m_splitter->setStretchFactor(1, 3); m_splitter->setStretchFactor(1, 3);
@@ -383,9 +405,16 @@ LogWindow::LogWindow(QWidget *parent)
aggregate->add(new Find::BaseTextFind(m_inputText)); aggregate->add(new Find::BaseTextFind(m_inputText));
connect(m_inputText, SIGNAL(statusMessageRequested(QString,int)), connect(m_inputText, SIGNAL(statusMessageRequested(QString,int)),
this, SIGNAL(statusMessageRequested(QString,int))); SIGNAL(statusMessageRequested(QString,int)));
connect(m_inputText, SIGNAL(commandSelected(int)), connect(m_inputText, SIGNAL(commandSelected(int)),
m_combinedText, SLOT(gotoResult(int))); m_combinedText, SLOT(gotoResult(int)));
connect(m_commandEdit, SIGNAL(returnPressed()),
SLOT(sendCommand()));
}
void LogWindow::sendCommand()
{
debuggerCore()->action(ExecuteCommand)->trigger(m_commandEdit->text());
} }
void LogWindow::showOutput(int channel, const QString &output) void LogWindow::showOutput(int channel, const QString &output)

3
src/plugins/debugger/logwindow.h
View File

@@ -38,6 +38,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QCursor; class QCursor;
class QLabel;
class QLineEdit; class QLineEdit;
class QPlainTextEdit; class QPlainTextEdit;
QT_END_NAMESPACE QT_END_NAMESPACE
@@ -63,6 +64,7 @@ public:
public slots: public slots:
void clearContents(); void clearContents();
void sendCommand();
void showOutput(int channel, const QString &output); void showOutput(int channel, const QString &output);
void showInput(int channel, const QString &input); void showInput(int channel, const QString &input);
@@ -74,6 +76,7 @@ private:
QPlainTextEdit *m_combinedText; // combined input/output QPlainTextEdit *m_combinedText; // combined input/output
QPlainTextEdit *m_inputText; // scriptable input alone QPlainTextEdit *m_inputText; // scriptable input alone
QLineEdit *m_commandEdit; QLineEdit *m_commandEdit;
QLabel *m_commandLabel;
}; };