fix compilation pb ; update eu.po

[lyx.git] / src / insets / insetcommand.h

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index 87c7e4049542960e3930fe4658c8ce5191948922..99f0592dd8ac7ddeedc33c058019e4e0b49bbcf0 100644 (file)
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -16,8 +16,9 @@
 #pragma interface
 #endif
 
-#include "lyxinset.h"
-#include "LString.h"
+#include "insetbutton.h"
+#include <sigc++/signal_system.h>
+#include <boost/utility.hpp>
 
 // Created by Alejandro 970222
 /** Used to insert a LaTeX command automatically
@@ -25,42 +26,80 @@
  * Similar to InsetLaTeX but having control of the basic structure of a
  *   LaTeX command: \name[options]{contents}. 
  */
-class InsetCommand: public Inset {
+class InsetCommandParams {
 public:
        ///
-       InsetCommand();
+       InsetCommandParams();
        ///
-       InsetCommand(string const & name, string const & arg = string(), 
-                    string const & opt = string());
+       explicit
+       InsetCommandParams( string const & n,
+                           string const & c = string(),
+                           string const & o = string());
        ///
-       int ascent(Painter &, LyXFont const &) const;
+       bool operator==(InsetCommandParams const &) const;
        ///
-       int descent(Painter &, LyXFont const &) const;
+       bool operator!=(InsetCommandParams const &) const;
        ///
-       int width(Painter &, LyXFont const &) const;
+       void Read(LyXLex &);
+       /// Parse the command
+       void scanCommand(string const &);
        ///
-       void draw(Painter &, LyXFont const &, int baseline, float & x) const;
+       void Write(std::ostream &) const;
+       /// Build the complete LaTeX command
+       string const getCommand() const;
+       ///
+       string const & getCmdName() const { return cmdname; }
+       ///
+       string const & getOptions() const { return options; }
+       ///
+       string const & getContents() const { return contents; }
+       ///
+       void setCmdName( string const & n) { cmdname = n; }
        ///
-       void Write(ostream &);
-       /// Parse the command.
-       void scanCommand(string const & cmd);
-       /// Will not be used when lyxf3
-       void Read(LyXLex & lex);
+       void setOptions(string const & o) { options = o; }
+       ///
+       void setContents(string const & c) { contents = c; }
+       ///
+       string const getAsString() const;
+       ///
+       void setFromString( string const & );
+private:
+       ///    
+       string cmdname;
+       ///    
+       string contents;
+       ///    
+       string options;
+};
+
+
+///
+class InsetCommand : public InsetButton, boost::noncopyable {
+public:
+       ///
+       explicit
+       InsetCommand(InsetCommandParams const &);
+       ///
+       virtual ~InsetCommand() { hideDialog(); }
+       ///
+       void Write(Buffer const *, std::ostream & os) const
+               { p_.Write( os ); }
+       ///
+       virtual void Read(Buffer const *, LyXLex & lex)
+               { p_.Read( lex ); }
+       /// Can remove one InsetBibKey is modified
+       void scanCommand(string const & c) { p_.scanCommand( c ); };
        /// 
-       virtual int Latex(ostream &, signed char fragile);
+       virtual int Latex(Buffer const *, std::ostream &,
+                         bool fragile, bool free_spc) const;
        ///
-       virtual int Latex(string & file, signed char fragile);
+       int Ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       virtual int Linuxdoc(string & file);
+       virtual int Linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       virtual int DocBook(string & file);
+       virtual int DocBook(Buffer const *, std::ostream &) const;
        ///
-       Inset * Clone() const;
-       ///  
-       Inset::Code LyxCode() const
-       {
-               return Inset::NO_CODE;
-       }
+       Inset::Code LyxCode() const { return Inset::NO_CODE; }
        
        /** Get the label that appears at screen.
          
@@ -68,44 +107,30 @@ public:
          confusion with lyxinset::getLabel(int), but I've seen that
          it wasn't. I hope you never confuse again both methods.  (ale)
         */
-       virtual string getScreenLabel() const
-       {
-               return getCommand();
-       }
-       
-       /// Build the complete LaTeX command
-       string getCommand() const;
+       virtual string const getScreenLabel() const = 0;
        ///
-       string const & getCmdName() const {
-               return command;
-       }
+       string const getCommand() const { return p_.getCommand(); }
        ///
-       string const & getOptions() const {
-               return options;
-       }
+       string const & getCmdName() const { return p_.getCmdName(); }
        ///
-       string const & getContents() const {
-               return contents;
-       }
+       string const & getOptions() const { return p_.getOptions(); }
        ///
-       void setCmdName(string const & n) {
-               command = n;
-       }
+       string const & getContents() const { return p_.getContents(); }
        ///
-       void setOptions(string const & o) {
-               options = o;
-       }
+       void setCmdName(string const & n) { p_.setCmdName(n); }
        ///
-       virtual void setContents(string const & c) {
-               contents = c;
-       }
-protected:
-       ///    
-       string command;
-       ///    
-       string options;
-       ///    
-       string contents;
+       void setOptions(string const & o) { p_.setOptions(o); }
+       ///
+       void setContents(string const & c) { p_.setContents(c); }
+       ///
+       InsetCommandParams const & params() const { return p_; }
+       ///
+       void setParams(InsetCommandParams const &);
+       ///
+       SigC::Signal0<void> hideDialog;
+private:
+       ///
+       InsetCommandParams p_;
 };
 
 #endif