From 149ceafa77840ab83c0e4ef83492bb08ae9e38d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Thu, 10 Feb 2011 14:06:53 +0000 Subject: [PATCH] * GuiSendto: allow to simply export from this dialog if no command is given. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37582 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiSendto.cpp | 17 +++++++++++------ src/frontends/qt4/ui/SendtoUi.ui | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/frontends/qt4/GuiSendto.cpp b/src/frontends/qt4/GuiSendto.cpp index 0bfb1de465..18694b28e2 100644 --- a/src/frontends/qt4/GuiSendto.cpp +++ b/src/frontends/qt4/GuiSendto.cpp @@ -33,7 +33,7 @@ namespace frontend { GuiSendTo::GuiSendTo(GuiView & lv) - : GuiDialog(lv, "sendto", qt_("Send Document to Command")) + : GuiDialog(lv, "sendto", qt_("Export or Send Document")) { setupUi(this); @@ -131,8 +131,7 @@ bool GuiSendTo::isValid() return false; return (formatLW->selectedItems().size() > 0 - && formatLW->count() != 0 - && !commandCO->currentText().isEmpty()); + && formatLW->count() != 0); } @@ -155,11 +154,17 @@ void GuiSendTo::paramsToDialog(Format const * /*format*/, QString const & comman void GuiSendTo::dispatchParams() { - if (command_.isEmpty() || !format_ || format_->name().empty()) + if (!format_ || format_->name().empty()) return; - string const data = format_->name() + " " + fromqstr(command_); - dispatch(FuncRequest(getLfun(), data)); + string data = format_->name(); + if (!command_.isEmpty()) + data += " " + fromqstr(command_); + + FuncCode const lfun = command_.isEmpty() ? + LFUN_BUFFER_EXPORT : getLfun(); + + dispatch(FuncRequest(lfun, data)); } Dialog * createGuiSendTo(GuiView & lv) { return new GuiSendTo(lv); } diff --git a/src/frontends/qt4/ui/SendtoUi.ui b/src/frontends/qt4/ui/SendtoUi.ui index 111ce46ae8..7626a855ca 100644 --- a/src/frontends/qt4/ui/SendtoUi.ui +++ b/src/frontends/qt4/ui/SendtoUi.ui @@ -108,7 +108,7 @@ - &Command: + &Send exported file to command: commandCO