merge booktabs branch

[lyx.git] / src / frontends / xforms / FormSendto.C

diff --git a/src/frontends/xforms/FormSendto.C b/src/frontends/xforms/FormSendto.C
index 6ace8e2078ac9968f28ca85629caf1325518499b..3784475a887adca11785eabd859ee6d60feb60b6 100644 (file)
--- a/src/frontends/xforms/FormSendto.C
+++ b/src/frontends/xforms/FormSendto.C
@@ -1,52 +1,62 @@
-/*
+/**
  * \file FormSendto.C
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Angus Leeming, a.leeming@ic.ac.uk
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "FormSendto.h"
-#include "form_sendto.h"
 #include "ControlSendto.h"
-#include "xformsBC.h"
+#include "forms/form_sendto.h"
+
 #include "Tooltips.h"
 #include "xforms_helpers.h"
-#include "converter.h"
-#include "gettext.h"
+#include "xformsBC.h"
+
+#include "format.h"
+
+#include "support/lstrings.h"
+
+#include "lyx_forms.h"
 
 using std::vector;
+using std::string;
+
+namespace lyx {
 
-typedef FormCB<ControlSendto, FormDB<FD_form_sendto> > base_class;
+using support::trim;
 
-FormSendto::FormSendto(ControlSendto & c)
-       : base_class(c, _("Send document to command"))
+namespace frontend {
+
+typedef FormController<ControlSendto, FormView<FD_sendto> > base_class;
+
+FormSendto::FormSendto(Dialog & parent)
+       : base_class(parent, _("Send Document to Command"))
 {}
 
 
 void FormSendto::build()
 {
-       dialog_.reset(build_sendto());
+       dialog_.reset(build_sendto(this));
 
        fl_set_input_return(dialog_->input_command, FL_RETURN_CHANGED);
        setPrehandler(dialog_->input_command);
 
-        // Manage the ok, apply, restore and cancel/close buttons
-       bc().setOK(dialog_->button_ok);
-       bc().setApply(dialog_->button_apply);
-       bc().setCancel(dialog_->button_close);
+       // Manage the ok, apply, restore and cancel/close buttons
+       bcview().setOK(dialog_->button_ok);
+       bcview().setApply(dialog_->button_apply);
+       bcview().setCancel(dialog_->button_close);
 
        // Set up the tooltip mechanism
-       string str = N_("Export the buffer to this format before running the command below on it.");
+       string str = _("Export the buffer to this format before running the command below on it.");
        tooltips().init(dialog_->browser_formats, str);
 
-       str = N_("Run this command on the buffer exported to the chosen format. $$FName will be replaced by the name of this file.");
+       str = _("Run this command on the buffer exported to the chosen format. $$FName will be replaced by the name of this file.");
        tooltips().init(dialog_->input_command, str);
 }
 
@@ -68,7 +78,7 @@ void FormSendto::update()
        }
 
        vector<string> const browser_keys =
-               getVectorFromBrowser(dialog_->browser_formats);
+               getVector(dialog_->browser_formats);
 
        if (browser_keys == keys)
                return;
@@ -91,8 +101,8 @@ ButtonPolicy::SMInput FormSendto::input(FL_OBJECT *, long)
        if (line < 1 || line > fl_get_browser_maxline(dialog_->browser_formats))
                return ButtonPolicy::SMI_INVALID;
 
-       string cmd = getStringFromInput(dialog_->input_command);
-       cmd = strip(frontStrip(cmd));
+       string cmd = getString(dialog_->input_command);
+       cmd = trim(cmd);
        if (cmd.empty())
                return ButtonPolicy::SMI_INVALID;
 
@@ -106,8 +116,11 @@ void FormSendto::apply()
        if (line < 1 || line > fl_get_browser_maxline(dialog_->browser_formats))
                return;
 
-       string const cmd = getStringFromInput(dialog_->input_command);
+       string const cmd = getString(dialog_->input_command);
 
        controller().setFormat(all_formats_[line-1]);
        controller().setCommand(cmd);
 }
+
+} // namespace frontend
+} // namespace lyx