John's character.C patch (bug fix).

[lyx.git] / src / frontends / controllers / ControlCommand.C

diff --git a/src/frontends/controllers/ControlCommand.C b/src/frontends/controllers/ControlCommand.C
index 1ed0c12fa68ef2a1f86685f76b2909825664df7d..9a81d08cc6d7f4dff15cc78542a0191af835801a 100644 (file)
--- a/src/frontends/controllers/ControlCommand.C
+++ b/src/frontends/controllers/ControlCommand.C
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
@@ -18,96 +17,45 @@
 
 #include <config.h>
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlCommand.h"
-#include "BufferView.h"
+#include "buffer.h"
 #include "Dialogs.h"
-#include "lyxfunc.h"
 #include "LyXView.h"
-#include "support/LAssert.h"
+#include "lyxfunc.h"
+#include "BufferView.h"
 
 ControlCommand::ControlCommand(LyXView & lv, Dialogs & d, kb_action ac)
-       : ControlInset<InsetCommand>(lv, d),
-         params_(0), action_(ac)
+       : ControlInset<InsetCommand, InsetCommandParams>(lv, d),
+         action_(ac)
 {}
 
 
-void ControlCommand::showInset(InsetCommand * inset)
-{
-       if (inset == 0) return;  // maybe we should Assert this?
-
-       connectInset(inset);
-       show(inset->params());
-}
-
-
-void ControlCommand::createInset(string const & arg)
+InsetCommandParams const ControlCommand::getParams(string const & arg)
 {
-       connectInset();
-
-       if ( !arg.empty() )
-               bc().valid(); // so that the user can press Ok
-
        InsetCommandParams params;
        params.setFromString(arg);
-       show(params);
+       return params;
 }
 
 
-void ControlCommand::update()
+InsetCommandParams const ControlCommand::getParams(InsetCommand const & inset)
 {
-       if (params_) delete params_;
-
-       if (inset_)
-               params_ = new InsetCommandParams(inset_->params());
-       else
-               params_ = new InsetCommandParams;
-
-       bc().readOnly(isReadonly());
-       view().update();
+       return inset.params();
 }
 
 
-void ControlCommand::show(InsetCommandParams const & params)
+void ControlCommand::applyParamsToInset()
 {
-       if (params_) delete params_;
-       params_ = new InsetCommandParams(params);
-
-       bc().readOnly(isReadonly());
-       view().show();
+       inset()->setParams(params());
+       lv_.view()->updateInset(inset(), true);
 }
 
 
-void ControlCommand::hide()
+void ControlCommand::applyParamsNoInset()
 {
-       if (params_) {
-               delete params_;
-               params_ = 0;
-       }
-
-       clearParams();
-
-       disconnect();
-       view().hide();
+       if (action_ == LFUN_NOACTION) return;
+       lv_.getLyXFunc()->dispatch(action_, params().getAsString());
 }
 
-InsetCommandParams & ControlCommand::params() const
-{
-       Assert(params_);
-       return *params_;
-}
-
-
-void ControlCommand::apply()
-{
-       view().apply();
-
-       if (inset_) {
-               // Only update if contents have changed
-               if (params() != inset_->params()) {
-                       inset_->setParams(params());
-                       lv_.view()->updateInset(inset_, true);
-               }
-       } else if (action_ != LFUN_NOACTION){
-               lv_.getLyXFunc()->Dispatch(action_, params().getAsString());
-       }
-}