#include "GuiCommandBuffer.h"
+#include "GuiApplication.h"
#include "GuiCommandEdit.h"
#include "GuiView.h"
#include "qt_helpers.h"
#include "BufferView.h"
#include "Cursor.h"
-#include "LyXFunc.h"
+#include "LyX.h"
#include "LyXAction.h"
#include "FuncRequest.h"
#include "Session.h"
}
};
-} // end of anon
+} // namespace
GuiCommandBuffer::GuiCommandBuffer(GuiView * view)
transform(lyxaction.func_begin(), lyxaction.func_end(),
back_inserter(commands_), firster());
- QPixmap qpup(":/images/up.png");
- QPixmap qpdown(":/images/down.png");
+ QPixmap qpup = getPixmap("images/", "up", "svgz,png");
+ QPixmap qpdown = getPixmap("images/", "down", "svgz,png");
QVBoxLayout * top = new QVBoxLayout(this);
QHBoxLayout * layout = new QHBoxLayout(0);
+ edit_ = new GuiCommandEdit(this);
+ edit_->setMinimumSize(edit_->sizeHint());
+ edit_->setFocusPolicy(Qt::ClickFocus);
+
+ int height = max(24, 2 * (edit_->sizeHint().height() / 2));
+ QSize button_size = QSize(height, height);
+ QSize icon_size = button_size - QSize(4, 4);
+
upPB = new QPushButton(qpup, "", this);
upPB->setToolTip(qt_("List of previous commands"));
- upPB->setMaximumSize(24, 24);
+ upPB->setMaximumSize(button_size);
+ upPB->setIconSize(icon_size);
downPB = new QPushButton(qpdown, "", this);
downPB->setToolTip(qt_("Next command"));
- downPB->setMaximumSize(24, 24);
+ downPB->setMaximumSize(button_size);
+ downPB->setIconSize(icon_size);
downPB->setEnabled(false);
connect(downPB, SIGNAL(clicked()), this, SLOT(down()));
connect(upPB, SIGNAL(pressed()), this, SLOT(listHistoryUp()));
- edit_ = new GuiCommandEdit(this);
- edit_->setMinimumSize(edit_->sizeHint());
- edit_->setFocusPolicy(Qt::ClickFocus);
-
- connect(edit_, SIGNAL(escapePressed()), this, SLOT(cancel()));
connect(edit_, SIGNAL(returnPressed()), this, SLOT(dispatch()));
connect(edit_, SIGNAL(tabPressed()), this, SLOT(complete()));
connect(edit_, SIGNAL(upPressed()), this, SLOT(up()));
connect(edit_, SIGNAL(downPressed()), this, SLOT(down()));
- connect(edit_, SIGNAL(hidePressed()), this, SLOT(hideParent()));
+ connect(edit_, SIGNAL(escapePressed()), this, SLOT(hideParent()));
layout->addWidget(upPB, 0);
layout->addWidget(downPB, 0);
top->setMargin(0);
setFocusProxy(edit_);
- LastCommandsSection::LastCommands last_commands
+ LastCommandsSection::LastCommands last_commands
= theSession().lastCommands().getcommands();
- LastCommandsSection::LastCommands::const_iterator it
+ LastCommandsSection::LastCommands::const_iterator it
= last_commands.begin();
- LastCommandsSection::LastCommands::const_iterator end
+ LastCommandsSection::LastCommands::const_iterator end
= last_commands.end();
upPB->setEnabled(it != end);
}
-void GuiCommandBuffer::cancel()
-{
- view_->setFocus();
- edit_->setText(QString());
-}
-
-
void GuiCommandBuffer::dispatch()
{
- QString cmd = edit_->text();
- view_->setFocus();
- edit_->setText(QString());
- edit_->clearFocus();
- std::string const cmd_ = fromqstr(cmd);
- theSession().lastCommands().add(cmd_);
- dispatch(cmd_);
+ std::string const cmd = fromqstr(edit_->text());
+ if (!cmd.empty())
+ theSession().lastCommands().add(cmd);
+ DispatchResult const & dr = dispatch(cmd);
+ if (!dr.error()) {
+ view_->setFocus();
+ edit_->setText(QString());
+ edit_->clearFocus();
+ // If the toolbar was "auto", it is not needed anymore
+ view_->resetCommandExecute();
+ }
}
listBox->move(pos.x(), y);
connect(listBox, SIGNAL(itemClicked(QListWidgetItem *)),
- this, SLOT(item_selected(QListWidgetItem *)));
+ this, SLOT(itemSelected(QListWidgetItem *)));
connect(listBox, SIGNAL(itemActivated(QListWidgetItem *)),
- this, SLOT(item_selected(QListWidgetItem *)));
+ this, SLOT(itemSelected(QListWidgetItem *)));
listBox->show();
listBox->setFocus();
}
-void GuiCommandBuffer::item_selected(QListWidgetItem * item)
+void GuiCommandBuffer::itemSelected(QListWidgetItem * item)
{
QWidget const * widget = static_cast<QWidget const *>(sender());
const_cast<QWidget *>(widget)->hide();
void GuiCommandBuffer::up()
{
- string const input = fromqstr(edit_->text());
string const h = historyUp();
if (!h.empty())
void GuiCommandBuffer::down()
{
- string const input = fromqstr(edit_->text());
string const h = historyDown();
if (!h.empty())
edit_->setText(toqstr(h));
- downPB->setEnabled(history_pos_ != history_.end()-1);
+ downPB->setEnabled(!history_.empty()
+ && history_pos_ != history_.end() - 1);
upPB->setEnabled(history_pos_ != history_.begin());
}
-
+
void GuiCommandBuffer::hideParent()
{
view_->setFocus();
+ view_->resetCommandExecute();
edit_->setText(QString());
edit_->clearFocus();
- hide();
}
bool operator()(string const & s) const { return prefixIs(s, p); }
};
-} // end of anon namespace
+} // namespace
string const GuiCommandBuffer::historyUp()
}
-docstring const GuiCommandBuffer::getCurrentState() const
-{
- return view_->view()->cursor().currentState();
-}
-
-
-void GuiCommandBuffer::hide() const
-{
- FuncRequest cmd(LFUN_COMMAND_EXECUTE, "off");
- theLyXFunc().setLyXView(view_);
- lyx::dispatch(cmd);
-}
-
-
vector<string> const
GuiCommandBuffer::completions(string const & prefix, string & new_prefix)
{
vector<string> comp;
- copy_if(commands_.begin(), commands_.end(),
+ lyx::copy_if(commands_.begin(), commands_.end(),
back_inserter(comp), prefix_p(prefix));
if (comp.empty()) {
test += tmp[test.length()];
while (test.length() < tmp.length()) {
vector<string> vtmp;
- copy_if(comp.begin(), comp.end(),
+ lyx::copy_if(comp.begin(), comp.end(),
back_inserter(vtmp), prefix_p(test));
if (vtmp.size() != comp.size()) {
test.erase(test.length() - 1);
}
-void GuiCommandBuffer::dispatch(string const & str)
+DispatchResult const & GuiCommandBuffer::dispatch(string const & str)
{
- if (str.empty())
- return;
+ if (str.empty()) {
+ static DispatchResult empty_dr;
+ return empty_dr;
+ }
history_.push_back(trim(str));
history_pos_ = history_.end();
upPB->setEnabled(history_pos_ != history_.begin());
downPB->setEnabled(history_pos_ != history_.end());
FuncRequest func = lyxaction.lookupFunc(str);
- func.origin = FuncRequest::COMMANDBUFFER;
- theLyXFunc().setLyXView(view_);
- lyx::dispatch(func);
+ func.setOrigin(FuncRequest::COMMANDBUFFER);
+ return lyx::dispatch(func);
}
} // namespace frontend
projects / lyx.git / blobdiff