fix compilation pb ; update eu.po

[lyx.git] / src / lyxfunc.h

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index fb88aa29761a47999f661e2181855cfb23404d52..f8a85d0f18beb5ea73d24bc2d691ef7511abad59 100644 (file)
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -2,10 +2,13 @@
 #ifndef LYXFUNC_H
 #define LYXFUNC_H
 
+#include <sigc++/signal_system.h>
+
 #ifdef __GNUG__
 #pragma interface
 #endif
 
+#include FORMS_H_LOCATION
 #include "commandtags.h"
 #include "kbsequence.h"
 #include "insets/lyxinset.h"
@@ -13,37 +16,51 @@
 
 class LyXView;
 
+
 /** This class encapsulates all the LyX command operations. 
     This is the class of the LyX's "high level event handler".
     Every user command is processed here, either invocated from
     keyboard or from the GUI. All GUI objects, including buttons and
     menus should use this class and never call kernel functions directly.
 */
-class LyXFunc {
+class LyXFunc : public SigC::Object {
 public:
        /// The status of a function.
        enum func_status {
-               OK = 0, // No problem
+               /// No problem
+               OK = 0,
+               ///
                Unknown = 1,
-               Disabled = 2, // Command cannot be executed
+               /// Command cannot be executed
+               Disabled = 2,
+               ///
                ToggleOn = 4,
+               ///
                ToggleOff = 8
        };
        ///
        explicit
        LyXFunc(LyXView *);
     
-       /// LyX distpatcher, executes lyx actions.
-       string Dispatch(int action, char const * arg = 0);
+       /// LyX dispatcher, executes lyx actions.
+       string const Dispatch(int action, string const & arg = string());
                         
        /// The same but uses the name of a lyx command.
-       string Dispatch(string const & cmd);
+       string const Dispatch(string const & cmd);
 
-       /// A keyboard event is processed to execute a lyx action. 
-       int  processKeyEvent(XEvent * ev);
+       ///
+       void miniDispatch(string const & cmd);
 
        ///
+       void initMiniBuffer();
+               
+       ///
+       int processKeySym(KeySym k, unsigned int state);
+
+       /// we need one internall which is called from inside LyXAction and
+       /// can contain the string argument.
        func_status getStatus(int ac) const;
+       func_status getStatus(int ac, string const & not_to_use_arg) const;
        
        /// The last key was meta
        bool wasMetaKey() const;
@@ -51,13 +68,13 @@ public:
        // These can't be global because are part of the
        // internal state (ale970227)
        /// Get the current keyseq string
-       string keyseqStr() const;
+       string const keyseqStr() const;
 
        /// Is the key sequence uncomplete?
        bool keyseqUncomplete() const;
 
        /// get options for the current keyseq
-       string keyseqOptions() const;
+       string const keyseqOptions() const;
 
         /// True if lyxfunc reports an error
         bool errorStat() const { return errorstat; }
@@ -66,10 +83,9 @@ public:
         /// Buffer to store result messages
         void setErrorMessage(string const &) const; 
         /// Buffer to store result messages
-        string getMessage() const { return dispatch_buffer; }
-        /// Get next inset of this class from current cursor position  
-        Inset * getInsetByCode(Inset::Code);
-       
+        string const getMessage() const { return dispatch_buffer; }
+       /// Handle a accented char keysequenze
+       void handleKeyFunc(kb_action action);
        /// Should a hint message be displayed?
        void setHintMessage(bool);
 private:
@@ -84,7 +100,7 @@ private:
        ///
        unsigned meta_fake_bit;
        ///
-       void moveCursorUpdate(bool selecting = false);
+       void moveCursorUpdate(bool flag = true, bool selecting = false);
        ///
        void setupLocalKeymap();
         ///
@@ -107,25 +123,21 @@ private:
        void MenuNew(bool fromTemplate);
 
        ///
-       void MenuOpen();
+       void Open(string const &);
 
        ///
-       void doImportLaTeX(bool);
+       void doImport(string const &);
 
        ///
-       void doImportASCII(bool);
-
+       void CloseBuffer();
        ///
-       void doImportLinuxDoc();
-
+       void reloadBuffer();
        ///
-       void MenuInsertLyXFile(string const &);
-
+       //  This return or directly text (default) of getLyXText()
        ///
-       void CloseBuffer();
+       LyXText * TEXT(bool) const;
        ///
-       void reloadBuffer();
-       /// This is the same for all lyxfunc objects
+       //  This is the same for all lyxfunc objects
        static bool show_sc;
 };
      
@@ -140,7 +152,7 @@ bool LyXFunc::wasMetaKey() const
      
 
 inline
-string LyXFunc::keyseqStr() const
+string const LyXFunc::keyseqStr() const
 {
        // Why not just remove this function
        string text;
@@ -150,7 +162,7 @@ string LyXFunc::keyseqStr() const
 
 
 inline
-string LyXFunc::keyseqOptions() const
+string const LyXFunc::keyseqOptions() const
 {
        // Why not just remove this function
        string text;
@@ -172,7 +184,7 @@ void LyXFunc::setHintMessage(bool hm)
        show_sc = hm;
 }
 
-
+///
 inline
 void operator|=(LyXFunc::func_status & fs, LyXFunc::func_status f)
 {